diff options
| author | Sahil Tandon <sahil@FreeBSD.org> | 2013-01-28 02:44:04 +0000 |
|---|---|---|
| committer | Sahil Tandon <sahil@FreeBSD.org> | 2013-01-28 02:44:04 +0000 |
| commit | e9f1df8199f3234595b92022387a6c31fa2b6b7b (patch) | |
| tree | 4785841dd527556de949b419a26ae44db71952f1 /mail | |
| parent | Update to 0.8.0. (diff) | |
Update to 2.9.5 and revise the PKGINSTALL script to
distinguish between upgrades and fresh installs. Also,
mark BROKEN when users try to build WITH_LDAP_SASL but
WITHOUT_SASL2.
Notes
Notes:
svn path=/head/; revision=311090
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/postfix/Makefile | 8 | ||||
| -rw-r--r-- | mail/postfix/distinfo | 8 | ||||
| -rw-r--r-- | mail/postfix/files/patch-src::util::sys_defs.h | 8 | ||||
| -rw-r--r-- | mail/postfix/files/pkg-install.in | 14 |
4 files changed, 22 insertions, 16 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index a7ebe286eced..066ace398c2a 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -6,8 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 2.9.4 -PORTREVISION= 2 +PORTVERSION= 2.9.5 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -21,7 +20,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= sahil@FreeBSD.org COMMENT= A secure alternative to widely-used Sendmail -VDAVERSION= 2.9.1 +VDAVERSION= 2.9.5 CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-8].* postfix-base-2.[0-8].* \ postfix-current-2.* postfix-current-base-2.* sendmail-8.* \ sendmail+*-8.* smail-3.* zmailer-2.* opensmtpd-[0-9]* @@ -220,6 +219,9 @@ POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lldap -llber _REQUIRE+= slapd .if defined(WITH_LDAP_SASL) +.if !defined(WITH_SASL2) +BROKEN= Compile with Cyrus SASL to use LDAP_SASL +.endif POSTFIX_CCARGS+= -DUSE_LDAP_SASL .endif .endif diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo index 4b3b745048a8..563417711421 100644 --- a/mail/postfix/distinfo +++ b/mail/postfix/distinfo @@ -1,6 +1,6 @@ -SHA256 (postfix/postfix-2.9.4.tar.gz) = 58343afcc727594cc1f9a3980562d8199aa55fc2cf2330da6b9ddfbf31502679 -SIZE (postfix/postfix-2.9.4.tar.gz) = 3760718 +SHA256 (postfix/postfix-2.9.5.tar.gz) = 590381cc0705a6d3fd2279760e79aff625adab6000cb895cf5336ae6a11ee6e4 +SIZE (postfix/postfix-2.9.5.tar.gz) = 3761272 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 -SHA256 (postfix/postfix-vda-v11-2.9.1.patch) = 611283a932577944bcdde36e5fe1a80ca750a0a66eb5f3490666e2adafd2bf84 -SIZE (postfix/postfix-vda-v11-2.9.1.patch) = 55009 +SHA256 (postfix/postfix-vda-v11-2.9.5.patch) = df30379c456971a514ae5587531bb5cd8492921a6a27e6d23f5014a1434945aa +SIZE (postfix/postfix-vda-v11-2.9.5.patch) = 55009 diff --git a/mail/postfix/files/patch-src::util::sys_defs.h b/mail/postfix/files/patch-src::util::sys_defs.h index a13c320759ff..bc27051815d6 100644 --- a/mail/postfix/files/patch-src::util::sys_defs.h +++ b/mail/postfix/files/patch-src::util::sys_defs.h @@ -1,11 +1,11 @@ ---- src/util/sys_defs.h.orig 2011-03-01 19:35:19.000000000 -0500 -+++ src/util/sys_defs.h 2011-03-01 19:36:54.000000000 -0500 +--- src/util/sys_defs.h.orig 2013-01-19 18:30:14.000000000 +0000 ++++ src/util/sys_defs.h 2013-01-19 18:31:50.000000000 +0000 @@ -25,7 +25,7 @@ */ #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ -- || defined(FREEBSD8) \ +- || defined(FREEBSD8) || defined(FREEBSD9) \ + || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \ || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ - || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ + || defined(OPENBSD5) \ diff --git a/mail/postfix/files/pkg-install.in b/mail/postfix/files/pkg-install.in index f8d9a47206fc..92185a153fc7 100644 --- a/mail/postfix/files/pkg-install.in +++ b/mail/postfix/files/pkg-install.in @@ -65,11 +65,15 @@ if [ "$2" = "POST-INSTALL" ]; then fi done - /bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \ - daemon_directory=${DAEMONDIR} \ - html_directory=${READMEDIR} \ - readme_directory=${READMEDIR} \ - upgrade-package + cmp ${DAEMONDIR}/main.cf ${ETCDIR}/main.cf >/dev/null 2>&1 \ + && POSTARG="set-permissions" \ + || POSTARG="upgrade-package" + + /bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \ + daemon_directory=${DAEMONDIR} \ + html_directory=${READMEDIR} \ + readme_directory=${READMEDIR} \ + ${POSTARG} fi if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" -a -f "${MC}" ]; then |