From root@corp.grupos.com.br  Sat Jan 29 21:37:05 2005
Return-Path: <root@corp.grupos.com.br>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8FA3916A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 29 Jan 2005 21:37:05 +0000 (GMT)
Received: from gwmail1.grupos.com.br (gwmail1.grupos.com.br [66.90.64.125])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 05E6D43D48
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 29 Jan 2005 21:37:05 +0000 (GMT)
	(envelope-from root@corp.grupos.com.br)
Received: from corp.grupos.com.br (unknown [150.162.166.55])
	by gwmail1.grupos.com.br (Postfix) with ESMTP id C43C43C4B6;
	Sat, 29 Jan 2005 19:37:03 -0200 (BRST)
Received: by corp.grupos.com.br (Postfix, from userid 0)
	id 0FACE20A22; Sat, 29 Jan 2005 19:37:03 -0200 (BRST)
Message-Id: <20050129213703.0FACE20A22@corp.grupos.com.br>
Date: Sat, 29 Jan 2005 19:37:03 -0200 (BRST)
From: Marcus Grando <marcus@corp.grupos.com.br>
Reply-To: Marcus Grando <marcus@corp.grupos.com.br>
To: FreeBSD-gnats-submit@freebsd.org
Cc: vivek@khera.org
Subject: Update port: mail/postfix-current change to 2.2-20050119
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         76830
>Category:       ports
>Synopsis:       Update port: mail/postfix-current change to 2.2-20050119
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 29 21:40:17 GMT 2005
>Closed-Date:    Mon Feb 14 19:48:31 GMT 2005
>Last-Modified:  Mon Feb 14 19:48:31 GMT 2005
>Originator:     Marcus Grando
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
Grupos Internet S/A
>Environment:
System: FreeBSD corp.grupos.com.br 4.11-STABLE FreeBSD 4.11-STABLE #40: Fri Jan 28 13:42:33 BRST 2005 root@corp.grupos.com.br:/usr/obj/usr/src/sys/CORP i386


	
>Description:
Update port: mail/postfix-current change to 2.2-20050119

+ Change to 2.2-20050119
+ Remove IPV6 options. Because IPV6 detect automaticaly.
+ Corrected TLS option

Maintainer contacted in CC's

	
>How-To-Repeat:
	
>Fix:

	

--- postfix-current.patch begins here ---
diff -ruN postfix-current.old/Makefile postfix-current/Makefile
--- postfix-current.old/Makefile	Thu Jan 13 11:50:24 2005
+++ postfix-current/Makefile	Sat Jan 29 18:41:21 2005
@@ -7,7 +7,7 @@
 
 # To pre-select options in batch mode, run make like this:
 #
-#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
+#  make -DBATCH POSTFIX_OPTIONS="DB3 TLS"
 #
 # the options are the same names as in the scripts/configure.postfix file.
 # POSTFIX_OPTIONS can be set in /etc/make.conf also.
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSIONRAW=	2.2-20041030
+PORTVERSIONRAW=	2.2-20050119
 PORTVERSION=	${PORTVERSIONRAW:S/-/./}
 PORTEPOCH=	2
 CATEGORIES=	mail ipv6
@@ -50,11 +50,7 @@
 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 discard.8
-
-# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
-# patch it.
-MAN8base=$(MAN8:S/tlsmgr.8//)
+	scache.8 discard.8 tlsmgr.8
 
 CONF1=	main.cf master.cf access aliases canonical header_checks relocated \
 	transport virtual
@@ -70,7 +66,7 @@
 	SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
 	SMTPD_PROXY_README STANDARD_CONFIGURATION_README TUNING_README \
 	ULTRIX_README UUCP_README VERP_README VIRTUAL_README \
-	XCLIENT_README XFORWARD_README
+	XCLIENT_README XFORWARD_README IPV6_README TLS_README
 
 .if !defined(DEBUG)
 MAKEFILEFLAGS+=	DEBUG=
@@ -138,18 +134,18 @@
 
 do-install:
 	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	 config_directory=${PREFIX}/etc/postfix \
-	 daemon_directory=${PREFIX}/libexec/postfix \
-	 command_directory=${PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PREFIX}/sbin/sendmail \
-	 newaliases_path=${PREFIX}/bin/newaliases \
-	 mailq_path=${PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PREFIX}/man \
-	 sample_directory=${PREFIX}/etc/postfix \
-	 readme_directory=${READMEDIR}
+	config_directory=${PREFIX}/etc/postfix \
+	daemon_directory=${PREFIX}/libexec/postfix \
+	command_directory=${PREFIX}/sbin \
+	queue_directory=/var/spool/postfix \
+	sendmail_path=${PREFIX}/sbin/sendmail \
+	newaliases_path=${PREFIX}/bin/newaliases \
+	mailq_path=${PREFIX}/bin/mailq \
+	mail_owner=postfix \
+	setgid_group=maildrop \
+	manpage_directory=${PREFIX}/man \
+	sample_directory=${PREFIX}/etc/postfix \
+	readme_directory=${READMEDIR}
 
 .for f in ${CONF1}
 	${INSTALL_DATA} ${WRKSRC}/conf/${f} \
diff -ruN postfix-current.old/distinfo postfix-current/distinfo
--- postfix-current.old/distinfo	Thu Jan 13 11:50:24 2005
+++ postfix-current/distinfo	Sat Jan 29 17:42:48 2005
@@ -1,4 +1,2 @@
-MD5 (postfix/postfix-2.2-20041030.tar.gz) = f179f5d50d387d2eb82351bdb03dac9e
-SIZE (postfix/postfix-2.2-20041030.tar.gz) = 2106328
-MD5 (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 2f5df0781abd0390611158b4a5fb63c4
-SIZE (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 239159
+MD5 (postfix/postfix-2.2-20050119.tar.gz) = 63861b2e09f17a7acfe84dbf6623c2d3
+SIZE (postfix/postfix-2.2-20050119.tar.gz) = 2354298
diff -ruN postfix-current.old/files/patch-freebsd6 postfix-current/files/patch-freebsd6
--- postfix-current.old/files/patch-freebsd6	Tue Aug 24 14:51:22 2004
+++ postfix-current/files/patch-freebsd6	Sat Jan 29 17:42:48 2005
@@ -9,26 +9,3 @@
    OpenBSD.2*)	SYSTYPE=OPENBSD2
  		;;
    OpenBSD.3*)	SYSTYPE=OPENBSD3
---- makedefs.snapshot_orig	Wed Apr 14 14:18:06 2004
-+++ makedefs.snapshot	Fri Aug 20 15:08:54 2004
-@@ -93,6 +93,8 @@
- 		;;
-   FreeBSD.5*)	SYSTYPE=FREEBSD5
- 		;;
-+  FreeBSD.6*)	SYSTYPE=FREEBSD5
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-   OpenBSD.3*)	SYSTYPE=OPENBSD3
-===cut-here===
---- makedefs.stable_orig	Wed Apr 14 13:59:43 2004
-+++ makedefs.stable	Fri Aug 20 15:10:13 2004
-@@ -93,6 +93,8 @@
- 		;;
-   FreeBSD.5*)	SYSTYPE=FREEBSD5
- 		;;
-+  FreeBSD.6*)	SYSTYPE=FREEBSD5
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-   OpenBSD.3*)	SYSTYPE=OPENBSD3
diff -ruN postfix-current.old/pkg-plist postfix-current/pkg-plist
--- postfix-current.old/pkg-plist	Thu Jan 13 11:50:24 2005
+++ postfix-current/pkg-plist	Sat Jan 29 18:25:19 2005
@@ -8,6 +8,7 @@
 @unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist-transport; then rm -f %D/etc/postfix/transport; fi
 @unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist-virtual; then rm -f %D/etc/postfix/virtual; fi
 etc/postfix/LICENSE
+etc/postfix/TLS_LICENSE
 etc/postfix/main.cf.default
 etc/postfix/makedefs.out
 etc/postfix/post-install
@@ -46,7 +47,7 @@
 libexec/postfix/trivial-rewrite
 libexec/postfix/verify
 libexec/postfix/virtual
-%%SUB_TLS%%libexec/postfix/tlsmgr
+libexec/postfix/tlsmgr
 sbin/postalias
 sbin/postcat
 sbin/postconf
@@ -93,7 +94,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
-%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
+%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
+%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
+%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
+%%PORTDOCS%%%%DOCSDIR%%/TLS_README
+%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LDAP_README
 %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
@@ -215,6 +220,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/verify.8.html
 %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
 %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
+%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/postfix
 @unexec rmdir %D/etc/postfix  2>/dev/null || true
diff -ruN postfix-current.old/scripts/configure.postfix postfix-current/scripts/configure.postfix
--- postfix-current.old/scripts/configure.postfix	Thu Jan 13 11:50:24 2005
+++ postfix-current/scripts/configure.postfix	Sat Jan 29 18:26:43 2005
@@ -23,9 +23,7 @@
 SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
 SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
 SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
-TLS		"SSL and TLS (BROKEN)" "$status_TLS" \
-IPv6		"IPv6 support (BROKEN)" "$status_IPv6" \
-IPv6TLS		"IPv6 support with SSL and TLS (BROKEN)" "$status_IPv6TLS" \
+TLS		"SSL and TLS" "$status_TLS" \
 DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
 DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
 DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
@@ -62,9 +60,7 @@
 
 echo "PREFIX=	${PREFIX}"
 
-SUB_TLS="@comment "
 SUB_TEST="@comment "
-SUB_IPV6="@comment "
 
 while [ "$1" ]; do
 	case $1 in
@@ -105,15 +101,10 @@
                         echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
 			;;
 		TLS)
-			echo "MAN8+=		tlsmgr.8"
 			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.19-2.2-20040919-0.9.7d/pfixtls.diff"
-			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
-			SUB_TLS=""
 			;;
 		DB3)
 			if [ "X$BDB_SELECTED" != "X" ]; then
@@ -205,37 +196,6 @@
 #			echo "MAN1+=		smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
 			SUB_TEST=""
 			;;
-		IPv6)
-			if [ X$SUB_TLS = "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.25-pf-2.2-20040616.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "IPv6_SUFFIX=	+ipv6"
-			echo ""
-			IPv6SELECTED=YES
-			SUB_IPV6=""
-			;;
-		IPv6TLS)
-			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			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.25-pf-2.2-20040616.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls+ipv6"
-			SUB_TLS=""
-			SUB_IPV6=""
-			;;
 		*)
 			echo "Unknown option(s): $*" > /dev/stderr
 			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
@@ -245,12 +205,10 @@
 	shift
 done
 
-echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
 echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-echo "PLIST_SUB+=	SUB_IPV6=\"${SUB_IPV6}\""
 
 # for some reason, if we alter the pkg name this way, the first build (where
 # we ask the configure questions) doesn't pick up the extensions, but
 # any subsequent build will.  so "make; make install" will build twice.
 # don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}\${NIS_SUFFIX}"
+#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"
--- postfix-current.patch ends here ---


>Release-Note:
>Audit-Trail:

From: Marcus Grando <marcus@corp.grupos.com.br>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/76830: Update port: mail/postfix-current change to 2.2-20050119
Date: Sat, 29 Jan 2005 22:07:25 -0200

 This is a multi-part message in MIME format.
 --------------050404010503070701080407
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 + Adding Kerberos5 option. (from mail/postfix)
 
 Regards
 
 -- 
 Marcus Grando
 Grupos Internet S/A
 marcus(at)corp.grupos.com.br
 
 --------------050404010503070701080407
 Content-Type: text/plain;
  name="postfix-current.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="postfix-current.patch"
 
 diff -ruN postfix-current.old/Makefile postfix-current/Makefile
 --- postfix-current.old/Makefile	Sat Nov 27 00:24:12 2004
 +++ postfix-current/Makefile	Sat Jan 29 21:44:35 2005
 @@ -7,7 +7,7 @@
  
  # To pre-select options in batch mode, run make like this:
  #
 -#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
 +#  make -DBATCH POSTFIX_OPTIONS="DB3 TLS"
  #
  # the options are the same names as in the scripts/configure.postfix file.
  # POSTFIX_OPTIONS can be set in /etc/make.conf also.
 @@ -15,7 +15,7 @@
  # NOTE: PCRE is enabled by default unless you specifically disable it.
  
  PORTNAME=	postfix
 -PORTVERSIONRAW=	2.2-20041030
 +PORTVERSIONRAW=	2.2-20050119
  PORTVERSION=	${PORTVERSIONRAW:S/-/./}
  PORTEPOCH=	2
  CATEGORIES=	mail ipv6
 @@ -50,11 +50,7 @@
  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 discard.8
 -
 -# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
 -# patch it.
 -MAN8base=$(MAN8:S/tlsmgr.8//)
 +	scache.8 discard.8 tlsmgr.8
  
  CONF1=	main.cf master.cf access aliases canonical header_checks relocated \
  	transport virtual
 @@ -70,7 +66,7 @@
  	SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
  	SMTPD_PROXY_README STANDARD_CONFIGURATION_README TUNING_README \
  	ULTRIX_README UUCP_README VERP_README VIRTUAL_README \
 -	XCLIENT_README XFORWARD_README
 +	XCLIENT_README XFORWARD_README IPV6_README TLS_README
  
  .if !defined(DEBUG)
  MAKEFILEFLAGS+=	DEBUG=
 @@ -138,18 +134,18 @@
  
  do-install:
  	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
 -	 config_directory=${PREFIX}/etc/postfix \
 -	 daemon_directory=${PREFIX}/libexec/postfix \
 -	 command_directory=${PREFIX}/sbin \
 -	 queue_directory=/var/spool/postfix \
 -	 sendmail_path=${PREFIX}/sbin/sendmail \
 -	 newaliases_path=${PREFIX}/bin/newaliases \
 -	 mailq_path=${PREFIX}/bin/mailq \
 -	 mail_owner=postfix \
 -	 setgid_group=maildrop \
 -	 manpage_directory=${PREFIX}/man \
 -	 sample_directory=${PREFIX}/etc/postfix \
 -	 readme_directory=${READMEDIR}
 +	config_directory=${PREFIX}/etc/postfix \
 +	daemon_directory=${PREFIX}/libexec/postfix \
 +	command_directory=${PREFIX}/sbin \
 +	queue_directory=/var/spool/postfix \
 +	sendmail_path=${PREFIX}/sbin/sendmail \
 +	newaliases_path=${PREFIX}/bin/newaliases \
 +	mailq_path=${PREFIX}/bin/mailq \
 +	mail_owner=postfix \
 +	setgid_group=maildrop \
 +	manpage_directory=${PREFIX}/man \
 +	sample_directory=${PREFIX}/etc/postfix \
 +	readme_directory=${READMEDIR}
  
  .for f in ${CONF1}
  	${INSTALL_DATA} ${WRKSRC}/conf/${f} \
 diff -ruN postfix-current.old/distinfo postfix-current/distinfo
 --- postfix-current.old/distinfo	Sat Nov 27 00:24:12 2004
 +++ postfix-current/distinfo	Sat Jan 29 21:44:35 2005
 @@ -1,4 +1,2 @@
 -MD5 (postfix/postfix-2.2-20041030.tar.gz) = f179f5d50d387d2eb82351bdb03dac9e
 -SIZE (postfix/postfix-2.2-20041030.tar.gz) = 2106328
 -MD5 (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 2f5df0781abd0390611158b4a5fb63c4
 -SIZE (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 239159
 +MD5 (postfix/postfix-2.2-20050119.tar.gz) = 63861b2e09f17a7acfe84dbf6623c2d3
 +SIZE (postfix/postfix-2.2-20050119.tar.gz) = 2354298
 diff -ruN postfix-current.old/files/patch-freebsd6 postfix-current/files/patch-freebsd6
 --- postfix-current.old/files/patch-freebsd6	Tue Aug 24 14:51:22 2004
 +++ postfix-current/files/patch-freebsd6	Sat Jan 29 21:44:35 2005
 @@ -9,26 +9,3 @@
     OpenBSD.2*)	SYSTYPE=OPENBSD2
   		;;
     OpenBSD.3*)	SYSTYPE=OPENBSD3
 ---- makedefs.snapshot_orig	Wed Apr 14 14:18:06 2004
 -+++ makedefs.snapshot	Fri Aug 20 15:08:54 2004
 -@@ -93,6 +93,8 @@
 - 		;;
 -   FreeBSD.5*)	SYSTYPE=FREEBSD5
 - 		;;
 -+  FreeBSD.6*)	SYSTYPE=FREEBSD5
 -+		;;
 -   OpenBSD.2*)	SYSTYPE=OPENBSD2
 - 		;;
 -   OpenBSD.3*)	SYSTYPE=OPENBSD3
 -===cut-here===
 ---- makedefs.stable_orig	Wed Apr 14 13:59:43 2004
 -+++ makedefs.stable	Fri Aug 20 15:10:13 2004
 -@@ -93,6 +93,8 @@
 - 		;;
 -   FreeBSD.5*)	SYSTYPE=FREEBSD5
 - 		;;
 -+  FreeBSD.6*)	SYSTYPE=FREEBSD5
 -+		;;
 -   OpenBSD.2*)	SYSTYPE=OPENBSD2
 - 		;;
 -   OpenBSD.3*)	SYSTYPE=OPENBSD3
 diff -ruN postfix-current.old/pkg-plist postfix-current/pkg-plist
 --- postfix-current.old/pkg-plist	Sat Nov 27 00:24:12 2004
 +++ postfix-current/pkg-plist	Sat Jan 29 21:44:35 2005
 @@ -8,6 +8,7 @@
  @unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist-transport; then rm -f %D/etc/postfix/transport; fi
  @unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist-virtual; then rm -f %D/etc/postfix/virtual; fi
  etc/postfix/LICENSE
 +etc/postfix/TLS_LICENSE
  etc/postfix/main.cf.default
  etc/postfix/makedefs.out
  etc/postfix/post-install
 @@ -46,7 +47,7 @@
  libexec/postfix/trivial-rewrite
  libexec/postfix/verify
  libexec/postfix/virtual
 -%%SUB_TLS%%libexec/postfix/tlsmgr
 +libexec/postfix/tlsmgr
  sbin/postalias
  sbin/postcat
  sbin/postconf
 @@ -93,7 +94,11 @@
  %%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
  %%PORTDOCS%%%%DOCSDIR%%/INSTALL
  %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
 -%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
 +%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
 +%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
 +%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
 +%%PORTDOCS%%%%DOCSDIR%%/TLS_README
 +%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
  %%PORTDOCS%%%%DOCSDIR%%/LDAP_README
  %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
  %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
 @@ -215,6 +220,7 @@
  %%PORTDOCS%%%%DOCSDIR%%/verify.8.html
  %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
  %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
 +%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
  @dirrm libexec/postfix
  @unexec rmdir %D/etc/postfix  2>/dev/null || true
 diff -ruN postfix-current.old/scripts/configure.postfix postfix-current/scripts/configure.postfix
 --- postfix-current.old/scripts/configure.postfix	Sat Nov 27 00:24:12 2004
 +++ postfix-current/scripts/configure.postfix	Sat Jan 29 21:50:08 2005
 @@ -23,9 +23,8 @@
  SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
  SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
  SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
 -TLS		"SSL and TLS (BROKEN)" "$status_TLS" \
 -IPv6		"IPv6 support (BROKEN)" "$status_IPv6" \
 -IPv6TLS		"IPv6 support with SSL and TLS (BROKEN)" "$status_IPv6TLS" \
 +SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
 +TLS		"SSL and TLS" "$status_TLS" \
  DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
  DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
  DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 @@ -62,9 +61,7 @@
  
  echo "PREFIX=	${PREFIX}"
  
 -SUB_TLS="@comment "
  SUB_TEST="@comment "
 -SUB_IPV6="@comment "
  
  while [ "$1" ]; do
  	case $1 in
 @@ -104,16 +101,14 @@
  		SASLKRB)
                          echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
  			;;
 +		SASLKRB5)
 +			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
 +			;;
  		TLS)
 -			echo "MAN8+=		tlsmgr.8"
  			echo "USE_OPENSSL=	yes"
 -			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 +			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
  			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 -			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz"
 -			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.19-2.2-20040919-0.9.7d/pfixtls.diff"
 -			echo "PATCH_STRIP=	-p1"
  			echo "TLS_SUFFIX=	+tls"
 -			SUB_TLS=""
  			;;
  		DB3)
  			if [ "X$BDB_SELECTED" != "X" ]; then
 @@ -205,37 +200,6 @@
  #			echo "MAN1+=		smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
  			SUB_TEST=""
  			;;
 -		IPv6)
 -			if [ X$SUB_TLS = "X" ]; then
 -				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
 -				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 -				exit 1
 -			fi
 -			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
 -			echo "PATCHFILES+=	ipv6-1.25-pf-2.2-20040616.patch.gz"
 -			echo "PATCH_DIST_STRIP=	-p1"
 -			echo "IPv6_SUFFIX=	+ipv6"
 -			echo ""
 -			IPv6SELECTED=YES
 -			SUB_IPV6=""
 -			;;
 -		IPv6TLS)
 -			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
 -				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
 -				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 -				exit 1
 -			fi
 -			echo "MAN8+=		tlsmgr.8"
 -			echo "USE_OPENSSL=	yes"
 -			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.25-pf-2.2-20040616.patch.gz"
 -			echo "PATCH_DIST_STRIP=	-p1"
 -			echo "TLS_SUFFIX=	+tls+ipv6"
 -			SUB_TLS=""
 -			SUB_IPV6=""
 -			;;
  		*)
  			echo "Unknown option(s): $*" > /dev/stderr
  			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 @@ -245,12 +209,10 @@
  	shift
  done
  
 -echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
  echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
 -echo "PLIST_SUB+=	SUB_IPV6=\"${SUB_IPV6}\""
  
  # for some reason, if we alter the pkg name this way, the first build (where
  # we ask the configure questions) doesn't pick up the extensions, but
  # any subsequent build will.  so "make; make install" will build twice.
  # don't do this for now.
 -#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}\${NIS_SUFFIX}"
 +#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"
 
 --------------050404010503070701080407--
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Sun Jan 30 13:59:00 GMT 2005 
State-Changed-Why:  
Asked maintainer for approval. 


Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Sun Jan 30 13:59:00 GMT 2005 
Responsible-Changed-Why:  
Handle. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=76830 

From: Pav Lucistnik <pav@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, vivek@khera.org
Cc:  
Subject: Re: ports/76830: Update port: mail/postfix-current change to
	2.2-20050119
Date: Sun, 30 Jan 2005 14:58:57 +0100

 Dear maintainer of FreeBSD port mail/postfix-current, please take a look
 at
 
 http://www.freebsd.org/cgi/query-pr.cgi?q=76830
 
 Do you approve this update?
 
 -- 
 Pav Lucistnik <pav@oook.cz>
               <pav@FreeBSD.org>
 
 I will give you a name, and I shall call you Sting.

