Update to 20011121 and TLS to go with it

PR:		32068
Submitted by:	matthias.andree@web.de

10 files changed, 49 insertions, 49 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index ef1e6d9c8440..a57b69e00904 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	20011104
+PORTVERSION=	20011121
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 257fde9fe2c1..146db738f2d1 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,2 +1,2 @@
-MD5 (postfix/snapshot-20011104.tar.gz) = b33235d9f2f3be74f0c992f56241a5d2
-MD5 (postfix/pfixtls-0.7.12-snap20011104-0.9.6b.tar.gz) = e8b1e0392a73a2fbbb935233a3c7c852
+MD5 (postfix/snapshot-20011121.tar.gz) = 3c79dd6ce991eb6188332b7d79d856ca
+MD5 (postfix/pfixtls-0.7.13a-snap20011121-0.9.6b.tar.gz) = 9803b8055d045b4d2515c3ef022f5372
diff --git a/mail/postfix-current/files/patch-aa b/mail/postfix-current/files/patch-aa
index a5f9ee7a5b2e..74bbbb38d097 100644
--- a/mail/postfix-current/files/patch-aa
+++ b/mail/postfix-current/files/patch-aa
@@ -50,8 +50,8 @@
 ***************
 *** 209,211 ****
   #
-! # mail_spool_directory = /var/mail
-  # mail_spool_directory = /var/spool/mail
+! #mail_spool_directory = /var/mail
+  #mail_spool_directory = /var/spool/mail
 --- 209,211 ----
   #
 ! mail_spool_directory = /var/mail
diff --git a/mail/postfix-current/files/patch-ah b/mail/postfix-current/files/patch-ah
index c8c769e8f815..a8c70a15a78d 100644
--- a/mail/postfix-current/files/patch-ah
+++ b/mail/postfix-current/files/patch-ah
@@ -12,33 +12,33 @@
 ***************
 *** 19,24 ****
   #
-! # canonical_maps = dbm:/etc/postfix/canonical
-! # canonical_maps = hash:/etc/postfix/canonical
-! # canonical_maps = hash:/etc/postfix/canonical, nis:canonical
-! # canonical_maps = hash:/etc/postfix/canonical, netinfo:/canonical
+! #canonical_maps = dbm:/etc/postfix/canonical
+! #canonical_maps = hash:/etc/postfix/canonical
+! #canonical_maps = hash:/etc/postfix/canonical, nis:canonical
+! #canonical_maps = hash:/etc/postfix/canonical, netinfo:/canonical
   canonical_maps = 
 --- 19,24 ----
   #
-! # canonical_maps = dbm:!!PREFIX!!/etc/postfix/canonical
-! # canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical
-! # canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, nis:canonical
-! # canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, netinfo:/canonical
+! #canonical_maps = dbm:!!PREFIX!!/etc/postfix/canonical
+! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical
+! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, nis:canonical
+! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, netinfo:/canonical
   canonical_maps = 
 ***************
 *** 32,34 ****
   #
-! # recipient_canonical_maps = hash:/etc/postfix/recipient_canonical
+! #recipient_canonical_maps = hash:/etc/postfix/recipient_canonical
   recipient_canonical_maps = 
 --- 32,34 ----
   #
-! # recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical
+! #recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical
   recipient_canonical_maps = 
 ***************
 *** 46,48 ****
   #
-! # sender_canonical_maps = hash:/etc/postfix/sender_canonical
+! #sender_canonical_maps = hash:/etc/postfix/sender_canonical
   sender_canonical_maps = 
 --- 46,48 ----
   #
-! # sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical
+! #sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical
   sender_canonical_maps = 
diff --git a/mail/postfix-current/files/patch-aj b/mail/postfix-current/files/patch-aj
index 2f27afd4a13a..241d48132551 100644
--- a/mail/postfix-current/files/patch-aj
+++ b/mail/postfix-current/files/patch-aj
@@ -14,11 +14,11 @@
   # Specify the types and names of databases to use.  After change,
 ! # run "postmap /etc/postfix/relocated", then "postfix reload".
   #
-! # relocated_maps = hash:/etc/postfix/relocated
+! #relocated_maps = hash:/etc/postfix/relocated
   relocated_maps =
 --- 263,267 ----
   # Specify the types and names of databases to use.  After change,
 ! # run "postmap !!PREFIX!!/etc/postfix/relocated", then "postfix reload".
   #
-! # relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated
+! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated
   relocated_maps =
diff --git a/mail/postfix-current/files/patch-ak b/mail/postfix-current/files/patch-ak
index 249a427016f2..250dd411a4bd 100644
--- a/mail/postfix-current/files/patch-ak
+++ b/mail/postfix-current/files/patch-ak
@@ -12,15 +12,15 @@
 ***************
 *** 16,21 ****
   #
-! # relocated_maps = dbm:/etc/postfix/relocated
-! # relocated_maps = hash:/etc/postfix/relocated
-! # relocated_maps = hash:/etc/postfix/relocated, nis:virtual
-! # relocated_maps = hash:/etc/postfix/relocated, netinfo:/relocated
+! #relocated_maps = dbm:/etc/postfix/relocated
+! #relocated_maps = hash:/etc/postfix/relocated
+! #relocated_maps = hash:/etc/postfix/relocated, nis:virtual
+! #relocated_maps = hash:/etc/postfix/relocated, netinfo:/relocated
   relocated_maps = 
 --- 16,21 ----
   #
