Update to 2.0.14 [1]

Use %%DOCSDIR%% in pkg-plist [2]

Submitted by:	Vivek Khera <vivek@khera.org> [1],
		Linh Pham <question@closedsrc.org> [1],
		osa [2]
Approved by:	Vivek Khera <vivek@khera.org> (maintainer)
PRs:		55759, 56016

40 files changed, 990 insertions, 990 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 5acef00fe967..098c72576fcb 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.13
+PORTVERSION=	2.0.14
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 1a4d11248e8e..a0d6db45a6e4 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
-MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
+MD5 (postfix/postfix-2.0.14.tar.gz) = d0f1d1382958f3ce918d4d690be22229
+MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
+MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7
+MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc
diff --git a/mail/postfix/pkg-plist b/mail/postfix/pkg-plist
index 41e126fff794..09f2ca9027a0 100644
--- a/mail/postfix/pkg-plist
+++ b/mail/postfix/pkg-plist
@@ -89,94 +89,94 @@ bin/newaliases
 bin/mailq
 %%SUB_TEST%%sbin/smtp-sink
 %%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%%%SUB_IPV6%%share/doc/postfix/IPV6_README
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/postfix
+%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/DB_README
+%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
+%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
+%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
+%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
+%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
+%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
+%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
+%%PORTDOCS%%%%DOCSDIR%%/MACOSX_README
+%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
+%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
+%%PORTDOCS%%%%DOCSDIR%%/NFS_README
+%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
+%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
+%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/SASL_README
+%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
+%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
+%%PORTDOCS%%%%DOCSDIR%%/VERP_README
+%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
+%%PORTDOCS%%%%DOCSDIR%%/access.5.html
+%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
+%%PORTDOCS%%%%DOCSDIR%%/architecture.html
+%%PORTDOCS%%%%DOCSDIR%%/backstage.html
+%%PORTDOCS%%%%DOCSDIR%%/basic.html
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.html
+%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
+%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
+%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/commands.html
+%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
+%%PORTDOCS%%%%DOCSDIR%%/delivering.html
+%%PORTDOCS%%%%DOCSDIR%%/error.8.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
+%%PORTDOCS%%%%DOCSDIR%%/goals.html
+%%PORTDOCS%%%%DOCSDIR%%/inbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/local.8.html
+%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
+%%PORTDOCS%%%%DOCSDIR%%/master.8.html
+%%PORTDOCS%%%%DOCSDIR%%/motivation.html
+%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
+%%PORTDOCS%%%%DOCSDIR%%/nqmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/outbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
+%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
+%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/queuing.html
+%%PORTDOCS%%%%DOCSDIR%%/rate.html
+%%PORTDOCS%%%%DOCSDIR%%/receiving.html
+%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
+%%PORTDOCS%%%%DOCSDIR%%/resource.html
+%%PORTDOCS%%%%DOCSDIR%%/rewrite.html
+%%PORTDOCS%%%%DOCSDIR%%/security.html
+%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
+%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
+%%PORTDOCS%%%%DOCSDIR%%/small-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
+%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
+%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
+%%PORTDOCS%%%%DOCSDIR%%/uce.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/postfix
 @unexec rmdir %D/etc/postfix  2>/dev/null || true