From: Marcus Grando <marcus@corp.grupos.com.br>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/76830: Update port: mail/postfix-current change to 2.2-20050119
Date: Sat, 05 Feb 2005 20:02:12 -0200

 This is a multi-part message in MIME format.
 --------------050205000903060803000402
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 New patch...
 
 Update port: mail/postfix-current change to 2.2-20050203
 
 + Change to 2.2-20050203
 + Remove IPV6 options. Because IPV6 detect automaticaly.
 + Corrected TLS option
 + Adding Kerberos5 option. (from mail/postfix)
 
 Attached.
 
 -- 
 Marcus Grando
 Grupos Internet S/A
 marcus(at)corp.grupos.com.br
 
 --------------050205000903060803000402
 Content-Type: text/plain;
  name="postfix-current.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="postfix-current.patch"
 
 diff -ruN postfix-current.old/Makefile postfix-current/Makefile
 --- postfix-current.old/Makefile	Sat Nov 27 00:24:12 2004
 +++ postfix-current/Makefile	Sat Feb  5 19:45:38 2005
 @@ -7,7 +7,7 @@
  
  # To pre-select options in batch mode, run make like this:
  #
 -#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
 +#  make -DBATCH POSTFIX_OPTIONS="DB3 TLS"
  #
  # the options are the same names as in the scripts/configure.postfix file.
  # POSTFIX_OPTIONS can be set in /etc/make.conf also.
 @@ -15,7 +15,7 @@
  # NOTE: PCRE is enabled by default unless you specifically disable it.
  
  PORTNAME=	postfix
 -PORTVERSIONRAW=	2.2-20041030
 +PORTVERSIONRAW=	2.2-20050203
  PORTVERSION=	${PORTVERSIONRAW:S/-/./}
  PORTEPOCH=	2
  CATEGORIES=	mail ipv6
 @@ -50,11 +50,7 @@
  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 discard.8
 -
 -# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
 -# patch it.
 -MAN8base=$(MAN8:S/tlsmgr.8//)
 +	scache.8 discard.8 tlsmgr.8
  
  CONF1=	main.cf master.cf access aliases canonical header_checks relocated \
  	transport virtual
 @@ -70,7 +66,7 @@
  	SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
  	SMTPD_PROXY_README STANDARD_CONFIGURATION_README TUNING_README \
  	ULTRIX_README UUCP_README VERP_README VIRTUAL_README \
 -	XCLIENT_README XFORWARD_README
 +	XCLIENT_README XFORWARD_README IPV6_README TLS_README
  
  .if !defined(DEBUG)
  MAKEFILEFLAGS+=	DEBUG=
 @@ -138,18 +134,18 @@
  
  do-install:
  	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
 -	 config_directory=${PREFIX}/etc/postfix \
 -	 daemon_directory=${PREFIX}/libexec/postfix \
 -	 command_directory=${PREFIX}/sbin \
 -	 queue_directory=/var/spool/postfix \
 -	 sendmail_path=${PREFIX}/sbin/sendmail \
 -	 newaliases_path=${PREFIX}/bin/newaliases \
 -	 mailq_path=${PREFIX}/bin/mailq \
 -	 mail_owner=postfix \
 -	 setgid_group=maildrop \
 -	 manpage_directory=${PREFIX}/man \
 -	 sample_directory=${PREFIX}/etc/postfix \
 -	 readme_directory=${READMEDIR}
 +	config_directory=${PREFIX}/etc/postfix \
 +	daemon_directory=${PREFIX}/libexec/postfix \
 +	command_directory=${PREFIX}/sbin \
 +	queue_directory=/var/spool/postfix \
 +	sendmail_path=${PREFIX}/sbin/sendmail \
 +	newaliases_path=${PREFIX}/bin/newaliases \
 +	mailq_path=${PREFIX}/bin/mailq \
 +	mail_owner=postfix \
 +	setgid_group=maildrop \
 +	manpage_directory=${PREFIX}/man \
 +	sample_directory=${PREFIX}/etc/postfix \
 +	readme_directory=${READMEDIR}
  
  .for f in ${CONF1}
  	${INSTALL_DATA} ${WRKSRC}/conf/${f} \
 diff -ruN postfix-current.old/distinfo postfix-current/distinfo
 --- postfix-current.old/distinfo	Sat Nov 27 00:24:12 2004
 +++ postfix-current/distinfo	Sat Feb  5 19:46:06 2005
 @@ -1,4 +1,2 @@
 -MD5 (postfix/postfix-2.2-20041030.tar.gz) = f179f5d50d387d2eb82351bdb03dac9e
 -SIZE (postfix/postfix-2.2-20041030.tar.gz) = 2106328
 -MD5 (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 2f5df0781abd0390611158b4a5fb63c4
 -SIZE (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 239159
 +MD5 (postfix/postfix-2.2-20050203.tar.gz) = 1ef0a77b8d6dbb8cd9cfecaf4e9d4859
 +SIZE (postfix/postfix-2.2-20050203.tar.gz) = 2374394
 diff -ruN postfix-current.old/files/patch-freebsd6 postfix-current/files/patch-freebsd6
 --- postfix-current.old/files/patch-freebsd6	Tue Aug 24 14:51:22 2004
 +++ postfix-current/files/patch-freebsd6	Sat Feb  5 19:45:02 2005
 @@ -9,26 +9,3 @@
     OpenBSD.2*)	SYSTYPE=OPENBSD2
   		;;
     OpenBSD.3*)	SYSTYPE=OPENBSD3
 ---- makedefs.snapshot_orig	Wed Apr 14 14:18:06 2004
 -+++ makedefs.snapshot	Fri Aug 20 15:08:54 2004
 -@@ -93,6 +93,8 @@
 - 		;;
 -   FreeBSD.5*)	SYSTYPE=FREEBSD5
 - 		;;
 -+  FreeBSD.6*)	SYSTYPE=FREEBSD5
 -+		;;
 -   OpenBSD.2*)	SYSTYPE=OPENBSD2
 - 		;;
 -   OpenBSD.3*)	SYSTYPE=OPENBSD3
 -===cut-here===
 ---- makedefs.stable_orig	Wed Apr 14 13:59:43 2004
 -+++ makedefs.stable	Fri Aug 20 15:10:13 2004
 -@@ -93,6 +93,8 @@
 - 		;;
 -   FreeBSD.5*)	SYSTYPE=FREEBSD5
 - 		;;
 -+  FreeBSD.6*)	SYSTYPE=FREEBSD5
 -+		;;
 -   OpenBSD.2*)	SYSTYPE=OPENBSD2
 - 		;;
 -   OpenBSD.3*)	SYSTYPE=OPENBSD3
 diff -ruN postfix-current.old/pkg-plist postfix-current/pkg-plist
 --- postfix-current.old/pkg-plist	Sat Nov 27 00:24:12 2004
 +++ postfix-current/pkg-plist	Sat Feb  5 19:45:02 2005
 @@ -8,6 +8,7 @@
  @unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist-transport; then rm -f %D/etc/postfix/transport; fi
  @unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist-virtual; then rm -f %D/etc/postfix/virtual; fi
  etc/postfix/LICENSE
 +etc/postfix/TLS_LICENSE
  etc/postfix/main.cf.default
  etc/postfix/makedefs.out
  etc/postfix/post-install
 @@ -46,7 +47,7 @@
  libexec/postfix/trivial-rewrite
  libexec/postfix/verify
  libexec/postfix/virtual
 -%%SUB_TLS%%libexec/postfix/tlsmgr
 +libexec/postfix/tlsmgr
  sbin/postalias
  sbin/postcat
  sbin/postconf
 @@ -93,7 +94,11 @@
  %%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
  %%PORTDOCS%%%%DOCSDIR%%/INSTALL
  %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
 -%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
 +%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
 +%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
 +%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
 +%%PORTDOCS%%%%DOCSDIR%%/TLS_README
 +%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
  %%PORTDOCS%%%%DOCSDIR%%/LDAP_README
  %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
  %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
 @@ -215,6 +220,7 @@
  %%PORTDOCS%%%%DOCSDIR%%/verify.8.html
  %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
  %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
 +%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
  @dirrm libexec/postfix
  @unexec rmdir %D/etc/postfix  2>/dev/null || true
 diff -ruN postfix-current.old/scripts/configure.postfix postfix-current/scripts/configure.postfix
 --- postfix-current.old/scripts/configure.postfix	Sat Nov 27 00:24:12 2004
 +++ postfix-current/scripts/configure.postfix	Sat Feb  5 19:45:02 2005
 @@ -23,9 +23,8 @@
  SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
  SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
  SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
 -TLS		"SSL and TLS (BROKEN)" "$status_TLS" \
 -IPv6		"IPv6 support (BROKEN)" "$status_IPv6" \
 -IPv6TLS		"IPv6 support with SSL and TLS (BROKEN)" "$status_IPv6TLS" \
 +SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
 +TLS		"SSL and TLS" "$status_TLS" \
  DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
  DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
  DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 @@ -62,9 +61,7 @@
  
  echo "PREFIX=	${PREFIX}"
  
 -SUB_TLS="@comment "
  SUB_TEST="@comment "
 -SUB_IPV6="@comment "
  
  while [ "$1" ]; do
  	case $1 in
 @@ -104,16 +101,14 @@
  		SASLKRB)
                          echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
  			;;
 +		SASLKRB5)
 +			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
 +			;;
  		TLS)
 -			echo "MAN8+=		tlsmgr.8"
  			echo "USE_OPENSSL=	yes"
 -			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 +			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
  			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 -			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz"
 -			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.19-2.2-20040919-0.9.7d/pfixtls.diff"
 -			echo "PATCH_STRIP=	-p1"
  			echo "TLS_SUFFIX=	+tls"
 -			SUB_TLS=""
  			;;
  		DB3)
  			if [ "X$BDB_SELECTED" != "X" ]; then
 @@ -205,37 +200,6 @@
  #			echo "MAN1+=		smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
  			SUB_TEST=""
  			;;
 -		IPv6)
 -			if [ X$SUB_TLS = "X" ]; then
 -				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
 -				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 -				exit 1
 -			fi
 -			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
 -			echo "PATCHFILES+=	ipv6-1.25-pf-2.2-20040616.patch.gz"
 -			echo "PATCH_DIST_STRIP=	-p1"
 -			echo "IPv6_SUFFIX=	+ipv6"
 -			echo ""
 -			IPv6SELECTED=YES
 -			SUB_IPV6=""
 -			;;
 -		IPv6TLS)
 -			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
 -				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
 -				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 -				exit 1
 -			fi
 -			echo "MAN8+=		tlsmgr.8"
 -			echo "USE_OPENSSL=	yes"
 -			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.25-pf-2.2-20040616.patch.gz"
 -			echo "PATCH_DIST_STRIP=	-p1"
 -			echo "TLS_SUFFIX=	+tls+ipv6"
 -			SUB_TLS=""
 -			SUB_IPV6=""
 -			;;
  		*)
  			echo "Unknown option(s): $*" > /dev/stderr
  			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 @@ -245,12 +209,10 @@
  	shift
  done
  
 -echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
  echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
 -echo "PLIST_SUB+=	SUB_IPV6=\"${SUB_IPV6}\""
  
  # for some reason, if we alter the pkg name this way, the first build (where
  # we ask the configure questions) doesn't pick up the extensions, but
  # any subsequent build will.  so "make; make install" will build twice.
  # don't do this for now.
 -#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}\${NIS_SUFFIX}"
 +#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"
 
 --------------050205000903060803000402--

