76 files changed, 56 insertions, 78 deletions

diff --git a/net/arla/files/arla.sh.in b/net/arla/files/arla.sh.in
index 8a2c30a399e7..792f2735afac 100644
--- a/net/arla/files/arla.sh.in
+++ b/net/arla/files/arla.sh.in
@@ -5,7 +5,6 @@
 
 # PROVIDE: arla
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD
 
 # Add the following line to /etc/rc.conf to enable `arla':
 #
diff --git a/net/asterisk-bristuff/files/asterisk.sh.in b/net/asterisk-bristuff/files/asterisk.sh.in
index 10f0c4275c84..22ef57fd3727 100644
--- a/net/asterisk-bristuff/files/asterisk.sh.in
+++ b/net/asterisk-bristuff/files/asterisk.sh.in
@@ -3,7 +3,7 @@
 # PROVIDE asterisk
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable asterisk:
diff --git a/net/asterisk/files/asterisk.sh.in b/net/asterisk/files/asterisk.sh.in
index 10f0c4275c84..22ef57fd3727 100644
--- a/net/asterisk/files/asterisk.sh.in
+++ b/net/asterisk/files/asterisk.sh.in
@@ -3,7 +3,7 @@
 # PROVIDE asterisk
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable asterisk:
diff --git a/net/asterisk10/files/asterisk.sh.in b/net/asterisk10/files/asterisk.sh.in
index 10f0c4275c84..22ef57fd3727 100644
--- a/net/asterisk10/files/asterisk.sh.in
+++ b/net/asterisk10/files/asterisk.sh.in
@@ -3,7 +3,7 @@
 # PROVIDE asterisk
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable asterisk:
diff --git a/net/asterisk12/files/asterisk.sh.in b/net/asterisk12/files/asterisk.sh.in
index 10f0c4275c84..22ef57fd3727 100644
--- a/net/asterisk12/files/asterisk.sh.in
+++ b/net/asterisk12/files/asterisk.sh.in
@@ -3,7 +3,7 @@
 # PROVIDE asterisk
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable asterisk:
diff --git a/net/asterisk14/files/asterisk.sh.in b/net/asterisk14/files/asterisk.sh.in
index 10f0c4275c84..22ef57fd3727 100644
--- a/net/asterisk14/files/asterisk.sh.in
+++ b/net/asterisk14/files/asterisk.sh.in
@@ -3,7 +3,7 @@
 # PROVIDE asterisk
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable asterisk:
diff --git a/net/asterisk16/files/asterisk.sh.in b/net/asterisk16/files/asterisk.sh.in
index 10f0c4275c84..22ef57fd3727 100644
--- a/net/asterisk16/files/asterisk.sh.in
+++ b/net/asterisk16/files/asterisk.sh.in
@@ -3,7 +3,7 @@
 # PROVIDE asterisk
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable asterisk:
diff --git a/net/balance/files/balance.sh.in b/net/balance/files/balance.sh.in
index 6a7de5b0d644..73c0ee98d4a5 100644
--- a/net/balance/files/balance.sh.in
+++ b/net/balance/files/balance.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: balance
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable balance:
diff --git a/net/bfilter/files/bfilter.sh b/net/bfilter/files/bfilter.sh
index 7286956038b3..20ffc4d1af23 100644
--- a/net/bfilter/files/bfilter.sh
+++ b/net/bfilter/files/bfilter.sh
@@ -4,7 +4,6 @@
 #
 # PROVIDE: bfilter
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable bfilter:
 #
diff --git a/net/binkd/files/binkd.sh.in b/net/binkd/files/binkd.sh.in
index fd08ab704309..30e794541152 100644
--- a/net/binkd/files/binkd.sh.in
+++ b/net/binkd/files/binkd.sh.in
@@ -4,7 +4,7 @@
 #
 # PROVIDE: binkd 
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Define these binkd_* variables in one of these files:
 #       /etc/rc.conf
