65 files changed, 53 insertions, 47 deletions
diff --git a/security/amavisd-milter/Makefile b/security/amavisd-milter/Makefile
index d17b802241ed..0f7f7b00e35f 100644
--- a/security/amavisd-milter/Makefile
+++ b/security/amavisd-milter/Makefile
@@ -34,7 +34,7 @@ AMAVISDIR?=	/var/amavis
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ARGS=	--localstatedir=${AMAVISDIR} --with-working-dir=tmp
-USE_RC_SUBR=	${PORTNAME}.sh
+USE_RC_SUBR=	${PORTNAME}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	AMAVISUSER=${AMAVISUSER} \
diff --git a/security/amavisd-milter/files/amavisd-milter.sh.in b/security/amavisd-milter/files/amavisd-milter.in
index 546220cc1cf3..546220cc1cf3 100644
--- a/security/amavisd-milter/files/amavisd-milter.sh.in
+++ b/security/amavisd-milter/files/amavisd-milter.in
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 1b4309d9bf70..9d811ba4cf3f 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -83,14 +83,14 @@ PLIST_SUB+=	AMAVIS_NOP0F=${AMAVIS_NOP0F}
 
 .include <bsd.port.options.mk>
 
-USE_RC_SUBR+=	amavisd.sh
+USE_RC_SUBR+=	amavisd
 
 .if defined(WITH_IPV6)
 RUN_DEPENDS+=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
 .endif
 
 .if defined(WITH_SNMP) && defined(WITH_BDB)
-USE_RC_SUBR+=	amavisd-snmp.sh
+USE_RC_SUBR+=	amavisd-snmp
 RUN_DEPENDS+=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
 .endif
 
@@ -124,7 +124,7 @@ RUN_DEPENDS+=	p5-Mail-SpamAssassin>=0:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 
 .if defined(WITH_P0F)
 RUN_DEPENDS+=	${LOCALBASE}/bin/p0f:${PORTSDIR}/net-mgmt/p0f
-USE_RC_SUBR+=	amavis-p0fanalyzer.sh
+USE_RC_SUBR+=	amavis-p0fanalyzer
 .else
 AMAVIS_NOP0F=	"@comment "
 .endif
diff --git a/security/amavisd-new/files/amavis-milter.sh.in b/security/amavisd-new/files/amavis-milter.in
index ec6136b96661..ec6136b96661 100644
--- a/security/amavisd-new/files/amavis-milter.sh.in
+++ b/security/amavisd-new/files/amavis-milter.in
diff --git a/security/amavisd-new/files/amavis-p0fanalyzer.sh.in b/security/amavisd-new/files/amavis-p0fanalyzer.in
index d7009711bcfc..d7009711bcfc 100644
--- a/security/amavisd-new/files/amavis-p0fanalyzer.sh.in
+++ b/security/amavisd-new/files/amavis-p0fanalyzer.in
diff --git a/security/amavisd-new/files/amavisd-snmp.sh.in b/security/amavisd-new/files/amavisd-snmp.in
index 0f724ae759f3..0f724ae759f3 100644
--- a/security/amavisd-new/files/amavisd-snmp.sh.in
+++ b/security/amavisd-new/files/amavisd-snmp.in
diff --git a/security/amavisd-new/files/amavisd.sh.in b/security/amavisd-new/files/amavisd.in
index 593d26982d81..593d26982d81 100644
--- a/security/amavisd-new/files/amavisd.sh.in
+++ b/security/amavisd-new/files/amavisd.in
diff --git a/security/barnyard2/Makefile b/security/barnyard2/Makefile
index 9729caabbab4..5c6a58f4bf6f 100644
--- a/security/barnyard2/Makefile
+++ b/security/barnyard2/Makefile
@@ -22,7 +22,7 @@ OPTIONS=	MYSQL "Enable MySQL support" on \
 OPTIONS+=	TCL "Enable TCL support" off
 .endif
 
