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

7 files changed, 8 insertions, 68 deletions

diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index 78b26ab1969..ff52565ffa0 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/09/19 08:41:50 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/19 09:04:14 jlam Exp $
 
 DISTNAME=	chrony-1.17
 CATEGORIES=	net
@@ -9,15 +9,13 @@ HOMEPAGE=	http://go.to/chrony
 COMMENT=	Daemon for maintaining the accuracy of computer clocks
 
 HAS_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--prefix=${LOCALBASE}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
 EGDIR=			${LOCALBASE}/share/examples/chrony
 EGFILES=		chrony.conf.example chrony.keys.example
 RCD_SCRIPTS=		chronyd
 
 pre-install:
-	${SED} ${FILES_SUBST_SED} \
-		${FILESDIR}/chronyd.sh > ${WRKDIR}/chronyd
 	for file in ${EGFILES}; do				\
 		${SED} ${FILES_SUBST_SED}			\
 			${WRKSRC}/examples/$${file} >		\
@@ -25,10 +23,6 @@ pre-install:
 	done
 
 post-install:
-	for script in ${RCD_SCRIPTS}; do			\
-		${INSTALL_SCRIPT} ${WRKDIR}/$${script}		\
-		${LOCALBASE}/etc/rc.d/$${script};		\
-	done
 	${INSTALL_DATA_DIR} ${EGDIR}
 	for file in ${EGFILES}; do				\
 		${INSTALL_DATA} ${WRKDIR}/$${file}		\
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index 22d9aa4fbbd..7a77235170c 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/09/18 21:15:14 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/09/19 09:04:15 jlam Exp $
 
 DISTNAME=	ddclient-3.6.2
 CATEGORIES=	net
@@ -30,17 +30,7 @@ do-configure:
 
 do-build:	# empty
 
