[PATCH] mail/postfix: Update to libspf2-2.1.5-5

update the SPF patch to latest release which fixes bug exposed by gcc in FreeBSD 5.3. it is otherwise identical to prior version, so no upgrade is necessary if you have it compiled and workign in FreeBSD 4.10 already (thus no version bump). removed "extra libspf2" patch that tried to work around failure of IPv6+TLS patch when used in conjunction with SPF patch. It just doesn't work, and I can't figure out exactly what it is supposed to do. As it was, this would cause failures when selecting just the SPF patch. PR: ports/74095 Submitted by: Vivek Khera <vivek@khera.org>
author: edwin <edwin@FreeBSD.org> 2004-11-27 10:15:57 +0800
committer: edwin <edwin@FreeBSD.org> 2004-11-27 10:15:57 +0800
commit: 62c6e49af63d6b3e13d88ea03b3e24d23a4b3db3 (patch)
tree: 518762ed0b0543fa3a411638d8d939d259b1978a /mail
parent: f92fbd65577aade90992380aeba0263f686b8421 (diff)
download: freebsd-ports-gnome-62c6e49af63d6b3e13d88ea03b3e24d23a4b3db3.tar.gz
freebsd-ports-gnome-62c6e49af63d6b3e13d88ea03b3e24d23a4b3db3.tar.zst
freebsd-ports-gnome-62c6e49af63d6b3e13d88ea03b3e24d23a4b3db3.zip
36 files changed, 54 insertions, 234 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index c093fe26507e..8bcb312b0e37 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -16,6 +16,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.1.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 93eefa53e11c..4ce70c2c42ea 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,7 +1,7 @@
 MD5 (postfix/postfix-2.1.5.tar.gz) = bcaa4aac80595d04c60c72844203a04d
 SIZE (postfix/postfix-2.1.5.tar.gz) = 1971931
-MD5 (postfix/postfix-libspf2-2.1.3-4.patch) = 0312a568fdf96861dbd6ac206b395630
-SIZE (postfix/postfix-libspf2-2.1.3-4.patch) = 25713
+MD5 (postfix/postfix-libspf2-2.1.5-5.patch) = c6ac24b91af6c575ec787110a2df8a24
+SIZE (postfix/postfix-libspf2-2.1.5-5.patch) = 25889
 MD5 (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = c1c5a84b6c04bde0df7100cf05abb54c
 SIZE (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = 48228
 MD5 (postfix/tls+ipv6-1.25-pf-2.1.5.patch.gz) = 5b02ebf2ec104c43f805d2bcb7bb16ef
diff --git a/mail/postfix/files/extra-libspf2_and_tls.patch b/mail/postfix/files/extra-libspf2_and_tls.patch
deleted file mode 100644
index 7753bc77e84c..000000000000
--- a/mail/postfix/files/extra-libspf2_and_tls.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- postfix-2.1.5/src/smtpd/smtpd.c.orig	Sat Oct 16 21:44:03 2004
-+++ postfix-2.1.5/src/smtpd/smtpd.c	Sat Oct 16 21:44:13 2004
-@@ -2749,12 +2749,12 @@
- 	VAR_ALLOW_UNTRUST_ROUTE, DEF_ALLOW_UNTRUST_ROUTE, &var_allow_untrust_route,
- 	VAR_SMTPD_SASL_ENABLE, DEF_SMTPD_SASL_ENABLE, &var_smtpd_sasl_enable,
- 	VAR_BROKEN_AUTH_CLNTS, DEF_BROKEN_AUTH_CLNTS, &var_broken_auth_clients,
--	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
--	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
--	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
- 	VAR_SPF_MARK_ONLY, DEF_SPF_MARK_ONLY, &var_spf_mark_only,
- 	VAR_SPF_RCVD_HEADER, DEF_SPF_RCVD_HEADER, &var_spf_rcvd_header,
- 	VAR_SPF_GLOBAL_WHITELIST, DEF_SPF_GLOBAL_WHITELIST, &var_spf_global_whitelist,
-+	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
-+	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
-+	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
- 	0,
-     };
-     static CONFIG_STR_TABLE str_table[] = {
diff --git a/mail/postfix/scripts/configure.postfix b/mail/postfix/scripts/configure.postfix
index a22330259928..c0a2b41a2a05 100644
--- a/mail/postfix/scripts/configure.postfix
+++ b/mail/postfix/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.56 2004-11-14 19:59:51 pav Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.57 2004-11-27 02:15:57 edwin Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -210,8 +210,8 @@ while [ "$1" ]; do
 		SPF)
 			# see http://www.ipnet6.org/postfix/spf/
 			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/spf/p4/"
-			echo "PATCHFILES+=	postfix-libspf2-2.1.3-4.patch"
+			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
+			echo "PATCHFILES+=	postfix-libspf2-2.1.5-5.patch"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
@@ -219,9 +219,6 @@ while [ "$1" ]; do
 ##			echo "README+=	SPF_README"
 			echo ""
 			SUB_SPF=""
-			if [ X$SUB_TLS != "X" ]; then
-				echo "EXTRA_PATCHES+=	${FILESDIR}/extra-libspf2_and_tls.patch"
-			fi
 			;;
 		IPv6)
 			if [ X$SUB_TLS = "X" ]; then
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index c093fe26507e..8bcb312b0e37 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -16,6 +16,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.1.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix21/distinfo b/mail/postfix21/distinfo
index 93eefa53e11c..4ce70c2c42ea 100644
--- a/mail/postfix21/distinfo
+++ b/mail/postfix21/distinfo
@@ -1,7 +1,7 @@
 MD5 (postfix/postfix-2.1.5.tar.gz) = bcaa4aac80595d04c60c72844203a04d
 SIZE (postfix/postfix-2.1.5.tar.gz) = 1971931