-USE_RC_SUBR=	barnyard2.sh
+USE_RC_SUBR=	barnyard2
 GNU_CONFIGURE=	yes
 SUB_FILES=	pkg-message
 
diff --git a/security/barnyard2/files/barnyard2.sh.in b/security/barnyard2/files/barnyard2.in
index 08a37f4b8030..b3ad5ac2c873 100644
--- a/security/barnyard2/files/barnyard2.sh.in
+++ b/security/barnyard2/files/barnyard2.in
@@ -1,9 +1,10 @@
 #!/bin/sh
-# 
 
+# $FreeBSD$
+#
 # PROVIDE: barnyard2
 # REQUIRE: DAEMON%%MYSQL%%%%PGSQL%%
-
+#
 # Add the following lines to /etc/rc.conf to enable barnyard2:
 # barnyard2_enable (bool):	Set to YES to enable barnyard2
 # 				Default: NO
@@ -18,7 +19,6 @@
 # #$command $flags $args
 #
 # USAGE: barnyard2 [-options]
-#
 
 . /etc/rc.subr
 
diff --git a/security/bruteblock/Makefile b/security/bruteblock/Makefile
index dd851d4a8eb1..9f4f793eede0 100644
--- a/security/bruteblock/Makefile
+++ b/security/bruteblock/Makefile
@@ -21,7 +21,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 MAKE_JOBS_SAFE=	yes
 
-USE_RC_SUBR=	bruteblockd.sh
+USE_RC_SUBR=	bruteblockd
 MAN8=		bruteblock.8
 
 CONFDIR=	${PREFIX}/etc/${PORTNAME}
diff --git a/security/bruteblock/files/bruteblockd.sh.in b/security/bruteblock/files/bruteblockd.in
index 51de2ea73635..23e95fd97106 100644
--- a/security/bruteblock/files/bruteblockd.sh.in
+++ b/security/bruteblock/files/bruteblockd.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: bruteblockd
 # REQUIRE: NETWORKING syslogd
 # KEYWORD: nojail
diff --git a/security/clamsmtp/Makefile b/security/clamsmtp/Makefile
index a991ff81a875..c5e3e109df6c 100644
--- a/security/clamsmtp/Makefile
+++ b/security/clamsmtp/Makefile
@@ -16,7 +16,7 @@ COMMENT=	An ClamAV anti-virus SMTP Filter
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_RC_SUBR=	clamsmtpd.sh
+USE_RC_SUBR=	clamsmtpd
 SUB_LIST=	CLAMAV_PID_DIR=${CLAMAV_PID_DIR}
 SUB_FILES+=	pkg-message
 
diff --git a/security/clamsmtp/files/clamsmtpd.sh.in b/security/clamsmtp/files/clamsmtpd.in
index c5c93c5c1a9c..c5c93c5c1a9c 100644
--- a/security/clamsmtp/files/clamsmtpd.sh.in
+++ b/security/clamsmtp/files/clamsmtpd.in
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 2c958d5d423f..f4244da23b6f 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -168,9 +168,9 @@ do-build:	#empty
 
 .if ${AUTHMOD} == authbase
 .if defined(WITH_RCORDER)
-USE_RCORDER=	courier-authdaemond.sh
+USE_RCORDER=	courier-authdaemond
 .else
-USE_RC_SUBR=	courier-authdaemond.sh
+USE_RC_SUBR=	courier-authdaemond
 .endif
 
 pre-everything::
diff --git a/security/courier-authlib/files/courier-authdaemond.sh.in b/security/courier-authlib/files/courier-authdaemond.in
index 6dc0304c5e4a..c70cb56f41c8 100644
--- a/security/courier-authlib/files/courier-authdaemond.sh.in
+++ b/security/courier-authlib/files/courier-authdaemond.in
@@ -1,7 +1,7 @@
 #!/bin/sh