diff --git a/net/bld/files/bld.sh b/net/bld/files/bld.sh
index de3f04256497..f0852d982d24 100644
--- a/net/bld/files/bld.sh
+++ b/net/bld/files/bld.sh
@@ -3,7 +3,7 @@
 # PROVIDE: bld
 # REQUIRE: LOGIN
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable bld:
diff --git a/net/boinc-client/files/boinc.sh.in b/net/boinc-client/files/boinc.sh.in
index 4c87c3e7c7f8..717c6478753a 100644
--- a/net/boinc-client/files/boinc.sh.in
+++ b/net/boinc-client/files/boinc.sh.in
@@ -4,7 +4,7 @@
 
 # PROVIDE: boinc
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 . %%RC_SUBR%%
 
diff --git a/net/ccxstream/files/ccxstream.sh.sample b/net/ccxstream/files/ccxstream.sh.sample
index 7ebff4f09e37..0782f1c0e740 100644
--- a/net/ccxstream/files/ccxstream.sh.sample
+++ b/net/ccxstream/files/ccxstream.sh.sample
@@ -5,7 +5,6 @@
 
 # PROVIDE: ccxstream
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 
 # Define these ccxstream_* variables in one of these files:
 #       /etc/rc.conf
diff --git a/net/cvsup-mirror/files/cvsupd.sh.in b/net/cvsup-mirror/files/cvsupd.sh.in
index 78a666879bf7..b780f80d514c 100644
--- a/net/cvsup-mirror/files/cvsupd.sh.in
+++ b/net/cvsup-mirror/files/cvsupd.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: cvsupd
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable cvsupd:
diff --git a/net/cvsync/files/cvsyncd.sh b/net/cvsync/files/cvsyncd.sh
index 360a5c344b7a..4f467f6c824a 100644
--- a/net/cvsync/files/cvsyncd.sh
+++ b/net/cvsync/files/cvsyncd.sh
@@ -4,7 +4,6 @@
 #
 # PROVIDE: cvsyncd
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD
 #
 cvsyncd_enable=${cvsyncd_enable-"NO"}
 cvsyncd_pidfile=${cvsyncd_pidfile-"/var/run/cvsyncd.pid"}
diff --git a/net/dante/files/sockd.sh.in b/net/dante/files/sockd.sh.in
index 3ed415c9fdbc..faf0457278a5 100644
--- a/net/dante/files/sockd.sh.in
+++ b/net/dante/files/sockd.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: sockd
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable sockd:
diff --git a/net/dhcp6/files/dhcp6c.sh b/net/dhcp6/files/dhcp6c.sh
index 32117d128bf4..95ecedc1be37 100644
--- a/net/dhcp6/files/dhcp6c.sh
+++ b/net/dhcp6/files/dhcp6c.sh
@@ -6,7 +6,7 @@
 # PROVIDE: dhcp6c
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # NOTE for FreeBSD 5.0+:
 # If you want this script to start with the base rc scripts
diff --git a/net/dhcp6/files/dhcp6relay.sh b/net/dhcp6/files/dhcp6relay.sh
index bff8d9815a2d..cece41dbf6b9 100644
--- a/net/dhcp6/files/dhcp6relay.sh
+++ b/net/dhcp6/files/dhcp6relay.sh
@@ -6,7 +6,7 @@
 # PROVIDE: dhcp6relay
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # NOTE for FreeBSD 5.0+:
 # If you want this script to start with the base rc scripts
diff --git a/net/dhcp6/files/dhcp6s.sh b/net/dhcp6/files/dhcp6s.sh
index 603ed4a5eb30..a9428b1c72f5 100644
--- a/net/dhcp6/files/dhcp6s.sh
+++ b/net/dhcp6/files/dhcp6s.sh
@@ -6,7 +6,7 @@
 # PROVIDE: dhcp6s
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # NOTE for FreeBSD 5.0+:
 # If you want this script to start with the base rc scripts