From: Marcus Grando <marcus@corp.grupos.com.br>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/76830: Update port: mail/postfix-current change to 2.2-20050119
Date: Mon, 07 Feb 2005 13:43:04 -0200

 This is a multi-part message in MIME format.
 --------------070909080606030502060804
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 New patch...
 
 Update port: mail/postfix-current change to 2.2-20050203
 
 + Change to 2.2-20050203
 + Remove IPV6 options. Because IPV6 detect automaticaly.
 + Corrected TLS option
 + Adding Kerberos5 option. (from mail/postfix)
 + Fix PostgreSQL
 
 Attached.
 
 -- 
 Marcus Grando
 Grupos Internet S/A
 marcus(at)corp.grupos.com.br
 
 --------------070909080606030502060804
 Content-Type: text/plain;
  name="postfix-current.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="postfix-current.patch"
 
 diff -ruN postfix-current.old/Makefile postfix-current/Makefile
 --- postfix-current.old/Makefile	Sat Nov 27 00:24:12 2004
 +++ postfix-current/Makefile	Mon Feb  7 13:28:50 2005
 @@ -7,7 +7,7 @@
  
  # To pre-select options in batch mode, run make like this:
  #
 -#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
 +#  make -DBATCH POSTFIX_OPTIONS="DB3 TLS"
  #
  # the options are the same names as in the scripts/configure.postfix file.
  # POSTFIX_OPTIONS can be set in /etc/make.conf also.
 @@ -15,7 +15,7 @@
  # NOTE: PCRE is enabled by default unless you specifically disable it.
  
  PORTNAME=	postfix
 -PORTVERSIONRAW=	2.2-20041030
 +PORTVERSIONRAW=	2.2-20050203
  PORTVERSION=	${PORTVERSIONRAW:S/-/./}
  PORTEPOCH=	2
  CATEGORIES=	mail ipv6
 @@ -50,11 +50,7 @@
  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 discard.8
 -
 -# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
 -# patch it.
 -MAN8base=$(MAN8:S/tlsmgr.8//)
 +	scache.8 discard.8 tlsmgr.8
  
  CONF1=	main.cf master.cf access aliases canonical header_checks relocated \
  	transport virtual
 @@ -70,7 +66,7 @@
  	SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
  	SMTPD_PROXY_README STANDARD_CONFIGURATION_README TUNING_README \
  	ULTRIX_README UUCP_README VERP_README VIRTUAL_README \
 -	XCLIENT_README XFORWARD_README
 +	XCLIENT_README XFORWARD_README IPV6_README TLS_README
  
  .if !defined(DEBUG)
  MAKEFILEFLAGS+=	DEBUG=
 @@ -138,18 +134,18 @@
  
  do-install:
  	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
 -	 config_directory=${PREFIX}/etc/postfix \
 -	 daemon_directory=${PREFIX}/libexec/postfix \
 -	 command_directory=${PREFIX}/sbin \
 -	 queue_directory=/var/spool/postfix \
 -	 sendmail_path=${PREFIX}/sbin/sendmail \
 -	 newaliases_path=${PREFIX}/bin/newaliases \
 -	 mailq_path=${PREFIX}/bin/mailq \
 -	 mail_owner=postfix \
 -	 setgid_group=maildrop \
 -	 manpage_directory=${PREFIX}/man \
 -	 sample_directory=${PREFIX}/etc/postfix \
 -	 readme_directory=${READMEDIR}
 +	config_directory=${PREFIX}/etc/postfix \
 +	daemon_directory=${PREFIX}/libexec/postfix \
 +	command_directory=${PREFIX}/sbin \
 +	queue_directory=/var/spool/postfix \
 +	sendmail_path=${PREFIX}/sbin/sendmail \
 +	newaliases_path=${PREFIX}/bin/newaliases \
 +	mailq_path=${PREFIX}/bin/mailq \
 +	mail_owner=postfix \
 +	setgid_group=maildrop \
 +	manpage_directory=${PREFIX}/man \
 +	sample_directory=${PREFIX}/etc/postfix \
 +	readme_directory=${READMEDIR}
  
  .for f in ${CONF1}
  	${INSTALL_DATA} ${WRKSRC}/conf/${f} \
 diff -ruN postfix-current.old/distinfo postfix-current/distinfo
 --- postfix-current.old/distinfo	Sat Nov 27 00:24:12 2004
 +++ postfix-current/distinfo	Mon Feb  7 13:28:50 2005
 @@ -1,4 +1,2 @@
 -MD5 (postfix/postfix-2.2-20041030.tar.gz) = f179f5d50d387d2eb82351bdb03dac9e
 -SIZE (postfix/postfix-2.2-20041030.tar.gz) = 2106328
 -MD5 (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 2f5df0781abd0390611158b4a5fb63c4
 -SIZE (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 239159
 +MD5 (postfix/postfix-2.2-20050203.tar.gz) = 1ef0a77b8d6dbb8cd9cfecaf4e9d4859
 +SIZE (postfix/postfix-2.2-20050203.tar.gz) = 2374394
 diff -ruN postfix-current.old/files/patch-freebsd6 postfix-current/files/patch-freebsd6
 --- postfix-current.old/files/patch-freebsd6	Tue Aug 24 14:51:22 2004
 +++ postfix-current/files/patch-freebsd6	Mon Feb  7 13:28:50 2005
 @@ -9,26 +9,3 @@
     OpenBSD.2*)	SYSTYPE=OPENBSD2
   		;;
     OpenBSD.3*)	SYSTYPE=OPENBSD3
 ---- makedefs.snapshot_orig	Wed Apr 14 14:18:06 2004
 -+++ makedefs.snapshot	Fri Aug 20 15:08:54 2004
 -@@ -93,6 +93,8 @@
 - 		;;
 -   FreeBSD.5*)	SYSTYPE=FREEBSD5
 - 		;;
 -+  FreeBSD.6*)	SYSTYPE=FREEBSD5
 -+		;;
 -   OpenBSD.2*)	SYSTYPE=OPENBSD2
 - 		;;
 -   OpenBSD.3*)	SYSTYPE=OPENBSD3
 -===cut-here===
 ---- makedefs.stable_orig	Wed Apr 14 13:59:43 2004
 -+++ makedefs.stable	Fri Aug 20 15:10:13 2004
 -@@ -93,6 +93,8 @@
 - 		;;
 -   FreeBSD.5*)	SYSTYPE=FREEBSD5
 - 		;;
 -+  FreeBSD.6*)	SYSTYPE=FREEBSD5
 -+		;;
 -   OpenBSD.2*)	SYSTYPE=OPENBSD2
 - 		;;
 -   OpenBSD.3*)	SYSTYPE=OPENBSD3
 diff -ruN postfix-current.old/pkg-plist postfix-current/pkg-plist
 --- postfix-current.old/pkg-plist	Sat Nov 27 00:24:12 2004
 +++ postfix-current/pkg-plist	Mon Feb  7 13:28:50 2005
 @@ -8,6 +8,7 @@
  @unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist-transport; then rm -f %D/etc/postfix/transport; fi
  @unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist-virtual; then rm -f %D/etc/postfix/virtual; fi
  etc/postfix/LICENSE
 +etc/postfix/TLS_LICENSE
  etc/postfix/main.cf.default
  etc/postfix/makedefs.out
  etc/postfix/post-install
 @@ -46,7 +47,7 @@
  libexec/postfix/trivial-rewrite
  libexec/postfix/verify
  libexec/postfix/virtual
 -%%SUB_TLS%%libexec/postfix/tlsmgr
 +libexec/postfix/tlsmgr
  sbin/postalias
  sbin/postcat
  sbin/postconf
 @@ -93,7 +94,11 @@
  %%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
  %%PORTDOCS%%%%DOCSDIR%%/INSTALL
  %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
 -%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
 +%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
 +%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
 +%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
 +%%PORTDOCS%%%%DOCSDIR%%/TLS_README
 +%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
  %%PORTDOCS%%%%DOCSDIR%%/LDAP_README
  %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
  %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
 @@ -215,6 +220,7 @@
  %%PORTDOCS%%%%DOCSDIR%%/verify.8.html
  %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
  %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
 +%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
  @dirrm libexec/postfix
  @unexec rmdir %D/etc/postfix  2>/dev/null || true
 diff -ruN postfix-current.old/scripts/configure.postfix postfix-current/scripts/configure.postfix
 --- postfix-current.old/scripts/configure.postfix	Sat Nov 27 00:24:12 2004
 +++ postfix-current/scripts/configure.postfix	Mon Feb  7 13:29:34 2005
 @@ -23,9 +23,8 @@
  SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
  SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
  SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
 -TLS		"SSL and TLS (BROKEN)" "$status_TLS" \
 -IPv6		"IPv6 support (BROKEN)" "$status_IPv6" \
 -IPv6TLS		"IPv6 support with SSL and TLS (BROKEN)" "$status_IPv6TLS" \
 +SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
 +TLS		"SSL and TLS" "$status_TLS" \
  DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
  DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
  DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 @@ -33,7 +32,6 @@
  MySQL		"MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
  PgSQL		"PostgreSQL v7.4 map lookups" "$status_PgSQL" \
  PgSQL73		"PostgreSQL v7.3 map lookups" "$status_PgSQL73" \
 -PgSQL72		"PostgreSQL v7.2 map lookups" "$status_PgSQL72" \
  OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
  NIS		"NIS map lookups" "$status_NIS" \
  Test		"SMTP/LMTP test server and generator" "$status_Test" \
 @@ -62,9 +60,7 @@
  
  echo "PREFIX=	${PREFIX}"
  
 -SUB_TLS="@comment "
  SUB_TEST="@comment "
 -SUB_IPV6="@comment "
  
  while [ "$1" ]; do
  	case $1 in
 @@ -104,16 +100,14 @@
  		SASLKRB)
                          echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
  			;;
 +		SASLKRB5)
 +			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
 +			;;
  		TLS)
 -			echo "MAN8+=		tlsmgr.8"
  			echo "USE_OPENSSL=	yes"
 -			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 +			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
  			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 -			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz"
 -			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.19-2.2-20040919-0.9.7d/pfixtls.diff"
 -			echo "PATCH_STRIP=	-p1"
  			echo "TLS_SUFFIX=	+tls"
 -			SUB_TLS=""
  			;;
  		DB3)
  			if [ "X$BDB_SELECTED" != "X" ]; then
 @@ -170,26 +164,19 @@
  			echo "MYSQL_SUFFIX=	+mysql"
  			;;
  		PgSQL)
 -			echo "POSTGRESQL_PORT?=	databases/postgresql7"
 +			echo "POSTGRESQL_PORT?=	databases/postgresql74-client"
  			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
  			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
  			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
  			echo "PGSQL_SUFFIX=	+pgsql"
  			;;
  		PgSQL73)
 -			echo "POSTGRESQL_PORT?=	databases/postgresql73"
 +			echo "POSTGRESQL_PORT?=	databases/postgresql73-client"
  			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
  			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
  			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
  			echo "PGSQL_SUFFIX=	+pgsql"
  			;;
 -		PgSQL72)
 -			echo "POSTGRESQL_PORT?=	databases/postgresql72"
 -			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}"
 -			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
 -			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
 -			echo "PGSQL_SUFFIX=	+pgsql"
 -			;;
  		OpenLDAP)
  			echo "USE_OPENLDAP=YES"
  			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 @@ -205,37 +192,6 @@
  #			echo "MAN1+=		smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
  			SUB_TEST=""
  			;;
 -		IPv6)
 -			if [ X$SUB_TLS = "X" ]; then
 -				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
 -				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 -				exit 1
 -			fi
 -			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
 -			echo "PATCHFILES+=	ipv6-1.25-pf-2.2-20040616.patch.gz"
 -			echo "PATCH_DIST_STRIP=	-p1"
 -			echo "IPv6_SUFFIX=	+ipv6"
 -			echo ""
 -			IPv6SELECTED=YES
 -			SUB_IPV6=""
 -			;;
 -		IPv6TLS)
 -			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
 -				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
 -				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 -				exit 1
 -			fi
 -			echo "MAN8+=		tlsmgr.8"
 -			echo "USE_OPENSSL=	yes"
 -			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.25-pf-2.2-20040616.patch.gz"
 -			echo "PATCH_DIST_STRIP=	-p1"
 -			echo "TLS_SUFFIX=	+tls+ipv6"
 -			SUB_TLS=""
 -			SUB_IPV6=""
 -			;;
  		*)
  			echo "Unknown option(s): $*" > /dev/stderr
  			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 @@ -245,12 +201,10 @@
  	shift
  done
  
 -echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
  echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
 -echo "PLIST_SUB+=	SUB_IPV6=\"${SUB_IPV6}\""
  
  # for some reason, if we alter the pkg name this way, the first build (where
  # we ask the configure questions) doesn't pick up the extensions, but
  # any subsequent build will.  so "make; make install" will build twice.
  # don't do this for now.
 -#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}\${NIS_SUFFIX}"
 +#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"
 
 --------------070909080606030502060804--

