2 files changed, 159 insertions, 4 deletions

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 4439543e800d..ee5c771d16a2 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 May 1998
 # Whom:			Mario S F Ferreira <lioux@gns.com.br> et al.
 #
-# $Id: Makefile,v 1.5 1998/07/25 21:49:36 hoek Exp $
+# $Id: Makefile,v 1.6 1998/07/28 00:54:03 hoek Exp $
 #
 
 DISTNAME=	qmail-1.03
@@ -45,6 +45,8 @@ MAN8=	qmail-local.8 qmail-lspawn.8 qmail-getpw.8 qmail-remote.8 \
 	qmail-tcpto.8 qmail-pop3d.8 qmail-popup.8 qmail-qmqpc.8 qmail-qmqpd.8 \
 	qmail-qmtpd.8 qmail-smtpd.8 qmail-command.8
 
+PLIST_SUB=	DOCDIR=${DOCDIR}
+
 DOCFILES=	${WRKSRC}/BLURB ${WRKSRC}/BLURB2 ${WRKSRC}/BLURB3 \
 		${WRKSRC}/BLURB4 ${WRKSRC}/INTERNALS ${WRKSRC}/SECURITY \
 		${WRKSRC}/THOUGHTS ${FILESDIR}/PORT_NOTES
@@ -74,8 +76,6 @@ BOOTFILES+=	${FILESDIR}/maildir
 CONFIGUREFILES=	${WRKSRC}/install ${WRKSRC}/dnsfq ${WRKSRC}/hostname \
 		${WRKSRC}/dnsip ${WRKSRC}/ipmeprint ${WRKSRC}/dnsptr
 
-PLIST=	${WRKDIR}/PLIST
-
 .if (${PREFIX} == "/usr/local")
 DOCDIR=	share/doc/qmail
 .else
@@ -92,7 +92,6 @@ do-configure:
 	@PKG_PREFIX=${PREFIX} /usr/bin/perl ${PKGDIR}/INSTALL
 	@${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
 	@${ECHO} ${PREFIX} > ${WRKSRC}/conf-qmail
-	@${SED} s+@DOCDIR@+${DOCDIR}+g ${FILESDIR}/pkg.PLIST > ${PLIST}
 
 post-patch: thereal-post-patch
 
diff --git a/mail/qmail/pkg-plist b/mail/qmail/pkg-plist
new file mode 100644
index 000000000000..b6e05e93959d
--- /dev/null
+++ b/mail/qmail/pkg-plist
@@ -0,0 +1,156 @@
+%%DOCDIR%%/FAQ
+%%DOCDIR%%/UPGRADE
+%%DOCDIR%%/SENDMAIL
+%%DOCDIR%%/INSTALL
+%%DOCDIR%%/INSTALL.alias
+%%DOCDIR%%/INSTALL.ctl
+%%DOCDIR%%/INSTALL.ids
+%%DOCDIR%%/INSTALL.maildir
+%%DOCDIR%%/INSTALL.mbox
+%%DOCDIR%%/INSTALL.vsm
+%%DOCDIR%%/TEST.deliver
+%%DOCDIR%%/TEST.receive
+%%DOCDIR%%/REMOVE.sendmail
+%%DOCDIR%%/REMOVE.binmail
+%%DOCDIR%%/PIC.local2alias
+%%DOCDIR%%/PIC.local2ext
+%%DOCDIR%%/PIC.local2local
+%%DOCDIR%%/PIC.local2rem
+%%DOCDIR%%/PIC.local2virt
+%%DOCDIR%%/PIC.nullclient
+%%DOCDIR%%/PIC.relaybad
+%%DOCDIR%%/PIC.relaygood
+%%DOCDIR%%/PIC.rem2local
+boot/home
+boot/home+df
+boot/proc
+boot/proc+df
+boot/binm1
+boot/binm1+df
+boot/binm2
+boot/binm2+df
+boot/binm3
+boot/binm3+df
+
+@group qmail
+@mode 04711
+@comment *** NOTE different owner
+@owner qmailq
+bin/qmail-queue
+@owner
+@mode 0700
+bin/qmail-lspawn
+@mode 0700
+bin/qmail-start
+@mode 0711
+bin/qmail-getpw
+@mode 0711
+bin/qmail-local
+@mode 0711
+bin/qmail-remote
+@mode 0711
+bin/qmail-rspawn
+@mode 0711
+bin/qmail-clean
+@mode 0711
+bin/qmail-send
+@mode 0711
+bin/splogger
+@mode 0700
+bin/qmail-newu
+@mode 0700
+bin/qmail-newmrh
+@mode 0711
+bin/qmail-pw2u
+@mode 0755
+bin/qmail-inject
+@mode 0755
+bin/predate
+@mode 0755
+bin/datemail
+@mode 0755
+bin/mailsubj
+@mode 0755
+bin/qmail-showctl
+@mode 0755
+bin/qmail-qread
+@mode 0755
+bin/qmail-qstat
+@mode 0755
+bin/qmail-tcpto
+@mode 0755
+bin/qmail-tcpok
+@mode 0755
+bin/qmail-pop3d
+@mode 0711
+bin/qmail-popup
+@mode 0755
+bin/qmail-qmqpc
+@mode 0755
+bin/qmail-qmqpd
+@mode 0755
+bin/qmail-qmtpd
+@mode 0755
+bin/qmail-smtpd
+@mode 0755
+bin/sendmail
+@mode 0755
+bin/tcp-env
+@mode 0755
+bin/qreceipt
+@mode 0755
+bin/qsmhook
+@mode 0755
+bin/qbiff
+@mode 0755
+bin/forward
+@mode 0755
+bin/preline
+@mode 0755
+bin/condredirect
+@mode 0755
+bin/bouncesaying
+@mode 0755
+bin/except
+@mode 0755
+bin/maildirmake
+@mode 0755
+bin/maildir2mbox
+@mode 0755
+bin/maildirwatch
+@mode 0755
+bin/qail
+@mode 0755
+bin/elq
+@mode 0755
+bin/pinq
+
+@group
+@owner
+@mode
+
+@comment This port installs the following manually (ie. not through qmail-hier)
+configure/install
+configure/config
+configure/dnsfq
+configure/hostname
+configure/dnsip
+configure/ipmeprint
+configure/dnsptr
+%%DOCDIR%%/BLURB
+%%DOCDIR%%/BLURB2
+%%DOCDIR%%/BLURB3
+%%DOCDIR%%/BLURB4
+%%DOCDIR%%/INTERNALS
+%%DOCDIR%%/SECURITY
+%%DOCDIR%%/THOUGHTS
+%%DOCDIR%%/PORT_NOTES
+%%DOCDIR%%/SYSDEPS
+%%DOCDIR%%/mkaliasdir
+boot/maildir
+@dirrm %%DOCDIR%%
+@dirrm configure
+@dirrm boot
+@dirrm bin
+
+@unexec echo "If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." | /usr/bin/fmt