diff --git a/net/dhcprelay/files/dhcprelay.sh.in b/net/dhcprelay/files/dhcprelay.sh.in
index d58f30f06bdf..f42a94a356b1 100644
--- a/net/dhcprelay/files/dhcprelay.sh.in
+++ b/net/dhcprelay/files/dhcprelay.sh.in
@@ -1,10 +1,9 @@
 #! /bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/net/dhcprelay/files/Attic/dhcprelay.sh.in,v 1.1 2005-11-15 11:26:44 edwin Exp $
+# $FreeBSD: /tmp/pcvs/ports/net/dhcprelay/files/Attic/dhcprelay.sh.in,v 1.2 2006-02-20 20:47:22 dougb Exp $
 #
 # PROVIDE: dhcprelay
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable dhcrelay:
 #
diff --git a/net/dictd/files/dictd.sh b/net/dictd/files/dictd.sh
index ef10cccdea56..3cbf5d5b210e 100644
--- a/net/dictd/files/dictd.sh
+++ b/net/dictd/files/dictd.sh
@@ -3,7 +3,6 @@
 #
 # PROVIDE: dictd
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable dictd:
 #
diff --git a/net/dtcp/files/dtcpc.sh.in b/net/dtcp/files/dtcpc.sh.in
index 3ca23c039e83..ac4ad6ab6a58 100644
--- a/net/dtcp/files/dtcpc.sh.in
+++ b/net/dtcp/files/dtcpc.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: dtcpc
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # NOTE for FreeBSD 5.0+:
 # If you want this script to start with the base rc scripts
diff --git a/net/dtcp/files/dtcps.sh.in b/net/dtcp/files/dtcps.sh.in
index a2e3ad9c9b1a..f6bb60d651cf 100644
--- a/net/dtcp/files/dtcps.sh.in
+++ b/net/dtcp/files/dtcps.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: dtcps
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # NOTE for FreeBSD 5.0+:
 # If you want this script to start with the base rc scripts
diff --git a/net/dtcpclient/files/dtcpclient.sh.in b/net/dtcpclient/files/dtcpclient.sh.in
index e8b0ee65658d..156923be85a1 100644
--- a/net/dtcpclient/files/dtcpclient.sh.in
+++ b/net/dtcpclient/files/dtcpclient.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: dtcpclient
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # NOTE for FreeBSD 5.0+:
 # If you want this script to start with the base rc scripts
diff --git a/net/freenet6/files/freenet6.sh.in b/net/freenet6/files/freenet6.sh.in
index 9bb02b5e5385..a90e10ed0039 100644
--- a/net/freenet6/files/freenet6.sh.in
+++ b/net/freenet6/files/freenet6.sh.in
@@ -7,7 +7,7 @@
 # PROVIDE: freenet6
 # REQUIRE: NETWORKING
 # BEFORE: SERVERS
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 
 #
diff --git a/net/gnu-radius/files/radiusd.sh.in b/net/gnu-radius/files/radiusd.sh.in
index 70411d5b8596..214afd518768 100644
--- a/net/gnu-radius/files/radiusd.sh.in
+++ b/net/gnu-radius/files/radiusd.sh.in
@@ -3,7 +3,7 @@
 # PROVIDE radiusd
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable radiusd:
diff --git a/net/haproxy-devel/files/haproxy.sh b/net/haproxy-devel/files/haproxy.sh
index 3b633d089d7b..a69868ffb1e8 100644
--- a/net/haproxy-devel/files/haproxy.sh
+++ b/net/haproxy-devel/files/haproxy.sh
@@ -6,7 +6,7 @@
 # PROVIDE: haproxy
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable haproxy:
diff --git a/net/haproxy/files/haproxy.sh b/net/haproxy/files/haproxy.sh
index 3b633d089d7b..a69868ffb1e8 100644
--- a/net/haproxy/files/haproxy.sh
+++ b/net/haproxy/files/haproxy.sh
@@ -6,7 +6,7 @@
 # PROVIDE: haproxy
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable haproxy:
diff --git a/net/howl/files/mdnsresponder.sh b/net/howl/files/mdnsresponder.sh
index 6b12a93e7786..f0ad7b25a12b 100644
--- a/net/howl/files/mdnsresponder.sh
+++ b/net/howl/files/mdnsresponder.sh
@@ -4,7 +4,6 @@
 #
 # PROVIDE: mdnsresponder
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Howl's mDNSResponder, a Zeroconf (Bonjour) service advertisement daemon.
 #
