4 files changed, 10 insertions, 8 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index eb55d84ece3d..67d7a70dde8b 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSIONRAW=	2.2-20040829
+PORTVERSIONRAW=	2.2-20040919
 PORTVERSION=	${PORTVERSIONRAW:S/-/./}
 PORTEPOCH=	2
 CATEGORIES=	mail ipv6
@@ -49,7 +49,7 @@ MAN5=	access.5 aliases.5 canonical.5 cidr_table.5 ldap_table.5 \
 MAN8=	anvil.8 bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
 	master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
 	smtp.8 smtpd.8 spawn.8 trace.8 trivial-rewrite.8 verify.8 virtual.8 \
-	scache.8
+	scache.8 discard.8
 
 # TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
 # patch it.
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 2f96f30cd8de..2c5a16fa656a 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,2 +1,2 @@
-MD5 (postfix/postfix-2.2-20040829.tar.gz) = f73a622382cdfc0dfe5109c35bdf98d9
-SIZE (postfix/postfix-2.2-20040829.tar.gz) = 2065746
+MD5 (postfix/postfix-2.2-20040919.tar.gz) = 4611a1087f346c3d1ddcc0c1ec9466ab
+SIZE (postfix/postfix-2.2-20040919.tar.gz) = 2077140
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index 04e0542388b2..d0034a0e1d6d 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -25,6 +25,7 @@ etc/postfix/dist-virtual
 libexec/postfix/anvil
 libexec/postfix/bounce
 libexec/postfix/cleanup
+libexec/postfix/discard
 libexec/postfix/error
 libexec/postfix/flush
 libexec/postfix/lmtp
@@ -157,6 +158,7 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
 %%PORTDOCS%%%%DOCSDIR%%/defer.8.html
+%%PORTDOCS%%%%DOCSDIR%%/discard.8.html
 %%PORTDOCS%%%%DOCSDIR%%/error.8.html
 %%PORTDOCS%%%%DOCSDIR%%/flush.8.html
 %%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html
diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix
index 5989f585cf0e..450b7761ae96 100644
--- a/mail/postfix-current/scripts/configure.postfix
+++ b/mail/postfix-current/scripts/configure.postfix
@@ -108,8 +108,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.18-2.1.0-0.9.7d.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.18-2.1.0-0.9.7d/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.19-2.2-20040829-0.9.7d.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.19-2.2-20040829-0.9.7d/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -207,7 +207,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.24-pf-2.2-20040504.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.25-pf-2.2-20040616.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -225,7 +225,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.24-pf-2.2-20040504.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.25-pf-2.2-20040616.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""