diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 9277c93611aa..c2de16e14f82 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 2.6.5 +PORTVERSION= 2.7.0 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -23,7 +23,7 @@ MAINTAINER= sahil@tandon.net COMMENT= A secure alternative to widely-used Sendmail VDAVERSION= 2.6.5 -CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \ +CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-68-9].* postfix-current-2.* \ sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* USE_SUBMAKE= yes @@ -132,7 +132,7 @@ _REQUIRE+= dovecot .if defined(WITH_SASLKRB) .if defined(WITH_SASLKRB5) || defined(WITH_SASLKMIT) -BROKEN= Select only one SASL Kerberos option +BROKEN= Select only one SASL Kerberos option .endif POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err .endif diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo index 7e05b3fbe4f3..b2f6b678b89f 100644 --- a/mail/postfix/distinfo +++ b/mail/postfix/distinfo @@ -1,6 +1,6 @@ -MD5 (postfix/postfix-2.6.5.tar.gz) = 6b954cfb3eb6141dac1e773281211717 -SHA256 (postfix/postfix-2.6.5.tar.gz) = 5b5c8d3c98d7dffece1d30ed4dc1cfbd3220842fd626a324ce038d7d795e4102 -SIZE (postfix/postfix-2.6.5.tar.gz) = 3325444 +MD5 (postfix/postfix-2.7.0.tar.gz) = df648f59421604e895cce56325f00bae +SHA256 (postfix/postfix-2.7.0.tar.gz) = c5b232ae5e396107bc58aed4178cf6cfd0a75b9dcbbedb49d158eb71d6c91b75 +SIZE (postfix/postfix-2.7.0.tar.gz) = 3418064 MD5 (postfix/postfix-2.6.5-vda-ng.patch.gz) = 43e54d0a1a016b90d15a1bd231e6fa38 SHA256 (postfix/postfix-2.6.5-vda-ng.patch.gz) = e1c04e9d268dc84832334997e1f593af9877dbd5030708280427a0dc4452e797 SIZE (postfix/postfix-2.6.5-vda-ng.patch.gz) = 12435 diff --git a/mail/postfix/files/patch-makedefs b/mail/postfix/files/patch-makedefs index 59dd2ccb8d95..268ceb3b9253 100644 --- a/mail/postfix/files/patch-makedefs +++ b/mail/postfix/files/patch-makedefs @@ -1,11 +1,9 @@ ---- makedefs.orig 2009-07-17 18:21:25.000000000 -0400 -+++ makedefs 2009-07-17 18:23:12.000000000 -0400 -@@ -144,6 +144,10 @@ +--- makedefs.orig 2010-02-16 20:22:51.000000000 -0500 ++++ makedefs 2010-02-16 20:23:42.000000000 -0500 +@@ -146,6 +146,8 @@ ;; - FreeBSD.7*) SYSTYPE=FREEBSD7 + FreeBSD.8*) SYSTYPE=FREEBSD8 ;; -+ FreeBSD.8*) SYSTYPE=FREEBSD8 -+ ;; + FreeBSD.9*) SYSTYPE=FREEBSD9 + ;; OpenBSD.2*) SYSTYPE=OPENBSD2 diff --git a/mail/postfix/files/patch-src::util::sys_defs.h b/mail/postfix/files/patch-src::util::sys_defs.h index 61f5186e8693..71d892ccd90b 100644 --- a/mail/postfix/files/patch-src::util::sys_defs.h +++ b/mail/postfix/files/patch-src::util::sys_defs.h @@ -1,22 +1,21 @@ ---- src/util/sys_defs.h.orig 2009-05-11 03:45:27.000000000 +0300 -+++ src/util/sys_defs.h 2009-07-22 21:26:44.208909929 +0300 -@@ -25,6 +25,7 @@ +--- src/util/sys_defs.h.orig 2010-02-16 20:15:11.000000000 -0500 ++++ src/util/sys_defs.h 2010-02-16 20:19:41.000000000 -0500 +@@ -25,7 +25,7 @@ */ #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ +- || defined(FREEBSD8) \ + || defined(FREEBSD8) || defined(FREEBSD9) \ || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ -@@ -110,6 +111,11 @@ +@@ -111,7 +111,8 @@ #define HAS_DUPLEX_PIPE /* 4.1 breaks with kqueue(2) */ #endif +-#if __FreeBSD_version >= 800107 /* safe; don't believe the experts */ +#if (__FreeBSD_version >= 702104 && __FreeBSD_version <= 800000) \ + || __FreeBSD_version >= 800100 -+#define HAS_CLOSEFROM -+#endif -+ - /* OpenBSD version is year+month */ + #define HAS_CLOSEFROM + #endif - #if OpenBSD >= 199805 /* XXX */ diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile index 9277c93611aa..c2de16e14f82 100644 --- a/mail/postfix27/Makefile +++ b/mail/postfix27/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 2.6.5 +PORTVERSION= 2.7.0 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -23,7 +23,7 @@ MAINTAINER= sahil@tandon.net COMMENT= A secure alternative to widely-used Sendmail VDAVERSION= 2.6.5 -CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \ +CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-68-9].* postfix-current-2.* \ sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* USE_SUBMAKE= yes @@ -132,7 +132,7 @@ _REQUIRE+= dovecot .if defined(WITH_SASLKRB) .if defined(WITH_SASLKRB5) || defined(WITH_SASLKMIT) -BROKEN= Select only one SASL Kerberos option +BROKEN= Select only one SASL Kerberos option .endif POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err .endif diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo index 7e05b3fbe4f3..b2f6b678b89f 100644 --- a/mail/postfix27/distinfo +++ b/mail/postfix27/distinfo @@ -1,6 +1,6 @@ -MD5 (postfix/postfix-2.6.5.tar.gz) = 6b954cfb3eb6141dac1e773281211717 -SHA256 (postfix/postfix-2.6.5.tar.gz) = 5b5c8d3c98d7dffece1d30ed4dc1cfbd3220842fd626a324ce038d7d795e4102 -SIZE (postfix/postfix-2.6.5.tar.gz) = 3325444 +MD5 (postfix/postfix-2.7.0.tar.gz) = df648f59421604e895cce56325f00bae +SHA256 (postfix/postfix-2.7.0.tar.gz) = c5b232ae5e396107bc58aed4178cf6cfd0a75b9dcbbedb49d158eb71d6c91b75 +SIZE (postfix/postfix-2.7.0.tar.gz) = 3418064 MD5 (postfix/postfix-2.6.5-vda-ng.patch.gz) = 43e54d0a1a016b90d15a1bd231e6fa38 SHA256 (postfix/postfix-2.6.5-vda-ng.patch.gz) = e1c04e9d268dc84832334997e1f593af9877dbd5030708280427a0dc4452e797 SIZE (postfix/postfix-2.6.5-vda-ng.patch.gz) = 12435 diff --git a/mail/postfix27/files/patch-makedefs b/mail/postfix27/files/patch-makedefs index 59dd2ccb8d95..268ceb3b9253 100644 --- a/mail/postfix27/files/patch-makedefs +++ b/mail/postfix27/files/patch-makedefs @@ -1,11 +1,9 @@ ---- makedefs.orig 2009-07-17 18:21:25.000000000 -0400 -+++ makedefs 2009-07-17 18:23:12.000000000 -0400 -@@ -144,6 +144,10 @@ +--- makedefs.orig 2010-02-16 20:22:51.000000000 -0500 ++++ makedefs 2010-02-16 20:23:42.000000000 -0500 +@@ -146,6 +146,8 @@ ;; - FreeBSD.7*) SYSTYPE=FREEBSD7 + FreeBSD.8*) SYSTYPE=FREEBSD8 ;; -+ FreeBSD.8*) SYSTYPE=FREEBSD8 -+ ;; + FreeBSD.9*) SYSTYPE=FREEBSD9 + ;; OpenBSD.2*) SYSTYPE=OPENBSD2 diff --git a/mail/postfix27/files/patch-src::util::sys_defs.h b/mail/postfix27/files/patch-src::util::sys_defs.h index 61f5186e8693..71d892ccd90b 100644 --- a/mail/postfix27/files/patch-src::util::sys_defs.h +++ b/mail/postfix27/files/patch-src::util::sys_defs.h @@ -1,22 +1,21 @@ ---- src/util/sys_defs.h.orig 2009-05-11 03:45:27.000000000 +0300 -+++ src/util/sys_defs.h 2009-07-22 21:26:44.208909929 +0300 -@@ -25,6 +25,7 @@ +--- src/util/sys_defs.h.orig 2010-02-16 20:15:11.000000000 -0500 ++++ src/util/sys_defs.h 2010-02-16 20:19:41.000000000 -0500 +@@ -25,7 +25,7 @@ */ #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ +- || defined(FREEBSD8) \ + || defined(FREEBSD8) || defined(FREEBSD9) \ || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ -@@ -110,6 +111,11 @@ +@@ -111,7 +111,8 @@ #define HAS_DUPLEX_PIPE /* 4.1 breaks with kqueue(2) */ #endif +-#if __FreeBSD_version >= 800107 /* safe; don't believe the experts */ +#if (__FreeBSD_version >= 702104 && __FreeBSD_version <= 800000) \ + || __FreeBSD_version >= 800100 -+#define HAS_CLOSEFROM -+#endif -+ - /* OpenBSD version is year+month */ + #define HAS_CLOSEFROM + #endif - #if OpenBSD >= 199805 /* XXX */ diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile index 9277c93611aa..c2de16e14f82 100644 --- a/mail/postfix28/Makefile +++ b/mail/postfix28/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 2.6.5 +PORTVERSION= 2.7.0 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -23,7 +23,7 @@ MAINTAINER= sahil@tandon.net COMMENT= A secure alternative to widely-used Sendmail VDAVERSION= 2.6.5 -CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \ +CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-68-9].* postfix-current-2.* \ sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* USE_SUBMAKE= yes @@ -132,7 +132,7 @@ _REQUIRE+= dovecot .if defined(WITH_SASLKRB) .if defined(WITH_SASLKRB5) || defined(WITH_SASLKMIT) -BROKEN= Select only one SASL Kerberos option +BROKEN= Select only one SASL Kerberos option .endif POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err .endif diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo index 7e05b3fbe4f3..b2f6b678b89f 100644 --- a/mail/postfix28/distinfo +++ b/mail/postfix28/distinfo @@ -1,6 +1,6 @@ -MD5 (postfix/postfix-2.6.5.tar.gz) = 6b954cfb3eb6141dac1e773281211717 -SHA256 (postfix/postfix-2.6.5.tar.gz) = 5b5c8d3c98d7dffece1d30ed4dc1cfbd3220842fd626a324ce038d7d795e4102 -SIZE (postfix/postfix-2.6.5.tar.gz) = 3325444 +MD5 (postfix/postfix-2.7.0.tar.gz) = df648f59421604e895cce56325f00bae +SHA256 (postfix/postfix-2.7.0.tar.gz) = c5b232ae5e396107bc58aed4178cf6cfd0a75b9dcbbedb49d158eb71d6c91b75 +SIZE (postfix/postfix-2.7.0.tar.gz) = 3418064 MD5 (postfix/postfix-2.6.5-vda-ng.patch.gz) = 43e54d0a1a016b90d15a1bd231e6fa38 SHA256 (postfix/postfix-2.6.5-vda-ng.patch.gz) = e1c04e9d268dc84832334997e1f593af9877dbd5030708280427a0dc4452e797 SIZE (postfix/postfix-2.6.5-vda-ng.patch.gz) = 12435 diff --git a/mail/postfix28/files/patch-makedefs b/mail/postfix28/files/patch-makedefs index 59dd2ccb8d95..268ceb3b9253 100644 --- a/mail/postfix28/files/patch-makedefs +++ b/mail/postfix28/files/patch-makedefs @@ -1,11 +1,9 @@ ---- makedefs.orig 2009-07-17 18:21:25.000000000 -0400 -+++ makedefs 2009-07-17 18:23:12.000000000 -0400 -@@ -144,6 +144,10 @@ +--- makedefs.orig 2010-02-16 20:22:51.000000000 -0500 ++++ makedefs 2010-02-16 20:23:42.000000000 -0500 +@@ -146,6 +146,8 @@ ;; - FreeBSD.7*) SYSTYPE=FREEBSD7 + FreeBSD.8*) SYSTYPE=FREEBSD8 ;; -+ FreeBSD.8*) SYSTYPE=FREEBSD8 -+ ;; + FreeBSD.9*) SYSTYPE=FREEBSD9 + ;; OpenBSD.2*) SYSTYPE=OPENBSD2 diff --git a/mail/postfix28/files/patch-src::util::sys_defs.h b/mail/postfix28/files/patch-src::util::sys_defs.h index 61f5186e8693..71d892ccd90b 100644 --- a/mail/postfix28/files/patch-src::util::sys_defs.h +++ b/mail/postfix28/files/patch-src::util::sys_defs.h @@ -1,22 +1,21 @@ ---- src/util/sys_defs.h.orig 2009-05-11 03:45:27.000000000 +0300 -+++ src/util/sys_defs.h 2009-07-22 21:26:44.208909929 +0300 -@@ -25,6 +25,7 @@ +--- src/util/sys_defs.h.orig 2010-02-16 20:15:11.000000000 -0500 ++++ src/util/sys_defs.h 2010-02-16 20:19:41.000000000 -0500 +@@ -25,7 +25,7 @@ */ #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ +- || defined(FREEBSD8) \ + || defined(FREEBSD8) || defined(FREEBSD9) \ || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ -@@ -110,6 +111,11 @@ +@@ -111,7 +111,8 @@ #define HAS_DUPLEX_PIPE /* 4.1 breaks with kqueue(2) */ #endif +-#if __FreeBSD_version >= 800107 /* safe; don't believe the experts */ +#if (__FreeBSD_version >= 702104 && __FreeBSD_version <= 800000) \ + || __FreeBSD_version >= 800100 -+#define HAS_CLOSEFROM -+#endif -+ - /* OpenBSD version is year+month */ + #define HAS_CLOSEFROM + #endif - #if OpenBSD >= 199805 /* XXX */