-MD5 (postfix/postfix-libspf2-2.1.3-4.patch) = 0312a568fdf96861dbd6ac206b395630
-SIZE (postfix/postfix-libspf2-2.1.3-4.patch) = 25713
+MD5 (postfix/postfix-libspf2-2.1.5-5.patch) = c6ac24b91af6c575ec787110a2df8a24
+SIZE (postfix/postfix-libspf2-2.1.5-5.patch) = 25889
 MD5 (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = c1c5a84b6c04bde0df7100cf05abb54c
 SIZE (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = 48228
 MD5 (postfix/tls+ipv6-1.25-pf-2.1.5.patch.gz) = 5b02ebf2ec104c43f805d2bcb7bb16ef
diff --git a/mail/postfix21/files/extra-libspf2_and_tls.patch b/mail/postfix21/files/extra-libspf2_and_tls.patch
deleted file mode 100644
index 7753bc77e84c..000000000000
--- a/mail/postfix21/files/extra-libspf2_and_tls.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- postfix-2.1.5/src/smtpd/smtpd.c.orig	Sat Oct 16 21:44:03 2004
-+++ postfix-2.1.5/src/smtpd/smtpd.c	Sat Oct 16 21:44:13 2004
-@@ -2749,12 +2749,12 @@
- 	VAR_ALLOW_UNTRUST_ROUTE, DEF_ALLOW_UNTRUST_ROUTE, &var_allow_untrust_route,
- 	VAR_SMTPD_SASL_ENABLE, DEF_SMTPD_SASL_ENABLE, &var_smtpd_sasl_enable,
- 	VAR_BROKEN_AUTH_CLNTS, DEF_BROKEN_AUTH_CLNTS, &var_broken_auth_clients,
--	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
--	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
--	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
- 	VAR_SPF_MARK_ONLY, DEF_SPF_MARK_ONLY, &var_spf_mark_only,
- 	VAR_SPF_RCVD_HEADER, DEF_SPF_RCVD_HEADER, &var_spf_rcvd_header,
- 	VAR_SPF_GLOBAL_WHITELIST, DEF_SPF_GLOBAL_WHITELIST, &var_spf_global_whitelist,
-+	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
-+	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
-+	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
- 	0,
-     };
-     static CONFIG_STR_TABLE str_table[] = {
diff --git a/mail/postfix21/scripts/configure.postfix b/mail/postfix21/scripts/configure.postfix
index 211634b7f24f..c559cbf17e74 100644
--- a/mail/postfix21/scripts/configure.postfix
+++ b/mail/postfix21/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.56 2004-11-14 19:59:51 pav Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.57 2004-11-27 02:15:57 edwin Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -210,8 +210,8 @@ while [ "$1" ]; do
 		SPF)
 			# see http://www.ipnet6.org/postfix/spf/
 			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/spf/p4/"
-			echo "PATCHFILES+=	postfix-libspf2-2.1.3-4.patch"
+			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
+			echo "PATCHFILES+=	postfix-libspf2-2.1.5-5.patch"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
@@ -219,9 +219,6 @@ while [ "$1" ]; do
 ##			echo "README+=	SPF_README"
 			echo ""
 			SUB_SPF=""
-			if [ X$SUB_TLS != "X" ]; then
-				echo "EXTRA_PATCHES+=	${FILESDIR}/extra-libspf2_and_tls.patch"
-			fi
 			;;
 		IPv6)
 			if [ X$SUB_TLS = "X" ]; then
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
index c093fe26507e..8bcb312b0e37 100644
--- a/mail/postfix22/Makefile
+++ b/mail/postfix22/Makefile
@@ -16,6 +16,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.1.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix22/distinfo b/mail/postfix22/distinfo
index 93eefa53e11c..4ce70c2c42ea 100644
--- a/mail/postfix22/distinfo
+++ b/mail/postfix22/distinfo
@@ -1,7 +1,7 @@
 MD5 (postfix/postfix-2.1.5.tar.gz) = bcaa4aac80595d04c60c72844203a04d
 SIZE (postfix/postfix-2.1.5.tar.gz) = 1971931
