Fix pkg/PLIST and prepare this port to be the MASTERDIR for the upcoming

qmail-ldap port.

PR:		18733
Submitted by:	maintainer

3 files changed, 16 insertions, 4 deletions

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 89b22785dfb1..8d9ca67172f2 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -21,8 +21,8 @@ MASTER_SITES=	http://cr.yp.to/software/ \
 # Patch necessary to cope with non-RFC >512 dns entries
 # Since AOL has been using those, the problem has skyrocketed from minor to
 # groundzero. qmail being RFC compliant need to be "fixed" to work with those
-PATCH_SITES=	http://www.ckdhr.com/ckd/
-PATCHFILES=	qmail-103.patch
+PATCH_SITES?=	http://www.ckdhr.com/ckd/
+PATCHFILES?=	qmail-103.patch
 PATCH_DIST_STRIP+=	-p1
 
 MAINTAINER=	lioux@linf.unb.br
@@ -51,7 +51,7 @@ MAN8=	qmail-local.8 qmail-lspawn.8 qmail-getpw.8 qmail-remote.8 \
 
 PLIST_SUB=	DOCDIR=${DOCDIR}
 
-DOCFILES=	${WRKSRC}/BLURB ${WRKSRC}/BLURB2 ${WRKSRC}/BLURB3 \
+DOCFILES+=	${WRKSRC}/BLURB ${WRKSRC}/BLURB2 ${WRKSRC}/BLURB3 \
 		${WRKSRC}/BLURB4 ${WRKSRC}/INTERNALS ${WRKSRC}/SECURITY \
 		${WRKSRC}/THOUGHTS ${FILESDIR}/PORT_NOTES \
 		${FILESDIR}/PORT_NOTES_FreeBSD_40-RELEASE
@@ -82,7 +82,7 @@ CONFIGUREPROGS=	${WRKSRC}/install ${WRKSRC}/dnsfq ${WRKSRC}/hostname \
 		${WRKSRC}/dnsip ${WRKSRC}/ipmeprint ${WRKSRC}/dnsptr
 CONFIGUREFILES=	${WRKSRC}/config ${WRKSRC}/config-fast
 
-.if (${PREFIX} == "/usr/local")
+.if (${PREFIX} == ${LOCALBASE})
 DOCDIR=	share/doc/qmail
 .else
 DOCDIR=	doc
@@ -90,6 +90,10 @@ DOCDIR=	doc
 
 NO_MTREE=	yes
 
+.if !defined(_PREMKINCLUDED)
+.include <bsd.port.pre.mk>
+.endif
+
 # If you want to change the qmail users, they must be changed in both
 # work/*/conf-users and pkg/INSTALL.
 
@@ -136,7 +140,12 @@ do-install:
 	@${ECHO}
 	@${SED} s!/usr/local/!${PREFIX}/!g ${PKGDIR}/MESSAGE | /usr/bin/fmt
 
+# hack to allow slave ports to include bsd.port.pre.mk and then this file
+.if defined(_PREMKINCLUDED)
+.include <bsd.port.post.mk>
+.else
 .include <bsd.port.mk>
+.endif
 
 # Ugh...  ;-)
 thereal-post-patch:
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index 58c19c20dd05..7945db8fc902 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -1,2 +1,3 @@
 MD5 (qmail-1.03.tar.gz) = 622f65f982e380dbe86e6574f3abcb7c
 MD5 (qmail-103.patch) = 9140ad2b03017145cd7963c84bb24f16
+MD5 (qmail-ldap-1.03-20000501.patch.gz) = 3bac26caf4fbbf9a9af1919c60dd9f94
diff --git a/mail/qmail/pkg-plist b/mail/qmail/pkg-plist
index b6e05e93959d..a92bd910698a 100644
--- a/mail/qmail/pkg-plist
+++ b/mail/qmail/pkg-plist
@@ -132,6 +132,7 @@ bin/pinq
 @comment This port installs the following manually (ie. not through qmail-hier)
 configure/install
 configure/config
+configure/config-fast
 configure/dnsfq
 configure/hostname
 configure/dnsip
@@ -145,6 +146,7 @@ configure/dnsptr
 %%DOCDIR%%/SECURITY
 %%DOCDIR%%/THOUGHTS
 %%DOCDIR%%/PORT_NOTES
+%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
 %%DOCDIR%%/SYSDEPS
 %%DOCDIR%%/mkaliasdir
 boot/maildir