diff --git a/net/ifstated/files/ifstated.sh b/net/ifstated/files/ifstated.sh
index 9f852e97c0a1..98c544fafe0f 100644
--- a/net/ifstated/files/ifstated.sh
+++ b/net/ifstated/files/ifstated.sh
@@ -6,7 +6,7 @@
 # PROVIDE: ifstated
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable ifstated:
diff --git a/net/ipw-firmware/files/ipw.sh.in b/net/ipw-firmware/files/ipw.sh.in
index 3b97b6c09fb3..9eedb74fde58 100644
--- a/net/ipw-firmware/files/ipw.sh.in
+++ b/net/ipw-firmware/files/ipw.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: %%DRIVERNAME%%
 # REQUIRE: mountcritlocal
 # BEFORE:  ipfilter
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable `%%DRIVERNAME%%':
 #
diff --git a/net/irrd/files/irrd.sh b/net/irrd/files/irrd.sh
index 77bff7f81717..033b875555b6 100644
--- a/net/irrd/files/irrd.sh
+++ b/net/irrd/files/irrd.sh
@@ -4,7 +4,7 @@
 # PROVIDE: irrd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these irrd_* variables in one of these files:
 #	/etc/rc.conf
diff --git a/net/isc-dhcp3-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp3-server/files/isc-dhcpd.sh.sample
index 9d7c518b2dfa..97e56f5f9b24 100644
--- a/net/isc-dhcp3-server/files/isc-dhcpd.sh.sample
+++ b/net/isc-dhcp3-server/files/isc-dhcpd.sh.sample
@@ -5,7 +5,7 @@
 # PROVIDE: dhcpd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable dhcpd:
 #
diff --git a/net/isc-dhcp3-server/files/isc-dhcrelay.sh.sample b/net/isc-dhcp3-server/files/isc-dhcrelay.sh.sample
index 3c72b5520efe..11c9b00b3133 100644
--- a/net/isc-dhcp3-server/files/isc-dhcrelay.sh.sample
+++ b/net/isc-dhcp3-server/files/isc-dhcrelay.sh.sample
@@ -4,7 +4,6 @@
 #
 # PROVIDE: dhcrelay
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable dhcrelay:
 #
diff --git a/net/isc-dhcp30-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp30-server/files/isc-dhcpd.sh.sample
index 9d7c518b2dfa..97e56f5f9b24 100644
--- a/net/isc-dhcp30-server/files/isc-dhcpd.sh.sample
+++ b/net/isc-dhcp30-server/files/isc-dhcpd.sh.sample
@@ -5,7 +5,7 @@
 # PROVIDE: dhcpd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable dhcpd:
 #
diff --git a/net/isc-dhcp30-server/files/isc-dhcrelay.sh.sample b/net/isc-dhcp30-server/files/isc-dhcrelay.sh.sample
index 3c72b5520efe..11c9b00b3133 100644
--- a/net/isc-dhcp30-server/files/isc-dhcrelay.sh.sample
+++ b/net/isc-dhcp30-server/files/isc-dhcrelay.sh.sample
@@ -4,7 +4,6 @@
 #
 # PROVIDE: dhcrelay
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable dhcrelay:
 #
diff --git a/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample
index 9d7c518b2dfa..97e56f5f9b24 100644
--- a/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample
+++ b/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample
@@ -5,7 +5,7 @@
 # PROVIDE: dhcpd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable dhcpd:
 #
diff --git a/net/isc-dhcp31-server/files/isc-dhcrelay.sh.sample b/net/isc-dhcp31-server/files/isc-dhcrelay.sh.sample
index 3c72b5520efe..11c9b00b3133 100644
--- a/net/isc-dhcp31-server/files/isc-dhcrelay.sh.sample
+++ b/net/isc-dhcp31-server/files/isc-dhcrelay.sh.sample
@@ -4,7 +4,6 @@
 #
 # PROVIDE: dhcrelay
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable dhcrelay:
 #
diff --git a/net/isc-dhcp40-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp40-server/files/isc-dhcpd.sh.sample
index 9d7c518b2dfa..97e56f5f9b24 100644
--- a/net/isc-dhcp40-server/files/isc-dhcpd.sh.sample
+++ b/net/isc-dhcp40-server/files/isc-dhcpd.sh.sample
@@ -5,7 +5,7 @@
 # PROVIDE: dhcpd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable dhcpd:
 #
diff --git a/net/isc-dhcp40-server/files/isc-dhcrelay.sh.sample b/net/isc-dhcp40-server/files/isc-dhcrelay.sh.sample
index 3c72b5520efe..11c9b00b3133 100644
--- a/net/isc-dhcp40-server/files/isc-dhcrelay.sh.sample
+++ b/net/isc-dhcp40-server/files/isc-dhcrelay.sh.sample
@@ -4,7 +4,6 @@
 #
 # PROVIDE: dhcrelay
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable dhcrelay:
 #
diff --git a/net/iwi-firmware/files/iwi.sh.in b/net/iwi-firmware/files/iwi.sh.in
index 6419abdedcec..08b9dee36082 100644
--- a/net/iwi-firmware/files/iwi.sh.in
+++ b/net/iwi-firmware/files/iwi.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: %%DRIVERNAME%%
 # REQUIRE: mountcritlocal
 # BEFORE:  ipfilter
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable `%%DRIVERNAME%%':
 #