diff --git a/mail/postfix/scripts/configure.postfix b/mail/postfix/scripts/configure.postfix
index f8bd34b223d4..166874b3b41a 100644
--- a/mail/postfix/scripts/configure.postfix
+++ b/mail/postfix/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.39 2003-08-17 12:54:27 kuriyama Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -106,8 +106,8 @@ while [ "$1" ]; do
 			echo "USE_OPENSSL=	yes"
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.14-2.0.12-0.9.7b/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -203,7 +203,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -221,7 +221,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index 5acef00fe967..098c72576fcb 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.13
+PORTVERSION=	2.0.14
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix20/distinfo b/mail/postfix20/distinfo
index 1a4d11248e8e..a0d6db45a6e4 100644
--- a/mail/postfix20/distinfo
+++ b/mail/postfix20/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
-MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
+MD5 (postfix/postfix-2.0.14.tar.gz) = d0f1d1382958f3ce918d4d690be22229
+MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
+MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7
+MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc
diff --git a/mail/postfix20/pkg-plist b/mail/postfix20/pkg-plist
index 41e126fff794..09f2ca9027a0 100644
--- a/mail/postfix20/pkg-plist
+++ b/mail/postfix20/pkg-plist
@@ -89,94 +89,94 @@ bin/newaliases
 bin/mailq
 %%SUB_TEST%%sbin/smtp-sink
 %%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%%%SUB_IPV6%%share/doc/postfix/IPV6_README
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/postfix
+%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/DB_README
+%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
+%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
+%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
+%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
+%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
+%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
+%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
+%%PORTDOCS%%%%DOCSDIR%%/MACOSX_README
+%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
+%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
+%%PORTDOCS%%%%DOCSDIR%%/NFS_README
+%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
+%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
+%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/SASL_README
+%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
+%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
+%%PORTDOCS%%%%DOCSDIR%%/VERP_README
+%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
+%%PORTDOCS%%%%DOCSDIR%%/access.5.html
+%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
+%%PORTDOCS%%%%DOCSDIR%%/architecture.html
+%%PORTDOCS%%%%DOCSDIR%%/backstage.html
+%%PORTDOCS%%%%DOCSDIR%%/basic.html
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.html
+%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
+%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
+%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/commands.html
+%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
+%%PORTDOCS%%%%DOCSDIR%%/delivering.html
+%%PORTDOCS%%%%DOCSDIR%%/error.8.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
+%%PORTDOCS%%%%DOCSDIR%%/goals.html
+%%PORTDOCS%%%%DOCSDIR%%/inbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/local.8.html
+%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
+%%PORTDOCS%%%%DOCSDIR%%/master.8.html
+%%PORTDOCS%%%%DOCSDIR%%/motivation.html
+%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
+%%PORTDOCS%%%%DOCSDIR%%/nqmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/outbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
+%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
+%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/queuing.html
+%%PORTDOCS%%%%DOCSDIR%%/rate.html
+%%PORTDOCS%%%%DOCSDIR%%/receiving.html
+%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
+%%PORTDOCS%%%%DOCSDIR%%/resource.html
+%%PORTDOCS%%%%DOCSDIR%%/rewrite.html
+%%PORTDOCS%%%%DOCSDIR%%/security.html
+%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
+%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
+%%PORTDOCS%%%%DOCSDIR%%/small-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
+%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
+%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
+%%PORTDOCS%%%%DOCSDIR%%/uce.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/postfix
 @unexec rmdir %D/etc/postfix  2>/dev/null || true
diff --git a/mail/postfix20/scripts/configure.postfix b/mail/postfix20/scripts/configure.postfix
index 5ab252ad71de..136cb257aa8b 100644
--- a/mail/postfix20/scripts/configure.postfix
+++ b/mail/postfix20/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.39 2003-08-17 12:54:27 kuriyama Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -106,8 +106,8 @@ while [ "$1" ]; do
 			echo "USE_OPENSSL=	yes"
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.14-2.0.12-0.9.7b/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -203,7 +203,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -221,7 +221,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index 5acef00fe967..098c72576fcb 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.13
+PORTVERSION=	2.0.14
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix21/distinfo b/mail/postfix21/distinfo
index 1a4d11248e8e..a0d6db45a6e4 100644
--- a/mail/postfix21/distinfo
+++ b/mail/postfix21/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
-MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
+MD5 (postfix/postfix-2.0.14.tar.gz) = d0f1d1382958f3ce918d4d690be22229
+MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
+MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7
+MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc
diff --git a/mail/postfix21/pkg-plist b/mail/postfix21/pkg-plist
index 41e126fff794..09f2ca9027a0 100644
--- a/mail/postfix21/pkg-plist
+++ b/mail/postfix21/pkg-plist
@@ -89,94 +89,94 @@ bin/newaliases
 bin/mailq
 %%SUB_TEST%%sbin/smtp-sink
 %%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%%%SUB_IPV6%%share/doc/postfix/IPV6_README
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/postfix
+%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/DB_README
+%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
+%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
+%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
+%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
+%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
+%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
+%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
+%%PORTDOCS%%%%DOCSDIR%%/MACOSX_README
+%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
+%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
+%%PORTDOCS%%%%DOCSDIR%%/NFS_README
+%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
+%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
+%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/SASL_README
+%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
+%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
+%%PORTDOCS%%%%DOCSDIR%%/VERP_README
+%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
+%%PORTDOCS%%%%DOCSDIR%%/access.5.html
+%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
+%%PORTDOCS%%%%DOCSDIR%%/architecture.html
+%%PORTDOCS%%%%DOCSDIR%%/backstage.html
+%%PORTDOCS%%%%DOCSDIR%%/basic.html
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.html
+%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
+%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
+%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/commands.html
+%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
+%%PORTDOCS%%%%DOCSDIR%%/delivering.html
+%%PORTDOCS%%%%DOCSDIR%%/error.8.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
+%%PORTDOCS%%%%DOCSDIR%%/goals.html
+%%PORTDOCS%%%%DOCSDIR%%/inbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/local.8.html
+%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
+%%PORTDOCS%%%%DOCSDIR%%/master.8.html
+%%PORTDOCS%%%%DOCSDIR%%/motivation.html
+%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
+%%PORTDOCS%%%%DOCSDIR%%/nqmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/outbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
+%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
+%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/queuing.html
+%%PORTDOCS%%%%DOCSDIR%%/rate.html
+%%PORTDOCS%%%%DOCSDIR%%/receiving.html
+%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
+%%PORTDOCS%%%%DOCSDIR%%/resource.html
+%%PORTDOCS%%%%DOCSDIR%%/rewrite.html
+%%PORTDOCS%%%%DOCSDIR%%/security.html
+%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
+%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
+%%PORTDOCS%%%%DOCSDIR%%/small-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
+%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
+%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
+%%PORTDOCS%%%%DOCSDIR%%/uce.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/postfix
 @unexec rmdir %D/etc/postfix  2>/dev/null || true
