Cleanse more RC_SUBR and RC_SUBR_SUFFIX variables

19 files changed, 15 insertions, 34 deletions

diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile
index 501867e0d06d..ec3c991a560d 100644
--- a/dns/dnsmasq/Makefile
+++ b/dns/dnsmasq/Makefile
@@ -19,7 +19,6 @@ MAN8=		dnsmasq.8
 
 PORTDOCS=	CHANGELOG CHANGELOG.archive FAQ doc.html setup.html
 
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 SUB_FILES=	pkg-message
 
 MAKE_JOBS_SAFE=	yes
diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile
index 3630bf34dbe4..70431e035762 100644
--- a/japanese/FreeWnn-server/Makefile
+++ b/japanese/FreeWnn-server/Makefile
@@ -30,7 +30,6 @@ MAKE_ARGS=	MANLANG="${MANLANG}" CDEBUGFLAGS="${CFLAGS}" \
 ALL_TARGET=	includes all
 INSTALL_TARGET=	install install.man
 SUB_FILES=	pkg-install
-SUB_LIST=	RC_SUBR=${RC_SUBR}
 PKGINSTALL=	${WRKDIR}/pkg-install
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/mail/mailscanner-devel/Makefile b/mail/mailscanner-devel/Makefile
index 4ae5d3c733ea..35ad050db8de 100644
--- a/mail/mailscanner-devel/Makefile
+++ b/mail/mailscanner-devel/Makefile
@@ -115,7 +115,6 @@ USRLOCAL_FILES_LIB=	\
 		rav-wrapper sophos-autoupdate
 
 USE_RC_SUBR=	mailscanner mta
