Rename ${DOCDIR} to ${DOCSDIR} which is defined in bsd.port.mk

Delete ${DOCDIR}= due to above
Add QMQP P and VERP elm support
Add Previously missing extra DOCS
Bump PORTREVISION

PR:		30246
Submitted by:	Matthias Andree

3 files changed, 44 insertions, 11 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index c8f89f2b63d1..6dc4a5de5936 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	20010808
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
@@ -29,7 +29,7 @@ MAN5=	access.5 aliases.5 canonical.5 regexp_table.5 relocated.5 \
 	transport.5 virtual.5
 
 MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 showq.8 smtp.8 \
+	master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \
 	smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
 
 CONF1=	access aliases canonical main.cf master.cf \
@@ -37,21 +37,27 @@ CONF1=	access aliases canonical main.cf master.cf \
 
 CONF2=	sample-aliases.cf sample-canonical.cf sample-debug.cf \
 	sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
+	sample-qmqpd.cf \
 	sample-rate.cf sample-regexp.cf sample-relocated.cf \
 	sample-resource.cf sample-rewrite.cf sample-smtp.cf \
 	sample-smtpd.cf sample-transport.cf sample-virtual.cf
 
 BIN1=	bounce cleanup error flush lmtp local master nqmgr pickup \
-	pipe qmgr showq smtp smtpd spawn trivial-rewrite virtual
+	pipe qmgr qmqpd showq smtp smtpd spawn trivial-rewrite virtual
 
 BIN2=	postalias postcat postconf postdrop postfix \
 	postkick postlock postlog postmap postsuper sendmail
 
+DOC1=	0README COMPATIBILITY DB_README DEBUG_README ETRN_README \
+	FILTER_README HISTORY INSTALL LDAP_README LICENSE LINUX_README \
+	LMTP_README MACOSX_README MYSQL_README PCRE_README PORTING \
+	QMQP_README RELEASE_NOTES SASL_README TODO ULTRIX_README UUCP_README \
+	VERP_README VIRTUAL_README 
+
 .if defined(NOPORTDOCS)
 PLIST_SUB+=	SUB_DOCS="@comment "
 .else
 PLIST_SUB+=	SUB_DOCS=""
-DOCDIR=		${PREFIX}/share/doc/postfix
 .endif
 
 .if !defined(DEBUG)
@@ -142,9 +148,12 @@ do-install:
 .endfor
 
 .if !defined(NOPORTDOCS)
-	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCDIR}
-	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCDIR} && \
-		${ECHO_MSG} "Installed HTML documentation in ${DOCDIR}"
+	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
+	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \
+		${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
+	@cd ${WRKSRC} && for i in ${DOC1} ; do \
+		${INSTALL_DATA} $$i ${DOCSDIR} ; done && \
+		${ECHO_MSG} "Installed text documentation in ${DOCSDIR}"
 .endif
 
 	@${ECHO_MSG} '--------------------------------------------------'
diff --git a/mail/postfix-current/pkg-descr b/mail/postfix-current/pkg-descr
index e1c988998f55..1f335ce6820c 100644
--- a/mail/postfix-current/pkg-descr
+++ b/mail/postfix-current/pkg-descr
@@ -1,8 +1,6 @@
 Postfix attempts to be fast, easy to administer, and secure, while at
 the same time being sendmail-compatible enough to not upset existing
-users.
+users. It also offers QMQP and VERP support to let Postfix act as delivery
+daemon for ezmlm-idx.
 
 WWW: http://www.postfix.org/
-
-- Omachonu Ogali
-oogali@intranova.net
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index 791b5f5b6592..d146b0bb6b61 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -19,6 +19,7 @@ etc/postfix/sample-master.cf
 etc/postfix/sample-misc.cf
 %%SUB_PCRE%%etc/postfix/sample-pcre.cf
 %%SUB_PCRE%%etc/postfix/sample-pcre_table
+etc/postfix/sample-qmqpd.cf
 etc/postfix/sample-rate.cf
 etc/postfix/sample-regexp.cf
 etc/postfix/sample-regexp_table
@@ -44,6 +45,7 @@ libexec/postfix/nqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
 libexec/postfix/qmgr
+libexec/postfix/qmqpd
 libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
@@ -64,6 +66,30 @@ sbin/postdrop
 sbin/sendmail
 %%SUB_TEST%%sbin/smtp-sink
 %%SUB_TEST%%sbin/smtp-source
+%%SUB_DOCS%%share/doc/postfix/0README
+%%SUB_DOCS%%share/doc/postfix/COMPATIBILITY
+%%SUB_DOCS%%share/doc/postfix/DB_README
+%%SUB_DOCS%%share/doc/postfix/DEBUG_README
+%%SUB_DOCS%%share/doc/postfix/ETRN_README
+%%SUB_DOCS%%share/doc/postfix/FILTER_README
+%%SUB_DOCS%%share/doc/postfix/HISTORY
+%%SUB_DOCS%%share/doc/postfix/INSTALL
+%%SUB_DOCS%%share/doc/postfix/LDAP_README
+%%SUB_DOCS%%share/doc/postfix/LICENSE
+%%SUB_DOCS%%share/doc/postfix/LINUX_README
+%%SUB_DOCS%%share/doc/postfix/LMTP_README
+%%SUB_DOCS%%share/doc/postfix/MACOSX_README
+%%SUB_DOCS%%share/doc/postfix/MYSQL_README
+%%SUB_DOCS%%share/doc/postfix/PCRE_README
+%%SUB_DOCS%%share/doc/postfix/PORTING
+%%SUB_DOCS%%share/doc/postfix/QMQP_README
+%%SUB_DOCS%%share/doc/postfix/RELEASE_NOTES
+%%SUB_DOCS%%share/doc/postfix/SASL_README
+%%SUB_DOCS%%share/doc/postfix/TODO
+%%SUB_DOCS%%share/doc/postfix/ULTRIX_README
+%%SUB_DOCS%%share/doc/postfix/UUCP_README
+%%SUB_DOCS%%share/doc/postfix/VERP_README
+%%SUB_DOCS%%share/doc/postfix/VIRTUAL_README
 %%SUB_DOCS%%share/doc/postfix/access.5.html
 %%SUB_DOCS%%share/doc/postfix/aliases.5.html
 %%SUB_DOCS%%share/doc/postfix/architecture.html