-MD5 (postfix/postfix-libspf2-2.1.3-4.patch) = 0312a568fdf96861dbd6ac206b395630
-SIZE (postfix/postfix-libspf2-2.1.3-4.patch) = 25713
+MD5 (postfix/postfix-libspf2-2.1.5-5.patch) = c6ac24b91af6c575ec787110a2df8a24
+SIZE (postfix/postfix-libspf2-2.1.5-5.patch) = 25889
 MD5 (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = c1c5a84b6c04bde0df7100cf05abb54c
 SIZE (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = 48228
 MD5 (postfix/tls+ipv6-1.25-pf-2.1.5.patch.gz) = 5b02ebf2ec104c43f805d2bcb7bb16ef
diff --git a/mail/postfix22/files/extra-libspf2_and_tls.patch b/mail/postfix22/files/extra-libspf2_and_tls.patch
deleted file mode 100644
index 7753bc77e84c..000000000000
--- a/mail/postfix22/files/extra-libspf2_and_tls.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- postfix-2.1.5/src/smtpd/smtpd.c.orig	Sat Oct 16 21:44:03 2004
-+++ postfix-2.1.5/src/smtpd/smtpd.c	Sat Oct 16 21:44:13 2004
-@@ -2749,12 +2749,12 @@
- 	VAR_ALLOW_UNTRUST_ROUTE, DEF_ALLOW_UNTRUST_ROUTE, &var_allow_untrust_route,
- 	VAR_SMTPD_SASL_ENABLE, DEF_SMTPD_SASL_ENABLE, &var_smtpd_sasl_enable,
- 	VAR_BROKEN_AUTH_CLNTS, DEF_BROKEN_AUTH_CLNTS, &var_broken_auth_clients,
--	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
--	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
--	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
- 	VAR_SPF_MARK_ONLY, DEF_SPF_MARK_ONLY, &var_spf_mark_only,
- 	VAR_SPF_RCVD_HEADER, DEF_SPF_RCVD_HEADER, &var_spf_rcvd_header,
- 	VAR_SPF_GLOBAL_WHITELIST, DEF_SPF_GLOBAL_WHITELIST, &var_spf_global_whitelist,
-+	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
-+	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
-+	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
- 	0,
-     };
-     static CONFIG_STR_TABLE str_table[] = {
diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix
index 1a0e528d2ac0..2378aa59435a 100644
--- a/mail/postfix22/scripts/configure.postfix
+++ b/mail/postfix22/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.56 2004-11-14 19:59:51 pav Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.57 2004-11-27 02:15:57 edwin Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -210,8 +210,8 @@ while [ "$1" ]; do
 		SPF)
 			# see http://www.ipnet6.org/postfix/spf/
 			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/spf/p4/"
-			echo "PATCHFILES+=	postfix-libspf2-2.1.3-4.patch"
+			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
+			echo "PATCHFILES+=	postfix-libspf2-2.1.5-5.patch"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
@@ -219,9 +219,6 @@ while [ "$1" ]; do
 ##			echo "README+=	SPF_README"
 			echo ""
 			SUB_SPF=""
-			if [ X$SUB_TLS != "X" ]; then
-				echo "EXTRA_PATCHES+=	${FILESDIR}/extra-libspf2_and_tls.patch"
-			fi
 			;;
 		IPv6)
 			if [ X$SUB_TLS = "X" ]; then
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index c093fe26507e..8bcb312b0e37 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -16,6 +16,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.1.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix23/distinfo b/mail/postfix23/distinfo
index 93eefa53e11c..4ce70c2c42ea 100644
--- a/mail/postfix23/distinfo
+++ b/mail/postfix23/distinfo
@@ -1,7 +1,7 @@
 MD5 (postfix/postfix-2.1.5.tar.gz) = bcaa4aac80595d04c60c72844203a04d
 SIZE (postfix/postfix-2.1.5.tar.gz) = 1971931