diff --git a/mail/postfix21/scripts/configure.postfix b/mail/postfix21/scripts/configure.postfix
index 43bbe1d0e80e..26a16b43716d 100644
--- a/mail/postfix21/scripts/configure.postfix
+++ b/mail/postfix21/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.39 2003-08-17 12:54:27 kuriyama Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -106,8 +106,8 @@ while [ "$1" ]; do
 			echo "USE_OPENSSL=	yes"
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.14-2.0.12-0.9.7b/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -203,7 +203,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -221,7 +221,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
index 5acef00fe967..098c72576fcb 100644
--- a/mail/postfix22/Makefile
+++ b/mail/postfix22/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.13
+PORTVERSION=	2.0.14
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix22/distinfo b/mail/postfix22/distinfo
index 1a4d11248e8e..a0d6db45a6e4 100644
--- a/mail/postfix22/distinfo
+++ b/mail/postfix22/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
-MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
+MD5 (postfix/postfix-2.0.14.tar.gz) = d0f1d1382958f3ce918d4d690be22229
+MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
+MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7
+MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc
diff --git a/mail/postfix22/pkg-plist b/mail/postfix22/pkg-plist
index 41e126fff794..09f2ca9027a0 100644
--- a/mail/postfix22/pkg-plist
+++ b/mail/postfix22/pkg-plist
@@ -89,94 +89,94 @@ bin/newaliases
 bin/mailq
 %%SUB_TEST%%sbin/smtp-sink
 %%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%%%SUB_IPV6%%share/doc/postfix/IPV6_README
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/postfix
+%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/DB_README
+%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
+%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
+%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
+%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
+%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
+%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
+%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
+%%PORTDOCS%%%%DOCSDIR%%/MACOSX_README
+%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
+%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
+%%PORTDOCS%%%%DOCSDIR%%/NFS_README
+%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
+%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
+%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/SASL_README
+%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
+%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
+%%PORTDOCS%%%%DOCSDIR%%/VERP_README
+%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
+%%PORTDOCS%%%%DOCSDIR%%/access.5.html
+%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
+%%PORTDOCS%%%%DOCSDIR%%/architecture.html
+%%PORTDOCS%%%%DOCSDIR%%/backstage.html
+%%PORTDOCS%%%%DOCSDIR%%/basic.html
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.html
+%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
+%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
+%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/commands.html
+%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
+%%PORTDOCS%%%%DOCSDIR%%/delivering.html
+%%PORTDOCS%%%%DOCSDIR%%/error.8.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
+%%PORTDOCS%%%%DOCSDIR%%/goals.html
+%%PORTDOCS%%%%DOCSDIR%%/inbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/local.8.html
+%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
+%%PORTDOCS%%%%DOCSDIR%%/master.8.html
+%%PORTDOCS%%%%DOCSDIR%%/motivation.html
+%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
+%%PORTDOCS%%%%DOCSDIR%%/nqmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/outbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
+%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
+%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/queuing.html
+%%PORTDOCS%%%%DOCSDIR%%/rate.html
+%%PORTDOCS%%%%DOCSDIR%%/receiving.html
+%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
+%%PORTDOCS%%%%DOCSDIR%%/resource.html
+%%PORTDOCS%%%%DOCSDIR%%/rewrite.html
+%%PORTDOCS%%%%DOCSDIR%%/security.html
+%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
+%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
+%%PORTDOCS%%%%DOCSDIR%%/small-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
+%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
+%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
+%%PORTDOCS%%%%DOCSDIR%%/uce.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/postfix
 @unexec rmdir %D/etc/postfix  2>/dev/null || true
diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix
index 48811f5bb26a..720a9c20eb2c 100644
--- a/mail/postfix22/scripts/configure.postfix
+++ b/mail/postfix22/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.39 2003-08-17 12:54:27 kuriyama Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -106,8 +106,8 @@ while [ "$1" ]; do
 			echo "USE_OPENSSL=	yes"
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.14-2.0.12-0.9.7b/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -203,7 +203,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -221,7 +221,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index 5acef00fe967..098c72576fcb 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.13
+PORTVERSION=	2.0.14
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix23/distinfo b/mail/postfix23/distinfo
index 1a4d11248e8e..a0d6db45a6e4 100644
--- a/mail/postfix23/distinfo
+++ b/mail/postfix23/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
-MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
+MD5 (postfix/postfix-2.0.14.tar.gz) = d0f1d1382958f3ce918d4d690be22229
+MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
+MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7
+MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc
diff --git a/mail/postfix23/pkg-plist b/mail/postfix23/pkg-plist
index 41e126fff794..09f2ca9027a0 100644
--- a/mail/postfix23/pkg-plist
+++ b/mail/postfix23/pkg-plist
@@ -89,94 +89,94 @@ bin/newaliases
 bin/mailq
 %%SUB_TEST%%sbin/smtp-sink
 %%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%%%SUB_IPV6%%share/doc/postfix/IPV6_README
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/postfix
+%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/DB_README
+%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
+%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
+%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
+%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
+%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
+%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
+%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
+%%PORTDOCS%%%%DOCSDIR%%/MACOSX_README
+%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
+%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
+%%PORTDOCS%%%%DOCSDIR%%/NFS_README
+%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
+%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
+%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/SASL_README
+%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
+%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
+%%PORTDOCS%%%%DOCSDIR%%/VERP_README
+%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
+%%PORTDOCS%%%%DOCSDIR%%/access.5.html
+%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
+%%PORTDOCS%%%%DOCSDIR%%/architecture.html
+%%PORTDOCS%%%%DOCSDIR%%/backstage.html
+%%PORTDOCS%%%%DOCSDIR%%/basic.html
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.html
+%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
+%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
+%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/commands.html
+%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
+%%PORTDOCS%%%%DOCSDIR%%/delivering.html
+%%PORTDOCS%%%%DOCSDIR%%/error.8.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
+%%PORTDOCS%%%%DOCSDIR%%/goals.html
+%%PORTDOCS%%%%DOCSDIR%%/inbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/local.8.html
+%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
+%%PORTDOCS%%%%DOCSDIR%%/master.8.html
+%%PORTDOCS%%%%DOCSDIR%%/motivation.html
+%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
+%%PORTDOCS%%%%DOCSDIR%%/nqmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/outbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
+%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
+%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/queuing.html
+%%PORTDOCS%%%%DOCSDIR%%/rate.html
+%%PORTDOCS%%%%DOCSDIR%%/receiving.html
+%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
+%%PORTDOCS%%%%DOCSDIR%%/resource.html
+%%PORTDOCS%%%%DOCSDIR%%/rewrite.html
+%%PORTDOCS%%%%DOCSDIR%%/security.html
+%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
+%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
+%%PORTDOCS%%%%DOCSDIR%%/small-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
+%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
+%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
+%%PORTDOCS%%%%DOCSDIR%%/uce.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/postfix
 @unexec rmdir %D/etc/postfix  2>/dev/null || true
