4 files changed, 6 insertions, 26 deletions

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