Add some bell and whistles that will enable better support for the

qmail-* skeleton ports inheriting (including) this port

While there, update NO_PACKAGE with a more informative message.
The NO_PACKAGE variable will be inherited by all meta ports

Since qmail-{ldap,mysql,tls} are meta ports sharing qmail's port
code, update qmail distinfo information with new distribution
patches:
	- Add new distinfo information required by updated qmail-ldap
	version 1.03.20010201
	- Add new distinfo for recently added port qmail-tls and
	qmail-mysql

In PLIST, use recently added PORTDOCS variable support

PORTREVISION bump is not necessary.

3 files changed, 72 insertions, 46 deletions

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 3e9997f26bd4..e8b0e2884832 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -16,18 +16,23 @@ MASTER_SITES=	http://cr.yp.to/software/ \
 		ftp://ftp.id.wustl.edu/pub/qmail/
 DISTNAME=	${PORTNAME}-${QMAIL_VERSION}
 
+# qmail-* skeleton ports including this port may not want
+# its patches
+.if !defined (MAIN_QMAIL_PORT_PATCH_BARRIER)
 # 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/ \
+PATCH_SITES+=	http://www.ckdhr.com/ckd/ \
 		${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR?=	lioux
-PATCHFILES?=	qmail-103.patch
+PATCH_SITE_SUBDIR+=	lioux
+PATCHFILES+=	qmail-103.patch
 PATCH_DIST_STRIP+=	-p1
+.endif
 
 MAINTAINER=	lioux@FreeBSD.org
 
-NO_PACKAGE=	Forbidden - we have patches to the distribution.
+NO_PACKAGE=	djb\'s packaging license does not allow non-standard\
+		qmail binary distributions
 
 # A normal qmail installation puts everything into /var/qmail/.
 # If you want to install to /usr/local/, then "/usr/local/qmail" is
@@ -35,6 +40,9 @@ NO_PACKAGE=	Forbidden - we have patches to the distribution.
 PREFIX?=		/var/qmail
 QMAIL_VERSION?=		1.03
 
+# Some programs we use when building/installing the port
+HEAD?=	/usr/bin/head
+
 ALL_TARGET=	default dot-qmail.5 qmail-control.5 qmail-getpw.8 \
 		qmail-limits.7 qmail-newmrh.8 qmail-newu.8 qmail-pw2u.8 \
 		qmail-send.8 qmail-start.8 qmail-users.5
@@ -98,16 +106,32 @@ NO_MTREE=	yes
 .include <bsd.port.pre.mk>
 .endif
 
+pre-fetch: yetanotherone-pre-fetch
+
+# Yet anther ugly hack (used by qmail-* skeleton ports)
+# Permits them to define local targets without braking everything
+# The ugly target name hopefully will avoid name clashing
+.if !target(yetanotherone-pre-fetch)
+yetanotherone-pre-fetch:
+.endif
+
 # If you want to change the qmail users, they must be changed in both
 # work/*/conf-users and pkg/INSTALL.
 
 do-configure:
 	@# Create/Check the necessary groups/users
 	@PKG_PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL}
-	@${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
+	@${ECHO} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@${ECHO} ${PREFIX} > ${WRKSRC}/conf-qmail
 
-post-patch: thereal-post-patch
+post-patch: thereal-post-patch yetanotherone-post-patch
+
+# Yet anther ugly hack (used by qmail-* skeleton ports)
+# Permits them to define local targets without braking everything
+# The ugly target name hopefully will avoid name clashing
+.if !target(yetanotherone-post-patch)
+yetanotherone-post-patch:
+.endif
 
 do-install:
 	@# Check again, just in case (ideally should error if not found)
@@ -158,8 +182,8 @@ thereal-post-patch:
 	then \
 		${CP} $i.sh $i.sh.orig; \
 		(head -c `${EXPR} \`ls -l $i.sh.orig \
-		    | ${AWK} '{print $$5}'\` - 1` $i.sh.orig ; ${ECHO} '&') \
-		    > $i.sh ; \
+			| ${AWK} '{print $$5}'\` - 1` $i.sh.orig ; ${ECHO} '&') \
+			> $i.sh ; \
 	fi
 .endfor
 	@${SED} s!/var/qmail/!${PREFIX}/!g ${FILESDIR}/mailer.conf.sample > \
@@ -226,7 +250,7 @@ enable-qmail: install disable-sendmail
 		${ECHO_MSG} "===> installation breaking your qmail one." ; \
 		${ECHO_MSG} "===> Read the FreeBSD Handbook section on \"make world\"" ; \
 		${ECHO_MSG} "===> if you do not know what I am talking about." ; \
-		${ECHO_MSG} "===> Check http://www.freebsd.org/ for the most" ; \
+		${ECHO_MSG} "===> Check http://www.FreeBSD.org/ for the most" ; \
 		${ECHO_MSG} "===> updated copy of the Handbook." ; \
 	fi
 	@${ECHO_MSG} "===> Do not forget to choose an appropriate qmail startup"
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index 38f16f72ea51..41d8367f73b7 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -1,3 +1,5 @@
 MD5 (qmail-1.03.tar.gz) = 622f65f982e380dbe86e6574f3abcb7c
 MD5 (qmail-103.patch) = 9140ad2b03017145cd7963c84bb24f16
-MD5 (qmail-ldap-1.03-20001201.patch.gz) = 9c290f9bedbe0ee602108cdf74cbd0a4
+MD5 (qmail-ldap-1.03-20010201.patch.gz) = b5616fa91819359846fc00f883631a7a
+MD5 (qmail-mysql-1.1.1.patch) = 6bea6192bc39194bc4dda73def0d20df
+MD5 (tls.patch) = 6cd2d06a4688aa4262e30088bc0ed6e9
diff --git a/mail/qmail/pkg-plist b/mail/qmail/pkg-plist
index 13d33730f3b0..2cc6ce759710 100644
--- a/mail/qmail/pkg-plist
+++ b/mail/qmail/pkg-plist
@@ -1,26 +1,26 @@
-%%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
+%%PORTDOCS%%%%DOCDIR%%/FAQ
+%%PORTDOCS%%%%DOCDIR%%/UPGRADE
+%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
+%%PORTDOCS%%%%DOCDIR%%/INSTALL
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
+%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
+%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
+%%PORTDOCS%%%%DOCDIR%%/TEST.receive
+%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
+%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
+%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
+%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
+%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
+%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
+%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
 boot/home
 boot/home+df
 boot/proc
@@ -138,20 +138,20 @@ 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%%/PORT_NOTES_FreeBSD_40-RELEASE
-%%DOCDIR%%/SYSDEPS
-%%DOCDIR%%/mailer.conf.sample
-%%DOCDIR%%/mkaliasdir
+%%PORTDOCS%%%%DOCDIR%%/BLURB
+%%PORTDOCS%%%%DOCDIR%%/BLURB2
+%%PORTDOCS%%%%DOCDIR%%/BLURB3
+%%PORTDOCS%%%%DOCDIR%%/BLURB4
+%%PORTDOCS%%%%DOCDIR%%/INTERNALS
+%%PORTDOCS%%%%DOCDIR%%/SECURITY
+%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
+%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
+%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
+%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
+%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
+%%PORTDOCS%%%%DOCDIR%%/mkaliasdir
 boot/maildir
-@dirrm %%DOCDIR%%
+%%PORTDOCS%%@dirrm %%DOCDIR%%
 @dirrm configure
 @dirrm boot
 @dirrm bin