Add rc.d script to control qmail, provided by Lubomir Sedlacik

<salo@Xtrmntr.org> in pkg/15326.

Add example mailer.conf.

Bump PKGREVISION.

Clarify binary package situation: We don't allow binary packages
to be created because they don't currently work. Additionally, if
someone were to make them work, we'd be unable to distribute them
because we apply a few patches to the qmail source.

Thanks to zuntum and jlam for discussion and assistance.

5 files changed, 66 insertions, 9 deletions

diff --git a/mail/qmail/MESSAGE b/mail/qmail/MESSAGE
index 5ac5929ba4e..27fdff8e005 100644
--- a/mail/qmail/MESSAGE
+++ b/mail/qmail/MESSAGE
@@ -1,8 +1,10 @@
 ======================================================================
-$NetBSD: MESSAGE,v 1.3 2002/01/21 16:00:51 zuntum Exp $
+$NetBSD: MESSAGE,v 1.4 2002/07/28 01:54:37 schmonz Exp $
 
   To be able to view manpages either add "${QMAILDIR}/man/" to the
   _default line in /etc/man.conf or specify this directory in
   MANPATH variable in your environment.
 
+  To start qmail at startup set qmail=YES in /etc/rc.conf.
+
 ======================================================================
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 0f36d4f9fd5..ac8481f4ae9 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2002/07/22 23:30:29 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2002/07/28 01:54:37 schmonz Exp $
 #
 
 DISTNAME=	qmail-1.03
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
-MASTER_SITES=   http://cr.yp.to/software/			\
+MASTER_SITES=	http://cr.yp.to/software/			\
 		ftp://ftp.ntnu.no/pub/unix/mail/qmail/		\
 		ftp://ftp.jp.qmail.org/qmail/			\
 		ftp://ftp.rifkin.technion.ac.il/pub/qmail/	\
@@ -20,9 +20,17 @@ DEPENDS+=	qmail-users>=1.0:../../mail/qmail-users
 ALL_TARGET= 	it man
 INSTALL_TARGET=	setup check
 
-NO_PACKAGE=	YES
+RESTRICTED=		"djb does not permit modified binary packages"
+NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
 
-OWN_DIRS+=	${QMAILDIR}
+NO_PACKAGE=		"needs work to function properly as a binary package"
+
+OWN_DIRS+=		${QMAILDIR}
+
+FILES_SUBST+=		QMAILDIR=${QMAILDIR}
+RCD_SCRIPTS=		qmail
+RCD_SCRIPTS_EXAMPLEDIR=	${QMAILDIR}/etc/rc.d
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -31,14 +39,26 @@ LOCALBASE=	/
 
 DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
 
-pre-build:
+do-configure:
 	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
 	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 	${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
+
 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 && 				\
+	cd ${QMAILDIR}/alias && 					\
 		${TOUCH} .qmail-postmaster .qmail-mailer-daemon .qmail-root
 
 .include "../../mk/bsd.pkg.install.mk"
diff --git a/mail/qmail/PLIST b/mail/qmail/PLIST
index 21d94d81614..a91d61b9798 100644
--- a/mail/qmail/PLIST
+++ b/mail/qmail/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/21 18:45:04 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/07/28 01:54:37 schmonz Exp $
+${QMAILDIR}/etc/mailer.conf.qmail
+${QMAILDIR}/etc/rc.d/qmail
 ${QMAILDIR}/doc/FAQ
 ${QMAILDIR}/doc/UPGRADE
 ${QMAILDIR}/doc/SENDMAIL
@@ -187,6 +189,8 @@ ${QMAILDIR}/man/man8/qmail-command.8
 @dirrm ${QMAILDIR}/man/man7
 @dirrm ${QMAILDIR}/man/man8
 @dirrm ${QMAILDIR}/man
+@dirrm ${QMAILDIR}/etc/rc.d
+@dirrm ${QMAILDIR}/etc
 @dirrm ${QMAILDIR}/doc
 @dirrm ${QMAILDIR}/boot
 @dirrm ${QMAILDIR}/bin
diff --git a/mail/qmail/files/mailer.conf b/mail/qmail/files/mailer.conf
new file mode 100644
index 00000000000..20b6ee761ee
--- /dev/null
+++ b/mail/qmail/files/mailer.conf
@@ -0,0 +1,6 @@
+#	$NetBSD: mailer.conf,v 1.1 2002/07/28 01:54:37 schmonz Exp $
+#
+# Use "qmail" as replacement for "sendmail".
+#
+sendmail	@QMAILDIR@/bin/sendmail
+send-mail	@QMAILDIR@/bin/sendmail
diff --git a/mail/qmail/files/qmail.sh b/mail/qmail/files/qmail.sh
new file mode 100644
index 00000000000..fd39ac811b8
--- /dev/null
+++ b/mail/qmail/files/qmail.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# $NetBSD: qmail.sh,v 1.1 2002/07/28 01:54:37 schmonz Exp $
+#
+
+# PROVIDE: mail
+# REQUIRE: LOGIN
+
+. /etc/rc.subr
+
+name="qmail"
+rcvar=${name}
+required_files="@QMAILDIR@/rc @QMAILDIR@/control/me"
+command="@QMAILDIR@/bin/qmail-send"
+start_precmd="qmail_precmd"
+extra_commands="reload"
+
+qmail_precmd()
+{
+	command="@QMAILDIR@/rc"
+	command_args="&"
+}
+
+load_rc_config $name
+run_rc_command "$1"