Remove the FreeBSD KEYWORD from all rc.d scripts where it appears.

We have not checked for this KEYWORD for a long time now, so this is a complete noop, and thus no PORTREVISION bump. Removing it at this point is mostly for pedantic reasons, and partly to avoid perpetuating this anachronism by copy and paste to future scripts.
author: Doug Barton <dougb@FreeBSD.org> 2006-02-20 20:47:50 +0000
committer: Doug Barton <dougb@FreeBSD.org> 2006-02-20 20:47:50 +0000
commit: c49d1a3273d77f35b5564b3722856ca8b9dcc291 (patch)
tree: 3da9de442d629d38ac63cb930e82da714209de9f
parent: 2aa383c4ecd765535e04e8eba8a625608b808ee4 (diff)
download: ports-c49d1a3273d77f35b5564b3722856ca8b9dcc291.tar.gz
ports-c49d1a3273d77f35b5564b3722856ca8b9dcc291.zip
328 files changed, 268 insertions, 351 deletions
diff --git a/audio/autocd/files/autocd.sh b/audio/autocd/files/autocd.sh
index 0c078948a1d5..152cc13cfde4 100644
--- a/audio/autocd/files/autocd.sh
+++ b/audio/autocd/files/autocd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: autocd
 # REQUIRE:
 # BEFORE:
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable autocd:
diff --git a/audio/daapd/files/daapd.sh b/audio/daapd/files/daapd.sh
index 17b0052e3776..26b5f3b58f6b 100644
--- a/audio/daapd/files/daapd.sh
+++ b/audio/daapd/files/daapd.sh
@@ -3,7 +3,7 @@
 
 # PROVIDE: daapd
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these daapd_* variables in one of these files:
 #       /etc/rc.conf
diff --git a/audio/gnump3d/files/gnump3d.sh.in b/audio/gnump3d/files/gnump3d.sh.in
index 98de6a39fb00..9efd9c2c9a62 100644
--- a/audio/gnump3d/files/gnump3d.sh.in
+++ b/audio/gnump3d/files/gnump3d.sh.in
@@ -2,7 +2,7 @@
 #
 # PROVIDE: gnump3d
 # REQUIRE: DAEMON NETWORKING LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 . %%RC_SUBR%%
 
diff --git a/audio/icecast2/files/icecast2.sh.in b/audio/icecast2/files/icecast2.sh.in
index accb36722e61..0168b7badf99 100644
--- a/audio/icecast2/files/icecast2.sh.in
+++ b/audio/icecast2/files/icecast2.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: icecast2
 # REQUIRE: DAEMON
 # BEFORE:  login
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable `icecast2'. This requires
 # a working configuration in %%PREFIX%%/etc/icecast.xml.
diff --git a/audio/musicpd/files/musicpd.sh b/audio/musicpd/files/musicpd.sh
index 176fd6ff3b0c..8b8a5f2d93d5 100644
--- a/audio/musicpd/files/musicpd.sh
+++ b/audio/musicpd/files/musicpd.sh
@@ -4,7 +4,7 @@
 # PROVIDE: musicpd
 # REQUIRE:
 # BEFORE:
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable mpd:
 #
diff --git a/audio/shoutcast/files/shoutcast.sh.in b/audio/shoutcast/files/shoutcast.sh.in
index f7d71c328509..eadc86683c1f 100644
--- a/audio/shoutcast/files/shoutcast.sh.in
+++ b/audio/shoutcast/files/shoutcast.sh.in
@@ -4,7 +4,7 @@
 # PROVIDE: shoutcast
 # REQUIRE: LOGIN
 # BEFORE:
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
diff --git a/audio/slimserver/files/slimserver.sh.in b/audio/slimserver/files/slimserver.sh.in
index d4617c1cc2a8..ee4783aa1f1e 100644
--- a/audio/slimserver/files/slimserver.sh.in
+++ b/audio/slimserver/files/slimserver.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: slimserver
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable slimserver:
diff --git a/audio/squeezeboxserver/files/slimserver.sh.in b/audio/squeezeboxserver/files/slimserver.sh.in
index d4617c1cc2a8..ee4783aa1f1e 100644
--- a/audio/squeezeboxserver/files/slimserver.sh.in
+++ b/audio/squeezeboxserver/files/slimserver.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: slimserver
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable slimserver:
diff --git a/audio/squeezeboxserver/files/squeezecenter.sh.in b/audio/squeezeboxserver/files/squeezecenter.sh.in
index d4617c1cc2a8..ee4783aa1f1e 100644
--- a/audio/squeezeboxserver/files/squeezecenter.sh.in
+++ b/audio/squeezeboxserver/files/squeezecenter.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: slimserver
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable slimserver:
diff --git a/audio/squeezecenter/files/slimserver.sh.in b/audio/squeezecenter/files/slimserver.sh.in
index d4617c1cc2a8..ee4783aa1f1e 100644
--- a/audio/squeezecenter/files/slimserver.sh.in
+++ b/audio/squeezecenter/files/slimserver.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: slimserver
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable slimserver:
diff --git a/audio/squeezecenter/files/squeezecenter.sh.in b/audio/squeezecenter/files/squeezecenter.sh.in
index d4617c1cc2a8..ee4783aa1f1e 100644
--- a/audio/squeezecenter/files/squeezecenter.sh.in
+++ b/audio/squeezecenter/files/squeezecenter.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: slimserver
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable slimserver:
diff --git a/comms/ltmdm/files/ltmdm.sh.in b/comms/ltmdm/files/ltmdm.sh.in
index df991fb01b89..10fb24dfb346 100644
--- a/comms/ltmdm/files/ltmdm.sh.in
+++ b/comms/ltmdm/files/ltmdm.sh.in
@@ -1,10 +1,10 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/comms/ltmdm/files/Attic/ltmdm.sh.in,v 1.1 2005-04-18 15:20:08 vs Exp $
+# $FreeBSD: /tmp/pcvs/ports/comms/ltmdm/files/Attic/ltmdm.sh.in,v 1.2 2006-02-20 20:46:49 dougb Exp $
 
 # PROVIDE: ltmdm
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these ltmdm_* variables in one of these files:
 #       /etc/rc.conf
diff --git a/comms/smstools/files/patch-bin_sms b/comms/smstools/files/patch-bin_sms
index c5c5d336b5ec..c88a529e85fb 100644
--- a/comms/smstools/files/patch-bin_sms
+++ b/comms/smstools/files/patch-bin_sms
@@ -1,6 +1,6 @@
---- bin/sms.orig	Sun Apr 17 12:56:51 2005
-+++ bin/sms	Sun Apr 17 12:58:09 2005
-@@ -1,21 +1,27 @@
+--- bin/sms.orig	Thu Jan 30 05:31:18 2003
++++ bin/sms	Mon Feb 20 12:39:53 2006
+@@ -1,21 +1,26 @@
 -#! /bin/sh
 -# This script can be used to start/stop smsd 
 -# as a daemon in Linux and Solaris.
@@ -10,7 +10,6 @@
 +#
 +# PROVIDE: smsd 
 +# REQUIRE: DAEMON
-+# KEYWORD: FreeBSD
 +#
 +# Add the following line to %%PREFIX%%/etc/rc.conf to enable smsd:
 +#
diff --git a/comms/vpb-driver/files/vpb.sh.in b/comms/vpb-driver/files/vpb.sh.in
index d50a3e46ed82..5628aaeb3c64 100644
--- a/comms/vpb-driver/files/vpb.sh.in
+++ b/comms/vpb-driver/files/vpb.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: vpb-driver
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #	we load the vpb-driver after the network is fully loaded
 #       (for VOIP?)
 
diff --git a/databases/cyrus-smlacapd/files/cyrus_smlacapd_backend.sh.in b/databases/cyrus-smlacapd/files/cyrus_smlacapd_backend.sh.in
index 91cbe3376a76..ff255910fe6d 100644
--- a/databases/cyrus-smlacapd/files/cyrus_smlacapd_backend.sh.in
+++ b/databases/cyrus-smlacapd/files/cyrus_smlacapd_backend.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: cyrus_smlacapd_backend
 # REQUIRE: DAEMON cyrus_pwcheck
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable cyrus_smlacapd_backend:
diff --git a/databases/pgcluster/files/pgcluster.sh.tmpl b/databases/pgcluster/files/pgcluster.sh.tmpl
index 49a2b539e436..1a4ec30ec616 100644
--- a/databases/pgcluster/files/pgcluster.sh.tmpl
+++ b/databases/pgcluster/files/pgcluster.sh.tmpl
@@ -5,7 +5,6 @@
 # PROVIDE: pgcluster
 # REQUIRE: DAEMON
 # BEFORE:  pgreplicate
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable pgcluster:
 #
diff --git a/databases/pgcluster/files/pglb.sh.tmpl b/databases/pgcluster/files/pglb.sh.tmpl
index 958019ad6549..4e5af93ab3ba 100644
--- a/databases/pgcluster/files/pglb.sh.tmpl
+++ b/databases/pgcluster/files/pglb.sh.tmpl
@@ -4,7 +4,6 @@
 #
 # PROVIDE: pglb
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable pglb:
 #
diff --git a/databases/pgcluster/files/pgreplicate.sh.tmpl b/databases/pgcluster/files/pgreplicate.sh.tmpl
index a4ce495496dd..bf58256c28de 100644
--- a/databases/pgcluster/files/pgreplicate.sh.tmpl
+++ b/databases/pgcluster/files/pgreplicate.sh.tmpl
@@ -5,7 +5,6 @@
 # PROVIDE: pgreplicate
 # REQUIRE: DAEMON
 # BEFORE:  pglb
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable pgreplicate:
 #
diff --git a/databases/postgresql-relay/files/postgresql-relay.sh b/databases/postgresql-relay/files/postgresql-relay.sh
index 2a0ce105e9a4..926c685e54e4 100644
--- a/databases/postgresql-relay/files/postgresql-relay.sh
+++ b/databases/postgresql-relay/files/postgresql-relay.sh
@@ -6,7 +6,7 @@
 # PROVIDE: postgresql-relay
 # REQUIRE: LOGIN
 # AFTER: postgresql
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable spamd:
diff --git a/databases/postgresql73-server/files/pgsql.sh.tmpl b/databases/postgresql73-server/files/pgsql.sh.tmpl
index 2f7554620e89..e6a538b409a2 100644
--- a/databases/postgresql73-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql73-server/files/pgsql.sh.tmpl
@@ -4,7 +4,7 @@
 #
 # PROVIDE: postgresql
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable PostgreSQL:
 #
diff --git a/databases/postgresql74-server/files/pgsql.sh.tmpl b/databases/postgresql74-server/files/pgsql.sh.tmpl
index 2f7554620e89..e6a538b409a2 100644
--- a/databases/postgresql74-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql74-server/files/pgsql.sh.tmpl
@@ -4,7 +4,7 @@
 #
 # PROVIDE: postgresql
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable PostgreSQL:
 #
diff --git a/databases/postgresql80-server/files/pgsql.sh.tmpl b/databases/postgresql80-server/files/pgsql.sh.tmpl
index 2f7554620e89..e6a538b409a2 100644
--- a/databases/postgresql80-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql80-server/files/pgsql.sh.tmpl
@@ -4,7 +4,7 @@
 #
 # PROVIDE: postgresql
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable PostgreSQL:
 #
diff --git a/databases/postgresql81-server/files/pgsql.sh.tmpl b/databases/postgresql81-server/files/pgsql.sh.tmpl
index 2f7554620e89..e6a538b409a2 100644
--- a/databases/postgresql81-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql81-server/files/pgsql.sh.tmpl
@@ -4,7 +4,7 @@
 #
 # PROVIDE: postgresql
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable PostgreSQL:
 #
diff --git a/databases/postgresql82-server/files/pgsql.sh.tmpl b/databases/postgresql82-server/files/pgsql.sh.tmpl
index 2f7554620e89..e6a538b409a2 100644
--- a/databases/postgresql82-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql82-server/files/pgsql.sh.tmpl
@@ -4,7 +4,7 @@
 #
 # PROVIDE: postgresql
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable PostgreSQL:
 #
diff --git a/databases/postgresql83-server/files/pgsql.sh.tmpl b/databases/postgresql83-server/files/pgsql.sh.tmpl
index 2f7554620e89..e6a538b409a2 100644
--- a/databases/postgresql83-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql83-server/files/pgsql.sh.tmpl
@@ -4,7 +4,7 @@
 #
 # PROVIDE: postgresql
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable PostgreSQL:
 #
diff --git a/databases/postgresql84-server/files/pgsql.sh.tmpl b/databases/postgresql84-server/files/pgsql.sh.tmpl
index 2f7554620e89..e6a538b409a2 100644
--- a/databases/postgresql84-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql84-server/files/pgsql.sh.tmpl
@@ -4,7 +4,7 @@
 #
 # PROVIDE: postgresql
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable PostgreSQL:
 #
diff --git a/databases/postgresql90-server/files/pgsql.sh.tmpl b/databases/postgresql90-server/files/pgsql.sh.tmpl
index 2f7554620e89..e6a538b409a2 100644
--- a/databases/postgresql90-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql90-server/files/pgsql.sh.tmpl
@@ -4,7 +4,7 @@
 #
 # PROVIDE: postgresql
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable PostgreSQL:
 #
diff --git a/databases/postgresql91-server/files/pgsql.sh.tmpl b/databases/postgresql91-server/files/pgsql.sh.tmpl
index 2f7554620e89..e6a538b409a2 100644
--- a/databases/postgresql91-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql91-server/files/pgsql.sh.tmpl
@@ -4,7 +4,7 @@
 #
 # PROVIDE: postgresql
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable PostgreSQL:
 #
diff --git a/databases/postgresql92-server/files/pgsql.sh.tmpl b/databases/postgresql92-server/files/pgsql.sh.tmpl
index 2f7554620e89..e6a538b409a2 100644
--- a/databases/postgresql92-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql92-server/files/pgsql.sh.tmpl
@@ -4,7 +4,7 @@
 #
 # PROVIDE: postgresql
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable PostgreSQL:
 #
diff --git a/databases/slony1/files/slon.sh.in b/databases/slony1/files/slon.sh.in
index c64c1175b2b7..6f2ee3c82feb 100644
--- a/databases/slony1/files/slon.sh.in
+++ b/databases/slony1/files/slon.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: %%NAME%%
 # REQUIRE: postgresql
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable `%%NAME%%':
 #
