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

49 files changed, 28 insertions, 28 deletions

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