Use bsd.pkg.install.mk to handle generation and installation of the rc.d

script.  Bump PKGREVISION to 1.

2 files changed, 12 insertions, 13 deletions

diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index ba2edcb7c94..52888550f25 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2003/07/17 22:56:08 grant Exp $
+# $NetBSD: Makefile,v 1.47 2003/08/29 09:25:40 jmmv Exp $
 
 DISTNAME=	wwwoffle-2.7f
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/www/servers/} \
 		ftp://ftp.demon.co.uk/pub/unix/httpd/ \
@@ -12,14 +13,17 @@ HOMEPAGE=	http://www.gedanken.demon.co.uk/wwwoffle/
 COMMENT=	WWW proxy with support for offline browsing
 
 USE_GMAKE=	yes
+USE_PKGINSTALL=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+= --with-spooldir=/var/wwwoffle
 
-PKG_SYSCONFSUBDIR= wwwoffle
-PLIST_SUBST+=	GTAR="${GTAR}" PKG_SYSCONFDIR="${PKG_SYSCONFDIR}"
-INSTALL_FILE=	${WRKDIR}/INSTALL
+PKG_SYSCONFSUBDIR= 	wwwoffle
+PLIST_SUBST+=		GTAR="${GTAR}"
+INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
+
+RCD_SCRIPTS=		wwwoffled
 
 post-build:
 	cd ${WRKSRC}/cache/search/htdig/scripts; \
@@ -29,11 +33,6 @@ post-build:
 		  -e 's#/usr/local#${PREFIX}#' $$f.old > $$f; \
 		${RM} $$f.old; \
 	done
-	${SED} -e 's#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g' \
-		-e 's#@PREFIX@#${PREFIX}#g' \
-		${FILESDIR}/wwwoffled > ${WRKDIR}/wwwoffled
-	${SED} -e 's#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g' \
-	  	INSTALL > ${WRKDIR}/INSTALL
 
 # For bulk-build machines: a one-time install/deinstall, if wwwoffle
 # is never run, leaves an incomplete cache directory, which the install
@@ -58,7 +57,6 @@ post-install:
 	  ${PREFIX}/sbin/wwwoffle-upgrade-config.pl
 	${INSTALL_SCRIPT} ${WRKSRC}/conf/upgrade-config-2.x-2.5.pl \
 	  ${PREFIX}/sbin/wwwoffle-upgrade-config-2.x-2.5.pl
-	${INSTALL_SCRIPT} ${WRKDIR}/wwwoffled ${PREFIX}/etc/rc.d
 # Directories other than html and search are automatically created at run time
 	${GTAR} czCf / ${PREFIX}/libdata/wwwoffle-spool.tar.gz \
 		var/wwwoffle/html var/wwwoffle/search
diff --git a/www/wwwoffle/files/wwwoffled b/www/wwwoffle/files/wwwoffled.sh
index 7bb72402af9..bb7df162551 100644
--- a/www/wwwoffle/files/wwwoffled
+++ b/www/wwwoffle/files/wwwoffled.sh
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: wwwoffled,v 1.4 2002/08/10 17:03:27 fredb Exp $
+# $NetBSD: wwwoffled.sh,v 1.1 2003/08/29 09:25:41 jmmv Exp $
 #
 # PROVIDE: wwwoffled
 # REQUIRE: DAEMON network
+#
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
@@ -31,6 +32,6 @@ if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
 	load_rc_config $name
 	run_rc_command "$1"
 else
-	echo -n ' ${name}'
+	printf " ${name}"
 	${start_cmd}
 fi