diff --git a/mail/postfix23/scripts/configure.postfix b/mail/postfix23/scripts/configure.postfix
index 5beae34c3de5..9989ceae7569 100644
--- a/mail/postfix23/scripts/configure.postfix
+++ b/mail/postfix23/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.39 2003-08-17 12:54:27 kuriyama Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -106,8 +106,8 @@ while [ "$1" ]; do
 			echo "USE_OPENSSL=	yes"
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.14-2.0.12-0.9.7b/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -203,7 +203,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -221,7 +221,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index 5acef00fe967..098c72576fcb 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.13
+PORTVERSION=	2.0.14
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix24/distinfo b/mail/postfix24/distinfo
index 1a4d11248e8e..a0d6db45a6e4 100644
--- a/mail/postfix24/distinfo
+++ b/mail/postfix24/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
-MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
+MD5 (postfix/postfix-2.0.14.tar.gz) = d0f1d1382958f3ce918d4d690be22229
+MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
+MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7
+MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc
diff --git a/mail/postfix24/pkg-plist b/mail/postfix24/pkg-plist
index 41e126fff794..09f2ca9027a0 100644
--- a/mail/postfix24/pkg-plist
+++ b/mail/postfix24/pkg-plist
@@ -89,94 +89,94 @@ bin/newaliases
 bin/mailq
 %%SUB_TEST%%sbin/smtp-sink
 %%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%%%SUB_IPV6%%share/doc/postfix/IPV6_README
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/postfix
+%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/DB_README
+%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
+%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
+%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
+%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
+%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
+%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
+%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
+%%PORTDOCS%%%%DOCSDIR%%/MACOSX_README
+%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
+%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
+%%PORTDOCS%%%%DOCSDIR%%/NFS_README
+%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
+%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
+%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/SASL_README
+%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
+%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
+%%PORTDOCS%%%%DOCSDIR%%/VERP_README
+%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
+%%PORTDOCS%%%%DOCSDIR%%/access.5.html
+%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
+%%PORTDOCS%%%%DOCSDIR%%/architecture.html
+%%PORTDOCS%%%%DOCSDIR%%/backstage.html
+%%PORTDOCS%%%%DOCSDIR%%/basic.html
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.html
+%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
+%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
+%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/commands.html
+%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
+%%PORTDOCS%%%%DOCSDIR%%/delivering.html
+%%PORTDOCS%%%%DOCSDIR%%/error.8.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
+%%PORTDOCS%%%%DOCSDIR%%/goals.html
+%%PORTDOCS%%%%DOCSDIR%%/inbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/local.8.html
+%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
+%%PORTDOCS%%%%DOCSDIR%%/master.8.html
+%%PORTDOCS%%%%DOCSDIR%%/motivation.html
+%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
+%%PORTDOCS%%%%DOCSDIR%%/nqmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/outbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
+%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
+%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/queuing.html
+%%PORTDOCS%%%%DOCSDIR%%/rate.html
+%%PORTDOCS%%%%DOCSDIR%%/receiving.html
+%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
+%%PORTDOCS%%%%DOCSDIR%%/resource.html
+%%PORTDOCS%%%%DOCSDIR%%/rewrite.html
+%%PORTDOCS%%%%DOCSDIR%%/security.html
+%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
+%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
+%%PORTDOCS%%%%DOCSDIR%%/small-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
+%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
+%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
+%%PORTDOCS%%%%DOCSDIR%%/uce.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/postfix
 @unexec rmdir %D/etc/postfix  2>/dev/null || true