-#
-# An rc.subr-style startup script for courier-authdaemond service.
 
+# $FreeBSD$
+#
 # PROVIDE: courier_authdaemond
 # REQUIRE: DAEMON mysql ldconfig
 # BEFORE: mail imap
diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile
index 03fdd46767dc..fce2ad943b41 100644
--- a/security/cyrus-sasl2-saslauthd/Makefile
+++ b/security/cyrus-sasl2-saslauthd/Makefile
@@ -32,7 +32,7 @@ DOCSDIR=	${PREFIX}/share/doc/cyrus-sasl2
 
 MAN8=		saslauthd.8
 
-USE_RC_SUBR=	saslauthd.sh
+USE_RC_SUBR=	saslauthd
 
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
diff --git a/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in b/security/cyrus-sasl2-saslauthd/files/saslauthd.in
index f5468ce36096..f5468ce36096 100644
--- a/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in
+++ b/security/cyrus-sasl2-saslauthd/files/saslauthd.in
diff --git a/security/distcache-devel/Makefile b/security/distcache-devel/Makefile
index dce9b9019018..4db977f989e4 100644
--- a/security/distcache-devel/Makefile
+++ b/security/distcache-devel/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Distributed OpenSSL session caching tools - development version
 CONFLICTS=	distcache-1.4*
 
 USE_BZIP2=	yes
-USE_RC_SUBR=	dc_server.sh
+USE_RC_SUBR=	dc_server
 USE_AUTOTOOLS=	libtool
 USE_OPENSSL=	yes
 LIBTOOLFILES=	configure ssl/configure
diff --git a/security/distcache-devel/files/dc_server.sh.in b/security/distcache-devel/files/dc_server.in
index 6f2d02c72b6b..6f2d02c72b6b 100644
--- a/security/distcache-devel/files/dc_server.sh.in
+++ b/security/distcache-devel/files/dc_server.in
diff --git a/security/distcache/Makefile b/security/distcache/Makefile
index 5bc8e54a8d74..8b76ee0f3b23 100644
--- a/security/distcache/Makefile
+++ b/security/distcache/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Distributed OpenSSL session caching tools
 CONFLICTS=	distcache-devel-*
 
 USE_BZIP2=	yes
-USE_RC_SUBR=	dc_server.sh
+USE_RC_SUBR=	dc_server
 USE_AUTOTOOLS=	libtool
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
diff --git a/security/distcache/files/dc_server.sh.in b/security/distcache/files/dc_server.in
index 6f2d02c72b6b..6f2d02c72b6b 100644
--- a/security/distcache/files/dc_server.sh.in
+++ b/security/distcache/files/dc_server.in
diff --git a/security/doorman/Makefile b/security/doorman/Makefile
index 689a4f9d570e..bc3f645f03d1 100644
--- a/security/doorman/Makefile
+++ b/security/doorman/Makefile
@@ -29,7 +29,7 @@ MAN8=	doormand.8
 
 GNU_CONFIGURE=	yes
 SUB_FILES=	pkg-message doormand.cf.EXAMPLE
-USE_RC_SUBR=	doorman.sh
+USE_RC_SUBR=	doorman
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' \
diff --git a/security/doorman/files/doorman.sh.in b/security/doorman/files/doorman.in
index 98e25a3d383b..152cf4aab2fb 100644
--- a/security/doorman/files/doorman.sh.in
+++ b/security/doorman/files/doorman.in
@@ -1,15 +1,14 @@
 #!/bin/sh
-#
 
+# $FreeBSD$
+#
 # PROVIDE: doorman
 # REQUIRE: LOGIN
-
 #
 # Add the following lines to /etc/rc.conf to enable doorman:
 # doorman_enable (bool):      Set to "NO" by default.
 #                             Set it to "YES" to enable doorman
 # doorman_config (path):      Set to "%%PREFIX%%/etc/doormand/doormand.cf" by default.