-MD5 (postfix/postfix-libspf2-2.1.3-4.patch) = 0312a568fdf96861dbd6ac206b395630
-SIZE (postfix/postfix-libspf2-2.1.3-4.patch) = 25713
+MD5 (postfix/postfix-libspf2-2.1.5-5.patch) = c6ac24b91af6c575ec787110a2df8a24
+SIZE (postfix/postfix-libspf2-2.1.5-5.patch) = 25889
 MD5 (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = c1c5a84b6c04bde0df7100cf05abb54c
 SIZE (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = 48228
 MD5 (postfix/tls+ipv6-1.25-pf-2.1.5.patch.gz) = 5b02ebf2ec104c43f805d2bcb7bb16ef
diff --git a/mail/postfix23/files/extra-libspf2_and_tls.patch b/mail/postfix23/files/extra-libspf2_and_tls.patch
deleted file mode 100644
index 7753bc77e84c..000000000000
--- a/mail/postfix23/files/extra-libspf2_and_tls.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- postfix-2.1.5/src/smtpd/smtpd.c.orig	Sat Oct 16 21:44:03 2004
-+++ postfix-2.1.5/src/smtpd/smtpd.c	Sat Oct 16 21:44:13 2004
-@@ -2749,12 +2749,12 @@
- 	VAR_ALLOW_UNTRUST_ROUTE, DEF_ALLOW_UNTRUST_ROUTE, &var_allow_untrust_route,
- 	VAR_SMTPD_SASL_ENABLE, DEF_SMTPD_SASL_ENABLE, &var_smtpd_sasl_enable,
- 	VAR_BROKEN_AUTH_CLNTS, DEF_BROKEN_AUTH_CLNTS, &var_broken_auth_clients,
--	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
--	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
--	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
- 	VAR_SPF_MARK_ONLY, DEF_SPF_MARK_ONLY, &var_spf_mark_only,
- 	VAR_SPF_RCVD_HEADER, DEF_SPF_RCVD_HEADER, &var_spf_rcvd_header,
- 	VAR_SPF_GLOBAL_WHITELIST, DEF_SPF_GLOBAL_WHITELIST, &var_spf_global_whitelist,
-+	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
-+	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
-+	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
- 	0,
-     };
-     static CONFIG_STR_TABLE str_table[] = {
diff --git a/mail/postfix23/scripts/configure.postfix b/mail/postfix23/scripts/configure.postfix
index ece7075c75b4..614ec061c278 100644
--- a/mail/postfix23/scripts/configure.postfix
+++ b/mail/postfix23/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.56 2004-11-14 19:59:51 pav Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.57 2004-11-27 02:15:57 edwin Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -210,8 +210,8 @@ while [ "$1" ]; do
 		SPF)
 			# see http://www.ipnet6.org/postfix/spf/
 			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/spf/p4/"
-			echo "PATCHFILES+=	postfix-libspf2-2.1.3-4.patch"
+			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
+			echo "PATCHFILES+=	postfix-libspf2-2.1.5-5.patch"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
@@ -219,9 +219,6 @@ while [ "$1" ]; do
 ##			echo "README+=	SPF_README"
 			echo ""
 			SUB_SPF=""
-			if [ X$SUB_TLS != "X" ]; then
-				echo "EXTRA_PATCHES+=	${FILESDIR}/extra-libspf2_and_tls.patch"
-			fi
 			;;
 		IPv6)
 			if [ X$SUB_TLS = "X" ]; then
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index c093fe26507e..8bcb312b0e37 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -16,6 +16,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.1.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix24/distinfo b/mail/postfix24/distinfo
index 93eefa53e11c..4ce70c2c42ea 100644
--- a/mail/postfix24/distinfo
+++ b/mail/postfix24/distinfo
@@ -1,7 +1,7 @@
 MD5 (postfix/postfix-2.1.5.tar.gz) = bcaa4aac80595d04c60c72844203a04d
 SIZE (postfix/postfix-2.1.5.tar.gz) = 1971931