diff --git a/mail/postfix24/scripts/configure.postfix b/mail/postfix24/scripts/configure.postfix
index 5743edd205aa..754b4c784bca 100644
--- a/mail/postfix24/scripts/configure.postfix
+++ b/mail/postfix24/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.39 2003-08-17 12:54:27 kuriyama Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -106,8 +106,8 @@ while [ "$1" ]; do
 			echo "USE_OPENSSL=	yes"
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.14-2.0.12-0.9.7b/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -203,7 +203,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -221,7 +221,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index 5acef00fe967..098c72576fcb 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.13
+PORTVERSION=	2.0.14
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo
index 1a4d11248e8e..a0d6db45a6e4 100644
--- a/mail/postfix25/distinfo
+++ b/mail/postfix25/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
-MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
+MD5 (postfix/postfix-2.0.14.tar.gz) = d0f1d1382958f3ce918d4d690be22229
+MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
+MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7
+MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc
diff --git a/mail/postfix25/pkg-plist b/mail/postfix25/pkg-plist
index 41e126fff794..09f2ca9027a0 100644
--- a/mail/postfix25/pkg-plist
+++ b/mail/postfix25/pkg-plist
@@ -89,94 +89,94 @@ bin/newaliases
 bin/mailq
 %%SUB_TEST%%sbin/smtp-sink
 %%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%%%SUB_IPV6%%share/doc/postfix/IPV6_README
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/postfix
+%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/DB_README
+%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
+%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
+%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
+%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
+%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
+%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
+%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
+%%PORTDOCS%%%%DOCSDIR%%/MACOSX_README
+%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
+%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
+%%PORTDOCS%%%%DOCSDIR%%/NFS_README
+%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
+%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
+%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/SASL_README
+%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
+%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
+%%PORTDOCS%%%%DOCSDIR%%/VERP_README
+%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
+%%PORTDOCS%%%%DOCSDIR%%/access.5.html
+%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
+%%PORTDOCS%%%%DOCSDIR%%/architecture.html
+%%PORTDOCS%%%%DOCSDIR%%/backstage.html
+%%PORTDOCS%%%%DOCSDIR%%/basic.html
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.html
+%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
+%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
+%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/commands.html
+%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
+%%PORTDOCS%%%%DOCSDIR%%/delivering.html
+%%PORTDOCS%%%%DOCSDIR%%/error.8.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
+%%PORTDOCS%%%%DOCSDIR%%/goals.html
+%%PORTDOCS%%%%DOCSDIR%%/inbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/local.8.html
+%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
+%%PORTDOCS%%%%DOCSDIR%%/master.8.html
+%%PORTDOCS%%%%DOCSDIR%%/motivation.html
+%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
+%%PORTDOCS%%%%DOCSDIR%%/nqmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/outbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
+%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
+%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/queuing.html
+%%PORTDOCS%%%%DOCSDIR%%/rate.html
+%%PORTDOCS%%%%DOCSDIR%%/receiving.html
+%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
+%%PORTDOCS%%%%DOCSDIR%%/resource.html
+%%PORTDOCS%%%%DOCSDIR%%/rewrite.html
+%%PORTDOCS%%%%DOCSDIR%%/security.html
+%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
+%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
+%%PORTDOCS%%%%DOCSDIR%%/small-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
+%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
+%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
+%%PORTDOCS%%%%DOCSDIR%%/uce.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/postfix
 @unexec rmdir %D/etc/postfix  2>/dev/null || true
diff --git a/mail/postfix25/scripts/configure.postfix b/mail/postfix25/scripts/configure.postfix
index 41cc96ff87df..fc0ebc0140c7 100644
--- a/mail/postfix25/scripts/configure.postfix
+++ b/mail/postfix25/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.39 2003-08-17 12:54:27 kuriyama Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -106,8 +106,8 @@ while [ "$1" ]; do
 			echo "USE_OPENSSL=	yes"
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.14-2.0.12-0.9.7b/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -203,7 +203,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -221,7 +221,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index 5acef00fe967..098c72576fcb 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.13
+PORTVERSION=	2.0.14
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo
index 1a4d11248e8e..a0d6db45a6e4 100644
--- a/mail/postfix26/distinfo
+++ b/mail/postfix26/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
-MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
+MD5 (postfix/postfix-2.0.14.tar.gz) = d0f1d1382958f3ce918d4d690be22229
+MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
+MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7
+MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc
diff --git a/mail/postfix26/pkg-plist b/mail/postfix26/pkg-plist
index 41e126fff794..09f2ca9027a0 100644
--- a/mail/postfix26/pkg-plist
+++ b/mail/postfix26/pkg-plist
@@ -89,94 +89,94 @@ bin/newaliases
 bin/mailq
 %%SUB_TEST%%sbin/smtp-sink
 %%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%%%SUB_IPV6%%share/doc/postfix/IPV6_README
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/postfix
+%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/DB_README
+%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
+%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
+%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
+%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
+%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
+%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
+%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
+%%PORTDOCS%%%%DOCSDIR%%/MACOSX_README
+%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
+%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
+%%PORTDOCS%%%%DOCSDIR%%/NFS_README
+%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
+%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
+%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/SASL_README
+%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
+%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
+%%PORTDOCS%%%%DOCSDIR%%/VERP_README
+%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
+%%PORTDOCS%%%%DOCSDIR%%/access.5.html
+%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
+%%PORTDOCS%%%%DOCSDIR%%/architecture.html
+%%PORTDOCS%%%%DOCSDIR%%/backstage.html
+%%PORTDOCS%%%%DOCSDIR%%/basic.html
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.html
+%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
+%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
+%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/commands.html
+%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
+%%PORTDOCS%%%%DOCSDIR%%/delivering.html
+%%PORTDOCS%%%%DOCSDIR%%/error.8.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
+%%PORTDOCS%%%%DOCSDIR%%/goals.html
+%%PORTDOCS%%%%DOCSDIR%%/inbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/local.8.html
+%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
+%%PORTDOCS%%%%DOCSDIR%%/master.8.html
+%%PORTDOCS%%%%DOCSDIR%%/motivation.html
+%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
+%%PORTDOCS%%%%DOCSDIR%%/nqmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/outbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
+%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
+%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/queuing.html
+%%PORTDOCS%%%%DOCSDIR%%/rate.html
+%%PORTDOCS%%%%DOCSDIR%%/receiving.html
+%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
+%%PORTDOCS%%%%DOCSDIR%%/resource.html
+%%PORTDOCS%%%%DOCSDIR%%/rewrite.html
+%%PORTDOCS%%%%DOCSDIR%%/security.html
+%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
+%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
+%%PORTDOCS%%%%DOCSDIR%%/small-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
+%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
+%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
+%%PORTDOCS%%%%DOCSDIR%%/uce.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/postfix
 @unexec rmdir %D/etc/postfix  2>/dev/null || true
