Merge net.OS into net

29 files changed, 19 insertions, 19 deletions

diff --git a/net.BSD/Makefile b/net.BSD/Makefile
deleted file mode 100644
index 95391e8..0000000
--- a/net.BSD/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-DIR=	${PREFIX}/${RC_LIB}/net
-INC=	ifconfig.sh
-
-MK=	../mk
-include ${MK}/scripts.mk
diff --git a/net.FreeBSD/Makefile b/net.FreeBSD/Makefile
deleted file mode 100644
index da75fc3..0000000
--- a/net.FreeBSD/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-DIR=	${PREFIX}/${RC_LIB}/net
-INC=	iwconfig.sh
-
-MK=	../mk
-include ${MK}/scripts.mk
diff --git a/net.Linux/Makefile b/net.Linux/Makefile
deleted file mode 100644
index 628f5f4..0000000
--- a/net.Linux/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-DIR=	${PREFIX}/${RC_LIB}/net
-INC=	adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh ccwgroup.sh \
-	clip.sh ifconfig.sh ifplugd.sh ip6to4.sh ipppd.sh iproute2.sh \
-	iwconfig.sh netplugd.sh pppd.sh pump.sh tuntap.sh udhcpc.sh vlan.sh
-
-MK=	../mk
-include ${MK}/scripts.mk
diff --git a/net/Makefile b/net/Makefile
index 677bd2f..bde659e 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,5 +1,6 @@
 DIR=	${PREFIX}/${RC_LIB}/net
-INC=	dhclient.sh dhcpcd.sh macchanger.sh macnet.sh \
+SRCS=	ifconfig.sh.in
+INC=	dhclient.sh dhcpcd.sh ifconfig.sh macchanger.sh macnet.sh \
 	ssidnet.sh system.sh wpa_supplicant.sh
 
 MK=	../mk