-MD5 (postfix/postfix-libspf2-2.1.3-4.patch) = 0312a568fdf96861dbd6ac206b395630
-SIZE (postfix/postfix-libspf2-2.1.3-4.patch) = 25713
+MD5 (postfix/postfix-libspf2-2.1.5-5.patch) = c6ac24b91af6c575ec787110a2df8a24
+SIZE (postfix/postfix-libspf2-2.1.5-5.patch) = 25889
 MD5 (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = c1c5a84b6c04bde0df7100cf05abb54c
 SIZE (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = 48228
 MD5 (postfix/tls+ipv6-1.25-pf-2.1.5.patch.gz) = 5b02ebf2ec104c43f805d2bcb7bb16ef
diff --git a/mail/postfix24/files/extra-libspf2_and_tls.patch b/mail/postfix24/files/extra-libspf2_and_tls.patch
deleted file mode 100644
index 7753bc77e84c..000000000000
--- a/mail/postfix24/files/extra-libspf2_and_tls.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- postfix-2.1.5/src/smtpd/smtpd.c.orig	Sat Oct 16 21:44:03 2004
-+++ postfix-2.1.5/src/smtpd/smtpd.c	Sat Oct 16 21:44:13 2004
-@@ -2749,12 +2749,12 @@
- 	VAR_ALLOW_UNTRUST_ROUTE, DEF_ALLOW_UNTRUST_ROUTE, &var_allow_untrust_route,
- 	VAR_SMTPD_SASL_ENABLE, DEF_SMTPD_SASL_ENABLE, &var_smtpd_sasl_enable,
- 	VAR_BROKEN_AUTH_CLNTS, DEF_BROKEN_AUTH_CLNTS, &var_broken_auth_clients,
--	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
--	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
--	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
- 	VAR_SPF_MARK_ONLY, DEF_SPF_MARK_ONLY, &var_spf_mark_only,
- 	VAR_SPF_RCVD_HEADER, DEF_SPF_RCVD_HEADER, &var_spf_rcvd_header,
- 	VAR_SPF_GLOBAL_WHITELIST, DEF_SPF_GLOBAL_WHITELIST, &var_spf_global_whitelist,
-+	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
-+	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
-+	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
- 	0,
-     };
-     static CONFIG_STR_TABLE str_table[] = {
diff --git a/mail/postfix24/scripts/configure.postfix b/mail/postfix24/scripts/configure.postfix
index 182186186226..1a22290c9a8b 100644
--- a/mail/postfix24/scripts/configure.postfix
+++ b/mail/postfix24/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.56 2004-11-14 19:59:51 pav Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.57 2004-11-27 02:15:57 edwin Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -210,8 +210,8 @@ while [ "$1" ]; do
 		SPF)
 			# see http://www.ipnet6.org/postfix/spf/
 			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/spf/p4/"
-			echo "PATCHFILES+=	postfix-libspf2-2.1.3-4.patch"
+			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
+			echo "PATCHFILES+=	postfix-libspf2-2.1.5-5.patch"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
@@ -219,9 +219,6 @@ while [ "$1" ]; do
 ##			echo "README+=	SPF_README"
 			echo ""
 			SUB_SPF=""
-			if [ X$SUB_TLS != "X" ]; then
-				echo "EXTRA_PATCHES+=	${FILESDIR}/extra-libspf2_and_tls.patch"
-			fi
 			;;
 		IPv6)
 			if [ X$SUB_TLS = "X" ]; then
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index c093fe26507e..8bcb312b0e37 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -16,6 +16,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.1.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo
index 93eefa53e11c..4ce70c2c42ea 100644
--- a/mail/postfix25/distinfo
+++ b/mail/postfix25/distinfo
@@ -1,7 +1,7 @@
 MD5 (postfix/postfix-2.1.5.tar.gz) = bcaa4aac80595d04c60c72844203a04d
 SIZE (postfix/postfix-2.1.5.tar.gz) = 1971931
-MD5 (postfix/postfix-libspf2-2.1.3-4.patch) = 0312a568fdf96861dbd6ac206b395630
-SIZE (postfix/postfix-libspf2-2.1.3-4.patch) = 25713
+MD5 (postfix/postfix-libspf2-2.1.5-5.patch) = c6ac24b91af6c575ec787110a2df8a24
+SIZE (postfix/postfix-libspf2-2.1.5-5.patch) = 25889
 MD5 (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = c1c5a84b6c04bde0df7100cf05abb54c
 SIZE (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = 48228
 MD5 (postfix/tls+ipv6-1.25-pf-2.1.5.patch.gz) = 5b02ebf2ec104c43f805d2bcb7bb16ef
diff --git a/mail/postfix25/files/extra-libspf2_and_tls.patch b/mail/postfix25/files/extra-libspf2_and_tls.patch
deleted file mode 100644
index 7753bc77e84c..000000000000
--- a/mail/postfix25/files/extra-libspf2_and_tls.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- postfix-2.1.5/src/smtpd/smtpd.c.orig	Sat Oct 16 21:44:03 2004
-+++ postfix-2.1.5/src/smtpd/smtpd.c	Sat Oct 16 21:44:13 2004
-@@ -2749,12 +2749,12 @@
- 	VAR_ALLOW_UNTRUST_ROUTE, DEF_ALLOW_UNTRUST_ROUTE, &var_allow_untrust_route,
- 	VAR_SMTPD_SASL_ENABLE, DEF_SMTPD_SASL_ENABLE, &var_smtpd_sasl_enable,
- 	VAR_BROKEN_AUTH_CLNTS, DEF_BROKEN_AUTH_CLNTS, &var_broken_auth_clients,
--	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
--	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
--	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
- 	VAR_SPF_MARK_ONLY, DEF_SPF_MARK_ONLY, &var_spf_mark_only,
- 	VAR_SPF_RCVD_HEADER, DEF_SPF_RCVD_HEADER, &var_spf_rcvd_header,
- 	VAR_SPF_GLOBAL_WHITELIST, DEF_SPF_GLOBAL_WHITELIST, &var_spf_global_whitelist,
-+	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
-+	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
-+	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
- 	0,
-     };
-     static CONFIG_STR_TABLE str_table[] = {
diff --git a/mail/postfix25/scripts/configure.postfix b/mail/postfix25/scripts/configure.postfix
index 8b7bc08f811e..da41fc6c5a27 100644
--- a/mail/postfix25/scripts/configure.postfix
+++ b/mail/postfix25/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.56 2004-11-14 19:59:51 pav Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.57 2004-11-27 02:15:57 edwin Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -210,8 +210,8 @@ while [ "$1" ]; do
 		SPF)
 			# see http://www.ipnet6.org/postfix/spf/
 			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/spf/p4/"
-			echo "PATCHFILES+=	postfix-libspf2-2.1.3-4.patch"
+			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
+			echo "PATCHFILES+=	postfix-libspf2-2.1.5-5.patch"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
@@ -219,9 +219,6 @@ while [ "$1" ]; do
 ##			echo "README+=	SPF_README"
 			echo ""
 			SUB_SPF=""
-			if [ X$SUB_TLS != "X" ]; then
-				echo "EXTRA_PATCHES+=	${FILESDIR}/extra-libspf2_and_tls.patch"
-			fi
 			;;
 		IPv6)
 			if [ X$SUB_TLS = "X" ]; then
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index c093fe26507e..8bcb312b0e37 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -16,6 +16,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.1.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo
index 93eefa53e11c..4ce70c2c42ea 100644
--- a/mail/postfix26/distinfo
+++ b/mail/postfix26/distinfo
@@ -1,7 +1,7 @@
 MD5 (postfix/postfix-2.1.5.tar.gz) = bcaa4aac80595d04c60c72844203a04d
 SIZE (postfix/postfix-2.1.5.tar.gz) = 1971931
