4 files changed, 24 insertions, 30 deletions

diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index d6238333932d..74ef14e0a606 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	20010228.1
+PORTVERSION=	20010228.2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
@@ -15,10 +15,10 @@ MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 		ftp://ftp.samurai.com/pub/postfix/official/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
 MASTER_SITE_SUBDIR= . old related/postfix
-DISTNAME=	postfix-20010228-pl01
+DISTNAME=	postfix-20010228-pl02
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	blaz@amis.net
+MAINTAINER=	blaz@si.FreeBSD.org
 
 MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
 	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
diff --git a/mail/postfix21/distinfo b/mail/postfix21/distinfo
index a48c057cff60..6dafd833bbfd 100644
--- a/mail/postfix21/distinfo
+++ b/mail/postfix21/distinfo
@@ -1,2 +1,3 @@
-MD5 (postfix/postfix-20010228-pl01.tar.gz) = e05f316a87f568a6416f48a9241e73ae
-MD5 (postfix/pfixtls-0.7.0-20010228-0.9.6.tar.gz) = 64699fb4f0bb4dc87ba1c6c7aef81366
+MD5 (postfix/postfix-20010228-pl02.tar.gz) = 9a0730bf0c95922c82157465dda718c4
+MD5 (postfix/pfixtls-0.7.2-20010228-pl02-0.9.6a.tar.gz) = 5137fd4e3578092d7cadbeea8098846d
+MD5 (postfix/postfix-20010228pl02-v6-20010503a.diff.gz) = 9390349d5aa23a827179f7e8afaa91ec
diff --git a/mail/postfix21/pkg-plist b/mail/postfix21/pkg-plist
index 97167cb8ed15..b7656bbe5982 100644
--- a/mail/postfix21/pkg-plist
+++ b/mail/postfix21/pkg-plist
@@ -121,4 +121,4 @@ sbin/sendmail
 %%SUB_DOCS%%share/doc/postfix/virtual.5.html
 %%SUB_DOCS%%@dirrm share/doc/postfix
 @dirrm libexec/postfix
-@dirrm etc/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 383723018008..6c5db5aeb9a3 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.6 2001-03-26 04:43:28 kuriyama Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.7 2001-05-21 06:52:08 kuriyama Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -10,24 +10,10 @@ tempfile=`mktemp -t checklist`
 if [ "${BATCH}" = "yes" ]; then
 	set \"PCRE\"
 else
-	# IPv6 patches are broken on alpha
-	if [ `uname -m` = "alpha" ]; then
-		/usr/bin/dialog --title "Postfix configuration options" --clear \
+	/usr/bin/dialog --title "Postfix configuration options" --clear \
 			--checklist "\n\
 Please select desired options:" -1 -1 16 \
-PCRE		"Perl Compatible Regular Expressions" ON \
-SASL		"Cyrus SASL (Simple Authentication and Security Layer)" OFF \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" OFF \
-MySQL		"MySQL map lookups" OFF \
-OpenLDAP	"OpenLDAP map lookups" OFF \
-Test		"SMTP/LMTP test server and generator" OFF \
-TLS		"Secure Sockets Layer and Transport Layer Security" OFF \
-2> $tempfile
-	else
-		/usr/bin/dialog --title "Postfix configuration options" --clear \
-			--checklist "\n\
-Please select desired options:" -1 -1 16 \
-PCRE		"Perl Compatible Regular Expressions" ON \
+PCRE		"Perl Compatible Regular Expressions" OFF \
 SASL		"Cyrus SASL (Simple Authentication and Security Layer)" OFF \
 DB3		"Berkeley DB3 (required if SASL also built with DB3)" OFF \
 MySQL		"MySQL map lookups" OFF \
@@ -36,7 +22,6 @@ Test		"SMTP/LMTP test server and generator" OFF \
 TLS		"Secure Sockets Layer and Transport Layer Security" OFF \
 IPv6		"IPv6 support" OFF \
 2> $tempfile
-	fi
 
 	retval=$?
 
@@ -93,8 +78,8 @@ while [ "$1" ]; do
 			echo "BIN1+=		tlsmgr"
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
 			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.7.0-20010228-0.9.6.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.7.0-20010228-0.9.6/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.7.2-20010228-pl02-0.9.6a.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.7.2-20010228-pl02-0.9.6a/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			SUB_TLS=""
 			;;
@@ -120,12 +105,20 @@ while [ "$1" ]; do
 			SUB_TEST=""
 			;;
 		\"IPv6\")
+			if [ `uname -m` != "i386" ]; then
+				/usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr
+				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+				exit 1
+			fi
+			if [ X$SUB_TLS = "X" ]; then
+				/usr/bin/dialog --msgbox "IPv6 and TLS patch cannot be used simultaneously!" 5 60 > /dev/stderr
+				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+				exit 1
+			fi
 			echo "PATCH_SITES+=	ftp://ftp.kame.net/pub/kame/misc/"
 			echo "PATCH_SITES+=	\${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}"
-			echo "PATCHFILES+=	postfix-20010225snap-v6-20010228a.diff.gz"
-			echo ""
-			echo "pre-patch:"
-			echo "	cd \${WRKSRC} && ln -s . postfix"
+			echo "PATCHFILES+=	postfix-20010228pl02-v6-20010503a.diff.gz"
+			echo "PATCH_DIST_STRIP= -p1"
 			echo ""
 			;;
 		*)