Implement rc_subr suggestions made by dougb@

3 files changed, 1 insertions, 7 deletions

diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index c86d8dbb57f7..dc384f1b32db 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A caching proxy server for HTTP and FTP designed for dial-up hosts
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	${PORTNAME}d.sh
 
 # $SPOOL seems like a common name which could be used for other things, so
 # use $WWWOFFLE_SPOOL as the overriding setting.
@@ -47,15 +47,10 @@ post-configure:
 
 .endif
 
-post-build:
-	@${SED}	${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/wwwoffled.sh > ${WRKDIR}/wwwoffled.sh
-
 post-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/conf/upgrade-config-2.5-2.6.pl ${WWWOFFLE_SPOOL}
 	@${INSTALL_SCRIPT} ${WRKSRC}/conf/upgrade-config-2.x-2.5.pl ${WWWOFFLE_SPOOL}
 	@${INSTALL_SCRIPT} ${WRKSRC}/conf/upgrade-config.pl ${WWWOFFLE_SPOOL}
-	@${INSTALL_SCRIPT} ${WRKDIR}/wwwoffled.sh ${PREFIX}/etc/rc.d/wwwoffled.sh
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/wwwoffle/files/wwwoffled.sh b/www/wwwoffle/files/wwwoffled.sh.in
index 0c2c2f2bd1b2..0c2c2f2bd1b2 100644
--- a/www/wwwoffle/files/wwwoffled.sh
+++ b/www/wwwoffle/files/wwwoffled.sh.in
diff --git a/www/wwwoffle/pkg-plist b/www/wwwoffle/pkg-plist
index aab0110635af..5762e3591a18 100644
--- a/www/wwwoffle/pkg-plist
+++ b/www/wwwoffle/pkg-plist
@@ -6,7 +6,6 @@ bin/wwwoffle-read
 bin/wwwoffle-rm
 bin/wwwoffle-tools
 bin/wwwoffle-write
-etc/rc.d/wwwoffled.sh
 @unexec if cmp -s %D/etc/wwwoffle.conf.install %D/etc/wwwoffle.conf; then rm -f %D/etc/wwwoffle.conf; fi
 etc/wwwoffle.conf.install
 sbin/wwwoffled