Upgrade to latest version, fix PR 16472, 16753, 17078 too.

PR:		ports/17749
Submitted by:	Martti Kuparinen <martti.kuparinen@piuha.net>

4 files changed, 73 insertions, 6 deletions

diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index bc3a5c4c17be..1b2570425812 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -6,8 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=	postfix-19991231-pl04
-PKGNAME=	postfix-19991231.04
+DISTNAME=	postfix-19991231-pl06
+PKGNAME=	postfix-19991231.06
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
@@ -47,7 +47,8 @@ MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
 MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
 	showq.8 smtp.8 smtpd.8 trivial-rewrite.8 error.8
 
-SHAREMODE=	0644
+SHAREMODE=	0444
+PDOC=		${PREFIX}/share/doc/postfix
 
 do-install:
 	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
@@ -93,6 +94,10 @@ do-install:
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
 			${PREFIX}/man/man8/$$f ;\
 	done
+	@${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${PDOC}
+	@cd ${WRKSRC} && ${INSTALL_DATA} \
+		html/*.html html/*.gif ${PDOC} && \
+		${ECHO_MSG} "Installed HTML documentation in ${PDOC}"
 	@${MKDIR} -m 0755 /var/spool/postfix
 	@${ECHO_MSG} "--------------------------------------------------"
 	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
diff --git a/mail/postfix20/distinfo b/mail/postfix20/distinfo
index b81e8ba3c9ee..92c3c8543aa4 100644
--- a/mail/postfix20/distinfo
+++ b/mail/postfix20/distinfo
@@ -1 +1 @@
-MD5 (postfix-19991231-pl04.tar.gz) = 4a57993049e0e1a092494272398a78e7
+MD5 (postfix-19991231-pl06.tar.gz) = 7630d7466569c08f1fdf7c437cef0a14
diff --git a/mail/postfix20/files/patch-bj b/mail/postfix20/files/patch-bj
index 74e5aac880bf..99c521341ca5 100644
--- a/mail/postfix20/files/patch-bj
+++ b/mail/postfix20/files/patch-bj
@@ -1,5 +1,5 @@
---- makedefs.orig	Sat Jan 22 14:04:27 2000
-+++ makedefs	Sat Mar 25 09:04:50 2000
+--- makedefs.orig	Sun Jan 23 03:04:27 2000
++++ makedefs	Mon Apr  3 08:59:17 2000
 @@ -89,6 +89,8 @@
  		;;
    FreeBSD.4*)	SYSTYPE=FREEBSD4
@@ -9,3 +9,12 @@
    OpenBSD.2*)	SYSTYPE=OPENBSD2
  		;;
     NetBSD.1*)	SYSTYPE=NETBSD1
+@@ -244,7 +246,7 @@
+         *) : ${OPT='-O'};;
+ esac
+ 
+-: ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk}
++: ${CC='gcc $(WARN)'} ${OPT='-O'} ${AWK=awk}
+ 
+ export SYSTYPE AR ARFL RANLIB SYSLIBS CC OPT DEBUG AWK OPTS
+ 
diff --git a/mail/postfix20/pkg-plist b/mail/postfix20/pkg-plist
index af5f26a4396c..943a3766560b 100644
--- a/mail/postfix20/pkg-plist
+++ b/mail/postfix20/pkg-plist
@@ -43,6 +43,59 @@ sbin/postsuper
 sbin/sendmail
 sbin/smtp-sink
 sbin/smtp-source
+share/doc/postfix/access.5.html
+share/doc/postfix/aliases.5.html
+share/doc/postfix/architecture.html
+share/doc/postfix/backstage.html
+share/doc/postfix/basic.html
+share/doc/postfix/big-picture.gif
+share/doc/postfix/big-picture.html
+share/doc/postfix/bounce.8.html
+share/doc/postfix/canonical.5.html
+share/doc/postfix/cleanup.8.html
+share/doc/postfix/commands.html
+share/doc/postfix/defer.8.html
+share/doc/postfix/delivering.html
+share/doc/postfix/error.8.html
+share/doc/postfix/faq.html
+share/doc/postfix/goals.html
+share/doc/postfix/inbound.gif
+share/doc/postfix/index.html
+share/doc/postfix/local.8.html
+share/doc/postfix/mailq.1.html
+share/doc/postfix/master.8.html
+share/doc/postfix/motivation.html
+share/doc/postfix/newaliases.1.html
+share/doc/postfix/outbound.gif
+share/doc/postfix/pickup.8.html
+share/doc/postfix/pipe.8.html
+share/doc/postfix/postalias.1.html
+share/doc/postfix/postcat.1.html
+share/doc/postfix/postconf.1.html
+share/doc/postfix/postdrop.1.html
+share/doc/postfix/postfix.1.html
+share/doc/postfix/postkick.1.html
+share/doc/postfix/postlock.1.html
+share/doc/postfix/postlog.1.html
+share/doc/postfix/postmap.1.html
+share/doc/postfix/postsuper.1.html
+share/doc/postfix/qmgr.8.html
+share/doc/postfix/queuing.html
+share/doc/postfix/rate.html
+share/doc/postfix/receiving.html
+share/doc/postfix/relocated.5.html
+share/doc/postfix/resource.html
+share/doc/postfix/rewrite.html
+share/doc/postfix/security.html
+share/doc/postfix/sendmail.1.html
+share/doc/postfix/showq.8.html
+share/doc/postfix/small-picture.gif
+share/doc/postfix/smtp.8.html
+share/doc/postfix/smtpd.8.html
+share/doc/postfix/transport.5.html
+share/doc/postfix/trivial-rewrite.8.html
+share/doc/postfix/uce.html
+share/doc/postfix/virtual.5.html
 @exec mkdir -p -m 0755 /var/spool/postfix
 @exec chown root:wheel /var/spool/postfix
 @dirrm libexec/postfix