From: Marcus Grando <marcus@corp.grupos.com.br>
To: freebsd-gnats-submit@FreeBSD.org, vivek@khera.org
Cc:  
Subject: Re: ports/76830: Update port: mail/postfix-current change to 2.2-20050119
Date: Thu, 10 Feb 2005 09:33:32 -0200

 This is a multi-part message in MIME format.
 --------------040706050802070307050001
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 New patch...
 
 Update port: mail/postfix-current change to 2.2-20050209
 
 + Change to 2.2-20050209
 + Remove IPV6 options. Because IPV6 detect automaticaly.
 + Corrected TLS option
 + Adding Kerberos5 option. (from mail/postfix)
 + Fix PostgreSQL
 
 Attached.
 
 -- 
 Marcus Grando
 Grupos Internet S/A
 marcus(at)corp.grupos.com.br
 
 --------------040706050802070307050001
 Content-Type: text/plain;
  name="postfix-current.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="postfix-current.patch"
 
 diff -ruN postfix-current.old/Makefile postfix-current/Makefile
 --- postfix-current.old/Makefile	Sat Nov 27 00:24:12 2004
 +++ postfix-current/Makefile	Thu Feb 10 02:04:20 2005
 @@ -7,7 +7,7 @@
  
  # To pre-select options in batch mode, run make like this:
  #
 -#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
 +#  make -DBATCH POSTFIX_OPTIONS="DB3 TLS"
  #
  # the options are the same names as in the scripts/configure.postfix file.
  # POSTFIX_OPTIONS can be set in /etc/make.conf also.
 @@ -15,7 +15,7 @@
  # NOTE: PCRE is enabled by default unless you specifically disable it.
  
  PORTNAME=	postfix
 -PORTVERSIONRAW=	2.2-20041030
 +PORTVERSIONRAW=	2.2-20050209
  PORTVERSION=	${PORTVERSIONRAW:S/-/./}
  PORTEPOCH=	2
  CATEGORIES=	mail ipv6
 @@ -45,19 +45,16 @@
  MAN5=	access.5 aliases.5 canonical.5 cidr_table.5 ldap_table.5 \
  	mysql_table.5 pgsql_table.5 postconf.5 pcre_table.5 \
  	regexp_table.5 relocated.5 tcp_table.5 transport.5 virtual.5 \
 -	header_checks.5 body_checks.5 master.5 nisplus_table.5
 +	header_checks.5 body_checks.5 master.5 nisplus_table.5 \
 +	generics.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 discard.8
 -
 -# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
 -# patch it.
 -MAN8base=$(MAN8:S/tlsmgr.8//)
 +	scache.8 discard.8 tlsmgr.8
  
  CONF1=	main.cf master.cf access aliases canonical header_checks relocated \
 -	transport virtual
 +	transport virtual generics
  
  README=	ADDRESS_CLASS_README ADDRESS_REWRITING_README \
  	ADDRESS_VERIFICATION_README BACKSCATTER_README \
 @@ -70,7 +67,7 @@
  	SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
  	SMTPD_PROXY_README STANDARD_CONFIGURATION_README TUNING_README \
  	ULTRIX_README UUCP_README VERP_README VIRTUAL_README \
 -	XCLIENT_README XFORWARD_README
 +	XCLIENT_README XFORWARD_README IPV6_README TLS_README
  
  .if !defined(DEBUG)
  MAKEFILEFLAGS+=	DEBUG=
 @@ -138,18 +135,18 @@
  
  do-install:
  	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
 -	 config_directory=${PREFIX}/etc/postfix \
 -	 daemon_directory=${PREFIX}/libexec/postfix \
 -	 command_directory=${PREFIX}/sbin \
 -	 queue_directory=/var/spool/postfix \
 -	 sendmail_path=${PREFIX}/sbin/sendmail \
 -	 newaliases_path=${PREFIX}/bin/newaliases \
 -	 mailq_path=${PREFIX}/bin/mailq \
 -	 mail_owner=postfix \
 -	 setgid_group=maildrop \
 -	 manpage_directory=${PREFIX}/man \
 -	 sample_directory=${PREFIX}/etc/postfix \
 -	 readme_directory=${READMEDIR}
 +	config_directory=${PREFIX}/etc/postfix \
 +	daemon_directory=${PREFIX}/libexec/postfix \
 +	command_directory=${PREFIX}/sbin \
 +	queue_directory=/var/spool/postfix \
 +	sendmail_path=${PREFIX}/sbin/sendmail \
 +	newaliases_path=${PREFIX}/bin/newaliases \
 +	mailq_path=${PREFIX}/bin/mailq \
 +	mail_owner=postfix \
 +	setgid_group=maildrop \
 +	manpage_directory=${PREFIX}/man \
 +	sample_directory=${PREFIX}/etc/postfix \
 +	readme_directory=${READMEDIR}
  
  .for f in ${CONF1}
  	${INSTALL_DATA} ${WRKSRC}/conf/${f} \
 diff -ruN postfix-current.old/distinfo postfix-current/distinfo
 --- postfix-current.old/distinfo	Sat Nov 27 00:24:12 2004
 +++ postfix-current/distinfo	Thu Feb 10 01:46:52 2005
 @@ -1,4 +1,2 @@
 -MD5 (postfix/postfix-2.2-20041030.tar.gz) = f179f5d50d387d2eb82351bdb03dac9e
 -SIZE (postfix/postfix-2.2-20041030.tar.gz) = 2106328
 -MD5 (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 2f5df0781abd0390611158b4a5fb63c4
 -SIZE (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 239159
 +MD5 (postfix/postfix-2.2-20050209.tar.gz) = 824b225dd1523753dac31c18ddef611d
 +SIZE (postfix/postfix-2.2-20050209.tar.gz) = 2381315
 diff -ruN postfix-current.old/files/patch-freebsd6 postfix-current/files/patch-freebsd6
 --- postfix-current.old/files/patch-freebsd6	Tue Aug 24 14:51:22 2004
 +++ postfix-current/files/patch-freebsd6	Thu Feb 10 01:45:53 2005
 @@ -9,26 +9,3 @@
     OpenBSD.2*)	SYSTYPE=OPENBSD2
   		;;
     OpenBSD.3*)	SYSTYPE=OPENBSD3
 ---- makedefs.snapshot_orig	Wed Apr 14 14:18:06 2004
 -+++ makedefs.snapshot	Fri Aug 20 15:08:54 2004
 -@@ -93,6 +93,8 @@
 - 		;;
 -   FreeBSD.5*)	SYSTYPE=FREEBSD5
 - 		;;
 -+  FreeBSD.6*)	SYSTYPE=FREEBSD5
 -+		;;
 -   OpenBSD.2*)	SYSTYPE=OPENBSD2
 - 		;;
 -   OpenBSD.3*)	SYSTYPE=OPENBSD3
 -===cut-here===
 ---- makedefs.stable_orig	Wed Apr 14 13:59:43 2004
 -+++ makedefs.stable	Fri Aug 20 15:10:13 2004
 -@@ -93,6 +93,8 @@
 - 		;;
 -   FreeBSD.5*)	SYSTYPE=FREEBSD5
 - 		;;
 -+  FreeBSD.6*)	SYSTYPE=FREEBSD5
 -+		;;
 -   OpenBSD.2*)	SYSTYPE=OPENBSD2
 - 		;;
 -   OpenBSD.3*)	SYSTYPE=OPENBSD3
 diff -ruN postfix-current.old/pkg-plist postfix-current/pkg-plist
 --- postfix-current.old/pkg-plist	Sat Nov 27 00:24:12 2004
 +++ postfix-current/pkg-plist	Thu Feb 10 02:05:06 2005
 @@ -7,7 +7,9 @@
  @unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist-relocated; then rm -f %D/etc/postfix/relocated; fi
  @unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist-transport; then rm -f %D/etc/postfix/transport; fi
  @unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist-virtual; then rm -f %D/etc/postfix/virtual; fi
 +@unexec if cmp -s %D/etc/postfix/generics %D/etc/postfix/dist-generics; then rm -f %D/etc/postfix/generics; fi
  etc/postfix/LICENSE
 +etc/postfix/TLS_LICENSE
  etc/postfix/main.cf.default
  etc/postfix/makedefs.out
  etc/postfix/post-install
 @@ -46,7 +48,7 @@
  libexec/postfix/trivial-rewrite
  libexec/postfix/verify
  libexec/postfix/virtual
 -%%SUB_TLS%%libexec/postfix/tlsmgr
 +libexec/postfix/tlsmgr
  sbin/postalias
  sbin/postcat
  sbin/postconf
 @@ -93,7 +95,11 @@
  %%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
  %%PORTDOCS%%%%DOCSDIR%%/INSTALL
  %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
 -%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
 +%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
 +%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
 +%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
 +%%PORTDOCS%%%%DOCSDIR%%/TLS_README
 +%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
  %%PORTDOCS%%%%DOCSDIR%%/LDAP_README
  %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
  %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
 @@ -215,6 +221,8 @@
  %%PORTDOCS%%%%DOCSDIR%%/verify.8.html
  %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
  %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
 +%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
 +%%PORTDOCS%%%%DOCSDIR%%/generics.5.html
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
  @dirrm libexec/postfix
  @unexec rmdir %D/etc/postfix  2>/dev/null || true
 diff -ruN postfix-current.old/scripts/configure.postfix postfix-current/scripts/configure.postfix
 --- postfix-current.old/scripts/configure.postfix	Sat Nov 27 00:24:12 2004
 +++ postfix-current/scripts/configure.postfix	Thu Feb 10 01:45:53 2005
 @@ -23,9 +23,8 @@
  SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
  SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
  SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
 -TLS		"SSL and TLS (BROKEN)" "$status_TLS" \
 -IPv6		"IPv6 support (BROKEN)" "$status_IPv6" \
 -IPv6TLS		"IPv6 support with SSL and TLS (BROKEN)" "$status_IPv6TLS" \
 +SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
 +TLS		"SSL and TLS" "$status_TLS" \
  DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
  DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
  DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 @@ -33,7 +32,6 @@
  MySQL		"MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
  PgSQL		"PostgreSQL v7.4 map lookups" "$status_PgSQL" \
  PgSQL73		"PostgreSQL v7.3 map lookups" "$status_PgSQL73" \
 -PgSQL72		"PostgreSQL v7.2 map lookups" "$status_PgSQL72" \
  OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
  NIS		"NIS map lookups" "$status_NIS" \
  Test		"SMTP/LMTP test server and generator" "$status_Test" \
 @@ -62,9 +60,7 @@
  
  echo "PREFIX=	${PREFIX}"
  
 -SUB_TLS="@comment "
  SUB_TEST="@comment "
 -SUB_IPV6="@comment "
  
  while [ "$1" ]; do
  	case $1 in
 @@ -104,16 +100,14 @@
  		SASLKRB)
                          echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
  			;;
 +		SASLKRB5)
 +			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
 +			;;
  		TLS)
 -			echo "MAN8+=		tlsmgr.8"
  			echo "USE_OPENSSL=	yes"
 -			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 +			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
  			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 -			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz"
 -			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.19-2.2-20040919-0.9.7d/pfixtls.diff"
 -			echo "PATCH_STRIP=	-p1"
  			echo "TLS_SUFFIX=	+tls"
 -			SUB_TLS=""
  			;;
  		DB3)
  			if [ "X$BDB_SELECTED" != "X" ]; then
 @@ -170,26 +164,19 @@
  			echo "MYSQL_SUFFIX=	+mysql"
  			;;
  		PgSQL)
 -			echo "POSTGRESQL_PORT?=	databases/postgresql7"
 +			echo "POSTGRESQL_PORT?=	databases/postgresql74-client"
  			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
  			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
  			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
  			echo "PGSQL_SUFFIX=	+pgsql"
  			;;
  		PgSQL73)
 -			echo "POSTGRESQL_PORT?=	databases/postgresql73"
 +			echo "POSTGRESQL_PORT?=	databases/postgresql73-client"
  			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
  			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
  			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
  			echo "PGSQL_SUFFIX=	+pgsql"
  			;;
 -		PgSQL72)
 -			echo "POSTGRESQL_PORT?=	databases/postgresql72"
 -			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}"
 -			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
 -			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
 -			echo "PGSQL_SUFFIX=	+pgsql"
 -			;;
  		OpenLDAP)
  			echo "USE_OPENLDAP=YES"
  			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 @@ -205,37 +192,6 @@
  #			echo "MAN1+=		smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
  			SUB_TEST=""
  			;;
 -		IPv6)
 -			if [ X$SUB_TLS = "X" ]; then
 -				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
 -				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 -				exit 1
 -			fi
 -			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
 -			echo "PATCHFILES+=	ipv6-1.25-pf-2.2-20040616.patch.gz"
 -			echo "PATCH_DIST_STRIP=	-p1"
 -			echo "IPv6_SUFFIX=	+ipv6"
 -			echo ""
 -			IPv6SELECTED=YES
 -			SUB_IPV6=""
 -			;;
 -		IPv6TLS)
 -			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
 -				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
 -				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 -				exit 1
 -			fi
 -			echo "MAN8+=		tlsmgr.8"
 -			echo "USE_OPENSSL=	yes"
 -			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.25-pf-2.2-20040616.patch.gz"
 -			echo "PATCH_DIST_STRIP=	-p1"
 -			echo "TLS_SUFFIX=	+tls+ipv6"
 -			SUB_TLS=""
 -			SUB_IPV6=""
 -			;;
  		*)
  			echo "Unknown option(s): $*" > /dev/stderr
  			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 @@ -245,12 +201,10 @@
  	shift
  done
  
 -echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
  echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
 -echo "PLIST_SUB+=	SUB_IPV6=\"${SUB_IPV6}\""
  
  # for some reason, if we alter the pkg name this way, the first build (where
  # we ask the configure questions) doesn't pick up the extensions, but
  # any subsequent build will.  so "make; make install" will build twice.
  # don't do this for now.
 -#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}\${NIS_SUFFIX}"
 +#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"
 
 --------------040706050802070307050001--