-#
 
 . /etc/rc.subr
 
diff --git a/security/hamachi/Makefile b/security/hamachi/Makefile
index 8d60360b5506..c284ec86d19f 100644
--- a/security/hamachi/Makefile
+++ b/security/hamachi/Makefile
@@ -20,7 +20,7 @@ PATCH_DEPENDS=	upx:${PORTSDIR}/archivers/upx
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX=	yes
 
-USE_RC_SUBR=	hamachi.sh
+USE_RC_SUBR=	hamachi
 PLIST_FILES=	bin/hamachi bin/hamachi-init sbin/hamachi-tuncfg
 PORTDOCS=	README CHANGES
 MAKE_ENV=	HAMACHI_DST=${PREFIX}/bin TUNCFG_DST=${PREFIX}/sbin
diff --git a/security/hamachi/files/hamachi.sh.in b/security/hamachi/files/hamachi.in
index 99e6877c70bd..99e6877c70bd 100644
--- a/security/hamachi/files/hamachi.sh.in
+++ b/security/hamachi/files/hamachi.in
diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index 6f45495ad0ac..efa99a90e7cb 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -20,7 +20,7 @@ COMMENT=	KAME racoon IKE daemon, ipsec-tools version
 
 CONFLICTS=	racoon-[0-9]*
 
-USE_RC_SUBR=	racoon.sh
+USE_RC_SUBR=	racoon
 USE_OPENSSL=	yes
 USE_BZIP2=	yes
 
diff --git a/security/ipsec-tools/files/racoon.sh.in b/security/ipsec-tools/files/racoon.in
index 1ab85061fcfa..1ab85061fcfa 100644
--- a/security/ipsec-tools/files/racoon.sh.in
+++ b/security/ipsec-tools/files/racoon.in
diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile
index 740e8ac25d65..d039ca6bcb6e 100644
--- a/security/isakmpd/Makefile
+++ b/security/isakmpd/Makefile
@@ -25,7 +25,7 @@ BROKEN=		requires IPsec support
 BUILD_DEPENDS+=	keynote:${PORTSDIR}/security/keynote
 .endif
 
-USE_RC_SUBR=	isakmpd.sh
+USE_RC_SUBR=	isakmpd
 WRKSRC=		${WRKDIR}/isakmpd
 MAKE_ENV+=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man LC_ALL=C
 
diff --git a/security/isakmpd/files/isakmpd.sh.in b/security/isakmpd/files/isakmpd.in
index fb30d09d8c51..fb30d09d8c51 100644
--- a/security/isakmpd/files/isakmpd.sh.in
+++ b/security/isakmpd/files/isakmpd.in
diff --git a/security/knock/Makefile b/security/knock/Makefile
index 42574d10472e..e391cc731363 100644
--- a/security/knock/Makefile
+++ b/security/knock/Makefile
@@ -31,7 +31,7 @@ OPTIONS=	SERVER		"Install knockd server"		on \
 
 .if defined(WITH_SERVER)
 MAN1=		knockd.1
-USE_RC_SUBR=	knockd.sh
+USE_RC_SUBR=	knockd
 PLIST_FILES+=	bin/knockd
 PLIST_FILES+=	etc/knockd.conf.sample
 .endif
diff --git a/security/knock/files/knockd.sh.in b/security/knock/files/knockd.in
index 67e17f929a82..56268e362141 100644
--- a/security/knock/files/knockd.sh.in
+++ b/security/knock/files/knockd.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: knockd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 93c648eb4fcf..20023e447984 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -32,7 +32,7 @@ SUB_FILES=	pkg-deinstall
 SUB_LIST=	PKGNAME=${PKGNAME}
 
 GNU_CONFIGURE=	yes
