Major rewrite of qmail package.

By default (the one set in bsd.pkg.defaults.mk) qmail installs into /var/qmail.
This can be changed by setting QMAILDIR in /etc/mk.conf to another directory,
for example /usr/qmail.

If you want to user non-standard path of installation, make sure to set it in
/etc/mk.conf *before* attempting to install any of qmail packages,
and do not change it in the mean time (if you install qmail with QMAILDIR set to
/var/qmail, change it to another dir and try to install qmail-conf, you will lose).

Slave packages will soon be updated to use this feature.

2 files changed, 199 insertions, 201 deletions

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 0a4499751cf..869e7fa8808 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/01/21 16:00:52 zuntum Exp $
+# $NetBSD: Makefile,v 1.6 2002/01/21 18:45:03 zuntum Exp $
 #
 
 DISTNAME=	qmail-1.03
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=   http://cr.yp.to/software/			\
 		ftp://ftp.ntnu.no/pub/unix/mail/qmail/		\
@@ -27,13 +28,14 @@ ALL_TARGET= 	it man
 INSTALL_TARGET=	setup check
 
 IS_INTERACTIVE=	YES
-NO_PACKAGE=	"Has to be compiled on target system due to installation path issue"
+NO_PACKAGE=	YES
 
-QMAILDIR?=	/var/qmail
+OWN_DIRS+=	${QMAILDIR}
 
-MESSAGE_SUBST+=	QMAILDIR=${QMAILDIR}
+.include "../../mk/bsd.prefs.mk"
 
-OWN_DIRS+=	${QMAILDIR}
+NO_MTREE=	YES
+LOCALBASE=	/
 
 DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
 