diff --git a/net/keepalived/files/keepalived.sh.in b/net/keepalived/files/keepalived.sh.in
index 7b931d26e749..f4f390e360a6 100644
--- a/net/keepalived/files/keepalived.sh.in
+++ b/net/keepalived/files/keepalived.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: keepalived
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable apache2:
diff --git a/net/lanbrowsing/files/lisa.sh b/net/lanbrowsing/files/lisa.sh
index 4f609cc04bdb..a2a4a55110d6 100644
--- a/net/lanbrowsing/files/lisa.sh
+++ b/net/lanbrowsing/files/lisa.sh
@@ -5,7 +5,6 @@
 
 # PROVIDE: lisa
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD
 
 lisa_enable="NO"
 lisa_conffile="%%PREFIX%%/etc/lisarc"
diff --git a/net/mDNSResponder/files/mdnsd.sh.in b/net/mDNSResponder/files/mdnsd.sh.in
index b3fc2fa0ea7d..eacb5cf9e948 100644
--- a/net/mDNSResponder/files/mdnsd.sh.in
+++ b/net/mDNSResponder/files/mdnsd.sh.in
@@ -3,7 +3,7 @@
 
 # PROVIDE: mdnsd
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 mdnsd_enable="${mdnsd_enable-NO}"
 
diff --git a/net/minisapserver/files/sapserver.sh b/net/minisapserver/files/sapserver.sh
index dbd8fcd5dce5..b7cbcef95361 100644
--- a/net/minisapserver/files/sapserver.sh
+++ b/net/minisapserver/files/sapserver.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/net/minisapserver/files/Attic/sapserver.sh,v 1.2 2006-01-07 06:29:53 dougb Exp $
+# $FreeBSD: /tmp/pcvs/ports/net/minisapserver/files/Attic/sapserver.sh,v 1.3 2006-02-20 20:47:27 dougb Exp $
 #
 
 # PROVIDE: sapserver
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable sapserver:
diff --git a/net/mpd/files/mpd.sh b/net/mpd/files/mpd.sh
index a3a6ded80304..1e57ace8b2aa 100644
--- a/net/mpd/files/mpd.sh
+++ b/net/mpd/files/mpd.sh
@@ -4,7 +4,6 @@
 #
 # PROVIDE: mpd
 # REQUIRE: NETWORKING syslogd
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable mpd:
 #
