Take advantage of the auto-generation and installation of rc.d scripts.

5 files changed, 6 insertions, 19 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index 82ef0c96559..bbb54ea8236 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2002/08/25 18:40:16 jlam Exp $
+# $NetBSD: Makefile,v 1.105 2002/09/19 09:04:28 jlam Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -172,7 +172,6 @@ pre-configure:
 
 pre-install:
 	${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
 
 post-install:
 .if !defined(NOPIC)
@@ -185,7 +184,6 @@ post-install:
 		${RM} -f ${PKG_SYSCONFDIR}/$${file}.default;		\
 	done
 	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
-	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
 
 .include "../../devel/libmm/buildlink2.mk"
 .include "../../textproc/expat/buildlink2.mk"
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index a702a7f87d8..a83883a023d 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/08/29 14:12:27 martti Exp $
+# $NetBSD: Makefile,v 1.13 2002/09/19 09:04:29 jlam Exp $
 
 DISTNAME=		httpd-${APACHE_VERSION}
 PKGNAME=		apache-${APACHE_VERSION}
@@ -115,9 +115,6 @@ CONFIGURE_ARGS+=	${_AP_CFG_ARGS.${_ap_mod}}
 .  endif
 .endfor
 
-post-build:
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
-
 AP_CONF_FILE_SED=	-e "s|${EGDIR}|${PKG_SYSCONFDIR}|g"
 AP_CONF_FILE_SED+=	-e "s|${PREFIX}/htdocs|${PREFIX}/share/httpd/htdocs|g"
 AP_CONF_FILE_SED+=	-e "s|${PREFIX}/conf|${PKG_SYSCONFDIR}|g"
@@ -152,7 +149,6 @@ post-install:
 			' >> $${file}.new;				\
 		${MV} -f $${file}.new $${file};				\
 	done
-	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
 
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../textproc/expat/buildlink2.mk"
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 40687be9ab9..210dde42760 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2002/08/25 21:51:58 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2002/09/19 09:04:30 jlam Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -154,7 +154,6 @@ pre-configure:
 
 pre-install:
 	${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/httpd
@@ -164,7 +163,6 @@ post-install:
 		${RM} -f ${PKG_SYSCONFDIR}/$${file}.default;		\
 	done
 	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
-	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
 
 .include "../../textproc/expat/buildlink2.mk"
 
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 2ff5ced077a..6c9c20053dd 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2002/09/15 14:39:51 grant Exp $
+# $NetBSD: Makefile,v 1.68 2002/09/19 09:04:32 jlam Exp $
 
 DISTNAME=	squid-2.4.STABLE7-src
 PKGNAME=	squid-2.4.7
@@ -48,9 +48,6 @@ SQUID_CONFIGURE_ARGS?=	--disable-internal-dns \
 
 OPTIONAL_FILES=	libexec/diskd libexec/dnsserver libexec/pinger libexec/unlinkd
 
-post-build:
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/squid.sh > ${WRKDIR}/squid
-
 pre-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/squid
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid
@@ -59,7 +56,6 @@ pre-install:
 
 post-install:
 	cd ${WRKSRC}/src; ${TEST} ! -x pinger || ${MAKE} install-pinger
-	${INSTALL_SCRIPT} ${WRKDIR}/squid ${RCD_SCRIPTS_EXAMPLEDIR}/squid
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	@(							\
 	for FILE in ${OPTIONAL_FILES}; do			\
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index 6a2d64ab9d4..f8b77252dd7 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/06/16 19:12:13 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2002/09/19 09:04:34 jlam Exp $
 
 DISTNAME=	thttpd-2.23beta1
 PKGNAME=	thttpd-2.23.0.1
@@ -31,7 +31,7 @@ pre-configure:
 	done
 
 post-build:
-	for FILE in thttpd.conf thttpd.sh; do				\
+	for FILE in thttpd.conf; do					\
 		${SED} ${FILES_SUBST_SED}				\
 			${FILESDIR}/$${FILE} > ${WRKDIR}/$${FILE};	\
 	done
@@ -41,7 +41,6 @@ pre-install:
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/thttpd.conf ${PREFIX}/share/examples
-	${INSTALL_SCRIPT} ${WRKDIR}/thttpd.sh ${PREFIX}/etc/rc.d/thttpd
 	${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/thttpd
 	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/thttpd