-SUB_LIST+=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 
 post-extract:
 	cd ${WRKSRC} && ${TAR} xvzf perl-tar/MailScanner-${PORTVERSION}-${PATCHLEVEL}.tar.gz > /dev/null && ${MV} MailScanner-${PORTVERSION}/* .
@@ -146,7 +145,7 @@ do-build:
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
 		s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \
-		s,%%RC_SUBR%%,${RC_SUBR},g;' \
+		s,%%RC_SUBR%%,/etc/rc.subr,g;' \
 		${WRKSRC}/bin/cron/update_virus_scanners.cron
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
@@ -155,12 +154,12 @@ do-build:
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
 		s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \
-		s,%%RC_SUBR%%,${RC_SUBR},g;' \
+		s,%%RC_SUBR%%,/etc/rc.subr,g;' \
 		${WRKSRC}/bin/cron/update_phishing_sites.cron
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
 		s,/usr/bin/sa-update,${LOCALBASE}/bin/sa-update,g; \
-		s,%%RC_SUBR%%,${RC_SUBR},g;' \
+		s,%%RC_SUBR%%,/etc/rc.subr,g;' \
 		${WRKSRC}/bin/cron/sa-update.cron
 	${PERL} -pi -e \
 		's,/etc/MailScanner/MailScanner.conf,${PREFIX}/etc/MailScanner/MailScanner.conf,g;' \
diff --git a/mail/mailscanner-devel/files/mta.in b/mail/mailscanner-devel/files/mta.in
index dcf2089dd818..03c3e0cba649 100644
--- a/mail/mailscanner-devel/files/mta.in
+++ b/mail/mailscanner-devel/files/mta.in
@@ -63,7 +63,7 @@ PATH=$PATH:/sbin:/usr/sbin; export PATH
 name="mta"
 rcvar=`set_rcvar`
 
-_mta_rc_script="%%PREFIX%%/etc/rc.d/mta%%RC_SUBR_SUFFIX%%"
+_mta_rc_script="%%PREFIX%%/etc/rc.d/mta"
 
 load_rc_config $name
 
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 03f1295e8bbd..3ce594c610e1 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -115,7 +115,6 @@ USRLOCAL_FILES_LIB=	\
 		rav-wrapper sophos-autoupdate
 
 USE_RC_SUBR=	mailscanner mta
-SUB_LIST+=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 
 post-extract:
 	cd ${WRKSRC} && ${TAR} xvzf perl-tar/MailScanner-${PORTVERSION}-${PATCHLEVEL}.tar.gz > /dev/null && ${MV} MailScanner-${PORTVERSION}-${PATCHLEVEL}/* .
@@ -157,7 +156,7 @@ do-build:
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
 		s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \
-		s,%%RC_SUBR%%,${RC_SUBR},g;' \
+		s,%%RC_SUBR%%,/etc/rc.subr,g;' \
 		${WRKSRC}/bin/cron/update_virus_scanners.cron
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
@@ -174,17 +173,17 @@ do-build:
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
 		s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \
-		s,%%RC_SUBR%%,${RC_SUBR},g;' \
+		s,%%RC_SUBR%%,/etc/rc.subr,g;' \
 		${WRKSRC}/bin/cron/update_phishing_sites.cron
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
 		s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \
-		s,%%RC_SUBR%%,${RC_SUBR},g;' \
+		s,%%RC_SUBR%%,/etc/rc.subr,g;' \
 		${WRKSRC}/bin/cron/update_bad_phishing_sites.cron
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
 		s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \
-		s,%%RC_SUBR%%,${RC_SUBR},g;' \
+		s,%%RC_SUBR%%,/etc/rc.subr,g;' \
 		${WRKSRC}/bin/cron/update_spamassassin.cron
 	${PERL} -pi -e \
 		's,/bin/bash,${LOCALBASE}/bin/bash,g; \
diff --git a/mail/mailscanner/files/mta.in b/mail/mailscanner/files/mta.in
index dcf2089dd818..03c3e0cba649 100644
--- a/mail/mailscanner/files/mta.in
+++ b/mail/mailscanner/files/mta.in
@@ -63,7 +63,7 @@ PATH=$PATH:/sbin:/usr/sbin; export PATH
 name="mta"
 rcvar=`set_rcvar`
 
-_mta_rc_script="%%PREFIX%%/etc/rc.d/mta%%RC_SUBR_SUFFIX%%"
+_mta_rc_script="%%PREFIX%%/etc/rc.d/mta"
 
 load_rc_config $name
 
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
index dbbed7ebe198..1a777d4b99d9 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -86,7 +86,6 @@ LDFLAGS+=	-L${MILTERLIB}
 USE_RC_SUBR=	spamass-milter
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 SUB_FILES=	pkg-message
 
diff --git a/net-mgmt/yabm/Makefile b/net-mgmt/yabm/Makefile
index cb5ee3b3b479..328285625db1 100644
--- a/net-mgmt/yabm/Makefile
+++ b/net-mgmt/yabm/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Yet Another Bandwidth Meter, somewhat resembles the Linux bwbar
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_RC_SUBR=	yes
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=/etc/rc.subr
 
 SUB_FILES=	pkg-message
 
diff --git a/net/mpd-l2tp-ipv6pd-client/scripts/setting b/net/mpd-l2tp-ipv6pd-client/scripts/setting
index 7b825e1f0abe..02183ce27293 100644
--- a/net/mpd-l2tp-ipv6pd-client/scripts/setting
+++ b/net/mpd-l2tp-ipv6pd-client/scripts/setting
@@ -114,7 +114,6 @@ for infile in ${SCRIPTDIR}/*.in; do
 	       -e "s|%%FIXED_SERVER%%|${fixed_server}|g" \
 	       -e "s|%%INTERFACE%%|${interface}|g" \
 	       -e "s|%%PD_INTERFACE%%|${pd_interface}|g" \
-	       -e "s|%%RC_SUBR%%|${RC_SUBR}|g" \
 	       -e "s|%%PREFIX%%|${PREFIX}|g" \
 	       -e "s|%%CONF_DIR%%|${CONF_DIR}|g" \
 	       -e "s|%%MD5%%|${MD5}|g" \
diff --git a/sysutils/daedalus/Makefile b/sysutils/daedalus/Makefile
index 6999ef266213..fb9f61ab1054 100644
--- a/sysutils/daedalus/Makefile
+++ b/sysutils/daedalus/Makefile
@@ -21,8 +21,7 @@ USE_RUBY_FEATURES=	1.8
 NO_BUILD=	yes
 
 USE_RC_SUBR=	yes
-SED_SCRIPT=	-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-		-e 's,%%PREFIX%%,${PREFIX},g' \
+SED_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g' \
 		-e 's,%%RUBY_WITHOUT_SUFFIX%%,${RUBY_WITHOUT_SUFFIX},g'
 
 pre-install:
diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index c12d70378b72..9fa5deea3f12 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -29,7 +29,6 @@ USE_RC_SUBR=	syslog-ng.sh
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 SUB_FILES=	pkg-message
-SUB_LIST=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 USE_OPENSSL=	yes
 
 
diff --git a/sysutils/syslog-ng-devel/files/pkg-message.in b/sysutils/syslog-ng-devel/files/pkg-message.in
index 5901623ad1d1..2b5582660897 100644
--- a/sysutils/syslog-ng-devel/files/pkg-message.in
+++ b/sysutils/syslog-ng-devel/files/pkg-message.in
@@ -25,5 +25,5 @@ syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 
 5. Start syslog-ng:
 
-     %%PREFIX%%/etc/rc.d/syslog-ng%%RC_SUBR_SUFFIX%% start
+     %%PREFIX%%/etc/rc.d/syslog-ng start
 
diff --git a/sysutils/syslog-ng3-devel/Makefile b/sysutils/syslog-ng3-devel/Makefile
index c12d70378b72..9fa5deea3f12 100644
--- a/sysutils/syslog-ng3-devel/Makefile
+++ b/sysutils/syslog-ng3-devel/Makefile
@@ -29,7 +29,6 @@ USE_RC_SUBR=	syslog-ng.sh
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 SUB_FILES=	pkg-message
-SUB_LIST=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 USE_OPENSSL=	yes
 
 
diff --git a/sysutils/syslog-ng3-devel/files/pkg-message.in b/sysutils/syslog-ng3-devel/files/pkg-message.in
index 5901623ad1d1..2b5582660897 100644
--- a/sysutils/syslog-ng3-devel/files/pkg-message.in
+++ b/sysutils/syslog-ng3-devel/files/pkg-message.in
@@ -25,5 +25,5 @@ syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 
 5. Start syslog-ng:
 
-     %%PREFIX%%/etc/rc.d/syslog-ng%%RC_SUBR_SUFFIX%% start
+     %%PREFIX%%/etc/rc.d/syslog-ng start
 
diff --git a/sysutils/syslog-ng3/Makefile b/sysutils/syslog-ng3/Makefile
index c12d70378b72..9fa5deea3f12 100644
--- a/sysutils/syslog-ng3/Makefile
+++ b/sysutils/syslog-ng3/Makefile
@@ -29,7 +29,6 @@ USE_RC_SUBR=	syslog-ng.sh
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 SUB_FILES=	pkg-message
-SUB_LIST=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 USE_OPENSSL=	yes
 
 
diff --git a/sysutils/syslog-ng3/files/pkg-message.in b/sysutils/syslog-ng3/files/pkg-message.in
index 5901623ad1d1..2b5582660897 100644
--- a/sysutils/syslog-ng3/files/pkg-message.in
+++ b/sysutils/syslog-ng3/files/pkg-message.in
@@ -25,5 +25,5 @@ syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 
 5. Start syslog-ng:
 
-     %%PREFIX%%/etc/rc.d/syslog-ng%%RC_SUBR_SUFFIX%% start
+     %%PREFIX%%/etc/rc.d/syslog-ng start
 
diff --git a/www/jetty/Makefile b/www/jetty/Makefile
index f783d773b700..27207442d67a 100644
--- a/www/jetty/Makefile
+++ b/www/jetty/Makefile
@@ -21,8 +21,6 @@ USE_PYTHON=	1.6+
 PLIST=		${WRKDIR}/pkg-plist
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-USE_RC_SUBR=	jetty
-
 APP_NAME=	${PORTNAME}
 APP_HOME=	${PREFIX}/${PORTNAME}
 PID_FILE?=	${APP_HOME}/${APP_NAME}.pid
@@ -35,7 +33,6 @@ LOG_FILE?=	${APP_HOME}/${APP_NAME}.log
 SUB_LIST=	\
 		APP_HOME=${APP_HOME} \
 		APP_NAME=${APP_NAME} \
-		RC_SUBR=${RC_SUBR} \
 		JAVA_HOME=${JAVA_HOME} \
 		JAVA=${JAVA} \
 		PID_FILE=${PID_FILE} \
diff --git a/www/polipo/Makefile b/www/polipo/Makefile
index fd3856b0e5da..b08e8668c11b 100644
--- a/www/polipo/Makefile
+++ b/www/polipo/Makefile
@@ -34,7 +34,7 @@ PORTDOCS=	*
 SUB_FILES=	pkg-message pkg-install pkg-deinstall 400.polipo
 SUB_LIST+=	USER=${PUSER} GROUP=${PGRP} DESTDIR=${DESTDIR} PCONFIGDIR=${PCONFIGDIR} \
 		PCACHEDIR=${PCACHEDIR} PPIDDIR=${PPIDDIR} PPIDFILE=${PPIDFILE} \
-		PLOGFILE=${PLOGFILE} RC_SUBR=${RC_SUBR}
+		PLOGFILE=${PLOGFILE}
 
 # polipo installation options, propagated to install scripts
 PUSER?=		polipo
diff --git a/www/polipo/files/pkg-install.in b/www/polipo/files/pkg-install.in
index 8cead8eaf08f..b3e7a0f80b2b 100644
--- a/www/polipo/files/pkg-install.in
+++ b/www/polipo/files/pkg-install.in
@@ -12,12 +12,6 @@ POLIPOPID=%%PPIDFILE%%
 
 if [ "$2" = "PRE-INSTALL" ]; then
 
-	if [ "%%RC_SUBR%%" = "" ]; then
-		echo "=> Port requires /etc/rc.subr (native or port/sysutils/rc_subr)!"
-		echo "=> If you want to install without you should modify startup script and pkg-install."
-		exit 1
-	fi
-
 	if fgrep "polipo" "%%DESTDIR%%/etc/newsyslog.conf" 2>/dev/null 1>&2; then
 		if ! fgrep "polipo.pid" "%%DESTDIR%%/etc/newsyslog.conf" 2>/dev/null 1>&2; then
 			echo "==> ERROR: Previous installation left an invalid entry in %%DESTDIR%%/etc/newsyslog.conf."