-! # relocated_maps = dbm:!!PREFIX!!/etc/postfix/relocated
-! # relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated
-! # relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, nis:virtual
-! # relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, netinfo:/relocated
+! #relocated_maps = dbm:!!PREFIX!!/etc/postfix/relocated
+! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated
+! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, nis:virtual
+! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, netinfo:/relocated
   relocated_maps = 
diff --git a/mail/postfix-current/files/patch-al b/mail/postfix-current/files/patch-al
index d363aba1d02e..799206da0c96 100644
--- a/mail/postfix-current/files/patch-al
+++ b/mail/postfix-current/files/patch-al
@@ -2,10 +2,10 @@
 --- ./conf/sample-smtpd.cf	Thu Jun  1 22:11:22 2000
 ***************
 *** 183,185 ****
-  # smtpd_sender_restrictions = reject_unknown_sender_domain
-! # smtpd_sender_restrictions = reject_unknown_sender_domain, hash:/etc/postfix/access
+  #smtpd_sender_restrictions = reject_unknown_sender_domain
+! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:/etc/postfix/access
   smtpd_sender_restrictions = 
 --- 183,185 ----
-  # smtpd_sender_restrictions = reject_unknown_sender_domain
-! # smtpd_sender_restrictions = reject_unknown_sender_domain, hash:!!PREFIX!!/etc/postfix/access
+  #smtpd_sender_restrictions = reject_unknown_sender_domain
+! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:!!PREFIX!!/etc/postfix/access
   smtpd_sender_restrictions = 
diff --git a/mail/postfix-current/files/patch-am b/mail/postfix-current/files/patch-am
index 3328cc42ab77..2d395fa9ca03 100644
--- a/mail/postfix-current/files/patch-am
+++ b/mail/postfix-current/files/patch-am
@@ -6,18 +6,18 @@
 ! # to use.  If you use this feature, run "postmap /etc/postfix/transport"
   # after change, then "postfix reload".
   # 
-! # transport_maps = dbm:/etc/postfix/transport
-! # transport_maps = hash:/etc/postfix/transport
-! # transport_maps = hash:/etc/postfix/transport, nis:transport
-! # transport_maps = hash:/etc/postfix/transport, netinfo:/transport
+! #transport_maps = dbm:/etc/postfix/transport
+! #transport_maps = hash:/etc/postfix/transport
+! #transport_maps = hash:/etc/postfix/transport, nis:transport
+! #transport_maps = hash:/etc/postfix/transport, netinfo:/transport
   transport_maps = 
 --- 10,18 ----
   # By default, this feature is disabled. Specify the types of databases
 ! # to use.  If you use this feature, run "postmap !!PREFIX!!/etc/postfix/transport"
   # after change, then "postfix reload".
   # 
-! # transport_maps = dbm:!!PREFIX!!/etc/postfix/transport
-! # transport_maps = hash:!!PREFIX!!/etc/postfix/transport
-! # transport_maps = hash:!!PREFIX!!/etc/postfix/transport, nis:transport
-! # transport_maps = hash:!!PREFIX!!/etc/postfix/transport, netinfo:/transport
+! #transport_maps = dbm:!!PREFIX!!/etc/postfix/transport
+! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport
+! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, nis:transport
+! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, netinfo:/transport
   transport_maps = 
diff --git a/mail/postfix-current/files/patch-an b/mail/postfix-current/files/patch-an
index 4da6a093d4f3..af5ac7cc031b 100644
--- a/mail/postfix-current/files/patch-an
+++ b/mail/postfix-current/files/patch-an
@@ -12,15 +12,15 @@
 ***************
 *** 18,23 ****
   #
-! # virtual_maps = dbm:/etc/postfix/virtual
-! # virtual_maps = hash:/etc/postfix/virtual
-! # virtual_maps = hash:/etc/postfix/virtual, nis:virtual
-! # virtual_maps = hash:/etc/postfix/virtual, netinfo:/virtual
+! #virtual_maps = dbm:/etc/postfix/virtual
+! #virtual_maps = hash:/etc/postfix/virtual
+! #virtual_maps = hash:/etc/postfix/virtual, nis:virtual
+! #virtual_maps = hash:/etc/postfix/virtual, netinfo:/virtual
   virtual_maps = 
 --- 18,23 ----
   #
-! # virtual_maps = dbm:!!PREFIX!!/etc/postfix/virtual
-! # virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual
-! # virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, nis:virtual
-! # virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, netinfo:/virtual
+! #virtual_maps = dbm:!!PREFIX!!/etc/postfix/virtual
+! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual
+! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, nis:virtual
+! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, netinfo:/virtual
   virtual_maps = 
diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix
index 5f90f70f1bba..49b42e12efd4 100644
--- a/mail/postfix-current/scripts/configure.postfix
+++ b/mail/postfix-current/scripts/configure.postfix
@@ -87,8 +87,8 @@ while [ "$1" ]; do
 			echo "BIN1+=		tlsmgr"
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
 			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.7.12-snap20011104-0.9.6b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.7.12-snap20011104-0.9.6b/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.7.13a-snap20011121-0.9.6b.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.7.13a-snap20011121-0.9.6b/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			SUB_TLS=""
 			;;