diff --git a/mail/postfix26/scripts/configure.postfix b/mail/postfix26/scripts/configure.postfix
index 3464c8f6c631..994228093011 100644
--- a/mail/postfix26/scripts/configure.postfix
+++ b/mail/postfix26/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.39 2003-08-17 12:54:27 kuriyama Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -106,8 +106,8 @@ while [ "$1" ]; do
 			echo "USE_OPENSSL=	yes"
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.14-2.0.12-0.9.7b/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -203,7 +203,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -221,7 +221,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index 5acef00fe967..098c72576fcb 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.13
+PORTVERSION=	2.0.14
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo
index 1a4d11248e8e..a0d6db45a6e4 100644
--- a/mail/postfix27/distinfo
+++ b/mail/postfix27/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
-MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
+MD5 (postfix/postfix-2.0.14.tar.gz) = d0f1d1382958f3ce918d4d690be22229
+MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
+MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7
+MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc
diff --git a/mail/postfix27/pkg-plist b/mail/postfix27/pkg-plist
index 41e126fff794..09f2ca9027a0 100644
--- a/mail/postfix27/pkg-plist
+++ b/mail/postfix27/pkg-plist
@@ -89,94 +89,94 @@ bin/newaliases
 bin/mailq
 %%SUB_TEST%%sbin/smtp-sink
 %%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%%%SUB_IPV6%%share/doc/postfix/IPV6_README
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/postfix
+%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/DB_README
+%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
+%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
+%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
+%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
+%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
+%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
+%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
+%%PORTDOCS%%%%DOCSDIR%%/MACOSX_README
+%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
+%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
+%%PORTDOCS%%%%DOCSDIR%%/NFS_README
+%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
+%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
+%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/SASL_README
+%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
+%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
+%%PORTDOCS%%%%DOCSDIR%%/VERP_README
+%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
+%%PORTDOCS%%%%DOCSDIR%%/access.5.html
+%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
+%%PORTDOCS%%%%DOCSDIR%%/architecture.html
+%%PORTDOCS%%%%DOCSDIR%%/backstage.html
+%%PORTDOCS%%%%DOCSDIR%%/basic.html
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.html
+%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
+%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
+%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/commands.html
+%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
+%%PORTDOCS%%%%DOCSDIR%%/delivering.html
+%%PORTDOCS%%%%DOCSDIR%%/error.8.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
+%%PORTDOCS%%%%DOCSDIR%%/goals.html
+%%PORTDOCS%%%%DOCSDIR%%/inbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/local.8.html
+%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
+%%PORTDOCS%%%%DOCSDIR%%/master.8.html
+%%PORTDOCS%%%%DOCSDIR%%/motivation.html
+%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
+%%PORTDOCS%%%%DOCSDIR%%/nqmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/outbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
+%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
+%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/queuing.html
+%%PORTDOCS%%%%DOCSDIR%%/rate.html
+%%PORTDOCS%%%%DOCSDIR%%/receiving.html
+%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
+%%PORTDOCS%%%%DOCSDIR%%/resource.html
+%%PORTDOCS%%%%DOCSDIR%%/rewrite.html
+%%PORTDOCS%%%%DOCSDIR%%/security.html
+%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
+%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
+%%PORTDOCS%%%%DOCSDIR%%/small-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
+%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
+%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
+%%PORTDOCS%%%%DOCSDIR%%/uce.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/postfix
 @unexec rmdir %D/etc/postfix  2>/dev/null || true