diff --git a/databases/slony1v2/files/slon.sh.in b/databases/slony1v2/files/slon.sh.in
index c64c1175b2b7..6f2ee3c82feb 100644
--- a/databases/slony1v2/files/slon.sh.in
+++ b/databases/slony1v2/files/slon.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: %%NAME%%
 # REQUIRE: postgresql
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable `%%NAME%%':
 #
diff --git a/devel/cvsnt/files/cvslockd.sh.in b/devel/cvsnt/files/cvslockd.sh.in
index 66784c35dc7d..4d087f2f0a62 100644
--- a/devel/cvsnt/files/cvslockd.sh.in
+++ b/devel/cvsnt/files/cvslockd.sh.in
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/devel/cvsnt/files/Attic/cvslockd.sh.in,v 1.1 2005-04-19 19:03:52 fjoe Exp $
+# $FreeBSD: /tmp/pcvs/ports/devel/cvsnt/files/Attic/cvslockd.sh.in,v 1.2 2006-02-20 20:46:54 dougb Exp $
 #
 # PROVIDE: cvslockd
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 . %%RC_SUBR%%
 
diff --git a/devel/devhelp/files/devhelp.sh b/devel/devhelp/files/devhelp.sh
index eaf475d7e355..411ff22fb5f0 100644
--- a/devel/devhelp/files/devhelp.sh
+++ b/devel/devhelp/files/devhelp.sh
@@ -4,7 +4,6 @@
 #
 # PROVIDE: devhelp
 # REQUIRE: ldconfig
-# KEYWORD: FreeBSD
 
 . /etc/rc.subr
 
diff --git a/devel/distcc/files/distccd.sh.in b/devel/distcc/files/distccd.sh.in
index 7fb081cbb304..d5a9efb91add 100644
--- a/devel/distcc/files/distccd.sh.in
+++ b/devel/distcc/files/distccd.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: distccd
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable distccd:
diff --git a/dns/dnrd/files/dnrd.sh.in b/dns/dnrd/files/dnrd.sh.in
index 9dcee18fab22..13eef265db65 100644
--- a/dns/dnrd/files/dnrd.sh.in
+++ b/dns/dnrd/files/dnrd.sh.in
@@ -3,7 +3,6 @@
 #
 # PROVIDE: dnrd
 # REQUIRE: DAEMON NETWORKING SERVERS
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable dnrd:
 #
diff --git a/dns/dns_balance/files/dns_balance.sh.in b/dns/dns_balance/files/dns_balance.sh.in
index afce344f390e..9855a7fba88d 100644
--- a/dns/dns_balance/files/dns_balance.sh.in
+++ b/dns/dns_balance/files/dns_balance.sh.in
@@ -4,7 +4,6 @@
 #
 # PROVIDE: dns_balance
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 
 . %%RC_SUBR%%
 
diff --git a/dns/dualserver/files/dualserver.sh.in b/dns/dualserver/files/dualserver.sh.in
index 619fdebab80e..bcd54f6eb1d5 100644
--- a/dns/dualserver/files/dualserver.sh.in
+++ b/dns/dualserver/files/dualserver.sh.in
@@ -4,7 +4,7 @@
 # PROVIDE: dualserver
 # REQUIRE: SERVERS
 # BEFORE:
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
diff --git a/dns/ez-ipupdate/files/ez-ipupdate.sh.in b/dns/ez-ipupdate/files/ez-ipupdate.sh.in
index 763d026c35ec..e276e4cc9624 100644
--- a/dns/ez-ipupdate/files/ez-ipupdate.sh.in
+++ b/dns/ez-ipupdate/files/ez-ipupdate.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: ez-ipupdate
 # REQUIRE:
 # BEFORE:
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable ez-ipupdate:
 #
diff --git a/dns/maradns/files/rc_d.sh b/dns/maradns/files/rc_d.sh
index d1e3ba7e6d18..b5aebb3680da 100644
--- a/dns/maradns/files/rc_d.sh
+++ b/dns/maradns/files/rc_d.sh
@@ -6,7 +6,7 @@
 # PROVIDE: %%SERVICE%%
 # REQUIRE: SERVERS
 # BEFORE: DAEMON
-# 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/dns/powerdns-devel/files/pdns.in b/dns/powerdns-devel/files/pdns.in
index 63c2a0537df2..8735e8268353 100644
--- a/dns/powerdns-devel/files/pdns.in
+++ b/dns/powerdns-devel/files/pdns.in
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/dns/powerdns-devel/files/Attic/pdns.in,v 1.1 2006-02-15 12:56:37 ehaupt Exp $
+# $FreeBSD: /tmp/pcvs/ports/dns/powerdns-devel/files/Attic/pdns.in,v 1.2 2006-02-20 20:46:57 dougb Exp $
 #
 
 # PROVIDE: pdns_server
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable powerdns:
diff --git a/dns/powerdns-devel/files/pdns_recursor.in b/dns/powerdns-devel/files/pdns_recursor.in
index fc19a1e940af..96bf4743c638 100644
--- a/dns/powerdns-devel/files/pdns_recursor.in
+++ b/dns/powerdns-devel/files/pdns_recursor.in
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/dns/powerdns-devel/files/Attic/pdns_recursor.in,v 1.1 2006-02-15 12:56:37 ehaupt Exp $
+# $FreeBSD: /tmp/pcvs/ports/dns/powerdns-devel/files/Attic/pdns_recursor.in,v 1.2 2006-02-20 20:46:57 dougb Exp $
 #
 
 # PROVIDE: pdns_recursor
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable pdns_recursor:
diff --git a/dns/powerdns/files/pdns.in b/dns/powerdns/files/pdns.in
index 9eae04153346..ca99abb2963f 100644
--- a/dns/powerdns/files/pdns.in
+++ b/dns/powerdns/files/pdns.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: pdns_server
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable powerdns:
diff --git a/dns/powerdns/files/pdns_recursor.in b/dns/powerdns/files/pdns_recursor.in
index 25017f55dcf0..4a3e0f10e33a 100644
--- a/dns/powerdns/files/pdns_recursor.in
+++ b/dns/powerdns/files/pdns_recursor.in
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/dns/powerdns/files/Attic/pdns_recursor.in,v 1.1 2006-02-15 12:56:37 ehaupt Exp $
+# $FreeBSD: /tmp/pcvs/ports/dns/powerdns/files/Attic/pdns_recursor.in,v 1.2 2006-02-20 20:46:57 dougb Exp $
 #
 
 # PROVIDE: pdns_recursor
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable pdns_recursor:
diff --git a/dns/rbldnsd/files/rbldnsd.sh b/dns/rbldnsd/files/rbldnsd.sh
index 8f7afecc493b..1fd44f93216e 100644
--- a/dns/rbldnsd/files/rbldnsd.sh
+++ b/dns/rbldnsd/files/rbldnsd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: rbldnsd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to enable rbldnsd:
 #
diff --git a/dns/totd/files/totd.sh b/dns/totd/files/totd.sh
index f21da7456630..287f20207e9f 100644
--- a/dns/totd/files/totd.sh
+++ b/dns/totd/files/totd.sh
@@ -6,7 +6,6 @@
 # PROVIDE: totd
 # REQUIRE: SERVERS
 # BEFORE:  DAEMON
-# KEYWORD: FreeBSD
 #
 # NOTE for FreeBSD 5.0+:
 # If you want this script to start with the base rc scripts
diff --git a/emulators/vmware-guestd4/files/vmware-guestd.sh b/emulators/vmware-guestd4/files/vmware-guestd.sh
index 2bdeddcab5ac..4f5072ce1f41 100644
--- a/emulators/vmware-guestd4/files/vmware-guestd.sh
+++ b/emulators/vmware-guestd4/files/vmware-guestd.sh
@@ -6,7 +6,6 @@
 # PROVIDE: vmware-guestd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD
 
 PREFIX=%%PREFIX%%
 . %%RC_SUBR%%
diff --git a/emulators/vmware-guestd4/files/vmware-guestd.sh.in b/emulators/vmware-guestd4/files/vmware-guestd.sh.in
index 2bdeddcab5ac..4f5072ce1f41 100644
--- a/emulators/vmware-guestd4/files/vmware-guestd.sh.in
+++ b/emulators/vmware-guestd4/files/vmware-guestd.sh.in
@@ -6,7 +6,6 @@
 # PROVIDE: vmware-guestd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD
 
 PREFIX=%%PREFIX%%
 . %%RC_SUBR%%
diff --git a/emulators/vmware-guestd5/files/vmware-guestd.sh b/emulators/vmware-guestd5/files/vmware-guestd.sh
index dea842ec234f..158e88bf56bd 100644
--- a/emulators/vmware-guestd5/files/vmware-guestd.sh
+++ b/emulators/vmware-guestd5/files/vmware-guestd.sh
@@ -6,7 +6,6 @@
 # PROVIDE: vmware-guestd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD
 
 PREFIX=%%PREFIX%%
 . %%RC_SUBR%%
diff --git a/emulators/vmware-guestd5/files/vmware-guestd.sh.in b/emulators/vmware-guestd5/files/vmware-guestd.sh.in
index dea842ec234f..158e88bf56bd 100644
--- a/emulators/vmware-guestd5/files/vmware-guestd.sh.in
+++ b/emulators/vmware-guestd5/files/vmware-guestd.sh.in
@@ -6,7 +6,6 @@
 # PROVIDE: vmware-guestd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD
 
 PREFIX=%%PREFIX%%
 . %%RC_SUBR%%
diff --git a/emulators/vmware-guestd6/files/vmware-guestd.sh b/emulators/vmware-guestd6/files/vmware-guestd.sh
index dea842ec234f..158e88bf56bd 100644
--- a/emulators/vmware-guestd6/files/vmware-guestd.sh
+++ b/emulators/vmware-guestd6/files/vmware-guestd.sh
@@ -6,7 +6,6 @@
 # PROVIDE: vmware-guestd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD
 
 PREFIX=%%PREFIX%%
 . %%RC_SUBR%%
diff --git a/emulators/vmware-guestd6/files/vmware-guestd.sh.in b/emulators/vmware-guestd6/files/vmware-guestd.sh.in
index dea842ec234f..158e88bf56bd 100644
--- a/emulators/vmware-guestd6/files/vmware-guestd.sh.in
+++ b/emulators/vmware-guestd6/files/vmware-guestd.sh.in
@@ -6,7 +6,6 @@
 # PROVIDE: vmware-guestd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD
 
 PREFIX=%%PREFIX%%
 . %%RC_SUBR%%
diff --git a/french/plgrenouille/files/plgrenouille.sh b/french/plgrenouille/files/plgrenouille.sh
index 38dd7c1705a9..9409b14bd048 100644
--- a/french/plgrenouille/files/plgrenouille.sh
+++ b/french/plgrenouille/files/plgrenouille.sh
@@ -4,7 +4,6 @@
 #
 # PROVIDE: plgrenouille
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable upclient:
 #
diff --git a/ftp/bsdftpd-ssl/files/bsdftpd_ssl.sh b/ftp/bsdftpd-ssl/files/bsdftpd_ssl.sh
index 3b12d07cd253..8d5961475b92 100644
--- a/ftp/bsdftpd-ssl/files/bsdftpd_ssl.sh
+++ b/ftp/bsdftpd-ssl/files/bsdftpd_ssl.sh
@@ -3,7 +3,7 @@
 # PROVIDE: bsdftpd_ssl
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # You need to set "bsdftpd_ssl_enable=YES" in either /etc/rc.conf,
diff --git a/ftp/jftpgw/files/jftpgw.sh.in b/ftp/jftpgw/files/jftpgw.sh.in
index b4ba07389a79..428465cb43ee 100644
--- a/ftp/jftpgw/files/jftpgw.sh.in
+++ b/ftp/jftpgw/files/jftpgw.sh.in
@@ -3,7 +3,7 @@
 # PROVIDE jftpgw
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable pure-ftpd:
diff --git a/ftp/moftpd/files/moftpd.sh b/ftp/moftpd/files/moftpd.sh
index eaa61d6520a4..a1c407313bf6 100644
--- a/ftp/moftpd/files/moftpd.sh
+++ b/ftp/moftpd/files/moftpd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: moftpd
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable moftpd:
diff --git a/ftp/proftpd-devel/files/proftpd.sh.in b/ftp/proftpd-devel/files/proftpd.sh.in
index 442cacbec11e..5e72d10cfb88 100644
--- a/ftp/proftpd-devel/files/proftpd.sh.in
+++ b/ftp/proftpd-devel/files/proftpd.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: proftpd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable proftpd:
diff --git a/ftp/proftpd/files/proftpd.sh.in b/ftp/proftpd/files/proftpd.sh.in
index 442cacbec11e..5e72d10cfb88 100644
--- a/ftp/proftpd/files/proftpd.sh.in
+++ b/ftp/proftpd/files/proftpd.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: proftpd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable proftpd:
diff --git a/ftp/pure-ftpd/files/pure-ftpd.sh.sample b/ftp/pure-ftpd/files/pure-ftpd.sh.sample
index 4c53c806cc7b..991897b0c7b6 100644
--- a/ftp/pure-ftpd/files/pure-ftpd.sh.sample
+++ b/ftp/pure-ftpd/files/pure-ftpd.sh.sample
@@ -3,7 +3,7 @@
 # PROVIDE: pureftpd
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable pure-ftpd:
diff --git a/ftp/vsftpd/files/vsftpd.sh.in b/ftp/vsftpd/files/vsftpd.sh.in
index f80397ea0ab8..16e069ccf372 100644
--- a/ftp/vsftpd/files/vsftpd.sh.in
+++ b/ftp/vsftpd/files/vsftpd.sh.in
@@ -5,7 +5,6 @@
 
 # PROVIDE: vsftpd
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 
 # Add the following line to /etc/rc.conf to enable `vsftpd':
 #
diff --git a/ftp/wzdftpd/files/wzdftpd.sh b/ftp/wzdftpd/files/wzdftpd.sh
index 3cbda3b9f65e..25a14fc945ec 100644
--- a/ftp/wzdftpd/files/wzdftpd.sh
+++ b/ftp/wzdftpd/files/wzdftpd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: wzdftpd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 
 prefix=%%PREFIX%%