diff --git a/net/nylon/files/nylon.sh.in b/net/nylon/files/nylon.sh.in
index 251f9c90c280..457407e6dc71 100644
--- a/net/nylon/files/nylon.sh.in
+++ b/net/nylon/files/nylon.sh.in
@@ -3,7 +3,7 @@
 
 # PROVIDE: nylon
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable nylon:
diff --git a/net/openbgpd/files/openbgpd.sh.in b/net/openbgpd/files/openbgpd.sh.in
index eb7a8311a283..51e889b666e4 100644
--- a/net/openbgpd/files/openbgpd.sh.in
+++ b/net/openbgpd/files/openbgpd.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: bgpd
 # REQUIRE: LOGIN abi
 # BEFORE:  securelevel
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable `openbgpd':
 #
diff --git a/net/openldap22-server/files/slapd.sh b/net/openldap22-server/files/slapd.sh
index 6c6066220aec..a663f674af2c 100644
--- a/net/openldap22-server/files/slapd.sh
+++ b/net/openldap22-server/files/slapd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: slapd
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: securelevel
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable slapd:
diff --git a/net/openldap22-server/files/slurpd.sh b/net/openldap22-server/files/slurpd.sh
index 79021305b400..ea5e5b0642b6 100644
--- a/net/openldap22-server/files/slurpd.sh
+++ b/net/openldap22-server/files/slurpd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: slurpd
 # REQUIRE: slapd
 # BEFORE:
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable slurpd:
 #
diff --git a/net/openldap23-server/files/slapd.sh b/net/openldap23-server/files/slapd.sh
index 6c6066220aec..a663f674af2c 100644
--- a/net/openldap23-server/files/slapd.sh
+++ b/net/openldap23-server/files/slapd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: slapd
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: securelevel
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable slapd:
diff --git a/net/openldap23-server/files/slurpd.sh b/net/openldap23-server/files/slurpd.sh
index 79021305b400..ea5e5b0642b6 100644
--- a/net/openldap23-server/files/slurpd.sh
+++ b/net/openldap23-server/files/slurpd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: slurpd
 # REQUIRE: slapd
 # BEFORE:
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable slurpd:
 #
diff --git a/net/openldap24-server/files/slapd.sh b/net/openldap24-server/files/slapd.sh
index 6c6066220aec..a663f674af2c 100644
--- a/net/openldap24-server/files/slapd.sh
+++ b/net/openldap24-server/files/slapd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: slapd
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: securelevel
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable slapd:
diff --git a/net/openldap24-server/files/slurpd.sh b/net/openldap24-server/files/slurpd.sh
index 79021305b400..ea5e5b0642b6 100644
--- a/net/openldap24-server/files/slurpd.sh
+++ b/net/openldap24-server/files/slurpd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: slurpd
 # REQUIRE: slapd
 # BEFORE:
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable slurpd:
 #
diff --git a/net/openntpd/files/openntpd.sh b/net/openntpd/files/openntpd.sh
index 22553d1f6084..0563632209c7 100644
--- a/net/openntpd/files/openntpd.sh
+++ b/net/openntpd/files/openntpd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: openntpd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
 
 . %%RC_SUBR%%
 
diff --git a/net/openradius/files/openradius.in b/net/openradius/files/openradius.in
index bd049990a511..fad9e2bf01ce 100644
--- a/net/openradius/files/openradius.in
+++ b/net/openradius/files/openradius.in
@@ -4,7 +4,6 @@
 #
 # PROVIDE: openradius
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable openradius:
 #
diff --git a/net/poptop/files/pptpd.sh.in b/net/poptop/files/pptpd.sh.in
index faad7bf0f6dd..3cc15684420a 100644
--- a/net/poptop/files/pptpd.sh.in
+++ b/net/poptop/files/pptpd.sh.in
@@ -4,7 +4,6 @@
 #
 # PROVIDE: pptpd
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable pptpd:
 #
diff --git a/net/qadsl/files/qadsl.sh.in b/net/qadsl/files/qadsl.sh.in
index 09489d00dc89..68dc1b15c9de 100644
--- a/net/qadsl/files/qadsl.sh.in
+++ b/net/qadsl/files/qadsl.sh.in
@@ -3,7 +3,7 @@
 # PROVIDE: qadsl 
 # REQUIRE: NETWORK
 # BEFORE: DAEMON SERVERS LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable qadsl:
diff --git a/net/quagga/files/quagga.sh.in b/net/quagga/files/quagga.sh.in
index 0f15a7aa9693..005f5ccbebed 100644
--- a/net/quagga/files/quagga.sh.in
+++ b/net/quagga/files/quagga.sh.in
@@ -4,7 +4,7 @@
 # PROVIDE: quagga
 # REQUIRE: netif routing mountcritlocal
 # BEFORE:  NETWORKING
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: NetBSD
 
 #
 # Add the following line to /etc/rc.conf to enable quagga:
diff --git a/net/quagga/files/watchquagga.sh.in b/net/quagga/files/watchquagga.sh.in
index 3545ecdd6f49..dfb9ca42fdd5 100644
--- a/net/quagga/files/watchquagga.sh.in
+++ b/net/quagga/files/watchquagga.sh.in
@@ -4,7 +4,7 @@
 # PROVIDE: watchquagga
 # REQUIRE: netif routing mountcritlocal quagga
 # BEFORE:  NETWORKING
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: NetBSD
 
 #
 # Add the following line to /etc/rc.conf to enable quagga:
diff --git a/net/redir/files/redir.in b/net/redir/files/redir.in
index 51e3674313c1..17f69f3ddb6c 100644
--- a/net/redir/files/redir.in
+++ b/net/redir/files/redir.in
@@ -4,7 +4,6 @@
 #
 # PROVIDE: redir
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following lines to /etc/rc.conf to enable redir:
 #
diff --git a/net/repeater/files/repeater.sh b/net/repeater/files/repeater.sh
index 1dba76d780ef..0006f81ae025 100644
--- a/net/repeater/files/repeater.sh
+++ b/net/repeater/files/repeater.sh
@@ -3,7 +3,7 @@
 # PROVIDE: repeater
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable repeater:
diff --git a/net/rinetd/files/rinetd.sh.in b/net/rinetd/files/rinetd.sh.in
index dc86c53b79ea..a32adf10a6c4 100644
--- a/net/rinetd/files/rinetd.sh.in
+++ b/net/rinetd/files/rinetd.sh.in
@@ -3,7 +3,7 @@
 # PROVIDE: rinetd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable rinetd:
diff --git a/net/ris/files/binlsrv.sh.in b/net/ris/files/binlsrv.sh.in
index bba45b8750c0..1b3473df512a 100644
--- a/net/ris/files/binlsrv.sh.in
+++ b/net/ris/files/binlsrv.sh.in
@@ -3,7 +3,7 @@
 # PROVIDE: binlsrv
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these variables in one of these files:
 #	/etc/rc.conf
diff --git a/net/rsync/files/rsyncd.sh.in b/net/rsync/files/rsyncd.sh.in
index b86b09e12543..318c6293b887 100644
--- a/net/rsync/files/rsyncd.sh.in
+++ b/net/rsync/files/rsyncd.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: %%NAME%%
 # REQUIRE: LOGIN
 # BEFORE:  securelevel
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable `%%NAME%%':
 #