From: Marcus Grando <marcus@corp.grupos.com.br>
To: freebsd-gnats-submit@FreeBSD.org, vivek@khera.org
Cc:  
Subject: Re: ports/76830: Update port: mail/postfix-current change to 2.2-20050119
Date: Sat, 12 Feb 2005 00:02:39 -0200

 This is a multi-part message in MIME format.
 --------------070502000902060306060409
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 New patch...
 
 Update port: mail/postfix-current change to 2.2-20050210
 
 + Change to 2.2-20050210
 + Remove IPV6 options. Because IPV6 detect automaticaly.
 + Corrected TLS option
 + Adding Kerberos5 option. (from mail/postfix)
 + Fix PostgreSQL
 
 Attached.
 
 -- 
 Marcus Grando
 Grupos Internet S/A
 marcus(at)corp.grupos.com.br
 
 --------------070502000902060306060409
 Content-Type: text/plain;
  name="postfix-current.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="postfix-current.patch"
 
 diff -ruN postfix-current/Makefile postfix-current.old/Makefile
 --- postfix-current/Makefile	Fri Feb 11 23:53:11 2005
 +++ postfix-current.old/Makefile	Sat Nov 27 00:24:12 2004
 @@ -7,7 +7,7 @@
  
  # To pre-select options in batch mode, run make like this:
  #
 -#  make -DBATCH POSTFIX_OPTIONS="DB3 TLS"
 +#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
  #
  # the options are the same names as in the scripts/configure.postfix file.
  # POSTFIX_OPTIONS can be set in /etc/make.conf also.
 @@ -15,7 +15,7 @@
  # NOTE: PCRE is enabled by default unless you specifically disable it.
  
  PORTNAME=	postfix
 -PORTVERSIONRAW=	2.2-20050210
 +PORTVERSIONRAW=	2.2-20041030
  PORTVERSION=	${PORTVERSIONRAW:S/-/./}
  PORTEPOCH=	2
  CATEGORIES=	mail ipv6
 @@ -45,16 +45,19 @@
  MAN5=	access.5 aliases.5 canonical.5 cidr_table.5 ldap_table.5 \
  	mysql_table.5 pgsql_table.5 postconf.5 pcre_table.5 \
  	regexp_table.5 relocated.5 tcp_table.5 transport.5 virtual.5 \
 -	header_checks.5 body_checks.5 master.5 nisplus_table.5 \
 -	generics.5
 +	header_checks.5 body_checks.5 master.5 nisplus_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 discard.8 tlsmgr.8
 +	scache.8 discard.8
 +
 +# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
 +# patch it.
 +MAN8base=$(MAN8:S/tlsmgr.8//)
  
  CONF1=	main.cf master.cf access aliases canonical header_checks relocated \
 -	transport virtual generics
 +	transport virtual
  
  README=	ADDRESS_CLASS_README ADDRESS_REWRITING_README \
  	ADDRESS_VERIFICATION_README BACKSCATTER_README \
 @@ -67,7 +70,7 @@
  	SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
  	SMTPD_PROXY_README STANDARD_CONFIGURATION_README TUNING_README \
  	ULTRIX_README UUCP_README VERP_README VIRTUAL_README \
 -	XCLIENT_README XFORWARD_README IPV6_README TLS_README
 +	XCLIENT_README XFORWARD_README
  
  .if !defined(DEBUG)
  MAKEFILEFLAGS+=	DEBUG=
 @@ -135,18 +138,18 @@
  
  do-install:
  	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
 -	config_directory=${PREFIX}/etc/postfix \
 -	daemon_directory=${PREFIX}/libexec/postfix \
 -	command_directory=${PREFIX}/sbin \
 -	queue_directory=/var/spool/postfix \
 -	sendmail_path=${PREFIX}/sbin/sendmail \
 -	newaliases_path=${PREFIX}/bin/newaliases \
 -	mailq_path=${PREFIX}/bin/mailq \
 -	mail_owner=postfix \
 -	setgid_group=maildrop \
 -	manpage_directory=${PREFIX}/man \
 -	sample_directory=${PREFIX}/etc/postfix \
 -	readme_directory=${READMEDIR}
 +	 config_directory=${PREFIX}/etc/postfix \
 +	 daemon_directory=${PREFIX}/libexec/postfix \
 +	 command_directory=${PREFIX}/sbin \
 +	 queue_directory=/var/spool/postfix \
 +	 sendmail_path=${PREFIX}/sbin/sendmail \
 +	 newaliases_path=${PREFIX}/bin/newaliases \
 +	 mailq_path=${PREFIX}/bin/mailq \
 +	 mail_owner=postfix \
 +	 setgid_group=maildrop \
 +	 manpage_directory=${PREFIX}/man \
 +	 sample_directory=${PREFIX}/etc/postfix \
 +	 readme_directory=${READMEDIR}
  
  .for f in ${CONF1}
  	${INSTALL_DATA} ${WRKSRC}/conf/${f} \
 diff -ruN postfix-current/distinfo postfix-current.old/distinfo
 --- postfix-current/distinfo	Fri Feb 11 23:53:41 2005
 +++ postfix-current.old/distinfo	Sat Nov 27 00:24:12 2004
 @@ -1,2 +1,4 @@
 -MD5 (postfix/postfix-2.2-20050210.tar.gz) = 1f4bd984214b6d2eb4452c4b74803245
 -SIZE (postfix/postfix-2.2-20050210.tar.gz) = 2393463
 +MD5 (postfix/postfix-2.2-20041030.tar.gz) = f179f5d50d387d2eb82351bdb03dac9e
 +SIZE (postfix/postfix-2.2-20041030.tar.gz) = 2106328
 +MD5 (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 2f5df0781abd0390611158b4a5fb63c4
 +SIZE (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 239159
 diff -ruN postfix-current/files/patch-freebsd6 postfix-current.old/files/patch-freebsd6
 --- postfix-current/files/patch-freebsd6	Fri Feb 11 23:52:52 2005
 +++ postfix-current.old/files/patch-freebsd6	Tue Aug 24 14:51:22 2004
 @@ -9,3 +9,26 @@
     OpenBSD.2*)	SYSTYPE=OPENBSD2
   		;;
     OpenBSD.3*)	SYSTYPE=OPENBSD3
 +--- makedefs.snapshot_orig	Wed Apr 14 14:18:06 2004
 ++++ makedefs.snapshot	Fri Aug 20 15:08:54 2004
 +@@ -93,6 +93,8 @@
 + 		;;
 +   FreeBSD.5*)	SYSTYPE=FREEBSD5
 + 		;;
 ++  FreeBSD.6*)	SYSTYPE=FREEBSD5
 ++		;;
 +   OpenBSD.2*)	SYSTYPE=OPENBSD2
 + 		;;
 +   OpenBSD.3*)	SYSTYPE=OPENBSD3
 +===cut-here===
 +--- makedefs.stable_orig	Wed Apr 14 13:59:43 2004
 ++++ makedefs.stable	Fri Aug 20 15:10:13 2004
 +@@ -93,6 +93,8 @@
 + 		;;
 +   FreeBSD.5*)	SYSTYPE=FREEBSD5
 + 		;;
 ++  FreeBSD.6*)	SYSTYPE=FREEBSD5
 ++		;;
 +   OpenBSD.2*)	SYSTYPE=OPENBSD2
 + 		;;
 +   OpenBSD.3*)	SYSTYPE=OPENBSD3
 diff -ruN postfix-current/pkg-plist postfix-current.old/pkg-plist
 --- postfix-current/pkg-plist	Fri Feb 11 23:52:52 2005
 +++ postfix-current.old/pkg-plist	Sat Nov 27 00:24:12 2004
 @@ -7,9 +7,7 @@
  @unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist-relocated; then rm -f %D/etc/postfix/relocated; fi
  @unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist-transport; then rm -f %D/etc/postfix/transport; fi
  @unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist-virtual; then rm -f %D/etc/postfix/virtual; fi
 -@unexec if cmp -s %D/etc/postfix/generics %D/etc/postfix/dist-generics; then rm -f %D/etc/postfix/generics; fi
  etc/postfix/LICENSE
 -etc/postfix/TLS_LICENSE
  etc/postfix/main.cf.default
  etc/postfix/makedefs.out
  etc/postfix/post-install
 @@ -48,7 +46,7 @@
  libexec/postfix/trivial-rewrite
  libexec/postfix/verify
  libexec/postfix/virtual
 -libexec/postfix/tlsmgr
 +%%SUB_TLS%%libexec/postfix/tlsmgr
  sbin/postalias
  sbin/postcat
  sbin/postconf
 @@ -95,11 +93,7 @@
  %%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
  %%PORTDOCS%%%%DOCSDIR%%/INSTALL
  %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
 -%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
 -%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
 -%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
 -%%PORTDOCS%%%%DOCSDIR%%/TLS_README
 -%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
 +%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
  %%PORTDOCS%%%%DOCSDIR%%/LDAP_README
  %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
  %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
 @@ -221,8 +215,6 @@
  %%PORTDOCS%%%%DOCSDIR%%/verify.8.html
  %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
  %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
 -%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
 -%%PORTDOCS%%%%DOCSDIR%%/generics.5.html
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
  @dirrm libexec/postfix
  @unexec rmdir %D/etc/postfix  2>/dev/null || true
 diff -ruN postfix-current/scripts/configure.postfix postfix-current.old/scripts/configure.postfix
 --- postfix-current/scripts/configure.postfix	Fri Feb 11 23:52:52 2005
 +++ postfix-current.old/scripts/configure.postfix	Sat Nov 27 00:24:12 2004
 @@ -23,8 +23,9 @@
  SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
  SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
  SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
 -SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
 -TLS		"SSL and TLS" "$status_TLS" \
 +TLS		"SSL and TLS (BROKEN)" "$status_TLS" \
 +IPv6		"IPv6 support (BROKEN)" "$status_IPv6" \
 +IPv6TLS		"IPv6 support with SSL and TLS (BROKEN)" "$status_IPv6TLS" \
  DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
  DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
  DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 @@ -32,6 +33,7 @@
  MySQL		"MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
  PgSQL		"PostgreSQL v7.4 map lookups" "$status_PgSQL" \
  PgSQL73		"PostgreSQL v7.3 map lookups" "$status_PgSQL73" \
 +PgSQL72		"PostgreSQL v7.2 map lookups" "$status_PgSQL72" \
  OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
  NIS		"NIS map lookups" "$status_NIS" \
  Test		"SMTP/LMTP test server and generator" "$status_Test" \
 @@ -60,7 +62,9 @@
  
  echo "PREFIX=	${PREFIX}"
  
 +SUB_TLS="@comment "
  SUB_TEST="@comment "
 +SUB_IPV6="@comment "
  
  while [ "$1" ]; do
  	case $1 in
 @@ -100,14 +104,16 @@
  		SASLKRB)
                          echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
  			;;
 -		SASLKRB5)
 -			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
 -			;;
  		TLS)
 +			echo "MAN8+=		tlsmgr.8"
  			echo "USE_OPENSSL=	yes"
 -			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
 +			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
  			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 +			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz"
 +			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.19-2.2-20040919-0.9.7d/pfixtls.diff"
 +			echo "PATCH_STRIP=	-p1"
  			echo "TLS_SUFFIX=	+tls"
 +			SUB_TLS=""
  			;;
  		DB3)
  			if [ "X$BDB_SELECTED" != "X" ]; then
 @@ -164,19 +170,26 @@
  			echo "MYSQL_SUFFIX=	+mysql"
  			;;
  		PgSQL)
 -			echo "POSTGRESQL_PORT?=	databases/postgresql74-client"
 +			echo "POSTGRESQL_PORT?=	databases/postgresql7"
  			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
  			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
  			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
  			echo "PGSQL_SUFFIX=	+pgsql"
  			;;
  		PgSQL73)
 -			echo "POSTGRESQL_PORT?=	databases/postgresql73-client"
 +			echo "POSTGRESQL_PORT?=	databases/postgresql73"
  			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
  			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
  			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
  			echo "PGSQL_SUFFIX=	+pgsql"
  			;;
 +		PgSQL72)
 +			echo "POSTGRESQL_PORT?=	databases/postgresql72"
 +			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}"
 +			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
 +			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
 +			echo "PGSQL_SUFFIX=	+pgsql"
 +			;;
  		OpenLDAP)
  			echo "USE_OPENLDAP=YES"
  			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 @@ -192,6 +205,37 @@
  #			echo "MAN1+=		smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
  			SUB_TEST=""
  			;;
 +		IPv6)
 +			if [ X$SUB_TLS = "X" ]; then
 +				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
 +				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 +				exit 1
 +			fi
 +			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
 +			echo "PATCHFILES+=	ipv6-1.25-pf-2.2-20040616.patch.gz"
 +			echo "PATCH_DIST_STRIP=	-p1"
 +			echo "IPv6_SUFFIX=	+ipv6"
 +			echo ""
 +			IPv6SELECTED=YES
 +			SUB_IPV6=""
 +			;;
 +		IPv6TLS)
 +			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
 +				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
 +				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 +				exit 1
 +			fi
 +			echo "MAN8+=		tlsmgr.8"
 +			echo "USE_OPENSSL=	yes"
 +			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.25-pf-2.2-20040616.patch.gz"
 +			echo "PATCH_DIST_STRIP=	-p1"
 +			echo "TLS_SUFFIX=	+tls+ipv6"
 +			SUB_TLS=""
 +			SUB_IPV6=""
 +			;;
  		*)
  			echo "Unknown option(s): $*" > /dev/stderr
  			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 @@ -201,10 +245,12 @@
  	shift
  done
  
 +echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
  echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
 +echo "PLIST_SUB+=	SUB_IPV6=\"${SUB_IPV6}\""
  
  # for some reason, if we alter the pkg name this way, the first build (where
  # we ask the configure questions) doesn't pick up the extensions, but
  # any subsequent build will.  so "make; make install" will build twice.
  # don't do this for now.
 -#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"
 +#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}\${NIS_SUFFIX}"
 
 --------------070502000902060306060409--