@@ -41,9 +43,6 @@ pre-build:
 	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
 	${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
 
-pre-install:
-	${LN} -sf ${QMAILDIR} ${PREFIX}/qmail
-
 post-install:
 	${MKDIR} ${QMAILDIR}/alias
 	cd ${QMAILDIR}/alias && 				\
diff --git a/mail/qmail/PLIST b/mail/qmail/PLIST
index 46051c0adca..21d94d81614 100644
--- a/mail/qmail/PLIST
+++ b/mail/qmail/PLIST
@@ -1,193 +1,192 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:01:11 zuntum Exp $
-qmail/doc/FAQ
-qmail/doc/UPGRADE
-qmail/doc/SENDMAIL
-qmail/doc/INSTALL
-qmail/doc/INSTALL.alias
-qmail/doc/INSTALL.ctl
-qmail/doc/INSTALL.ids
-qmail/doc/INSTALL.maildir
-qmail/doc/INSTALL.mbox
-qmail/doc/INSTALL.vsm
-qmail/doc/TEST.deliver
-qmail/doc/TEST.receive
-qmail/doc/REMOVE.sendmail
-qmail/doc/REMOVE.binmail
-qmail/doc/PIC.local2alias
-qmail/doc/PIC.local2ext
-qmail/doc/PIC.local2local
-qmail/doc/PIC.local2rem
-qmail/doc/PIC.local2virt
-qmail/doc/PIC.nullclient
-qmail/doc/PIC.relaybad
-qmail/doc/PIC.relaygood
-qmail/doc/PIC.rem2local
-qmail/boot/home
-qmail/boot/home+df
-qmail/boot/proc
-qmail/boot/proc+df
-qmail/boot/binm1
-qmail/boot/binm1+df
-qmail/boot/binm2
-qmail/boot/binm2+df
-qmail/boot/binm3
-qmail/boot/binm3+df
-qmail/bin/qmail-queue
-qmail/bin/qmail-lspawn
-qmail/bin/qmail-start
-qmail/bin/qmail-getpw
-qmail/bin/qmail-local
-qmail/bin/qmail-remote
-qmail/bin/qmail-rspawn
-qmail/bin/qmail-clean
-qmail/bin/qmail-send
-qmail/bin/splogger
-qmail/bin/qmail-newu
-qmail/bin/qmail-newmrh
-qmail/bin/qmail-pw2u
-qmail/bin/qmail-inject
-qmail/bin/predate
-qmail/bin/datemail
-qmail/bin/mailsubj
-qmail/bin/qmail-showctl
-qmail/bin/qmail-qread
-qmail/bin/qmail-qstat
-qmail/bin/qmail-tcpto
-qmail/bin/qmail-tcpok
-qmail/bin/qmail-pop3d
-qmail/bin/qmail-popup
-qmail/bin/qmail-qmqpc
-qmail/bin/qmail-qmqpd
-qmail/bin/qmail-qmtpd
-qmail/bin/qmail-smtpd
-qmail/bin/sendmail
-qmail/bin/tcp-env
-qmail/bin/qreceipt
-qmail/bin/qsmhook
-qmail/bin/qbiff
-qmail/bin/forward
-qmail/bin/preline
-qmail/bin/condredirect
-qmail/bin/bouncesaying
-qmail/bin/except
-qmail/bin/maildirmake
-qmail/bin/maildir2mbox
-qmail/bin/maildirwatch
-qmail/bin/qail
-qmail/bin/elq
-qmail/bin/pinq
-qmail/man/cat1/forward.0
-qmail/man/cat1/condredirect.0
-qmail/man/cat1/bouncesaying.0
-qmail/man/cat1/except.0
-qmail/man/cat1/maildirmake.0
-qmail/man/cat1/maildir2mbox.0
-qmail/man/cat1/maildirwatch.0
-qmail/man/cat1/mailsubj.0
-qmail/man/cat1/qreceipt.0
-qmail/man/cat1/qbiff.0
-qmail/man/cat1/preline.0
-qmail/man/cat1/tcp-env.0
-qmail/man/cat5/addresses.0
-qmail/man/cat5/envelopes.0
-qmail/man/cat5/maildir.0
-qmail/man/cat5/mbox.0
-qmail/man/cat5/dot-qmail.0
-qmail/man/cat5/qmail-control.0
-qmail/man/cat5/qmail-header.0
-qmail/man/cat5/qmail-log.0
-qmail/man/cat5/qmail-users.0
-qmail/man/cat5/tcp-environ.0
-qmail/man/cat7/forgeries.0
-qmail/man/cat7/qmail-limits.0
-qmail/man/cat7/qmail.0
-qmail/man/cat8/qmail-local.0
-qmail/man/cat8/qmail-lspawn.0
-qmail/man/cat8/qmail-getpw.0
-qmail/man/cat8/qmail-remote.0
-qmail/man/cat8/qmail-rspawn.0
-qmail/man/cat8/qmail-clean.0
-qmail/man/cat8/qmail-send.0
-qmail/man/cat8/qmail-start.0
-qmail/man/cat8/splogger.0
-qmail/man/cat8/qmail-queue.0
-qmail/man/cat8/qmail-inject.0
-qmail/man/cat8/qmail-showctl.0
-qmail/man/cat8/qmail-newmrh.0
-qmail/man/cat8/qmail-newu.0
-qmail/man/cat8/qmail-pw2u.0
-qmail/man/cat8/qmail-qread.0
-qmail/man/cat8/qmail-qstat.0
-qmail/man/cat8/qmail-tcpok.0
-qmail/man/cat8/qmail-tcpto.0
-qmail/man/cat8/qmail-pop3d.0
-qmail/man/cat8/qmail-popup.0
-qmail/man/cat8/qmail-qmqpc.0
-qmail/man/cat8/qmail-qmqpd.0
-qmail/man/cat8/qmail-qmtpd.0
-qmail/man/cat8/qmail-smtpd.0
-qmail/man/cat8/qmail-command.0
-qmail/man/man1/forward.1
-qmail/man/man1/condredirect.1
-qmail/man/man1/bouncesaying.1
-qmail/man/man1/except.1
-qmail/man/man1/maildirmake.1
-qmail/man/man1/maildir2mbox.1
-qmail/man/man1/maildirwatch.1
-qmail/man/man1/mailsubj.1
-qmail/man/man1/qreceipt.1
-qmail/man/man1/qbiff.1
-qmail/man/man1/preline.1
-qmail/man/man1/tcp-env.1
-qmail/man/man5/addresses.5
-qmail/man/man5/envelopes.5
-qmail/man/man5/maildir.5
-qmail/man/man5/mbox.5
-qmail/man/man5/dot-qmail.5
-qmail/man/man5/qmail-control.5
-qmail/man/man5/qmail-header.5
-qmail/man/man5/qmail-log.5
-qmail/man/man5/qmail-users.5
-qmail/man/man5/tcp-environ.5
-qmail/man/man7/forgeries.7
-qmail/man/man7/qmail-limits.7
-qmail/man/man7/qmail.7
-qmail/man/man8/qmail-local.8
-qmail/man/man8/qmail-lspawn.8
-qmail/man/man8/qmail-getpw.8
-qmail/man/man8/qmail-remote.8
-qmail/man/man8/qmail-rspawn.8
-qmail/man/man8/qmail-clean.8
-qmail/man/man8/qmail-send.8
-qmail/man/man8/qmail-start.8
-qmail/man/man8/splogger.8
-qmail/man/man8/qmail-queue.8
-qmail/man/man8/qmail-inject.8
-qmail/man/man8/qmail-showctl.8
-qmail/man/man8/qmail-newmrh.8
-qmail/man/man8/qmail-newu.8
-qmail/man/man8/qmail-pw2u.8
-qmail/man/man8/qmail-qread.8
-qmail/man/man8/qmail-qstat.8
-qmail/man/man8/qmail-tcpok.8
-qmail/man/man8/qmail-tcpto.8
-qmail/man/man8/qmail-pop3d.8
-qmail/man/man8/qmail-popup.8
-qmail/man/man8/qmail-qmqpc.8
-qmail/man/man8/qmail-qmqpd.8
-qmail/man/man8/qmail-qmtpd.8
-qmail/man/man8/qmail-smtpd.8
-qmail/man/man8/qmail-command.8
-@dirrm qmail/man/cat1
-@dirrm qmail/man/cat5
-@dirrm qmail/man/cat7
-@dirrm qmail/man/cat8
-@dirrm qmail/man/man1
-@dirrm qmail/man/man5
-@dirrm qmail/man/man7
-@dirrm qmail/man/man8
-@dirrm qmail/man
-@dirrm qmail/doc
-@dirrm qmail/boot
-@dirrm qmail/bin
-qmail
+@comment $NetBSD: PLIST,v 1.2 2002/01/21 18:45:04 zuntum Exp $
+${QMAILDIR}/doc/FAQ
+${QMAILDIR}/doc/UPGRADE
+${QMAILDIR}/doc/SENDMAIL
+${QMAILDIR}/doc/INSTALL
+${QMAILDIR}/doc/INSTALL.alias
+${QMAILDIR}/doc/INSTALL.ctl
+${QMAILDIR}/doc/INSTALL.ids
+${QMAILDIR}/doc/INSTALL.maildir
+${QMAILDIR}/doc/INSTALL.mbox
+${QMAILDIR}/doc/INSTALL.vsm
+${QMAILDIR}/doc/TEST.deliver
+${QMAILDIR}/doc/TEST.receive
+${QMAILDIR}/doc/REMOVE.sendmail
+${QMAILDIR}/doc/REMOVE.binmail
+${QMAILDIR}/doc/PIC.local2alias
+${QMAILDIR}/doc/PIC.local2ext
+${QMAILDIR}/doc/PIC.local2local
+${QMAILDIR}/doc/PIC.local2rem
+${QMAILDIR}/doc/PIC.local2virt
+${QMAILDIR}/doc/PIC.nullclient
+${QMAILDIR}/doc/PIC.relaybad
+${QMAILDIR}/doc/PIC.relaygood
+${QMAILDIR}/doc/PIC.rem2local
+${QMAILDIR}/boot/home
+${QMAILDIR}/boot/home+df
+${QMAILDIR}/boot/proc
+${QMAILDIR}/boot/proc+df
+${QMAILDIR}/boot/binm1
+${QMAILDIR}/boot/binm1+df
+${QMAILDIR}/boot/binm2
+${QMAILDIR}/boot/binm2+df
+${QMAILDIR}/boot/binm3
+${QMAILDIR}/boot/binm3+df
+${QMAILDIR}/bin/qmail-queue
+${QMAILDIR}/bin/qmail-lspawn
+${QMAILDIR}/bin/qmail-start
+${QMAILDIR}/bin/qmail-getpw
+${QMAILDIR}/bin/qmail-local
+${QMAILDIR}/bin/qmail-remote
+${QMAILDIR}/bin/qmail-rspawn
+${QMAILDIR}/bin/qmail-clean
+${QMAILDIR}/bin/qmail-send
+${QMAILDIR}/bin/splogger
+${QMAILDIR}/bin/qmail-newu
+${QMAILDIR}/bin/qmail-newmrh
+${QMAILDIR}/bin/qmail-pw2u
+${QMAILDIR}/bin/qmail-inject
+${QMAILDIR}/bin/predate
+${QMAILDIR}/bin/datemail
+${QMAILDIR}/bin/mailsubj
+${QMAILDIR}/bin/qmail-showctl
+${QMAILDIR}/bin/qmail-qread
+${QMAILDIR}/bin/qmail-qstat
+${QMAILDIR}/bin/qmail-tcpto
+${QMAILDIR}/bin/qmail-tcpok
+${QMAILDIR}/bin/qmail-pop3d
+${QMAILDIR}/bin/qmail-popup
+${QMAILDIR}/bin/qmail-qmqpc
+${QMAILDIR}/bin/qmail-qmqpd
+${QMAILDIR}/bin/qmail-qmtpd
+${QMAILDIR}/bin/qmail-smtpd
+${QMAILDIR}/bin/sendmail
+${QMAILDIR}/bin/tcp-env
+${QMAILDIR}/bin/qreceipt
+${QMAILDIR}/bin/qsmhook
+${QMAILDIR}/bin/qbiff
+${QMAILDIR}/bin/forward
+${QMAILDIR}/bin/preline
+${QMAILDIR}/bin/condredirect
+${QMAILDIR}/bin/bouncesaying
+${QMAILDIR}/bin/except
+${QMAILDIR}/bin/maildirmake
+${QMAILDIR}/bin/maildir2mbox
+${QMAILDIR}/bin/maildirwatch
+${QMAILDIR}/bin/qail
+${QMAILDIR}/bin/elq
+${QMAILDIR}/bin/pinq
+${QMAILDIR}/man/cat1/forward.0
+${QMAILDIR}/man/cat1/condredirect.0
+${QMAILDIR}/man/cat1/bouncesaying.0
+${QMAILDIR}/man/cat1/except.0
+${QMAILDIR}/man/cat1/maildirmake.0
+${QMAILDIR}/man/cat1/maildir2mbox.0
+${QMAILDIR}/man/cat1/maildirwatch.0
+${QMAILDIR}/man/cat1/mailsubj.0
+${QMAILDIR}/man/cat1/qreceipt.0
+${QMAILDIR}/man/cat1/qbiff.0
+${QMAILDIR}/man/cat1/preline.0
+${QMAILDIR}/man/cat1/tcp-env.0
+${QMAILDIR}/man/cat5/addresses.0
+${QMAILDIR}/man/cat5/envelopes.0
+${QMAILDIR}/man/cat5/maildir.0
+${QMAILDIR}/man/cat5/mbox.0
+${QMAILDIR}/man/cat5/dot-qmail.0
+${QMAILDIR}/man/cat5/qmail-control.0
+${QMAILDIR}/man/cat5/qmail-header.0
+${QMAILDIR}/man/cat5/qmail-log.0
+${QMAILDIR}/man/cat5/qmail-users.0
+${QMAILDIR}/man/cat5/tcp-environ.0
+${QMAILDIR}/man/cat7/forgeries.0
+${QMAILDIR}/man/cat7/qmail-limits.0
+${QMAILDIR}/man/cat7/qmail.0
+${QMAILDIR}/man/cat8/qmail-local.0
+${QMAILDIR}/man/cat8/qmail-lspawn.0
+${QMAILDIR}/man/cat8/qmail-getpw.0
+${QMAILDIR}/man/cat8/qmail-remote.0
+${QMAILDIR}/man/cat8/qmail-rspawn.0
+${QMAILDIR}/man/cat8/qmail-clean.0
+${QMAILDIR}/man/cat8/qmail-send.0
+${QMAILDIR}/man/cat8/qmail-start.0
+${QMAILDIR}/man/cat8/splogger.0
+${QMAILDIR}/man/cat8/qmail-queue.0
+${QMAILDIR}/man/cat8/qmail-inject.0
+${QMAILDIR}/man/cat8/qmail-showctl.0
+${QMAILDIR}/man/cat8/qmail-newmrh.0
+${QMAILDIR}/man/cat8/qmail-newu.0
+${QMAILDIR}/man/cat8/qmail-pw2u.0
+${QMAILDIR}/man/cat8/qmail-qread.0
+${QMAILDIR}/man/cat8/qmail-qstat.0
+${QMAILDIR}/man/cat8/qmail-tcpok.0
+${QMAILDIR}/man/cat8/qmail-tcpto.0
+${QMAILDIR}/man/cat8/qmail-pop3d.0
+${QMAILDIR}/man/cat8/qmail-popup.0
+${QMAILDIR}/man/cat8/qmail-qmqpc.0
+${QMAILDIR}/man/cat8/qmail-qmqpd.0
+${QMAILDIR}/man/cat8/qmail-qmtpd.0
+${QMAILDIR}/man/cat8/qmail-smtpd.0
+${QMAILDIR}/man/cat8/qmail-command.0
+${QMAILDIR}/man/man1/forward.1
+${QMAILDIR}/man/man1/condredirect.1
+${QMAILDIR}/man/man1/bouncesaying.1
+${QMAILDIR}/man/man1/except.1
+${QMAILDIR}/man/man1/maildirmake.1
+${QMAILDIR}/man/man1/maildir2mbox.1
+${QMAILDIR}/man/man1/maildirwatch.1
+${QMAILDIR}/man/man1/mailsubj.1
+${QMAILDIR}/man/man1/qreceipt.1
+${QMAILDIR}/man/man1/qbiff.1
+${QMAILDIR}/man/man1/preline.1
+${QMAILDIR}/man/man1/tcp-env.1
+${QMAILDIR}/man/man5/addresses.5
+${QMAILDIR}/man/man5/envelopes.5
+${QMAILDIR}/man/man5/maildir.5
+${QMAILDIR}/man/man5/mbox.5
+${QMAILDIR}/man/man5/dot-qmail.5
+${QMAILDIR}/man/man5/qmail-control.5
+${QMAILDIR}/man/man5/qmail-header.5
+${QMAILDIR}/man/man5/qmail-log.5
+${QMAILDIR}/man/man5/qmail-users.5
+${QMAILDIR}/man/man5/tcp-environ.5
+${QMAILDIR}/man/man7/forgeries.7
+${QMAILDIR}/man/man7/qmail-limits.7
+${QMAILDIR}/man/man7/qmail.7
+${QMAILDIR}/man/man8/qmail-local.8
+${QMAILDIR}/man/man8/qmail-lspawn.8
+${QMAILDIR}/man/man8/qmail-getpw.8
+${QMAILDIR}/man/man8/qmail-remote.8
+${QMAILDIR}/man/man8/qmail-rspawn.8
+${QMAILDIR}/man/man8/qmail-clean.8
+${QMAILDIR}/man/man8/qmail-send.8
+${QMAILDIR}/man/man8/qmail-start.8
+${QMAILDIR}/man/man8/splogger.8
+${QMAILDIR}/man/man8/qmail-queue.8
+${QMAILDIR}/man/man8/qmail-inject.8
+${QMAILDIR}/man/man8/qmail-showctl.8
+${QMAILDIR}/man/man8/qmail-newmrh.8
+${QMAILDIR}/man/man8/qmail-newu.8
+${QMAILDIR}/man/man8/qmail-pw2u.8
+${QMAILDIR}/man/man8/qmail-qread.8
+${QMAILDIR}/man/man8/qmail-qstat.8
+${QMAILDIR}/man/man8/qmail-tcpok.8
+${QMAILDIR}/man/man8/qmail-tcpto.8
+${QMAILDIR}/man/man8/qmail-pop3d.8
+${QMAILDIR}/man/man8/qmail-popup.8
+${QMAILDIR}/man/man8/qmail-qmqpc.8
+${QMAILDIR}/man/man8/qmail-qmqpd.8
+${QMAILDIR}/man/man8/qmail-qmtpd.8
+${QMAILDIR}/man/man8/qmail-smtpd.8
+${QMAILDIR}/man/man8/qmail-command.8
+@dirrm ${QMAILDIR}/man/cat1
+@dirrm ${QMAILDIR}/man/cat5
+@dirrm ${QMAILDIR}/man/cat7
+@dirrm ${QMAILDIR}/man/cat8
+@dirrm ${QMAILDIR}/man/man1
+@dirrm ${QMAILDIR}/man/man5
+@dirrm ${QMAILDIR}/man/man7
+@dirrm ${QMAILDIR}/man/man8
+@dirrm ${QMAILDIR}/man
+@dirrm ${QMAILDIR}/doc
+@dirrm ${QMAILDIR}/boot
+@dirrm ${QMAILDIR}/bin