diff --git a/net/siproxd/files/siproxd.sh b/net/siproxd/files/siproxd.sh
index 9d4485646813..f14d7616dd48 100644
--- a/net/siproxd/files/siproxd.sh
+++ b/net/siproxd/files/siproxd.sh
@@ -5,7 +5,6 @@
 
 # PROVIDE: siproxd
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # NOTE for FreeBSD 5.0+:
 # If you want this script to start with the base rc scripts
diff --git a/net/sixxs-aiccu/files/sixxs-aiccu.sh b/net/sixxs-aiccu/files/sixxs-aiccu.sh
index 27a7de255776..b4eb89dc4a26 100644
--- a/net/sixxs-aiccu/files/sixxs-aiccu.sh
+++ b/net/sixxs-aiccu/files/sixxs-aiccu.sh
@@ -5,7 +5,6 @@
 
 # PROVIDE: sixxs-aiccu
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD
 
 #
 # Add the following lines to /etc/rc.conf to enable sixxs-aiccu:
diff --git a/net/sixxs-heartbeatd/files/sixxs-heartbeatd.sh b/net/sixxs-heartbeatd/files/sixxs-heartbeatd.sh
index 4d3c29ba95db..1aa21d31e645 100644
--- a/net/sixxs-heartbeatd/files/sixxs-heartbeatd.sh
+++ b/net/sixxs-heartbeatd/files/sixxs-heartbeatd.sh
@@ -5,7 +5,6 @@
 
 # PROVIDE: sixxs-heartbeatd
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD
 
 #
 # Add the following lines to /etc/rc.conf to enable sixxs-heartbeatd:
