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

5 files changed, 5 insertions, 34 deletions

diff --git a/mail/courier-auth/Makefile b/mail/courier-auth/Makefile
index 428cc8d8bb9..83e2ebc0767 100644
--- a/mail/courier-auth/Makefile
+++ b/mail/courier-auth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/09/18 21:15:10 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/19 09:04:10 jlam Exp $
 
 PKGNAME=	courier-auth-${BASE_VERS}
 PKGREVISION?=	1
@@ -37,12 +37,6 @@ do-install:
 .endfor
 
 post-install:
-	@for file in ${RCD_SCRIPTS}; do					\
-		${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${file}.sh	\
-			> ${WRKDIR}/$${file}.sh;			\
-		${INSTALL_SCRIPT} ${WRKDIR}/$${file}.sh			\
-			${PREFIX}/etc/rc.d/$${file};			\
-	done
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${SYSCONFTOOL}
 	for file in authdaemonrc.dist; do				\
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 3c92c35d555..6307d2883c4 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/09/18 21:15:10 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2002/09/19 09:04:11 jlam Exp $
 
 DISTNAME=	courier-imap-1.4.2
 PKGREVISION=	1
@@ -60,12 +60,6 @@ pre-configure:
 	done
 
 post-install:
-	@for file in ${RCD_SCRIPTS}; do					\
-		${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${file}.sh	\
-			> ${WRKDIR}/$${file}.sh;			\
-		${INSTALL_SCRIPT} ${WRKDIR}/$${file}.sh			\
-			${PREFIX}/etc/rc.d/$${file};			\
-	done
 	${INSTALL_DATA_DIR} ${EGDIR} ${DOCDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${SYSCONFTOOL}
 	${INSTALL_DATA} ${WRKSRC}/imap/BUGS				\
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 205ee09befb..7d2b2755bd0 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2002/09/18 21:15:11 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2002/09/19 09:04:11 jlam Exp $
 
 DISTNAME=		cyrus-imapd-2.0.16
 PKGREVISION=		1
@@ -98,17 +98,7 @@ post-patch:
 		${MV} -f $${file}.fixed $${file};			\
 	done
 
-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_SCRIPT} ${WRKSRC}/tools/mkimap ${PREFIX}/cyrus/bin
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EGDIR}
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 5fc1abafdc2..3865574aa46 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/09/18 21:15:12 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2002/09/19 09:04:12 jlam Exp $
 #
 
 DISTNAME=	qmail-1.03
@@ -43,8 +43,6 @@ do-configure:
 	${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
 
 pre-install:
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/qmail.sh			\
-		> ${WRKDIR}/qmail
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/mailer.conf		\
 		> ${WRKDIR}/mailer.conf.qmail
 
@@ -52,9 +50,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${QMAILDIR}/etc
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf.qmail ${QMAILDIR}/etc
 
-	${INSTALL_SCRIPT_DIR} ${RCD_SCRIPTS_EXAMPLEDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/qmail ${RCD_SCRIPTS_EXAMPLEDIR}
-
 	${INSTALL_DATA_DIR} ${QMAILDIR}/alias
 	cd ${QMAILDIR}/alias && 					\
 		${TOUCH} .qmail-postmaster .qmail-mailer-daemon .qmail-root
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 0fe94296caa..1ff5093fdb8 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/09/08 23:30:38 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/19 09:04:13 jlam Exp $
 
 DISTNAME=	Mail-SpamAssassin-2.31
 PKGNAME=	spamassassin-2.31
@@ -33,8 +33,6 @@ do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 post-install:
-	${SED}  -e 's:@PREFIX@:${PREFIX}:' ${FILESDIR}/spamd.sh \
-	    > ${PREFIX}/etc/rc.d/spamd
 .for d in spamassassin spamassassin/sql spamassassin/spamd
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/$d
 .endfor