Move the rc.d scripts of the form *.sh.in to *.in

Where necessary add $FreeBSD$ to the file

No PORTREVISION bump necessary because this is a no-op

611 files changed, 407 insertions, 373 deletions

diff --git a/audio/gnump3d/Makefile b/audio/gnump3d/Makefile
index c7b5b9a23b05..066aeafad9ee 100644
--- a/audio/gnump3d/Makefile
+++ b/audio/gnump3d/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
 USE_BZIP2=	yes
 USE_PERL5_RUN=	5.8.0+
 NO_BUILD=	yes
-USE_RC_SUBR=	gnump3d.sh
+USE_RC_SUBR=	gnump3d
 SUB_LIST+=	PERL=${PERL}
 
 MAN1=		gnump3d-index.1 gnump3d-top.1 gnump3d.1 gnump3d.conf.1
diff --git a/audio/gnump3d/files/gnump3d.sh.in b/audio/gnump3d/files/gnump3d.in
index e68f1c1cf09c..4f0dfb2dd5a9 100644
--- a/audio/gnump3d/files/gnump3d.sh.in
+++ b/audio/gnump3d/files/gnump3d.in
@@ -1,4 +1,6 @@
 #!/bin/sh
+
+# $FreeBSD$
 #
 # PROVIDE: gnump3d
 # REQUIRE: DAEMON NETWORKING LOGIN
diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index d8eb7a57b9b7..a0a8c620576c 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -28,7 +28,7 @@ LICENSE=	GPLv2
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_RC_SUBR=	icecast2.sh
+USE_RC_SUBR=	icecast2
 SUB_FILES+=	pkg-message
 CONFIGURE_ENV=	OGG_PREFIX=${LOCALBASE}
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/icecast2/files/icecast2.sh.in b/audio/icecast2/files/icecast2.in
index 05f0f7494cb2..05f0f7494cb2 100644
--- a/audio/icecast2/files/icecast2.sh.in
+++ b/audio/icecast2/files/icecast2.in
diff --git a/audio/ices0/Makefile b/audio/ices0/Makefile
index 48df1919ced8..1eaeb1234bc9 100644
--- a/audio/ices0/Makefile
+++ b/audio/ices0/Makefile
@@ -26,7 +26,7 @@ USE_PERL5=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=  yes
 LATEST_LINK=	ices0
-USE_RC_SUBR=	ices0.sh
+USE_RC_SUBR=	ices0
 SUB_FILES+=	message message-bin
 CONFIGURE_ARGS+=--program-suffix=0
 
diff --git a/audio/ices0/files/ices0.sh.in b/audio/ices0/files/ices0.in
index 698128f462d7..698128f462d7 100644
--- a/audio/ices0/files/ices0.sh.in
+++ b/audio/ices0/files/ices0.in
diff --git a/audio/liquidsoap/Makefile b/audio/liquidsoap/Makefile
index a4698d6a2e55..054c8a030571 100644
--- a/audio/liquidsoap/Makefile
+++ b/audio/liquidsoap/Makefile
@@ -67,7 +67,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 USE_BZIP2=	yes
 
-USE_RC_SUBR=	liquidsoap.sh
+USE_RC_SUBR=	liquidsoap
 
 USE_OCAML=	yes
 NO_OCAML_RUNDEPENDS=	yes
diff --git a/audio/liquidsoap/files/liquidsoap.sh.in b/audio/liquidsoap/files/liquidsoap.in
index bc7bb18b0872..df7420e2abd1 100644
--- a/audio/liquidsoap/files/liquidsoap.sh.in
+++ b/audio/liquidsoap/files/liquidsoap.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: liquidsoap
 # REQUIRE: NETWORKING icecast2 shoutcast
 # KEYWORD: shutdown
diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile
index a1d33083119a..7773f38a4369 100644
--- a/audio/squeezeboxserver/Makefile
+++ b/audio/squeezeboxserver/Makefile
@@ -77,7 +77,7 @@ RUN_DEPENDS+=	shorten:${PORTSDIR}/audio/shorten
 RUN_DEPENDS+=	sox:${PORTSDIR}/audio/sox
 .endif
 
-USE_RC_SUBR=	squeezeboxserver.sh
+USE_RC_SUBR=	squeezeboxserver
 TMP_SLIMDIR=	${WRKDIR}/_squeezeboxserver
 TMP_DOCSDIR=	${WRKDIR}/doc
 DOCFILES=	Changelog.html Installation.txt License.txt
diff --git a/audio/squeezeboxserver/files/squeezeboxserver.sh.in b/audio/squeezeboxserver/files/squeezeboxserver.in
index 833ea1871af0..833ea1871af0 100644
--- a/audio/squeezeboxserver/files/squeezeboxserver.sh.in
+++ b/audio/squeezeboxserver/files/squeezeboxserver.in
diff --git a/audio/ventrilo-server/Makefile b/audio/ventrilo-server/Makefile
index c72b8decfbf2..6100d51aecdf 100644
--- a/audio/ventrilo-server/Makefile
+++ b/audio/ventrilo-server/Makefile
@@ -25,7 +25,7 @@ IA32_BINARY_PORT=	yes
 NO_BUILD=	yes
 RESTRICTED=	Redistribution of pre-compiled binaries is not permitted
 INSTALL_DIR=	${PREFIX}/ventrilo-server
-USE_RC_SUBR=	${PORTNAME}${PKGNAMESUFFIX}.sh
+USE_RC_SUBR=	${PORTNAME}${PKGNAMESUFFIX}
 VENT_USER=	${PORTNAME}
 USERS=		${VENT_USER}
 GROUPS=		${USERS}
diff --git a/audio/ventrilo-server/files/ventrilo-server.sh.in b/audio/ventrilo-server/files/ventrilo-server.in
index f638cd279564..f638cd279564 100644
--- a/audio/ventrilo-server/files/ventrilo-server.sh.in
+++ b/audio/ventrilo-server/files/ventrilo-server.in
diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile
index bbce60934046..18c936c60200 100644
--- a/comms/conserver-com/Makefile
+++ b/comms/conserver-com/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Application that allows multiple users to watch serial consoles
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-master=${DEFAULTHOST} --with-port=${DEFAULTPORT} \
 		--with-pam --with-libwrap --with-openssl
-USE_RC_SUBR=	conserver.sh
+USE_RC_SUBR=	conserver
 
 MAN1=	console.1
 MAN5=	conserver.cf.5 conserver.passwd.5
diff --git a/comms/conserver-com/files/conserver.sh.in b/comms/conserver-com/files/conserver.in
index cb7e87dfece7..cb7e87dfece7 100644
--- a/comms/conserver-com/files/conserver.sh.in
+++ b/comms/conserver-com/files/conserver.in
diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index abccf88bda5b..eec3f7cbde0b 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -30,7 +30,7 @@ DEFAULTHOST?=	localhost
 DEFAULTPORT?=	782
 MAKE_ENV+=	DEFAULTHOST="${DEFAULTHOST}" DEFAULTPORT="${DEFAULTPORT}"
 #PKGMESSAGE=	${WRKDIR}/MESSAGE
-USE_RC_SUBR=	conserver.sh
+USE_RC_SUBR=	conserver
 
 do-build:
 	${REINPLACE_CMD} -e 's:/usr/local/lib:${PREFIX}/etc:g'  \
diff --git a/comms/conserver/files/conserver.sh.in b/comms/conserver/files/conserver.in
index 0cc210e94f2e..0cc210e94f2e 100644
--- a/comms/conserver/files/conserver.sh.in
+++ b/comms/conserver/files/conserver.in
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index f4bcb99a1a38..b36883a22031 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -36,7 +36,7 @@ MAKE_ARGS+=	OPTIMIZER="" -EOPTIMIZER
 
 PORTDOCS=	RELEASENOTES-4.3.txt RELEASENOTES-4.4.txt RELEASENOTES-6.0.txt
 SUB_FILES=	pkg-message
-USE_RC_SUBR=	hylafax.sh
+USE_RC_SUBR=	hylafax
 
 MAN1=	edit-faxcover.1 faxalter.1 faxcover.1 faxmail.1 faxrm.1 faxstat.1 \
 	hylafax-client.1 sendfax.1 sendpage.1 sgi2fax.1 textfmt.1
diff --git a/comms/hylafax/files/hylafax.sh.in b/comms/hylafax/files/hylafax.in
index 9364e6ad689c..3645960deefa 100644
--- a/comms/hylafax/files/hylafax.sh.in
+++ b/comms/hylafax/files/hylafax.in
@@ -1,8 +1,7 @@
-
 #!/bin/sh
-#
-# $Id: hylafax.sh
 
+# $FreeBSD$
+#
 # PROVIDE: hylafax
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
@@ -25,5 +24,3 @@ procname="%%PREFIX%%/sbin/faxq"
 
 load_rc_config $name
 run_rc_command "$1"
-
-# eof
diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile
index 30c8acb792d0..5f352f674512 100644
--- a/comms/lirc/Makefile
+++ b/comms/lirc/Makefile
@@ -39,7 +39,7 @@ OPTIONS_DEFINE=	MINIMAL DEBUG UARTLIRC
 MINIMAL_DESC=	Build with minmal dependencies
 UARTLIRC_DESC=	Install serial LIRC driver
 
-USE_RC_SUBR=	lircd.sh
+USE_RC_SUBR=	lircd
 PORTDOCS=	html images irxevent.keys lirc.css lirc.hwdb
 PORTEXAMPLES=	remotes
 SUB_FILES=	pkg-message lircd.conf
diff --git a/comms/lirc/files/lircd.sh.in b/comms/lirc/files/lircd.in
index ecc2cc83d122..ecc2cc83d122 100644
--- a/comms/lirc/files/lircd.sh.in
+++ b/comms/lirc/files/lircd.in
diff --git a/databases/drizzle/Makefile b/databases/drizzle/Makefile
index ddd20d75617a..d24b6958bba9 100644
--- a/databases/drizzle/Makefile
+++ b/databases/drizzle/Makefile
@@ -55,7 +55,7 @@ MAN1=	drizzle.1 \
 
 MAN8=	drizzled.8
 
-USE_RC_SUBR=	drizzle-server.sh
+USE_RC_SUBR=	drizzle-server
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/drizzle/files/drizzle-server.sh.in b/databases/drizzle/files/drizzle-server.in
index 162d3e71b36a..162d3e71b36a 100644
--- a/databases/drizzle/files/drizzle-server.sh.in
+++ b/databases/drizzle/files/drizzle-server.in
diff --git a/databases/frontbase/Makefile b/databases/frontbase/Makefile
index 9c2b3ddcd170..d1a6939ac0d1 100644
--- a/databases/frontbase/Makefile
+++ b/databases/frontbase/Makefile
@@ -22,7 +22,7 @@ LICENSE_PERMS=	no-auto-accept # nothing else allowed either
 
 NO_PACKAGE=	license requires confirmation
 
-USE_RC_SUBR=	frontbase.sh
+USE_RC_SUBR=	frontbase
 USE_LDCONFIG=	yes
 SUB_FILES+=	pkg-message
 
diff --git a/databases/frontbase/files/frontbase.sh.in b/databases/frontbase/files/frontbase.in
index b11a623a3d49..b11a623a3d49 100644
--- a/databases/frontbase/files/frontbase.sh.in
+++ b/databases/frontbase/files/frontbase.in
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 2db5b021c5f5..cf39def95b92 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -93,7 +93,7 @@ LATEST_LINK=	mysql41-server
 
 CONFLICTS=	mysql-server-[35].* mysql-server-4.[02-9].*
 
-USE_RC_SUBR=	mysql-server.sh
+USE_RC_SUBR=	mysql-server
 
 USERS=		mysql
 GROUPS=		mysql
diff --git a/databases/mysql41-server/files/mysql-server.sh.in b/databases/mysql41-server/files/mysql-server.in
index 7d32b4390512..7d32b4390512 100644
--- a/databases/mysql41-server/files/mysql-server.sh.in
+++ b/databases/mysql41-server/files/mysql-server.in
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 2a71e09fac0f..77038daf7b83 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -104,7 +104,7 @@ LATEST_LINK=	mysql50-server
 
 CONFLICTS_INSTALL=	mysql-server-[34].* mysql-server-5.[1-9].*
 
-USE_RC_SUBR=	mysql-server.sh
+USE_RC_SUBR=	mysql-server
 
 USERS=		mysql
 GROUPS=		mysql
diff --git a/databases/mysql50-server/files/mysql-server.sh.in b/databases/mysql50-server/files/mysql-server.in
index 0f09381c1242..0f09381c1242 100644
--- a/databases/mysql50-server/files/mysql-server.sh.in
+++ b/databases/mysql50-server/files/mysql-server.in
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index c85f0a96f0a1..4cec11226381 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -98,7 +98,7 @@ LATEST_LINK=	mysql51-server
 
 CONFLICTS_INSTALL=	mysql-server-[34].* mysql-server-5.[02-9].*
 
-USE_RC_SUBR=	mysql-server.sh
+USE_RC_SUBR=	mysql-server
 
 USERS=		mysql
 GROUPS=		mysql
diff --git a/databases/mysql51-server/files/mysql-server.sh.in b/databases/mysql51-server/files/mysql-server.in
index 14104b1cbba4..14104b1cbba4 100644
--- a/databases/mysql51-server/files/mysql-server.sh.in
+++ b/databases/mysql51-server/files/mysql-server.in
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 79d9560e8c5f..d62adfb88259 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -63,7 +63,7 @@ LATEST_LINK=	mysql55-server
 
 CONFLICTS_INSTALL=	mysql-server-[34].* mysql-server-5.[0-46-9].*
 
-USE_RC_SUBR=	mysql-server.sh
+USE_RC_SUBR=	mysql-server
 
 USERS=		mysql
 GROUPS=		mysql
diff --git a/databases/mysql55-server/files/mysql-server.sh.in b/databases/mysql55-server/files/mysql-server.in
index fa701dcca45b..fa701dcca45b 100644
--- a/databases/mysql55-server/files/mysql-server.sh.in
+++ b/databases/mysql55-server/files/mysql-server.in
diff --git a/databases/mysqlard/Makefile b/databases/mysqlard/Makefile
index 07bc39f1a69a..7c9e9c612b89 100644
--- a/databases/mysqlard/Makefile
+++ b/databases/mysqlard/Makefile
@@ -22,7 +22,7 @@ USE_MYSQL=	yes
 
 MYSQLARD_DIR?=	${PREFIX}/www/mysqlard
 
-USE_RC_SUBR=	mysqlard.sh
+USE_RC_SUBR=	mysqlard
 
 MAN1=		mysqlar_graph.1
 MAN8=		mysqlard.8
diff --git a/databases/mysqlard/files/mysqlard.sh.in b/databases/mysqlard/files/mysqlard.in
index fcd25baf9441..2c5b39080a6b 100644
--- a/databases/mysqlard/files/mysqlard.sh.in
+++ b/databases/mysqlard/files/mysqlard.in
@@ -1,4 +1,6 @@
 #!/bin/sh
+
+# $FreeBSD$
 #
 #  $Id: mysqlard.server.sh 40 2006-01-20 20:26:11Z dewitge $
 #	
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index c8e613dfba61..769feadef78a 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -67,7 +67,7 @@ LATEST_LINK=	percona55-server
 
 CONFLICTS_INSTALL=	mysql-server-[34].* mysql-server-5.[0-46-9].*
 
-USE_RC_SUBR=	mysql-server.sh
+USE_RC_SUBR=	mysql-server
 
 USERS=		mysql
 GROUPS=		mysql
diff --git a/databases/percona55-server/files/mysql-server.sh.in b/databases/percona55-server/files/mysql-server.in
index fa701dcca45b..fa701dcca45b 100644
--- a/databases/percona55-server/files/mysql-server.sh.in
+++ b/databases/percona55-server/files/mysql-server.in
diff --git a/databases/pgbouncer/Makefile b/databases/pgbouncer/Makefile
index 38a8e3009a5d..b8606dceed0c 100644
--- a/databases/pgbouncer/Makefile
+++ b/databases/pgbouncer/Makefile
@@ -22,7 +22,7 @@ PORTSCOUT=	site:http://pgfoundry.org/frs/?group_id=1000258
 USERS=		pgbouncer
 GROUPS=		pgbouncer
 
-USE_RC_SUBR=	pgbouncer.sh
+USE_RC_SUBR=	pgbouncer
 SUB_FILES=	pkg-message pkg-install pkg-deinstall
 
 GNU_CONFIGURE=	yes
diff --git a/databases/pgbouncer/files/pgbouncer.sh.in b/databases/pgbouncer/files/pgbouncer.in
index f66379a9e238..f66379a9e238 100644
--- a/databases/pgbouncer/files/pgbouncer.sh.in
+++ b/databases/pgbouncer/files/pgbouncer.in
diff --git a/databases/slony1/Makefile b/databases/slony1/Makefile
index 392df24ad0d2..c6db1fa31317 100644
--- a/databases/slony1/Makefile
+++ b/databases/slony1/Makefile
@@ -22,7 +22,7 @@ USE_BISON=	build
 USE_PGSQL=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-USE_RC_SUBR=	slon.sh
+USE_RC_SUBR=	slon
 
 SUB_FILES=	pkg-message slon-mkservice.sh
 SUB_LIST+=	NAME=slon
diff --git a/databases/slony1/files/slon.sh.in b/databases/slony1/files/slon.in
index 6a5f1a45d317..6a5f1a45d317 100644
--- a/databases/slony1/files/slon.sh.in
+++ b/databases/slony1/files/slon.in
diff --git a/databases/slony1v2/Makefile b/databases/slony1v2/Makefile
index ef3b0f80f462..c86a7d23d4df 100644
--- a/databases/slony1v2/Makefile
+++ b/databases/slony1v2/Makefile
@@ -24,7 +24,7 @@ USE_BISON=	build
 USE_PGSQL=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-USE_RC_SUBR=	slon.sh
+USE_RC_SUBR=	slon
 
 SUB_FILES=	pkg-message slon-mkservice.sh
 SUB_LIST+=	NAME=slon
diff --git a/databases/slony1v2/files/slon.sh.in b/databases/slony1v2/files/slon.in
index 6a5f1a45d317..6a5f1a45d317 100644
--- a/databases/slony1v2/files/slon.sh.in
+++ b/databases/slony1v2/files/slon.in
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index e005aebc4144..729253c3aa67 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -40,7 +40,7 @@ CPPFLAGS+=	-std=gnu89 -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	PATH=${LOCALBASE}/bin:${PATH}\
 		ISQL=isql-vt
-USE_RC_SUBR=	virtuoso.sh
+USE_RC_SUBR=	virtuoso
 ONLY_FOR_ARCHS=	i386 amd64 sparc64
 USERS=		virtuoso
 GROUPS=		virtuoso
diff --git a/databases/virtuoso/files/virtuoso.sh.in b/databases/virtuoso/files/virtuoso.in
index da1c267b51ee..da1c267b51ee 100644
--- a/databases/virtuoso/files/virtuoso.sh.in
+++ b/databases/virtuoso/files/virtuoso.in
diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index 04e523bc53ad..6a7311a65196 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 DISTCCD_PIDFILE=/var/run/distccd.pid
-USE_RC_SUBR=	distccd.sh
+USE_RC_SUBR=	distccd
 SUB_LIST=	DISTCCD_PIDFILE=${DISTCCD_PIDFILE}
 
 OPTIONS=	GNOME	"Build GUI monitor based on GNOME"	Off \
diff --git a/devel/distcc/files/distccd.sh.in b/devel/distcc/files/distccd.in
index c9b9d4ac3b2d..c9b9d4ac3b2d 100644
--- a/devel/distcc/files/distccd.sh.in
+++ b/devel/distcc/files/distccd.in
diff --git a/devel/gearmand/Makefile b/devel/gearmand/Makefile
index 372bc6e4cd3c..80a166af7661 100644
--- a/devel/gearmand/Makefile
+++ b/devel/gearmand/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
-USE_RC_SUBR=	gearmand.sh
+USE_RC_SUBR=	gearmand
 CONFIGURE_ARGS+=--with-lib-prefix=${LOCALBASE} --with-boost=${LOCALBASE}
 
 OPTIONS=	DRIZZLE "Enable Drizzle support for persistent queue" off \
diff --git a/devel/gearmand/files/gearmand.sh.in b/devel/gearmand/files/gearmand.in
index e313c2e435b9..e313c2e435b9 100644
--- a/devel/gearmand/files/gearmand.sh.in
+++ b/devel/gearmand/files/gearmand.in
diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile
index b8200686ff02..9dd75c0e919d 100644
--- a/devel/p4d/Makefile
+++ b/devel/p4d/Makefile
@@ -36,7 +36,7 @@ P4LOG?=		/var/log/p4d.log
 SUB_LIST=	P4ROOT=${P4ROOT} \
 		P4LOG=${P4LOG}
 
-USE_RC_SUBR=	p4d.sh
+USE_RC_SUBR=	p4d
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/p4d/files/p4d.sh.in b/devel/p4d/files/p4d.in
index 8cfbce26fb25..8cfbce26fb25 100644
--- a/devel/p4d/files/p4d.sh.in
+++ b/devel/p4d/files/p4d.in
diff --git a/devel/p4ftpd/Makefile b/devel/p4ftpd/Makefile
index c04adc6e3d3c..11ebaaeded59 100644
--- a/devel/p4ftpd/Makefile
+++ b/devel/p4ftpd/Makefile
@@ -32,7 +32,7 @@ P4LOG?=		/var/log/p4ftpd.log
 
 SUB_LIST=	P4LOG=${P4LOG}
 
-USE_RC_SUBR=	p4ftpd.sh
+USE_RC_SUBR=	p4ftpd
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/p4ftpd/files/p4ftpd.sh.in b/devel/p4ftpd/files/p4ftpd.in
index aa7c0d5b026b..aa7c0d5b026b 100644
--- a/devel/p4ftpd/files/p4ftpd.sh.in
+++ b/devel/p4ftpd/files/p4ftpd.in
diff --git a/devel/p4p/Makefile b/devel/p4p/Makefile
index 831374092c74..58f46f85cd57 100644
--- a/devel/p4p/Makefile
+++ b/devel/p4p/Makefile
@@ -36,7 +36,7 @@ P4LOG?=		/var/log/p4p.log
 SUB_LIST=	P4CACHE=${P4CACHE} \
 		P4LOG=${P4LOG}
 
-USE_RC_SUBR=	p4p.sh
+USE_RC_SUBR=	p4p
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/p4p/files/p4p.sh.in b/devel/p4p/files/p4p.in
index aa407e4d089f..aa407e4d089f 100644
--- a/devel/p4p/files/p4p.sh.in
+++ b/devel/p4p/files/p4p.in
diff --git a/devel/p4web/Makefile b/devel/p4web/Makefile
index 32df11f938eb..b50d66da37a7 100644
--- a/devel/p4web/Makefile
+++ b/devel/p4web/Makefile
@@ -32,7 +32,7 @@ P4LOG?=		/var/log/p4web.log
 
 SUB_LIST=	P4LOG=${P4LOG}
 
-USE_RC_SUBR=	p4web.sh
+USE_RC_SUBR=	p4web
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/p4web/files/p4web.sh.in b/devel/p4web/files/p4web.in
index b2c3276bf6ec..b2c3276bf6ec 100644
--- a/devel/p4web/files/p4web.sh.in
+++ b/devel/p4web/files/p4web.in
diff --git a/devel/p5-Java/Makefile b/devel/p5-Java/Makefile
index 474229356658..f4322c50adf1 100644
--- a/devel/p5-Java/Makefile
+++ b/devel/p5-Java/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	numisemis@yahoo.com
 COMMENT=	Perl extension for accessing a JVM remotely or locally
 
-USE_RC_SUBR=	javaserver.sh
+USE_RC_SUBR=	javaserver
 PERL_CONFIGURE=	YES
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
diff --git a/devel/p5-Java/files/javaserver.sh.in b/devel/p5-Java/files/javaserver.in
index db4069de4e91..db4069de4e91 100644
--- a/devel/p5-Java/files/javaserver.sh.in
+++ b/devel/p5-Java/files/javaserver.in
diff --git a/dns/dnrd/Makefile b/dns/dnrd/Makefile
index efa4da7ba749..c02818b35e1d 100644
--- a/dns/dnrd/Makefile
+++ b/dns/dnrd/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=		natanael.copa@gmail.com
 COMMENT=		A proxy DNS daemon
 
 USE_GMAKE=		yes
-USE_RC_SUBR=		${PORTNAME}.sh
+USE_RC_SUBR=		${PORTNAME}
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
 
diff --git a/dns/dnrd/files/dnrd.sh.in b/dns/dnrd/files/dnrd.in
index 1e801c5d493d..9afbe2e77632 100644
--- a/dns/dnrd/files/dnrd.sh.in
+++ b/dns/dnrd/files/dnrd.in
@@ -1,5 +1,6 @@
-#! /bin/sh
-#
+#!/bin/sh
+
+# $FreeBSD$
 #
 # PROVIDE: dnrd
 # REQUIRE: DAEMON NETWORKING SERVERS
@@ -7,7 +8,6 @@
 # Add the following line to /etc/rc.conf to enable dnrd:
 #
 # dnrd_enable="YES"
-#
 
 # override these variables in /etc/rc.conf
 dnrd_enable=${dnrd_enable-"NO"}
@@ -31,4 +31,3 @@ case $1 in
 		run_rc_command "$1"
 		;;
 esac
-
diff --git a/dns/dns_balance/Makefile b/dns/dns_balance/Makefile
index 6de617276799..7bb64354719d 100644
--- a/dns/dns_balance/Makefile
+++ b/dns/dns_balance/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A dynamic load-balancing DNS server
 
 USE_RUBY=	yes
-USE_RC_SUBR=	dns_balance.sh
+USE_RC_SUBR=	dns_balance
 
 NO_BUILD=	yes
 
diff --git a/dns/dns_balance/files/dns_balance.sh.in b/dns/dns_balance/files/dns_balance.in
index 50a51098631c..50a51098631c 100644
--- a/dns/dns_balance/files/dns_balance.sh.in
+++ b/dns/dns_balance/files/dns_balance.in
diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile
index 9c66f98caa72..9c61e28991c0 100644
--- a/dns/dnsmasq/Makefile
+++ b/dns/dnsmasq/Makefile
@@ -71,7 +71,7 @@ CFLAGS+=	-DHAVE_LUASCRIPT
 USE_LUA=	5.1
 .endif
 
-USE_RC_SUBR=	dnsmasq.sh
+USE_RC_SUBR=	dnsmasq
 
 .include <bsd.port.pre.mk>
 
diff --git a/dns/dnsmasq/files/dnsmasq.sh.in b/dns/dnsmasq/files/dnsmasq.in
index 26d7b267d301..ae752c379bae 100644
--- a/dns/dnsmasq/files/dnsmasq.sh.in
+++ b/dns/dnsmasq/files/dnsmasq.in
@@ -1,4 +1,6 @@
-#! /bin/sh
+#!/bin/sh
+
+# $FreeBSD$
 #
 # PROVIDE: dnsmasq
 # REQUIRE: SERVERS
diff --git a/dns/dualserver/Makefile b/dns/dualserver/Makefile
index 2391995f85be..e9266018788a 100644
--- a/dns/dualserver/Makefile
+++ b/dns/dualserver/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Combined DHCP/DNS server for small LANs
 
 USE_DOS2UNIX=	yes
-USE_RC_SUBR=	dualserver.sh
+USE_RC_SUBR=	dualserver
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST_FILES=	sbin/dualserver etc/dualserver.conf.sample
 
diff --git a/dns/dualserver/files/dualserver.sh.in b/dns/dualserver/files/dualserver.in
index 9c90a19714bd..b094232a491b 100644
--- a/dns/dualserver/files/dualserver.sh.in
+++ b/dns/dualserver/files/dualserver.in
@@ -1,6 +1,7 @@
 #!/bin/sh
-#
 
+# $FreeBSD$
+#
 # PROVIDE: dualserver
 # REQUIRE: SERVERS
 # BEFORE:
diff --git a/dns/ez-ipupdate/Makefile b/dns/ez-ipupdate/Makefile
index 134617547a0b..4aacc06d47e3 100644
--- a/dns/ez-ipupdate/Makefile
+++ b/dns/ez-ipupdate/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	http://dyn.pl/client/UNIX/ez-ipupdate/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Update your host name on any dynamic DNS service
 
-USE_RC_SUBR=	ez-ipupdate.sh
+USE_RC_SUBR=	ez-ipupdate
 GNU_CONFIGURE=	yes
 
 post-install:
diff --git a/dns/ez-ipupdate/files/ez-ipupdate.sh.in b/dns/ez-ipupdate/files/ez-ipupdate.in
index 1209b62e4770..1209b62e4770 100644
--- a/dns/ez-ipupdate/files/ez-ipupdate.sh.in
+++ b/dns/ez-ipupdate/files/ez-ipupdate.in
diff --git a/dns/mydns/Makefile b/dns/mydns/Makefile
index 565c27ad5ecc..fdc188b079c8 100644
--- a/dns/mydns/Makefile
+++ b/dns/mydns/Makefile
@@ -19,7 +19,7 @@ CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc
 USE_ICONV=	yes
 USE_BZIP2=	yes
 
