Another round of the periodic sweep for removal of the

KEYWORD: FreeBSD scourge. We have ignored this keyword
for a long time now, so this is a non-functional change
(therefore no PORTREVISION bumps).

Insert a $FreeBSD tag where needed, and adjust a comment
in mail/milter-regex to match reality.

14 files changed, 30 insertions, 20 deletions

diff --git a/audio/ventrilo-server/files/ventrilo-server.sh.in b/audio/ventrilo-server/files/ventrilo-server.sh.in
index 36f242660390..52daf01d966b 100644
--- a/audio/ventrilo-server/files/ventrilo-server.sh.in
+++ b/audio/ventrilo-server/files/ventrilo-server.sh.in
@@ -1,8 +1,10 @@
 #!/bin/sh
 
+# $FreeBSD$
+
 # PROVIDE: ventrilo
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 [ -z "${ventrilo_enable}" ] && ventrilo_enable="NO"
 [ -z "${ventrilo_port}" ] && ventrilo_port="3784"
diff --git a/mail/milter-regex/files/milterregex.sh.in b/mail/milter-regex/files/milterregex.sh.in
index f869e5cabc5f..969e4cb6a0b1 100644
--- a/mail/milter-regex/files/milterregex.sh.in
+++ b/mail/milter-regex/files/milterregex.sh.in
@@ -1,15 +1,18 @@
 #!/bin/sh
 
+# $FreeBSD$
+
 # Start or stop milterregex
 
 # PROVIDE: milterregex
 # REQUIRE: DAEMON
 # BEFORE: mail
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
-# NOTE for FreeBSD 5.0+:
+# NOTE for FreeBSD 5.0 through 6.0:
 # If you want this script to start with the base rc scripts
 # move milterregex to /etc/rc.d/milterregex
+# Not necessary for 6.1+
 
 prefix=%%PREFIX%%
 spooldir=%%SPOOLDIR%%
diff --git a/multimedia/mythtv/files/mythbackend.in b/multimedia/mythtv/files/mythbackend.in
index f13a21f9861e..5f1d2c120ac1 100644
--- a/multimedia/mythtv/files/mythbackend.in
+++ b/multimedia/mythtv/files/mythbackend.in
@@ -1,9 +1,11 @@
 #!/bin/sh
 
+# $FreeBSD$
+
 # PROVIDE: mythbackend
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Define mythbackend_enable in one of these places:
 #       /etc/rc.conf
diff --git a/net-im/jggtrans/files/jggtrans.sh.in b/net-im/jggtrans/files/jggtrans.sh.in
index 9339edbe9467..c3eca746c790 100644
--- a/net-im/jggtrans/files/jggtrans.sh.in
+++ b/net-im/jggtrans/files/jggtrans.sh.in
@@ -1,9 +1,11 @@
 #!/bin/sh
+
+# $FreeBSD$
 #
 # PROVIDE: jggtrans
 # REQUIRE: DAEMON %%JABBER_USER%%
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 # SET THEM IN THE /etc/rc.conf 
diff --git a/net-mgmt/netmond/files/netmond.sh.in b/net-mgmt/netmond/files/netmond.sh.in
index 70896a3cfa04..ec78c3a0c2bc 100644
--- a/net-mgmt/netmond/files/netmond.sh.in
+++ b/net-mgmt/netmond/files/netmond.sh.in
@@ -5,7 +5,7 @@
 # PROVIDE: netmond
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 #
 # Define these netmond_* variables in one of these files:
 #	/etc/rc.conf
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/miredo/files/isatapd.in b/net/miredo/files/isatapd.in
index 17f0f5a8b8a6..38ae26f09782 100644
--- a/net/miredo/files/isatapd.in
+++ b/net/miredo/files/isatapd.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: isatapd
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable isatapd:
diff --git a/net/miredo/files/miredo.in b/net/miredo/files/miredo.in
index b084e6168c2d..990f8d8121da 100644
--- a/net/miredo/files/miredo.in
+++ b/net/miredo/files/miredo.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: miredo
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable miredo:
diff --git a/net/miredo/files/miredo_server.in b/net/miredo/files/miredo_server.in
index 506a8832de3a..bc1db2d0bcab 100644
--- a/net/miredo/files/miredo_server.in
+++ b/net/miredo/files/miredo_server.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: miredo_server
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable miredo-server:
diff --git a/net/vserver/files/vserver.in b/net/vserver/files/vserver.in
index c122fb1e7f82..38a716ecbbfc 100644
--- a/net/vserver/files/vserver.in
+++ b/net/vserver/files/vserver.in
@@ -1,13 +1,12 @@
 #!/bin/sh
 
-#
-# $Id: startup-freebsd.sh,v 1.2 2006/06/03 17:18:59 mickey Exp $
+# $FreeBSD$
 #
 # FreeBSD boot time start up script for vserver(8).
 #
 # PROVIDE: vserver
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable vserver:
diff --git a/security/amavisd-new/files/amavis-p0fanalyzer.sh.in b/security/amavisd-new/files/amavis-p0fanalyzer.sh.in
index df48438d3387..ab2988629cbf 100644
--- a/security/amavisd-new/files/amavis-p0fanalyzer.sh.in
+++ b/security/amavisd-new/files/amavis-p0fanalyzer.sh.in
@@ -4,7 +4,6 @@
 # PROVIDE: amavis_p0fanalyzer
 # REQUIRE: DAEMON
 # BEFORE: amavisd
-# KEYWORD: FreeBSD
 
 amavis_p0fanalyzer_enable="${amavis_p0fanalyzer_enable-NO}"
 amavis_p0fanalyzer_p0f_filter="${amavis_p0fanalyzer_p0f_filter-"tcp dst port 25"}"
diff --git a/security/sguil-sensor/files/sensor_agent.sh.in b/security/sguil-sensor/files/sensor_agent.sh.in
index cf3a66e3eb62..4f24bc65d83e 100644
--- a/security/sguil-sensor/files/sensor_agent.sh.in
+++ b/security/sguil-sensor/files/sensor_agent.sh.in
@@ -1,14 +1,15 @@
 #!/bin/sh
-# 
+
+# $FreeBSD$
 
 # PROVIDE: sensor_agent
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable sensor_agent:
 # sensor_agent_enable (bool):	Set to YES to enable sensor_agent
 # 				Default: NO
-# sensor_agent_flags (str):         Extra flags passed to sensor_agent
+# sensor_agent_flags (str):     Extra flags passed to sensor_agent
 #                               Default: -D
 # sensor_agent_conf (str):	Sensor_agent configuration file
 #				Default: %%PREFIX%%/etc/sensor_agent.conf
diff --git a/security/sguil-server/files/sguild.sh.in b/security/sguil-server/files/sguild.sh.in
index 9bc712efe3c3..febad2a7cef0 100644
--- a/security/sguil-server/files/sguild.sh.in
+++ b/security/sguil-server/files/sguild.sh.in
@@ -1,8 +1,10 @@
 #!/bin/sh
 
+# $FreeBSD$
+
 # PROVIDE: sguild
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable sguild:
 # sguild_enable (bool):		Set to YES to enable sguild
diff --git a/security/snort_inline/files/snort.sh.in b/security/snort_inline/files/snort.sh.in
index aecaf43cd77a..ee0e05e000c1 100644
--- a/security/snort_inline/files/snort.sh.in
+++ b/security/snort_inline/files/snort.sh.in
@@ -1,10 +1,11 @@
 #!/bin/sh
-# $Id$
+
+# $FreeBSD$
 
 # 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