diff --git a/games/kaid/files/kaid.sh b/games/kaid/files/kaid.sh
index 8b214dec67bf..4cf3de99b256 100644
--- a/games/kaid/files/kaid.sh
+++ b/games/kaid/files/kaid.sh
@@ -5,7 +5,7 @@
 
 # PROVIDE: kaid
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable  kaid:
diff --git a/games/pvpgn/files/bnetd.sh b/games/pvpgn/files/bnetd.sh
index aa7fabc20fbd..99d4e1d53f66 100644
--- a/games/pvpgn/files/bnetd.sh
+++ b/games/pvpgn/files/bnetd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: bnetd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable bnetd:
diff --git a/irc/dancer-ircd/files/dancer-ircd.sh b/irc/dancer-ircd/files/dancer-ircd.sh
index 21fc17010a95..adb0d2804def 100644
--- a/irc/dancer-ircd/files/dancer-ircd.sh
+++ b/irc/dancer-ircd/files/dancer-ircd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: dancer-ircd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 . %%RC_SUBR%%
 
diff --git a/irc/dancer-services/files/dancer-services.sh b/irc/dancer-services/files/dancer-services.sh
index c776dc03655f..82749206d15c 100644
--- a/irc/dancer-services/files/dancer-services.sh
+++ b/irc/dancer-services/files/dancer-services.sh
@@ -4,7 +4,6 @@
 #
 
 # PROVIDE: dancer-services
-# KEYWORD: FreeBSD
 
 . %%RC_SUBR%%
 
diff --git a/irc/ircd-hybrid/files/ircd-hybrid.sh.in b/irc/ircd-hybrid/files/ircd-hybrid.sh.in
index 75acabd5fde2..c70decfa5376 100644
--- a/irc/ircd-hybrid/files/ircd-hybrid.sh.in
+++ b/irc/ircd-hybrid/files/ircd-hybrid.sh.in
@@ -3,7 +3,7 @@
 # PROVIDE: ircd-hybrid
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # To get ircd-hybrid enabled at boot, add the following lines to /etc/rc.conf :
 # ircd_hybrid_enable (bool):    Set to "NO" by default.
diff --git a/irc/ircservices/files/ircservices.sh.in b/irc/ircservices/files/ircservices.sh.in
index 00f6f7dda6f9..e82a2eae3e3b 100644
--- a/irc/ircservices/files/ircservices.sh.in
+++ b/irc/ircservices/files/ircservices.sh.in
@@ -2,7 +2,6 @@
 #
 # PROVIDE: ircservices
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable ircservices:
 #
diff --git a/japanese/Canna/files/canna.sh.in b/japanese/Canna/files/canna.sh.in
index 6881832fb165..236d28e9b454 100644
--- a/japanese/Canna/files/canna.sh.in
+++ b/japanese/Canna/files/canna.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: canna
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these canna_* variables in one of these files:
 #	/etc/rc.conf
diff --git a/japanese/canna-lib/files/canna.sh.in b/japanese/canna-lib/files/canna.sh.in
index 6881832fb165..236d28e9b454 100644
--- a/japanese/canna-lib/files/canna.sh.in
+++ b/japanese/canna-lib/files/canna.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: canna
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these canna_* variables in one of these files:
 #	/etc/rc.conf
diff --git a/japanese/canna-server/files/canna.sh.in b/japanese/canna-server/files/canna.sh.in
index 6881832fb165..236d28e9b454 100644
--- a/japanese/canna-server/files/canna.sh.in
+++ b/japanese/canna-server/files/canna.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: canna
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these canna_* variables in one of these files:
 #	/etc/rc.conf
diff --git a/japanese/ebnetd/files/ebnetd.sh b/japanese/ebnetd/files/ebnetd.sh
index e3e388e3ec4f..57fff3017479 100644
--- a/japanese/ebnetd/files/ebnetd.sh
+++ b/japanese/ebnetd/files/ebnetd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: ebnetd ndtpd ebhttpd
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable EBNETD servers:
diff --git a/japanese/esecanna/files/esecanna.sh b/japanese/esecanna/files/esecanna.sh
index d79ab1eb1000..3fb6b40b747e 100644
--- a/japanese/esecanna/files/esecanna.sh
+++ b/japanese/esecanna/files/esecanna.sh
@@ -5,7 +5,7 @@
 # PROVIDE: esecanna
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 . %%RC_SUBR%%
 
diff --git a/japanese/multiskkserv/files/multiskkserv.sh b/japanese/multiskkserv/files/multiskkserv.sh
index b06b287cd04b..fa430dbb2239 100644
--- a/japanese/multiskkserv/files/multiskkserv.sh
+++ b/japanese/multiskkserv/files/multiskkserv.sh
@@ -5,7 +5,6 @@
 
 # PROVIDE: multiskkserv
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD
 
 #
 # Add the following lines to /etc/rc.conf to enable multiskkserv:
diff --git a/japanese/rskkserv/files/rskkserv.sh.in b/japanese/rskkserv/files/rskkserv.sh.in
index 7be0a302caad..cdcb5f71fc6c 100644
--- a/japanese/rskkserv/files/rskkserv.sh.in
+++ b/japanese/rskkserv/files/rskkserv.sh.in
@@ -5,7 +5,7 @@
 # PROVIDE: rskkserv
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 prefix=%%PREFIX%%
 
diff --git a/japanese/samba/files/samba.sh.sample b/japanese/samba/files/samba.sh.sample
index 6fea8f03478a..15476b31d399 100644
--- a/japanese/samba/files/samba.sh.sample
+++ b/japanese/samba/files/samba.sh.sample
@@ -7,7 +7,7 @@
 %%WINBIND%%# PROVIDE: winbindd
 # REQUIRE: NETWORKING SERVERS named %%CUPS%%
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable samba:
diff --git a/japanese/vje30/files/vje.sh b/japanese/vje30/files/vje.sh
index 7702ea9dc8b1..2fabf7c21a44 100644
--- a/japanese/vje30/files/vje.sh
+++ b/japanese/vje30/files/vje.sh
@@ -5,7 +5,7 @@
 # PROVIDE: vjed
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 . %%RC_SUBR%%
 
diff --git a/mail/assp/files/assp.sh.in b/mail/assp/files/assp.sh.in
index dd31cfcba1f4..bc5f119715d1 100644
--- a/mail/assp/files/assp.sh.in
+++ b/mail/assp/files/assp.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: assp
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 . %%RC_SUBR%%
 
diff --git a/mail/courier-imap/files/courier-imap-imapd-ssl.in b/mail/courier-imap/files/courier-imap-imapd-ssl.in
index d54c97023180..f7e72f31691f 100644
--- a/mail/courier-imap/files/courier-imap-imapd-ssl.in
+++ b/mail/courier-imap/files/courier-imap-imapd-ssl.in
@@ -4,7 +4,7 @@
 
 # PROVIDE: courier_imap_imapd_ssl
 # REQUIRE: LOGIN courier_authdaemond
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these courier_imap_imapd_ssl_* variables in one of these files:
 # 	/etc/rc.conf
diff --git a/mail/courier-imap/files/courier-imap-imapd-ssl.sh b/mail/courier-imap/files/courier-imap-imapd-ssl.sh
index d54c97023180..f7e72f31691f 100644
--- a/mail/courier-imap/files/courier-imap-imapd-ssl.sh
+++ b/mail/courier-imap/files/courier-imap-imapd-ssl.sh
@@ -4,7 +4,7 @@
 
 # PROVIDE: courier_imap_imapd_ssl
 # REQUIRE: LOGIN courier_authdaemond
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these courier_imap_imapd_ssl_* variables in one of these files:
 # 	/etc/rc.conf
diff --git a/mail/courier-imap/files/courier-imap-imapd.in b/mail/courier-imap/files/courier-imap-imapd.in
index 42c776b830ed..7bfa1625e3b1 100644
--- a/mail/courier-imap/files/courier-imap-imapd.in
+++ b/mail/courier-imap/files/courier-imap-imapd.in
@@ -4,7 +4,7 @@
 
 # PROVIDE: courier_imap_imapd
 # REQUIRE: LOGIN courier_authdaemond
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these courier_imap_imapd_* variables in one of these files:
 # 	/etc/rc.conf
diff --git a/mail/courier-imap/files/courier-imap-imapd.sh b/mail/courier-imap/files/courier-imap-imapd.sh
index 42c776b830ed..7bfa1625e3b1 100644
--- a/mail/courier-imap/files/courier-imap-imapd.sh
+++ b/mail/courier-imap/files/courier-imap-imapd.sh
@@ -4,7 +4,7 @@
 
 # PROVIDE: courier_imap_imapd
 # REQUIRE: LOGIN courier_authdaemond
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these courier_imap_imapd_* variables in one of these files:
 # 	/etc/rc.conf
diff --git a/mail/courier-imap/files/courier-imap-pop3d-ssl.in b/mail/courier-imap/files/courier-imap-pop3d-ssl.in
index b594235905f5..3fc4c3d3dab8 100644
--- a/mail/courier-imap/files/courier-imap-pop3d-ssl.in
+++ b/mail/courier-imap/files/courier-imap-pop3d-ssl.in
@@ -4,7 +4,7 @@
 
 # PROVIDE: courier_imap_pop3d_ssl
 # REQUIRE: LOGIN courier_authdaemond
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these courier_imap_pop3d_ssl_* variables in one of these files:
 # 	/etc/rc.conf
diff --git a/mail/courier-imap/files/courier-imap-pop3d-ssl.sh b/mail/courier-imap/files/courier-imap-pop3d-ssl.sh
index b594235905f5..3fc4c3d3dab8 100644
--- a/mail/courier-imap/files/courier-imap-pop3d-ssl.sh
+++ b/mail/courier-imap/files/courier-imap-pop3d-ssl.sh
@@ -4,7 +4,7 @@
 
 # PROVIDE: courier_imap_pop3d_ssl
 # REQUIRE: LOGIN courier_authdaemond
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these courier_imap_pop3d_ssl_* variables in one of these files:
 # 	/etc/rc.conf
diff --git a/mail/courier-imap/files/courier-imap-pop3d.in b/mail/courier-imap/files/courier-imap-pop3d.in
index 886d21eaa3e1..da0fad1b9312 100644
--- a/mail/courier-imap/files/courier-imap-pop3d.in
+++ b/mail/courier-imap/files/courier-imap-pop3d.in
@@ -4,7 +4,7 @@
 
 # PROVIDE: courier_imap_pop3d
 # REQUIRE: LOGIN courier_authdaemond
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these courier_imap_pop3d_* variables in one of these files:
 # 	/etc/rc.conf
diff --git a/mail/courier-imap/files/courier-imap-pop3d.sh b/mail/courier-imap/files/courier-imap-pop3d.sh
index 886d21eaa3e1..da0fad1b9312 100644
--- a/mail/courier-imap/files/courier-imap-pop3d.sh
+++ b/mail/courier-imap/files/courier-imap-pop3d.sh
@@ -4,7 +4,7 @@
 
 # PROVIDE: courier_imap_pop3d
 # REQUIRE: LOGIN courier_authdaemond
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these courier_imap_pop3d_* variables in one of these files:
 # 	/etc/rc.conf
diff --git a/mail/courier/files/courier.sh.in b/mail/courier/files/courier.sh.in
index b69171796ff4..7ad2acdb899a 100644
--- a/mail/courier/files/courier.sh.in
+++ b/mail/courier/files/courier.sh.in
@@ -10,7 +10,7 @@
 # PROVIDE: mail
 # REQUIRE: LOGIN courier_authdaemond
 # BEFORE:  securelevel
-# 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/mail/couriergraph/files/couriergraph.sh.in b/mail/couriergraph/files/couriergraph.sh.in
index f8a471153017..3ce36484e285 100644
--- a/mail/couriergraph/files/couriergraph.sh.in
+++ b/mail/couriergraph/files/couriergraph.sh.in
@@ -4,7 +4,6 @@
 #
 # PROVIDE: couriergraph
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable mailgraph:
 #
diff --git a/mail/cyrus-imapd2/files/imapd.sh.in b/mail/cyrus-imapd2/files/imapd.sh.in
index 5fcc612bb31c..b8dd83bd4a01 100644
--- a/mail/cyrus-imapd2/files/imapd.sh.in
+++ b/mail/cyrus-imapd2/files/imapd.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: cyrus_imapd
 # REQUIRE: DAEMON
 # BEFORE: mail
-# 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/mail/cyrus-imapd22/files/imapd.sh.in b/mail/cyrus-imapd22/files/imapd.sh.in
index 5fcc612bb31c..b8dd83bd4a01 100644
--- a/mail/cyrus-imapd22/files/imapd.sh.in
+++ b/mail/cyrus-imapd22/files/imapd.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: cyrus_imapd
 # REQUIRE: DAEMON
 # BEFORE: mail
-# 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/mail/cyrus-imapd23/files/imapd.sh.in b/mail/cyrus-imapd23/files/imapd.sh.in
index 5fcc612bb31c..b8dd83bd4a01 100644
--- a/mail/cyrus-imapd23/files/imapd.sh.in
+++ b/mail/cyrus-imapd23/files/imapd.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: cyrus_imapd
 # REQUIRE: DAEMON
 # BEFORE: mail
-# 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/mail/cyrus-imapd24/files/imapd.sh.in b/mail/cyrus-imapd24/files/imapd.sh.in
index 5fcc612bb31c..b8dd83bd4a01 100644
--- a/mail/cyrus-imapd24/files/imapd.sh.in
+++ b/mail/cyrus-imapd24/files/imapd.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: cyrus_imapd
 # REQUIRE: DAEMON
 # BEFORE: mail
-# 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/mail/dkfilter/files/dkfilter_in.sh.in b/mail/dkfilter/files/dkfilter_in.sh.in
index 7d1dcb34440f..1c76ea62fd59 100644
--- a/mail/dkfilter/files/dkfilter_in.sh.in
+++ b/mail/dkfilter/files/dkfilter_in.sh.in
@@ -5,7 +5,7 @@
 # PROVIDE: dkfilter_in
 # REQUIRE: LOGIN
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable dkfilter.in:
diff --git a/mail/dkfilter/files/dkfilter_out.sh.in b/mail/dkfilter/files/dkfilter_out.sh.in
index 78d3c7f402c4..70500db2a2bd 100644
--- a/mail/dkfilter/files/dkfilter_out.sh.in
+++ b/mail/dkfilter/files/dkfilter_out.sh.in
@@ -5,7 +5,7 @@
 # PROVIDE: dkfilter_out
 # REQUIRE: LOGIN
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable dkfilter.out:
diff --git a/mail/dovecot-devel/files/dovecot.sh.in b/mail/dovecot-devel/files/dovecot.sh.in
index f6697f1ba23a..4d6d3ecc21a8 100644
--- a/mail/dovecot-devel/files/dovecot.sh.in
+++ b/mail/dovecot-devel/files/dovecot.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: dovecot
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable dovecot:
diff --git a/mail/dovecot/files/dovecot.sh.in b/mail/dovecot/files/dovecot.sh.in
index f6697f1ba23a..4d6d3ecc21a8 100644
--- a/mail/dovecot/files/dovecot.sh.in
+++ b/mail/dovecot/files/dovecot.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: dovecot
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable dovecot:
diff --git a/mail/drac/files/dracd.sh.in b/mail/drac/files/dracd.sh.in
index c5b0332d5bdb..8601bfd86aec 100644
--- a/mail/drac/files/dracd.sh.in
+++ b/mail/drac/files/dracd.sh.in
@@ -4,7 +4,7 @@
 # PROVIDE: dracd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these dracd_* variables in one of these files:
 #       /etc/rc.conf