diff --git a/net/Makefile.FreeBSD b/net/Makefile.FreeBSD
index e69de29..cd1a671 100644
--- a/net/Makefile.FreeBSD
+++ b/net/Makefile.FreeBSD
@@ -0,0 +1,6 @@
+SRCS+=		iwconfig.sh.in
+INC+=		iwconfig.sh
+
+.SUFFIXES:	.sh.BSD.in
+.sh.BSD.in.sh:
+	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
diff --git a/net/Makefile.Linux b/net/Makefile.Linux
index e69de29..1a496c7 100644
--- a/net/Makefile.Linux
+++ b/net/Makefile.Linux
@@ -0,0 +1,8 @@
+SRCS+=		iwconfig.sh.in
+INC+=		adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh \
+		ccwgroup.sh iproute2.sh ifplugd.sh ip6to4.sh ipppd.sh \
+		iwconfig.sh netplugd.sh pppd.sh tuntap.sh udhcpc.sh vlan.sh
+
+.SUFFIXES:	.sh.Linux.in
+.sh.Linux.in.sh:
+	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
diff --git a/net/Makefile.NetBSD b/net/Makefile.NetBSD
index cda89ef..2ff4750 100644
--- a/net/Makefile.NetBSD
+++ b/net/Makefile.NetBSD
@@ -1 +1,3 @@
-INC+=	ifwatchd.sh
+.SUFFIXES:	.sh.BSD.in
+.sh.BSD.in.sh:
+	sed ${SED_REPLACE} ${SED_EXTRA} $< > $@
diff --git a/net.Linux/adsl.sh b/net/adsl.sh
index 6dd93e0..6dd93e0 100644
--- a/net.Linux/adsl.sh
+++ b/net/adsl.sh
diff --git a/net.Linux/apipa.sh b/net/apipa.sh
index 39da392..39da392 100644
--- a/net.Linux/apipa.sh
+++ b/net/apipa.sh
diff --git a/net.Linux/arping.sh b/net/arping.sh
index 8046c47..8046c47 100644
--- a/net.Linux/arping.sh
+++ b/net/arping.sh
diff --git a/net.Linux/bonding.sh b/net/bonding.sh
index 69de32a..69de32a 100644
--- a/net.Linux/bonding.sh
+++ b/net/bonding.sh
diff --git a/net.Linux/br2684ctl.sh b/net/br2684ctl.sh
index 11ee4f5..11ee4f5 100644
--- a/net.Linux/br2684ctl.sh
+++ b/net/br2684ctl.sh
diff --git a/net.Linux/bridge.sh b/net/bridge.sh
index 517fe72..517fe72 100644
--- a/net.Linux/bridge.sh
+++ b/net/bridge.sh
diff --git a/net.Linux/ccwgroup.sh b/net/ccwgroup.sh
index d40e713..d40e713 100644
--- a/net.Linux/ccwgroup.sh
+++ b/net/ccwgroup.sh
diff --git a/net.Linux/clip.sh b/net/clip.sh
index 78344d2..78344d2 100644
--- a/net.Linux/clip.sh
+++ b/net/clip.sh
diff --git a/net.BSD/ifconfig.sh b/net/ifconfig.sh.BSD.in
index 6f96177..6f96177 100644
--- a/net.BSD/ifconfig.sh
+++ b/net/ifconfig.sh.BSD.in
diff --git a/net.Linux/ifconfig.sh b/net/ifconfig.sh.Linux.in
index f82f25c..f82f25c 100644
--- a/net.Linux/ifconfig.sh
+++ b/net/ifconfig.sh.Linux.in
diff --git a/net.Linux/ifplugd.sh b/net/ifplugd.sh
index db7007a..db7007a 100644
--- a/net.Linux/ifplugd.sh
+++ b/net/ifplugd.sh
diff --git a/net.Linux/ip6to4.sh b/net/ip6to4.sh
index d58eb31..d58eb31 100644
--- a/net.Linux/ip6to4.sh
+++ b/net/ip6to4.sh
diff --git a/net.Linux/ipppd.sh b/net/ipppd.sh
index cf4558d..cf4558d 100644
--- a/net.Linux/ipppd.sh
+++ b/net/ipppd.sh
diff --git a/net.Linux/iproute2.sh b/net/iproute2.sh
index de76537..de76537 100644
--- a/net.Linux/iproute2.sh
+++ b/net/iproute2.sh
diff --git a/net.FreeBSD/iwconfig.sh b/net/iwconfig.sh.BSD.in
index 3a276cd..3a276cd 100644
--- a/net.FreeBSD/iwconfig.sh
+++ b/net/iwconfig.sh.BSD.in
diff --git a/net.Linux/iwconfig.sh b/net/iwconfig.sh.Linux.in
index 1610cba..1610cba 100644
--- a/net.Linux/iwconfig.sh
+++ b/net/iwconfig.sh.Linux.in
diff --git a/net.Linux/netplugd.sh b/net/netplugd.sh
index eed37aa..eed37aa 100644
--- a/net.Linux/netplugd.sh
+++ b/net/netplugd.sh
diff --git a/net.Linux/pppd.sh b/net/pppd.sh
index abee058..abee058 100644
--- a/net.Linux/pppd.sh
+++ b/net/pppd.sh
diff --git a/net.Linux/pump.sh b/net/pump.sh
index 4ab7929..4ab7929 100644
--- a/net.Linux/pump.sh
+++ b/net/pump.sh
diff --git a/net.Linux/tuntap.sh b/net/tuntap.sh
index 3174d81..3174d81 100644
--- a/net.Linux/tuntap.sh
+++ b/net/tuntap.sh
diff --git a/net.Linux/udhcpc.sh b/net/udhcpc.sh
index 462f058..462f058 100644
--- a/net.Linux/udhcpc.sh
+++ b/net/udhcpc.sh
diff --git a/net.Linux/vlan.sh b/net/vlan.sh
index 7d77aae..7d77aae 100644
--- a/net.Linux/vlan.sh
+++ b/net/vlan.sh