From: Marcus Grando <marcus@corp.grupos.com.br>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/76830: Update port: mail/postfix-current change to 2.2-20050119
Date: Sat, 12 Feb 2005 21:00:01 -0200

 This is a multi-part message in MIME format.
 --------------000100090805000503060709
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 New patch...
 
 Update port: mail/postfix-current change to 2.2-20050211
 
 + Change to 2.2-20050211
 + Remove IPV6 options. Because IPV6 detect automaticaly.
 + Corrected TLS option
 + Adding Kerberos5 option. (from mail/postfix)
 + Fix PostgreSQL
 
 Attached.
 
 -- 
 Marcus Grando
 Grupos Internet S/A
 marcus(at)corp.grupos.com.br
 
 --------------000100090805000503060709
 Content-Type: text/plain;
  name="postfix-current.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="postfix-current.patch"
 
 diff -ruN postfix-current.old/Makefile postfix-current/Makefile
 --- postfix-current.old/Makefile	Sat Nov 27 00:24:12 2004
 +++ postfix-current/Makefile	Sat Feb 12 20:52:51 2005
 @@ -7,7 +7,7 @@
  
  # To pre-select options in batch mode, run make like this:
  #
 -#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
 +#  make -DBATCH POSTFIX_OPTIONS="DB3 TLS"
  #
  # the options are the same names as in the scripts/configure.postfix file.
  # POSTFIX_OPTIONS can be set in /etc/make.conf also.
 @@ -15,7 +15,7 @@
  # NOTE: PCRE is enabled by default unless you specifically disable it.
  
  PORTNAME=	postfix
 -PORTVERSIONRAW=	2.2-20041030
 +PORTVERSIONRAW=	2.2-20050211
  PORTVERSION=	${PORTVERSIONRAW:S/-/./}
  PORTEPOCH=	2
  CATEGORIES=	mail ipv6
 @@ -45,19 +45,16 @@
  MAN5=	access.5 aliases.5 canonical.5 cidr_table.5 ldap_table.5 \
  	mysql_table.5 pgsql_table.5 postconf.5 pcre_table.5 \
  	regexp_table.5 relocated.5 tcp_table.5 transport.5 virtual.5 \
 -	header_checks.5 body_checks.5 master.5 nisplus_table.5
 +	header_checks.5 body_checks.5 master.5 nisplus_table.5 \
 +	generic.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 discard.8
 -
 -# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
 -# patch it.
 -MAN8base=$(MAN8:S/tlsmgr.8//)
 +	scache.8 discard.8 tlsmgr.8
  
  CONF1=	main.cf master.cf access aliases canonical header_checks relocated \
 -	transport virtual
 +	transport virtual generic
  
  README=	ADDRESS_CLASS_README ADDRESS_REWRITING_README \
  	ADDRESS_VERIFICATION_README BACKSCATTER_README \
 @@ -70,7 +67,7 @@
  	SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
  	SMTPD_PROXY_README STANDARD_CONFIGURATION_README TUNING_README \
  	ULTRIX_README UUCP_README VERP_README VIRTUAL_README \
 -	XCLIENT_README XFORWARD_README
 +	XCLIENT_README XFORWARD_README IPV6_README TLS_README
  
  .if !defined(DEBUG)
  MAKEFILEFLAGS+=	DEBUG=
 @@ -138,18 +135,18 @@
  
  do-install:
  	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
 -	 config_directory=${PREFIX}/etc/postfix \
 -	 daemon_directory=${PREFIX}/libexec/postfix \
 -	 command_directory=${PREFIX}/sbin \
 -	 queue_directory=/var/spool/postfix \
 -	 sendmail_path=${PREFIX}/sbin/sendmail \
 -	 newaliases_path=${PREFIX}/bin/newaliases \
 -	 mailq_path=${PREFIX}/bin/mailq \
 -	 mail_owner=postfix \
 -	 setgid_group=maildrop \
 -	 manpage_directory=${PREFIX}/man \
 -	 sample_directory=${PREFIX}/etc/postfix \
 -	 readme_directory=${READMEDIR}
 +	config_directory=${PREFIX}/etc/postfix \
 +	daemon_directory=${PREFIX}/libexec/postfix \
 +	command_directory=${PREFIX}/sbin \
 +	queue_directory=/var/spool/postfix \
 +	sendmail_path=${PREFIX}/sbin/sendmail \
 +	newaliases_path=${PREFIX}/bin/newaliases \
 +	mailq_path=${PREFIX}/bin/mailq \
 +	mail_owner=postfix \
 +	setgid_group=maildrop \
 +	manpage_directory=${PREFIX}/man \
 +	sample_directory=${PREFIX}/etc/postfix \
 +	readme_directory=${READMEDIR}
  
  .for f in ${CONF1}
  	${INSTALL_DATA} ${WRKSRC}/conf/${f} \
 diff -ruN postfix-current.old/distinfo postfix-current/distinfo
 --- postfix-current.old/distinfo	Sat Nov 27 00:24:12 2004
 +++ postfix-current/distinfo	Sat Feb 12 20:50:48 2005
 @@ -1,4 +1,2 @@
 -MD5 (postfix/postfix-2.2-20041030.tar.gz) = f179f5d50d387d2eb82351bdb03dac9e
 -SIZE (postfix/postfix-2.2-20041030.tar.gz) = 2106328
 -MD5 (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 2f5df0781abd0390611158b4a5fb63c4
 -SIZE (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 239159
 +MD5 (postfix/postfix-2.2-20050211.tar.gz) = 33c6c0215fc3a136e24fc42f6cfded95
 +SIZE (postfix/postfix-2.2-20050211.tar.gz) = 2396343
 diff -ruN postfix-current.old/files/patch-freebsd6 postfix-current/files/patch-freebsd6
 --- postfix-current.old/files/patch-freebsd6	Tue Aug 24 14:51:22 2004
 +++ postfix-current/files/patch-freebsd6	Sat Feb 12 20:49:00 2005
 @@ -9,26 +9,3 @@
     OpenBSD.2*)	SYSTYPE=OPENBSD2
   		;;
     OpenBSD.3*)	SYSTYPE=OPENBSD3
 ---- makedefs.snapshot_orig	Wed Apr 14 14:18:06 2004
 -+++ makedefs.snapshot	Fri Aug 20 15:08:54 2004
 -@@ -93,6 +93,8 @@
 - 		;;
 -   FreeBSD.5*)	SYSTYPE=FREEBSD5
 - 		;;
 -+  FreeBSD.6*)	SYSTYPE=FREEBSD5
 -+		;;
 -   OpenBSD.2*)	SYSTYPE=OPENBSD2
 - 		;;
 -   OpenBSD.3*)	SYSTYPE=OPENBSD3
 -===cut-here===
 ---- makedefs.stable_orig	Wed Apr 14 13:59:43 2004
 -+++ makedefs.stable	Fri Aug 20 15:10:13 2004
 -@@ -93,6 +93,8 @@
 - 		;;
 -   FreeBSD.5*)	SYSTYPE=FREEBSD5
 - 		;;
 -+  FreeBSD.6*)	SYSTYPE=FREEBSD5
 -+		;;
 -   OpenBSD.2*)	SYSTYPE=OPENBSD2
 - 		;;
 -   OpenBSD.3*)	SYSTYPE=OPENBSD3
 diff -ruN postfix-current.old/pkg-plist postfix-current/pkg-plist
 --- postfix-current.old/pkg-plist	Sat Nov 27 00:24:12 2004
 +++ postfix-current/pkg-plist	Sat Feb 12 20:53:07 2005
 @@ -7,7 +7,9 @@
  @unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist-relocated; then rm -f %D/etc/postfix/relocated; fi
  @unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist-transport; then rm -f %D/etc/postfix/transport; fi
  @unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist-virtual; then rm -f %D/etc/postfix/virtual; fi
 +@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist-generic; then rm -f %D/etc/postfix/generic; fi
  etc/postfix/LICENSE
 +etc/postfix/TLS_LICENSE
  etc/postfix/main.cf.default
  etc/postfix/makedefs.out
  etc/postfix/post-install
 @@ -46,7 +48,7 @@
  libexec/postfix/trivial-rewrite
  libexec/postfix/verify
  libexec/postfix/virtual
 -%%SUB_TLS%%libexec/postfix/tlsmgr
 +libexec/postfix/tlsmgr
  sbin/postalias
  sbin/postcat
  sbin/postconf
 @@ -93,7 +95,11 @@
  %%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
  %%PORTDOCS%%%%DOCSDIR%%/INSTALL
  %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
 -%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
 +%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
 +%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
 +%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
 +%%PORTDOCS%%%%DOCSDIR%%/TLS_README
 +%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
  %%PORTDOCS%%%%DOCSDIR%%/LDAP_README
  %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
  %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
 @@ -215,6 +221,8 @@
  %%PORTDOCS%%%%DOCSDIR%%/verify.8.html
  %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
  %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
 +%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
 +%%PORTDOCS%%%%DOCSDIR%%/generic.5.html
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
  @dirrm libexec/postfix
  @unexec rmdir %D/etc/postfix  2>/dev/null || true
 diff -ruN postfix-current.old/scripts/configure.postfix postfix-current/scripts/configure.postfix
 --- postfix-current.old/scripts/configure.postfix	Sat Nov 27 00:24:12 2004
 +++ postfix-current/scripts/configure.postfix	Sat Feb 12 20:49:00 2005
 @@ -23,9 +23,8 @@
  SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
  SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
  SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
 -TLS		"SSL and TLS (BROKEN)" "$status_TLS" \
 -IPv6		"IPv6 support (BROKEN)" "$status_IPv6" \
 -IPv6TLS		"IPv6 support with SSL and TLS (BROKEN)" "$status_IPv6TLS" \
 +SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
 +TLS		"SSL and TLS" "$status_TLS" \
  DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
  DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
  DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 @@ -33,7 +32,6 @@
  MySQL		"MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
  PgSQL		"PostgreSQL v7.4 map lookups" "$status_PgSQL" \
  PgSQL73		"PostgreSQL v7.3 map lookups" "$status_PgSQL73" \
 -PgSQL72		"PostgreSQL v7.2 map lookups" "$status_PgSQL72" \
  OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
  NIS		"NIS map lookups" "$status_NIS" \
  Test		"SMTP/LMTP test server and generator" "$status_Test" \
 @@ -62,9 +60,7 @@
  
  echo "PREFIX=	${PREFIX}"
  
 -SUB_TLS="@comment "
  SUB_TEST="@comment "
 -SUB_IPV6="@comment "
  
  while [ "$1" ]; do
  	case $1 in
 @@ -104,16 +100,14 @@
  		SASLKRB)
                          echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
  			;;
 +		SASLKRB5)
 +			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
 +			;;
  		TLS)
 -			echo "MAN8+=		tlsmgr.8"
  			echo "USE_OPENSSL=	yes"
 -			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 +			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
  			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 -			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz"
 -			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.19-2.2-20040919-0.9.7d/pfixtls.diff"
 -			echo "PATCH_STRIP=	-p1"
  			echo "TLS_SUFFIX=	+tls"
 -			SUB_TLS=""
  			;;
  		DB3)
  			if [ "X$BDB_SELECTED" != "X" ]; then
 @@ -170,26 +164,19 @@
  			echo "MYSQL_SUFFIX=	+mysql"
  			;;
  		PgSQL)
 -			echo "POSTGRESQL_PORT?=	databases/postgresql7"
 +			echo "POSTGRESQL_PORT?=	databases/postgresql74-client"
  			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
  			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
  			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
  			echo "PGSQL_SUFFIX=	+pgsql"
  			;;
  		PgSQL73)
 -			echo "POSTGRESQL_PORT?=	databases/postgresql73"
 +			echo "POSTGRESQL_PORT?=	databases/postgresql73-client"
  			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
  			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
  			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
  			echo "PGSQL_SUFFIX=	+pgsql"
  			;;
 -		PgSQL72)
 -			echo "POSTGRESQL_PORT?=	databases/postgresql72"
 -			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}"
 -			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
 -			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
 -			echo "PGSQL_SUFFIX=	+pgsql"
 -			;;
  		OpenLDAP)
  			echo "USE_OPENLDAP=YES"
  			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 @@ -205,37 +192,6 @@
  #			echo "MAN1+=		smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
  			SUB_TEST=""
  			;;
 -		IPv6)
 -			if [ X$SUB_TLS = "X" ]; then
 -				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
 -				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 -				exit 1
 -			fi
 -			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
 -			echo "PATCHFILES+=	ipv6-1.25-pf-2.2-20040616.patch.gz"
 -			echo "PATCH_DIST_STRIP=	-p1"
 -			echo "IPv6_SUFFIX=	+ipv6"
 -			echo ""
 -			IPv6SELECTED=YES
 -			SUB_IPV6=""
 -			;;
 -		IPv6TLS)
 -			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
 -				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
 -				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 -				exit 1
 -			fi
 -			echo "MAN8+=		tlsmgr.8"
 -			echo "USE_OPENSSL=	yes"
 -			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.25-pf-2.2-20040616.patch.gz"
 -			echo "PATCH_DIST_STRIP=	-p1"
 -			echo "TLS_SUFFIX=	+tls+ipv6"
 -			SUB_TLS=""
 -			SUB_IPV6=""
 -			;;
  		*)
  			echo "Unknown option(s): $*" > /dev/stderr
  			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 @@ -245,12 +201,10 @@
  	shift
  done
  
 -echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
  echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
 -echo "PLIST_SUB+=	SUB_IPV6=\"${SUB_IPV6}\""
  
  # for some reason, if we alter the pkg name this way, the first build (where
  # we ask the configure questions) doesn't pick up the extensions, but
  # any subsequent build will.  so "make; make install" will build twice.
  # don't do this for now.
 -#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}\${NIS_SUFFIX}"
 +#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"
 
 --------------000100090805000503060709--