-USE_RC_SUBR=	nessusd.sh
+USE_RC_SUBR=	nessusd
 WANT_GNOME=	yes
 .if defined(WITHOUT_NESSUS_GTK) || defined(WITHOUT_GTK)
 WITHOUT_GNOME=	yes
diff --git a/security/nessus/files/nessusd.sh.in b/security/nessus/files/nessusd.in
index 10e0801a9637..10e0801a9637 100644
--- a/security/nessus/files/nessusd.sh.in
+++ b/security/nessus/files/nessusd.in
diff --git a/security/openvpn-beta/Makefile b/security/openvpn-beta/Makefile
index 2c9ba8a4e578..2fc39596a330 100644
--- a/security/openvpn-beta/Makefile
+++ b/security/openvpn-beta/Makefile
@@ -33,7 +33,7 @@ MAN8=		openvpn.8
 OPTIONS=	PW_SAVE "Interactive passwords may be read from a file" off \
 		PKCS11  "Use security/pkcs11-helper" off
 
-USE_RC_SUBR=	openvpn.sh
+USE_RC_SUBR=	openvpn
 USE_LDCONFIG=	${PREFIX}/lib
 
 LIB_DEPENDS+=	lzo2.2:${PORTSDIR}/archivers/lzo2
diff --git a/security/openvpn-beta/files/openvpn.sh.in b/security/openvpn-beta/files/openvpn.in
index 124082b72687..124082b72687 100644
--- a/security/openvpn-beta/files/openvpn.sh.in
+++ b/security/openvpn-beta/files/openvpn.in
diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile
index e9f6cee3b176..ed2f6dc0f5e0 100644
--- a/security/openvpn-devel/Makefile
+++ b/security/openvpn-devel/Makefile
@@ -35,7 +35,7 @@ OPTIONS=	PW_SAVE "Interactive passwords may be read from a file" off \
 		EXAMPLES "Install sample configs and scripts" off \
 		POLARSSL "Build will PolarSSL instead of OpenSSL" off
 
-USE_RC_SUBR=	openvpn.sh
+USE_RC_SUBR=	openvpn
 USE_LDCONFIG=	${PREFIX}/lib
 
 SUB_FILES=	pkg-message
diff --git a/security/openvpn-devel/files/openvpn.sh.in b/security/openvpn-devel/files/openvpn.in
index 124082b72687..124082b72687 100644
--- a/security/openvpn-devel/files/openvpn.sh.in
+++ b/security/openvpn-devel/files/openvpn.in
diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile
index e20f17c1d3bf..64446289cd06 100644
--- a/security/openvpn/Makefile
+++ b/security/openvpn/Makefile
@@ -37,7 +37,7 @@ MAN8=		openvpn.8
 OPTIONS=	PW_SAVE "Interactive passwords may be read from a file" off \
 		PKCS11  "Use security/pkcs11-helper" off
 
-USE_RC_SUBR=	openvpn.sh
+USE_RC_SUBR=	openvpn
 USE_LDCONFIG=	${PREFIX}/lib
 
 SUB_FILES=	pkg-message
diff --git a/security/openvpn/files/openvpn.sh.in b/security/openvpn/files/openvpn.in
index f4f1dbdbb7ad..f4f1dbdbb7ad 100644
--- a/security/openvpn/files/openvpn.sh.in
+++ b/security/openvpn/files/openvpn.in
diff --git a/security/openvpn20/Makefile b/security/openvpn20/Makefile
index 223369f5c314..a4c39409e007 100644
--- a/security/openvpn20/Makefile
+++ b/security/openvpn20/Makefile
@@ -28,7 +28,7 @@ MAN8=		openvpn.8
 
 OPTIONS=	PW_SAVE "Interactive passwords may be read from a file" off
 
-USE_RC_SUBR=	openvpn.sh
+USE_RC_SUBR=	openvpn
 USE_LDCONFIG=	${PREFIX}/lib
 
 LIB_DEPENDS+=	lzo2.2:${PORTSDIR}/archivers/lzo2