-pre-install:
-	@for script in ${RCD_SCRIPTS}; do				\
-		${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh	\
-			> ${WRKDIR}/$${script};				\
-	done
-
 do-install:
-	for script in ${RCD_SCRIPTS}; do				\
-		${INSTALL_SCRIPT} ${WRKDIR}/$${script}			\
-			${PREFIX}/etc/rc.d/$${script};			\
-	done
 	${INSTALL_SCRIPT} ${WRKSRC}/ddclient ${PREFIX}/sbin
 	${INSTALL_DATA_DIR} ${DOCDIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCDIR}
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index 7896d47d95b..96281b49819 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/09/18 21:15:14 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/09/19 09:04:16 jlam Exp $
 
 DISTNAME=		samba-${SAMBA_BASE_VERSION}-ja-${SAMBA_JA_VERSION}
 PKGNAME=		ja-samba-${SAMBA_BASE_VERSION}.${SAMBA_JA_VERSION}
@@ -124,12 +124,6 @@ post-extract:
 	${RM} -r ${WRKDIR}/${DISTNAME}/examples/smbchartool
 	${RM} -r ${WRKDIR}/${DISTNAME}/examples/svr4-startup
 
-pre-install:
-	@for script in ${RCD_SCRIPTS}; do				\
-		${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh	\
-			> ${WRKDIR}/$${script};				\
-	done
-
 post-install:
 	# Install Samba documentation.
 	${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR}
@@ -144,10 +138,6 @@ post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 	${CHMOD} -R ugo-w ${EXAMPLESDIR}
 
-	for script in ${RCD_SCRIPTS}; do				\
-		${INSTALL_SCRIPT} ${WRKDIR}/$${script}			\
-			${PREFIX}/etc/rc.d/$${script};			\
-	done
 	${INSTALL_SCRIPT} ${WRKSRC}/script/convert_smbpasswd		\
 		${EXAMPLESDIR}/misc
 	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh		\
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 02c1c16203c..cbc718229bc 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/09/16 21:00:56 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/09/19 09:04:16 jlam Exp $
 
 DISTNAME=	openslp-1.0.9a
 CATEGORIES=	net
@@ -30,17 +30,7 @@ RCD_SCRIPTS=		slpd
 post-extract:
 	${FIND} ${WRKSRC} -name "CVS" -print | ${XARGS} ${RM} -rf
 
-pre-install:
-	@for script in ${RCD_SCRIPTS}; do				\
-		${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh	\
-			> ${WRKDIR}/$${script};				\
-	done
-
 post-install:
-	for script in ${RCD_SCRIPTS}; do				\
-		${INSTALL_SCRIPT} ${WRKDIR}/$${script}			\
-			${PREFIX}/etc/rc.d/$${script};			\
-	done
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA_DIR} ${HTMLDIR}
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 5c721c2d3fd..43bf4d908e2 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2002/09/18 21:15:15 jlam Exp $
+# $NetBSD: Makefile,v 1.89 2002/09/19 09:04:17 jlam Exp $
 
 .include "Makefile.common"
 
@@ -65,12 +65,6 @@ post-extract:
 	${RM} -r ${WRKDIR}/${DISTNAME}/examples/libsmbclient
 	${RM} -r ${WRKDIR}/${DISTNAME}/examples/svr4-startup
 
-pre-install:
-	@for script in ${RCD_SCRIPTS}; do				\
-		${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh	\
-			> ${WRKDIR}/$${script};				\
-	done
-
 post-install:
 	# Install Samba documentation.
 	${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR}
@@ -85,10 +79,6 @@ post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 	${CHMOD} -R ugo-w ${EXAMPLESDIR}
 
-	for script in ${RCD_SCRIPTS}; do				\
-		${INSTALL_SCRIPT} ${WRKDIR}/$${script}			\
-			${PREFIX}/etc/rc.d/$${script};			\
-	done
 	${INSTALL_SCRIPT} ${WRKSRC}/script/convert_smbpasswd		\
 		${EXAMPLESDIR}/misc
 	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh		\
diff --git a/net/samba20/Makefile b/net/samba20/Makefile
index 70987a6af4f..9a3b05e9a2a 100644
--- a/net/samba20/Makefile
+++ b/net/samba20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/09/18 21:15:16 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/09/19 09:04:18 jlam Exp $
 
 DISTNAME=		samba-2.0.10
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
@@ -66,12 +66,6 @@ RCD_SCRIPTS=		samba nmbd smbd
 MAKE_DIRS=		${SAMBA_LOCKDIR}
 OWN_DIRS=		${SAMBA_ETCDIR} ${SAMBA_PRIVATE}
 
-pre-install:
-	for script in ${RCD_SCRIPTS}; do				\
-		${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh	\
-			> ${WRKDIR}/$${script};				\
-	done
-
 post-install:
 	# Install Samba documentation.
 	${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR}
@@ -85,10 +79,6 @@ post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 	${CHMOD} -R ugo-w ${EXAMPLESDIR}
 
-	for script in ${RCD_SCRIPTS}; do				\
-		${INSTALL_SCRIPT} ${WRKDIR}/$${script}			\
-			${PREFIX}/etc/rc.d/$${script};			\
-	done
 	${MV} ${PREFIX}/bin/convert_smbpasswd ${PREFIX}/sbin/convert_smbpasswd
 	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh		\
 		${PREFIX}/sbin/mksmbpasswd
diff --git a/net/speedtouch/Makefile b/net/speedtouch/Makefile
index 5108aef87f3..1981eb247fd 100644
--- a/net/speedtouch/Makefile
+++ b/net/speedtouch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/07/18 00:10:07 abs Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/19 09:04:19 jlam Exp $
 #
 
 DISTNAME=	speedtouch-1.1
@@ -17,12 +17,8 @@ GNU_CONFIGURE=	yes
 
 RCD_SCRIPTS=	adsl
 
-pre-install:
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/adsl.sh > ${WRKDIR}/adsl.sh
-
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/mgmt/mgmt.o ${PREFIX}/libdata/alcaudsl.sys
-	${INSTALL_SCRIPT} ${WRKDIR}/adsl.sh ${PREFIX}/etc/rc.d/adsl
 
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"