-USE_RC_SUBR=	mydns.sh
+USE_RC_SUBR=	mydns
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/dns/mydns/files/mydns.sh.in b/dns/mydns/files/mydns.in
index 896a550fda4b..896a550fda4b 100644
--- a/dns/mydns/files/mydns.sh.in
+++ b/dns/mydns/files/mydns.in
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index d6b3dc395522..67368f44b0ac 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -75,7 +75,7 @@ CONFIGURE_ARGS+=	--without-icu
 LIB_DEPENDS+=		icuuc:${PORTSDIR}/devel/icu
 .endif
 
-USE_RC_SUBR=		vmware-guestd.sh vmware-kmod.sh
+USE_RC_SUBR=		vmware-guestd vmware-kmod
 
 .include <bsd.port.pre.mk>
 
diff --git a/emulators/open-vm-tools/files/vmware-guestd.sh.in b/emulators/open-vm-tools/files/vmware-guestd.in
index 25c42936435a..25c42936435a 100644
--- a/emulators/open-vm-tools/files/vmware-guestd.sh.in
+++ b/emulators/open-vm-tools/files/vmware-guestd.in
diff --git a/emulators/open-vm-tools/files/vmware-kmod.sh.in b/emulators/open-vm-tools/files/vmware-kmod.in
index 4831d99a4366..4831d99a4366 100644
--- a/emulators/open-vm-tools/files/vmware-kmod.sh.in
+++ b/emulators/open-vm-tools/files/vmware-kmod.in
diff --git a/emulators/vmware-guestd4/Makefile b/emulators/vmware-guestd4/Makefile
index eaff35fd3128..6ac05533df57 100644
--- a/emulators/vmware-guestd4/Makefile
+++ b/emulators/vmware-guestd4/Makefile
@@ -25,7 +25,7 @@ IGNOREFILES=	${DISTFILES}
 WRKSRC=		${WRKDIR}/vmware-tools-distrib
 
 ONLY_FOR_ARCHS=	i386
-USE_RC_SUBR=	vmware-guestd.sh
+USE_RC_SUBR=	vmware-guestd
 .if !defined(BATCH)
 IS_INTERACTIVE=	yes
 .endif
diff --git a/emulators/vmware-guestd4/files/vmware-guestd.sh.in b/emulators/vmware-guestd4/files/vmware-guestd.in
index 2e076c9a3a94..2e076c9a3a94 100644
--- a/emulators/vmware-guestd4/files/vmware-guestd.sh.in
+++ b/emulators/vmware-guestd4/files/vmware-guestd.in
diff --git a/emulators/vmware-guestd5/Makefile b/emulators/vmware-guestd5/Makefile
index a05974598b67..b0dee8df1db5 100644
--- a/emulators/vmware-guestd5/Makefile
+++ b/emulators/vmware-guestd5/Makefile
@@ -42,7 +42,7 @@ LIB_DEPENDS+=	c.6:${PORTSDIR}/misc/compat6x
 PLIST_SUB+=	INSTALLXGTKTOOL:="@comment "
 .endif
 .else
-USE_RC_SUBR=	vmware-guestd.sh
+USE_RC_SUBR=	vmware-guestd
 .endif
 
 RESTRICTED=	"Not sure if we can redistribute this."
diff --git a/emulators/vmware-guestd5/files/vmware-guestd.sh.in b/emulators/vmware-guestd5/files/vmware-guestd.in
index 98bcad2c83d3..98bcad2c83d3 100644
--- a/emulators/vmware-guestd5/files/vmware-guestd.sh.in
+++ b/emulators/vmware-guestd5/files/vmware-guestd.in
diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile
index 20cd13122a11..19449fb4fab5 100644
--- a/emulators/vmware-guestd6/Makefile
+++ b/emulators/vmware-guestd6/Makefile
@@ -55,7 +55,7 @@ USE_GNOME+=	glib12 gtk12
 PLIST_SUB+=	INSTALLXGTKTOOL="@comment "
 .endif
 .else
-USE_RC_SUBR=	vmware-guestd.sh
+USE_RC_SUBR=	vmware-guestd
 .endif
 .if ${OSVERSION} >= 700000
 LIB_DEPENDS+=	c.6:${PORTSDIR}/misc/compat6x
diff --git a/emulators/vmware-guestd6/files/vmware-guestd.sh.in b/emulators/vmware-guestd6/files/vmware-guestd.in
index 98bcad2c83d3..98bcad2c83d3 100644
--- a/emulators/vmware-guestd6/files/vmware-guestd.sh.in
+++ b/emulators/vmware-guestd6/files/vmware-guestd.in
diff --git a/ftp/frox/Makefile b/ftp/frox/Makefile
index 86c5eca2a881..95390c154f7a 100644
--- a/ftp/frox/Makefile
+++ b/ftp/frox/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-USE_RC_SUBR=	frox.sh
+USE_RC_SUBR=	frox
 SUB_FILES=	pkg-message
 
 MAN1=		frox.1
diff --git a/ftp/frox/files/frox.sh.in b/ftp/frox/files/frox.in
index 4b584b4167e3..4b584b4167e3 100644
--- a/ftp/frox/files/frox.sh.in
+++ b/ftp/frox/files/frox.in
diff --git a/ftp/ftpd-tls/Makefile b/ftp/ftpd-tls/Makefile
index dec789f64008..d0291b2ad59e 100644
--- a/ftp/ftpd-tls/Makefile
+++ b/ftp/ftpd-tls/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Ftp server supporting FTP AUTH TLS
 
 GNU_CONFIGURE=	YES
 USE_OPENSSL=	YES
-USE_RC_SUBR=	ftpd-tls.sh
+USE_RC_SUBR=	ftpd-tls
 
 MAN8=		ftpd-tls.8
 
diff --git a/ftp/ftpd-tls/files/ftpd-tls.sh.in b/ftp/ftpd-tls/files/ftpd-tls.in
index a276e72ca1bc..a276e72ca1bc 100644
--- a/ftp/ftpd-tls/files/ftpd-tls.sh.in
+++ b/ftp/ftpd-tls/files/ftpd-tls.in
diff --git a/ftp/ftpsesame/Makefile b/ftp/ftpsesame/Makefile
index 074f06febc8c..6ceb221910bb 100644
--- a/ftp/ftpsesame/Makefile
+++ b/ftp/ftpsesame/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Helper for pf firewall to pass FTP protocol
 
 MAN8=		ftpsesame.8
 PLIST_FILES=	bin/ftpsesame
-USE_RC_SUBR=	ftpsesame.sh
+USE_RC_SUBR=	ftpsesame
 
 MAKE_ARGS=	PREFIX=${PREFIX} MANPREFIX=${MANPREFIX}
 
diff --git a/ftp/ftpsesame/files/ftpsesame.sh.in b/ftp/ftpsesame/files/ftpsesame.in
index 6bcb29a525b3..6bcb29a525b3 100644
--- a/ftp/ftpsesame/files/ftpsesame.sh.in
+++ b/ftp/ftpsesame/files/ftpsesame.in
diff --git a/ftp/ncftpd/Makefile b/ftp/ncftpd/Makefile
index 59af71174193..80558d614f71 100644
--- a/ftp/ncftpd/Makefile
+++ b/ftp/ncftpd/Makefile
@@ -22,7 +22,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 NO_BUILD=	YES
 RESTRICTED=	30 day evaluation license
 
-USE_RC_SUBR=	ncftpd.sh
+USE_RC_SUBR=	ncftpd
 SUB_FILES=	pkg-message
 
 PORTDOCS=	install.html README README.freebsd LICENSE
diff --git a/ftp/ncftpd/files/ncftpd.sh.in b/ftp/ncftpd/files/ncftpd.in
index 779a78065c89..dcdc33a42d57 100644
--- a/ftp/ncftpd/files/ncftpd.sh.in
+++ b/ftp/ncftpd/files/ncftpd.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: ncftpd
 # REQUIRE: DAEMON
 #
@@ -9,7 +11,6 @@
 # ncftpd_enable="YES"
 # ncftpd_flags="-dq"	# Not required
 # ncftpd_config="/path/to/general.cf /path/to/domain.cf" # Not required
-#
 
 . /etc/rc.subr
 
diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile
index 6c5539a8d66b..5075cedfe065 100644
--- a/ftp/pure-ftpd/Makefile
+++ b/ftp/pure-ftpd/Makefile
@@ -19,7 +19,7 @@ SUB_FILES=	pkg-message
 SUB_LIST=	PAM_DIR=${PAM_DIR} PAM_TARGET=${PAM_TARGET}
 USE_BZIP2=	yes
 USE_PERL5_RUN=	yes
-USE_RC_SUBR=	pure-ftpd.sh
+USE_RC_SUBR=	pure-ftpd
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ARGS=	--with-everything \
diff --git a/ftp/pure-ftpd/files/pure-ftpd.sh.in b/ftp/pure-ftpd/files/pure-ftpd.in
index 50043abd0d98..c8a389076788 100644
--- a/ftp/pure-ftpd/files/pure-ftpd.sh.in
+++ b/ftp/pure-ftpd/files/pure-ftpd.in
@@ -1,10 +1,11 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: pureftpd
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
-
 #
 # Add the following lines to /etc/rc.conf to enable pure-ftpd:
 #
@@ -13,7 +14,6 @@
 # For launch uploadscript daemon define
 # pureftpd_upload_enable="YES"
 # pureftpd_uploadscript="/full/path/to/launch_script"
-#
 
 . /etc/rc.subr
 
diff --git a/ftp/smbftpd/Makefile b/ftp/smbftpd/Makefile
index b0303d2307eb..15b69b119f1c 100644
--- a/ftp/smbftpd/Makefile
+++ b/ftp/smbftpd/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS=	"--prefix=${PREFIX}"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_PERL5=	yes
-USE_RC_SUBR=	${PORTNAME}.sh
+USE_RC_SUBR=	${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
diff --git a/ftp/smbftpd/files/smbftpd.sh.in b/ftp/smbftpd/files/smbftpd.in
index c079c4014309..1b83c83ae54c 100644
--- a/ftp/smbftpd/files/smbftpd.sh.in
+++ b/ftp/smbftpd/files/smbftpd.in
@@ -1,15 +1,15 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: smbftpd
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
-
 #
 # Add the following lines to /etc/rc.conf to enable pure-ftpd:
 #
 # smbftpd_enable="YES"
-#
 
 . /etc/rc.subr
 
diff --git a/ftp/vsftpd-ext/Makefile b/ftp/vsftpd-ext/Makefile
index 57f423a79422..9aae1023b9a9 100644
--- a/ftp/vsftpd-ext/Makefile
+++ b/ftp/vsftpd-ext/Makefile
@@ -36,7 +36,7 @@ OPTIONS=	RC_SCRIPT	"install RC_SCRIPT"		on \
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_RC_SCRIPT)
-USE_RC_SUBR=	vsftpd.sh
+USE_RC_SUBR=	vsftpd
 .endif
 
 .if defined(WITH_VSFTPD_SSL) && !defined(WITHOUT_SSL)
diff --git a/ftp/vsftpd-ext/files/vsftpd.sh.in b/ftp/vsftpd-ext/files/vsftpd.in
index 1832f6fe9d16..1832f6fe9d16 100644
--- a/ftp/vsftpd-ext/files/vsftpd.sh.in
+++ b/ftp/vsftpd-ext/files/vsftpd.in
diff --git a/ftp/vsftpd/Makefile b/ftp/vsftpd/Makefile
index 18a45bbe5907..9fac421a724c 100644
--- a/ftp/vsftpd/Makefile
+++ b/ftp/vsftpd/Makefile
@@ -21,7 +21,7 @@ LICENSE=	GPLv2
 ALL_TARGET=	vsftpd
 MAN5=		vsftpd.conf.5
 MAN8=		vsftpd.8
-USE_RC_SUBR=	vsftpd.sh
+USE_RC_SUBR=	vsftpd
 DOCFILES=	AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL LICENSE \
 		README README.security README.ssl REFS REWARD \
 		SIZE SPEED TODO TUNING
diff --git a/ftp/vsftpd/files/vsftpd.sh.in b/ftp/vsftpd/files/vsftpd.in
index 5f612c27c8dc..5f612c27c8dc 100644
--- a/ftp/vsftpd/files/vsftpd.sh.in
+++ b/ftp/vsftpd/files/vsftpd.in
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index f63835478fdd..27b198e3335f 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modular FTP server configurable online using SITE commands
 
 USE_AUTOTOOLS=	libtool
-USE_RC_SUBR=	wzdftpd.sh
+USE_RC_SUBR=	wzdftpd
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/ftp/wzdftpd/files/wzdftpd.sh.in b/ftp/wzdftpd/files/wzdftpd.in
index 133f8a3e5b82..133f8a3e5b82 100644
--- a/ftp/wzdftpd/files/wzdftpd.sh.in
+++ b/ftp/wzdftpd/files/wzdftpd.in
diff --git a/games/pvpgn/Makefile b/games/pvpgn/Makefile
index 308c23b25046..eb817820a5a6 100644
--- a/games/pvpgn/Makefile
+++ b/games/pvpgn/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/pvpgn \
 		--localstatedir=${DATADIR} \
 		--with-libraries=${LOCALBASE}/lib
 
-USE_RC_SUBR=	bnetd.sh
+USE_RC_SUBR=	bnetd
 
 MAN1=		bnbot.1 bnchat.1 bnetd.1 bnftp.1 bni2tga.1 bnibuild.1 \
 		bniextract.1 bnilist.1 bnpass.1 bnstat.1 bntrackd.1 tgainfo.1
diff --git a/games/pvpgn/files/bnetd.sh.in b/games/pvpgn/files/bnetd.in
index c0381ea9871e..c0381ea9871e 100644
--- a/games/pvpgn/files/bnetd.sh.in
+++ b/games/pvpgn/files/bnetd.in
diff --git a/irc/inspircd12/Makefile b/irc/inspircd12/Makefile
index d9072000f89c..fe7ea00af27a 100644
--- a/irc/inspircd12/Makefile
+++ b/irc/inspircd12/Makefile
@@ -21,7 +21,7 @@ LATEST_LINK=	inspircd12
 WRKSRC=	${WRKDIR}/inspircd
 USE_BZIP2=	yes
 USE_LDCONFIG=	${PREFIX}/lib/inspircd
-USE_RC_SUBR=	inspircd.sh
+USE_RC_SUBR=	inspircd
 MAKE_JOBS_SAFE=	yes
 
 USERS=	${INCPIRCD_USR}
diff --git a/irc/inspircd12/files/inspircd.sh.in b/irc/inspircd12/files/inspircd.in
index eb9e8366ac02..eb9e8366ac02 100644
--- a/irc/inspircd12/files/inspircd.sh.in
+++ b/irc/inspircd12/files/inspircd.in
diff --git a/irc/irc/Makefile b/irc/irc/Makefile
index 6e8d609f7453..072770c750b9 100644
--- a/irc/irc/Makefile
+++ b/irc/irc/Makefile
@@ -20,7 +20,7 @@ COMMENT=	The "Internet Relay Chat" Server
 CONFLICTS_INSTALL=	charybdis-[0-9]* ircd-hybrid-[0-9]* Nefarious-[0-9]* \
 			ru-ircd-hybrid-[0-9]* ircd-ru-[0-9]*
 
-USE_RC_SUBR=	ircd.sh
+USE_RC_SUBR=	ircd
 MAN5=		iauth.conf.5
 MAN8=		ircd.8 iauth.8 ircdwatch.8
 
diff --git a/irc/irc/files/ircd.sh.in b/irc/irc/files/ircd.in
index 5e1ff858b4c6..5e1ff858b4c6 100644
--- a/irc/irc/files/ircd.sh.in
+++ b/irc/irc/files/ircd.in
diff --git a/irc/ircd-hybrid/Makefile b/irc/ircd-hybrid/Makefile
index 44512353618e..851cd720d547 100644
--- a/irc/ircd-hybrid/Makefile
+++ b/irc/ircd-hybrid/Makefile
@@ -23,7 +23,7 @@ GNU_CONFIGURE=	yes
 USERS=		ircd
 GROUPS=		${USERS}
 
-USE_RC_SUBR=	ircd-hybrid.sh
+USE_RC_SUBR=	ircd-hybrid
 SUB_FILES=	pkg-message
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
diff --git a/irc/ircd-hybrid/files/ircd-hybrid.sh.in b/irc/ircd-hybrid/files/ircd-hybrid.in
index 64b97bc81c19..608af1fef0ae 100644
--- a/irc/ircd-hybrid/files/ircd-hybrid.sh.in
+++ b/irc/ircd-hybrid/files/ircd-hybrid.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: ircd-hybrid
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
diff --git a/irc/ircd-ratbox-devel/Makefile b/irc/ircd-ratbox-devel/Makefile
index 433b5f1f1f72..513ca7edc96f 100644
--- a/irc/ircd-ratbox-devel/Makefile
+++ b/irc/ircd-ratbox-devel/Makefile
@@ -22,7 +22,7 @@ CONFLICTS=	ircd-ratbox-[0-9]* charybdis-[0-9]*
 
 USE_BZIP2=	yes
 #MAN8=		ircd.8
-USE_RC_SUBR=	ircd-ratbox.sh
+USE_RC_SUBR=	ircd-ratbox
 USE_SQLITE=	3
 USE_PERL5_BUILD=	yes
 USE_LDCONFIG=	${PREFIX}/lib/ircd-ratbox
diff --git a/irc/ircd-ratbox-devel/files/ircd-ratbox.sh.in b/irc/ircd-ratbox-devel/files/ircd-ratbox.in
index 464cb9521f11..a67342e70112 100644
--- a/irc/ircd-ratbox-devel/files/ircd-ratbox.sh.in
+++ b/irc/ircd-ratbox-devel/files/ircd-ratbox.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: ircd-ratbox
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
diff --git a/irc/ircd-ratbox/Makefile b/irc/ircd-ratbox/Makefile
index 84f5cffc01e0..59513d4597cc 100644
--- a/irc/ircd-ratbox/Makefile
+++ b/irc/ircd-ratbox/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=	ircd-ratbox-devel-[0-9]* charybdis-[0-9]*
 
 USE_BZIP2=	yes
 #MAN8=		ircd.8
-USE_RC_SUBR=	ircd-ratbox.sh
+USE_RC_SUBR=	ircd-ratbox
 USE_SQLITE=	3
 USE_LDCONFIG=	${PREFIX}/lib/ircd-ratbox
 
diff --git a/irc/ircd-ratbox/files/ircd-ratbox.sh.in b/irc/ircd-ratbox/files/ircd-ratbox.in
index fedd43d80296..f2e1e1609a9d 100644
--- a/irc/ircd-ratbox/files/ircd-ratbox.sh.in
+++ b/irc/ircd-ratbox/files/ircd-ratbox.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: ircd-ratbox
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
diff --git a/irc/ratbox-services/Makefile b/irc/ratbox-services/Makefile
index 662ea5be7778..8d925c17e4d7 100644
--- a/irc/ratbox-services/Makefile
+++ b/irc/ratbox-services/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	moggie@elasticmind.net
 COMMENT=	A highly configurable services package for use with ircd-ratbox
 
-USE_RC_SUBR=	ratbox-services.sh
+USE_RC_SUBR=	ratbox-services
 
 USERS=		ircservices
 GROUPS=		${USERS}
diff --git a/irc/ratbox-services/files/ratbox-services.sh.in b/irc/ratbox-services/files/ratbox-services.in
index 5096eb5fa819..1ab25706fb13 100644
--- a/irc/ratbox-services/files/ratbox-services.sh.in
+++ b/irc/ratbox-services/files/ratbox-services.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: ratbox-services
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
diff --git a/irc/thales/Makefile b/irc/thales/Makefile
index 959b6ceb6f1d..f048692c1d64 100644
--- a/irc/thales/Makefile
+++ b/irc/thales/Makefile
@@ -18,7 +18,7 @@ COMMENT=	GNU Thales -- An IRC to MySQL gateway
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_MYSQL=	yes
-USE_RC_SUBR=	thales.sh
+USE_RC_SUBR=	thales
 
 # Currently, not all supported IRCDs are handled here, only the ones
 # I could find corresponding RUN_DEPENDS in our Ports Collection.
diff --git a/irc/thales/files/thales.sh.in b/irc/thales/files/thales.in
index 6e007ac9e50a..6e007ac9e50a 100644
--- a/irc/thales/files/thales.sh.in
+++ b/irc/thales/files/thales.in
diff --git a/irc/tircd/Makefile b/irc/tircd/Makefile
index 05414ddf6699..cfce7ab1274e 100644
--- a/irc/tircd/Makefile
+++ b/irc/tircd/Makefile
@@ -30,7 +30,7 @@ USE_PERL5=	yes
 NO_BUILD=	yes
 
 MAN1=		tircd.1
-USE_RC_SUBR=	tircd.sh
+USE_RC_SUBR=	tircd
 
 post-patch:
 	${REINPLACE_CMD} -e '1s,^#!/usr/bin/perl,#!${PREFIX}/bin/perl,' \
diff --git a/irc/tircd/files/tircd.sh.in b/irc/tircd/files/tircd.in
index eae1eda6e24d..eae1eda6e24d 100644
--- a/irc/tircd/files/tircd.sh.in
+++ b/irc/tircd/files/tircd.in
diff --git a/irc/undernet-ircu/Makefile b/irc/undernet-ircu/Makefile
index 3324c3c7d2a2..8bf66f06d916 100644
--- a/irc/undernet-ircu/Makefile
+++ b/irc/undernet-ircu/Makefile
@@ -19,7 +19,7 @@ USERS=		undernet
 GROUPS=		${USERS}
 
 GNU_CONFIGURE=		yes
-USE_RC_SUBR=		undernet.sh
+USE_RC_SUBR=		undernet
 CONFIGURE_ARGS=		--with-dpath=${PREFIX}/etc/ --with-symlink=no
 
 PLIST_FILES=	bin/ircd bin/umkpasswd bin/convert-conf etc/ircd.conf.example
diff --git a/irc/undernet-ircu/files/undernet.sh.in b/irc/undernet-ircu/files/undernet.in
index e30e7a8d8bb6..4d3819fc06de 100644
--- a/irc/undernet-ircu/files/undernet.sh.in
+++ b/irc/undernet-ircu/files/undernet.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: undernet
 # REQUIRE: LOGIN
 #
diff --git a/irc/unreal/Makefile b/irc/unreal/Makefile
index e730c5698d14..186558aa1937 100644
--- a/irc/unreal/Makefile
+++ b/irc/unreal/Makefile
@@ -27,7 +27,7 @@ RUNDIR=		/var/run/ircd
 LOGDIR=		/var/log/ircd
 
 HAS_CONFIGURE=	yes
-USE_RC_SUBR=	unrealircd.sh
+USE_RC_SUBR=	unrealircd
 
 USERS=		ircd
 GROUPS=		ircd
diff --git a/irc/unreal/files/unrealircd.sh.in b/irc/unreal/files/unrealircd.in
index 9781f577850d..9781f577850d 100644
--- a/irc/unreal/files/unrealircd.sh.in
+++ b/irc/unreal/files/unrealircd.in
diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile
index 2394f10a25d7..f680dfeb0b7c 100644
--- a/japanese/FreeWnn-server/Makefile
+++ b/japanese/FreeWnn-server/Makefile
@@ -53,7 +53,7 @@ MAN4.WNN=	2a_ctrl.4 2b_romkana.4 cvt_key_tbl.4 fzk.data.4 fzk.u.4	\
 		uumkey.4 uumrc.4 wnnenvrc.4
 MAN5.WNN=	pubdic.5 usr_dic.5
 MANLANG.WNN=	ja
-USE_RC_SUBR.WNN=	wnn.sh
+USE_RC_SUBR.WNN=	wnn
 
 # CWnn
 CONFIGURE_ARGS.CWNN+=	--enable-Wnn=no --enable-kWnn=no		\
@@ -63,14 +63,14 @@ LIB_DEPENDS.CWNN=	cwnn.0:${PORTSDIR}/chinese/FreeWnn-lib
 MAN1.CWNN=	cserver.1 cuum.1 cwnnkill.1 cwnnstat.1 catod.1 catof.1	\
 		cdicsort.1 cdtoa.1 cwddel.1 cwdreg.1 cwnntouch.1
 MAN4.CWNN=	cst_end.4 cwnn.4 cenv.4 ckey.4
-USE_RC_SUBR.CWNN=	cwnn.sh twnn.sh
+USE_RC_SUBR.CWNN=	cwnn twnn
 
 # KWnn
 CONFIGURE_ARGS.KWNN+=	--enable-Wnn=no --enable-cWnn=no \
 			--with-libkwnn=-lkwnn \
 			--with-kwnn-libraries="${PREFIX}/lib"
 LIB_DEPENDS.KWNN=	kwnn.0:${PORTSDIR}/korean/FreeWnn-lib
-USE_RC_SUBR.KWNN=	kwnn.sh
+USE_RC_SUBR.KWNN=	kwnn
 
 .for M in LIB_DEPENDS MAN1 MAN4 MAN5 MLINKS MANLANG USE_RC_SUBR
 . if defined(${M}.${WNNTYPE})
diff --git a/japanese/FreeWnn-server/files/cwnn.sh.in b/japanese/FreeWnn-server/files/cwnn.in
index 721bc7d2e881..721bc7d2e881 100644
--- a/japanese/FreeWnn-server/files/cwnn.sh.in
+++ b/japanese/FreeWnn-server/files/cwnn.in
diff --git a/japanese/FreeWnn-server/files/kwnn.sh.in b/japanese/FreeWnn-server/files/kwnn.in
index fe7c4faa51b8..fe7c4faa51b8 100644
--- a/japanese/FreeWnn-server/files/kwnn.sh.in
+++ b/japanese/FreeWnn-server/files/kwnn.in
diff --git a/japanese/FreeWnn-server/files/twnn.sh.in b/japanese/FreeWnn-server/files/twnn.in
index 88b91c9a7212..88b91c9a7212 100644
--- a/japanese/FreeWnn-server/files/twnn.sh.in
+++ b/japanese/FreeWnn-server/files/twnn.in
diff --git a/japanese/FreeWnn-server/files/wnn.sh.in b/japanese/FreeWnn-server/files/wnn.in
index 1656fd9f4da4..1656fd9f4da4 100644
--- a/japanese/FreeWnn-server/files/wnn.sh.in
+++ b/japanese/FreeWnn-server/files/wnn.in
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index 8d284fbc0c31..af4746a2a7f5 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A Kana-to-Kanji conversion system, binary part
 
 LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/canna-lib
 
-USE_RC_SUBR=	canna.sh
+USE_RC_SUBR=	canna
 USE_BZIP2=	yes
 USE_IMAKE=	yes
 ALL_TARGET=	canna
diff --git a/japanese/canna-server/files/canna.sh.in b/japanese/canna-server/files/canna.in
index db9b91097fb9..db9b91097fb9 100644
--- a/japanese/canna-server/files/canna.sh.in
+++ b/japanese/canna-server/files/canna.in
diff --git a/japanese/rskkserv/Makefile b/japanese/rskkserv/Makefile
index 3191215f48f9..0b8b58659d9a 100644
--- a/japanese/rskkserv/Makefile
+++ b/japanese/rskkserv/Makefile
@@ -30,7 +30,7 @@ RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/eb.so:${PORTSDIR}/japanese/ruby-eb
 USE_RUBY=	yes
 USE_AUTOTOOLS=	autoconf213
 USE_GMAKE=	yes
-USE_RC_SUBR=	rskkserv.sh
+USE_RC_SUBR=	rskkserv
 
 CONFIGURE_ARGS=	--with-ruby="${RUBY}" \
 		--with-dicfile="${SKKJISYO_BASE}/${SKKJISYO}" \
diff --git a/japanese/rskkserv/files/rskkserv.sh.in b/japanese/rskkserv/files/rskkserv.in
index 80b91210b540..80b91210b540 100644
--- a/japanese/rskkserv/files/rskkserv.sh.in
+++ b/japanese/rskkserv/files/rskkserv.in
diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile
index e7a7fca30b85..62dbcc4ea7a3 100644
--- a/japanese/sj3-server/Makefile
+++ b/japanese/sj3-server/Makefile
@@ -21,7 +21,7 @@ COMMENT=	A Japanese input method, binary part
 
 LIB_DEPENDS=	sj3lib.1:${PORTSDIR}/japanese/sj3-lib
 
-USE_RC_SUBR=	sj3.sh
+USE_RC_SUBR=	sj3
 USE_IMAKE=	yes
 SUB_FILES=	sj3_freebsd.tmpl
 SUB_LIST=	DESTDIR=${DESTDIR}
