Replace dependency on "qmail or netqmail" with dependency on qmail.

Remove dependency on mailwrapper. If you're on a Linux with
/etc/alternatives, for instance, you don't need it. For platforms
where mailwrapper builds and provides functionality not otherwise
available, it's still a good idea.

Remove dependency on rc.subr. Teach the rc.d scripts to start
services even in the absence of rc.subr. For full rc.d-style
functionality, rc.subr is still required.

Create control/concurrencypop3 at install time, and use it in the
qmailpop3d rc.d script. From Dave Sill's book.

Add comments to the qmail rc.d script to satisfy Linux's chkconfig
utility. From the qmailctl script in "Life with qmail".

Add qmail-procmail wrapper script to map procmail's exit codes to
qmail's. To use procmail, install it and call this script. From
Dave Sill's book.

Add qmail-qfilter-queue wrapper script. Previously part of the
qmail-qfilter package, it's moving here for the same reasons that
all my other custom scripts moved here.

Insert a blank comment line in pkgsrc-generated config files.

Bump version.

1 files changed, 13 insertions, 18 deletions

diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile
index 2131e042037..0e06269ca45 100644
--- a/mail/qmail-run/Makefile
+++ b/mail/qmail-run/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/08/03 08:59:24 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2004/08/23 03:47:48 schmonz Exp $
 #
 
-DISTNAME=		qmail-run-20040803
+DISTNAME=		qmail-run-20040823
 CATEGORIES=		mail
 MASTER_SITES=		# empty
 DISTFILES=		# empty
@@ -9,14 +9,8 @@ DISTFILES=		# empty
 MAINTAINER=		schmonz@NetBSD.org
 COMMENT=		Configures qmail to receive and deliver mail
 
-DEPENDS_QMAIL=		{qmail>=1.03nb8,netqmail>=1.05nb1}:../../mail/qmail
+DEPENDS_QMAIL=		qmail>=1.03nb8:../../mail/qmail
 DEPENDS+=		${DEPENDS_QMAIL}
-.if !exists(/usr/sbin/mailwrapper)
-DEPENDS+=		mailwrapper-[0-9]*:../../mail/mailwrapper
-.endif
-.if !exists(/etc/rc.subr)
-DEPENDS+=		rc.subr-[0-9]*:../../pkgtools/rc.subr
-.endif
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
@@ -27,21 +21,16 @@ USE_PKGINSTALL=		yes
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 FILES_SUBST+=		QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA}
 FILES_SUBST+=		PKGNAME=${PKGNAME}
-RCD_SCRIPTS=		qmail qmailqread qmailpop3d qmailsend qmailsmtpd
+RCD_SCRIPTS=		qmail qmailpop3d qmailqread qmailsend qmailsmtpd
 
 INSTALLATION_DIRS=	bin share/doc/qmail-run share/examples/qmail-run
 
 .include "../../mk/bsd.prefs.mk"
 
-# Detect the PKG_SYSCONFDIR of the installed qmail or netqmail, so we
-# can create config files there and refer to them from rc.d scripts.
+# Detect the PKG_SYSCONFDIR of the installed qmail, so we can create
+# config files there and refer to them from rc.d scripts.
 .if !empty(PHASES_AFTER_EXTRACT:M${PKG_PHASE})
-INSTALLED_QMAIL!= \
-	dep=`${PKG_BEST_EXISTS} ${DEPENDS_QMAIL:C/:.*$//:Q:S/\ / /g}`;	\
-	case "$$dep" in							\
-	"")	${ECHO} "qmail_not_found_" ;;				\
-	*)	${ECHO} "$$dep" ;;					\
-	esac
+INSTALLED_QMAIL!= ${PKG_BEST_EXISTS} ${DEPENDS_QMAIL:C/:.*$//:Q:S/\ / /g}
 .  if empty(INSTALLED_QMAIL:M*_not_found_)
 .    if !defined(PKG_SYSCONFDIR.qmail-run)
 PKG_SYSCONFDIR.qmail-run!= \
@@ -56,10 +45,16 @@ do-build:
 		> ${WRKDIR}/README.pkgsrc
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/mailer.conf		\
 		> ${WRKDIR}/mailer.conf
+	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/qmail-procmail.sh	\
+		> ${WRKDIR}/qmail-procmail
+	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/qmail-qfilter-queue.sh	\
+		> ${WRKDIR}/qmail-qfilter-queue
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/qmail-qread-client.sh	\
 		> ${WRKDIR}/qmail-qread-client
 
 do-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/qmail-procmail ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/qmail-qfilter-queue ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKDIR}/qmail-qread-client ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/README.pkgsrc ${PREFIX}/share/doc/qmail-run
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf ${PREFIX}/share/examples/qmail-run