ports/57083 - Update mail/postfix to 2.0.16

[Sergey A. Osokin]

On Mon, Sep 29, 2003 at 07:30:26AM -0700, Vivek Khera wrote:
>  EG> Please see http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/57083.
>  EG> Do you approve this update?
>  
>  The postfix-2.0-ns-mx-acl-patch.gz conflicts with the TLS patch.  when
>  the SSL+TLS patch is applied, it fails.  there needs to be a way to
>  turn off the postfix-2.0-ns-mx-acl-patch for this case.
>  
>  curiously, the IPV6+TLS patch has no conflicts...

OK. Here is another version of patch without of
postfix-2.0-ns-mx-acl-patch.gz

-- 

Rgdz,                        /"\  ASCII RIBBON CAMPAIGN
Sergey Osokin aka oZZ,       \ /    AGAINST HTML MAIL
http://ozz.pp.ru/             X          AND NEWS
                             / \
-------------- next part --------------
Index: ports/mail/postfix/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/postfix/Makefile,v
retrieving revision 1.78
diff -u -u -r1.78 Makefile
--- ports/mail/postfix/Makefile	9 Sep 2003 14:35:10 -0000	1.78
+++ ports/mail/postfix/Makefile	1 Oct 2003 10:50:39 -0000
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.15
+PORTVERSION=	2.0.16
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
Index: ports/mail/postfix/distinfo
===================================================================
RCS file: /home/pcvs/ports/mail/postfix/distinfo,v
retrieving revision 1.44
diff -u -u -r1.44 distinfo
--- ports/mail/postfix/distinfo	9 Sep 2003 14:35:10 -0000	1.44
+++ ports/mail/postfix/distinfo	1 Oct 2003 10:50:45 -0000
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.15.tar.gz) = 723c2b7f67016e0c19b0e1aa08dad246
-MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623
+MD5 (postfix/postfix-2.0.16.tar.gz) = ac13776442ba7708e683bc1bfbadab2f
+MD5 (postfix/pfixtls-0.8.16-2.0.15-0.9.7b.tar.gz) = 6823c6645d64c80b63597db8b4a29d16
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-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
+MD5 (postfix/ipv6-1.18a-pf-2.0.16.patch.gz) = 8e0b85c6c131d367dc5b0d0d95e7e2c1
+MD5 (postfix/tls+ipv6-1.18a-pf-2.0.16.patch.gz) = b32876b1a02d3a8f6a93a66e574ddee7
Index: ports/mail/postfix/scripts/configure.postfix
===================================================================
RCS file: /home/pcvs/ports/mail/postfix/scripts/configure.postfix,v
retrieving revision 1.40
diff -u -u -r1.40 configure.postfix
--- ports/mail/postfix/scripts/configure.postfix	27 Aug 2003 20:19:58 -0000	1.40
+++ ports/mail/postfix/scripts/configure.postfix	18 Sep 2003 13:19:27 -0000
@@ -106,8 +106,8 @@
 			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.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 "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.16-2.0.15-0.9.7b.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.16-2.0.15-0.9.7b/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -203,7 +203,7 @@
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.17-pf-2.0.14.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.18a-pf-2.0.16.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -221,7 +221,7 @@
 			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.17-pf-2.0.14.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.18a-pf-2.0.16.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""