diff --git a/mail/postfix27/scripts/configure.postfix b/mail/postfix27/scripts/configure.postfix
index f352bf8c8f8a..f6ddaf1767fe 100644
--- a/mail/postfix27/scripts/configure.postfix
+++ b/mail/postfix27/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.39 2003-08-17 12:54:27 kuriyama Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -106,8 +106,8 @@ while [ "$1" ]; do
 			echo "USE_OPENSSL=	yes"
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.14-2.0.12-0.9.7b/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -203,7 +203,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -221,7 +221,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index 5acef00fe967..098c72576fcb 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.13
+PORTVERSION=	2.0.14
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo
index 1a4d11248e8e..a0d6db45a6e4 100644
--- a/mail/postfix28/distinfo
+++ b/mail/postfix28/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
-MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
+MD5 (postfix/postfix-2.0.14.tar.gz) = d0f1d1382958f3ce918d4d690be22229
+MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
+MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7
+MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc
diff --git a/mail/postfix28/pkg-plist b/mail/postfix28/pkg-plist
index 41e126fff794..09f2ca9027a0 100644
--- a/mail/postfix28/pkg-plist
+++ b/mail/postfix28/pkg-plist
@@ -89,94 +89,94 @@ bin/newaliases
 bin/mailq
 %%SUB_TEST%%sbin/smtp-sink
 %%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%%%SUB_IPV6%%share/doc/postfix/IPV6_README
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/postfix
+%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/DB_README
+%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
+%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
+%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
+%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
+%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
+%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
+%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
+%%PORTDOCS%%%%DOCSDIR%%/MACOSX_README
+%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
+%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
+%%PORTDOCS%%%%DOCSDIR%%/NFS_README
+%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
+%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
+%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
+%%PORTDOCS%%%%DOCSDIR%%/SASL_README
+%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
+%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
+%%PORTDOCS%%%%DOCSDIR%%/VERP_README
+%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
+%%PORTDOCS%%%%DOCSDIR%%/access.5.html
+%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
+%%PORTDOCS%%%%DOCSDIR%%/architecture.html
+%%PORTDOCS%%%%DOCSDIR%%/backstage.html
+%%PORTDOCS%%%%DOCSDIR%%/basic.html
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/big-picture.html
+%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
+%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
+%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/commands.html
+%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
+%%PORTDOCS%%%%DOCSDIR%%/delivering.html
+%%PORTDOCS%%%%DOCSDIR%%/error.8.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
+%%PORTDOCS%%%%DOCSDIR%%/goals.html
+%%PORTDOCS%%%%DOCSDIR%%/inbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/local.8.html
+%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
+%%PORTDOCS%%%%DOCSDIR%%/master.8.html
+%%PORTDOCS%%%%DOCSDIR%%/motivation.html
+%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
+%%PORTDOCS%%%%DOCSDIR%%/nqmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/outbound.gif
+%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
+%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
+%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
+%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/queuing.html
+%%PORTDOCS%%%%DOCSDIR%%/rate.html
+%%PORTDOCS%%%%DOCSDIR%%/receiving.html
+%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
+%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
+%%PORTDOCS%%%%DOCSDIR%%/resource.html
+%%PORTDOCS%%%%DOCSDIR%%/rewrite.html
+%%PORTDOCS%%%%DOCSDIR%%/security.html
+%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
+%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
+%%PORTDOCS%%%%DOCSDIR%%/small-picture.gif
+%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
+%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
+%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
+%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
+%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
+%%PORTDOCS%%%%DOCSDIR%%/uce.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
+%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/postfix
 @unexec rmdir %D/etc/postfix  2>/dev/null || true
diff --git a/mail/postfix28/scripts/configure.postfix b/mail/postfix28/scripts/configure.postfix
index 6d00664e4c21..0c21b1f5ad2f 100644
--- a/mail/postfix28/scripts/configure.postfix
+++ b/mail/postfix28/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.39 2003-08-17 12:54:27 kuriyama Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -106,8 +106,8 @@ while [ "$1" ]; do
 			echo "USE_OPENSSL=	yes"
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.14-2.0.12-0.9.7b/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -203,7 +203,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -221,7 +221,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.17-pf-2.0.14.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""