-MD5 (postfix/postfix-libspf2-2.1.3-4.patch) = 0312a568fdf96861dbd6ac206b395630
-SIZE (postfix/postfix-libspf2-2.1.3-4.patch) = 25713
+MD5 (postfix/postfix-libspf2-2.1.5-5.patch) = c6ac24b91af6c575ec787110a2df8a24
+SIZE (postfix/postfix-libspf2-2.1.5-5.patch) = 25889
 MD5 (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = c1c5a84b6c04bde0df7100cf05abb54c
 SIZE (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = 48228
 MD5 (postfix/tls+ipv6-1.25-pf-2.1.5.patch.gz) = 5b02ebf2ec104c43f805d2bcb7bb16ef
diff --git a/mail/postfix26/files/extra-libspf2_and_tls.patch b/mail/postfix26/files/extra-libspf2_and_tls.patch
deleted file mode 100644
index 7753bc77e84c..000000000000
--- a/mail/postfix26/files/extra-libspf2_and_tls.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- postfix-2.1.5/src/smtpd/smtpd.c.orig	Sat Oct 16 21:44:03 2004
-+++ postfix-2.1.5/src/smtpd/smtpd.c	Sat Oct 16 21:44:13 2004
-@@ -2749,12 +2749,12 @@
- 	VAR_ALLOW_UNTRUST_ROUTE, DEF_ALLOW_UNTRUST_ROUTE, &var_allow_untrust_route,
- 	VAR_SMTPD_SASL_ENABLE, DEF_SMTPD_SASL_ENABLE, &var_smtpd_sasl_enable,
- 	VAR_BROKEN_AUTH_CLNTS, DEF_BROKEN_AUTH_CLNTS, &var_broken_auth_clients,
--	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
--	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
--	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
- 	VAR_SPF_MARK_ONLY, DEF_SPF_MARK_ONLY, &var_spf_mark_only,
- 	VAR_SPF_RCVD_HEADER, DEF_SPF_RCVD_HEADER, &var_spf_rcvd_header,
- 	VAR_SPF_GLOBAL_WHITELIST, DEF_SPF_GLOBAL_WHITELIST, &var_spf_global_whitelist,
-+	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
-+	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
-+	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
- 	0,
-     };
-     static CONFIG_STR_TABLE str_table[] = {
diff --git a/mail/postfix26/scripts/configure.postfix b/mail/postfix26/scripts/configure.postfix
index 04c8b3ab7648..112b80b2e184 100644
--- a/mail/postfix26/scripts/configure.postfix
+++ b/mail/postfix26/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.56 2004-11-14 19:59:51 pav Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.57 2004-11-27 02:15:57 edwin Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -210,8 +210,8 @@ while [ "$1" ]; do
 		SPF)
 			# see http://www.ipnet6.org/postfix/spf/
 			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/spf/p4/"
-			echo "PATCHFILES+=	postfix-libspf2-2.1.3-4.patch"
+			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
+			echo "PATCHFILES+=	postfix-libspf2-2.1.5-5.patch"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
@@ -219,9 +219,6 @@ while [ "$1" ]; do
 ##			echo "README+=	SPF_README"
 			echo ""
 			SUB_SPF=""
-			if [ X$SUB_TLS != "X" ]; then
-				echo "EXTRA_PATCHES+=	${FILESDIR}/extra-libspf2_and_tls.patch"
-			fi
 			;;
 		IPv6)
 			if [ X$SUB_TLS = "X" ]; then
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index c093fe26507e..8bcb312b0e37 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -16,6 +16,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.1.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo
index 93eefa53e11c..4ce70c2c42ea 100644
--- a/mail/postfix27/distinfo
+++ b/mail/postfix27/distinfo
@@ -1,7 +1,7 @@
 MD5 (postfix/postfix-2.1.5.tar.gz) = bcaa4aac80595d04c60c72844203a04d
 SIZE (postfix/postfix-2.1.5.tar.gz) = 1971931