diff --git a/mail/dspampd/files/dspampd.rc b/mail/dspampd/files/dspampd.rc
index a8306e362941..842b7a58335e 100644
--- a/mail/dspampd/files/dspampd.rc
+++ b/mail/dspampd/files/dspampd.rc
@@ -6,7 +6,7 @@
 # PROVIDE: dspampd
 # REQUIRE: LOGIN %%CLAMAV%% %%DSPAM%%
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf[.local] to enable dspampd:
diff --git a/mail/exim/files/exim.sh b/mail/exim/files/exim.sh
index a71611712716..4a1e0ea1a86d 100644
--- a/mail/exim/files/exim.sh
+++ b/mail/exim/files/exim.sh
@@ -5,7 +5,7 @@
 
 # PROVIDE: mail
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #	we make mail start late, so that things like .forward's are not
 #	processed until the system is fully operational
 
diff --git a/mail/mailgraph/files/mailgraph.sh.in b/mail/mailgraph/files/mailgraph.sh.in
index 53c8a077b26f..4cc0d4313336 100644
--- a/mail/mailgraph/files/mailgraph.sh.in
+++ b/mail/mailgraph/files/mailgraph.sh.in
@@ -1,10 +1,9 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/mail/mailgraph/files/Attic/mailgraph.sh.in,v 1.1 2005-12-20 12:20:47 vanilla Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/mailgraph/files/Attic/mailgraph.sh.in,v 1.2 2006-02-20 20:47:11 dougb Exp $
 #
 # PROVIDE: mailgraph
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable mailgraph:
 #
diff --git a/mail/mailscanner/files/mailscanner.sh.in b/mail/mailscanner/files/mailscanner.sh.in
index 0ef8d417882f..4cfeddc41be8 100644
--- a/mail/mailscanner/files/mailscanner.sh.in
+++ b/mail/mailscanner/files/mailscanner.sh.in
@@ -2,7 +2,7 @@
 
 # PROVIDE: mailscanner
 # REQUIRE: mta
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable mailscanner:
diff --git a/mail/mailscanner/files/mta.sh.in b/mail/mailscanner/files/mta.sh.in
index f7e08d1ab8a0..aff193ac930a 100644
--- a/mail/mailscanner/files/mta.sh.in
+++ b/mail/mailscanner/files/mta.sh.in
@@ -5,7 +5,7 @@
 # PROVIDE: mta
 # REQUIRE: LOGIN cleanvar
 # BEFORE:
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable mta at boot-up time:
diff --git a/mail/masqmail/files/masqmail.sh b/mail/masqmail/files/masqmail.sh
index 1af2b245b8dc..dc001c15dc1e 100644
--- a/mail/masqmail/files/masqmail.sh
+++ b/mail/masqmail/files/masqmail.sh
@@ -5,7 +5,7 @@
 
 # PROVIDE: mail
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #	we make mail start late, so that things like .forward's are not
 #	processed until the system is fully operational
 
diff --git a/mail/nullmailer/files/nullmail.sh b/mail/nullmailer/files/nullmail.sh
index 1cee5009d9c4..6f3650990a89 100644
--- a/mail/nullmailer/files/nullmail.sh
+++ b/mail/nullmailer/files/nullmail.sh
@@ -3,7 +3,6 @@
 #
 # PROVIDE: nullmailer
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable nullmailer:
 #
diff --git a/mail/pop3proxy/files/pop3proxyd.sh b/mail/pop3proxy/files/pop3proxyd.sh
index cf3f51c05ce6..f0f8a74b3064 100644
--- a/mail/pop3proxy/files/pop3proxyd.sh
+++ b/mail/pop3proxy/files/pop3proxyd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: pop3proxyd
 # REQUIRE: LOGIN
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable pop3proxyd:
diff --git a/mail/postfix-policyd-sf/files/policyd.sh.in b/mail/postfix-policyd-sf/files/policyd.sh.in
index c00905530552..3ca29df414b2 100644
--- a/mail/postfix-policyd-sf/files/policyd.sh.in
+++ b/mail/postfix-policyd-sf/files/policyd.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: postfix-policyd-sf
 # REQUIRE: LOGIN
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable policyd:
diff --git a/mail/postgrey/files/postgrey.sh b/mail/postgrey/files/postgrey.sh
index 63f47a2b08e6..64f45981a2c2 100644
--- a/mail/postgrey/files/postgrey.sh
+++ b/mail/postgrey/files/postgrey.sh
@@ -5,7 +5,7 @@
 # PROVIDE: postgrey
 # REQUIRE: LOGIN
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable postgrey:
diff --git a/mail/smtptrapd/files/smtptrapd.sh.in b/mail/smtptrapd/files/smtptrapd.sh.in
index 44b2f6dec8e4..aec93ad194d9 100644
--- a/mail/smtptrapd/files/smtptrapd.sh.in
+++ b/mail/smtptrapd/files/smtptrapd.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: smtptrapd
 # REQUIRE: LOGIN
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable smtptrapd:
diff --git a/mail/spamass-milter/files/spamass-milter.sh b/mail/spamass-milter/files/spamass-milter.sh
index a54c36f0aac2..1a066afecef5 100644
--- a/mail/spamass-milter/files/spamass-milter.sh
+++ b/mail/spamass-milter/files/spamass-milter.sh
@@ -6,7 +6,7 @@
 # PROVIDE: spamass-milter
 # REQUIRE: LOGIN
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable spamass-milter:
diff --git a/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh.in b/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh.in
index 70e4eb44e36a..d92c785f5e5f 100644
--- a/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh.in
+++ b/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh.in
@@ -4,7 +4,7 @@
 
 # PROVIDE: sqwebmaild
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these sqwebmaild_* variables in one of these files:
 # 	/etc/rc.conf
diff --git a/mail/synonym/files/synonym.sh.in b/mail/synonym/files/synonym.sh.in
index 8e05007f094b..7c62d7f56ec3 100644
--- a/mail/synonym/files/synonym.sh.in
+++ b/mail/synonym/files/synonym.sh.in
@@ -5,7 +5,7 @@
 # PROVIDE: synonym
 # REQUIRE: DAEMON
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Define these synonym_* variables in one of these files:
 #       /etc/rc.conf
diff --git a/mail/tpop3d/files/tpop3d.sh.in b/mail/tpop3d/files/tpop3d.sh.in
index b20241c0d0b9..4e32ad9502f2 100644
--- a/mail/tpop3d/files/tpop3d.sh.in
+++ b/mail/tpop3d/files/tpop3d.sh.in
@@ -3,7 +3,6 @@
 
 # PROVIDE: tpop3d
 # BEFORE:  LOGIN
-# KEYWORD: FreeBSD
 
 #
 # Add the following line to /etc/rc.conf to enable tpop3d:
diff --git a/mail/up-imapproxy/files/imapproxyd.sh.in b/mail/up-imapproxy/files/imapproxyd.sh.in
index 82aac33ffc04..2938c658f7df 100644
--- a/mail/up-imapproxy/files/imapproxyd.sh.in
+++ b/mail/up-imapproxy/files/imapproxyd.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: imapproxyd
 # REQUIRE: LOGIN
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable imapproxyd:
diff --git a/misc/dnetc/files/dnetc.sh.in b/misc/dnetc/files/dnetc.sh.in
index cc3e4faf498c..32e0d2a2ea59 100644
--- a/misc/dnetc/files/dnetc.sh.in
+++ b/misc/dnetc/files/dnetc.sh.in
@@ -4,7 +4,7 @@
 #
 # PROVIDE: dnetc
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable dnetc:
diff --git a/misc/proxyper/files/proxyper.sh b/misc/proxyper/files/proxyper.sh
index c4121906006f..5ef19aab648a 100644
--- a/misc/proxyper/files/proxyper.sh
+++ b/misc/proxyper/files/proxyper.sh
@@ -4,7 +4,7 @@
 #
 # PROVIDE: proxyper
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 proxyper_enable=${proxyper_enable:-"NO"}
 
diff --git a/misc/upclient/files/upclient.sh b/misc/upclient/files/upclient.sh
index 6891c0c3667c..07de990f6193 100644
--- a/misc/upclient/files/upclient.sh
+++ b/misc/upclient/files/upclient.sh
@@ -4,7 +4,6 @@
 #
 # PROVIDE: upclient
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable upclient:
 #
diff --git a/multimedia/ffmpeg-devel/files/ffserver.sh b/multimedia/ffmpeg-devel/files/ffserver.sh
index d0b554ee10fb..47dd0a750802 100644
--- a/multimedia/ffmpeg-devel/files/ffserver.sh
+++ b/multimedia/ffmpeg-devel/files/ffserver.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/multimedia/ffmpeg-devel/files/Attic/ffserver.sh,v 1.2 2006-01-07 06:29:52 dougb Exp $
+# $FreeBSD: /tmp/pcvs/ports/multimedia/ffmpeg-devel/files/Attic/ffserver.sh,v 1.3 2006-02-20 20:47:18 dougb Exp $
 #
 
 # PROVIDE: ffserver
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable  ffserver:
diff --git a/multimedia/ffmpeg/files/ffserver.sh b/multimedia/ffmpeg/files/ffserver.sh
index 8ce57d4c8106..8313b678a546 100644
--- a/multimedia/ffmpeg/files/ffserver.sh
+++ b/multimedia/ffmpeg/files/ffserver.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/multimedia/ffmpeg/files/Attic/ffserver.sh,v 1.2 2006-01-07 06:29:51 dougb Exp $
+# $FreeBSD: /tmp/pcvs/ports/multimedia/ffmpeg/files/Attic/ffserver.sh,v 1.3 2006-02-20 20:47:17 dougb Exp $
 #
 
 # PROVIDE: ffserver
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable  ffserver:
diff --git a/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in b/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in
index a7ad4d531cd8..335d71fb2ca7 100644
--- a/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in
+++ b/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in
@@ -5,7 +5,7 @@
 # PROVIDE: jabber_pyicq
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Define these jabber_pyicq_* variables in one of these files:
 #       /etc/rc.conf
diff --git a/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in b/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in
index cfdd3dcf94dd..1e395925c01f 100644
--- a/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in
+++ b/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in
@@ -5,7 +5,7 @@
 # PROVIDE: jabber_pymsn
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Define these jabber_pymsn_* variables in one of these files:
 #       /etc/rc.conf
diff --git a/net-im/jabber-users-agent/files/jabber-users-agent.sh.in b/net-im/jabber-users-agent/files/jabber-users-agent.sh.in
index cc06be8b2de7..44e2a5673829 100644
--- a/net-im/jabber-users-agent/files/jabber-users-agent.sh.in
+++ b/net-im/jabber-users-agent/files/jabber-users-agent.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: jabber_users_agent
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Define these jabber_users_agent_* variables in one of these files:
 #       /etc/rc.conf
diff --git a/net-im/jabberd/files/jabberd.sh.in b/net-im/jabberd/files/jabberd.sh.in
index 5efc02dbdc8e..ecd5511ec49f 100644
--- a/net-im/jabberd/files/jabberd.sh.in
+++ b/net-im/jabberd/files/jabberd.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: jabberd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 prefix=%%PREFIX%%
 
diff --git a/net-mgmt/arpwatch-devel/files/arpwatch.sh b/net-mgmt/arpwatch-devel/files/arpwatch.sh
index 9017b8c3ca3f..2a7bfb1d06f1 100644
--- a/net-mgmt/arpwatch-devel/files/arpwatch.sh
+++ b/net-mgmt/arpwatch-devel/files/arpwatch.sh
@@ -6,7 +6,7 @@
 # PROVIDE: arpwatch
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable arpwatch:
diff --git a/net-mgmt/arpwatch/files/arpwatch.sh.in b/net-mgmt/arpwatch/files/arpwatch.sh.in
index 260396a571f9..35a7df2e36c1 100644
--- a/net-mgmt/arpwatch/files/arpwatch.sh.in
+++ b/net-mgmt/arpwatch/files/arpwatch.sh.in
@@ -5,7 +5,6 @@
 
 # PROVIDE: arpwatch
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD
 
 # Add the following lines to /etc/rc.conf to enable arpwatch:
 #
diff --git a/net-mgmt/bigsister/files/bigsister.sh b/net-mgmt/bigsister/files/bigsister.sh
index 0efe5b688a49..ef80d9f25dde 100644
--- a/net-mgmt/bigsister/files/bigsister.sh
+++ b/net-mgmt/bigsister/files/bigsister.sh
@@ -6,7 +6,6 @@
 # PROVIDE: bigsister
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: FreeBSD
 
 . %%RC_SUBR%%
 
diff --git a/net-mgmt/mrtg/files/mrtg_daemon.sh.in b/net-mgmt/mrtg/files/mrtg_daemon.sh.in
index 0662c0286ff5..1f75d573801b 100644
--- a/net-mgmt/mrtg/files/mrtg_daemon.sh.in
+++ b/net-mgmt/mrtg/files/mrtg_daemon.sh.in
@@ -5,7 +5,6 @@
 #
 # PROVIDE: mrtg_daemon
 # REQUIRE: DAEMON bsnmpd snmpd
-# KEYWORD: FreeBSD
 
 .  %%RC_SUBR%%
 
diff --git a/net-mgmt/net-snmp-devel/files/snmpd.sh.sample b/net-mgmt/net-snmp-devel/files/snmpd.sh.sample
index 6e089e397b40..062017469936 100644
--- a/net-mgmt/net-snmp-devel/files/snmpd.sh.sample
+++ b/net-mgmt/net-snmp-devel/files/snmpd.sh.sample
@@ -4,7 +4,6 @@
 #
 # PROVIDE: snmpd
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable snmpd:
 #
