diff options
| author | Sahil Tandon <sahil@FreeBSD.org> | 2012-02-11 05:14:32 +0000 |
|---|---|---|
| committer | Sahil Tandon <sahil@FreeBSD.org> | 2012-02-11 05:14:32 +0000 |
| commit | 08cdc1ea9ce01b1f56bbaf37be8773c14b0d59e2 (patch) | |
| tree | 4418645e897f772688f0ede2717095d27e10b063 /mail | |
| parent | 1205ceeb0a8db4369a54bc30339ab442cab2cb83 (diff) | |
Update to 2.10-20120202, revise IS_INTERACTIVE logic to
account for additional situations, and remove unnecessary
CONFLICTS line.
Notes
Notes:
svn path=/head/; revision=290903
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/postfix-current/Makefile | 25 | ||||
| -rw-r--r-- | mail/postfix-current/distinfo | 6 |
2 files changed, 22 insertions, 9 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 9371eb8fe5d6..34e638edd266 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -DISTVERSION= 2.9-20120115 +DISTVERSION= 2.10-20120202 PORTEPOCH= 4 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \ @@ -22,13 +22,8 @@ MAINTAINER= sahil@FreeBSD.org COMMENT= A secure alternative to widely-used Sendmail CONFLICTS= courier-0.* postfix-1.* postfix-2.* postfix-base-2.* \ - postfix-current-2.[0-8]* postfix-current-base-2.[0-8]* \ sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) -IS_INTERACTIVE= yes -.endif - USERS= postfix GROUPS= mail maildrop postfix MAKE_JOBS_SAFE= yes @@ -92,6 +87,13 @@ MLINKS= sendmail.1 mailq.1 \ HTML1= body_checks.5.html bounce.5.html postfix-power.png \ scache.8.html tlsmgr.8.html +.if !defined(PACKAGE_BUILDING) && exists(/etc/mail/mailer.conf) +OLD_MAILER!= ${GREP} -m 1 '^purgestat' /etc/mail/mailer.conf || true +.if !empty(OLD_MAILER) +IS_INTERACTIVE= yes +.endif +.endif + .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif @@ -168,7 +170,16 @@ POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto .endif .if defined(WITH_SPF) -BROKEN= At the moment, SPF support is unavailable for ${PORTNAME}-${DISTVERSION} +LIB_DEPENDS+= spf2.3:${PORTSDIR}/mail/libspf2 +PATCH_SITES+= ${MASTER_SITE_LOCAL} +PATCH_SITE_SUBDIR= mm +PATCHFILES+= postfix-2.8.0-libspf2-1.2.x-0.patch.gz +PATCH_DIST_STRIP= -p1 +POSTFIX_CCARGS+= -DHAVE_NS_TYPE -DHAS_SPF -I${LOCALBASE}/include +POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lspf2 +PLIST_SUB+= SPF="" +.else +PLIST_SUB+= SPF="@comment " .endif .if defined(WITH_BDB) diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo index eeb26427d65d..842d2df95d3c 100644 --- a/mail/postfix-current/distinfo +++ b/mail/postfix-current/distinfo @@ -1,2 +1,4 @@ -SHA256 (postfix/postfix-2.9-20120115.tar.gz) = 634742998f5e8d6402b1717afdfd6aa3bc908a7db93afc47a0f14aea644f644f -SIZE (postfix/postfix-2.9-20120115.tar.gz) = 3760369 +SHA256 (postfix/postfix-2.10-20120202.tar.gz) = a1b9e3feeaff7addd1df370d4931933135dcc41b151de9219b94e5fa688faa86 +SIZE (postfix/postfix-2.10-20120202.tar.gz) = 3759818 +SHA256 (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = e5c38e5bc226cab109c02a4e530ab1aefd3bb06f2169f3e052bdf83d2727aacc +SIZE (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = 8191 |