diff --git a/net/spread/files/spread.sh b/net/spread/files/spread.sh
index adc11250484f..fc9fd9e85755 100644
--- a/net/spread/files/spread.sh
+++ b/net/spread/files/spread.sh
@@ -5,7 +5,7 @@
 
 # PROVIDE: spread
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable spread:
diff --git a/net/spread4/files/spread.sh b/net/spread4/files/spread.sh
index adc11250484f..fc9fd9e85755 100644
--- a/net/spread4/files/spread.sh
+++ b/net/spread4/files/spread.sh
@@ -5,7 +5,7 @@
 
 # PROVIDE: spread
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable spread:
diff --git a/net/tac_plus4/files/tac_plus.sh b/net/tac_plus4/files/tac_plus.sh
index 5710a97a0b73..05f13e79b7f9 100644
--- a/net/tac_plus4/files/tac_plus.sh
+++ b/net/tac_plus4/files/tac_plus.sh
@@ -4,7 +4,6 @@
 #
 # PROVIDE: tac_plus
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable the TACACS+ daemon:
 #
diff --git a/net/traff/files/traff.sh.in b/net/traff/files/traff.sh.in
index b37a8b173fc4..05f51e837da3 100644
--- a/net/traff/files/traff.sh.in
+++ b/net/traff/files/traff.sh.in
@@ -4,7 +4,7 @@
 # PROVIDE: traff
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable traff:
diff --git a/net/vncreflector/files/vncreflector.sh.in b/net/vncreflector/files/vncreflector.sh.in
index 855f813dd38a..591e4ea97911 100644
--- a/net/vncreflector/files/vncreflector.sh.in
+++ b/net/vncreflector/files/vncreflector.sh.in
@@ -4,7 +4,7 @@
 # PROVIDE: vncreflector
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 _etcdir="%%PREFIX%%/etc/vncreflector"
 
diff --git a/net/vtun/files/vtunclient.sh b/net/vtun/files/vtunclient.sh
index c4bcef6a873e..7679ac50724e 100644
--- a/net/vtun/files/vtunclient.sh
+++ b/net/vtun/files/vtunclient.sh
@@ -4,7 +4,6 @@
 #
 # PROVIDE: vtunclient
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable vtunclient:
 #
diff --git a/net/vtun/files/vtund.sh b/net/vtun/files/vtund.sh
index f218c3a449a4..0675996796fe 100644
--- a/net/vtun/files/vtund.sh
+++ b/net/vtun/files/vtund.sh
@@ -4,7 +4,6 @@
 #
 # PROVIDE: vtund
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable vtund:
 #
diff --git a/net/widentd/files/widentd.sh.in b/net/widentd/files/widentd.sh.in
index f71b1ad72a90..069183d0e840 100644
--- a/net/widentd/files/widentd.sh.in
+++ b/net/widentd/files/widentd.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: widentd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD startup and shutdown
+# KEYWORD: shutdown
 #
 prefix=%%PREFIX%%