diff --git a/security/openvpn20/files/openvpn.sh.in b/security/openvpn20/files/openvpn.in
index f4f1dbdbb7ad..f4f1dbdbb7ad 100644
--- a/security/openvpn20/files/openvpn.sh.in
+++ b/security/openvpn20/files/openvpn.in
diff --git a/security/p5-openxpki-deployment/Makefile b/security/p5-openxpki-deployment/Makefile
index 19a6f4cd511f..9b6d275d5722 100644
--- a/security/p5-openxpki-deployment/Makefile
+++ b/security/p5-openxpki-deployment/Makefile
@@ -29,7 +29,7 @@ MAN1=	openxpki-configure.1 \
 	openxpkictl.1
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_RC_SUBR=	openxpki.sh
+USE_RC_SUBR=	openxpki
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix ${PREFIX}
 
diff --git a/security/p5-openxpki-deployment/files/openxpki.sh.in b/security/p5-openxpki-deployment/files/openxpki.in
index acb2aa9cfd64..acb2aa9cfd64 100644
--- a/security/p5-openxpki-deployment/files/openxpki.sh.in
+++ b/security/p5-openxpki-deployment/files/openxpki.in
diff --git a/security/pks/Makefile b/security/pks/Makefile
index d5467622a91c..6c238a3a8eca 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -29,7 +29,7 @@ MAKE_ENV+=	SUBDIRS=
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	DBLIB="-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}" DBINC=-I${BDB_INCLUDE_DIR} DBHDR=db.h
 
-USE_RC_SUBR=	pksd.sh
+USE_RC_SUBR=	pksd
 MAN5=		pksd.conf.5
 MAN8=		pks-intro.8 pksclient.8 pksd.8 pksdctl.8 pks-mail.sh.8 \
 		pks-queue-run.sh.8 pgpsplit.8
diff --git a/security/pks/files/pksd.sh.in b/security/pks/files/pksd.in
index ff9a23a6f05e..ff9a23a6f05e 100644
--- a/security/pks/files/pksd.sh.in
+++ b/security/pks/files/pksd.in
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index 7c76ecb63fac..1d845c806b36 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS+=	prelude.20:${PORTSDIR}/security/libprelude \
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_RC_SUBR=	prelude-lml.sh
+USE_RC_SUBR=	prelude-lml
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
 .include <bsd.port.pre.mk>
diff --git a/security/prelude-lml/files/prelude-lml.sh.in b/security/prelude-lml/files/prelude-lml.in
index 9da1f133c303..9da1f133c303 100644
--- a/security/prelude-lml/files/prelude-lml.sh.in
+++ b/security/prelude-lml/files/prelude-lml.in
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index afe7a92ae040..1372952cf070 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS+=	prelude.20:${PORTSDIR}/security/libprelude \
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf
-USE_RC_SUBR=	prelude-manager.sh
+USE_RC_SUBR=	prelude-manager
 CONFIGURE_ARGS=		--with-html-dir=${PREFIX}/share/doc \
 			--localstatedir=/var
 CONFIGURE_ENV=	LIBS="${LIBS} -L${LOCALBASE}/lib"
diff --git a/security/prelude-manager/files/prelude-manager.sh.in b/security/prelude-manager/files/prelude-manager.in
index 6f843826a8b5..ce8627650f55 100644
--- a/security/prelude-manager/files/prelude-manager.sh.in
+++ b/security/prelude-manager/files/prelude-manager.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: prelude_manager
 # REQUIRE: NETWORKING SERVERS
 #
@@ -9,7 +11,6 @@
 # prelude_manager_enable (bool):   Set to NO by default.
 #                                  Set it to YES to enable Prelude Manager.
 # prelude_manager_flags  (flags):  Set arguments to use with Prelude Manager
-#
 
 . /etc/rc.subr
 
