aboutsummaryrefslogtreecommitdiff
path: root/mail/postfix
diff options
context:
space:
mode:
authorSahil Tandon <sahil@FreeBSD.org>2010-10-06 03:29:04 +0000
committerSahil Tandon <sahil@FreeBSD.org>2010-10-06 03:29:04 +0000
commitf6cbabbc667d556f267d5be40d01dcb8d03be8d9 (patch)
treed44320a4822e355661e95a6d7b4524d9be6deaa8 /mail/postfix
parent2f03e84990d7c60c49c2685d3bcc156673cd38cd (diff)
downloadports-f6cbabbc667d556f267d5be40d01dcb8d03be8d9.tar.gz
ports-f6cbabbc667d556f267d5be40d01dcb8d03be8d9.zip
- Update optional SPF patch to version 1.1.0 [1]
- Fix CONFLICTS [2] PR: ports/151134 [1] Submitted by: mm@ [1] Noticed by: pav@ [2]
Notes
Notes: svn path=/head/; revision=262497
Diffstat (limited to 'mail/postfix')
-rw-r--r--mail/postfix/Makefile6
-rw-r--r--mail/postfix/distinfo6
2 files changed, 6 insertions, 6 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 3f4c45c921d9..41dc6162ca4f 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -23,7 +23,7 @@ COMMENT= A secure alternative to widely-used Sendmail
VDAVERSION= 2.7.0
CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-68-9].* postfix-current-2.* \
- sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
+ sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.*
USE_SUBMAKE= yes
USE_PERL5_BUILD=yes
@@ -154,9 +154,9 @@ POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto
LIB_DEPENDS+= spf2.3:${PORTSDIR}/mail/libspf2
PATCH_SITES+= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= mm
-PATCHFILES+= postfix-2.7.1-libspf2-1.2.x-1.patch.gz
+PATCHFILES+= postfix-2.7.1-libspf2-1.2.x-4.patch.gz
PATCH_DIST_STRIP= -p1
-POSTFIX_CCARGS+= -DHAVE_NS_TYPE -I${LOCALBASE}/include
+POSTFIX_CCARGS+= -DHAVE_NS_TYPE -DHAS_SPF -I${LOCALBASE}/include
POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lspf2
PLIST_SUB+= SPF=""
.else
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index df007196f774..05f762ae0b40 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,9 +1,9 @@
MD5 (postfix/postfix-2.7.1.tar.gz) = b7a5c3ccd309156a65d6f8d2683d4fa1
SHA256 (postfix/postfix-2.7.1.tar.gz) = 12301aa8dae18d333c8c96dbf7673f8f05139f10406e7afe278cfd4a1f132df0
SIZE (postfix/postfix-2.7.1.tar.gz) = 3418747
-MD5 (postfix/postfix-2.7.1-libspf2-1.2.x-1.patch.gz) = 703ea5a4e9b70c9d32cd7fe32cc535bc
-SHA256 (postfix/postfix-2.7.1-libspf2-1.2.x-1.patch.gz) = e610469e7c1bdc46cfb4155db849a309d0b43b5931a426e9efb495702da7ec03
-SIZE (postfix/postfix-2.7.1-libspf2-1.2.x-1.patch.gz) = 7225
+MD5 (postfix/postfix-2.7.1-libspf2-1.2.x-4.patch.gz) = 195c2477860f77567a458e84720e767a
+SHA256 (postfix/postfix-2.7.1-libspf2-1.2.x-4.patch.gz) = b67efb1ffbcae91f13bf3ed90a5181d4b5bc86ebe15753eaf9db8b2278f5bb16
+SIZE (postfix/postfix-2.7.1-libspf2-1.2.x-4.patch.gz) = 8186
MD5 (postfix/postfix-vda-2.7.0.patch) = f73d119fc9e00f31f23599176554e763
SHA256 (postfix/postfix-vda-2.7.0.patch) = 6a81aadc21ddd9ffa22fd3a64c924a241b92fc5f2b3bafd352075e830e086e0b
SIZE (postfix/postfix-vda-2.7.0.patch) = 59667