-MD5 (postfix/postfix-libspf2-2.1.3-4.patch) = 0312a568fdf96861dbd6ac206b395630
-SIZE (postfix/postfix-libspf2-2.1.3-4.patch) = 25713
+MD5 (postfix/postfix-libspf2-2.1.5-5.patch) = c6ac24b91af6c575ec787110a2df8a24
+SIZE (postfix/postfix-libspf2-2.1.5-5.patch) = 25889
 MD5 (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = c1c5a84b6c04bde0df7100cf05abb54c
 SIZE (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = 48228
 MD5 (postfix/tls+ipv6-1.25-pf-2.1.5.patch.gz) = 5b02ebf2ec104c43f805d2bcb7bb16ef
diff --git a/mail/postfix27/files/extra-libspf2_and_tls.patch b/mail/postfix27/files/extra-libspf2_and_tls.patch
deleted file mode 100644
index 7753bc77e84c..000000000000
--- a/mail/postfix27/files/extra-libspf2_and_tls.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- postfix-2.1.5/src/smtpd/smtpd.c.orig	Sat Oct 16 21:44:03 2004
-+++ postfix-2.1.5/src/smtpd/smtpd.c	Sat Oct 16 21:44:13 2004
-@@ -2749,12 +2749,12 @@
- 	VAR_ALLOW_UNTRUST_ROUTE, DEF_ALLOW_UNTRUST_ROUTE, &var_allow_untrust_route,
- 	VAR_SMTPD_SASL_ENABLE, DEF_SMTPD_SASL_ENABLE, &var_smtpd_sasl_enable,
- 	VAR_BROKEN_AUTH_CLNTS, DEF_BROKEN_AUTH_CLNTS, &var_broken_auth_clients,
--	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
--	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
--	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
- 	VAR_SPF_MARK_ONLY, DEF_SPF_MARK_ONLY, &var_spf_mark_only,
- 	VAR_SPF_RCVD_HEADER, DEF_SPF_RCVD_HEADER, &var_spf_rcvd_header,
- 	VAR_SPF_GLOBAL_WHITELIST, DEF_SPF_GLOBAL_WHITELIST, &var_spf_global_whitelist,
-+	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
-+	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
-+	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
- 	0,
-     };
-     static CONFIG_STR_TABLE str_table[] = {
diff --git a/mail/postfix27/scripts/configure.postfix b/mail/postfix27/scripts/configure.postfix
index 650235dc6c8b..963fafc02ad4 100644
--- a/mail/postfix27/scripts/configure.postfix
+++ b/mail/postfix27/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.56 2004-11-14 19:59:51 pav Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.57 2004-11-27 02:15:57 edwin Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -210,8 +210,8 @@ while [ "$1" ]; do
 		SPF)
 			# see http://www.ipnet6.org/postfix/spf/
 			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/spf/p4/"
-			echo "PATCHFILES+=	postfix-libspf2-2.1.3-4.patch"
+			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
+			echo "PATCHFILES+=	postfix-libspf2-2.1.5-5.patch"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
@@ -219,9 +219,6 @@ while [ "$1" ]; do
 ##			echo "README+=	SPF_README"
 			echo ""
 			SUB_SPF=""
-			if [ X$SUB_TLS != "X" ]; then
-				echo "EXTRA_PATCHES+=	${FILESDIR}/extra-libspf2_and_tls.patch"
-			fi
 			;;
 		IPv6)
 			if [ X$SUB_TLS = "X" ]; then
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index c093fe26507e..8bcb312b0e37 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -16,6 +16,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.1.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo
index 93eefa53e11c..4ce70c2c42ea 100644
--- a/mail/postfix28/distinfo
+++ b/mail/postfix28/distinfo
@@ -1,7 +1,7 @@
 MD5 (postfix/postfix-2.1.5.tar.gz) = bcaa4aac80595d04c60c72844203a04d
 SIZE (postfix/postfix-2.1.5.tar.gz) = 1971931