From: Marcus Grando <marcus@corp.grupos.com.br>
To: Vivek Khera <vivek@khera.org>, freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/76830: Update port: mail/postfix-current change to 2.2-20050119
Date: Mon, 14 Feb 2005 15:39:30 -0200

 This is a multi-part message in MIME format.
 --------------000608000008000808050506
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 New patch...
 
 Update port: mail/postfix-current change to 2.2-20050212
 
 + Take MAINTAINER (Vivek Khera approved)
 + Change to 2.2-20050212
 + Remove IPV6 options. Because IPV6 detect automaticaly.
 + Corrected TLS option
 + Adding Kerberos5 option. (from mail/postfix)
 + Fix PostgreSQL
 
 Attached.
 
 Vivek Khera wrote:
 > would you like to take over maintainership of postfix-current?  you seem 
 > to have more time than I to follow it.
 > 
 > On Feb 11, 2005, at 9:02 PM, Marcus Grando wrote:
 > 
 >> New patch...
 >>
 >> Update port: mail/postfix-current change to 2.2-20050210
 >>
 >> + Change to 2.2-20050210
 >> + Remove IPV6 options. Because IPV6 detect automaticaly.
 >> + Corrected TLS option
 >> + Adding Kerberos5 option. (from mail/postfix)
 >> + Fix PostgreSQL
 > 
 > 
 
 -- 
 Marcus Grando
 Grupos Internet S/A
 marcus(at)corp.grupos.com.br
 
 --------------000608000008000808050506
 Content-Type: text/plain;
  name="postfix-current.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="postfix-current.patch"
 
 diff -ruN postfix-current.old/Makefile postfix-current/Makefile
 --- postfix-current.old/Makefile	Sat Nov 27 00:24:12 2004
 +++ postfix-current/Makefile	Mon Feb 14 15:15:36 2005
 @@ -7,7 +7,7 @@
  
  # To pre-select options in batch mode, run make like this:
  #
 -#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
 +#  make -DBATCH POSTFIX_OPTIONS="DB3 TLS"
  #
  # the options are the same names as in the scripts/configure.postfix file.
  # POSTFIX_OPTIONS can be set in /etc/make.conf also.
 @@ -15,7 +15,7 @@
  # NOTE: PCRE is enabled by default unless you specifically disable it.
  
  PORTNAME=	postfix
 -PORTVERSIONRAW=	2.2-20041030
 +PORTVERSIONRAW=	2.2-20050212
  PORTVERSION=	${PORTVERSIONRAW:S/-/./}
  PORTEPOCH=	2
  CATEGORIES=	mail ipv6
 @@ -30,7 +30,7 @@
  DISTNAME=	postfix-${PORTVERSIONRAW}
  DIST_SUBDIR=	${PORTNAME}
  
 -MAINTAINER=	vivek@khera.org
 +MAINTAINER=	marcus@corp.grupos.com.br
  COMMENT=	A secure alternative to widely-used Sendmail
  
  CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 @@ -45,19 +45,16 @@
  MAN5=	access.5 aliases.5 canonical.5 cidr_table.5 ldap_table.5 \
  	mysql_table.5 pgsql_table.5 postconf.5 pcre_table.5 \
  	regexp_table.5 relocated.5 tcp_table.5 transport.5 virtual.5 \
 -	header_checks.5 body_checks.5 master.5 nisplus_table.5
 +	header_checks.5 body_checks.5 master.5 nisplus_table.5 \
 +	generic.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 discard.8
 -
 -# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
 -# patch it.
 -MAN8base=$(MAN8:S/tlsmgr.8//)
 +	scache.8 discard.8 tlsmgr.8
  
  CONF1=	main.cf master.cf access aliases canonical header_checks relocated \
 -	transport virtual
 +	transport virtual generic
  
  README=	ADDRESS_CLASS_README ADDRESS_REWRITING_README \
  	ADDRESS_VERIFICATION_README BACKSCATTER_README \
 @@ -70,7 +67,7 @@
  	SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
  	SMTPD_PROXY_README STANDARD_CONFIGURATION_README TUNING_README \
  	ULTRIX_README UUCP_README VERP_README VIRTUAL_README \
 -	XCLIENT_README XFORWARD_README
 +	XCLIENT_README XFORWARD_README IPV6_README TLS_README
  
  .if !defined(DEBUG)
  MAKEFILEFLAGS+=	DEBUG=
 @@ -138,18 +135,18 @@
  
  do-install:
  	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
 -	 config_directory=${PREFIX}/etc/postfix \
 -	 daemon_directory=${PREFIX}/libexec/postfix \
 -	 command_directory=${PREFIX}/sbin \
 -	 queue_directory=/var/spool/postfix \
 -	 sendmail_path=${PREFIX}/sbin/sendmail \
 -	 newaliases_path=${PREFIX}/bin/newaliases \
 -	 mailq_path=${PREFIX}/bin/mailq \
 -	 mail_owner=postfix \
 -	 setgid_group=maildrop \
 -	 manpage_directory=${PREFIX}/man \
 -	 sample_directory=${PREFIX}/etc/postfix \
 -	 readme_directory=${READMEDIR}
 +	config_directory=${PREFIX}/etc/postfix \
 +	daemon_directory=${PREFIX}/libexec/postfix \
 +	command_directory=${PREFIX}/sbin \
 +	queue_directory=/var/spool/postfix \
 +	sendmail_path=${PREFIX}/sbin/sendmail \
 +	newaliases_path=${PREFIX}/bin/newaliases \
 +	mailq_path=${PREFIX}/bin/mailq \
 +	mail_owner=postfix \
 +	setgid_group=maildrop \
 +	manpage_directory=${PREFIX}/man \
 +	sample_directory=${PREFIX}/etc/postfix \
 +	readme_directory=${READMEDIR}
  
  .for f in ${CONF1}
  	${INSTALL_DATA} ${WRKSRC}/conf/${f} \
 diff -ruN postfix-current.old/distinfo postfix-current/distinfo
 --- postfix-current.old/distinfo	Sat Nov 27 00:24:12 2004
 +++ postfix-current/distinfo	Mon Feb 14 15:16:12 2005
 @@ -1,4 +1,2 @@
 -MD5 (postfix/postfix-2.2-20041030.tar.gz) = f179f5d50d387d2eb82351bdb03dac9e
 -SIZE (postfix/postfix-2.2-20041030.tar.gz) = 2106328
 -MD5 (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 2f5df0781abd0390611158b4a5fb63c4
 -SIZE (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 239159
 +MD5 (postfix/postfix-2.2-20050212.tar.gz) = 12191a2c250eecc56d944c2050593c16
 +SIZE (postfix/postfix-2.2-20050212.tar.gz) = 2397152
 diff -ruN postfix-current.old/files/patch-freebsd6 postfix-current/files/patch-freebsd6
 --- postfix-current.old/files/patch-freebsd6	Tue Aug 24 14:51:22 2004
 +++ postfix-current/files/patch-freebsd6	Mon Feb 14 15:15:05 2005
 @@ -9,26 +9,3 @@
     OpenBSD.2*)	SYSTYPE=OPENBSD2
   		;;
     OpenBSD.3*)	SYSTYPE=OPENBSD3
 ---- makedefs.snapshot_orig	Wed Apr 14 14:18:06 2004
 -+++ makedefs.snapshot	Fri Aug 20 15:08:54 2004
 -@@ -93,6 +93,8 @@
 - 		;;
 -   FreeBSD.5*)	SYSTYPE=FREEBSD5
 - 		;;
 -+  FreeBSD.6*)	SYSTYPE=FREEBSD5
 -+		;;
 -   OpenBSD.2*)	SYSTYPE=OPENBSD2
 - 		;;
 -   OpenBSD.3*)	SYSTYPE=OPENBSD3
 -===cut-here===
 ---- makedefs.stable_orig	Wed Apr 14 13:59:43 2004
 -+++ makedefs.stable	Fri Aug 20 15:10:13 2004
 -@@ -93,6 +93,8 @@
 - 		;;
 -   FreeBSD.5*)	SYSTYPE=FREEBSD5
 - 		;;
 -+  FreeBSD.6*)	SYSTYPE=FREEBSD5
 -+		;;
 -   OpenBSD.2*)	SYSTYPE=OPENBSD2
 - 		;;
 -   OpenBSD.3*)	SYSTYPE=OPENBSD3
 diff -ruN postfix-current.old/pkg-plist postfix-current/pkg-plist
 --- postfix-current.old/pkg-plist	Sat Nov 27 00:24:12 2004
 +++ postfix-current/pkg-plist	Mon Feb 14 15:29:05 2005
 @@ -7,7 +7,9 @@
  @unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist-relocated; then rm -f %D/etc/postfix/relocated; fi
  @unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist-transport; then rm -f %D/etc/postfix/transport; fi
  @unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist-virtual; then rm -f %D/etc/postfix/virtual; fi
 +@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist-generic; then rm -f %D/etc/postfix/generic; fi
  etc/postfix/LICENSE
 +etc/postfix/TLS_LICENSE
  etc/postfix/main.cf.default
  etc/postfix/makedefs.out
  etc/postfix/post-install
 @@ -22,6 +24,7 @@
  etc/postfix/dist-relocated
  etc/postfix/dist-transport
  etc/postfix/dist-virtual
 +etc/postfix/dist-generic
  libexec/postfix/anvil
  libexec/postfix/bounce
  libexec/postfix/cleanup
 @@ -46,7 +49,7 @@
  libexec/postfix/trivial-rewrite
  libexec/postfix/verify
  libexec/postfix/virtual
 -%%SUB_TLS%%libexec/postfix/tlsmgr
 +libexec/postfix/tlsmgr
  sbin/postalias
  sbin/postcat
  sbin/postconf
 @@ -93,7 +96,11 @@
  %%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
  %%PORTDOCS%%%%DOCSDIR%%/INSTALL
  %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
 -%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
 +%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
 +%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
 +%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
 +%%PORTDOCS%%%%DOCSDIR%%/TLS_README
 +%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
  %%PORTDOCS%%%%DOCSDIR%%/LDAP_README
  %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
  %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
 @@ -215,6 +222,8 @@
  %%PORTDOCS%%%%DOCSDIR%%/verify.8.html
  %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
  %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
 +%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
 +%%PORTDOCS%%%%DOCSDIR%%/generic.5.html
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
  @dirrm libexec/postfix
  @unexec rmdir %D/etc/postfix  2>/dev/null || true
 diff -ruN postfix-current.old/scripts/configure.postfix postfix-current/scripts/configure.postfix
 --- postfix-current.old/scripts/configure.postfix	Sat Nov 27 00:24:12 2004
 +++ postfix-current/scripts/configure.postfix	Mon Feb 14 15:15:05 2005
 @@ -23,9 +23,8 @@
  SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
  SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
  SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
 -TLS		"SSL and TLS (BROKEN)" "$status_TLS" \
 -IPv6		"IPv6 support (BROKEN)" "$status_IPv6" \
 -IPv6TLS		"IPv6 support with SSL and TLS (BROKEN)" "$status_IPv6TLS" \
 +SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
 +TLS		"SSL and TLS" "$status_TLS" \
  DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
  DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
  DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 @@ -33,7 +32,6 @@
  MySQL		"MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
  PgSQL		"PostgreSQL v7.4 map lookups" "$status_PgSQL" \
  PgSQL73		"PostgreSQL v7.3 map lookups" "$status_PgSQL73" \
 -PgSQL72		"PostgreSQL v7.2 map lookups" "$status_PgSQL72" \
  OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
  NIS		"NIS map lookups" "$status_NIS" \
  Test		"SMTP/LMTP test server and generator" "$status_Test" \
 @@ -62,9 +60,7 @@
  
  echo "PREFIX=	${PREFIX}"
  
 -SUB_TLS="@comment "
  SUB_TEST="@comment "
 -SUB_IPV6="@comment "
  
  while [ "$1" ]; do
  	case $1 in
 @@ -104,16 +100,14 @@
  		SASLKRB)
                          echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
  			;;
 +		SASLKRB5)
 +			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
 +			;;
  		TLS)
 -			echo "MAN8+=		tlsmgr.8"
  			echo "USE_OPENSSL=	yes"
 -			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 +			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
  			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 -			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz"
 -			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.19-2.2-20040919-0.9.7d/pfixtls.diff"
 -			echo "PATCH_STRIP=	-p1"
  			echo "TLS_SUFFIX=	+tls"
 -			SUB_TLS=""
  			;;
  		DB3)
  			if [ "X$BDB_SELECTED" != "X" ]; then
 @@ -170,26 +164,19 @@
  			echo "MYSQL_SUFFIX=	+mysql"
  			;;
  		PgSQL)
 -			echo "POSTGRESQL_PORT?=	databases/postgresql7"
 +			echo "POSTGRESQL_PORT?=	databases/postgresql74-client"
  			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
  			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
  			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
  			echo "PGSQL_SUFFIX=	+pgsql"
  			;;
  		PgSQL73)
 -			echo "POSTGRESQL_PORT?=	databases/postgresql73"
 +			echo "POSTGRESQL_PORT?=	databases/postgresql73-client"
  			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
  			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
  			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
  			echo "PGSQL_SUFFIX=	+pgsql"
  			;;
 -		PgSQL72)
 -			echo "POSTGRESQL_PORT?=	databases/postgresql72"
 -			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}"
 -			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
 -			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
 -			echo "PGSQL_SUFFIX=	+pgsql"
 -			;;
  		OpenLDAP)
  			echo "USE_OPENLDAP=YES"
  			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 @@ -205,37 +192,6 @@
  #			echo "MAN1+=		smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
  			SUB_TEST=""
  			;;
 -		IPv6)
 -			if [ X$SUB_TLS = "X" ]; then
 -				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
 -				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 -				exit 1
 -			fi
 -			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
 -			echo "PATCHFILES+=	ipv6-1.25-pf-2.2-20040616.patch.gz"
 -			echo "PATCH_DIST_STRIP=	-p1"
 -			echo "IPv6_SUFFIX=	+ipv6"
 -			echo ""
 -			IPv6SELECTED=YES
 -			SUB_IPV6=""
 -			;;
 -		IPv6TLS)
 -			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
 -				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
 -				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 -				exit 1
 -			fi
 -			echo "MAN8+=		tlsmgr.8"
 -			echo "USE_OPENSSL=	yes"
 -			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.25-pf-2.2-20040616.patch.gz"
 -			echo "PATCH_DIST_STRIP=	-p1"
 -			echo "TLS_SUFFIX=	+tls+ipv6"
 -			SUB_TLS=""
 -			SUB_IPV6=""
 -			;;
  		*)
  			echo "Unknown option(s): $*" > /dev/stderr
  			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 @@ -245,12 +201,10 @@
  	shift
  done
  
 -echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
  echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
 -echo "PLIST_SUB+=	SUB_IPV6=\"${SUB_IPV6}\""
  
  # for some reason, if we alter the pkg name this way, the first build (where
  # we ask the configure questions) doesn't pick up the extensions, but
  # any subsequent build will.  so "make; make install" will build twice.
  # don't do this for now.
 -#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}\${NIS_SUFFIX}"
 +#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"
 
 --------------000608000008000808050506--

From: Vivek Khera <vivek@khera.org>
To: Marcus Grando <marcus@corp.grupos.com.br>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/76830: Update port: mail/postfix-current change to 2.2-20050119
Date: Mon, 14 Feb 2005 14:03:42 -0500

 On Feb 14, 2005, at 12:39 PM, Marcus Grando wrote:
 
 > Update port: mail/postfix-current change to 2.2-20050212
 >
 > + Take MAINTAINER (Vivek Khera approved)
 > + Change to 2.2-20050212
 >
 
 Just noting my approval of the MAINTAINER change in the PR.
 
 Thanks!
 
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Mon Feb 14 19:47:58 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=76830 
>Unformatted:
