use new scheme of USE_RC_SUBR.

6 files changed, 9 insertions, 28 deletions

diff --git a/net/dtcp/Makefile b/net/dtcp/Makefile
index e67e13348115..72907ef5f4bf 100644
--- a/net/dtcp/Makefile
+++ b/net/dtcp/Makefile
@@ -19,18 +19,16 @@ COMMENT=	Dynamic Tunnel Configuration Protocol daemon and client
 RUN_DEPENDS=	qpopauth:${PORTSDIR}/mail/qpopper
 .endif
 
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	dtcpc.sh dtcps.sh
 USE_RUBY=	yes
 MAKE_ENV+=	RUBY=${RUBY}
 
 MAN8=		dtcpauth.8 dtcpc.8 dtcps.8
 MANCOMPRESSED=	yes
 
-RC_SCRIPTS=	${PREFIX}/etc/rc.d/dtcpc.sh ${PREFIX}/etc/rc.d/dtcps.sh
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} RUBY=${RUBY}
+SUB_LIST+=	RUBY=${RUBY}
 
-PLIST_FILES=	sbin/dtcpauth sbin/dtcpc sbin/dtcps \
-		etc/rc.d/dtcpc.sh etc/rc.d/dtcps.sh
+PLIST_FILES=	sbin/dtcpauth sbin/dtcpc sbin/dtcps
 
 pre-everything::
 .if !defined(DTCP_CLIENT_ONLY)
@@ -41,19 +39,11 @@ pre-everything::
 .endif
 
 pre-install:
-	@for script in ${RC_SCRIPTS}; do \
-		if [ -f $${script} ]; then \
-			${ECHO_MSG} "Remove old $${script} before install."; \
+	@for script in ${USE_RC_SUBR}; do \
+		if [ -f ${PREFIX}/etc/rc.d/$${script} ]; then \
+			${ECHO_MSG} "Remove old ${PREFIX}/etc/rc.d/$${script} before install."; \
 			exit 1; \
 		fi; \
 	done
 
-post-install:
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/dtcpc.sh > ${PREFIX}/etc/rc.d/dtcpc.sh
-	@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/dtcpc.sh
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/dtcps.sh > ${PREFIX}/etc/rc.d/dtcps.sh
-	@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/dtcps.sh
-
 .include <bsd.port.mk>
diff --git a/net/dtcp/files/dtcpc.sh b/net/dtcp/files/dtcpc.sh.in
index 3ca23c039e83..3ca23c039e83 100644
--- a/net/dtcp/files/dtcpc.sh
+++ b/net/dtcp/files/dtcpc.sh.in
diff --git a/net/dtcp/files/dtcps.sh b/net/dtcp/files/dtcps.sh.in
index a2e3ad9c9b1a..a2e3ad9c9b1a 100644
--- a/net/dtcp/files/dtcps.sh
+++ b/net/dtcp/files/dtcps.sh.in
diff --git a/net/dtcpclient/Makefile b/net/dtcpclient/Makefile
index ae7f48f3e661..a597ef7ef847 100644
--- a/net/dtcpclient/Makefile
+++ b/net/dtcpclient/Makefile
@@ -15,23 +15,15 @@ MASTER_SITES=	http://www.imasy.or.jp/~ume/ipv6/ \
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Dynamic Tunnel Configuration Protocol client
 
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	dtcpclient.sh
 
 MAN8=		dtcpclient.8
 MANCOMPRESSED=	yes
 
-RC_SCRIPT=	${PREFIX}/etc/rc.d/dtcpclient.sh
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
-
 pre-install:
-	@if [ -f ${RC_SCRIPT} ]; then \
-		${ECHO_CMD} "Remove old ${RC_SCRIPT} before install."; \
+	@if [ -f ${PREFIX}/etc/rc.d/${USE_RC_SUBR} ]; then \
+		${ECHO_CMD} "Remove old ${PREFIX}/etc/rc.d/${USE_RC_SUBR} before install."; \
 		exit 1; \
 	fi
 
-post-install:
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/dtcpclient.sh > ${WRKDIR}/dtcpclient.sh
-	@${INSTALL_SCRIPT} ${WRKDIR}/dtcpclient.sh ${RC_SCRIPT}
-
 .include <bsd.port.mk>
diff --git a/net/dtcpclient/files/dtcpclient.sh b/net/dtcpclient/files/dtcpclient.sh.in
index e8b0ee65658d..e8b0ee65658d 100644
--- a/net/dtcpclient/files/dtcpclient.sh
+++ b/net/dtcpclient/files/dtcpclient.sh.in
diff --git a/net/dtcpclient/pkg-plist b/net/dtcpclient/pkg-plist
index 9b38dc4333b4..38249fc2b36d 100644
--- a/net/dtcpclient/pkg-plist
+++ b/net/dtcpclient/pkg-plist
@@ -3,4 +3,3 @@ sbin/dtcpclient
 %%EXAMPLESDIR%%/dtcpclient.script
 @exec [ -f %D/etc/dtcpclient.script ] || cp %B/%f %D/etc/dtcpclient.script
 @dirrm %%EXAMPLESDIR%%
-etc/rc.d/dtcpclient.sh