diff --git a/net-mgmt/net-snmp-devel/files/snmptrapd.sh.sample b/net-mgmt/net-snmp-devel/files/snmptrapd.sh.sample
index b3b48c2d79c2..35821ee9e973 100644
--- a/net-mgmt/net-snmp-devel/files/snmptrapd.sh.sample
+++ b/net-mgmt/net-snmp-devel/files/snmptrapd.sh.sample
@@ -4,7 +4,6 @@
 #
 # PROVIDE: snmptrapd
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable snmptrapd:
 #
diff --git a/net-mgmt/net-snmp/files/snmpd.sh.sample b/net-mgmt/net-snmp/files/snmpd.sh.sample
index 6e089e397b40..062017469936 100644
--- a/net-mgmt/net-snmp/files/snmpd.sh.sample
+++ b/net-mgmt/net-snmp/files/snmpd.sh.sample
@@ -4,7 +4,6 @@
 #
 # PROVIDE: snmpd
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable snmpd:
 #
diff --git a/net-mgmt/net-snmp/files/snmptrapd.sh.sample b/net-mgmt/net-snmp/files/snmptrapd.sh.sample
index b3b48c2d79c2..35821ee9e973 100644
--- a/net-mgmt/net-snmp/files/snmptrapd.sh.sample
+++ b/net-mgmt/net-snmp/files/snmptrapd.sh.sample
@@ -4,7 +4,6 @@
 #
 # PROVIDE: snmptrapd
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable snmptrapd:
 #
diff --git a/net-mgmt/net-snmp53/files/snmpd.sh.sample b/net-mgmt/net-snmp53/files/snmpd.sh.sample
index 6e089e397b40..062017469936 100644
--- a/net-mgmt/net-snmp53/files/snmpd.sh.sample
+++ b/net-mgmt/net-snmp53/files/snmpd.sh.sample
@@ -4,7 +4,6 @@
 #
 # PROVIDE: snmpd
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable snmpd:
 #
diff --git a/net-mgmt/net-snmp53/files/snmptrapd.sh.sample b/net-mgmt/net-snmp53/files/snmptrapd.sh.sample
index b3b48c2d79c2..35821ee9e973 100644
--- a/net-mgmt/net-snmp53/files/snmptrapd.sh.sample
+++ b/net-mgmt/net-snmp53/files/snmptrapd.sh.sample
@@ -4,7 +4,6 @@
 #
 # PROVIDE: snmptrapd
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable snmptrapd:
 #
diff --git a/net-mgmt/netustad/files/netustad.sh b/net-mgmt/netustad/files/netustad.sh
index 6e48bb0b3580..083dd8c289ae 100644
--- a/net-mgmt/netustad/files/netustad.sh
+++ b/net-mgmt/netustad/files/netustad.sh
@@ -5,7 +5,6 @@
 # PROVIDE: netustad
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Note:
 # If you are running an rcNG-System (i.e. FreeBSD 5 and later or after
diff --git a/net-mgmt/nrpe2/files/nrpe2.sh.in b/net-mgmt/nrpe2/files/nrpe2.sh.in
index 4fc22dd761a4..3d8757e9d6ea 100644
--- a/net-mgmt/nrpe2/files/nrpe2.sh.in
+++ b/net-mgmt/nrpe2/files/nrpe2.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: nrpe2
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable nrpe2:
diff --git a/net-mgmt/openvmps/files/vmpsd.sh b/net-mgmt/openvmps/files/vmpsd.sh
index 58fd33e646fe..131bcd845d28 100644
--- a/net-mgmt/openvmps/files/vmpsd.sh
+++ b/net-mgmt/openvmps/files/vmpsd.sh
@@ -5,7 +5,7 @@
 
 # PROVIDE: vmpsd
 # REQUIRE: DAEMON
-# 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-mgmt/rotorouter/files/rotorouter.sh b/net-mgmt/rotorouter/files/rotorouter.sh
index cca14be45b02..f28e61b5227e 100644
--- a/net-mgmt/rotorouter/files/rotorouter.sh
+++ b/net-mgmt/rotorouter/files/rotorouter.sh
@@ -6,7 +6,7 @@
 # PROVIDE: rotorouter
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable rotorouter:
 #
diff --git a/net-mgmt/snmptt/files/snmptt.sh.in b/net-mgmt/snmptt/files/snmptt.sh.in
index 9d830af79f2a..45596202bba5 100644
--- a/net-mgmt/snmptt/files/snmptt.sh.in
+++ b/net-mgmt/snmptt/files/snmptt.sh.in
@@ -5,7 +5,6 @@
 
 # PROVIDE: snmptt
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD
 
 #
 # Add the following lines to /etc/rc.conf to enable snmptt:
