113 files changed, 71 insertions, 68 deletions

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