-MD5 (postfix/postfix-libspf2-2.1.3-4.patch) = 0312a568fdf96861dbd6ac206b395630
-SIZE (postfix/postfix-libspf2-2.1.3-4.patch) = 25713
+MD5 (postfix/postfix-libspf2-2.1.5-5.patch) = c6ac24b91af6c575ec787110a2df8a24
+SIZE (postfix/postfix-libspf2-2.1.5-5.patch) = 25889
 MD5 (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = c1c5a84b6c04bde0df7100cf05abb54c
 SIZE (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = 48228
 MD5 (postfix/tls+ipv6-1.25-pf-2.1.5.patch.gz) = 5b02ebf2ec104c43f805d2bcb7bb16ef
diff --git a/mail/postfix28/files/extra-libspf2_and_tls.patch b/mail/postfix28/files/extra-libspf2_and_tls.patch
deleted file mode 100644
index 7753bc77e84c..000000000000
--- a/mail/postfix28/files/extra-libspf2_and_tls.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- postfix-2.1.5/src/smtpd/smtpd.c.orig	Sat Oct 16 21:44:03 2004
-+++ postfix-2.1.5/src/smtpd/smtpd.c	Sat Oct 16 21:44:13 2004
-@@ -2749,12 +2749,12 @@
- 	VAR_ALLOW_UNTRUST_ROUTE, DEF_ALLOW_UNTRUST_ROUTE, &var_allow_untrust_route,
- 	VAR_SMTPD_SASL_ENABLE, DEF_SMTPD_SASL_ENABLE, &var_smtpd_sasl_enable,
- 	VAR_BROKEN_AUTH_CLNTS, DEF_BROKEN_AUTH_CLNTS, &var_broken_auth_clients,
--	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
--	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
--	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
- 	VAR_SPF_MARK_ONLY, DEF_SPF_MARK_ONLY, &var_spf_mark_only,
- 	VAR_SPF_RCVD_HEADER, DEF_SPF_RCVD_HEADER, &var_spf_rcvd_header,
- 	VAR_SPF_GLOBAL_WHITELIST, DEF_SPF_GLOBAL_WHITELIST, &var_spf_global_whitelist,
-+	VAR_SHOW_UNK_RCPT_TABLE, DEF_SHOW_UNK_RCPT_TABLE, &var_show_unk_rcpt_table,
-+	VAR_SMTPD_REJ_UNL_FROM, DEF_SMTPD_REJ_UNL_FROM, &var_smtpd_rej_unl_from,
-+	VAR_SMTPD_REJ_UNL_RCPT, DEF_SMTPD_REJ_UNL_RCPT, &var_smtpd_rej_unl_rcpt,
- 	0,
-     };
-     static CONFIG_STR_TABLE str_table[] = {
diff --git a/mail/postfix28/scripts/configure.postfix b/mail/postfix28/scripts/configure.postfix
index 947ae63e657b..48ad87f6544b 100644
--- a/mail/postfix28/scripts/configure.postfix
+++ b/mail/postfix28/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.56 2004-11-14 19:59:51 pav Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.57 2004-11-27 02:15:57 edwin Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -210,8 +210,8 @@ while [ "$1" ]; do
 		SPF)
 			# see http://www.ipnet6.org/postfix/spf/
 			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/spf/p4/"
-			echo "PATCHFILES+=	postfix-libspf2-2.1.3-4.patch"
+			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
+			echo "PATCHFILES+=	postfix-libspf2-2.1.5-5.patch"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
@@ -219,9 +219,6 @@ while [ "$1" ]; do
 ##			echo "README+=	SPF_README"
 			echo ""
 			SUB_SPF=""
-			if [ X$SUB_TLS != "X" ]; then
-				echo "EXTRA_PATCHES+=	${FILESDIR}/extra-libspf2_and_tls.patch"
-			fi
 			;;
 		IPv6)
 			if [ X$SUB_TLS = "X" ]; then
author	edwin <edwin@FreeBSD.org>	2004-11-27 10:15:57 +0800
committer	edwin <edwin@FreeBSD.org>	2004-11-27 10:15:57 +0800
commit	62c6e49af63d6b3e13d88ea03b3e24d23a4b3db3 (patch)
tree	518762ed0b0543fa3a411638d8d939d259b1978a /mail
parent	f92fbd65577aade90992380aeba0263f686b8421 (diff)
download	freebsd-ports-gnome-62c6e49af63d6b3e13d88ea03b3e24d23a4b3db3.tar.gz freebsd-ports-gnome-62c6e49af63d6b3e13d88ea03b3e24d23a4b3db3.tar.zst freebsd-ports-gnome-62c6e49af63d6b3e13d88ea03b3e24d23a4b3db3.zip