diff --git a/net-mgmt/trafd/files/trafd.sh.sample b/net-mgmt/trafd/files/trafd.sh.sample
index daf53e8c4b1b..4fb078c4798b 100644
--- a/net-mgmt/trafd/files/trafd.sh.sample
+++ b/net-mgmt/trafd/files/trafd.sh.sample
@@ -3,7 +3,7 @@
 
 # PROVIDE: trafd
 # REQUIRE: netif routing
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable trafd:
diff --git a/net-p2p/amule-devel/files/amuled.sh b/net-p2p/amule-devel/files/amuled.sh
index 7ebdbadaff68..8e4d5d366974 100644
--- a/net-p2p/amule-devel/files/amuled.sh
+++ b/net-p2p/amule-devel/files/amuled.sh
@@ -8,7 +8,7 @@
 # PROVIDE: amuled
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable amuled at startup
diff --git a/net-p2p/amule/files/amuled.sh b/net-p2p/amule/files/amuled.sh
index 7ebdbadaff68..8e4d5d366974 100644
--- a/net-p2p/amule/files/amuled.sh
+++ b/net-p2p/amule/files/amuled.sh
@@ -8,7 +8,7 @@
 # PROVIDE: amuled
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable amuled at startup
diff --git a/net-p2p/amule2/files/amuled.sh b/net-p2p/amule2/files/amuled.sh
index 7ebdbadaff68..8e4d5d366974 100644
--- a/net-p2p/amule2/files/amuled.sh
+++ b/net-p2p/amule2/files/amuled.sh
@@ -8,7 +8,7 @@
 # PROVIDE: amuled
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable amuled at startup
diff --git a/net-p2p/bnbt/files/bnbt.sh.in b/net-p2p/bnbt/files/bnbt.sh.in
index d9f67bb8fee6..250c9202fdcd 100644
--- a/net-p2p/bnbt/files/bnbt.sh.in
+++ b/net-p2p/bnbt/files/bnbt.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: bnbt
 # REQUIRE: LOGIN abi
 # BEFORE:  securelevel
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable `bnbt':
 #
diff --git a/net-p2p/freenet/files/freenet.sh b/net-p2p/freenet/files/freenet.sh
index cb2c1759a047..f77a13c15784 100644
--- a/net-p2p/freenet/files/freenet.sh
+++ b/net-p2p/freenet/files/freenet.sh
@@ -6,7 +6,7 @@
 
 # PROVIDE: freenet
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable freenet:
diff --git a/net-p2p/freenet05/files/freenet.sh b/net-p2p/freenet05/files/freenet.sh
index cb2c1759a047..f77a13c15784 100644
--- a/net-p2p/freenet05/files/freenet.sh
+++ b/net-p2p/freenet05/files/freenet.sh
@@ -6,7 +6,7 @@
 
 # PROVIDE: freenet
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable freenet:
diff --git a/net-p2p/gift/files/giftd.sh b/net-p2p/gift/files/giftd.sh
index 5ea729548548..f83a7a7dede8 100644
--- a/net-p2p/gift/files/giftd.sh
+++ b/net-p2p/gift/files/giftd.sh
@@ -5,7 +5,7 @@
 
 # PROVIDE: giftd
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these giftd_* variables in one of these files:
 #       /etc/rc.conf
diff --git a/net-p2p/i2p/files/i2p.sh.in b/net-p2p/i2p/files/i2p.sh.in
index 25f8927faef0..e3fd12fcbe2b 100644
--- a/net-p2p/i2p/files/i2p.sh.in
+++ b/net-p2p/i2p/files/i2p.sh.in
@@ -6,7 +6,7 @@
 
 # PROVIDE: i2p
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable i2p:
diff --git a/net-p2p/mldonkey-devel/files/mlnet.in b/net-p2p/mldonkey-devel/files/mlnet.in
index f03ef1e46de3..ad55c9c7b347 100644
--- a/net-p2p/mldonkey-devel/files/mlnet.in
+++ b/net-p2p/mldonkey-devel/files/mlnet.in
@@ -6,7 +6,7 @@
 
 # PROVIDE: mlnet
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable mlnet:
diff --git a/net-p2p/mldonkey-devel/files/mlnet.sh b/net-p2p/mldonkey-devel/files/mlnet.sh
index f03ef1e46de3..ad55c9c7b347 100644
--- a/net-p2p/mldonkey-devel/files/mlnet.sh
+++ b/net-p2p/mldonkey-devel/files/mlnet.sh
@@ -6,7 +6,7 @@
 
 # PROVIDE: mlnet
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable mlnet:
diff --git a/net-p2p/mldonkey/files/mlnet.sh b/net-p2p/mldonkey/files/mlnet.sh
index 6860d810a5e5..fa85964de09f 100644
--- a/net-p2p/mldonkey/files/mlnet.sh
+++ b/net-p2p/mldonkey/files/mlnet.sh
@@ -3,7 +3,7 @@
 
 # PROVIDE: mlnet
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 mlnet_enable=${mlnet_enable:-"NO"}
 mlnet_http_port=${mlnet_http_port:-"4080"}
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%%
 
diff --git a/news/newscache/files/newscache.sh.in b/news/newscache/files/newscache.sh.in
index 46b4167bad41..f41d8c8f746d 100644
--- a/news/newscache/files/newscache.sh.in
+++ b/news/newscache/files/newscache.sh.in
@@ -4,7 +4,6 @@
 #
 # PROVIDE: newscache
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable newscache:
 #
diff --git a/print/pips800/files/ekpd.sh b/print/pips800/files/ekpd.sh
index 6c7b25186701..0d5a0cf7ff81 100644
--- a/print/pips800/files/ekpd.sh
+++ b/print/pips800/files/ekpd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: ekpd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these ekpd_* variables in one of these files:
 #	/etc/rc.conf
diff --git a/print/pips800/files/pips.sh b/print/pips800/files/pips.sh
index 81e79446bf70..7b845a878cb4 100644
--- a/print/pips800/files/pips.sh
+++ b/print/pips800/files/pips.sh
@@ -6,7 +6,7 @@
 # PROVIDE: pips
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these pips_* variables in one of these files:
 #	/etc/rc.conf
diff --git a/security/amavisd-milter/files/amavisd-milter.sh.in b/security/amavisd-milter/files/amavisd-milter.sh.in
index 9888f2e165ed..fc36e9d28a21 100644
--- a/security/amavisd-milter/files/amavisd-milter.sh.in
+++ b/security/amavisd-milter/files/amavisd-milter.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: amavisd-milter
 # REQUIRE: amavisd
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable amavisd-milter:
diff --git a/security/amavisd-new/files/amavis-milter.sh.in b/security/amavisd-new/files/amavis-milter.sh.in
index 180d515b2d9a..7bd5a095e838 100644
--- a/security/amavisd-new/files/amavis-milter.sh.in
+++ b/security/amavisd-new/files/amavis-milter.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: amavis_milter
 # REQUIRE: amavisd
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable amavis-milter:
diff --git a/security/amavisd-new/files/amavisd.sh.in b/security/amavisd-new/files/amavisd.sh.in
index b8c527bbe961..e27dfc84497a 100644
--- a/security/amavisd-new/files/amavisd.sh.in
+++ b/security/amavisd-new/files/amavisd.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: amavisd
 # REQUIRE: LOGIN
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable amavisd:
diff --git a/security/amavisd/files/amavisd-milter.sh b/security/amavisd/files/amavisd-milter.sh
index 2713faf0fd97..b82ced27f4e3 100644
--- a/security/amavisd/files/amavisd-milter.sh
+++ b/security/amavisd/files/amavisd-milter.sh
@@ -5,7 +5,7 @@
 
 # PROVIDE: amavisd-milter
 # BEFORE: amavisd mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 prefix=%%PREFIX%%
 
diff --git a/security/amavisd/files/amavisd.sh b/security/amavisd/files/amavisd.sh
index e45a10e6f63c..3f319a334784 100644
--- a/security/amavisd/files/amavisd.sh
+++ b/security/amavisd/files/amavisd.sh
@@ -5,7 +5,7 @@
  
 # PROVIDE: amavisd
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 prefix=%%PREFIX%%
 
diff --git a/security/barnyard/files/barnyard.sh.in b/security/barnyard/files/barnyard.sh.in
index 0f295bea90e9..b563b7fd7687 100644
--- a/security/barnyard/files/barnyard.sh.in
+++ b/security/barnyard/files/barnyard.sh.in
@@ -4,7 +4,7 @@
 # PROVIDE: barnyard
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable barnyard:
 # barnyard_enable (bool):	Set to YES to enable barnyard
diff --git a/security/clamav-devel/files/clamav-clamd.sh b/security/clamav-devel/files/clamav-clamd.sh
index c9019a8e3ac9..6164dfaf5176 100644
--- a/security/clamav-devel/files/clamav-clamd.sh
+++ b/security/clamav-devel/files/clamav-clamd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: clamd
 # REQUIRE: LOGIN
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable clamd:
diff --git a/security/clamav-devel/files/clamav-freshclam.sh b/security/clamav-devel/files/clamav-freshclam.sh
index 519f93a5a1c3..003bab98112a 100644
--- a/security/clamav-devel/files/clamav-freshclam.sh
+++ b/security/clamav-devel/files/clamav-freshclam.sh
@@ -6,7 +6,7 @@
 # PROVIDE: freshclam
 # REQUIRE: LOGIN clamd
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable the freshclam daemon:
diff --git a/security/clamav-devel/files/clamav-milter.sh b/security/clamav-devel/files/clamav-milter.sh
index 7a2e874d5d97..9118b50ee781 100644
--- a/security/clamav-devel/files/clamav-milter.sh
+++ b/security/clamav-devel/files/clamav-milter.sh
@@ -6,7 +6,7 @@
 # PROVIDE: clamav-milter
 # REQUIRE: LOGIN clamd
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable clamav-milter:
diff --git a/security/clamav/files/clamav-clamd.sh.in b/security/clamav/files/clamav-clamd.sh.in
index 3518358332c7..13ea88a2f213 100644
--- a/security/clamav/files/clamav-clamd.sh.in
+++ b/security/clamav/files/clamav-clamd.sh.in
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/Attic/clamav-clamd.sh.in,v 1.1 2005-05-13 08:16:40 jylefort Exp $
+# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/Attic/clamav-clamd.sh.in,v 1.2 2006-02-20 20:47:37 dougb Exp $
 #
 
 # PROVIDE: clamd
 # REQUIRE: LOGIN
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable clamd:
diff --git a/security/clamav/files/clamav-freshclam.sh.in b/security/clamav/files/clamav-freshclam.sh.in
index 89a2c4f63b5b..c85cf1305d1d 100644
--- a/security/clamav/files/clamav-freshclam.sh.in
+++ b/security/clamav/files/clamav-freshclam.sh.in
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/Attic/clamav-freshclam.sh.in,v 1.1 2005-05-13 08:16:40 jylefort Exp $
+# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/Attic/clamav-freshclam.sh.in,v 1.2 2006-02-20 20:47:37 dougb Exp $
 #
 
 # PROVIDE: freshclam
 # REQUIRE: LOGIN clamd
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable the freshclam daemon:
diff --git a/security/clamav/files/clamav-milter.sh.in b/security/clamav/files/clamav-milter.sh.in
index e4a9dd1f3688..fb2ec3524f1e 100644
--- a/security/clamav/files/clamav-milter.sh.in
+++ b/security/clamav/files/clamav-milter.sh.in
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/Attic/clamav-milter.sh.in,v 1.2 2005-07-27 17:22:05 sem Exp $
+# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/Attic/clamav-milter.sh.in,v 1.3 2006-02-20 20:47:37 dougb Exp $
 #
 
 # PROVIDE: clamav-milter
 # REQUIRE: LOGIN clamd
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable clamav-milter:
diff --git a/security/clamsmtp/files/clamsmtpd.sh.in b/security/clamsmtp/files/clamsmtpd.sh.in
index 05080f5f4f46..1740c58c17e9 100644
--- a/security/clamsmtp/files/clamsmtpd.sh.in
+++ b/security/clamsmtp/files/clamsmtpd.sh.in
@@ -4,7 +4,6 @@
 #
 # PROVIDE: clamsmtpd
 # REQUIRE: DAEMON %%CLAMD%%
-# KEYWORD: FreeBSD
 #
 # Add the fellowing line to /etc/rc.conf.local or /etc/rc.conf
 # to enable clamsmtpd:
diff --git a/security/courier-authlib/files/courier-authdaemond.sh.in b/security/courier-authlib/files/courier-authdaemond.sh.in
index 3fe0d42bc13d..dad4bc31e732 100644
--- a/security/courier-authlib/files/courier-authdaemond.sh.in
+++ b/security/courier-authlib/files/courier-authdaemond.sh.in
@@ -5,7 +5,7 @@
 # PROVIDE: courier_authdaemond
 # REQUIRE: DAEMON mysql ldconfig
 # BEFORE: mail imap
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 prefix="%%PREFIX%%"
 exec_prefix="${prefix}"
diff --git a/security/cyrus-sasl/files/cyrus_sasl1 b/security/cyrus-sasl/files/cyrus_sasl1
index f467b7f79380..fd56e3c0dd40 100644
--- a/security/cyrus-sasl/files/cyrus_sasl1
+++ b/security/cyrus-sasl/files/cyrus_sasl1
@@ -5,7 +5,6 @@
 
 # PROVIDE: sasl1
 # REQUIRE: DAEMON %%MYSQL_REQ%%
-# KEYWORD: FreeBSD
 #
 # NOTE for FreeBSD 5.0+:
 # If you want this script to start with the base rc scripts copy
diff --git a/security/cyrus-sasl/files/pwcheck.sh b/security/cyrus-sasl/files/pwcheck.sh
index c6e61b203ede..b43abbb8257c 100644
--- a/security/cyrus-sasl/files/pwcheck.sh
+++ b/security/cyrus-sasl/files/pwcheck.sh
@@ -6,7 +6,7 @@
 # PROVIDE: cyrus_pwcheck
 # REQUIRE: DAEMON
 # BEFORE: mail imap
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 
 prefix=%%PREFIX%%
diff --git a/security/cyrus-sasl/files/saslauthd.sh b/security/cyrus-sasl/files/saslauthd.sh
index dcdfe97a5202..1f27c8c1896f 100644
--- a/security/cyrus-sasl/files/saslauthd.sh
+++ b/security/cyrus-sasl/files/saslauthd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: saslauthd1
 # REQUIRE: DAEMON
 # BEFORE: mail imap
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 
 prefix=%%PREFIX%%
diff --git a/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in b/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in
index bee9231b2b78..56170d27d1eb 100644
--- a/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in
+++ b/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: saslauthd
 # REQUIRE: DAEMON
 # BEFORE: mail imap
-# 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/security/distcache-devel/files/dc_server.sh.in b/security/distcache-devel/files/dc_server.sh.in
index 84a871550ea0..386685537931 100644
--- a/security/distcache-devel/files/dc_server.sh.in
+++ b/security/distcache-devel/files/dc_server.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/security/distcache/files/dc_server.sh.in b/security/distcache/files/dc_server.sh.in
index 84a871550ea0..386685537931 100644
--- a/security/distcache/files/dc_server.sh.in
+++ b/security/distcache/files/dc_server.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/security/doorman/files/doorman.sh.in b/security/doorman/files/doorman.sh.in
index 883c83f5779f..6e5b792327c3 100644
--- a/security/doorman/files/doorman.sh.in
+++ b/security/doorman/files/doorman.sh.in
@@ -3,7 +3,6 @@
 
 # PROVIDE: doorman
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD
 
 #
 # Add the following lines to /etc/rc.conf to enable doorman:
diff --git a/security/ipsec-tools/files/racoon.sh.in b/security/ipsec-tools/files/racoon.sh.in
index 3d5722482ebe..c97d1bb1521a 100644
--- a/security/ipsec-tools/files/racoon.sh.in
+++ b/security/ipsec-tools/files/racoon.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: racoon
 # 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/security/nessus-devel/files/nessusd.sh b/security/nessus-devel/files/nessusd.sh
index b72c4f15e78c..f5785a6405cd 100644
--- a/security/nessus-devel/files/nessusd.sh
+++ b/security/nessus-devel/files/nessusd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: nessusd
 # 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/security/nessus/files/nessusd.sh b/security/nessus/files/nessusd.sh
index b72c4f15e78c..f5785a6405cd 100644
--- a/security/nessus/files/nessusd.sh
+++ b/security/nessus/files/nessusd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: nessusd
 # 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/security/oidentd/files/oidentd.sh b/security/oidentd/files/oidentd.sh
index 2f460be51b84..493fea51fb31 100644
--- a/security/oidentd/files/oidentd.sh
+++ b/security/oidentd/files/oidentd.sh
@@ -5,7 +5,7 @@
 
 # PROVIDE: oidentd
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable dovecot:
diff --git a/security/openvpn-devel/files/openvpn.sh.in b/security/openvpn-devel/files/openvpn.sh.in
index 1330f7a550f4..b4fc4dbba162 100644
--- a/security/openvpn-devel/files/openvpn.sh.in
+++ b/security/openvpn-devel/files/openvpn.sh.in
@@ -26,7 +26,7 @@
 # PROVIDE: openvpn
 # REQUIRE: DAEMON
 # BEFORE:
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # -----------------------------------------------------------------------------
 #
diff --git a/security/openvpn/files/openvpn.sh.in b/security/openvpn/files/openvpn.sh.in
index 1330f7a550f4..b4fc4dbba162 100644
--- a/security/openvpn/files/openvpn.sh.in
+++ b/security/openvpn/files/openvpn.sh.in
@@ -26,7 +26,7 @@
 # PROVIDE: openvpn
 # REQUIRE: DAEMON
 # BEFORE:
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # -----------------------------------------------------------------------------
 #
diff --git a/security/openvpn20/files/openvpn.sh.in b/security/openvpn20/files/openvpn.sh.in
index 1330f7a550f4..b4fc4dbba162 100644
--- a/security/openvpn20/files/openvpn.sh.in
+++ b/security/openvpn20/files/openvpn.sh.in
@@ -26,7 +26,7 @@
 # PROVIDE: openvpn
 # REQUIRE: DAEMON
 # BEFORE:
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # -----------------------------------------------------------------------------
 #
diff --git a/security/sancp/files/sancp.sh.in b/security/sancp/files/sancp.sh.in
index f8be90c0e112..3ee718aec6e4 100644
--- a/security/sancp/files/sancp.sh.in
+++ b/security/sancp/files/sancp.sh.in
@@ -4,7 +4,7 @@
 # PROVIDE: sancp
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable sancp:
 # sancp_enable (bool):	Set to YES to enable sancp
diff --git a/security/scanlogd/files/scanlogd.sh b/security/scanlogd/files/scanlogd.sh
index 563637ba3f84..ef14beba888b 100644
--- a/security/scanlogd/files/scanlogd.sh
+++ b/security/scanlogd/files/scanlogd.sh
@@ -6,7 +6,7 @@
 # PROVIDE: scanlogd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 
 prefix=%%PREFIX%%
diff --git a/security/snort_inline/files/snort.sh.in b/security/snort_inline/files/snort.sh.in
index f4611981fe3e..1b8b172cdfd7 100644
--- a/security/snort_inline/files/snort.sh.in
+++ b/security/snort_inline/files/snort.sh.in
@@ -4,7 +4,7 @@
 # PROVIDE: snort
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable snort:
 # snort_enable (bool):		Set to YES to enable snort
diff --git a/security/vpnd/files/vpnd.sh b/security/vpnd/files/vpnd.sh
index 9ec0fa7f8b83..e2309afe468b 100644
--- a/security/vpnd/files/vpnd.sh
+++ b/security/vpnd/files/vpnd.sh
@@ -3,7 +3,7 @@
 # PROVIDE: vpnd
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 # 
 # Note:
 # Set "vpnd_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or
diff --git a/security/xinetd/files/xinetd.sh.tmpl b/security/xinetd/files/xinetd.sh.tmpl
index 1a61c4111a28..45aa60dc7a93 100644
--- a/security/xinetd/files/xinetd.sh.tmpl
+++ b/security/xinetd/files/xinetd.sh.tmpl
@@ -4,7 +4,6 @@
 #
 # PROVIDE: snmpd
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable xinetd:
 #
diff --git a/sysutils/3dm/files/3dm2.sh.in b/sysutils/3dm/files/3dm2.sh.in
index b0f9f0e72a2a..722d5b175fca 100644
--- a/sysutils/3dm/files/3dm2.sh.in
+++ b/sysutils/3dm/files/3dm2.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: 3dm2
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable 3dm2:
diff --git a/sysutils/be_agent/files/be-agent.sh.in b/sysutils/be_agent/files/be-agent.sh.in
index 85739b1b324a..3003debe2474 100644
--- a/sysutils/be_agent/files/be-agent.sh.in
+++ b/sysutils/be_agent/files/be-agent.sh.in
@@ -3,7 +3,7 @@
 # PROVIDE: be-agent
 # REQUIRE: LOGIN
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable be-agent:
diff --git a/sysutils/boxbackup-devel/files/bbackupd.sh.in b/sysutils/boxbackup-devel/files/bbackupd.sh.in
index 915903437ac3..7bca5de79161 100644
--- a/sysutils/boxbackup-devel/files/bbackupd.sh.in
+++ b/sysutils/boxbackup-devel/files/bbackupd.sh.in
@@ -4,7 +4,7 @@
 #
 # PROVIDE: bbackupd
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable bbackupd:
diff --git a/sysutils/boxbackup-devel/files/bbstored.sh.in b/sysutils/boxbackup-devel/files/bbstored.sh.in
index 396344dc7f6e..49be98fb2870 100644
--- a/sysutils/boxbackup-devel/files/bbstored.sh.in
+++ b/sysutils/boxbackup-devel/files/bbstored.sh.in
@@ -4,7 +4,7 @@
 #
 # PROVIDE: bbstored
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable bbstored:
diff --git a/sysutils/boxbackup/files/bbackupd.sh.in b/sysutils/boxbackup/files/bbackupd.sh.in
index 915903437ac3..7bca5de79161 100644
--- a/sysutils/boxbackup/files/bbackupd.sh.in
+++ b/sysutils/boxbackup/files/bbackupd.sh.in
@@ -4,7 +4,7 @@
 #
 # PROVIDE: bbackupd
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable bbackupd:
diff --git a/sysutils/boxbackup/files/bbstored.sh.in b/sysutils/boxbackup/files/bbstored.sh.in
index 396344dc7f6e..49be98fb2870 100644
--- a/sysutils/boxbackup/files/bbstored.sh.in
+++ b/sysutils/boxbackup/files/bbstored.sh.in
@@ -4,7 +4,7 @@
 #
 # PROVIDE: bbstored
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable bbstored:
diff --git a/sysutils/daedalus/files/daedalus.sh b/sysutils/daedalus/files/daedalus.sh
index 96f02feea43e..4b3ac5b00a17 100644
--- a/sysutils/daedalus/files/daedalus.sh
+++ b/sysutils/daedalus/files/daedalus.sh
@@ -2,7 +2,6 @@
 #
 # PROVIDE: daedalus
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable daedalus:
 # daedalus_enable (bool):      Set to "NO" by default.
diff --git a/sysutils/daemontools/files/svscan.sh.sample b/sysutils/daemontools/files/svscan.sh.sample
index aafe643d7546..87ca26a5e9e3 100644
--- a/sysutils/daemontools/files/svscan.sh.sample
+++ b/sysutils/daemontools/files/svscan.sh.sample
@@ -5,7 +5,6 @@
 
 # PROVIDE: svscan
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD
 
 # Define these svscan_* variables in one of these files:
 #       /etc/rc.conf
diff --git a/sysutils/doinkd/files/idled.sh b/sysutils/doinkd/files/idled.sh
index 3021a54fe4ad..7f6a13dfa1c6 100644
--- a/sysutils/doinkd/files/idled.sh
+++ b/sysutils/doinkd/files/idled.sh
@@ -6,7 +6,7 @@
 # PROVIDE: idled
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable idled:
diff --git a/sysutils/est/files/est.sh b/sysutils/est/files/est.sh
index 612170465dd8..9cb494916803 100644
--- a/sysutils/est/files/est.sh
+++ b/sysutils/est/files/est.sh
@@ -6,7 +6,6 @@
 # PROVIDE: est
 # REQUIRE: abi
 # BEFORE: securelevel
-# KEYWORD: FreeBSD
 
 # Define est_* variables in one of these files:
 #	/etc/rc.conf
diff --git a/sysutils/estctrl/files/estctrl.sh b/sysutils/estctrl/files/estctrl.sh
index fb4c13d4e105..b34984b7beb3 100644
--- a/sysutils/estctrl/files/estctrl.sh
+++ b/sysutils/estctrl/files/estctrl.sh
@@ -5,7 +5,6 @@
 
 # PROVIDE: estctrl
 # REQUIRE: est
-# KEYWORD: FreeBSD
 
 # Define estctrl_* variables in one of these files:
 #	/etc/rc.conf
diff --git a/sysutils/fusefs-kmod/files/fuse.sh b/sysutils/fusefs-kmod/files/fuse.sh
index 0668d59f7178..cc94ae04d447 100644
--- a/sysutils/fusefs-kmod/files/fuse.sh
+++ b/sysutils/fusefs-kmod/files/fuse.sh
@@ -3,7 +3,7 @@
 
 # PROVIDE: fusefs
 # REQUIRE: sysctl
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 [ -z "${fusefs_enable}" ]	&& fusefs_enable="NO"
 
diff --git a/sysutils/fvcool/scripts/fvcool.sh b/sysutils/fvcool/scripts/fvcool.sh
index 2181a8187dde..e33398997d47 100644
--- a/sysutils/fvcool/scripts/fvcool.sh
+++ b/sysutils/fvcool/scripts/fvcool.sh
@@ -5,7 +5,7 @@
 # PROVIDE: %%PORTNAME%%
 # REQUIRE: LOGIN abi
 # BEFORE:  securelevel
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable `%%PORTNAME%%':
 #