diff --git a/security/sguil-sensor/Makefile b/security/sguil-sensor/Makefile
index 2d47f4feba7b..c09260dc11fa 100644
--- a/security/sguil-sensor/Makefile
+++ b/security/sguil-sensor/Makefile
@@ -23,7 +23,7 @@ OPTIONS=	SANCP "Include sancp sensor" off \
 		PADS "Include pads sensor" off
 
 NO_BUILD=	yes
-USE_RC_SUBR=	example_agent.sh pcap_agent.sh snort_agent.sh
+USE_RC_SUBR=	example_agent pcap_agent snort_agent
 TCLSH_CMD?=	tclsh8.4
 WRKSRC=		${WRKDIR}/sguil-${PORTVERSION}
 SUB_LIST=	SGUILDIR=${SGUILDIR}
@@ -41,7 +41,7 @@ WITH_PCRE=	true
 
 .if defined(WITH_SANCP)
 RUN_DEPENDS+=	sancp:${PORTSDIR}/security/sancp
-USE_RC_SUBR+=	sancp_agent.sh
+USE_RC_SUBR+=	sancp_agent
 SUB_FILES+=	sancp_agent.sh
 PLIST_SUB+=	USESANCP=
 .else
@@ -50,7 +50,7 @@ PLIST_SUB+=	USESANCP="@comment "
 
 .if defined(WITH_PADS)
 RUN_DEPENDS+=	pads:${PORTSDIR}/net-mgmt/pads
-USE_RC_SUBR+=	pads_agent.sh
+USE_RC_SUBR+=	pads_agent
 SUB_FILES+=	pads_agent.sh
 PLIST_SUB+=	USEPADS=
 .else
diff --git a/security/sguil-sensor/files/example_agent.sh.in b/security/sguil-sensor/files/example_agent.in
index 79b449745ea3..79b449745ea3 100644
--- a/security/sguil-sensor/files/example_agent.sh.in
+++ b/security/sguil-sensor/files/example_agent.in
diff --git a/security/sguil-sensor/files/pads_agent.sh.in b/security/sguil-sensor/files/pads_agent.in
index 757f03ee2e35..757f03ee2e35 100644
--- a/security/sguil-sensor/files/pads_agent.sh.in
+++ b/security/sguil-sensor/files/pads_agent.in
diff --git a/security/sguil-sensor/files/pcap_agent.sh.in b/security/sguil-sensor/files/pcap_agent.in
index 264c2ab4b865..264c2ab4b865 100644
--- a/security/sguil-sensor/files/pcap_agent.sh.in
+++ b/security/sguil-sensor/files/pcap_agent.in
diff --git a/security/sguil-sensor/files/sancp_agent.sh.in b/security/sguil-sensor/files/sancp_agent.in
index 7b93fd4f6c39..7b93fd4f6c39 100644
--- a/security/sguil-sensor/files/sancp_agent.sh.in
+++ b/security/sguil-sensor/files/sancp_agent.in
diff --git a/security/sguil-sensor/files/snort_agent.sh.in b/security/sguil-sensor/files/snort_agent.in
index 154f738118f7..154f738118f7 100644
--- a/security/sguil-sensor/files/snort_agent.sh.in
+++ b/security/sguil-sensor/files/snort_agent.in
diff --git a/security/sguil-server/Makefile b/security/sguil-server/Makefile
index f56475a53e4d..20d91687e237 100644
--- a/security/sguil-server/Makefile
+++ b/security/sguil-server/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	p0f:${PORTSDIR}/net-mgmt/p0f \
 LIB_DEPENDS=	tls:${PORTSDIR}/devel/tcltls
 
 NO_BUILD=	yes
-USE_RC_SUBR=	sguild.sh
+USE_RC_SUBR=	sguild
 TCLSH_CMD?=	${PREFIX}/bin/tclsh8.4
 SGUILDIR?=	sguil-server
 WRKSRC=		${WRKDIR}/sguil-${PORTVERSION}