diff --git a/japanese/sj3-server/files/sj3.sh.in b/japanese/sj3-server/files/sj3.in
index 6d005045c50d..6d005045c50d 100644
--- a/japanese/sj3-server/files/sj3.sh.in
+++ b/japanese/sj3-server/files/sj3.in
diff --git a/japanese/skkserv/Makefile b/japanese/skkserv/Makefile
index 32e07c05ec13..d03bb7275541 100644
--- a/japanese/skkserv/Makefile
+++ b/japanese/skkserv/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Dictionary server for the SKK Japanese-input software
 
 RUN_DEPENDS=	${LOCALBASE}/share/skk/${SKKJISYO}:${PORTSDIR}/japanese/skk-jisyo
 
-USE_RC_SUBR=	skkserv.sh
+USE_RC_SUBR=	skkserv
 WRKSRC=		${WRKDIR}/skk-${PORTVERSION}
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	SUBDIRS='skkserv'
diff --git a/japanese/skkserv/files/skkserv.sh.in b/japanese/skkserv/files/skkserv.in
index f2bbe584a817..f2bbe584a817 100644
--- a/japanese/skkserv/files/skkserv.sh.in
+++ b/japanese/skkserv/files/skkserv.in
diff --git a/java/jboss5/Makefile b/java/jboss5/Makefile
index e6384bf5e56d..765a8e334674 100644
--- a/java/jboss5/Makefile
+++ b/java/jboss5/Makefile
@@ -29,7 +29,7 @@ MANUAL_PACKAGE_BUILD=	fetches files in build phase
 
 MAKE_ARGS=	-buildfile build/build.xml
 
-USE_RC_SUBR=	jboss5.sh
+USE_RC_SUBR=	jboss5
 SUB_FILES=	pkg-install pkg-deinstall pkg-message
 
 PORTDATA=	*
diff --git a/java/jboss5/files/jboss5.sh.in b/java/jboss5/files/jboss5.in
index d497027a5323..d497027a5323 100644
--- a/java/jboss5/files/jboss5.sh.in
+++ b/java/jboss5/files/jboss5.in
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index a156f98df608..e5f3b55876a6 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -113,7 +113,7 @@ CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
 USE_GMAKE=	yes
 USE_CSTD=	gnu89
 USE_PERL5=	yes
-USE_RC_SUBR=	epmd.sh
+USE_RC_SUBR=	epmd
 GNU_CONFIGURE=	yes
 ONLY_FOR_ARCHS=	i386 amd64 sparc64 powerpc
 REINPLACE_ARGS=	-i
diff --git a/lang/erlang/files/epmd.sh.in b/lang/erlang/files/epmd.in
index acf9c58443bd..acf9c58443bd 100644
--- a/lang/erlang/files/epmd.sh.in
+++ b/lang/erlang/files/epmd.in
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile
index 582d92c35903..95e7a91c81bc 100644
--- a/lang/erlang14/Makefile
+++ b/lang/erlang14/Makefile
@@ -111,7 +111,7 @@ CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
 USE_GMAKE=	yes
 USE_CSTD=	gnu89
 USE_PERL5=	yes
-USE_RC_SUBR=	epmd.sh
+USE_RC_SUBR=	epmd
 GNU_CONFIGURE=	yes
 ONLY_FOR_ARCHS=	i386 amd64 sparc64 powerpc
 REINPLACE_ARGS=	-i
diff --git a/lang/erlang14/files/epmd.sh.in b/lang/erlang14/files/epmd.in
index acf9c58443bd..acf9c58443bd 100644
--- a/lang/erlang14/files/epmd.sh.in
+++ b/lang/erlang14/files/epmd.in
diff --git a/mail/antivirus-milter/Makefile b/mail/antivirus-milter/Makefile
index b9f048554977..76f7753dbf8a 100644
--- a/mail/antivirus-milter/Makefile
+++ b/mail/antivirus-milter/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Sendmail milter wich uses McAfee Virus Scan or clamav
 
 LICENSE=	BSD
 
-USE_RC_SUBR=	antivirus-milter.sh
+USE_RC_SUBR=	antivirus-milter
 
 CFLAGS+=	-Wall ${PTHREAD_CFLAGS:S=""==}
 LIBS+=		-lmilter ${PTHREAD_LIBS}
diff --git a/mail/antivirus-milter/files/antivirus-milter.sh.in b/mail/antivirus-milter/files/antivirus-milter.in
index 57ace61e9835..57ace61e9835 100644
--- a/mail/antivirus-milter/files/antivirus-milter.sh.in
+++ b/mail/antivirus-milter/files/antivirus-milter.in
diff --git a/mail/batv-milter/Makefile b/mail/batv-milter/Makefile
index 038c53e88dfe..ef675a06cf97 100644
--- a/mail/batv-milter/Makefile
+++ b/mail/batv-milter/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	SF
 MAINTAINER=	umq@ueo.co.jp
 COMMENT=	A milter for BATV (Bounce Address Tag Validation)
 
-USE_RC_SUBR=	milter-batv.sh
+USE_RC_SUBR=	milter-batv
 USE_OPENSSL=	TRUE
 
 SUB_FILES=	milter-batv.sh
diff --git a/mail/batv-milter/files/milter-batv.sh.in b/mail/batv-milter/files/milter-batv.in
index f9f901763bce..f9f901763bce 100644
--- a/mail/batv-milter/files/milter-batv.sh.in
+++ b/mail/batv-milter/files/milter-batv.in
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 56092eda226c..cc364da8e74e 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -69,7 +69,7 @@ USE_OPENSSL=	yes
 USE_PERL5=	yes
 USE_SUBMAKE=	yes
 
-USE_RC_SUBR=	courier.sh
+USE_RC_SUBR=	courier
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/mail/courier/files/courier.sh.in b/mail/courier/files/courier.in
index c45bcf9438ae..c45bcf9438ae 100644
--- a/mail/courier/files/courier.sh.in
+++ b/mail/courier/files/courier.in
diff --git a/mail/couriergraph/Makefile b/mail/couriergraph/Makefile
index 29ca0126e29b..2c3bcb98913e 100644
--- a/mail/couriergraph/Makefile
+++ b/mail/couriergraph/Makefile
@@ -26,7 +26,7 @@ DATADIR?=	/var/db/couriergraph
 COURIERGRAPH_USER?=	${WWWOWN}
 COURIERGRAPH_GROUP?=	${WWWGRP}
 
-USE_RC_SUBR=	${PORTNAME}.sh
+USE_RC_SUBR=	${PORTNAME}
 SUB_LIST+=	COURIERGRAPH_USER=${COURIERGRAPH_USER} COURIERGRAPH_GROUP=${COURIERGRAPH_GROUP}
 
 STARTUP_FILE=	${PREFIX}/etc/rc.d/couriergraph.sh
diff --git a/mail/couriergraph/files/couriergraph.sh.in b/mail/couriergraph/files/couriergraph.in
index c39859255592..c39859255592 100644
--- a/mail/couriergraph/files/couriergraph.sh.in
+++ b/mail/couriergraph/files/couriergraph.in
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 62dd5bfe7468..c888d7b59d2f 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -27,7 +27,7 @@ CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^1].*
 
 LATEST_LINK=	${PORTNAME}2
 
-USE_RC_SUBR=	imapd.sh
+USE_RC_SUBR=	imapd
 
 USE_OPENSSL=	yes
 USE_PERL5=	yes
diff --git a/mail/cyrus-imapd2/files/imapd.sh.in b/mail/cyrus-imapd2/files/imapd.in
index 1af0b40f32df..1af0b40f32df 100644
--- a/mail/cyrus-imapd2/files/imapd.sh.in
+++ b/mail/cyrus-imapd2/files/imapd.in
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 0c75c6331550..a68c83997d8c 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -22,7 +22,7 @@ CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^2].*
 
 LATEST_LINK=	${PORTNAME}22
 
-USE_RC_SUBR=	imapd.sh
+USE_RC_SUBR=	imapd
 USE_OPENSSL=	yes
 USE_PERL5=	yes
 USE_BDB=	yes
diff --git a/mail/cyrus-imapd22/files/imapd.sh.in b/mail/cyrus-imapd22/files/imapd.in
index 1af0b40f32df..1af0b40f32df 100644
--- a/mail/cyrus-imapd22/files/imapd.sh.in
+++ b/mail/cyrus-imapd22/files/imapd.in
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 94927a18cbca..28f51c0a81de 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -25,7 +25,7 @@ CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^3].*
 
 LATEST_LINK=	${PORTNAME}23
 
-USE_RC_SUBR=	imapd.sh
+USE_RC_SUBR=	imapd
 USE_OPENSSL=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
diff --git a/mail/cyrus-imapd23/files/imapd.sh.in b/mail/cyrus-imapd23/files/imapd.in
index 1af0b40f32df..1af0b40f32df 100644
--- a/mail/cyrus-imapd23/files/imapd.sh.in
+++ b/mail/cyrus-imapd23/files/imapd.in
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index de21eeb585b6..8455ffd5500e 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -25,7 +25,7 @@ CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^4].*
 
 LATEST_LINK=	${PORTNAME}24
 
-USE_RC_SUBR=	imapd.sh
+USE_RC_SUBR=	imapd
 USE_OPENSSL=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
diff --git a/mail/cyrus-imapd24/files/imapd.sh.in b/mail/cyrus-imapd24/files/imapd.in
index 1af0b40f32df..1af0b40f32df 100644
--- a/mail/cyrus-imapd24/files/imapd.sh.in
+++ b/mail/cyrus-imapd24/files/imapd.in
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index 86f10ed8792e..251cb868f619 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -29,7 +29,7 @@ LATEST_LINK=	dbmail22
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
-USE_RC_SUBR=	dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh
+USE_RC_SUBR=	dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved
 USE_GNOME=	glib20 pkgconfig
 USE_OPENSSL=	yes
 
diff --git a/mail/dbmail22/files/dbmail-imapd.sh.in b/mail/dbmail22/files/dbmail-imapd.in
index 7d1ca96ea7d0..7d1ca96ea7d0 100644
--- a/mail/dbmail22/files/dbmail-imapd.sh.in
+++ b/mail/dbmail22/files/dbmail-imapd.in
diff --git a/mail/dbmail22/files/dbmail-lmtpd.sh.in b/mail/dbmail22/files/dbmail-lmtpd.in
index f1805db488b1..f1805db488b1 100644
--- a/mail/dbmail22/files/dbmail-lmtpd.sh.in
+++ b/mail/dbmail22/files/dbmail-lmtpd.in
diff --git a/mail/dbmail22/files/dbmail-pop3d.sh.in b/mail/dbmail22/files/dbmail-pop3d.in
index 71a567fbd393..71a567fbd393 100644
--- a/mail/dbmail22/files/dbmail-pop3d.sh.in
+++ b/mail/dbmail22/files/dbmail-pop3d.in
diff --git a/mail/dbmail22/files/dbmail-timsieved.sh.in b/mail/dbmail22/files/dbmail-timsieved.in
index 27eb49540333..27eb49540333 100644
--- a/mail/dbmail22/files/dbmail-timsieved.sh.in
+++ b/mail/dbmail22/files/dbmail-timsieved.in
diff --git a/mail/dcc-dccd/Makefile b/mail/dcc-dccd/Makefile
index 8128f6524b71..47e78b0e640b 100644
--- a/mail/dcc-dccd/Makefile
+++ b/mail/dcc-dccd/Makefile
@@ -122,7 +122,7 @@ CONFIGURE_ARGS+=	--with-sendmail=yes
 
 PLIST_SUB+=	WITH_DCCM=""
 
-USE_RC_SUBR+=	dccm.sh
+USE_RC_SUBR+=	dccm
 
 .else
 CONFIGURE_ARGS+=	--disable-dccm
@@ -136,7 +136,7 @@ CONFIGURE_ARGS+=	--disable-dccifd
 PLIST_SUB+=	WITH_DCCIFD="@comment "
 .else
 PLIST_SUB+=	WITH_DCCIFD=""
-USE_RC_SUBR+=	dccifd.sh
+USE_RC_SUBR+=	dccifd
 .endif
 
 ## dccd server support
@@ -163,11 +163,11 @@ PLIST_SUB+=	WITH_IFD_MILT=""
 .endif
 
 .if defined(WITH_DCCD)
-USE_RC_SUBR+=	dccd.sh
+USE_RC_SUBR+=	dccd
 .endif
 
 .if defined(WITH_DCCGREY)
-USE_RC_SUBR+=	dccgrey.sh
+USE_RC_SUBR+=	dccgrey
 PLIST_SUB+=	WITH_DCCGREY=""
 .else
 PLIST_SUB+=	WITH_DCCGREY="@comment "
diff --git a/mail/dcc-dccd/files/dccd.sh.in b/mail/dcc-dccd/files/dccd.in
index 5618e428bf27..40bd326d732a 100644
--- a/mail/dcc-dccd/files/dccd.sh.in
+++ b/mail/dcc-dccd/files/dccd.in
@@ -1,10 +1,11 @@
 #!/bin/sh
+
+# $FreeBSD$
 #
 # PROVIDE: dccd
 # REQUIRE: LOGIN
 # BEFORE: mail
 # KEYWORD: shutdown
-
 #
 # Add the following lines to /etc/rc.conf:
 #
@@ -20,7 +21,6 @@
 #
 #
 # See %%DCCHOME%%/dcc_conf to configure startup options
-#
 
 . /etc/rc.subr
 
diff --git a/mail/dcc-dccd/files/dccgrey.sh.in b/mail/dcc-dccd/files/dccgrey.in
index 87267ba69ad1..6eae2ae20d08 100644
--- a/mail/dcc-dccd/files/dccgrey.sh.in
+++ b/mail/dcc-dccd/files/dccgrey.in
@@ -1,4 +1,6 @@
 #!/bin/sh
+
+# $FreeBSD$
 #
 # PROVIDE: dccgrey
 # REQUIRE: LOGIN
@@ -20,7 +22,6 @@
 #
 #
 # See %%DCCHOME%%/dcc_conf to configure startup options
-#
 
 . /etc/rc.subr
 
diff --git a/mail/dcc-dccd/files/dccifd.sh.in b/mail/dcc-dccd/files/dccifd.in
index 95fa8cd54fcd..ecea2d85bab8 100644
--- a/mail/dcc-dccd/files/dccifd.sh.in
+++ b/mail/dcc-dccd/files/dccifd.in
@@ -1,4 +1,6 @@
 #!/bin/sh
+
+# $FreeBSD$
 #
 # PROVIDE: dccifd
 # REQUIRE: LOGIN
@@ -20,7 +22,6 @@
 #
 #
 # See %%DCCHOME%%/dcc_conf to configure startup options
-#
 
 . /etc/rc.subr
 
diff --git a/mail/dcc-dccd/files/dccm.sh.in b/mail/dcc-dccd/files/dccm.in
index 4ef5ea578ef0..47f6dbe0733c 100644
--- a/mail/dcc-dccd/files/dccm.sh.in
+++ b/mail/dcc-dccd/files/dccm.in
@@ -1,4 +1,6 @@
 #!/bin/sh
+
+# $FreeBSD$
 #
 # PROVIDE: dccm
 # REQUIRE: LOGIN
@@ -20,7 +22,6 @@
 #
 #
 # See %%DCCHOME%%/dcc_conf to configure startup options
-#
 
 . /etc/rc.subr
 
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index 40ff67453939..9ba55aec26f6 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	SF/${PORTNAME}/DomainKeys%20Milter/${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Domainkeys milter for Sendmail
 
-USE_RC_SUBR=	milter-dk.sh
+USE_RC_SUBR=	milter-dk
 USE_OPENSSL=	yes
 
 .if !defined(BUILDING_INDEX)
@@ -59,7 +59,7 @@ SITE_SUB+=	-e '\|-static|s|%%STATIC%%||g'
 SITE_SUB+=	-e '\|-static|s|%%STATIC%%|dnl |g'
 .endif
 
-SUB_LIST=	"RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR:S/.sh$//}"
+SUB_LIST=	"RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR}"
 
 .if defined(WITH_DEBUG)
 SITE_SUB+=	-e '\|confOPTIMIZE.*-g|s/^dnl //g'
diff --git a/mail/dk-milter/files/milter-dk.sh.in b/mail/dk-milter/files/milter-dk.in
index d5b00f98358b..d5b00f98358b 100644
--- a/mail/dk-milter/files/milter-dk.sh.in
+++ b/mail/dk-milter/files/milter-dk.in
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index cdc4c54a61af..f42a7d1d79ac 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -31,7 +31,7 @@ DOVECOTVERSION=	1.2
 ######################################################################
 
 USE_ICONV=	yes
-USE_RC_SUBR=	dovecot.sh
+USE_RC_SUBR=	dovecot
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/mail/dovecot/files/dovecot.sh.in b/mail/dovecot/files/dovecot.in
index cadfadc7c8de..cadfadc7c8de 100644
--- a/mail/dovecot/files/dovecot.sh.in
+++ b/mail/dovecot/files/dovecot.in
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 23e30564adb2..087fd4cdcbb0 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -28,7 +28,7 @@ CONFLICTS=	dovecot-1.[0-9]*
 ######################################################################
 
 USE_ICONV=	yes
-USE_RC_SUBR=	dovecot.sh
+USE_RC_SUBR=	dovecot
 MAKE_JOBS_SAFE=	yes
 
 GNU_CONFIGURE=	yes
diff --git a/mail/dovecot2/files/dovecot.sh.in b/mail/dovecot2/files/dovecot.in
index 8c7a91dbe14a..8c7a91dbe14a 100644
--- a/mail/dovecot2/files/dovecot.sh.in
+++ b/mail/dovecot2/files/dovecot.in
diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index a73b1235468f..6dd04b2baf19 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
 .endif
 
 NO_WRKSUBDIR=	yes
-USE_RC_SUBR=	dracd.sh
+USE_RC_SUBR=	dracd
 
 .if !defined(NOPORTDOCS)
 MAN3=		dracauth.3
diff --git a/mail/drac/files/dracd.sh.in b/mail/drac/files/dracd.in
index 83054f707369..83054f707369 100644
--- a/mail/drac/files/dracd.sh.in
+++ b/mail/drac/files/dracd.in
diff --git a/mail/exilog/Makefile b/mail/exilog/Makefile
index 88d7bddf5879..34422b05c8b8 100644
--- a/mail/exilog/Makefile
+++ b/mail/exilog/Makefile
@@ -46,7 +46,7 @@ EXILOGDIR?=	${PREFIX}/exilog
 .if defined(WITHOUT_AGENT)
 PLIST_SUB+=	AGENT="@comment "
 .else
-USE_RC_SUBR=	exilog.sh
+USE_RC_SUBR=	exilog
 PLIST_SUB+=	AGENT=""
 .endif
 
diff --git a/mail/exilog/files/exilog.sh.in b/mail/exilog/files/exilog.in
index 887be6cbdce8..887be6cbdce8 100644
--- a/mail/exilog/files/exilog.sh.in
+++ b/mail/exilog/files/exilog.in
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 0a5af4a71e4a..f03494325a83 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -470,7 +470,7 @@ SEDLIST+=	-e 's,^\# (WITH_OLD_DEMIME=),\1,'
 .endif
 
 .if !defined(EXIMON_ONLY) && !defined(WITHOUT_DAEMON)
-USE_RC_SUBR=	exim.sh
+USE_RC_SUBR=	exim
 PLIST_SUB+=	DAEMON=""
 SUB_LIST+=	LOGDIR="${LOGDIR}"
 .else
diff --git a/mail/exim/files/exim.sh.in b/mail/exim/files/exim.in
index 119be1e21e9b..119be1e21e9b 100644
--- a/mail/exim/files/exim.sh.in
+++ b/mail/exim/files/exim.in
diff --git a/mail/james/Makefile b/mail/james/Makefile
index 228cf8f96945..2c5a8fff6069 100644
--- a/mail/james/Makefile
+++ b/mail/james/Makefile
@@ -20,7 +20,7 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.5+
 NO_BUILD=	YES
 
-USE_RC_SUBR=	james.sh
+USE_RC_SUBR=	james
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION}
diff --git a/mail/james/files/james.sh.in b/mail/james/files/james.in
index 838ae5f61443..838ae5f61443 100644
--- a/mail/james/files/james.sh.in
+++ b/mail/james/files/james.in
diff --git a/mail/milter-bogom/Makefile b/mail/milter-bogom/Makefile
index 71e1014163a4..6153c7679697 100644
--- a/mail/milter-bogom/Makefile
+++ b/mail/milter-bogom/Makefile
@@ -23,7 +23,7 @@ MAN8=		bogom.8
 MAKE_ARGS=	CPPFLAGS="-DDEF_CONF=\\\"${PREFIX}/etc/bogom.conf\\\" ${PTHREAD_CFLAGS}" \
 		LIBS="-lmilter ${PTHREAD_LIBS}"
 
-USE_RC_SUBR=	milter-bogom.sh
+USE_RC_SUBR=	milter-bogom
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	sbin/bogom \
diff --git a/mail/milter-bogom/files/milter-bogom.sh.in b/mail/milter-bogom/files/milter-bogom.in
index 778dccdc9321..233fe78cb9df 100644
--- a/mail/milter-bogom/files/milter-bogom.sh.in
+++ b/mail/milter-bogom/files/milter-bogom.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: milterbogom
 # REQUIRE: LOGIN
 # BEFORE: sendmail
diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile
index 63acc8ec5f64..7f1b3ef76992 100644
--- a/mail/milter-regex/Makefile
+++ b/mail/milter-regex/Makefile
@@ -20,7 +20,7 @@ LICENSE_FILE=	${FILESDIR}/COPYRIGHT
 MAILUSER?=	mailnull
 MAN8=		milter-regex.8
 PLIST_FILES=	libexec/milter-regex
-USE_RC_SUBR=	milterregex.sh
+USE_RC_SUBR=	milterregex
 SPOOLDIR?=	/var/run/milter-regex
 SUB_LIST=	SPOOLDIR=${SPOOLDIR}
 
diff --git a/mail/milter-regex/files/milterregex.sh.in b/mail/milter-regex/files/milterregex.in
index de4ef12fa921..de4ef12fa921 100644
--- a/mail/milter-regex/files/milterregex.sh.in
+++ b/mail/milter-regex/files/milterregex.in
diff --git a/mail/missey/Makefile b/mail/missey/Makefile
index 3cfddf3a91d0..dedae3501928 100644
--- a/mail/missey/Makefile
+++ b/mail/missey/Makefile
@@ -27,7 +27,7 @@ MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" \
 PLIST_FILES=	sbin/bent sbin/mps etc/mps/pop3d.conf-dist
 PLIST_DIRS=	etc/mps
 
-USE_RC_SUBR=	mps.sh
+USE_RC_SUBR=	mps
 
 post-patch:
 	@${CP}	${FILESDIR}/Makefile ${WRKSRC}/Makefile
diff --git a/mail/missey/files/mps.sh.in b/mail/missey/files/mps.in
index fce084360b03..fce084360b03 100644
--- a/mail/missey/files/mps.sh.in
+++ b/mail/missey/files/mps.in
diff --git a/mail/noattach/Makefile b/mail/noattach/Makefile
index 669a7e31a4f5..1b8bb15cbfef 100644
--- a/mail/noattach/Makefile
+++ b/mail/noattach/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	An attachment filter for Sendmail Milter
 
 GNU_CONFIGURE=	yes
-USE_RC_SUBR=    noattach.sh
+USE_RC_SUBR=    noattach
 
 CFLAGS+=	${PTHREAD_CFLAGS:S=""==}
 MAN8=		noattach.8
diff --git a/mail/noattach/files/noattach.sh.in b/mail/noattach/files/noattach.in
index ac167c52feca..ac167c52feca 100644
--- a/mail/noattach/files/noattach.sh.in
+++ b/mail/noattach/files/noattach.in
diff --git a/mail/ovs/Makefile b/mail/ovs/Makefile
index 049c9b17feb3..c1df10954448 100644
--- a/mail/ovs/Makefile
+++ b/mail/ovs/Makefile
@@ -26,7 +26,7 @@ WWWROOT?=	${PREFIX}/www/data
 OVS_USER?=	${WWWOWN}
 OVS_GROUP?=	${WWWGRP}
 
-USE_RC_SUBR=	${PORTNAME}.sh
+USE_RC_SUBR=	${PORTNAME}
 SUB_LIST+=	OVS_USER=${OVS_USER} OVS_GROUP=${OVS_GROUP}
 PLIST_SUB=	CGIDIR=${CGIDIR:S,${PREFIX}/,,} WWWROOT=${WWWROOT:S,${PREFIX}/,,}
 
diff --git a/mail/ovs/files/ovs.sh.in b/mail/ovs/files/ovs.in
index 1c8e16be08ad..1c8e16be08ad 100644
--- a/mail/ovs/files/ovs.sh.in
+++ b/mail/ovs/files/ovs.in
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index 861ef5869348..d710f3583366 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -146,7 +146,7 @@ DOCSSQL=	README README.awl README.bayes awl_mysql.sql awl_pg.sql bayes_mysql.sql
 DOCSLDAP=	README README.testing sa_test.ldif
 PORTDOCS=	${DOCS} sql ldap
 
-USE_RC_SUBR=	sa-spamd.sh
+USE_RC_SUBR=	sa-spamd
 
 .if defined(WITH_MYSQL) || defined(WITH_PGSQL)
 SUB_LIST+=	SQL_FLAG="-Q"
diff --git a/mail/p5-Mail-SpamAssassin/files/sa-spamd.sh.in b/mail/p5-Mail-SpamAssassin/files/sa-spamd.in
index 5398ea6fa7e7..5398ea6fa7e7 100644
--- a/mail/p5-Mail-SpamAssassin/files/sa-spamd.sh.in
+++ b/mail/p5-Mail-SpamAssassin/files/sa-spamd.in
diff --git a/mail/policyd2/Makefile b/mail/policyd2/Makefile
index d0cca75656e0..8d8645d85fdf 100644
--- a/mail/policyd2/Makefile
+++ b/mail/policyd2/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
 USE_PERL5=	yes
 USE_PHP=	yes
 NO_BUILD=	yes
-USE_RC_SUBR=	policyd2.sh
+USE_RC_SUBR=	policyd2
 BINMODE=	0755
 
 WEBUIDIR=	${PREFIX}/www/policyd
diff --git a/mail/policyd2/files/policyd2.sh.in b/mail/policyd2/files/policyd2.in
index a5443c618452..a5443c618452 100644
--- a/mail/policyd2/files/policyd2.sh.in
+++ b/mail/policyd2/files/policyd2.in
diff --git a/mail/pop-before-smtp/Makefile b/mail/pop-before-smtp/Makefile
index 2b77df270f0e..dd7b68433861 100644
--- a/mail/pop-before-smtp/Makefile
+++ b/mail/pop-before-smtp/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
 
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
-USE_RC_SUBR=	pop-before-smtp.sh
+USE_RC_SUBR=	pop-before-smtp
 SUB_FILES=	pkg-message
 SUB_LIST=	PERL=${PERL}
 
diff --git a/mail/pop-before-smtp/files/pop-before-smtp.sh.in b/mail/pop-before-smtp/files/pop-before-smtp.in
index 10f262c65dd5..10f262c65dd5 100644
--- a/mail/pop-before-smtp/files/pop-before-smtp.sh.in
+++ b/mail/pop-before-smtp/files/pop-before-smtp.in
diff --git a/mail/popular/Makefile b/mail/popular/Makefile
index 7efacd7769ad..f12a9e558142 100644
--- a/mail/popular/Makefile
+++ b/mail/popular/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ARGS=	--without-bdb --disable-docbook --with-confdir=${PREFIX}/etc/pop
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-USE_RC_SUBR=	pcheckd.sh pproxy.sh pserv.sh 0ringd.sh
+USE_RC_SUBR=	pcheckd pproxy pserv 0ringd
 
 MAN1=		pcheck.1 pcontrol.1 pdeliver.1 pstatus.1 ptestpdm.1
 MAN7=		popular-log.7
diff --git a/mail/popular/files/0ringd.sh.in b/mail/popular/files/0ringd.in
index 9ee445bd60b3..9ee445bd60b3 100644
--- a/mail/popular/files/0ringd.sh.in
+++ b/mail/popular/files/0ringd.in
diff --git a/mail/popular/files/pcheckd.sh.in b/mail/popular/files/pcheckd.in
index ab860cc4d5a2..ab860cc4d5a2 100644
--- a/mail/popular/files/pcheckd.sh.in
+++ b/mail/popular/files/pcheckd.in
diff --git a/mail/popular/files/pproxy.sh.in b/mail/popular/files/pproxy.in
index b401625a85e7..b401625a85e7 100644
--- a/mail/popular/files/pproxy.sh.in
+++ b/mail/popular/files/pproxy.in
diff --git a/mail/popular/files/pserv.sh.in b/mail/popular/files/pserv.in
index e5ef1c117cd7..e5ef1c117cd7 100644
--- a/mail/popular/files/pserv.sh.in
+++ b/mail/popular/files/pserv.in
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 54e970463233..d0c4fae526bb 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -249,10 +249,10 @@ PLIST_SUB+=	TEST="@comment "
 PKGNAMESUFFIX=	-current-base
 PREFIX=		/usr
 ETCDIR=		/etc/postfix