diff --git a/sysutils/ganglia-monitor-core/files/ganglia.sh.in b/sysutils/ganglia-monitor-core/files/ganglia.sh.in
index bb13de996c9d..f02b30ee376a 100644
--- a/sysutils/ganglia-monitor-core/files/ganglia.sh.in
+++ b/sysutils/ganglia-monitor-core/files/ganglia.sh.in
@@ -3,7 +3,7 @@
 
 # PROVIDE: ganglia
 # REQIORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # XXX: This should really be two seperate scripts with rcorder
 # dependencies, but we can't do that at the moment and gmetad doesn't
diff --git a/sysutils/gkrellm2/files/gkrellmd.sh.in b/sysutils/gkrellm2/files/gkrellmd.sh.in
index 1a826b5b4e8d..0bb39d28a454 100644
--- a/sysutils/gkrellm2/files/gkrellmd.sh.in
+++ b/sysutils/gkrellm2/files/gkrellmd.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: gkrellmd
 # 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/sysutils/idled/files/idled.sh b/sysutils/idled/files/idled.sh
index 3021a54fe4ad..7f6a13dfa1c6 100644
--- a/sysutils/idled/files/idled.sh
+++ b/sysutils/idled/files/idled.sh
@@ -6,7 +6,7 @@
 # PROVIDE: idled
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable idled:
diff --git a/sysutils/lookupd/files/lookupd.sh b/sysutils/lookupd/files/lookupd.sh
index 3fcd580aa8e3..ca2d43a97bbf 100644
--- a/sysutils/lookupd/files/lookupd.sh
+++ b/sysutils/lookupd/files/lookupd.sh
@@ -6,7 +6,6 @@
 # PROVIDE: lookupd
 # REQUIRE: mountcritlocal
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD
 
 #
 # Add the following lines to /etc/rc.conf to enable lookupd:
diff --git a/sysutils/munin-node/files/munin-node.in b/sysutils/munin-node/files/munin-node.in
index b770f4a984ee..6cb7a2b095b7 100644
--- a/sysutils/munin-node/files/munin-node.in
+++ b/sysutils/munin-node/files/munin-node.in
@@ -4,7 +4,6 @@
 # PROVIDE: munin-node
 # REQUIRE: DAEMON
 # BEFORE:  cron
-# KEYWORD: FreeBSD
 
 #
 # Add the following lines to /etc/rc.conf to enable munin-node:
diff --git a/sysutils/munin-node/files/munin-node.sh.in b/sysutils/munin-node/files/munin-node.sh.in
index b770f4a984ee..6cb7a2b095b7 100644
--- a/sysutils/munin-node/files/munin-node.sh.in
+++ b/sysutils/munin-node/files/munin-node.sh.in
@@ -4,7 +4,6 @@
 # PROVIDE: munin-node
 # REQUIRE: DAEMON
 # BEFORE:  cron
-# KEYWORD: FreeBSD
 
 #
 # Add the following lines to /etc/rc.conf to enable munin-node:
diff --git a/sysutils/netdump-server/files/netdump-server.sh.in b/sysutils/netdump-server/files/netdump-server.sh.in
index 82787e8e19c3..a9b6ebf60a50 100644
--- a/sysutils/netdump-server/files/netdump-server.sh.in
+++ b/sysutils/netdump-server/files/netdump-server.sh.in
@@ -4,7 +4,7 @@
 # PROVIDE: netdump_server
 # REQUIRE:
 # BEFORE:
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable mpd:
 #
diff --git a/sysutils/openupsd/files/openupsd.sh b/sysutils/openupsd/files/openupsd.sh
index a203c9f968d4..deb7d677b51b 100644
--- a/sysutils/openupsd/files/openupsd.sh
+++ b/sysutils/openupsd/files/openupsd.sh
@@ -4,7 +4,7 @@
 #
 # PROVIDE: openupsd
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 openupsd_enable=${openupsd_enable:-"NO"}
 
diff --git a/sysutils/powerman/files/patch-scripts-powerman.init b/sysutils/powerman/files/patch-scripts-powerman.init
index 783106699ec5..05b97fe4a5a4 100644
--- a/sysutils/powerman/files/patch-scripts-powerman.init
+++ b/sysutils/powerman/files/patch-scripts-powerman.init
@@ -19,7 +19,7 @@ $FreeBSD$
 +# PROVIDE: powermand
 +# REQUIRE: DAEMON
 +# BEFORE: LOGIN
-+# KEYWORD: FreeBSD shutdown
++# KEYWORD: shutdown
 +
 +# Define these powermand_* variables in one of these files:
 +#	/etc/rc.conf
diff --git a/sysutils/radmind/files/radmind.sh.in b/sysutils/radmind/files/radmind.sh.in
index d3451cefde46..5b0f2a66f4da 100644
--- a/sysutils/radmind/files/radmind.sh.in
+++ b/sysutils/radmind/files/radmind.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: radmind
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable radmind:
diff --git a/sysutils/rsyncmanager/files/rsyncmanager.sh.in b/sysutils/rsyncmanager/files/rsyncmanager.sh.in
index 86c9d5163370..14b302f7fb87 100644
--- a/sysutils/rsyncmanager/files/rsyncmanager.sh.in
+++ b/sysutils/rsyncmanager/files/rsyncmanager.sh.in
@@ -2,7 +2,6 @@
 #
 # PROVIDE: rsyncmanager
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable rsyncmanager:
 # rsyncmanager_enable (bool):      Set to "NO" by default.
diff --git a/sysutils/smartmontools-devel/files/smartd.sh b/sysutils/smartmontools-devel/files/smartd.sh
index 7610b0d6b059..600a0bf2a472 100644
--- a/sysutils/smartmontools-devel/files/smartd.sh
+++ b/sysutils/smartmontools-devel/files/smartd.sh
@@ -4,7 +4,7 @@
 # PROVIDE: smartd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these smartd_* variables in one of these files:
 #	/etc/rc.conf
diff --git a/sysutils/smartmontools/files/smartd.sh b/sysutils/smartmontools/files/smartd.sh
index 7610b0d6b059..600a0bf2a472 100644
--- a/sysutils/smartmontools/files/smartd.sh
+++ b/sysutils/smartmontools/files/smartd.sh
@@ -4,7 +4,7 @@
 # PROVIDE: smartd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these smartd_* variables in one of these files:
 #	/etc/rc.conf
diff --git a/sysutils/symon/files/symon.sh.in b/sysutils/symon/files/symon.sh.in
index be8d4570b870..e77e88ff6753 100644
--- a/sysutils/symon/files/symon.sh.in
+++ b/sysutils/symon/files/symon.sh.in
@@ -3,7 +3,6 @@
 
 # PROVIDE: symon
 # REQUIRE: NETWORKING SERVERS
-# KEYWORD: FreeBSD
 
 . %%RC_SUBR%%
 
diff --git a/sysutils/symon/files/symux.sh.in b/sysutils/symon/files/symux.sh.in
index 39778dd58595..309dc8875d45 100644
--- a/sysutils/symon/files/symux.sh.in
+++ b/sysutils/symon/files/symux.sh.in
@@ -3,7 +3,6 @@
 
 # PROVIDE: symux
 # REQUIRE: NETWORKING SERVERS
-# KEYWORD: FreeBSD
 
 . %%RC_SUBR%%
 