diff --git a/security/sguil-server/files/sguild.sh.in b/security/sguil-server/files/sguild.in
index 10860b427017..10860b427017 100644
--- a/security/sguil-server/files/sguild.sh.in
+++ b/security/sguil-server/files/sguild.in
diff --git a/security/snort/Makefile b/security/snort/Makefile
index 461c3486983c..339c4378fe7b 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -45,7 +45,7 @@ DBGSNORT_DESC=		Enable debugging symbols+core dumps
 
 .include <bsd.port.options.mk>
 
-USE_RC_SUBR=	snort.sh
+USE_RC_SUBR=	snort
 SUB_FILES=	pkg-message
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
diff --git a/security/snort/files/snort.sh.in b/security/snort/files/snort.in
index 41e272dec014..41e272dec014 100644
--- a/security/snort/files/snort.sh.in
+++ b/security/snort/files/snort.in
diff --git a/security/snortsam/Makefile b/security/snortsam/Makefile
index a7fb01a45ad1..8baee38d07a6 100644
--- a/security/snortsam/Makefile
+++ b/security/snortsam/Makefile
@@ -21,7 +21,7 @@ OPTIONS=	IPFW	"checks if configured tables are available" on \
 
 .include <bsd.port.pre.mk>
 
-USE_RC_SUBR=	snortsam.sh
+USE_RC_SUBR=	snortsam
 SUB_FILES=	pkg-message \
 		pkg-install
 
diff --git a/security/snortsam/files/snortsam.sh.in b/security/snortsam/files/snortsam.in
index bc78d1fc7e4e..bc78d1fc7e4e 100644
--- a/security/snortsam/files/snortsam.sh.in
+++ b/security/snortsam/files/snortsam.in
diff --git a/security/spybye/Makefile b/security/spybye/Makefile
index 9981e037108a..a072780a507d 100644
--- a/security/spybye/Makefile
+++ b/security/spybye/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
 
 OPTIONS=	CLAMAV "Enable CLAMAV support" off
 
-USE_RC_SUBR=	spybye.sh
+USE_RC_SUBR=	spybye
 GNU_CONFIGURE=	yes
 
 MAN1=		spybye.1
diff --git a/security/spybye/files/spybye.sh.in b/security/spybye/files/spybye.in
index 9c535e002be0..1e7ca85443d0 100644
--- a/security/spybye/files/spybye.sh.in
+++ b/security/spybye/files/spybye.in
@@ -1,11 +1,12 @@
 #!/bin/sh
-#
 
+# $FreeBSD$
+#
 # PROVIDE: spybye
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
-
+#
 # Add the following lines to /etc/rc.conf to enable spybye:
 # spybye_enable (bool):       Set to YES to enable spybye
 #                               Default: NO
diff --git a/security/tinc/Makefile b/security/tinc/Makefile
index 45149227ba27..27f8578532bd 100644
--- a/security/tinc/Makefile
+++ b/security/tinc/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--localstatedir=/var
-USE_RC_SUBR=	tincd.sh
+USE_RC_SUBR=	tincd
 
 PLIST_FILES=	sbin/tincd
 MAN5=	tinc.conf.5
diff --git a/security/tinc/files/tincd.sh.in b/security/tinc/files/tincd.in
index 96c38d7d02ad..83bc2c4c3832 100644
--- a/security/tinc/files/tincd.sh.in
+++ b/security/tinc/files/tincd.in
@@ -1,11 +1,12 @@
 #!/bin/sh
-#
 
+# $FreeBSD$
+#
 # PROVIDE: tincd
 # REQUIRE: ipfilter FILESYSTEMS sysctl netif
 # BEFORE:  SERVERS routing
 # KEYWORD: nojail
-
+#
 # Define these tincd_* variables in one of these files:
 #	/etc/rc.conf
 #	/etc/rc.conf.local