Cleanup around NOPORTDOCS.

Submitted by:	yds@dppl.com
PR:		ports/24595

3 files changed, 78 insertions, 9 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 37ece93129a2..daf07ba0a104 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	postfix
+# New ports collection makefile for:	postfix-current
 # Date created: 	18 Mar 1999
 # Whom:			torstenb
 #
@@ -45,7 +45,12 @@ BIN1=	bounce cleanup error flush lmtp local master nqmgr pickup \
 BIN2=	postalias postcat postconf postdrop postfix \
 	postkick postlock postlog postmap postsuper sendmail
 
-DOCDIR=	${PREFIX}/share/doc/postfix
+.if defined(NOPORTDOCS)
+PLIST_SUB+=	SUB_DOCS="@comment "
+.else
+PLIST_SUB+=	SUB_DOCS=""
+DOCDIR=		${PREFIX}/share/doc/postfix
+.endif
 
 .if !defined(DEBUG)
 MAKEFILEFLAGS+=	DEBUG=
@@ -132,11 +137,11 @@ do-install:
 		${PREFIX}/man/man8
 .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}"
-#.endif
+.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}"
+.endif
 
 	@${ECHO_MSG} '--------------------------------------------------'
 	@${ECHO_MSG} '- To replace your existing sendmail with postfix -'
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index 02b4507487ee..95e7fc7a8c3b 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -62,5 +62,65 @@ sbin/postdrop
 sbin/sendmail
 %%SUB_TEST%%sbin/smtp-sink
 %%SUB_TEST%%sbin/smtp-source
-@dirrm etc/postfix
+%%SUB_DOCS%%share/doc/postfix/access.5.html
+%%SUB_DOCS%%share/doc/postfix/aliases.5.html
+%%SUB_DOCS%%share/doc/postfix/architecture.html
+%%SUB_DOCS%%share/doc/postfix/backstage.html
+%%SUB_DOCS%%share/doc/postfix/basic.html
+%%SUB_DOCS%%share/doc/postfix/big-picture.gif
+%%SUB_DOCS%%share/doc/postfix/big-picture.html
+%%SUB_DOCS%%share/doc/postfix/bounce.8.html
+%%SUB_DOCS%%share/doc/postfix/canonical.5.html
+%%SUB_DOCS%%share/doc/postfix/cleanup.8.html
+%%SUB_DOCS%%share/doc/postfix/commands.html
+%%SUB_DOCS%%share/doc/postfix/defer.8.html
+%%SUB_DOCS%%share/doc/postfix/delivering.html
+%%SUB_DOCS%%share/doc/postfix/error.8.html
+%%SUB_DOCS%%share/doc/postfix/faq.html
+%%SUB_DOCS%%share/doc/postfix/flush.8.html
+%%SUB_DOCS%%share/doc/postfix/goals.html
+%%SUB_DOCS%%share/doc/postfix/inbound.gif
+%%SUB_DOCS%%share/doc/postfix/index.html
+%%SUB_DOCS%%share/doc/postfix/lmtp.8.html
+%%SUB_DOCS%%share/doc/postfix/local.8.html
+%%SUB_DOCS%%share/doc/postfix/mailq.1.html
+%%SUB_DOCS%%share/doc/postfix/master.8.html
+%%SUB_DOCS%%share/doc/postfix/motivation.html
+%%SUB_DOCS%%share/doc/postfix/newaliases.1.html
+%%SUB_DOCS%%share/doc/postfix/nqmgr.8.html
+%%SUB_DOCS%%share/doc/postfix/outbound.gif
+%%SUB_DOCS%%share/doc/postfix/pcre_table.5.html
+%%SUB_DOCS%%share/doc/postfix/pickup.8.html
+%%SUB_DOCS%%share/doc/postfix/pipe.8.html
+%%SUB_DOCS%%share/doc/postfix/postalias.1.html
+%%SUB_DOCS%%share/doc/postfix/postcat.1.html
+%%SUB_DOCS%%share/doc/postfix/postconf.1.html
+%%SUB_DOCS%%share/doc/postfix/postdrop.1.html
+%%SUB_DOCS%%share/doc/postfix/postfix.1.html
+%%SUB_DOCS%%share/doc/postfix/postkick.1.html
+%%SUB_DOCS%%share/doc/postfix/postlock.1.html
+%%SUB_DOCS%%share/doc/postfix/postlog.1.html
+%%SUB_DOCS%%share/doc/postfix/postmap.1.html
+%%SUB_DOCS%%share/doc/postfix/postsuper.1.html
+%%SUB_DOCS%%share/doc/postfix/qmgr.8.html
+%%SUB_DOCS%%share/doc/postfix/queuing.html
+%%SUB_DOCS%%share/doc/postfix/rate.html
+%%SUB_DOCS%%share/doc/postfix/receiving.html
+%%SUB_DOCS%%share/doc/postfix/regexp_table.5.html
+%%SUB_DOCS%%share/doc/postfix/relocated.5.html
+%%SUB_DOCS%%share/doc/postfix/resource.html
+%%SUB_DOCS%%share/doc/postfix/rewrite.html
+%%SUB_DOCS%%share/doc/postfix/security.html
+%%SUB_DOCS%%share/doc/postfix/sendmail.1.html
+%%SUB_DOCS%%share/doc/postfix/showq.8.html
+%%SUB_DOCS%%share/doc/postfix/small-picture.gif
+%%SUB_DOCS%%share/doc/postfix/smtp.8.html
+%%SUB_DOCS%%share/doc/postfix/smtpd.8.html
+%%SUB_DOCS%%share/doc/postfix/spawn.8.html
+%%SUB_DOCS%%share/doc/postfix/transport.5.html
+%%SUB_DOCS%%share/doc/postfix/trivial-rewrite.8.html
+%%SUB_DOCS%%share/doc/postfix/uce.html
+%%SUB_DOCS%%share/doc/postfix/virtual.5.html
+%%SUB_DOCS%%@dirrm share/doc/postfix
 @dirrm libexec/postfix
+@dirrm etc/postfix
diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix
index 849cb4c70dcf..4c67e1be275f 100644
--- a/mail/postfix-current/scripts/configure.postfix
+++ b/mail/postfix-current/scripts/configure.postfix
@@ -112,4 +112,8 @@ while [ "$1" ]; do
 	shift
 done
 
-echo "PLIST_SUB=	SUB_PCRE=\"${SUB_PCRE}\" SUB_SASL=\"${SUB_SASL}\" SUB_TLS=\"${SUB_TLS}\" SUB_LDAP=\"${SUB_LDAP}\" SUB_TEST=\"${SUB_TEST}\""
+echo "PLIST_SUB+=	SUB_PCRE=\"${SUB_PCRE}\""
+echo "PLIST_SUB+=	SUB_SASL=\"${SUB_SASL}\""
+echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
+echo "PLIST_SUB+=	SUB_LDAP=\"${SUB_LDAP}\""
+echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""