diff --git a/sysutils/tenshi/files/tenshi.sh b/sysutils/tenshi/files/tenshi.sh
index 5e3a6a882d5a..bb10718d3c94 100644
--- a/sysutils/tenshi/files/tenshi.sh
+++ b/sysutils/tenshi/files/tenshi.sh
@@ -5,7 +5,7 @@
 
 # PROVIDE: tenshi
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable `tenshi':
 #
diff --git a/sysutils/uptimec/files/uptimec.sh.in b/sysutils/uptimec/files/uptimec.sh.in
index 82a1b92a135b..ec44abbfda5e 100644
--- a/sysutils/uptimec/files/uptimec.sh.in
+++ b/sysutils/uptimec/files/uptimec.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: uptimec
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Uptimec is enabled by default, if you have configuration file
 #
diff --git a/sysutils/usermin/files/usermin.sh.in b/sysutils/usermin/files/usermin.sh.in
index fa0f5cdfc686..3444c57a33b8 100644
--- a/sysutils/usermin/files/usermin.sh.in
+++ b/sysutils/usermin/files/usermin.sh.in
@@ -4,7 +4,6 @@
 #
 # PROVIDE: usermin
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable usermin:
 #
diff --git a/sysutils/usermin/files/usermin.sh.sample b/sysutils/usermin/files/usermin.sh.sample
index af9e7fe2f72f..6df5ea7d4bf7 100644
--- a/sysutils/usermin/files/usermin.sh.sample
+++ b/sysutils/usermin/files/usermin.sh.sample
@@ -4,7 +4,6 @@
 #
 # PROVIDE: usermin
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable usermin:
 #
diff --git a/sysutils/webmin/files/webmin.sh.in b/sysutils/webmin/files/webmin.sh.in
index 7f398fb34cd4..ceee0a155169 100644
--- a/sysutils/webmin/files/webmin.sh.in
+++ b/sysutils/webmin/files/webmin.sh.in
@@ -4,7 +4,6 @@
 #
 # PROVIDE: webmin
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable webmin:
 #
diff --git a/textproc/iiimf-server/files/iiimd.sh.in b/textproc/iiimf-server/files/iiimd.sh.in
index e34b5f2a7ffd..9f631bff35c1 100644
--- a/textproc/iiimf-server/files/iiimd.sh.in
+++ b/textproc/iiimf-server/files/iiimd.sh.in
@@ -4,7 +4,7 @@
 
 # PROVIDE: iiimd
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 prefix=%%PREFIX%%
 
diff --git a/www/amphetadesk/files/amphetadesk.in b/www/amphetadesk/files/amphetadesk.in
index 330554953316..f01468475c21 100644
--- a/www/amphetadesk/files/amphetadesk.in
+++ b/www/amphetadesk/files/amphetadesk.in
@@ -6,7 +6,7 @@
 
 # PROVIDE: amphetadesk
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable amphetadesk:
diff --git a/www/amphetadesk/files/amphetadesk.sh b/www/amphetadesk/files/amphetadesk.sh
index 330554953316..f01468475c21 100644
--- a/www/amphetadesk/files/amphetadesk.sh
+++ b/www/amphetadesk/files/amphetadesk.sh
@@ -6,7 +6,7 @@
 
 # PROVIDE: amphetadesk
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable amphetadesk:
diff --git a/www/aolserver/files/aolserver.sh.in b/www/aolserver/files/aolserver.sh.in
index 2ba9e5e58d3a..09363bab12dd 100644
--- a/www/aolserver/files/aolserver.sh.in
+++ b/www/aolserver/files/aolserver.sh.in
@@ -3,7 +3,6 @@
 #
 # PROVIDE: aolserver
 # REQUIRE: DAEMON NETWORKING SERVERS
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable aolserver:
 #
diff --git a/www/apache13+ipv6/files/apache.sh b/www/apache13+ipv6/files/apache.sh
index 5b612e5aa804..304192b651c2 100644
--- a/www/apache13+ipv6/files/apache.sh
+++ b/www/apache13+ipv6/files/apache.sh
@@ -4,7 +4,7 @@
 # PROVIDE: apache
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these apache_* variables in one of these files:
 #       /etc/rc.conf
diff --git a/www/apache13-modperl/files/apache.sh b/www/apache13-modperl/files/apache.sh
index 2491e0514d97..f98638ebbff0 100644
--- a/www/apache13-modperl/files/apache.sh
+++ b/www/apache13-modperl/files/apache.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/www/apache13-modperl/files/Attic/apache.sh,v 1.2 2006-01-07 06:29:56 dougb Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/apache13-modperl/files/Attic/apache.sh,v 1.3 2006-02-20 20:47:46 dougb Exp $
 
 # PROVIDE: apache
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these apache_* variables in one of these files:
 #       /etc/rc.conf
diff --git a/www/apache13-modssl/files/rcng.sh b/www/apache13-modssl/files/rcng.sh
index 237365f1978c..d2c028147a7f 100644
--- a/www/apache13-modssl/files/rcng.sh
+++ b/www/apache13-modssl/files/rcng.sh
@@ -4,7 +4,7 @@
 # PROVIDE: apache
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these apache_* variables in one of these files:
 #       /etc/rc.conf
diff --git a/www/apache13-ssl/files/apache.sh b/www/apache13-ssl/files/apache.sh
index ccc40d8790bd..ff630bfe76ab 100644
--- a/www/apache13-ssl/files/apache.sh
+++ b/www/apache13-ssl/files/apache.sh
@@ -6,7 +6,7 @@
 # PROVIDE: apache
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable apache:
diff --git a/www/apache13/files/apache.sh b/www/apache13/files/apache.sh
index 5b612e5aa804..304192b651c2 100644
--- a/www/apache13/files/apache.sh
+++ b/www/apache13/files/apache.sh
@@ -4,7 +4,7 @@
 # PROVIDE: apache
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these apache_* variables in one of these files:
 #       /etc/rc.conf
diff --git a/www/apache20/files/apache.sh b/www/apache20/files/apache.sh
index 4ca6081fb0e7..a89a1b47e5fe 100644
--- a/www/apache20/files/apache.sh
+++ b/www/apache20/files/apache.sh
@@ -6,7 +6,7 @@
 # PROVIDE: apache2
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable apache2:
diff --git a/www/apache21/files/apache.sh b/www/apache21/files/apache.sh
index 50b83b7aafc2..92bfc1d222f3 100644
--- a/www/apache21/files/apache.sh
+++ b/www/apache21/files/apache.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/www/apache21/files/Attic/apache.sh,v 1.9 2006-01-15 18:58:38 clement Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/apache21/files/Attic/apache.sh,v 1.10 2006-02-20 20:47:47 dougb Exp $
 #
 
 # PROVIDE: apache21
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable apache21:
diff --git a/www/apache22/files/apache.sh b/www/apache22/files/apache.sh
index 03f61a1c17fd..eec4c2a84de0 100644
--- a/www/apache22/files/apache.sh
+++ b/www/apache22/files/apache.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/www/apache22/files/Attic/apache.sh,v 1.13 2006-01-23 11:37:04 clement Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/apache22/files/Attic/apache.sh,v 1.14 2006-02-20 20:47:47 dougb Exp $
 #
 
 # PROVIDE: apache22
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable apache22:
diff --git a/www/dansguardian-devel/files/dansguardian.sh.in b/www/dansguardian-devel/files/dansguardian.sh.in
index 8cf3060b3155..8d3924568649 100644
--- a/www/dansguardian-devel/files/dansguardian.sh.in
+++ b/www/dansguardian-devel/files/dansguardian.sh.in
@@ -1,10 +1,10 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/www/dansguardian-devel/files/Attic/dansguardian.sh.in,v 1.1 2005-12-27 23:02:10 edwin Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/dansguardian-devel/files/Attic/dansguardian.sh.in,v 1.2 2006-02-20 20:47:47 dougb Exp $
 
 # PROVIDE: dansguardian
 # REQUIRE: NETWORKING SERVERS squid
 # BEFORE:  DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these dansguardian_* variables in one of these files:
 #       /etc/rc.conf
diff --git a/www/dansguardian/files/dansguardian.sh b/www/dansguardian/files/dansguardian.sh
index 43440f0bdf7d..4aefec546e70 100644
--- a/www/dansguardian/files/dansguardian.sh
+++ b/www/dansguardian/files/dansguardian.sh
@@ -4,7 +4,7 @@
 # PROVIDE: dansguardian
 # REQUIRE: DAEMON squid
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these dansguardian_* variables in one of these files:
 #       /etc/rc.conf
diff --git a/www/frontpage/files/frontpage.sh.in b/www/frontpage/files/frontpage.sh.in
index f99e31c6f747..4338f5158ae3 100644
--- a/www/frontpage/files/frontpage.sh.in
+++ b/www/frontpage/files/frontpage.sh.in
@@ -5,7 +5,6 @@
 # PROVIDE: frontpage
 # REQUIRE: DAEMON
 # BEFORE: apache apache20 apache21 apache22
-# KEYWORD: FreeBSD
 
 # Define the following frontpage_* variables in one of the following:
 #       /etc/rc.conf
diff --git a/www/instiki/files/instiki.sh b/www/instiki/files/instiki.sh
index 28fcfa571539..d4a50d41a4ee 100644
--- a/www/instiki/files/instiki.sh
+++ b/www/instiki/files/instiki.sh
@@ -2,7 +2,6 @@
 #
 # PROVIDE: instiki
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 #
 # Add the following line to /etc/rc.conf to enable instiki:
 # instiki_enable (bool):      Set to "NO" by default
diff --git a/www/interchange/files/interchange.sh b/www/interchange/files/interchange.sh
index b0427cd36db8..6992188b7624 100644
--- a/www/interchange/files/interchange.sh
+++ b/www/interchange/files/interchange.sh
@@ -6,7 +6,7 @@
 # PROVIDE: interchange
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable Interchange:
diff --git a/www/jakarta-tomcat4/files/tomcat4.sh.in b/www/jakarta-tomcat4/files/tomcat4.sh.in
index 96994d9519b3..2823c81ca7d1 100644
--- a/www/jakarta-tomcat4/files/tomcat4.sh.in
+++ b/www/jakarta-tomcat4/files/tomcat4.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: tomcat%%TOMCAT_VERSION%%
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Configuration settings for tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
diff --git a/www/jakarta-tomcat41/files/tomcat41.sh.in b/www/jakarta-tomcat41/files/tomcat41.sh.in
index 96994d9519b3..2823c81ca7d1 100644
--- a/www/jakarta-tomcat41/files/tomcat41.sh.in
+++ b/www/jakarta-tomcat41/files/tomcat41.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: tomcat%%TOMCAT_VERSION%%
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Configuration settings for tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
diff --git a/www/jakarta-tomcat5/files/tomcat50.sh.in b/www/jakarta-tomcat5/files/tomcat50.sh.in
index 96994d9519b3..2823c81ca7d1 100644
--- a/www/jakarta-tomcat5/files/tomcat50.sh.in
+++ b/www/jakarta-tomcat5/files/tomcat50.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: tomcat%%TOMCAT_VERSION%%
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Configuration settings for tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
diff --git a/www/junkbuster/files/junkbuster.sh.in b/www/junkbuster/files/junkbuster.sh.in
index 7d8a7212fc55..bd3a1f6715c1 100644
--- a/www/junkbuster/files/junkbuster.sh.in
+++ b/www/junkbuster/files/junkbuster.sh.in
@@ -3,7 +3,6 @@
 # PROVIDE: junkbuster
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD
 
 #
 # Add the following lines to /etc/rc.conf to enable junkbuster:
diff --git a/www/oops/files/oops.sh b/www/oops/files/oops.sh
index 1fa370b5b354..ebecacce6244 100644
--- a/www/oops/files/oops.sh
+++ b/www/oops/files/oops.sh
@@ -5,7 +5,6 @@
 
 # PROVIDE: oops
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD
 
 . "%%RC_SUBR%%"
 
diff --git a/www/polipo/files/polipo.sh.in b/www/polipo/files/polipo.sh.in
index 8d7732abbaaa..c3faf78b22cd 100644
--- a/www/polipo/files/polipo.sh.in
+++ b/www/polipo/files/polipo.sh.in
@@ -3,7 +3,7 @@
 
 # PROVIDE: polipo
 # REQUIRE: NETWORK
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 . %%RC_SUBR%%
 
diff --git a/www/pound/files/pound.sh.in b/www/pound/files/pound.sh.in
index 51af6cca04fe..1d61ffca54ba 100644
--- a/www/pound/files/pound.sh.in
+++ b/www/pound/files/pound.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: %%NAME%%
 # REQUIRE: NETWORKING SERVERS
 # BEFORE:  DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable `%%NAME%%':
 #
diff --git a/www/spreadlogd/files/spreadlogd.sh.in b/www/spreadlogd/files/spreadlogd.sh.in
index 5f00ca1a1539..24ec9a475ec0 100644
--- a/www/spreadlogd/files/spreadlogd.sh.in
+++ b/www/spreadlogd/files/spreadlogd.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: spreadlogd
 # REQUIRE: spread
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable spread:
diff --git a/www/thttpd/files/thttpd.sh.in b/www/thttpd/files/thttpd.sh.in
index f3a4dc6229bb..091cd19ff582 100644
--- a/www/thttpd/files/thttpd.sh.in
+++ b/www/thttpd/files/thttpd.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: thttpd
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable thttpd:
diff --git a/www/tomcat41/files/tomcat41.sh.in b/www/tomcat41/files/tomcat41.sh.in
index 96994d9519b3..2823c81ca7d1 100644
--- a/www/tomcat41/files/tomcat41.sh.in
+++ b/www/tomcat41/files/tomcat41.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: tomcat%%TOMCAT_VERSION%%
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Configuration settings for tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
diff --git a/www/tomcat55/files/tomcat55.sh.in b/www/tomcat55/files/tomcat55.sh.in
index 96994d9519b3..2823c81ca7d1 100644
--- a/www/tomcat55/files/tomcat55.sh.in
+++ b/www/tomcat55/files/tomcat55.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: tomcat%%TOMCAT_VERSION%%
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Configuration settings for tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
diff --git a/www/tomcat6/files/tomcat55.sh.in b/www/tomcat6/files/tomcat55.sh.in
index 96994d9519b3..2823c81ca7d1 100644
--- a/www/tomcat6/files/tomcat55.sh.in
+++ b/www/tomcat6/files/tomcat55.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: tomcat%%TOMCAT_VERSION%%
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Configuration settings for tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
diff --git a/www/tomcat7/files/tomcat55.sh.in b/www/tomcat7/files/tomcat55.sh.in
index 96994d9519b3..2823c81ca7d1 100644
--- a/www/tomcat7/files/tomcat55.sh.in
+++ b/www/tomcat7/files/tomcat55.sh.in
@@ -6,7 +6,7 @@
 # PROVIDE: tomcat%%TOMCAT_VERSION%%
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Configuration settings for tomcat%%TOMCAT_VERSION%% in /etc/rc.conf:
diff --git a/www/wwwoffle/files/wwwoffled.sh.in b/www/wwwoffle/files/wwwoffled.sh.in
index 0c2c2f2bd1b2..18a3d97791c9 100644
--- a/www/wwwoffle/files/wwwoffled.sh.in
+++ b/www/wwwoffle/files/wwwoffled.sh.in
@@ -4,7 +4,7 @@
 # PROVIDE: wwwoffled
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define these wwwoffled_* variables in one of these files:
 #	/etc/rc.conf
diff --git a/www/zope/files/zeo.sh b/www/zope/files/zeo.sh
index 66057530b549..ccd02604fc90 100644
--- a/www/zope/files/zeo.sh
+++ b/www/zope/files/zeo.sh
@@ -6,7 +6,7 @@
 # PROVIDE: zeo
 # REQUIRE: DAEMON
 # BEFORE: zope
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 prefix=%%PREFIX%%
 
diff --git a/www/zope/files/zope.sh b/www/zope/files/zope.sh
index eb6ec5b70acd..56f3ab038e84 100644
--- a/www/zope/files/zope.sh
+++ b/www/zope/files/zope.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 # Start or stop zope
-# $FreeBSD: /tmp/pcvs/ports/www/zope/files/Attic/zope.sh,v 1.6 2005-12-30 23:37:16 girgen Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/zope/files/Attic/zope.sh,v 1.7 2006-02-20 20:47:50 dougb Exp $
 
 # PROVIDE: zope
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 prefix=%%PREFIX%%
 
diff --git a/x11-fonts/xfs/files/xfs.sh b/x11-fonts/xfs/files/xfs.sh
index d0a3cad8915f..5aa5f178ecff 100644
--- a/x11-fonts/xfs/files/xfs.sh
+++ b/x11-fonts/xfs/files/xfs.sh
@@ -1,12 +1,11 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/x11-fonts/xfs/files/Attic/xfs.sh,v 1.2 2006-01-05 17:08:06 lesi Exp $
+# $FreeBSD: /tmp/pcvs/ports/x11-fonts/xfs/files/Attic/xfs.sh,v 1.3 2006-02-20 20:47:50 dougb Exp $
 #
 
 # PROVIDE: xfs
 # REQUIRE: cleartmp ldconfig
 # BEFORE:  LOGIN
-# KEYWORD: FreeBSD
 
 # The following variables are provided to control startup of X font server in
 # rc configuration file (eg /etc/rc.conf):
diff --git a/x11-servers/XFree86-4-FontServer/files/xfs.sh b/x11-servers/XFree86-4-FontServer/files/xfs.sh
index c81383b2a449..f4397b00b368 100644
--- a/x11-servers/XFree86-4-FontServer/files/xfs.sh
+++ b/x11-servers/XFree86-4-FontServer/files/xfs.sh
@@ -6,7 +6,6 @@
 # PROVIDE: xfs
 # REQUIRE: cleartmp ldconfig
 # BEFORE:  LOGIN
-# KEYWORD: FreeBSD
 
 # The following variables are provided to control startup of X font server in
 # rc configuration file (eg /etc/rc.conf):
diff --git a/x11-servers/xorg-fontserver/files/xfs.sh b/x11-servers/xorg-fontserver/files/xfs.sh
index 25ebc6f754d1..2c94e5078cc6 100644
--- a/x11-servers/xorg-fontserver/files/xfs.sh
+++ b/x11-servers/xorg-fontserver/files/xfs.sh
@@ -1,12 +1,11 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/x11-servers/xorg-fontserver/files/Attic/xfs.sh,v 1.2 2006-01-05 17:08:06 lesi Exp $
+# $FreeBSD: /tmp/pcvs/ports/x11-servers/xorg-fontserver/files/Attic/xfs.sh,v 1.3 2006-02-20 20:47:50 dougb Exp $
 #
 
 # PROVIDE: xfs
 # REQUIRE: cleartmp ldconfig
 # BEFORE:  LOGIN
-# KEYWORD: FreeBSD
 
 # The following variables are provided to control startup of X font server in
 # rc configuration file (eg /etc/rc.conf):
author	Doug Barton <dougb@FreeBSD.org>	2006-02-20 20:47:50 +0000
committer	Doug Barton <dougb@FreeBSD.org>	2006-02-20 20:47:50 +0000
commit	c49d1a3273d77f35b5564b3722856ca8b9dcc291 (patch)
tree	3da9de442d629d38ac63cb930e82da714209de9f
parent	2aa383c4ecd765535e04e8eba8a625608b808ee4 (diff)
download	ports-c49d1a3273d77f35b5564b3722856ca8b9dcc291.tar.gz ports-c49d1a3273d77f35b5564b3722856ca8b9dcc291.zip