-USE_RCORDER=	postfix.sh
+USE_RCORDER=	postfix
 PLIST_SUB+=	BASE=""
 .else
-USE_RC_SUBR=	postfix.sh
+USE_RC_SUBR=	postfix
 PLIST_SUB+=	BASE="@comment "
 .endif
 
diff --git a/mail/postfix-current/files/postfix.sh.in b/mail/postfix-current/files/postfix.in
index 216a3a5b21f0..216a3a5b21f0 100644
--- a/mail/postfix-current/files/postfix.sh.in
+++ b/mail/postfix-current/files/postfix.in
diff --git a/mail/postfix-policyd-sf/Makefile b/mail/postfix-policyd-sf/Makefile
index 32f1dcdc564b..7d12cfeea9c6 100644
--- a/mail/postfix-policyd-sf/Makefile
+++ b/mail/postfix-policyd-sf/Makefile
@@ -21,7 +21,7 @@ COMMENT=	Anti-spam plugin for Postfix (written in C)
 
 USE_MYSQL=	yes
 USE_GMAKE=	yes
-USE_RC_SUBR=	policyd.sh
+USE_RC_SUBR=	policyd
 
 REALNAME=	${PKGNAME:C/-${PORTVERSION}.*//}
 
diff --git a/mail/postfix-policyd-sf/files/policyd.sh.in b/mail/postfix-policyd-sf/files/policyd.in
index 2a2648ef2335..2a2648ef2335 100644
--- a/mail/postfix-policyd-sf/files/policyd.sh.in
+++ b/mail/postfix-policyd-sf/files/policyd.in
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 144ffd7812ac..d626d4fc84fb 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -256,10 +256,10 @@ PLIST_SUB+=	TEST="@comment "
 PKGNAMESUFFIX=	-base
 PREFIX=		/usr
 ETCDIR=		/etc/postfix
-USE_RCORDER=	postfix.sh
+USE_RCORDER=	postfix
 PLIST_SUB+=	BASE=""
 .else
-USE_RC_SUBR=	postfix.sh
+USE_RC_SUBR=	postfix
 PLIST_SUB+=	BASE="@comment "
 .endif
 
diff --git a/mail/postfix/files/postfix.sh.in b/mail/postfix/files/postfix.in
index 216a3a5b21f0..216a3a5b21f0 100644
--- a/mail/postfix/files/postfix.sh.in
+++ b/mail/postfix/files/postfix.in
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index 8d1601e1e299..78cc586edc8f 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -29,7 +29,7 @@ GROUPS=		mail maildrop postfix
 NO_LATEST_LINK=	yes
 USE_SUBMAKE=	yes
 USE_PERL5_BUILD=yes
-USE_RC_SUBR=	postfix.sh
+USE_RC_SUBR=	postfix
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 # back compat pull in settings from POSTFIX_OPTIONS for convenience when
diff --git a/mail/postfix26/files/postfix.sh.in b/mail/postfix26/files/postfix.in
index 216a3a5b21f0..216a3a5b21f0 100644
--- a/mail/postfix26/files/postfix.sh.in
+++ b/mail/postfix26/files/postfix.in
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index 27a3c7e8287b..4d7b106f1376 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -238,10 +238,10 @@ PLIST_SUB+=	TEST="@comment "
 PKGNAMESUFFIX=	-base
 PREFIX=		/usr
 ETCDIR=		/etc/postfix
-USE_RCORDER=	postfix.sh
+USE_RCORDER=	postfix
 PLIST_SUB+=	BASE=""
 .else
-USE_RC_SUBR=	postfix.sh
+USE_RC_SUBR=	postfix
 PLIST_SUB+=	BASE="@comment "
 .endif
 
diff --git a/mail/postfix27/files/postfix.sh.in b/mail/postfix27/files/postfix.in
index 216a3a5b21f0..216a3a5b21f0 100644
--- a/mail/postfix27/files/postfix.sh.in
+++ b/mail/postfix27/files/postfix.in
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index 75be6eeee329..b3825161477e 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -258,10 +258,10 @@ PLIST_SUB+=	TEST="@comment "
 PKGNAMESUFFIX=	-base
 PREFIX=		/usr
 ETCDIR=		/etc/postfix
-USE_RCORDER=	postfix.sh
+USE_RCORDER=	postfix
 PLIST_SUB+=	BASE=""
 .else
-USE_RC_SUBR=	postfix.sh
+USE_RC_SUBR=	postfix
 PLIST_SUB+=	BASE="@comment "
 .endif
 
diff --git a/mail/postfix28/files/postfix.sh.in b/mail/postfix28/files/postfix.in
index 216a3a5b21f0..216a3a5b21f0 100644
--- a/mail/postfix28/files/postfix.sh.in
+++ b/mail/postfix28/files/postfix.in
diff --git a/mail/proxsmtp/Makefile b/mail/proxsmtp/Makefile
index c336d8e81ffa..5807cccb449f 100644
--- a/mail/proxsmtp/Makefile
+++ b/mail/proxsmtp/Makefile
@@ -17,7 +17,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 
-USE_RC_SUBR=	proxsmtpd.sh
+USE_RC_SUBR=	proxsmtpd
 SUB_FILES=	pkg-message
 
 MAN5=		proxsmtpd.conf.5
diff --git a/mail/proxsmtp/files/proxsmtpd.sh.in b/mail/proxsmtp/files/proxsmtpd.in
index b2f97d3770f1..b2f97d3770f1 100644
--- a/mail/proxsmtp/files/proxsmtpd.sh.in
+++ b/mail/proxsmtp/files/proxsmtpd.in
diff --git a/mail/py-ppolicy/Makefile b/mail/py-ppolicy/Makefile
index 6d9fd6f3b9d4..94aa3827e680 100644
--- a/mail/py-ppolicy/Makefile
+++ b/mail/py-ppolicy/Makefile
@@ -21,7 +21,7 @@ USE_PYTHON=	2.5+
 USE_PYDISTUTILS=yes
 USE_TWISTED=	yes
 NO_BUILD=	yes
-USE_RC_SUBR=	ppolicyd.sh
+USE_RC_SUBR=	ppolicyd
 DOCSDIR?=	${PREFIX}/share/doc/py-${PORTNAME}
 
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
diff --git a/mail/py-ppolicy/files/ppolicyd.sh.in b/mail/py-ppolicy/files/ppolicyd.in
index f4846ad02958..f4846ad02958 100644
--- a/mail/py-ppolicy/files/ppolicyd.sh.in
+++ b/mail/py-ppolicy/files/ppolicyd.in
diff --git a/mail/rabl_server/Makefile b/mail/rabl_server/Makefile
index c4ccd4f01aff..3f30f1bc8da5 100644
--- a/mail/rabl_server/Makefile
+++ b/mail/rabl_server/Makefile
@@ -24,7 +24,7 @@ PORTDOCS=	CHANGE README RELEASE.NOTES
 
 OPTIONS=	DEBUG "Enable DEBUG messages"	off
 
-USE_RC_SUBR=	${PORTNAME}.sh
+USE_RC_SUBR=	${PORTNAME}
 
 RABL_GROUP?=	bind
 
diff --git a/mail/rabl_server/files/rabl_server.sh.in b/mail/rabl_server/files/rabl_server.in
index 19efce4e5f21..19efce4e5f21 100644
--- a/mail/rabl_server/files/rabl_server.sh.in
+++ b/mail/rabl_server/files/rabl_server.in
diff --git a/mail/rbl-milter/Makefile b/mail/rbl-milter/Makefile
index 04386efbb9da..0b239c31c321 100644
--- a/mail/rbl-milter/Makefile
+++ b/mail/rbl-milter/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://opensource.confusticate.com/rbl-milter/
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A milter that adds mail header warnings on mail from open-relays
 
-USE_RC_SUBR=	rblmilter.sh
+USE_RC_SUBR=	rblmilter
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/mail/rbl-milter/files/rblmilter.sh.in b/mail/rbl-milter/files/rblmilter.in
index 89d1b1141aca..89d1b1141aca 100644
--- a/mail/rbl-milter/files/rblmilter.sh.in
+++ b/mail/rbl-milter/files/rblmilter.in
diff --git a/mail/sid-milter/Makefile b/mail/sid-milter/Makefile
index c4d68f5d7499..b2ca60d94905 100644
--- a/mail/sid-milter/Makefile
+++ b/mail/sid-milter/Makefile
@@ -35,7 +35,7 @@ SITE+=		${FILESDIR}/site.config.m4
 MAN3=		ar.3
 PLIST_FILES+=	include/libar.h lib/libar.a
 .endif
-USE_RC_SUBR=	milter-sid.sh
+USE_RC_SUBR=	milter-sid
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/sid-milter/files/milter-sid.sh.in b/mail/sid-milter/files/milter-sid.in
index a923e2b8f0b7..a923e2b8f0b7 100644
--- a/mail/sid-milter/files/milter-sid.sh.in
+++ b/mail/sid-milter/files/milter-sid.in
diff --git a/mail/smtptrapd/Makefile b/mail/smtptrapd/Makefile
index 4615c8a68b9d..6ac9327d2559 100644
--- a/mail/smtptrapd/Makefile
+++ b/mail/smtptrapd/Makefile
@@ -15,7 +15,7 @@ COMMENT=	RFC 2821 compliant SMTP service that always returns a 4xx soft error
 
 CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
 
-USE_RC_SUBR=	smtptrapd.sh
+USE_RC_SUBR=	smtptrapd
 
 PLIST_FILES=	bin/smtptrapd
 
diff --git a/mail/smtptrapd/files/smtptrapd.sh.in b/mail/smtptrapd/files/smtptrapd.in
index fc22353cdc80..fc22353cdc80 100644
--- a/mail/smtptrapd/files/smtptrapd.sh.in
+++ b/mail/smtptrapd/files/smtptrapd.in
diff --git a/mail/spamilter/Makefile b/mail/spamilter/Makefile
index 89c17f2acf2b..25153ba6d592 100644
--- a/mail/spamilter/Makefile
+++ b/mail/spamilter/Makefile
@@ -21,7 +21,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--have-resn
-USE_RC_SUBR=	spamilter.sh
+USE_RC_SUBR=	spamilter
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 CFLAGS+=	${PTHREAD_CFLAGS:S=""==}
diff --git a/mail/spamilter/files/spamilter.sh.in b/mail/spamilter/files/spamilter.in
index 645b044d61c2..645b044d61c2 100644
--- a/mail/spamilter/files/spamilter.sh.in
+++ b/mail/spamilter/files/spamilter.in
diff --git a/mail/synonym/Makefile b/mail/synonym/Makefile
index bdcf8c988542..ca7b2ecba20a 100644
--- a/mail/synonym/Makefile
+++ b/mail/synonym/Makefile
@@ -19,7 +19,7 @@ USE_GNOME=	libxml2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.4
 PORTDOCS=	README license.txt
-USE_RC_SUBR=	synonym.sh
+USE_RC_SUBR=	synonym
 
 MAKE_ENV+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 		PTHREAD_LIBS=${PTHREAD_LIBS} \
diff --git a/mail/synonym/files/synonym.sh.in b/mail/synonym/files/synonym.in
index 298b7eea3b47..298b7eea3b47 100644
--- a/mail/synonym/files/synonym.sh.in
+++ b/mail/synonym/files/synonym.in
diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile
index f78da75d2512..d7e7708deaec 100644
--- a/mail/tpop3d/Makefile
+++ b/mail/tpop3d/Makefile
@@ -97,7 +97,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib
 EXTRA_PATCHES+=${PATCHDIR}/extra-patch-auth_perl.c
 .endif
 
-USE_RC_SUBR=	tpop3d.sh
+USE_RC_SUBR=	tpop3d
 DEFAULT_CONFIG=	${PREFIX}/etc/tpop3d.conf.dist
 
 MAN5=		tpop3d.conf.5
diff --git a/mail/tpop3d/files/tpop3d.sh.in b/mail/tpop3d/files/tpop3d.in
index 090d50549457..c827ac561efb 100644
--- a/mail/tpop3d/files/tpop3d.sh.in
+++ b/mail/tpop3d/files/tpop3d.in
@@ -1,16 +1,15 @@
 #!/bin/sh
-#
 
+# $FreeBSD$
+#
 # PROVIDE: tpop3d
 # REQUIRE:  postgresql mysql LOGIN
-
 #
 # Add the following line to /etc/rc.conf to enable tpop3d:
 #tpop3d_enable="YES"
 #
 # You may also wish to use the following variables to fine-tune startup:
 #tpop3d_flags="..."
-#
 
 . /etc/rc.subr
 
diff --git a/mail/up-imapproxy/Makefile b/mail/up-imapproxy/Makefile
index 21aba0a3767d..fe7dbd494d19 100644
--- a/mail/up-imapproxy/Makefile
+++ b/mail/up-imapproxy/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A caching IMAP proxy server
 
 USE_AUTOTOOLS=	autoheader
 
-USE_RC_SUBR=	imapproxyd.sh
+USE_RC_SUBR=	imapproxyd
 DOCS=		COPYING ChangeLog README README.debian \
 		README.known_issues README.ssl
 SBINS=		in.imapproxyd pimpstat
diff --git a/mail/up-imapproxy/files/imapproxyd.sh.in b/mail/up-imapproxy/files/imapproxyd.in
index ffbeb7e6d032..ffbeb7e6d032 100644
--- a/mail/up-imapproxy/files/imapproxyd.sh.in
+++ b/mail/up-imapproxy/files/imapproxyd.in
diff --git a/mail/vbsfilter/Makefile b/mail/vbsfilter/Makefile
index f1855953ea93..e868656a9669 100644
--- a/mail/vbsfilter/Makefile
+++ b/mail/vbsfilter/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A vbs-attachment filter for Sendmail Milter
 
 LICENSE=	GPLv2
 
-USE_RC_SUBR=	vbsfilter.sh
+USE_RC_SUBR=	vbsfilter
 PLIST_FILES=	libexec/vbsfilter
 
 CTARGETS+=	vbsfilter-${PORTVERSION}
diff --git a/mail/vbsfilter/files/vbsfilter.sh.in b/mail/vbsfilter/files/vbsfilter.in
index 608d173965c1..608d173965c1 100644
--- a/mail/vbsfilter/files/vbsfilter.sh.in
+++ b/mail/vbsfilter/files/vbsfilter.in
diff --git a/mail/whoson/Makefile b/mail/whoson/Makefile
index fd1c0262162b..80a1aedfd854 100644
--- a/mail/whoson/Makefile
+++ b/mail/whoson/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=		--with-config=${PREFIX}/etc/whoson.conf
 USE_LDCONFIG=	yes
 
-USE_RC_SUBR=	whoson.sh
+USE_RC_SUBR=	whoson
 
 MAN3=	whoson.3 wso_login.3 wso_logout.3 wso_query.3 wso_version.3
 MAN5=	whoson.conf.5
diff --git a/mail/whoson/files/whoson.sh.in b/mail/whoson/files/whoson.in
index 8f28b3d692a0..8f28b3d692a0 100644
--- a/mail/whoson/files/whoson.sh.in
+++ b/mail/whoson/files/whoson.in
diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile
index 5647daf525ff..a3f58d98a9f6 100644
--- a/mail/zmailer/Makefile
+++ b/mail/zmailer/Makefile
@@ -62,7 +62,7 @@ MAN8=		hold.8zm router.8zm scheduler.8zm sendmail.8zm sm.8zm smtp.8zm \
 
 SUB_FILES=	pkg-install
 PKGINSTALL=	${WRKDIR}/pkg-install
-USE_RC_SUBR=	zmailer.sh
+USE_RC_SUBR=	zmailer
 
 # local variable (we can't use ${SED} here)
 DOMAIN!=	/bin/hostname | ${SED} -e "s:^"`/bin/hostname -s`"\.*::g"
diff --git a/mail/zmailer/files/zmailer.sh.in b/mail/zmailer/files/zmailer.in
index eb3968a4ba0a..eb3968a4ba0a 100644
--- a/mail/zmailer/files/zmailer.sh.in
+++ b/mail/zmailer/files/zmailer.in
diff --git a/misc/dnetc/Makefile b/misc/dnetc/Makefile
index b48ba8e15893..729401f98072 100644
--- a/misc/dnetc/Makefile
+++ b/misc/dnetc/Makefile
@@ -25,7 +25,7 @@ DISTINFO_FILE=	${MASTERDIR}/distinfo.${ARCH}
 
 ONLY_FOR_ARCHS=	i386 sparc64 amd64 powerpc
 
-USE_RC_SUBR=	dnetc.sh
+USE_RC_SUBR=	dnetc
 NO_BUILD=	yes
 
 BINDIR=		${PREFIX}/distributed.net
diff --git a/misc/dnetc/files/dnetc.sh.in b/misc/dnetc/files/dnetc.in
index 25d083b6a0ae..25d083b6a0ae 100644
--- a/misc/dnetc/files/dnetc.sh.in
+++ b/misc/dnetc/files/dnetc.in
diff --git a/misc/upclient/Makefile b/misc/upclient/Makefile
index 01662b7d1cda..174dc98c010c 100644
--- a/misc/upclient/Makefile
+++ b/misc/upclient/Makefile
@@ -20,7 +20,7 @@ COMMENT=	The Uptimes project client
 #
 
 USE_GETTEXT=	yes
-USE_RC_SUBR=	upclient.sh
+USE_RC_SUBR=	upclient
 ALL_TARGET=	bsd
 BUILD_WRKSRC=	${WRKSRC}/src
 
diff --git a/misc/upclient/files/upclient.sh.in b/misc/upclient/files/upclient.in
index 0f18a952fd37..0f18a952fd37 100644
--- a/misc/upclient/files/upclient.sh.in
+++ b/misc/upclient/files/upclient.in
diff --git a/misc/yaunc/Makefile b/misc/yaunc/Makefile
index 95d442b083b1..3b8848446183 100644
--- a/misc/yaunc/Makefile
+++ b/misc/yaunc/Makefile
@@ -19,7 +19,7 @@ CFLAGS+=	-DCONFFILE=\\\"${PREFIX}/etc/yaunc.conf\\\"
 PLIST_FILES=	bin/yaunc \
 		etc/yaunc.conf.sample
 
-USE_RC_SUBR=	yaunc.sh
+USE_RC_SUBR=	yaunc
 
 MAN1=		yaunc.1
 
diff --git a/misc/yaunc/files/yaunc.sh.in b/misc/yaunc/files/yaunc.in
index 6282064c6191..4997f5037d1b 100644
--- a/misc/yaunc/files/yaunc.sh.in
+++ b/misc/yaunc/files/yaunc.in
@@ -1,6 +1,8 @@
-#! /bin/sh
+#!/bin/sh
 
-#PROVIDE: yaunc
+# $FreeBSD$
+#
+# PROVIDE: yaunc
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
@@ -9,7 +11,6 @@
 #               Set it to YES to enable yaunc.
 # yaunc_config (path):   Set to %%PREFIX%%/etc/yaunc.conf
 #               by default.
-#
 
 . /etc/rc.subr
 
diff --git a/multimedia/ptx-kmod/Makefile b/multimedia/ptx-kmod/Makefile
index a225d2ff4e62..6312b1adabb7 100644
--- a/multimedia/ptx-kmod/Makefile
+++ b/multimedia/ptx-kmod/Makefile
@@ -24,7 +24,7 @@ MAKE_ENV=	KMODDIR=${PREFIX}/${KMODDIR} SYSDIR=${SYSDIR}
 PLIST_FILES=	${KMODDIR}/ptx.ko bin/recptx.pl
 PLIST_DIRS=	${KMODDIR}
 SUB_LIST=	KMODDIR=${KMODDIR}
-USE_RC_SUBR=	ptx.sh
+USE_RC_SUBR=	ptx
 PORTDOCS=	README
 
 .include <bsd.port.pre.mk>
diff --git a/multimedia/ptx-kmod/files/ptx.sh.in b/multimedia/ptx-kmod/files/ptx.in
index 498196bf256c..498196bf256c 100644
--- a/multimedia/ptx-kmod/files/ptx.sh.in
+++ b/multimedia/ptx-kmod/files/ptx.in
diff --git a/net-im/jabber-pyaim/Makefile b/net-im/jabber-pyaim/Makefile
index 37a3f5fa8ef4..8c1703d7c0a9 100644
--- a/net-im/jabber-pyaim/Makefile
+++ b/net-im/jabber-pyaim/Makefile
@@ -25,7 +25,7 @@ OPTIONS=	EJABBERD "Use transport with ejabberd" off \
 
 NO_BUILD=	yes
 USE_PYTHON=	yes
-USE_RC_SUBR=	jabber-pyaim-transport.sh
+USE_RC_SUBR=	jabber-pyaim-transport
 LOCAL_PYTHON=	${PYTHON_CMD}
 
 SUB_LIST=	PYTHON_CMD=${LOCAL_PYTHON}
diff --git a/net-im/jabber-pyaim/files/jabber-pyaim-transport.sh.in b/net-im/jabber-pyaim/files/jabber-pyaim-transport.in
index 462bf4cd076f..462bf4cd076f 100644
--- a/net-im/jabber-pyaim/files/jabber-pyaim-transport.sh.in
+++ b/net-im/jabber-pyaim/files/jabber-pyaim-transport.in
diff --git a/net-im/jabber-pyicq/Makefile b/net-im/jabber-pyicq/Makefile
index 83eb7a7ef9d6..8305a4b14c7e 100644
--- a/net-im/jabber-pyicq/Makefile
+++ b/net-im/jabber-pyicq/Makefile
@@ -32,7 +32,7 @@ OPTIONS=	JABBER "Use with jabberd14 (net-im/jabber)" off \
 
 NO_BUILD=	yes
 USE_PYTHON=	yes
-USE_RC_SUBR=	jabber-pyicq-transport.sh
+USE_RC_SUBR=	jabber-pyicq-transport
 LOCAL_PYTHON=	${PYTHON_CMD}
 
 SUB_FILES=	pkg-message README.jabberd14 README.jabberd2 README.external
diff --git a/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in b/net-im/jabber-pyicq/files/jabber-pyicq-transport.in
index f632d68bd6b9..f632d68bd6b9 100644
--- a/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in
+++ b/net-im/jabber-pyicq/files/jabber-pyicq-transport.in
diff --git a/net-im/jabber-pymsn/Makefile b/net-im/jabber-pymsn/Makefile
index 0b11021c9a53..7d19aa8a9275 100644
--- a/net-im/jabber-pymsn/Makefile
+++ b/net-im/jabber-pymsn/Makefile
@@ -28,7 +28,7 @@ OPTIONS=	JABBER "Use with jabberd14 (net-im/jabber)" off \
 
 NO_BUILD=	yes
 USE_PYTHON=	yes
-USE_RC_SUBR=	jabber-pymsn-transport.sh
+USE_RC_SUBR=	jabber-pymsn-transport
 LOCAL_PYTHON=	${PYTHON_CMD}
 
 SUB_FILES=	pkg-message README.jabberd14 README.jabberd2 README.external
diff --git a/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in b/net-im/jabber-pymsn/files/jabber-pymsn-transport.in
index 622be158185d..622be158185d 100644
--- a/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in
+++ b/net-im/jabber-pymsn/files/jabber-pymsn-transport.in
diff --git a/net-im/jggtrans/Makefile b/net-im/jggtrans/Makefile
index 0b1841f65ca1..b4911c2ca8df 100644
--- a/net-im/jggtrans/Makefile
+++ b/net-im/jggtrans/Makefile
@@ -26,7 +26,7 @@ CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 CFLAGS+=		-I${LOCALBASE}/include
 
-USE_RC_SUBR=		jggtrans.sh
+USE_RC_SUBR=		jggtrans
 
 OPTIONS=		NODEBUG "Turn off debugging code" off \
 			EJABBERD "Use transport with ejabberd" off
diff --git a/net-im/jggtrans/files/jggtrans.sh.in b/net-im/jggtrans/files/jggtrans.in
index 2db822352d75..2db822352d75 100644
--- a/net-im/jggtrans/files/jggtrans.sh.in
+++ b/net-im/jggtrans/files/jggtrans.in
diff --git a/net-im/py-punjab/Makefile b/net-im/py-punjab/Makefile
index e157b421db56..7c4498b47439 100644
--- a/net-im/py-punjab/Makefile
+++ b/net-im/py-punjab/Makefile
@@ -21,7 +21,7 @@ USE_TWISTED=	words web conch names
 
 PORTDOCS=	README.txt INSTALL.txt PKG-INFO
 
-USE_RC_SUBR=	punjab.sh
+USE_RC_SUBR=	punjab
 
 SUB_FILES=	pkg-message punjab.tac
 SUB_LIST+=	"PYTHON_CMD=${PYTHON_CMD}"
diff --git a/net-im/py-punjab/files/punjab.sh.in b/net-im/py-punjab/files/punjab.in
index d41f04dc8bbc..c48ffbf51534 100644
--- a/net-im/py-punjab/files/punjab.sh.in
+++ b/net-im/py-punjab/files/punjab.in
@@ -1,9 +1,9 @@
 #!/bin/sh
-#
 
+# $FreeBSD$
+#
 # PROVIDE: punjab
 # REQUIRE: DAEMON
-# BEFORE:  
 
 . /etc/rc.subr
 
diff --git a/net-mgmt/arpwatch/Makefile b/net-mgmt/arpwatch/Makefile
index 4643f800a2a1..8a69a979bd40 100644
--- a/net-mgmt/arpwatch/Makefile
+++ b/net-mgmt/arpwatch/Makefile
@@ -26,7 +26,7 @@ INSTALL_TARGET=	install install-man
 MAN8=		arpwatch.8 arpsnmp.8
 
 SUB_FILES=	pkg-message
-USE_RC_SUBR=	arpwatch.sh
+USE_RC_SUBR=	arpwatch
 
 .ifdef ARPDIR
 MAKE_ARGS=	ARPDIR=${ARPDIR}
diff --git a/net-mgmt/arpwatch/files/arpwatch.sh.in b/net-mgmt/arpwatch/files/arpwatch.in
index c2d51e145366..c2d51e145366 100644
--- a/net-mgmt/arpwatch/files/arpwatch.sh.in
+++ b/net-mgmt/arpwatch/files/arpwatch.in
diff --git a/net-mgmt/bigsister/Makefile b/net-mgmt/bigsister/Makefile
index 021f66acda22..cdf56e2b244f 100644
--- a/net-mgmt/bigsister/Makefile
+++ b/net-mgmt/bigsister/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	net-snmp>=0:${PORTSDIR}/net-mgmt/net-snmp \
 
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_RC_SUBR=	${PORTNAME}.sh
+USE_RC_SUBR=	${PORTNAME}
 NO_BUILD=	yes
 HAS_CONFIGURE=	yes
 
diff --git a/net-mgmt/bigsister/files/bigsister.sh.in b/net-mgmt/bigsister/files/bigsister.in
index 4cff1d36d64d..4cff1d36d64d 100644
--- a/net-mgmt/bigsister/files/bigsister.sh.in
+++ b/net-mgmt/bigsister/files/bigsister.in
diff --git a/net-mgmt/choparp/Makefile b/net-mgmt/choparp/Makefile
index 2234bb93c3dd..ea1047f1e9c4 100644
--- a/net-mgmt/choparp/Makefile
+++ b/net-mgmt/choparp/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	SF
 MAINTAINER=	nork@FreeBSD.org
 COMMENT=	Simple proxy arp daemon
 
-USE_RC_SUBR=	choparp.sh
+USE_RC_SUBR=	choparp
 
 MANCOMPRESSED=	yes
 MAN8=		choparp.8
diff --git a/net-mgmt/choparp/files/choparp.sh.in b/net-mgmt/choparp/files/choparp.in
index ba8d8e4bb2d5..ba8d8e4bb2d5 100644
--- a/net-mgmt/choparp/files/choparp.sh.in
+++ b/net-mgmt/choparp/files/choparp.in
diff --git a/net-mgmt/fprobe/Makefile b/net-mgmt/fprobe/Makefile
index 617a6fd571bb..9f22c83f1127 100644
--- a/net-mgmt/fprobe/Makefile
+++ b/net-mgmt/fprobe/Makefile
@@ -19,7 +19,7 @@ PLIST_FILES=	sbin/fprobe
 PORTDOCS=	ChangeLog README
 SUB_LIST=	NAME=${PORTNAME}
 USE_BZIP2=	yes
-USE_RC_SUBR=	fprobe.sh
+USE_RC_SUBR=	fprobe
 
 MAN8=		fprobe.8
 
diff --git a/net-mgmt/fprobe/files/fprobe.sh.in b/net-mgmt/fprobe/files/fprobe.in
index b2cff48f2b11..b2cff48f2b11 100644
--- a/net-mgmt/fprobe/files/fprobe.sh.in
+++ b/net-mgmt/fprobe/files/fprobe.in
diff --git a/net-mgmt/ipacctd/Makefile b/net-mgmt/ipacctd/Makefile
index 4efbc9915f53..5abeacb81035 100644
--- a/net-mgmt/ipacctd/Makefile
+++ b/net-mgmt/ipacctd/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.wuppy.net.ru/pub/FreeBSD/local/ipacctd/ \
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	IP accounting using divert socket
 
-USE_RC_SUBR=	ipacctd.sh
+USE_RC_SUBR=	ipacctd
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKE_ENV+=	BINDIR="${PREFIX}/sbin"
diff --git a/net-mgmt/ipacctd/files/ipacctd.sh.in b/net-mgmt/ipacctd/files/ipacctd.in
index c0113cb314b6..c0113cb314b6 100644
--- a/net-mgmt/ipacctd/files/ipacctd.sh.in
+++ b/net-mgmt/ipacctd/files/ipacctd.in
diff --git a/net-mgmt/nagios-devel/Makefile b/net-mgmt/nagios-devel/Makefile
index 76aec908db60..7c3d4dfd58b8 100644
--- a/net-mgmt/nagios-devel/Makefile
+++ b/net-mgmt/nagios-devel/Makefile
@@ -24,7 +24,7 @@ LATEST_LINK=	nagios-devel
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 USE_AUTOTOOLS=	autoconf libltdl
-USE_RC_SUBR=	nagios.sh
+USE_RC_SUBR=	nagios
 
 CONFLICTS=	nagios-[123].*
 
diff --git a/net-mgmt/nagios-devel/files/nagios.sh.in b/net-mgmt/nagios-devel/files/nagios.in
index a7e9215f25f7..a7e9215f25f7 100644
--- a/net-mgmt/nagios-devel/files/nagios.sh.in
+++ b/net-mgmt/nagios-devel/files/nagios.in
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 9acb5fc722c6..4e76bd296cef 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -35,7 +35,7 @@ OPTIONS=	IPV6 "Build with IPv6 support" on \
 MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
-USE_RC_SUBR=	snmpd.sh snmptrapd.sh
+USE_RC_SUBR=	snmpd snmptrapd
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 WANT_PERL=	yes
diff --git a/net-mgmt/net-snmp/files/snmpd.sh.in b/net-mgmt/net-snmp/files/snmpd.in
index 83d0c08efa29..83d0c08efa29 100644
--- a/net-mgmt/net-snmp/files/snmpd.sh.in
+++ b/net-mgmt/net-snmp/files/snmpd.in
diff --git a/net-mgmt/net-snmp/files/snmptrapd.sh.in b/net-mgmt/net-snmp/files/snmptrapd.in
index ac77e1c1fa49..ac77e1c1fa49 100644
--- a/net-mgmt/net-snmp/files/snmptrapd.sh.in
+++ b/net-mgmt/net-snmp/files/snmptrapd.in
diff --git a/net-mgmt/netmond/Makefile b/net-mgmt/netmond/Makefile
index 1232007b9b34..5fea45c59346 100644
--- a/net-mgmt/netmond/Makefile
+++ b/net-mgmt/netmond/Makefile
@@ -47,7 +47,7 @@ PLIST_FILES=	sbin/netmond sbin/netmond_watchdog sbin/netmondctl \
 PLIST_FILES+=	sbin/ifgraph
 .endif
 
-USE_RC_SUBR=	netmond.sh
+USE_RC_SUBR=	netmond
 
 SUB_FILES+=	pkg-message netmond_watchdog netmondctl
 
diff --git a/net-mgmt/netmond/files/netmond.sh.in b/net-mgmt/netmond/files/netmond.in
index ba4de7333433..ba4de7333433 100644
--- a/net-mgmt/netmond/files/netmond.sh.in
+++ b/net-mgmt/netmond/files/netmond.in
diff --git a/net-mgmt/ng_ipacct/Makefile b/net-mgmt/ng_ipacct/Makefile
index 277bc8c0c016..cb59702c8c61 100644
--- a/net-mgmt/ng_ipacct/Makefile
+++ b/net-mgmt/ng_ipacct/Makefile
@@ -32,7 +32,7 @@ MAN8=		ipacctctl.8
 MANLANG=	ru.KOI8-R
 MANCOMPRESSED=	yes
 
-USE_RC_SUBR=	ng_ipacct.sh
+USE_RC_SUBR=	ng_ipacct
 SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
diff --git a/net-mgmt/ng_ipacct/files/ng_ipacct.sh.in b/net-mgmt/ng_ipacct/files/ng_ipacct.in
index 572f354bb8b8..572f354bb8b8 100644
--- a/net-mgmt/ng_ipacct/files/ng_ipacct.sh.in
+++ b/net-mgmt/ng_ipacct/files/ng_ipacct.in
diff --git a/net-mgmt/noc/Makefile b/net-mgmt/noc/Makefile
index ee4736910580..2a3c7d94f97a 100644
--- a/net-mgmt/noc/Makefile
+++ b/net-mgmt/noc/Makefile
@@ -87,7 +87,7 @@ SUB_FILES=	pkg-install \
 SUB_LIST=	PREFIX=${PREFIX} \
 		${PLIST_SUB}
 
-USE_RC_SUBR=	noc.sh
+USE_RC_SUBR=	noc
 
 NOC_CONF_FILES=	etc/noc-activator.defaults \
 		etc/noc-classifier.defaults \
diff --git a/net-mgmt/noc/files/noc.sh.in b/net-mgmt/noc/files/noc.in
index dad6a3fc9c02..dad6a3fc9c02 100644
--- a/net-mgmt/noc/files/noc.sh.in
+++ b/net-mgmt/noc/files/noc.in
diff --git a/net-mgmt/pnp/Makefile b/net-mgmt/pnp/Makefile
index 46fb7f75c40e..03aebad99742 100644
--- a/net-mgmt/pnp/Makefile
+++ b/net-mgmt/pnp/Makefile
@@ -32,7 +32,7 @@ USE_PERL5=	yes
 USE_PHP=	gd iconv json pcre simplexml sockets xml zlib
 
 WANT_PHP_WEB=	yes
-USE_RC_SUBR=	npcd.sh
+USE_RC_SUBR=	npcd
 MAN8=		npcd.8
 USE_DOS2UNIX=	yes
 DOS2UNIX_REGEX=	'.*\.\(php\|js\|txt\)$$'
diff --git a/net-mgmt/pnp/files/npcd.sh.in b/net-mgmt/pnp/files/npcd.in
index 32ead7ca6718..32ead7ca6718 100644
--- a/net-mgmt/pnp/files/npcd.sh.in
+++ b/net-mgmt/pnp/files/npcd.in
diff --git a/net-mgmt/snmptt/Makefile b/net-mgmt/snmptt/Makefile
index 3d618877d3b2..8679fff0e2d3 100644
--- a/net-mgmt/snmptt/Makefile
+++ b/net-mgmt/snmptt/Makefile
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
 USE_PERL5=	yes
 
-USE_RC_SUBR=	snmptt.sh
+USE_RC_SUBR=	snmptt
 
 SCRIPTS=	snmptt snmptt-net-snmp-test snmpttconvert \
 		snmpttconvertmib snmptthandler
diff --git a/net-mgmt/snmptt/files/snmptt.sh.in b/net-mgmt/snmptt/files/snmptt.in
index 61860e7dbd18..61860e7dbd18 100644
--- a/net-mgmt/snmptt/files/snmptt.sh.in
+++ b/net-mgmt/snmptt/files/snmptt.in
diff --git a/net-mgmt/xymon-client/Makefile b/net-mgmt/xymon-client/Makefile
index 28f21de3e1ac..9a68d3d0faed 100644
--- a/net-mgmt/xymon-client/Makefile
+++ b/net-mgmt/xymon-client/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 CONFIGURE_ENV=	MAKE=gmake
 MAKE_ENV+=	XYMONUSER="${XYMONUSER}"
 MAKE_ENV+=	XYMONHOSTIP="${XYMONHOSTIP}"
-USE_RC_SUBR=	xymon-client.sh
+USE_RC_SUBR=	xymon-client
 PLIST_SUB+=	XYMONUSER="${XYMONUSER}"
 CONFIG_FILES=	clientlaunch.cfg xymonclient.cfg localclient.cfg
 
diff --git a/net-mgmt/xymon-client/files/xymon-client.sh.in b/net-mgmt/xymon-client/files/xymon-client.in
index 36cc378aca5c..36cc378aca5c 100644
--- a/net-mgmt/xymon-client/files/xymon-client.sh.in
+++ b/net-mgmt/xymon-client/files/xymon-client.in
diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index ff8268d979eb..2e60e15ad5c0 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ENV=	MAKE=gmake
 MAKE_ENV+=	XYMONUSER="${XYMONUSER}"
 MAKE_ENV+=	XYMONHOSTNAME="${XYMONHOSTNAME}"
 MAKE_ENV+=	XYMONHOSTIP="${XYMONHOSTIP}"
-USE_RC_SUBR=	xymon-server.sh
+USE_RC_SUBR=	xymon-server
 SUB_LIST+=	XYMONUSER="${XYMONUSER}"
 PLIST_SUB+=	XYMONUSER="${XYMONUSER}" VARBASE="/var"
 
diff --git a/net-mgmt/xymon-server/files/xymon-server.sh.in b/net-mgmt/xymon-server/files/xymon-server.in
index 89aefd153361..89aefd153361 100644
--- a/net-mgmt/xymon-server/files/xymon-server.sh.in
+++ b/net-mgmt/xymon-server/files/xymon-server.in
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 41624c732b6e..e22dd47df2f7 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -112,7 +112,7 @@ PLIST_SUB+=		AMULECMD="@comment "
 .if ${PORT_OPTIONS:MAMULEDAEMON}
 CONFIGURE_ARGS+=	--enable-amule-daemon
 PLIST_SUB+=		AMULEDAEMON=""
-USE_RC_SUBR=		amuled.sh
+USE_RC_SUBR=		amuled
 .else
 CONFIGURE_ARGS+=	--disable-amule-daemon
 PLIST_SUB+=		AMULEDAEMON="@comment "
diff --git a/net-p2p/amule-devel/files/amuled.sh.in b/net-p2p/amule-devel/files/amuled.in
index 2ed3fa8d8548..2d6af76340f7 100644
--- a/net-p2p/amule-devel/files/amuled.sh.in
+++ b/net-p2p/amule-devel/files/amuled.in
@@ -1,14 +1,14 @@
 #!/bin/sh
+
+# $FreeBSD$
 #
 # aMule RCng startup script
 # Ogirinal work from Gabriele Cecchetti (amule.org forum)
 # 
-
 # PROVIDE: amuled
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
-
 #
 # Add the following lines to /etc/rc.conf to enable amuled at startup
 # amuled (bool): Set to "NO" by default.
@@ -17,7 +17,7 @@
 #                    (default 'aMule')
 # amuled_home (str): Set to home directory of user running amuled
 #                    (default /home/${amuled_user})
-#
+
 . /etc/rc.subr
 
 name="amuled"
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index cd2b9ae1342f..6e58d2832d66 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -106,7 +106,7 @@ PLIST_SUB+=		AMULECMD="@comment "
 .if !defined(WITHOUT_AMULEDAEMON)
 CONFIGURE_ARGS+=	--enable-amule-daemon
 PLIST_SUB+=		AMULEDAEMON=""
-USE_RC_SUBR=		amuled.sh
+USE_RC_SUBR=		amuled
 .else
 CONFIGURE_ARGS+=	--disable-amule-daemon
 PLIST_SUB+=		AMULEDAEMON="@comment "
diff --git a/net-p2p/amule/files/amuled.sh.in b/net-p2p/amule/files/amuled.in
index 2ed3fa8d8548..2d6af76340f7 100644
--- a/net-p2p/amule/files/amuled.sh.in
+++ b/net-p2p/amule/files/amuled.in
@@ -1,14 +1,14 @@
 #!/bin/sh
+
+# $FreeBSD$
 #
 # aMule RCng startup script
 # Ogirinal work from Gabriele Cecchetti (amule.org forum)
 # 
-
 # PROVIDE: amuled
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
-
 #
 # Add the following lines to /etc/rc.conf to enable amuled at startup
 # amuled (bool): Set to "NO" by default.
@@ -17,7 +17,7 @@
 #                    (default 'aMule')
 # amuled_home (str): Set to home directory of user running amuled
 #                    (default /home/${amuled_user})
-#
+
 . /etc/rc.subr
 
 name="amuled"
diff --git a/net-p2p/bnbt/Makefile b/net-p2p/bnbt/Makefile
index a6c0557f6aac..ec7e0674730b 100644
--- a/net-p2p/bnbt/Makefile
+++ b/net-p2p/bnbt/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_DOS2UNIX=	yes
 
 SUB_FILES=	pkg-message
-USE_RC_SUBR=	bnbt.sh
+USE_RC_SUBR=	bnbt
 
 PORTDOCS=	footer.html header.html
 
diff --git a/net-p2p/bnbt/files/bnbt.sh.in b/net-p2p/bnbt/files/bnbt.in
index f8bde3c225cb..f8bde3c225cb 100644
--- a/net-p2p/bnbt/files/bnbt.sh.in
+++ b/net-p2p/bnbt/files/bnbt.in
diff --git a/net-p2p/i2p/Makefile b/net-p2p/i2p/Makefile
index 69c0ff114b51..b64e48c0797f 100644
--- a/net-p2p/i2p/Makefile
+++ b/net-p2p/i2p/Makefile
@@ -33,7 +33,7 @@ LICENSE_DISTFILES_ASL=	${JETTY_DISTFILE}
 LICENSE_DISTFILES_EULA=	i2psource_${PORTVERSION}${EXTRACT_SUFX}
 
 USE_BZIP2=	yes
-USE_RC_SUBR=	i2p.sh
+USE_RC_SUBR=	i2p
 
 JAVA_BUILD=	jdk
 USE_JAVA=	yes
diff --git a/net-p2p/i2p/files/i2p.sh.in b/net-p2p/i2p/files/i2p.in
index ffc192912fe7..ffc192912fe7 100644
--- a/net-p2p/i2p/files/i2p.sh.in
+++ b/net-p2p/i2p/files/i2p.in
diff --git a/net-p2p/uhub/Makefile b/net-p2p/uhub/Makefile
index a6b73cfb4ba9..312e986c3673 100644
--- a/net-p2p/uhub/Makefile
+++ b/net-p2p/uhub/Makefile
@@ -18,7 +18,7 @@ COMMENT=	High performance peer-to-peer hub for the ADC network
 USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
 
-USE_RC_SUBR=	uhub.sh
+USE_RC_SUBR=	uhub
 USERS=		uhub
 GROUPS=		uhub
 SHAREGRP=	uhub
diff --git a/net-p2p/uhub/files/uhub.sh.in b/net-p2p/uhub/files/uhub.in
index 7a06bcfefaf2..7a06bcfefaf2 100644
--- a/net-p2p/uhub/files/uhub.sh.in
+++ b/net-p2p/uhub/files/uhub.in
diff --git a/net/3proxy/Makefile b/net/3proxy/Makefile
index dd1cd24f538b..724a771a307c 100644
--- a/net/3proxy/Makefile
+++ b/net/3proxy/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Proxy servers set (support HTTP(S), FTP, SOCKS, POP3, TCP & UDP)
 
 CONFLICTS=	libproxy-[0-9]*
 
-USE_RC_SUBR=	3proxy.sh
+USE_RC_SUBR=	3proxy
 MAKEFILE=	Makefile.unix
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
diff --git a/net/3proxy/files/3proxy.sh.in b/net/3proxy/files/3proxy.in
index ab286f94cc37..ab286f94cc37 100644
--- a/net/3proxy/files/3proxy.sh.in
+++ b/net/3proxy/files/3proxy.in
diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile
index 1bfcd5560571..eeca5d77a631 100644
--- a/net/DarwinStreamingServer/Makefile
+++ b/net/DarwinStreamingServer/Makefile
@@ -30,7 +30,7 @@ NOT_FOR_ARCHS=	ia64 powerpc sparc64
 
 USE_PERL5_RUN=	yes
 USE_PERL5_BUILD=yes
-USE_RC_SUBR=	streamingadminserver.sh darwin_streaming_server.sh
+USE_RC_SUBR=	streamingadminserver darwin_streaming_server
 SUB_LIST+=	PERL=${PERL}
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/net/DarwinStreamingServer/files/darwin_streaming_server.sh.in b/net/DarwinStreamingServer/files/darwin_streaming_server.in
index 42996a6a9f45..42996a6a9f45 100644
--- a/net/DarwinStreamingServer/files/darwin_streaming_server.sh.in
+++ b/net/DarwinStreamingServer/files/darwin_streaming_server.in
diff --git a/net/DarwinStreamingServer/files/streamingadminserver.sh.in b/net/DarwinStreamingServer/files/streamingadminserver.in
index dde54db34b9c..dde54db34b9c 100644
--- a/net/DarwinStreamingServer/files/streamingadminserver.sh.in
+++ b/net/DarwinStreamingServer/files/streamingadminserver.in
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index ba0ebc3cb0e8..e11ed1bb12e4 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -32,7 +32,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
 USE_BISON=	build
-USE_RC_SUBR=	asterisk.sh
+USE_RC_SUBR=	asterisk
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		MKDIR="${MKDIR}" \
diff --git a/net/asterisk/files/asterisk.sh.in b/net/asterisk/files/asterisk.in
index a612850c5603..a612850c5603 100644
--- a/net/asterisk/files/asterisk.sh.in
+++ b/net/asterisk/files/asterisk.in
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index a6955ac7da12..effba7a6886e 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -30,7 +30,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
 USE_BISON=	build
-USE_RC_SUBR=	asterisk.sh
+USE_RC_SUBR=	asterisk
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		MKDIR="${MKDIR}" \
diff --git a/net/asterisk10/files/asterisk.sh.in b/net/asterisk10/files/asterisk.in
index a612850c5603..a612850c5603 100644
--- a/net/asterisk10/files/asterisk.sh.in
+++ b/net/asterisk10/files/asterisk.in
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index e17ac7055385..2dd5920e8dcd 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS=	--with-gsm=${LOCALBASE}
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
 USE_GMAKE=	yes
 USE_BISON=	build
-USE_RC_SUBR=	asterisk.sh
+USE_RC_SUBR=	asterisk
 MAKE_ENV=	MKDIR="${MKDIR}" \
 		PWLIBDIR=${LOCALBASE}/share/pwlib \
 		OPENH323DIR=${LOCALBASE}/share/openh323 \
diff --git a/net/asterisk14/files/asterisk.sh.in b/net/asterisk14/files/asterisk.in
index 36992dc45267..8c5049f28bf4 100644
--- a/net/asterisk14/files/asterisk.sh.in
+++ b/net/asterisk14/files/asterisk.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: asterisk
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
@@ -7,7 +9,6 @@
 # Add the following lines to /etc/rc.conf to enable asterisk:
 #
 # asterisk_enable="YES"
-#
 
 . /etc/rc.subr
 
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 9c2e9d9e87fd..cb9512f8bb73 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -36,7 +36,7 @@ CONFIGURE_ARGS=	--with-gsm=${LOCALBASE}
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
 USE_BISON=	build
-USE_RC_SUBR=	asterisk.sh
+USE_RC_SUBR=	asterisk
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		MKDIR="${MKDIR}" \
diff --git a/net/asterisk16/files/asterisk.sh.in b/net/asterisk16/files/asterisk.in
index be2d32d87d6c..be2d32d87d6c 100644
--- a/net/asterisk16/files/asterisk.sh.in
+++ b/net/asterisk16/files/asterisk.in
diff --git a/net/balance/Makefile b/net/balance/Makefile
index f881612b57fc..682bc2cbe6f5 100644
--- a/net/balance/Makefile
+++ b/net/balance/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	joseph@randomnetworks.com
 COMMENT=	Simple but powerful generic TCP proxy with round robin features
 
 ALL_TARGET=	balance
-USE_RC_SUBR=	balance.sh
+USE_RC_SUBR=	balance
 
 MAN1=		balance.1
 
diff --git a/net/balance/files/balance.sh.in b/net/balance/files/balance.in
index 5f80783f5ffb..5f80783f5ffb 100644
--- a/net/balance/files/balance.sh.in
+++ b/net/balance/files/balance.in
diff --git a/net/bfilter/Makefile b/net/bfilter/Makefile
index da3ce4c2c2c2..654bded45e4a 100644
--- a/net/bfilter/Makefile
+++ b/net/bfilter/Makefile
@@ -24,7 +24,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN8=		bfilter.8
-USE_RC_SUBR=	bfilter.sh
+USE_RC_SUBR=	bfilter
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
diff --git a/net/bfilter/files/bfilter.sh.in b/net/bfilter/files/bfilter.in
index b54c7f3bf192..b54c7f3bf192 100644
--- a/net/bfilter/files/bfilter.sh.in
+++ b/net/bfilter/files/bfilter.in
diff --git a/net/binkd/Makefile b/net/binkd/Makefile
index cd6d3b6e2254..bdcbb537b60c 100644
--- a/net/binkd/Makefile
+++ b/net/binkd/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Fidonet TCP/IP mailer
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_ZIP=	yes
-USE_RC_SUBR=	binkd.sh
+USE_RC_SUBR=	binkd
 GNU_CONFIGURE=	yes
 
 MAN8=		binkd.8
diff --git a/net/binkd/files/binkd.sh.in b/net/binkd/files/binkd.in
index 7d709ebe466c..7d709ebe466c 100644
--- a/net/binkd/files/binkd.sh.in
+++ b/net/binkd/files/binkd.in
diff --git a/net/cnupm/Makefile b/net/cnupm/Makefile
index 7600e2c72aec..9730c3c115eb 100644
--- a/net/cnupm/Makefile
+++ b/net/cnupm/Makefile
@@ -17,7 +17,7 @@ COMMENT=	The BPF Traffic Collector (IPv4/IPv6)
 MAKE_ENV+=	BINDIR="${PREFIX}/sbin" \
 		MANDIR="${MANPREFIX}/man/man"
 
-USE_RC_SUBR=	cnupm.sh
+USE_RC_SUBR=	cnupm
 MAN8=		cnupm.8 cnupmstat.8
 MANCOMPRESSED=	yes
 
diff --git a/net/cnupm/files/cnupm.sh.in b/net/cnupm/files/cnupm.in
index 2a9a33852020..2a9a33852020 100644
--- a/net/cnupm/files/cnupm.sh.in
+++ b/net/cnupm/files/cnupm.in
diff --git a/net/cvsup-mirror/Makefile b/net/cvsup-mirror/Makefile
index ce0339861b99..2ee68b05e1bb 100644
--- a/net/cvsup-mirror/Makefile
+++ b/net/cvsup-mirror/Makefile
@@ -21,7 +21,7 @@ NO_BUILD=	true
 IS_INTERACTIVE=	true
 NO_PACKAGE=	too interactive
 
-USE_RC_SUBR=	cvsupd.sh
+USE_RC_SUBR=	cvsupd
 SUB_FILES=	update.sh
 
 base=${PREFIX}/etc/cvsup
diff --git a/net/cvsup-mirror/files/cvsupd.sh.in b/net/cvsup-mirror/files/cvsupd.in
index 60d080b4b6ff..60d080b4b6ff 100644
--- a/net/cvsup-mirror/files/cvsupd.sh.in
+++ b/net/cvsup-mirror/files/cvsupd.in
diff --git a/net/daemonlogger/Makefile b/net/daemonlogger/Makefile
index 6bf352e78d33..e045b528b5ab 100644
--- a/net/daemonlogger/Makefile
+++ b/net/daemonlogger/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A packet sniffer capable of running as a daemon and as a software tap
 LIB_DEPENDS=	dnet.1:${PORTSDIR}/net/libdnet
 
 GNU_CONFIGURE=	yes
-USE_RC_SUBR=	daemonlogger.sh
+USE_RC_SUBR=	daemonlogger
 MAKE_JOBS_SAFE=	yes
 
 PLIST_FILES=	bin/daemonlogger
diff --git a/net/daemonlogger/files/daemonlogger.sh.in b/net/daemonlogger/files/daemonlogger.in
index 77dc52d509cc..77dc52d509cc 100644
--- a/net/daemonlogger/files/daemonlogger.sh.in
+++ b/net/daemonlogger/files/daemonlogger.in
diff --git a/net/dante/Makefile b/net/dante/Makefile
index dd5539763bad..b0dd91f72ce2 100644
--- a/net/dante/Makefile
+++ b/net/dante/Makefile
@@ -26,7 +26,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 
 USE_LDCONFIG=	yes
 
-USE_RC_SUBR=	sockd.sh
+USE_RC_SUBR=	sockd
 
 LICENSE=	BSD
 
diff --git a/net/dante/files/sockd.sh.in b/net/dante/files/sockd.in
index 078e49ea23e1..078e49ea23e1 100644
--- a/net/dante/files/sockd.sh.in
+++ b/net/dante/files/sockd.in
diff --git a/net/dhcp6/Makefile b/net/dhcp6/Makefile
index f97f34cad1c0..1a1ca028d77a 100644
--- a/net/dhcp6/Makefile
+++ b/net/dhcp6/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${LOCALBASE}/etc --with-localdbdir=/var/db
 MAN5=		dhcp6c.conf.5 dhcp6s.conf.5
 MAN8=		dhcp6c.8 dhcp6s.8 dhcp6relay.8 dhcp6ctl.8
 
-USE_RC_SUBR=	dhcp6c.sh dhcp6relay.sh dhcp6s.sh
+USE_RC_SUBR=	dhcp6c dhcp6relay dhcp6s
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/net/dhcp6/files/dhcp6c.sh.in b/net/dhcp6/files/dhcp6c.in
index 1054a0995bac..1054a0995bac 100644
--- a/net/dhcp6/files/dhcp6c.sh.in
+++ b/net/dhcp6/files/dhcp6c.in
diff --git a/net/dhcp6/files/dhcp6relay.sh.in b/net/dhcp6/files/dhcp6relay.in
index 849f825ba71d..849f825ba71d 100644
--- a/net/dhcp6/files/dhcp6relay.sh.in
+++ b/net/dhcp6/files/dhcp6relay.in
diff --git a/net/dhcp6/files/dhcp6s.sh.in b/net/dhcp6/files/dhcp6s.in
index f13c74b47ef0..f13c74b47ef0 100644
--- a/net/dhcp6/files/dhcp6s.sh.in
+++ b/net/dhcp6/files/dhcp6s.in
diff --git a/net/dtcp/Makefile b/net/dtcp/Makefile
index ee50d2b3127c..73fe9c87cc66 100644
--- a/net/dtcp/Makefile
+++ b/net/dtcp/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Dynamic Tunnel Configuration Protocol daemon and client
 RUN_DEPENDS=	qpopauth:${PORTSDIR}/mail/qpopper
 .endif
 
-USE_RC_SUBR=	dtcpc.sh dtcps.sh
+USE_RC_SUBR=	dtcpc dtcps
 USE_RUBY=	yes
 RUBY_VER=	1.8
 MAKE_ENV+=	RUBY=${RUBY}
diff --git a/net/dtcp/files/dtcpc.sh.in b/net/dtcp/files/dtcpc.in
index 0d7e32cdc0a9..0d7e32cdc0a9 100644
--- a/net/dtcp/files/dtcpc.sh.in
+++ b/net/dtcp/files/dtcpc.in
diff --git a/net/dtcp/files/dtcps.sh.in b/net/dtcp/files/dtcps.in
index 6f3693a985c9..6f3693a985c9 100644
--- a/net/dtcp/files/dtcps.sh.in
+++ b/net/dtcp/files/dtcps.in
diff --git a/net/dtcpclient/Makefile b/net/dtcpclient/Makefile
index f7b86f313c2f..de4f8239f8e1 100644
--- a/net/dtcpclient/Makefile
+++ b/net/dtcpclient/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.mahoroba.org/~ume/ipv6/ \
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Dynamic Tunnel Configuration Protocol client
 
-USE_RC_SUBR=	dtcpclient.sh
+USE_RC_SUBR=	dtcpclient
 
 MAN8=		dtcpclient.8
 MANCOMPRESSED=	yes
diff --git a/net/dtcpclient/files/dtcpclient.sh.in b/net/dtcpclient/files/dtcpclient.in
index 916c7873f498..916c7873f498 100644
--- a/net/dtcpclient/files/dtcpclient.sh.in
+++ b/net/dtcpclient/files/dtcpclient.in
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index aaafc1ea43f8..f8433b58bf1a 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -33,7 +33,7 @@ KRB5_CONFIG?=	/usr/bin/krb5-config --libs
 CONFLICTS=	gnu-radius-[0-9].* openradius-[0-9].* radiusd-cistron-[0-9].* \
 		freeradius-mysql-[0-9].* freeradius-[013-9].*
 
-USE_RC_SUBR=	radiusd.sh
+USE_RC_SUBR=	radiusd
 USE_AUTOTOOLS=	libltdl libtool autoconf
 USE_GMAKE=	yes
 USE_BZIP2=	yes
diff --git a/net/freeradius2/files/radiusd.sh.in b/net/freeradius2/files/radiusd.in
index bf65b812554c..bf65b812554c 100644
--- a/net/freeradius2/files/radiusd.sh.in
+++ b/net/freeradius2/files/radiusd.in
diff --git a/net/frickin/Makefile b/net/frickin/Makefile
index 6e3916567bcb..d1596cd32063 100644
--- a/net/frickin/Makefile
+++ b/net/frickin/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	asm@asm.kiev.ua
 COMMENT=	Frickin PPTP Proxy
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_RC_SUBR=	frickin.sh
+USE_RC_SUBR=	frickin
 SUB_FILES=	pkg-message
 PORTDOCS=	INSTALL LICENSE
 PLIST_FILES=	sbin/frickin2 etc/frickin.conf.sample
diff --git a/net/frickin/files/frickin.sh.in b/net/frickin/files/frickin.in
index 87776cac2678..87776cac2678 100644
--- a/net/frickin/files/frickin.sh.in
+++ b/net/frickin/files/frickin.in
diff --git a/net/gatekeeper/Makefile b/net/gatekeeper/Makefile
index 4e64adf569e5..966333c4068b 100644
--- a/net/gatekeeper/Makefile
+++ b/net/gatekeeper/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	h323_r.1:${PORTSDIR}/net/openh323
 
 #WRKSRC=		${WRKDIR}/${MASTER_SITE_SUBDIR}-${DISTVERSION:C/-[0-9]$//}
 
-USE_RC_SUBR=	gnugk.sh
+USE_RC_SUBR=	gnugk
 USERS=		gnugk
 GROUPS=		${USERS}
 
diff --git a/net/gatekeeper/files/gnugk.sh.in b/net/gatekeeper/files/gnugk.in
index 20ef2dfb4924..20ef2dfb4924 100644
--- a/net/gatekeeper/files/gnugk.sh.in
+++ b/net/gatekeeper/files/gnugk.in
diff --git a/net/gateway6/Makefile b/net/gateway6/Makefile
index ddff860bf380..60e9f0508f02 100644
--- a/net/gateway6/Makefile
+++ b/net/gateway6/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Gateway6 Tunnel Setup Protocol Client - Free IPv6 tunnel
 
 CONFLICTS=	freenet6-[0-9]*
 
-USE_RC_SUBR=	gateway6.sh
+USE_RC_SUBR=	gateway6
 WRKSRC=		${WRKDIR}/gw6c-6_0_1
 ETCDIR=		${PREFIX}/etc
 
diff --git a/net/gateway6/files/gateway6.sh.in b/net/gateway6/files/gateway6.in
index 4718b6683798..4718b6683798 100644
--- a/net/gateway6/files/gateway6.sh.in
+++ b/net/gateway6/files/gateway6.in
diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile
index e695f05189c0..73ecdb40362b 100644
--- a/net/gnu-dico/Makefile
+++ b/net/gnu-dico/Makefile
@@ -93,7 +93,7 @@ INFO=		dico
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 SUB_FILES+=	pkg-message
-USE_RC_SUBR=	dicod.sh
+USE_RC_SUBR=	dicod
 
 post-patch:
 	@${REINPLACE_CMD} 's/@bindir@/@sbindir@/' ${WRKSRC}/dicod/Makefile.in
diff --git a/net/gnu-dico/files/dicod.sh.in b/net/gnu-dico/files/dicod.in
index f18a48cba93c..52bc90cdd93e 100644
--- a/net/gnu-dico/files/dicod.sh.in
+++ b/net/gnu-dico/files/dicod.in
@@ -1,4 +1,6 @@
 #!/bin/sh
+
+# $FreeBSD$
 #
 # PROVIDE: dicod
 # REQUIRE: DAEMON
@@ -6,7 +8,7 @@
 # Add the following line to /etc/rc.conf to enable dicod:
 #
 # dicod_enable="YES"
-#
+
 
 dicod_enable=${dicod_enable-"NO"}
 
diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index 3087be97658c..f3156c1f2aae 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	GNU RADIUS server
 
 CONFLICTS=	freeradius-0.* openradius-0.* radiusd-cistron-1.*
-USE_RC_SUBR=	radiusd.sh
+USE_RC_SUBR=	radiusd
 USE_SUBMAKE=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libltdl libtool
diff --git a/net/gnu-radius/files/radiusd.sh.in b/net/gnu-radius/files/radiusd.in
index 1035a2797a63..370c7099f80b 100644
--- a/net/gnu-radius/files/radiusd.sh.in
+++ b/net/gnu-radius/files/radiusd.in
@@ -1,15 +1,15 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE radiusd
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
-
 #
 # Add the following lines to /etc/rc.conf to enable radiusd:
 #
 # radiusd_enable="YES"
-#
 
 . /etc/rc.subr
 
diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index 8a2cafa87b27..d74f04906a4c 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -24,7 +24,7 @@ MAN8=		irrd.8
 
 IRRD_CONFDIR=	${PREFIX}/etc
 
-USE_RC_SUBR=	irrd.sh
+USE_RC_SUBR=	irrd
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	YACC="${YACC}"
 #CONFIGURE_ARGS+=	--disable-thread
diff --git a/net/irrd/files/irrd.sh.in b/net/irrd/files/irrd.in
index 96dee7541f2c..96dee7541f2c 100644
--- a/net/irrd/files/irrd.sh.in
+++ b/net/irrd/files/irrd.in
diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile
index aba0b0e524a8..14a039b724d4 100644
--- a/net/mediatomb/Makefile
+++ b/net/mediatomb/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	--with-search="${LOCALBASE}" \
 		--disable-inotify
 CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
-USE_RC_SUBR=	mediatomb.sh
+USE_RC_SUBR=	mediatomb
 
 # --- configurable variables ---
 MEDIATOMB_USER?=	mediatomb
diff --git a/net/mediatomb/files/mediatomb.sh.in b/net/mediatomb/files/mediatomb.in
index 31476a2f41cb..31476a2f41cb 100644
--- a/net/mediatomb/files/mediatomb.sh.in
+++ b/net/mediatomb/files/mediatomb.in
diff --git a/net/minidlna/Makefile b/net/minidlna/Makefile
index c687318d8c8c..10c1d74fa5e3 100644
--- a/net/minidlna/Makefile
+++ b/net/minidlna/Makefile
@@ -32,7 +32,7 @@ EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude getifaddr.c
 
 PKGMESSAGE=	${WRKSRC}/pkg-message
 SUB_FILES+=	pkg-message
-USE_RC_SUBR=	minidlna.sh
+USE_RC_SUBR=	minidlna
 SUB_LIST+=	USER=${USERS}
 
 USERS=	dlna
diff --git a/net/minidlna/files/minidlna.sh.in b/net/minidlna/files/minidlna.in
index b2803349c32c..b2803349c32c 100644
--- a/net/minidlna/files/minidlna.sh.in
+++ b/net/minidlna/files/minidlna.in
diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index df1d56d398b7..85c4aaa558aa 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -25,7 +25,7 @@ MAKE_JOBS_UNSAFE=yes
 
 MAN8=		miniupnpd.8
 
-USE_RC_SUBR=	miniupnpd.sh
+USE_RC_SUBR=	miniupnpd
 
 OPTIONS=	PF_ENABLE_FILTER_RULES		"Enable pf generation of filter rules" off
 
diff --git a/net/miniupnpd/files/miniupnpd.sh.in b/net/miniupnpd/files/miniupnpd.in
index f866faf0f9d6..f866faf0f9d6 100644
--- a/net/miniupnpd/files/miniupnpd.sh.in
+++ b/net/miniupnpd/files/miniupnpd.in
diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile
index dbb925816891..1888b9cdb2bd 100644
--- a/net/mpd5/Makefile
+++ b/net/mpd5/Makefile
@@ -46,7 +46,7 @@ RUN_DEPENDS+=	/boot/modules/ng_ipacct.ko:${PORTSDIR}/net-mgmt/ng_ipacct
 
 MAN8=		mpd5.8
 MANCOMPRESSED=	maybe
-USE_RC_SUBR=	mpd5.sh
+USE_RC_SUBR=	mpd5
 HTMLNUM!=	jot 70 1
 CONFSUF=	conf secret script
 DOCSDIR=	${PREFIX}/share/doc/mpd5
diff --git a/net/mpd5/files/mpd5.sh.in b/net/mpd5/files/mpd5.in
index 5654f72f1842..5654f72f1842 100644
--- a/net/mpd5/files/mpd5.sh.in
+++ b/net/mpd5/files/mpd5.in
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 6c7d4037a6a2..0b02ddc68c56 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -47,7 +47,7 @@ MAN8=		ntop.8
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 SUB_FILES=	pkg-deinstall
 SUB_LIST=	DBDIR=${DBDIR}
-USE_RC_SUBR=	ntop.sh
+USE_RC_SUBR=	ntop
 
 ##
 ## Available knobs:
diff --git a/net/ntop/files/ntop.sh.in b/net/ntop/files/ntop.in
index bbedc786ffef..bbedc786ffef 100644
--- a/net/ntop/files/ntop.sh.in
+++ b/net/ntop/files/ntop.in
diff --git a/net/nylon/Makefile b/net/nylon/Makefile
index 3a7f81fdf4b9..b41f676695df 100644
--- a/net/nylon/Makefile
+++ b/net/nylon/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A Unix SOCKS 4 and 5 proxy server
 
 LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
 
-USE_RC_SUBR=	nylon.sh
+USE_RC_SUBR=	nylon
 
 GNU_CONFIGURE=	yes
 # Necessary for $PREFIX to work:
diff --git a/net/nylon/files/nylon.sh.in b/net/nylon/files/nylon.in
index bec8209efc9c..eceba950feca 100644
--- a/net/nylon/files/nylon.sh.in
+++ b/net/nylon/files/nylon.in
@@ -1,17 +1,16 @@
 #!/bin/sh
-#
 
+# $FreeBSD$
+#
 # PROVIDE: nylon
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
-
 #
 # Add the following lines to /etc/rc.conf to enable nylon:
 #
 #nylon_enable="YES"
 #
 # See nylon(1) for flags
-#
 
 . /etc/rc.subr
 
diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index e2a625c09a4d..70f2d54f0c3b 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=	yes
 USE_BISON=	build
 USE_GMAKE=	yes
 
-USE_RC_SUBR=	olsrd.sh
+USE_RC_SUBR=	olsrd
 MAN8=		olsrd.8
 MAN5=		olsrd.conf.5
 MANCOMPRESSED=	yes
diff --git a/net/olsrd/files/olsrd.sh.in b/net/olsrd/files/olsrd.in
index fa3a2345a312..fa3a2345a312 100644
--- a/net/olsrd/files/olsrd.sh.in
+++ b/net/olsrd/files/olsrd.in
diff --git a/net/openbgpd/Makefile b/net/openbgpd/Makefile
index 3c333da59809..c4793d40fffc 100644
--- a/net/openbgpd/Makefile
+++ b/net/openbgpd/Makefile
@@ -31,7 +31,7 @@ BROKEN=		does not build
 
 WRKSRC=		${WRKDIR}
 MANCOMPRESSED=	yes
-USE_RC_SUBR=	${PORTNAME}.sh
+USE_RC_SUBR=	${PORTNAME}
 PLIST_FILES=	sbin/bgpctl sbin/bgpd
 SUB_FILES=	pkg-message
 USERS=		_bgpd
diff --git a/net/openbgpd/files/openbgpd.sh.in b/net/openbgpd/files/openbgpd.in
index a2d3d7e9316e..a2d3d7e9316e 100644
--- a/net/openbgpd/files/openbgpd.sh.in
+++ b/net/openbgpd/files/openbgpd.in
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index b8b6e2b93320..ad3a71691708 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -164,7 +164,7 @@ PKGMESSAGE=		${WRKSRC}/pkg-message.client
 
 USE_LDCONFIG=		${PREFIX}/libexec/openldap
 SUB_FILES+=		pkg-deinstall pkg-message pkg-install
-USE_RC_SUBR=		slapd.sh ${SLURPDSH}
+USE_RC_SUBR=		slapd ${SLURPDSH}
 
 EXTRA_PATCHES+=		${FILESDIR}/extrapatch-Makefile.in
 
diff --git a/net/openldap23-server/files/slapd.sh.in b/net/openldap23-server/files/slapd.in
index 5ccee7aeec2b..5ccee7aeec2b 100644
--- a/net/openldap23-server/files/slapd.sh.in
+++ b/net/openldap23-server/files/slapd.in
diff --git a/net/openldap23-server/files/slurpd.sh.in b/net/openldap23-server/files/slurpd.in
index 087ac22238d6..087ac22238d6 100644
--- a/net/openldap23-server/files/slurpd.sh.in
+++ b/net/openldap23-server/files/slurpd.in
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 7bc9f4772a96..64c4d90b1dae 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -196,7 +196,7 @@ USE_LDCONFIG=		yes
 
 USE_LDCONFIG=		${PREFIX}/libexec/openldap
 SUB_FILES+=		pkg-message pkg-deinstall
-USE_RC_SUBR=		slapd.sh
+USE_RC_SUBR=		slapd
 
 EXTRA_PATCHES+=		${FILESDIR}/extrapatch-Makefile.in
 
diff --git a/net/openldap24-server/files/slapd.sh.in b/net/openldap24-server/files/slapd.in
index 76061fa441e1..76061fa441e1 100644
--- a/net/openldap24-server/files/slapd.sh.in
+++ b/net/openldap24-server/files/slapd.in
diff --git a/net/openospfd/Makefile b/net/openospfd/Makefile
index 2e0d88541b03..e0c59a3082d6 100644
--- a/net/openospfd/Makefile
+++ b/net/openospfd/Makefile
@@ -26,7 +26,7 @@ CONFLICTS=	zebra-0* quagga-0*
 
 WRKSRC=		${WRKDIR}
 MANCOMPRESSED=	yes
-USE_RC_SUBR=	openospfd.sh
+USE_RC_SUBR=	openospfd
 MAKE_ENV=	BINDIR="${PREFIX}/sbin" \
 		MANDIR="${PREFIX}/man/man"
 COPTS=		-I${LOCALBASE}/include -DMD5_DIGEST_LENGTH=16
diff --git a/net/openospfd/files/openospfd.sh.in b/net/openospfd/files/openospfd.in
index 723e18db4b77..723e18db4b77 100644
--- a/net/openospfd/files/openospfd.sh.in
+++ b/net/openospfd/files/openospfd.in
diff --git a/net/pen/Makefile b/net/pen/Makefile
index 857e50d8f1ab..23d1920fdd22 100644
--- a/net/pen/Makefile
+++ b/net/pen/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A load balancer for simple TCP based protocols
 
 GNU_CONFIGURE=		yes
 USE_OPENSSL=		yes
-USE_RC_SUBR=		pen.sh
+USE_RC_SUBR=		pen
 CONFIGURE_ARGS=		--with-daemon --with-docdir=${DOCSDIR} \
 			--with-ssl=${OPENSSLBASE}
 
diff --git a/net/pen/files/pen.sh.in b/net/pen/files/pen.in
index 6f4986633097..6f4986633097 100644
--- a/net/pen/files/pen.sh.in
+++ b/net/pen/files/pen.in
diff --git a/net/poptop/Makefile b/net/poptop/Makefile
index bcd8dbecff69..afcce607d898 100644
--- a/net/poptop/Makefile
+++ b/net/poptop/Makefile
@@ -20,7 +20,7 @@ GNU_CONFIGURE=	yes
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 
-USE_RC_SUBR=	pptpd.sh
+USE_RC_SUBR=	pptpd
 
 MAN5=		pptpd.conf.5
 MAN8=		pptpd.8 pptpctrl.8
diff --git a/net/poptop/files/pptpd.sh.in b/net/poptop/files/pptpd.in
index 375b5f60d889..375b5f60d889 100644
--- a/net/poptop/files/pptpd.sh.in
+++ b/net/poptop/files/pptpd.in
diff --git a/net/pxe/Makefile b/net/pxe/Makefile
index 1ec71901e577..5e75b3eb3336 100644
--- a/net/pxe/Makefile
+++ b/net/pxe/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.kano.org.uk/projects/pxe/ \
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	PXE daemon, set up a boot menu for netbooting PXE enabled clients
 
-USE_RC_SUBR=	pxe.sh
+USE_RC_SUBR=	pxe
 SUB_FILES=	pkg-message
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-config=${PREFIX}/etc/pxe.conf \
diff --git a/net/pxe/files/pxe.sh.in b/net/pxe/files/pxe.in
index 133e3eafb797..133e3eafb797 100644
--- a/net/pxe/files/pxe.sh.in
+++ b/net/pxe/files/pxe.in
diff --git a/net/qadsl/Makefile b/net/qadsl/Makefile
index b045c6436c40..7af6adf97852 100644
--- a/net/qadsl/Makefile
+++ b/net/qadsl/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Auto login/Keep-alive for Telia AB ADSL, COMHEM Cable, and Tiscali Inte
 LICENSE=	GPLv2 # (or later)
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_RC_SUBR=	qadsl.sh
+USE_RC_SUBR=	qadsl
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
diff --git a/net/qadsl/files/qadsl.sh.in b/net/qadsl/files/qadsl.in
index e94442588979..2c470f09970b 100644
--- a/net/qadsl/files/qadsl.sh.in
+++ b/net/qadsl/files/qadsl.in
@@ -1,10 +1,11 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: qadsl 
 # REQUIRE: NETWORK
 # BEFORE: DAEMON SERVERS LOGIN
 # KEYWORD: shutdown
-
 #
 # Add the following lines to /etc/rc.conf to enable qadsl:
 #
@@ -16,7 +17,6 @@
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
-
 # Default flags
 qadsl_enable=${qadsl_enable-"NO"}
 qadsl_flags=${qadsl_flags-"-l"}
diff --git a/net/quagga-re/Makefile b/net/quagga-re/Makefile
index 6c14842fc199..f788c84b60fc 100644
--- a/net/quagga-re/Makefile
+++ b/net/quagga-re/Makefile
@@ -128,7 +128,7 @@ SUB_LIST=	RCLDCONFIG=
 CONFIGURE_ARGS+=--disable-bgp-announce
 .endif
 
-USE_RC_SUBR=	quagga.sh watchquagga.sh
+USE_RC_SUBR=	quagga watchquagga
 
 SUB_LIST+=	LOCALSTATE_DIR=${LOCALSTATE_DIR} \
 		SYSCONF_DIR=${SYSCONF_DIR}
diff --git a/net/quagga-re/files/quagga.sh.in b/net/quagga-re/files/quagga.in
index 92c4d41af2f3..92c4d41af2f3 100644
--- a/net/quagga-re/files/quagga.sh.in
+++ b/net/quagga-re/files/quagga.in
diff --git a/net/quagga-re/files/watchquagga.sh.in b/net/quagga-re/files/watchquagga.in
index 1b7870f4ebd5..1b7870f4ebd5 100644
--- a/net/quagga-re/files/watchquagga.sh.in
+++ b/net/quagga-re/files/watchquagga.in
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 65d2ed45ee8e..41ba890ba8b8 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -127,7 +127,7 @@ SUB_LIST=	RCLDCONFIG=
 CONFIGURE_ARGS+=--disable-bgp-announce
 .endif
 
-USE_RC_SUBR=	quagga.sh watchquagga.sh
+USE_RC_SUBR=	quagga watchquagga
 
 SUB_LIST+=	LOCALSTATE_DIR=${LOCALSTATE_DIR} \
 		SYSCONF_DIR=${SYSCONF_DIR}
diff --git a/net/quagga/files/quagga.sh.in b/net/quagga/files/quagga.in
index 92c4d41af2f3..92c4d41af2f3 100644
--- a/net/quagga/files/quagga.sh.in
+++ b/net/quagga/files/quagga.in
diff --git a/net/quagga/files/watchquagga.sh.in b/net/quagga/files/watchquagga.in
index 1b7870f4ebd5..1b7870f4ebd5 100644
--- a/net/quagga/files/watchquagga.sh.in
+++ b/net/quagga/files/watchquagga.in
diff --git a/net/rinetd/Makefile b/net/rinetd/Makefile
index 4412c8c5044f..493ca5176761 100644
--- a/net/rinetd/Makefile
+++ b/net/rinetd/Makefile
@@ -28,7 +28,7 @@ MAN8=		rinetd.8
 PORTDOCS=	index.html
 PLIST_FILES=	sbin/rinetd
 
-USE_RC_SUBR=	rinetd.sh
+USE_RC_SUBR=	rinetd
 
 .include <bsd.port.pre.mk>
 
diff --git a/net/rinetd/files/rinetd.sh.in b/net/rinetd/files/rinetd.in
index fdb1cc87295a..16501c77263a 100644
--- a/net/rinetd/files/rinetd.sh.in
+++ b/net/rinetd/files/rinetd.in
@@ -1,17 +1,18 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: rinetd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
-
 #
 # Add the following lines to /etc/rc.conf to enable rinetd:
 # rinetd_enable (bool): Set to "NO" by default.
 #                       Set it to "YES" to enable rinetd
 # rinetd_flags (str):   Set to "" by default.
 #                       Extra flags passed to start command
-#
+
 . /etc/rc.subr
 
 name="rinetd"
diff --git a/net/ris/Makefile b/net/ris/Makefile
index 7d20ff1b3a05..982458fa6f9a 100644
--- a/net/ris/Makefile
+++ b/net/ris/Makefile
@@ -16,7 +16,7 @@ COMMENT=	OpenSource alternative to Microsoft Windows RIS
 
 RUN_DEPENDS=	${LOCALBASE}/libexec/in.tftpd:${PORTSDIR}/ftp/tftp-hpa
 
-USE_RC_SUBR=	binlsrv.sh
+USE_RC_SUBR=	binlsrv
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
diff --git a/net/ris/files/binlsrv.sh.in b/net/ris/files/binlsrv.in
index 5a36fb4179af..14a76e7b1df6 100644
--- a/net/ris/files/binlsrv.sh.in
+++ b/net/ris/files/binlsrv.in
@@ -1,16 +1,16 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: binlsrv
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
-
 #
 # Add the following lines to /etc/rc.conf to enable binlsrv:
 #
 # binlsrv_enable="YES"
 # binlsrv_infdir="/path/to/inf/files"
-#
 
 . /etc/rc.subr
 
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index e0973ae51c6a..45fb95875532 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -24,7 +24,7 @@ COMMENT=	A network file distribution/synchronization utility
 LICENSE=	GPLv3
 
 GNU_CONFIGURE=	yes
-USE_RC_SUBR=	rsyncd.sh
+USE_RC_SUBR=	rsyncd
 SUB_LIST=	NAME=rsyncd
 MAKE_JOBS_SAFE=	yes
 
diff --git a/net/rsync/files/rsyncd.sh.in b/net/rsync/files/rsyncd.in
index 395189e73243..395189e73243 100644
--- a/net/rsync/files/rsyncd.sh.in
+++ b/net/rsync/files/rsyncd.in
diff --git a/net/siproxd/Makefile b/net/siproxd/Makefile
index a4b974ae32ea..cbc9b90f7de0 100644
--- a/net/siproxd/Makefile
+++ b/net/siproxd/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A proxy/masquerading daemon for the SIP protocol
 
 LIB_DEPENDS=	osip2.9:${PORTSDIR}/net/libosip
 
-USE_RC_SUBR=	siproxd.sh
+USE_RC_SUBR=	siproxd
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-doc --with-libosip-prefix=${PREFIX}
 
diff --git a/net/siproxd/files/siproxd.sh.in b/net/siproxd/files/siproxd.in
index c3f0cd38c733..c3f0cd38c733 100644
--- a/net/siproxd/files/siproxd.sh.in
+++ b/net/siproxd/files/siproxd.in
diff --git a/net/splatd/Makefile b/net/splatd/Makefile
index 2c31c197b41a..c47cd639ac37 100644
--- a/net/splatd/Makefile
+++ b/net/splatd/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	splat
-USE_RC_SUBR=	splatd.sh
+USE_RC_SUBR=	splatd
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 MAN5=		splat.conf.5
 MAN8=		splatd.8
diff --git a/net/splatd/files/splatd.sh.in b/net/splatd/files/splatd.in
index cad9fd0e92b2..cad9fd0e92b2 100644
--- a/net/splatd/files/splatd.sh.in
+++ b/net/splatd/files/splatd.in
diff --git a/net/stone/Makefile b/net/stone/Makefile
index 605233c3e01e..f35ae0d319d6 100644
--- a/net/stone/Makefile
+++ b/net/stone/Makefile
@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-2.3d-2.3.2.7
 MAN1=		stone.1
 MANLANG=	"" ja
 
-USE_RC_SUBR=	stone.sh
+USE_RC_SUBR=	stone
 USE_OPENSSL=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/net/stone/files/stone.sh.in b/net/stone/files/stone.in
index 9910a5522198..48366bf59481 100644
--- a/net/stone/files/stone.sh.in
+++ b/net/stone/files/stone.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: stone
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
@@ -8,13 +10,11 @@
 # Add the following line to /etc/rc.conf to enable stone:
 # stone_enable (bool):		Set it to "YES" to enable stone.
 #				Default: NO
-
 # Add at least one of the followings to /etc/rc.conf to give rules to stone:
 # stone_flags (str):		See stone(1).
 #				Default: "" (-D will be added automatically)
 # stone_conffile (str):		Stone config file
 #				Default: ""
-#
 
 . /etc/rc.subr
 
diff --git a/net/stund/Makefile b/net/stund/Makefile
index 53f142410c4b..8038874c507b 100644
--- a/net/stund/Makefile
+++ b/net/stund/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A simple STUN (RFC 3489) server and client
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GMAKE=	yes
-USE_RC_SUBR=	stund.sh
+USE_RC_SUBR=	stund
 MAKE_ENV=	"CXX=${CXX}"
 
 do-install:
diff --git a/net/stund/files/stund.sh.in b/net/stund/files/stund.in
index 56da993c33b2..56da993c33b2 100644
--- a/net/stund/files/stund.sh.in
+++ b/net/stund/files/stund.in
diff --git a/net/vncreflector/Makefile b/net/vncreflector/Makefile
index 02c0e5598dbe..d3c863620e51 100644
--- a/net/vncreflector/Makefile
+++ b/net/vncreflector/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Multi-client VNC proxy server
 
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 
-USE_RC_SUBR=	vncreflector.sh
+USE_RC_SUBR=	vncreflector
 
 ALL_TARGET=	default
 WRKSRC=		${WRKDIR}/vnc_reflector
diff --git a/net/vncreflector/files/vncreflector.sh.in b/net/vncreflector/files/vncreflector.in
index 7b2725094713..7b2725094713 100644
--- a/net/vncreflector/files/vncreflector.sh.in
+++ b/net/vncreflector/files/vncreflector.in
diff --git a/net/widentd/Makefile b/net/widentd/Makefile
index 118200ee1b9a..672b2a498c49 100644
--- a/net/widentd/Makefile
+++ b/net/widentd/Makefile
@@ -19,7 +19,7 @@ COMMENT=	RFC1413 auth/identd daemon with fixed fake reply
 MAN8=		widentd.8
 MANCOMPRESSED=	yes
 PLIST_FILES=	sbin/widentd
-USE_RC_SUBR=	widentd.sh
+USE_RC_SUBR=	widentd
 
 MAKE_ENV+=	BINDIR="${PREFIX}/sbin" MANDIR="${PREFIX}/man/man"
 
diff --git a/net/widentd/files/widentd.sh.in b/net/widentd/files/widentd.in
index efc4baf42ba9..efc4baf42ba9 100644
--- a/net/widentd/files/widentd.sh.in
+++ b/net/widentd/files/widentd.in
diff --git a/net/wired-tracker/Makefile b/net/wired-tracker/Makefile
index ff507fc20568..ca62250d0121 100644
--- a/net/wired-tracker/Makefile
+++ b/net/wired-tracker/Makefile
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/wired-tracker-${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir="${LOCALBASE}/lib" --includedir="${LOCALBASE}/include"
 USE_GMAKE=	yes
-USE_RC_SUBR=	trackerd.sh
+USE_RC_SUBR=	trackerd
 
 MAN1=		trackerdctl.1
 MAN5=		trackerd.conf.5
diff --git a/net/wired-tracker/files/trackerd.sh.in b/net/wired-tracker/files/trackerd.in
index e7c83b8e6924..e7c83b8e6924 100644
--- a/net/wired-tracker/files/trackerd.sh.in
+++ b/net/wired-tracker/files/trackerd.in
diff --git a/net/wired/Makefile b/net/wired/Makefile
index 0298697188ae..fe2a8bf927a5 100644
--- a/net/wired/Makefile
+++ b/net/wired/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Wired server
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir="${LOCALBASE}/lib" --includedir="${LOCALBASE}/include"
 USE_GMAKE=	yes
-USE_RC_SUBR=	wired.sh
+USE_RC_SUBR=	wired
 
 MAN1=		wiredctl.1
 MAN5=		wired.conf.5
diff --git a/net/wired/files/wired.sh.in b/net/wired/files/wired.in
index a2ede8076392..a2ede8076392 100644
--- a/net/wired/files/wired.sh.in
+++ b/net/wired/files/wired.in
diff --git a/net/wizd/Makefile b/net/wizd/Makefile
index 8393dc150777..68b7834fa90d 100644
--- a/net/wizd/Makefile
+++ b/net/wizd/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 NO_WRKSUBDIR=	yes
 USE_DOS2UNIX=	Makefile
 USE_ZIP=	yes
-USE_RC_SUBR=	wizd.sh
+USE_RC_SUBR=	wizd
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|./skin|${DATADIR}/skins|' ${WRKSRC}/wizd.conf
diff --git a/net/wizd/files/wizd.sh.in b/net/wizd/files/wizd.in
index 4239fec4ba22..4239fec4ba22 100644
--- a/net/wizd/files/wizd.sh.in
+++ b/net/wizd/files/wizd.in
diff --git a/net/yate/Makefile b/net/yate/Makefile
index 3db885916081..ceb5f445ad93 100644
--- a/net/yate/Makefile
+++ b/net/yate/Makefile
@@ -54,7 +54,7 @@ OPTIONS=	MYSQL "MySQL Database support" off \
 		ALSA "Enable ALSA channel support" off
 
 SUB_FILES=	pkg-message
-USE_RC_SUBR=	yate.sh
+USE_RC_SUBR=	yate
 
 USERS=	yate
 GROUPS=	yate
diff --git a/net/yate/files/yate.sh.in b/net/yate/files/yate.in
index 2d25b9aa4723..2d25b9aa4723 100644
--- a/net/yate/files/yate.sh.in
+++ b/net/yate/files/yate.in
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 56d14e76b795..0021a40786d0 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_RC_SUBR=	innd.sh
+USE_RC_SUBR=	innd
 SUB_FILES=	pkg-install
 
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
diff --git a/news/inn/files/innd.sh.in b/news/inn/files/innd.in
index a86073304c93..a86073304c93 100644
--- a/news/inn/files/innd.sh.in
+++ b/news/inn/files/innd.in
diff --git a/news/newscache/Makefile b/news/newscache/Makefile
index c8b1b0413830..45534404ae47 100644
--- a/news/newscache/Makefile
+++ b/news/newscache/Makefile
@@ -22,7 +22,7 @@ AUTOMAKE_ARGS=	--add-missing
 CPPFLAGS+=	${CFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc
-USE_RC_SUBR=	${PORTNAME}.sh
+USE_RC_SUBR=	${PORTNAME}
 
 MAN5=	newscache.conf.5
 MAN8=	newscache.8 newscacheclean.8 updatenews.8
diff --git a/news/newscache/files/newscache.sh.in b/news/newscache/files/newscache.in
index 57830d8ad51d..57830d8ad51d 100644
--- a/news/newscache/files/newscache.sh.in
+++ b/news/newscache/files/newscache.in
diff --git a/print/acroreadwrapper/Makefile b/print/acroreadwrapper/Makefile
index 5fa6339717a3..7157dc7e88fa 100644
--- a/print/acroreadwrapper/Makefile
+++ b/print/acroreadwrapper/Makefile
@@ -29,7 +29,7 @@ SUB_LIST=	ACROBASE8=${ACROBASE8} \
 		LINUXSH=${LINUXBASE}/bin/sh \
 		PLUGINDIR=${PLUGINDIR} \
 		KMODDIR=${KMODDIR}
-USE_RC_SUBR=	linux_adobe.sh
+USE_RC_SUBR=	linux_adobe
 
 .include <bsd.port.pre.mk>
 
diff --git a/print/acroreadwrapper/files/linux_adobe.sh.in b/print/acroreadwrapper/files/linux_adobe.in
index c25abc45d281..c25abc45d281 100644
--- a/print/acroreadwrapper/files/linux_adobe.sh.in
+++ b/print/acroreadwrapper/files/linux_adobe.in
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
diff --git a/shells/wapsh/Makefile b/shells/wapsh/Makefile
index b296fb13f0ed..d396f4a08753 100644
--- a/shells/wapsh/Makefile
+++ b/shells/wapsh/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A system to allow remote shell logins via a WAP phone or web browser
 
-USE_RC_SUBR=	htshd.sh
+USE_RC_SUBR=	htshd
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 
diff --git a/shells/wapsh/files/htshd.sh.in b/shells/wapsh/files/htshd.in
index 9e1fe1762196..92a8a0a9e62f 100644
--- a/shells/wapsh/files/htshd.sh.in
+++ b/shells/wapsh/files/htshd.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: htshd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
diff --git a/sysutils/3dm/Makefile b/sysutils/3dm/Makefile
index 042ec654b4cd..6450191d5fba 100644
--- a/sysutils/3dm/Makefile
+++ b/sysutils/3dm/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR=	3dm2
 MAINTAINER=	ports.maintainer@evilphi.com
 COMMENT=	3ware RAID controller monitoring daemon and web server
 
-USE_RC_SUBR=	3dm2.sh
+USE_RC_SUBR=	3dm2
 
 OPTIONS=	SSLFIX "Install KB16625-patched binaries" On
 
diff --git a/sysutils/3dm/files/3dm2.sh.in b/sysutils/3dm/files/3dm2.in
index 93f0f65962dd..93f0f65962dd 100644
--- a/sysutils/3dm/files/3dm2.sh.in
+++ b/sysutils/3dm/files/3dm2.in
diff --git a/sysutils/915resolution/Makefile b/sysutils/915resolution/Makefile
index 8112ecd3aa9c..9ac099cb2c36 100644
--- a/sysutils/915resolution/Makefile
+++ b/sysutils/915resolution/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	ehaupt
 MAINTAINER=	bahamasfranks@gmail.com
 COMMENT=	Resolution tool for Intel i915 video cards
 
-USE_RC_SUBR=	915resolution.sh
+USE_RC_SUBR=	915resolution
 
 DOCS=		README.txt LICENSE.txt chipset_info.txt changes.log
 
diff --git a/sysutils/915resolution/files/915resolution.sh.in b/sysutils/915resolution/files/915resolution.in
index 4878ebfa6f07..4878ebfa6f07 100644
--- a/sysutils/915resolution/files/915resolution.sh.in
+++ b/sysutils/915resolution/files/915resolution.in
diff --git a/sysutils/afbinit/Makefile b/sysutils/afbinit/Makefile
index 2f41e79db963..c38f76843778 100644
--- a/sysutils/afbinit/Makefile
+++ b/sysutils/afbinit/Makefile
@@ -26,7 +26,7 @@ MAINTAINER=		marius@FreeBSD.org
 COMMENT=		Sun AFB aka Sun Elite 3D microcode firmware loader
 
 ONLY_FOR_ARCHS=		sparc64
-USE_RC_SUBR=		afbinit.sh
+USE_RC_SUBR=		afbinit
 WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
 PKGMESSAGE=		${WRKDIR}/pkg-message
 
diff --git a/sysutils/afbinit/files/afbinit.sh.in b/sysutils/afbinit/files/afbinit.in
index 6e23c9799813..6e23c9799813 100644
--- a/sysutils/afbinit/files/afbinit.sh.in
+++ b/sysutils/afbinit/files/afbinit.in
diff --git a/sysutils/anacron/Makefile b/sysutils/anacron/Makefile
index 6b9632e5d0c7..c20a0bcf8f82 100644
--- a/sysutils/anacron/Makefile
+++ b/sysutils/anacron/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Schedules periodic jobs on systems that are not permanently up
 MAN8=		anacron.8
 MAN5=		anacrontab.5
 USE_GMAKE=	yes
-USE_RC_SUBR=	anacron.sh
+USE_RC_SUBR=	anacron
 SUB_FILES=	pkg-message
 
 post-patch:
diff --git a/sysutils/anacron/files/anacron.sh.in b/sysutils/anacron/files/anacron.in
index 918d68703403..918d68703403 100644
--- a/sysutils/anacron/files/anacron.sh.in
+++ b/sysutils/anacron/files/anacron.in
diff --git a/sysutils/asusoled/Makefile b/sysutils/asusoled/Makefile
index c93a6fe8b177..94c015c1a20d 100644
--- a/sysutils/asusoled/Makefile
+++ b/sysutils/asusoled/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Utility for ASUS USB OLED Display
 RUN_DEPENDS=	${FONTDIR}/TTF/luxisr.ttf:${PORTSDIR}/x11-fonts/font-bh-ttf
 
 USE_SDL=	image sdl ttf
-USE_RC_SUBR=	asusoled.sh oled_clock.sh
+USE_RC_SUBR=	asusoled oled_clock
 
 PORTDATA=	asus.png asus_clock.png
 PORTDOCS=	README.FreeBSD
diff --git a/sysutils/asusoled/files/asusoled.sh.in b/sysutils/asusoled/files/asusoled.in
index b43223339368..b43223339368 100644
--- a/sysutils/asusoled/files/asusoled.sh.in
+++ b/sysutils/asusoled/files/asusoled.in
diff --git a/sysutils/asusoled/files/oled_clock.sh.in b/sysutils/asusoled/files/oled_clock.in
index d47d669f0eca..d47d669f0eca 100644
--- a/sysutils/asusoled/files/oled_clock.sh.in
+++ b/sysutils/asusoled/files/oled_clock.in
diff --git a/sysutils/be_agent/Makefile b/sysutils/be_agent/Makefile
index 8be885d53e36..9ea3f9a8243d 100644
--- a/sysutils/be_agent/Makefile
+++ b/sysutils/be_agent/Makefile
@@ -22,7 +22,7 @@ NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386
 NO_INSTALL_MANPAGES=	yes
 SUB_FILES=	pkg-message
-USE_RC_SUBR=	be-agent.sh
+USE_RC_SUBR=	be-agent
 PLIST_FILES=	bin/agent.be \
 		etc/be-agent.cfg.sample
 
diff --git a/sysutils/be_agent/files/be-agent.sh.in b/sysutils/be_agent/files/be-agent.in
index 2562e6021d61..509b2f95ce7b 100644
--- a/sysutils/be_agent/files/be-agent.sh.in
+++ b/sysutils/be_agent/files/be-agent.in
@@ -1,15 +1,15 @@
 #!/bin/sh
+
+# $FreeBSD$
 #
 # PROVIDE: be-agent
 # REQUIRE: LOGIN
 # BEFORE: DAEMON
 # KEYWORD: shutdown
-
 #
 # Add the following lines to /etc/rc.conf to enable be-agent:
 #
 #be_agent_enable="YES"
-#
 
 . /etc/rc.subr
 
diff --git a/sysutils/bsd-splash-changer/Makefile b/sysutils/bsd-splash-changer/Makefile
index 652d10fea9fd..11df6a0c200f 100644
--- a/sysutils/bsd-splash-changer/Makefile
+++ b/sysutils/bsd-splash-changer/Makefile
@@ -16,7 +16,7 @@ DISTFILES=	# none
 MAINTAINER=	gamato@users.sf.net
 COMMENT=	Boot Splash Image Changer
 
-USE_RC_SUBR=	change_splash.sh
+USE_RC_SUBR=	change_splash
 SUB_FILES=	pkg-message
 NO_BUILD=	yes
 
diff --git a/sysutils/bsd-splash-changer/files/change_splash.sh.in b/sysutils/bsd-splash-changer/files/change_splash.in
index f4a5122f69d7..f4a5122f69d7 100644
--- a/sysutils/bsd-splash-changer/files/change_splash.sh.in
+++ b/sysutils/bsd-splash-changer/files/change_splash.in
diff --git a/sysutils/freqsdwn/Makefile b/sysutils/freqsdwn/Makefile
index 485851f25516..53af4d140573 100644
--- a/sysutils/freqsdwn/Makefile
+++ b/sysutils/freqsdwn/Makefile
@@ -21,7 +21,7 @@ RESTRICTED=	See http://www.mitsubishielectric.co.jp/frequps/f_down/keiyaku.html
 IGNORE=		${RESTRICTED}
 .endif
 
-USE_RC_SUBR=	freqshpd.sh 000.freqshpk.sh
+USE_RC_SUBR=	freqshpd 000.freqshpk
 PLIST_SUB=	PORTNAME=${PORTNAME} CONFDIR=${CONFDIR}
 SUB_LIST=	PORTNAME=${PORTNAME} CONFDIR=${CONFDIR}
 
diff --git a/sysutils/freqsdwn/files/000.freqshpk.sh.in b/sysutils/freqsdwn/files/000.freqshpk.in
index 157c96def200..157c96def200 100644
--- a/sysutils/freqsdwn/files/000.freqshpk.sh.in
+++ b/sysutils/freqsdwn/files/000.freqshpk.in
diff --git a/sysutils/freqsdwn/files/freqshpd.sh.in b/sysutils/freqsdwn/files/freqshpd.in
index b3f44ba0000a..b3f44ba0000a 100644
--- a/sysutils/freqsdwn/files/freqshpd.sh.in
+++ b/sysutils/freqsdwn/files/freqshpd.in
diff --git a/sysutils/fvcool/Makefile b/sysutils/fvcool/Makefile
index b6772d9f755e..18264c7d5dc8 100644
--- a/sysutils/fvcool/Makefile
+++ b/sysutils/fvcool/Makefile
@@ -16,7 +16,7 @@ COMMENT=	VCool for FreeBSD - Cooling software for AMD Athlon/Duron CPUs
 
 ONLY_FOR_ARCHS=	i386
 GNU_CONFIGURE=	yes
-USE_RC_SUBR=	fvcool.sh
+USE_RC_SUBR=	fvcool
 SUB_FILES=	pkg-message
 SUB_LIST+=	"PORTNAME=${PORTNAME}"
 ALL_TARGET=	fvcool
diff --git a/sysutils/fvcool/files/fvcool.sh.in b/sysutils/fvcool/files/fvcool.in
index 8d4c0cadc543..8d4c0cadc543 100644
--- a/sysutils/fvcool/files/fvcool.sh.in
+++ b/sysutils/fvcool/files/fvcool.in
diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
index ee4caf525c3e..0fda3ff272f1 100644
--- a/sysutils/ganglia-monitor-core/Makefile
+++ b/sysutils/ganglia-monitor-core/Makefile
@@ -57,9 +57,9 @@ GMOND_CONF=	${WRKDIR}/gmond.conf
 
 .include <bsd.port.pre.mk>
 
-USE_RC_SUBR=	gmond.sh
+USE_RC_SUBR=	gmond
 .if defined (WITH_GMETAD)
-USE_RC_SUBR+=	gmetad.sh
+USE_RC_SUBR+=	gmetad
 .endif
 
 .if defined (WITH_GMETAD)
diff --git a/sysutils/ganglia-monitor-core/files/gmetad.sh.in b/sysutils/ganglia-monitor-core/files/gmetad.in
index 77f42fc6bfb2..77f42fc6bfb2 100644
--- a/sysutils/ganglia-monitor-core/files/gmetad.sh.in
+++ b/sysutils/ganglia-monitor-core/files/gmetad.in
diff --git a/sysutils/ganglia-monitor-core/files/gmond.sh.in b/sysutils/ganglia-monitor-core/files/gmond.in
index a8f6dbe139de..a8f6dbe139de 100644
--- a/sysutils/ganglia-monitor-core/files/gmond.sh.in
+++ b/sysutils/ganglia-monitor-core/files/gmond.in
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 0ac1ca9a0e67..5610ce566178 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -21,7 +21,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_RC_SUBR=	gkrellmd.sh
+USE_RC_SUBR=	gkrellmd
 WANT_GNOME=	yes
 USE_OPENSSL=	yes		# cannot set after bsd.port.pre.mk
 
diff --git a/sysutils/gkrellm2/files/gkrellmd.sh.in b/sysutils/gkrellm2/files/gkrellmd.in
index e588b2a6f54d..e588b2a6f54d 100644
--- a/sysutils/gkrellm2/files/gkrellmd.sh.in
+++ b/sysutils/gkrellm2/files/gkrellmd.in
diff --git a/sysutils/mbmon/Makefile b/sysutils/mbmon/Makefile
index 9f09727b6e29..a0abf62b3598 100644
--- a/sysutils/mbmon/Makefile
+++ b/sysutils/mbmon/Makefile
@@ -29,7 +29,7 @@ PORTDOCS=	ChangeLog ChangeLog.jp ReadMe ReadMe.jp ReadMe.tech
 OPTIONS=	SMB "enable smb(4) support" on
 
 .if ${PORTNAME} == "mbmon"
-USE_RC_SUBR=	mbmon.sh
+USE_RC_SUBR=	mbmon
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/sysutils/mbmon/files/mbmon.sh.in b/sysutils/mbmon/files/mbmon.in
index a06f60157ae4..a06f60157ae4 100644
--- a/sysutils/mbmon/files/mbmon.sh.in
+++ b/sysutils/mbmon/files/mbmon.in
diff --git a/sysutils/monit/Makefile b/sysutils/monit/Makefile
index 9f087ff2afa9..3e13723f79cf 100644
--- a/sysutils/monit/Makefile
+++ b/sysutils/monit/Makefile
@@ -18,7 +18,7 @@ MAN1=		monit.1
 GNU_CONFIGURE=	yes
 USE_BISON=	build
 USE_GMAKE=	yes
-USE_RC_SUBR=	${PORTNAME}.sh
+USE_RC_SUBR=	${PORTNAME}
 
 CONFIGURE_ENV=	CONFIG_SHELL="${SH}" \
 		LOCALBASE="${LOCALBASE}"
diff --git a/sysutils/monit/files/monit.sh.in b/sysutils/monit/files/monit.in
index 83ecd7c959a2..83ecd7c959a2 100644
--- a/sysutils/monit/files/monit.sh.in
+++ b/sysutils/monit/files/monit.in
diff --git a/sysutils/msyslog/Makefile b/sysutils/msyslog/Makefile
index 50db50e69e47..6a7edf38e5d4 100644
--- a/sysutils/msyslog/Makefile
+++ b/sysutils/msyslog/Makefile
@@ -23,7 +23,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_RC_SUBR=	msyslogd.sh
+USE_RC_SUBR=	msyslogd
 PKGMESSAGE=	${WRKDIR}/pkg-message
 USE_LDCONFIG=	yes
 MANCOMPRESSED=	yes
diff --git a/sysutils/msyslog/files/msyslogd.sh.in b/sysutils/msyslog/files/msyslogd.in
index 49a413429ee9..49a413429ee9 100644
--- a/sysutils/msyslog/files/msyslogd.sh.in
+++ b/sysutils/msyslog/files/msyslogd.in
diff --git a/sysutils/nagios-statd/Makefile b/sysutils/nagios-statd/Makefile
index 0c8dd3b55b5a..63261dc2255a 100644
--- a/sysutils/nagios-statd/Makefile
+++ b/sysutils/nagios-statd/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	jims@bluenotch.com
 COMMENT=	Daemon/client to check remote host information for Nagios
 
 USE_PYTHON=	yes
-USE_RC_SUBR=	nagiosstatd.sh
+USE_RC_SUBR=	nagiosstatd
 
 MAN1=		nagios-stat.1
 MAN8=		nagios-statd.8
diff --git a/sysutils/nagios-statd/files/nagiosstatd.sh.in b/sysutils/nagios-statd/files/nagiosstatd.in
index 617f43df4463..617f43df4463 100644
--- a/sysutils/nagios-statd/files/nagiosstatd.sh.in
+++ b/sysutils/nagios-statd/files/nagiosstatd.in
diff --git a/sysutils/netdump-server/Makefile b/sysutils/netdump-server/Makefile
index b145a55d19e0..eabf65b433df 100644
--- a/sysutils/netdump-server/Makefile
+++ b/sysutils/netdump-server/Makefile
@@ -26,7 +26,7 @@ MAN8=		netdump.8 netdump-server.8
 NETDUMP_OWN?=	netdump
 NETDUMP_GRP?=	operator
 
-USE_RC_SUBR=	netdump-server.sh
+USE_RC_SUBR=	netdump-server
 PLIST_SUB+=	NETDUMP_OWN=${NETDUMP_OWN} \
 		NETDUMP_GRP=${NETDUMP_GRP}
 SUB_FILES+=	pkg-message
diff --git a/sysutils/netdump-server/files/netdump-server.sh.in b/sysutils/netdump-server/files/netdump-server.in
index d61938d74f96..d61938d74f96 100644
--- a/sysutils/netdump-server/files/netdump-server.sh.in
+++ b/sysutils/netdump-server/files/netdump-server.in
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index e607b3418555..a7ff9b1a8b82 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -34,7 +34,7 @@ OPTIONS=	SERIAL		"SERIAL support" on \
 		CGI		"Web CGI interface" off \
 		BASH		"Bash Completion support" off
 
-USE_RC_SUBR=	nut.sh nut_upsmon.sh nut_upslog.sh
+USE_RC_SUBR=	nut nut_upsmon nut_upslog
 SUB_LIST+=	STATEDIR=${STATEDIR}
 PLIST_SUB+=	STATEDIR=${STATEDIR}
 
diff --git a/sysutils/nut/files/nut.sh.in b/sysutils/nut/files/nut.in
index 98ba6394389c..98ba6394389c 100644
--- a/sysutils/nut/files/nut.sh.in
+++ b/sysutils/nut/files/nut.in
diff --git a/sysutils/nut/files/nut_upslog.sh.in b/sysutils/nut/files/nut_upslog.in
index 9bb361e1d3be..9bb361e1d3be 100644
--- a/sysutils/nut/files/nut_upslog.sh.in
+++ b/sysutils/nut/files/nut_upslog.in
diff --git a/sysutils/nut/files/nut_upsmon.sh.in b/sysutils/nut/files/nut_upsmon.in
index 6aee6a46c900..6aee6a46c900 100644
--- a/sysutils/nut/files/nut_upsmon.sh.in
+++ b/sysutils/nut/files/nut_upsmon.in
diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile
index e50cfe404029..52342e9bb8b0 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -37,7 +37,7 @@ OPTIONS=	SERIAL		"SERIAL support"	on \
 		DEVEL		"Install header files"	off \
 		CGI		"Web CGI interface"	off \
 
-USE_RC_SUBR=	nut.sh nut_upsmon.sh nut_upslog.sh
+USE_RC_SUBR=	nut nut_upsmon nut_upslog
 SUB_LIST+=	STATEDIR=${STATEDIR}
 PLIST_SUB+=	STATEDIR=${STATEDIR}
 
diff --git a/sysutils/nut22/files/nut.sh.in b/sysutils/nut22/files/nut.in
index aaf33c5b18b0..aaf33c5b18b0 100644
--- a/sysutils/nut22/files/nut.sh.in
+++ b/sysutils/nut22/files/nut.in
diff --git a/sysutils/nut22/files/nut_upslog.sh.in b/sysutils/nut22/files/nut_upslog.in
index 9bb361e1d3be..9bb361e1d3be 100644
--- a/sysutils/nut22/files/nut_upslog.sh.in
+++ b/sysutils/nut22/files/nut_upslog.in
diff --git a/sysutils/nut22/files/nut_upsmon.sh.in b/sysutils/nut22/files/nut_upsmon.in
index 2470e766f186..2470e766f186 100644
--- a/sysutils/nut22/files/nut_upsmon.sh.in
+++ b/sysutils/nut22/files/nut_upsmon.in
diff --git a/sysutils/powerman/Makefile b/sysutils/powerman/Makefile
index cccca9448b45..af590048d006 100644
--- a/sysutils/powerman/Makefile
+++ b/sysutils/powerman/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	--with-httppower --localstatedir=${DESTDIR}/var \
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
-USE_RC_SUBR=	powerman.sh
+USE_RC_SUBR=	powerman
 
 MAN1=		pm.1 powerman.1
 MAN3=		libpowerman.3
diff --git a/sysutils/powerman/files/powerman.sh.in b/sysutils/powerman/files/powerman.in
index a5e64a218e13..a5e64a218e13 100644
--- a/sysutils/powerman/files/powerman.sh.in
+++ b/sysutils/powerman/files/powerman.in
diff --git a/sysutils/radmind/Makefile b/sysutils/radmind/Makefile
index eae329fb33eb..d654e36d95e0 100644
--- a/sysutils/radmind/Makefile
+++ b/sysutils/radmind/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	mikeg@bsd-box.net
 COMMENT=	Utility for administering filesystem changes
 
 USE_OPENSSL=	yes
-USE_RC_SUBR=	radmind.sh
+USE_RC_SUBR=	radmind
 MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/radmind/files/radmind.sh.in b/sysutils/radmind/files/radmind.in
index d64beb14c971..d64beb14c971 100644
--- a/sysutils/radmind/files/radmind.sh.in
+++ b/sysutils/radmind/files/radmind.in
diff --git a/sysutils/rsyncmanager/Makefile b/sysutils/rsyncmanager/Makefile
index 8785554812e2..da6b107f3994 100644
--- a/sysutils/rsyncmanager/Makefile
+++ b/sysutils/rsyncmanager/Makefile
@@ -24,7 +24,7 @@ NO_BUILD=	yes
 
 PORTDOCS=	README
 
-USE_RC_SUBR=	${PORTNAME}.sh
+USE_RC_SUBR=	${PORTNAME}
 SUB_LIST=	RUBY_WITHOUT_SUFFIX="${RUBY_WITHOUT_SUFFIX}"
 
 do-install:
diff --git a/sysutils/rsyncmanager/files/rsyncmanager.sh.in b/sysutils/rsyncmanager/files/rsyncmanager.in
index a00eafac24c5..d9794e730527 100644
--- a/sysutils/rsyncmanager/files/rsyncmanager.sh.in
+++ b/sysutils/rsyncmanager/files/rsyncmanager.in
@@ -1,4 +1,6 @@
 #!/bin/sh
+
+# $FreeBSD$
 #
 # PROVIDE: rsyncmanager
 # REQUIRE: DAEMON
@@ -8,7 +10,7 @@
 #                             Set it to "YES" to enable rsyncmanager
 # rsyncmanager_flags (str):        Set to "-C -c %%PREFIX%%/etc/rsyncmanager.conf" by default.
 #                             Extra flags passed to start command
-#
+
 . /etc/rc.subr
 
 name="rsyncmanager"
diff --git a/sysutils/runit/Makefile b/sysutils/runit/Makefile
index 6fed6fd7c2ee..93e770c61e9e 100644
--- a/sysutils/runit/Makefile
+++ b/sysutils/runit/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://smarden.org/${PORTNAME}/ \
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Service supervision tools compatible with DJB daemontools
 
-USE_RC_SUBR=	runsvdir.sh
+USE_RC_SUBR=	runsvdir
 WRKSRC=		${WRKDIR}/admin/${DISTNAME}
 
 SERVICE_DIR?=	/var/service
diff --git a/sysutils/runit/files/runsvdir.sh.in b/sysutils/runit/files/runsvdir.in
index 69e5e8e9aa62..69e5e8e9aa62 100644
--- a/sysutils/runit/files/runsvdir.sh.in
+++ b/sysutils/runit/files/runsvdir.in
diff --git a/sysutils/sge60/Makefile b/sysutils/sge60/Makefile
index cf4bde3e8ce7..d059aa3aca98 100644
--- a/sysutils/sge60/Makefile
+++ b/sysutils/sge60/Makefile
@@ -46,7 +46,7 @@ PLIST_SUB+=	SGE_BASE=${SGE_BASE}
 SUB_FILES=	pkg-message pkg-install
 SUB_LIST+=	SGE_BASE=${SGE_BASE}
 
-USE_RC_SUBR=	sge.sh
+USE_RC_SUBR=	sge
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
diff --git a/sysutils/sge60/files/sge.sh.in b/sysutils/sge60/files/sge.in
index f5e939500966..f5e939500966 100644
--- a/sysutils/sge60/files/sge.sh.in
+++ b/sysutils/sge60/files/sge.in
diff --git a/sysutils/sge61/Makefile b/sysutils/sge61/Makefile
index 60224320076a..e02a7c6fea41 100644
--- a/sysutils/sge61/Makefile
+++ b/sysutils/sge61/Makefile
@@ -49,7 +49,7 @@ PLIST_SUB+=	SGE_BASE=${SGE_BASE}
 SUB_FILES=	pkg-message pkg-install
 SUB_LIST+=	SGE_BASE=${SGE_BASE}
 
-USE_RC_SUBR=	sge.sh
+USE_RC_SUBR=	sge
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
diff --git a/sysutils/sge61/files/sge.sh.in b/sysutils/sge61/files/sge.in
index f5e939500966..f5e939500966 100644
--- a/sysutils/sge61/files/sge.sh.in
+++ b/sysutils/sge61/files/sge.in
diff --git a/sysutils/sge62/Makefile b/sysutils/sge62/Makefile
index 6382882efcbc..b98a400ee8cb 100644
--- a/sysutils/sge62/Makefile
+++ b/sysutils/sge62/Makefile
@@ -46,7 +46,7 @@ PLIST_SUB+=	SGE_BASE=${SGE_BASE}
 SUB_FILES=	pkg-message pkg-install
 SUB_LIST+=	SGE_BASE=${SGE_BASE}
 
-USE_RC_SUBR=	sge.sh
+USE_RC_SUBR=	sge
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
diff --git a/sysutils/sge62/files/sge.sh.in b/sysutils/sge62/files/sge.in
index f5e939500966..f5e939500966 100644
--- a/sysutils/sge62/files/sge.sh.in
+++ b/sysutils/sge62/files/sge.in
diff --git a/sysutils/symon/Makefile b/sysutils/symon/Makefile
index 1daa8b88fcaf..90e31c342526 100644
--- a/sysutils/symon/Makefile
+++ b/sysutils/symon/Makefile
@@ -39,7 +39,7 @@ SUBDIR=		lib
 SUBDIR+=	symon
 MAN8+=		symon.8
 PLIST_SUB+=	SYMON=""
-USE_RC_SUBR+=	symon.sh
+USE_RC_SUBR+=	symon
 .else
 PLIST_SUB+=	SYMON="@comment "
 .endif
@@ -47,7 +47,7 @@ PLIST_SUB+=	SYMON="@comment "
 SUBDIR+=	symux
 MAN8+=		symux.8
 PLIST_SUB+=	SYMUX=""
-USE_RC_SUBR+=	symux.sh
+USE_RC_SUBR+=	symux
 .else
 PLIST_SUB+=	SYMUX="@comment "
 .endif
diff --git a/sysutils/symon/files/symon.sh.in b/sysutils/symon/files/symon.in
index e75de3ed895a..e75de3ed895a 100644
--- a/sysutils/symon/files/symon.sh.in
+++ b/sysutils/symon/files/symon.in
diff --git a/sysutils/symon/files/symux.sh.in b/sysutils/symon/files/symux.in
index 8b2788e3fe24..8b2788e3fe24 100644
--- a/sysutils/symon/files/symux.sh.in
+++ b/sysutils/symon/files/symux.in
diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index 674f6ad793a5..965dfedbc01b 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -40,7 +40,7 @@ MAN5=		syslog-ng.conf.5
 MAN8=		syslog-ng.8
 
 USE_LDCONFIG=	yes
-USE_RC_SUBR=	syslog-ng.sh
+USE_RC_SUBR=	syslog-ng
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20 gnomehack
diff --git a/sysutils/syslog-ng-devel/files/syslog-ng.sh.in b/sysutils/syslog-ng-devel/files/syslog-ng.in
index 804bf6ec36fa..804bf6ec36fa 100644
--- a/sysutils/syslog-ng-devel/files/syslog-ng.sh.in
+++ b/sysutils/syslog-ng-devel/files/syslog-ng.in
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index dc185495402b..a50694b1c1b2 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -38,7 +38,7 @@ MAN5=		syslog-ng.conf.5
 MAN8=		syslog-ng.8
 
 USE_LDCONFIG=	yes
-USE_RC_SUBR=	syslog-ng.sh
+USE_RC_SUBR=	syslog-ng
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20 gnomehack
diff --git a/sysutils/syslog-ng/files/syslog-ng.sh.in b/sysutils/syslog-ng/files/syslog-ng.in
index 804bf6ec36fa..804bf6ec36fa 100644
--- a/sysutils/syslog-ng/files/syslog-ng.sh.in
+++ b/sysutils/syslog-ng/files/syslog-ng.in
diff --git a/sysutils/syslog-ng2/Makefile b/sysutils/syslog-ng2/Makefile
index f52766d6e60c..84837cddc20a 100644
--- a/sysutils/syslog-ng2/Makefile
+++ b/sysutils/syslog-ng2/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	evtlog.0:${PORTSDIR}/sysutils/eventlog
 MAN5=		syslog-ng.conf.5
 MAN8=		syslog-ng.8
 
-USE_RC_SUBR=	syslog-ng.sh
+USE_RC_SUBR=	syslog-ng
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 SUB_FILES=	pkg-message
diff --git a/sysutils/syslog-ng2/files/syslog-ng.sh.in b/sysutils/syslog-ng2/files/syslog-ng.in
index 804bf6ec36fa..804bf6ec36fa 100644
--- a/sysutils/syslog-ng2/files/syslog-ng.sh.in
+++ b/sysutils/syslog-ng2/files/syslog-ng.in
diff --git a/sysutils/tenshi/Makefile b/sysutils/tenshi/Makefile
index 7cd754d9c92e..ca15e5cc21d8 100644
--- a/sysutils/tenshi/Makefile
+++ b/sysutils/tenshi/Makefile
@@ -20,7 +20,7 @@ MAN8=			tenshi.8
 
 USE_PERL5=		yes
 NO_BUILD=		yes
-USE_RC_SUBR=		tenshi.sh
+USE_RC_SUBR=		tenshi
 SUB_LIST=		PERL=${PERL}
 
 PLIST_FILES=		bin/tenshi etc/tenshi.conf.sample
diff --git a/sysutils/tenshi/files/tenshi.sh.in b/sysutils/tenshi/files/tenshi.in
index 65044ae547b8..65044ae547b8 100644
--- a/sysutils/tenshi/files/tenshi.sh.in
+++ b/sysutils/tenshi/files/tenshi.in
diff --git a/sysutils/torque/Makefile b/sysutils/torque/Makefile
index 48b244b7d13a..514491b07274 100644
--- a/sysutils/torque/Makefile
+++ b/sysutils/torque/Makefile
@@ -17,7 +17,7 @@ USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-rcp=scp
 USE_GMAKE=	yes
-USE_RC_SUBR=	pbs_server.sh pbs_sched.sh pbs_mom.sh
+USE_RC_SUBR=	pbs_server pbs_sched pbs_mom
 SUB_FILES=	pkg-message
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/torque/files/pbs_mom.sh.in b/sysutils/torque/files/pbs_mom.in
index 07359e11a08e..07359e11a08e 100644
--- a/sysutils/torque/files/pbs_mom.sh.in
+++ b/sysutils/torque/files/pbs_mom.in
diff --git a/sysutils/torque/files/pbs_sched.sh.in b/sysutils/torque/files/pbs_sched.in
index 86df72fbd322..86df72fbd322 100644
--- a/sysutils/torque/files/pbs_sched.sh.in
+++ b/sysutils/torque/files/pbs_sched.in
diff --git a/sysutils/torque/files/pbs_server.sh.in b/sysutils/torque/files/pbs_server.in
index 1a639251689e..1a639251689e 100644
--- a/sysutils/torque/files/pbs_server.sh.in
+++ b/sysutils/torque/files/pbs_server.in
diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile
index 9512bd8e89c5..e4d70a042eba 100644
--- a/sysutils/usermin/Makefile
+++ b/sysutils/usermin/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
 FETCH_CMD?=	/usr/bin/fetch -pRr
 NO_BUILD=	yes
 USE_PERL5=	yes
-USE_RC_SUBR=	usermin.sh
+USE_RC_SUBR=	usermin
 SUB_LIST=	PERL5=${PERL}
 
 USERMIN_MODULES=
diff --git a/sysutils/usermin/files/usermin.sh.in b/sysutils/usermin/files/usermin.in
index 54c8aebb44d8..54c8aebb44d8 100644
--- a/sysutils/usermin/files/usermin.sh.in
+++ b/sysutils/usermin/files/usermin.in
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 9420e7747a99..f2e0d3189aff 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
 
 USE_PERL5=	yes
 USE_PYTHON=	yes
-USE_RC_SUBR=	webmin.sh
+USE_RC_SUBR=	webmin
 SUB_LIST=	PERL5=${PERL}
 SUB_FILES=	pkg-message
 
diff --git a/sysutils/webmin/files/webmin.sh.in b/sysutils/webmin/files/webmin.in
index 8bc39869c77e..8bc39869c77e 100644
--- a/sysutils/webmin/files/webmin.sh.in
+++ b/sysutils/webmin/files/webmin.in
diff --git a/textproc/pootle/Makefile b/textproc/pootle/Makefile
index db46b08eb9aa..4c943b1da33e 100644
--- a/textproc/pootle/Makefile
+++ b/textproc/pootle/Makefile
@@ -37,7 +37,7 @@ POOTLEDBDIR?=	/var/db/pootle
 POOTLELOGDIR?=	/var/log/pootle
 POOTLERUNDIR?=	/var/run/pootle
 
-USE_RC_SUBR=	pootle.sh
+USE_RC_SUBR=	pootle
 SUB_LIST+=	PYTHON_CMD="${PYTHON_CMD}" \
 		POOTLEDBDIR="${POOTLEDBDIR}" \
 		POOTLELOGDIR="${POOTLELOGDIR}" \
diff --git a/textproc/pootle/files/pootle.sh.in b/textproc/pootle/files/pootle.in
index 415fc50ba7bf..415fc50ba7bf 100644
--- a/textproc/pootle/files/pootle.sh.in
+++ b/textproc/pootle/files/pootle.in
diff --git a/textproc/sphinxsearch-devel/Makefile b/textproc/sphinxsearch-devel/Makefile
index 303dbbc0b228..76f218e9222f 100644
--- a/textproc/sphinxsearch-devel/Makefile
+++ b/textproc/sphinxsearch-devel/Makefile
@@ -100,7 +100,7 @@ SPHINX_LOG?=	/var/log/${PORTNAME}
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	${CXXFLAGS}
 CFGFILE=	${PREFIX}/etc/sphinx.conf
-USE_RC_SUBR=	sphinxsearch.sh
+USE_RC_SUBR=	sphinxsearch
 SUB_LIST+=	PORTNAME=${PORTNAME}	 \
 		CFGFILE=${CFGFILE}	 \
 		SPHINX_USR=${USERS}	 \
diff --git a/textproc/sphinxsearch-devel/files/sphinxsearch.sh.in b/textproc/sphinxsearch-devel/files/sphinxsearch.in
index 877267aa3634..877267aa3634 100644
--- a/textproc/sphinxsearch-devel/files/sphinxsearch.sh.in
+++ b/textproc/sphinxsearch-devel/files/sphinxsearch.in
diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile
index 16f7e3c2f831..b5c23751a2a8 100644
--- a/textproc/sphinxsearch/Makefile
+++ b/textproc/sphinxsearch/Makefile
@@ -136,7 +136,7 @@ SPHINX_LOG?=	/var/log/${PORTNAME}
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	${CXXFLAGS}
 CFGFILE=	${PREFIX}/etc/sphinx.conf
-USE_RC_SUBR=	sphinxsearch.sh
+USE_RC_SUBR=	sphinxsearch
 SUB_LIST+=	PORTNAME=${PORTNAME}	 \
 		CFGFILE=${CFGFILE}	 \
 		SPHINX_USR=${USERS}	 \
diff --git a/textproc/sphinxsearch/files/sphinxsearch.sh.in b/textproc/sphinxsearch/files/sphinxsearch.in
index 15347f8c2ea2..15347f8c2ea2 100644
--- a/textproc/sphinxsearch/files/sphinxsearch.sh.in
+++ b/textproc/sphinxsearch/files/sphinxsearch.in
diff --git a/www/abyssws/Makefile b/www/abyssws/Makefile
index 202f0bcd7b44..13926f8b9d6a 100644
--- a/www/abyssws/Makefile
+++ b/www/abyssws/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/abyssws
 ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
 
-USE_RC_SUBR=	abyssws.sh
+USE_RC_SUBR=	abyssws
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/abyssws/files/abyssws.sh.in b/www/abyssws/files/abyssws.in
index 58b2ee5916f7..58b2ee5916f7 100644
--- a/www/abyssws/files/abyssws.sh.in
+++ b/www/abyssws/files/abyssws.in
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 7e153dba8a76..146cc07fbe27 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -51,7 +51,7 @@ USE_GNOME=	gnomehack pkgconfig
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
-USE_RC_SUBR=	cherokee.sh
+USE_RC_SUBR=	cherokee
 SUB_FILES=	pkg-install pkg-message
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/cherokee/files/cherokee.sh.in b/www/cherokee/files/cherokee.in
index 04973fca397c..04973fca397c 100644
--- a/www/cherokee/files/cherokee.sh.in
+++ b/www/cherokee/files/cherokee.in
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index 8d4cc933250e..7b6fef117465 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	${PDISTNAME}-src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML Web Development Framework
 
-USE_RC_SUBR=		${PORTNAME}.sh
+USE_RC_SUBR=		${PORTNAME}
 USE_JAVA=		yes
 JAVA_VERSION=		1.5+
 USE_PYTHON=		1.6+
diff --git a/www/cocoon/files/cocoon.sh.in b/www/cocoon/files/cocoon.in
index 7e292e0e6f32..7e292e0e6f32 100644
--- a/www/cocoon/files/cocoon.sh.in
+++ b/www/cocoon/files/cocoon.in
diff --git a/www/dhttpd/Makefile b/www/dhttpd/Makefile
index f426bcacf7a6..d6005c4b8fef 100644
--- a/www/dhttpd/Makefile
+++ b/www/dhttpd/Makefile
@@ -21,7 +21,7 @@ PLIST_FILES=	sbin/dhttpd
 
 MAN1=		dhttpd.1
 
-USE_RC_SUBR=	dhttpd.sh
+USE_RC_SUBR=	dhttpd
 
 pre-everything::
 	@${ECHO_MSG} "=============================================================="
diff --git a/www/dhttpd/files/dhttpd.sh.in b/www/dhttpd/files/dhttpd.in
index d633d6f852b1..d633d6f852b1 100644
--- a/www/dhttpd/files/dhttpd.sh.in
+++ b/www/dhttpd/files/dhttpd.in
diff --git a/www/geronimo/Makefile b/www/geronimo/Makefile
index c5e07c1fbf9c..ff62080aa133 100644
--- a/www/geronimo/Makefile
+++ b/www/geronimo/Makefile
@@ -19,7 +19,7 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.5+
 NO_BUILD=	YES
 
-USE_RC_SUBR=	geronimo3.sh
+USE_RC_SUBR=	geronimo3
 SUB_FILES=	pkg-deinstall
 
 OPTIONS=	TOMCAT7 "Use Tomcat instead of default Jetty" off
diff --git a/www/geronimo/files/geronimo3.sh.in b/www/geronimo/files/geronimo3.in
index 9b9842f4a3d3..9b9842f4a3d3 100644
--- a/www/geronimo/files/geronimo3.sh.in
+++ b/www/geronimo/files/geronimo3.in
diff --git a/www/hudson/Makefile b/www/hudson/Makefile
index a11160af7f10..20d078eb6308 100644
--- a/www/hudson/Makefile
+++ b/www/hudson/Makefile
@@ -21,7 +21,7 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 
-USE_RC_SUBR=	hudson.sh
+USE_RC_SUBR=	hudson
 
 HUDSON_HOME?=	/var/lib/hudson
 HUDSON_USER?=	www
diff --git a/www/hudson/files/hudson.sh.in b/www/hudson/files/hudson.in
index c67bd3704c35..c67bd3704c35 100644
--- a/www/hudson/files/hudson.sh.in
+++ b/www/hudson/files/hudson.in
diff --git a/www/hydra/Makefile b/www/hydra/Makefile
index 713edec1de35..f1bb29ac6eeb 100644
--- a/www/hydra/Makefile
+++ b/www/hydra/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A high performance multi-threaded web server
 
 LIB_DEPENDS=	gnutls.47:${PORTSDIR}/security/gnutls
 
-USE_RC_SUBR=	hydra.sh
+USE_RC_SUBR=	hydra
 
 NO_LATEST_LINK=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/hydra/files/hydra.sh.in b/www/hydra/files/hydra.in
index 08c2f90e4f94..08c2f90e4f94 100644
--- a/www/hydra/files/hydra.sh.in
+++ b/www/hydra/files/hydra.in
diff --git a/www/interchange/Makefile b/www/interchange/Makefile
index 2dcb8478283e..083e6c878367 100644
--- a/www/interchange/Makefile
+++ b/www/interchange/Makefile
@@ -29,7 +29,7 @@ OPTIONS=	MYSQL "Add MySQL support" on \
 
 .include <bsd.port.pre.mk>
 
-USE_RC_SUBR=	interchange.sh
+USE_RC_SUBR=	interchange
 
 .if defined(WITH_MYSQL)
 RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
diff --git a/www/interchange/files/interchange.sh.in b/www/interchange/files/interchange.in
index 8ee4fed72957..8ee4fed72957 100644
--- a/www/interchange/files/interchange.sh.in
+++ b/www/interchange/files/interchange.in
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 05b6bd1e43e1..53976dd8dc80 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -41,7 +41,7 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(_BUILDING_LIGHTTPD_MODULE)
-USE_RC_SUBR=	lighttpd.sh
+USE_RC_SUBR=	lighttpd
 
 MAN8=		lighttpd.8
 
diff --git a/www/lighttpd/files/lighttpd.sh.in b/www/lighttpd/files/lighttpd.in
index b003ab57468a..b003ab57468a 100644
--- a/www/lighttpd/files/lighttpd.sh.in
+++ b/www/lighttpd/files/lighttpd.in
diff --git a/www/nostromo/Makefile b/www/nostromo/Makefile
index e554bfa27709..a5e1d3f0a35b 100644
--- a/www/nostromo/Makefile
+++ b/www/nostromo/Makefile
@@ -19,7 +19,7 @@ NOSTROMO_DIR?=		${PREFIX}/nostromo
 NOSTROMO_LOGDIR?=	${NOSTROMO_DIR}/logs
 NOSTROMO_LOGDIR_PERMS?=	0775
 
-USE_RC_SUBR=	nostromo.sh
+USE_RC_SUBR=	nostromo
 
 MAN8=		nhttpd.8
 
diff --git a/www/nostromo/files/nostromo.sh.in b/www/nostromo/files/nostromo.in
index 455aa54234b0..455aa54234b0 100644
--- a/www/nostromo/files/nostromo.sh.in
+++ b/www/nostromo/files/nostromo.in
diff --git a/www/polipo/Makefile b/www/polipo/Makefile
index b08e8668c11b..f3c88c2fa337 100644
--- a/www/polipo/Makefile
+++ b/www/polipo/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A small and fast caching web proxy
 MAN1=		polipo.1
 
 MAKE_JOBS_SAFE=	yes
-USE_RC_SUBR=	polipo.sh
+USE_RC_SUBR=	polipo
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/polipo/files/polipo.sh.in b/www/polipo/files/polipo.in
index b4b41f040786..d781d41fd943 100644
--- a/www/polipo/files/polipo.sh.in
+++ b/www/polipo/files/polipo.in
@@ -1,6 +1,7 @@
 #!/bin/sh
-#
 
+# $FreeBSD$
+#
 # PROVIDE: polipo
 # REQUIRE: NETWORK
 # KEYWORD: shutdown
diff --git a/www/pound/Makefile b/www/pound/Makefile
index c73f060afb8d..3b9fe9a8d1cb 100644
--- a/www/pound/Makefile
+++ b/www/pound/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Reverse proxy, load balancer and HTTP(S) frontend for web servers
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
-USE_RC_SUBR=	${PORTNAME}.sh
+USE_RC_SUBR=	${PORTNAME}
 
 SUB_LIST=	NAME=${PORTNAME}
 
diff --git a/www/pound/files/pound.sh.in b/www/pound/files/pound.in
index 23b6fa84dd5d..23b6fa84dd5d 100644
--- a/www/pound/files/pound.sh.in
+++ b/www/pound/files/pound.in
diff --git a/www/sams/Makefile b/www/sams/Makefile
index 084eae739949..05287d475114 100644
--- a/www/sams/Makefile
+++ b/www/sams/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
 
 SAMBA_PORT?=	net/samba34
 
-USE_RC_SUBR=	sams.sh
+USE_RC_SUBR=	sams
 
 OPTIONS=	NTLM	"NTLM autorization/ActiveDirectory support"	off \
 		INSTALLGD 	"Graphic reports"		on
diff --git a/www/sams/files/sams.sh.in b/www/sams/files/sams.in
index b81357358601..b81357358601 100644
--- a/www/sams/files/sams.sh.in
+++ b/www/sams/files/sams.in
diff --git a/www/spawn-fcgi/Makefile b/www/spawn-fcgi/Makefile
index 0601cd350a97..9183bb203515 100644
--- a/www/spawn-fcgi/Makefile
+++ b/www/spawn-fcgi/Makefile
@@ -15,7 +15,7 @@ COMMENT=	spawn-fcgi is used to spawn fastcgi applications
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_RC_SUBR=	spawn-fcgi.sh
+USE_RC_SUBR=	spawn-fcgi
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/www/spawn-fcgi/files/spawn-fcgi.sh.in b/www/spawn-fcgi/files/spawn-fcgi.in
index 75bd8939ab4b..75bd8939ab4b 100644
--- a/www/spawn-fcgi/files/spawn-fcgi.sh.in
+++ b/www/spawn-fcgi/files/spawn-fcgi.in
diff --git a/www/spreadlogd/Makefile b/www/spreadlogd/Makefile
index 8cb7272b1003..6de5191002db 100644
--- a/www/spreadlogd/Makefile
+++ b/www/spreadlogd/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS=	spread.1:${PORTSDIR}/net/spread
 
 MAKEFILE=	makefile
 
-USE_RC_SUBR=	spreadlogd.sh
-SUB_FILES=	spreadlogd.sh
+USE_RC_SUBR=	spreadlogd
 
 PLIST_FILES=	sbin/spreadlogd etc/spreadlogd.conf.sample
 
diff --git a/www/spreadlogd/files/spreadlogd.sh.in b/www/spreadlogd/files/spreadlogd.in
index 76608c06e870..76608c06e870 100644
--- a/www/spreadlogd/files/spreadlogd.sh.in
+++ b/www/spreadlogd/files/spreadlogd.in
diff --git a/www/tclhttpd/Makefile b/www/tclhttpd/Makefile
index 66833b044cd5..b3c602356de0 100644
--- a/www/tclhttpd/Makefile
+++ b/www/tclhttpd/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An http-server implemented in TCL
 
 RUN_DEPENDS=	dtplite:${PORTSDIR}/devel/tcllib
 
-USE_RC_SUBR=	tclhttpd.sh
+USE_RC_SUBR=	tclhttpd
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl="${TCL_LIBDIR}"	\
 		--with-tclinclude="${TCL_INCLUDEDIR}"
diff --git a/www/tclhttpd/files/tclhttpd.sh.in b/www/tclhttpd/files/tclhttpd.in
index c63303ba6b03..c63303ba6b03 100644
--- a/www/tclhttpd/files/tclhttpd.sh.in
+++ b/www/tclhttpd/files/tclhttpd.in
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index a5654a3cfc33..24dd5b74884c 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -22,7 +22,7 @@ IGNOREFILES=	notes.html
 
 GNU_CONFIGURE=	yes
 
-USE_RC_SUBR=	thttpd.sh
+USE_RC_SUBR=	thttpd
 SUB_FILES=	pkg-message thttpd.conf.sample
 SUB_LIST=	WWWOWN=${WWWOWN}
 PORTDOCS=	notes.html
diff --git a/www/thttpd/files/thttpd.sh.in b/www/thttpd/files/thttpd.in
index 2c9b10880b49..2c9b10880b49 100644
--- a/www/thttpd/files/thttpd.sh.in
+++ b/www/thttpd/files/thttpd.in
diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile
index feefce012c0f..71defaeb7665 100644
--- a/www/tinyproxy/Makefile
+++ b/www/tinyproxy/Makefile
@@ -22,7 +22,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 #		xmllint:${PORTSDIR}/textproc/libxml2 \
 #		${LOCALBASE}/share/xsl/docbook/lib/lib.xsl:${PORTSDIR}/textproc/docbook-xsl
 
-USE_RC_SUBR=	tinyproxy.sh
+USE_RC_SUBR=	tinyproxy
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/www/tinyproxy/files/tinyproxy.sh.in b/www/tinyproxy/files/tinyproxy.in
index 3a0e5a3866b1..7bc4ab95a0b6 100644
--- a/www/tinyproxy/files/tinyproxy.sh.in
+++ b/www/tinyproxy/files/tinyproxy.in
@@ -1,14 +1,14 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: tinyproxy
 # REQUIRE: LOGIN
-
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable tinyproxy:
 # tinyproxy_enable (bool): Set to "NO" by default.
 #                          Set it to "YES" to enable tinyproxy 
 # tinyproxy_config (path): Set to "%%PREFIX%%/etc/tinyproxy.conf" by default.
-#
 
 . /etc/rc.subr
 
diff --git a/www/tomcat55/Makefile b/www/tomcat55/Makefile
index 06e3c4e7f43b..d26060add634 100644
--- a/www/tomcat55/Makefile
+++ b/www/tomcat55/Makefile
@@ -31,7 +31,7 @@ JAVA_VERSION?=	1.5+
 JAVA_VENDOR?=	freebsd
 NO_BUILD=	YES
 
-USE_RC_SUBR=	tomcat55.sh
+USE_RC_SUBR=	tomcat55
 SUB_FILES=	pkg-install pkg-deinstall
 
 MAJOR_VER=	${PORTVERSION:R}
diff --git a/www/tomcat55/files/tomcat55.sh.in b/www/tomcat55/files/tomcat55.in
index 1c06fee2b69a..1c06fee2b69a 100644
--- a/www/tomcat55/files/tomcat55.sh.in
+++ b/www/tomcat55/files/tomcat55.in
diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index 7ec4e89c731f..90ab6264ab61 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -22,7 +22,7 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.5+
 NO_BUILD=	YES
 
-USE_RC_SUBR=	tomcat6.sh
+USE_RC_SUBR=	tomcat6
 SUB_FILES=	pkg-install
 
 MAJOR_VER=	${PORTVERSION:R}
diff --git a/www/tomcat6/files/tomcat6.sh.in b/www/tomcat6/files/tomcat6.in
index 8c5edf09b622..8c5edf09b622 100644
--- a/www/tomcat6/files/tomcat6.sh.in
+++ b/www/tomcat6/files/tomcat6.in
diff --git a/www/webobjects/Makefile b/www/webobjects/Makefile
index dbeecff25006..6ed0c84df7f5 100644
--- a/www/webobjects/Makefile
+++ b/www/webobjects/Makefile
@@ -24,7 +24,7 @@ WOBINARCHIVE=	${DISTNAME}${EXTRACT_SUFX}
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-USE_RC_SUBR=	wotaskd.sh JavaMonitor.sh
+USE_RC_SUBR=	wotaskd JavaMonitor
 USE_JAVA=	1.4+
 EXTRACT_PRESERVE_OWNERSHIP=	yes
 
diff --git a/www/webobjects/files/JavaMonitor.sh.in b/www/webobjects/files/JavaMonitor.in
index a3b9cdcba75a..a3b9cdcba75a 100644
--- a/www/webobjects/files/JavaMonitor.sh.in
+++ b/www/webobjects/files/JavaMonitor.in
diff --git a/www/webobjects/files/wotaskd.sh.in b/www/webobjects/files/wotaskd.in
index e6afe23937b8..e6afe23937b8 100644
--- a/www/webobjects/files/wotaskd.sh.in
+++ b/www/webobjects/files/wotaskd.in
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 9705d50f74d2..db3380e0f98f 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	gnutls.47:${PORTSDIR}/security/gnutls
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_RC_SUBR=	${PORTNAME}d.sh
+USE_RC_SUBR=	${PORTNAME}d
 
 # $SPOOL seems like a common name which could be used for other things, so
 # use $WWWOFFLE_SPOOL as the overriding setting.
diff --git a/www/wwwoffle/files/wwwoffled.sh.in b/www/wwwoffle/files/wwwoffled.in
index 53b60daf1068..53b60daf1068 100644
--- a/www/wwwoffle/files/wwwoffled.sh.in
+++ b/www/wwwoffle/files/wwwoffled.in
diff --git a/www/xshttpd-devel/Makefile b/www/xshttpd-devel/Makefile
index 70e7d80b81b3..3e2e33080ad2 100644
--- a/www/xshttpd-devel/Makefile
+++ b/www/xshttpd-devel/Makefile
@@ -28,7 +28,7 @@ MAN5=		httpd.conf.5 xsauth.5 xsconf.5 xsscripts.5 xsredir.5
 MAN7=		httpd_cgi.7 httpd_ssi.7
 USE_OPENSSL=	yes
 USE_BZIP2=	yes
-USE_RC_SUBR=	xshttpd.sh
+USE_RC_SUBR=	xshttpd
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-hier=bsd
diff --git a/www/xshttpd-devel/files/xshttpd.sh.in b/www/xshttpd-devel/files/xshttpd.in
index 975fece0691a..975fece0691a 100644
--- a/www/xshttpd-devel/files/xshttpd.sh.in
+++ b/www/xshttpd-devel/files/xshttpd.in
diff --git a/www/xshttpd/Makefile b/www/xshttpd/Makefile
index 5efc6833e14f..e5efeea845b6 100644
--- a/www/xshttpd/Makefile
+++ b/www/xshttpd/Makefile
@@ -26,7 +26,7 @@ MAN1=		clearxs.1 gfxcount.1 httpd.1 httpdc.1 imagemap.1 \
 MAN5=		httpd.conf.5 xsauth.5 xsconf.5 xsscripts.5 xsredir.5
 MAN7=		httpd_cgi.7 httpd_ssi.7
 USE_BZIP2=	yes
-USE_RC_SUBR=	xshttpd.sh
+USE_RC_SUBR=	xshttpd
 
 GNU_CONFIGURE=	yes
 
diff --git a/www/xshttpd/files/xshttpd.sh.in b/www/xshttpd/files/xshttpd.in
index 93687f7fad47..93687f7fad47 100644
--- a/www/xshttpd/files/xshttpd.sh.in
+++ b/www/xshttpd/files/xshttpd.in