Date: Sat, 18 Jan 2014 19:08:05 +0900 (JST) From: Yasuhiro KIMURA <yasu@utahime.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/185860: [PATCH] mail/postfix: Update to 2.11.0 Message-ID: <20140118100805.67D7918845B@rolling-vm-freebsd2.home.utahime.org> Resent-Message-ID: <201401181010.s0IAA2nd085571@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185860
>Category: ports
>Synopsis: [PATCH] mail/postfix: Update to 2.11.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 18 10:10:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Yasuhiro KIMURA
>Release: FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD xxxx 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260673: Wed Jan 15 16:43:55 JST 2014 xxxx amd64
>Description:
- Update mail/postfix to 2.11.0, and add LMDB option.
- Copy mail/postfix to mail/postfix210 and update to 2.10.3.
- Update mail/postfix2[789] to latest versions.
- Mark mail/postfix27 as DEPRICATED and set EXPIRATION_DATE of 6 months.
- Update CONFLICTS of each port.
- Convert LIB_DEPENDS to new format.
- Fix warning of 'make index' on 10.0 or newer.
- Pet portlint about order of PKGNAMESUFFIX.
>How-To-Repeat:
>Fix:
Before applying attached patch, please exec following commands:
% cd /usr/ports
% svn copy mail/postfix mail/postfix210
--- patch-postfix begins here ---
Index: mail/Makefile
===================================================================
--- mail/Makefile (revision 340145)
+++ mail/Makefile (working copy)
@@ -519,6 +519,7 @@
SUBDIR += postfix-policyd-spf-python
SUBDIR += postfix-policyd-weight
SUBDIR += postfix-postfwd
+ SUBDIR += postfix210
SUBDIR += postfix27
SUBDIR += postfix28
SUBDIR += postfix29
Index: mail/postfix/Makefile
===================================================================
--- mail/postfix/Makefile (revision 340145)
+++ mail/postfix/Makefile (working copy)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= postfix
-PORTVERSION= 2.10.2
+PORTVERSION= 2.11.0
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -22,7 +22,8 @@
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
VDAVERSION= 2.10.0
-CONFLICTS= courier-0.* postfix-1.* postfix2?-* \
+CONFLICTS= courier-0.* postfix-1.* postfix2?-* postfix2?-base-* \
+ postfix210-* postfix210-base-* \
postfix-current-2.* postfix-current-base-2.* sendmail-8.* \
sendmail+*-8.* smail-3.* zmailer-2.* opensmtpd-[0-9]*
@@ -34,7 +35,7 @@
SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
OPTIONS_DEFINE= PCRE SASL2 TLS BDB MYSQL PGSQL SQLITE OPENLDAP LDAP_SASL \
- CDB NIS VDA TEST SPF INST_BASE
+ CDB NIS VDA TEST SPF INST_BASE LMDB
PCRE_DESC= Perl Compatible Regular Expressions
SASL2_DESC= Cyrus SASLv2 (Simple Auth. and Sec. Layer)
DOVECOT_DESC= Dovecot 1.x SASL authentication method
@@ -54,6 +55,7 @@
TEST_DESC= SMTP/LMTP test server and generator
SPF_DESC= SPF support (via libspf2 1.2.x)
INST_BASE_DESC= Install into /usr and /etc/postfix
+LMDB_DESC= LMDB maps
OPTIONS_RADIO= RG1 RG2
OPTIONS_RADIO_RG1= DOVECOT DOVECOT2
@@ -71,9 +73,10 @@
sendmail.1 qshape.1
MAN5= access.5 aliases.5 bounce.5 canonical.5 cidr_table.5 generic.5 \
- header_checks.5 ldap_table.5 master.5 memcache_table.5 mysql_table.5 \
- nisplus_table.5 pcre_table.5 pgsql_table.5 postconf.5 postfix-wrapper.5 \
- regexp_table.5 relocated.5 sqlite_table.5 tcp_table.5 transport.5 virtual.5
+ header_checks.5 ldap_table.5 lmdb_table.5 master.5 memcache_table.5 \
+ mysql_table.5 nisplus_table.5 pcre_table.5 pgsql_table.5 postconf.5 \
+ postfix-wrapper.5 regexp_table.5 relocated.5 socketmap_table.5 \
+ sqlite_table.5 tcp_table.5 transport.5 virtual.5
MAN8= anvil.8 bounce.8 cleanup.8 discard.8 dnsblog.8 error.8 flush.8 local.8 master.8 \
oqmgr.8 pickup.8 pipe.8 postscreen.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 showq.8 \
@@ -90,7 +93,7 @@
scache.8.html tlsmgr.8.html
.if !defined(BATCH) && !defined(PACKAGE_BUILDING) && exists(/etc/mail/mailer.conf)
-OLD_MAILER!= ${GREP} -m 1 '^purgestat' /etc/mail/mailer.conf || true
+OLD_MAILER!= ${GREP} -m 1 '^purgestat' /etc/mail/mailer.conf || ${ECHO_CMD}
.if !empty(OLD_MAILER)
IS_INTERACTIVE= yes
.endif
@@ -124,7 +127,7 @@
_REQUIRE= LOGIN cleanvar
.if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre
POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include
POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre
.else
@@ -132,7 +135,7 @@
.endif
.if ${PORT_OPTIONS:MSASL2}
-LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
POSTFIX_CCARGS+= -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
.endif
@@ -152,7 +155,7 @@
.endif
.if ${PORT_OPTIONS:MSASLKMIT}
-LIB_DEPENDS+= krb5:${PORTSDIR}/security/krb5
+LIB_DEPENDS+= libkrb5.so:${PORTSDIR}/security/krb5
POSTFIX_AUXLIBS+= -Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err
.endif
@@ -163,7 +166,7 @@
.endif
.if ${PORT_OPTIONS:MSPF}
-LIB_DEPENDS+= spf2:${PORTSDIR}/mail/libspf2
+LIB_DEPENDS+= libspf2.so:${PORTSDIR}/mail/libspf2
PATCH_SITES+= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= mm
PATCHFILES+= postfix-2.8.0-libspf2-1.2.x-0.patch.gz
@@ -211,7 +214,7 @@
_REQUIRE+= slapd
.if ${PORT_OPTIONS:MLDAP_SASL}
.if ! ${PORT_OPTIONS:MSASL2}
-LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
.endif
POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
.endif
@@ -257,6 +260,12 @@
PLIST_SUB+= BASE="@comment "
.endif
+.if ${PORT_OPTIONS:MLMDB}
+LIB_DEPENDS+= liblmdb.so:${PORTSDIR}/databases/lmdb
+POSTFIX_CCARGS+= -DHAS_LMDB -I${LOCALBASE}/include
+POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -llmdb
+.endif
+
PLIST_SUB+= PFETC=${ETCDIR}
.if ${PORT_OPTIONS:MDOCS}
Index: mail/postfix/distinfo
===================================================================
--- mail/postfix/distinfo (revision 340145)
+++ mail/postfix/distinfo (working copy)
@@ -1,5 +1,5 @@
-SHA256 (postfix/postfix-2.10.2.tar.gz) = f1a735a5a9ffeac8fca59046c437c3b76e7f923fb4249db2a55b2bff0306ddd4
-SIZE (postfix/postfix-2.10.2.tar.gz) = 3828326
+SHA256 (postfix/postfix-2.11.0.tar.gz) = ca1d9d32d5662678dc4e3f700cce82f5d7bed6a614852b17b1a5166936330c38
+SIZE (postfix/postfix-2.11.0.tar.gz) = 4034741
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-v13-2.10.0.patch) = 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f
Index: mail/postfix/pkg-plist
===================================================================
--- mail/postfix/pkg-plist (revision 340145)
+++ mail/postfix/pkg-plist (working copy)
@@ -88,6 +88,8 @@
%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html
%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
+%%PORTDOCS%%%%DOCSDIR%%/FORWARD_SECRECY_README
+%%PORTDOCS%%%%DOCSDIR%%/FORWARD_SECRECY_README.html
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
@@ -98,6 +100,8 @@
%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
+%%PORTDOCS%%%%DOCSDIR%%/LMDB_README
+%%PORTDOCS%%%%DOCSDIR%%/LMDB_README.html
%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
Index: mail/postfix210/Makefile
===================================================================
--- mail/postfix210/Makefile (revision 340031)
+++ mail/postfix210/Makefile (working copy)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= postfix
-PORTVERSION= 2.10.2
+PORTVERSION= 2.10.3
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -11,6 +11,7 @@
ftp://ftp.samurai.com/pub/postfix/official/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
MASTER_SITE_SUBDIR= . old related/postfix
+PKGNAMESUFFIX= 210
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= sahil@FreeBSD.org
@@ -22,9 +23,10 @@
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
VDAVERSION= 2.10.0
-CONFLICTS= courier-0.* postfix-1.* postfix2?-* \
- postfix-current-2.* postfix-current-base-2.* sendmail-8.* \
- sendmail+*-8.* smail-3.* zmailer-2.* opensmtpd-[0-9]*
+CONFLICTS= courier-0.* postfix-1.* postfix2[789]-* postfix2[789]-base-* \
+ postfix-2.11.* postfix-base-2.11.* postfix-current-2.* \
+ postfix-current-base-2.* sendmail-8.* sendmail+*-8.* \
+ smail-3.* zmailer-2.* opensmtpd-[0-9]*
USERS= postfix
GROUPS= mail maildrop postfix
@@ -90,7 +92,7 @@
scache.8.html tlsmgr.8.html
.if !defined(BATCH) && !defined(PACKAGE_BUILDING) && exists(/etc/mail/mailer.conf)
-OLD_MAILER!= ${GREP} -m 1 '^purgestat' /etc/mail/mailer.conf || true
+OLD_MAILER!= ${GREP} -m 1 '^purgestat' /etc/mail/mailer.conf || ${ECHO_CMD}
.if !empty(OLD_MAILER)
IS_INTERACTIVE= yes
.endif
@@ -124,7 +126,7 @@
_REQUIRE= LOGIN cleanvar
.if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre
POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include
POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre
.else
@@ -132,7 +134,7 @@
.endif
.if ${PORT_OPTIONS:MSASL2}
-LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
POSTFIX_CCARGS+= -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
.endif
@@ -152,7 +154,7 @@
.endif
.if ${PORT_OPTIONS:MSASLKMIT}
-LIB_DEPENDS+= krb5:${PORTSDIR}/security/krb5
+LIB_DEPENDS+= libkrb5.so:${PORTSDIR}/security/krb5
POSTFIX_AUXLIBS+= -Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err
.endif
@@ -163,7 +165,7 @@
.endif
.if ${PORT_OPTIONS:MSPF}
-LIB_DEPENDS+= spf2:${PORTSDIR}/mail/libspf2
+LIB_DEPENDS+= libspf2.so:${PORTSDIR}/mail/libspf2
PATCH_SITES+= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= mm
PATCHFILES+= postfix-2.8.0-libspf2-1.2.x-0.patch.gz
@@ -211,7 +213,7 @@
_REQUIRE+= slapd
.if ${PORT_OPTIONS:MLDAP_SASL}
.if ! ${PORT_OPTIONS:MSASL2}
-LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
.endif
POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
.endif
@@ -247,7 +249,7 @@
.endif
.if ${PORT_OPTIONS:MINST_BASE}
-PKGNAMESUFFIX= -base
+PKGNAMESUFFIX= 210-base
PREFIX= /usr
ETCDIR= /etc/postfix
USE_RCORDER= postfix
Index: mail/postfix210/distinfo
===================================================================
--- mail/postfix210/distinfo (revision 340031)
+++ mail/postfix210/distinfo (working copy)
@@ -1,5 +1,5 @@
-SHA256 (postfix/postfix-2.10.2.tar.gz) = f1a735a5a9ffeac8fca59046c437c3b76e7f923fb4249db2a55b2bff0306ddd4
-SIZE (postfix/postfix-2.10.2.tar.gz) = 3828326
+SHA256 (postfix/postfix-2.10.3.tar.gz) = 7815d8ad88af76e0962f18bf1e80b1aa5a0d096a00dac1d313fbab3e824b3f5b
+SIZE (postfix/postfix-2.10.3.tar.gz) = 3828808
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-v13-2.10.0.patch) = 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f
Index: mail/postfix27/Makefile
===================================================================
--- mail/postfix27/Makefile (revision 340145)
+++ mail/postfix27/Makefile (working copy)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= postfix
-PORTVERSION= 2.7.15
+PORTVERSION= 2.7.16
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -11,8 +11,8 @@
ftp://ftp.samurai.com/pub/postfix/official/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
MASTER_SITE_SUBDIR= . old related/postfix
+PKGNAMESUFFIX= 27
DIST_SUBDIR= ${PORTNAME}
-PKGNAMESUFFIX= 27
MAINTAINER= sahil@FreeBSD.org
COMMENT= Secure alternative to widely-used Sendmail
@@ -22,9 +22,13 @@
LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+DEPRECATED= No longer supported by upstream
+EXPIRATION_DATE= 2014-07-30
+
VDAVERSION= 2.7.13
-CONFLICTS= courier-0.* postfix-1.* postfix2[89]-* \
- postfix-2.10.* postfix-base-2.10.* postfix-current-2.* \
+CONFLICTS= courier-0.* postfix-1.* postfix2[89]-* postfix2[89]-base-* \
+ postfix210-* postfix210-base-* \
+ postfix-2.11.* postfix-base-2.11.* postfix-current-2.* \
postfix-current-base-2.* sendmail-8.* sendmail+*-8.* \
smail-3.* zmailer-2.* opensmtpd-[0-9]*
@@ -116,7 +120,7 @@
_REQUIRE= LOGIN cleanvar
.if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre
POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include
POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre
.else
@@ -124,7 +128,7 @@
.endif
.if ${PORT_OPTIONS:MSASL2}
-LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
POSTFIX_CCARGS+= -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
.endif
@@ -144,7 +148,7 @@
.endif
.if ${PORT_OPTIONS:MSASLKMIT}
-LIB_DEPENDS+= krb5:${PORTSDIR}/security/krb5
+LIB_DEPENDS+= libkrb5.so:${PORTSDIR}/security/krb5
POSTFIX_AUXLIBS+= -Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err
.endif
@@ -155,7 +159,7 @@
.endif
.if ${PORT_OPTIONS:MSPF}
-LIB_DEPENDS+= spf2:${PORTSDIR}/mail/libspf2
+LIB_DEPENDS+= libspf2.so:${PORTSDIR}/mail/libspf2
PATCH_SITES+= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= mm
PATCHFILES+= postfix-2.7.1-libspf2-1.2.x-4.patch.gz
Index: mail/postfix27/distinfo
===================================================================
--- mail/postfix27/distinfo (revision 340145)
+++ mail/postfix27/distinfo (working copy)
@@ -1,5 +1,5 @@
-SHA256 (postfix/postfix-2.7.15.tar.gz) = d58acafd1b14270f0f071be7b89971e7b6a9a57243db9c008cf491c6e687a1d1
-SIZE (postfix/postfix-2.7.15.tar.gz) = 3421435
+SHA256 (postfix/postfix-2.7.16.tar.gz) = ce96e415cbf699bde5cf699ac8d4242c880a68233a7b809dad6a5896c3bf94bb
+SIZE (postfix/postfix-2.7.16.tar.gz) = 3421793
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
SHA256 (postfix/postfix-vda-v10-2.7.13.patch) = aaefb45cec8744c9cd211c87ef5fa779519f459a986d354e11fe1c9a05f1c624
Index: mail/postfix28/Makefile
===================================================================
--- mail/postfix28/Makefile (revision 340145)
+++ mail/postfix28/Makefile (working copy)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= postfix
-PORTVERSION= 2.8.16
+PORTVERSION= 2.8.17
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -11,8 +11,8 @@
ftp://ftp.samurai.com/pub/postfix/official/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
MASTER_SITE_SUBDIR= . old related/postfix
+PKGNAMESUFFIX= 28
DIST_SUBDIR= ${PORTNAME}
-PKGNAMESUFFIX= 28
MAINTAINER= sahil@FreeBSD.org
COMMENT= Secure alternative to widely-used Sendmail
@@ -23,8 +23,9 @@
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
VDAVERSION= 2.8.14
-CONFLICTS= courier-0.* postfix-1.* postfix2[79]-* \
- postfix-2.10.* postfix-base-2.10.* postfix-current-2.* \
+CONFLICTS= courier-0.* postfix-1.* postfix2[79]-* postfix2[79]-base-* \
+ postfix210-* postfix210-base-* \
+ postfix-2.11.* postfix-base-2.11.* postfix-current-2.* \
postfix-current-base-2.* sendmail-8.* sendmail+*-8.* \
smail-3.* zmailer-2.* opensmtpd-[0-9]*
@@ -92,7 +93,7 @@
scache.8.html tlsmgr.8.html
.if !defined(BATCH) && !defined(PACKAGE_BUILDING) && exists(/etc/mail/mailer.conf)
-OLD_MAILER!= ${GREP} -m 1 '^purgestat' /etc/mail/mailer.conf || true
+OLD_MAILER!= ${GREP} -m 1 '^purgestat' /etc/mail/mailer.conf || ${ECHO_CMD}
.if !empty(OLD_MAILER)
IS_INTERACTIVE= yes
.endif
@@ -126,7 +127,7 @@
_REQUIRE= LOGIN cleanvar
.if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre
POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include
POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre
.else
@@ -134,7 +135,7 @@
.endif
.if ${PORT_OPTIONS:MSASL2}
-LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
POSTFIX_CCARGS+= -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
.endif
@@ -154,7 +155,7 @@
.endif
.if ${PORT_OPTIONS:MSASLKMIT}
-LIB_DEPENDS+= krb5:${PORTSDIR}/security/krb5
+LIB_DEPENDS+= libkrb5.so:${PORTSDIR}/security/krb5
POSTFIX_AUXLIBS+= -Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err
.endif
@@ -165,7 +166,7 @@
.endif
.if ${PORT_OPTIONS:MSPF}
-LIB_DEPENDS+= spf2:${PORTSDIR}/mail/libspf2
+LIB_DEPENDS+= libspf2.so:${PORTSDIR}/mail/libspf2
PATCH_SITES+= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= mm
PATCHFILES+= postfix-2.8.0-libspf2-1.2.x-0.patch.gz
@@ -213,7 +214,7 @@
_REQUIRE+= slapd
.if ${PORT_OPTIONS:MLDAP_SASL}
.if ! ${PORT_OPTIONS:MSASL2}
-LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
.endif
POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
.endif
Index: mail/postfix28/distinfo
===================================================================
--- mail/postfix28/distinfo (revision 340145)
+++ mail/postfix28/distinfo (working copy)
@@ -1,5 +1,5 @@
-SHA256 (postfix/postfix-2.8.16.tar.gz) = 1a8d98ada1aec92a6b4901b2e9e448fe02d55dab3ca50543cd1fb118fd339b49
-SIZE (postfix/postfix-2.8.16.tar.gz) = 3643279
+SHA256 (postfix/postfix-2.8.17.tar.gz) = 54342cabf6a731c931c8950ab8fefa189b4607e3bce517f294d5bdd3e6fd646a
+SIZE (postfix/postfix-2.8.17.tar.gz) = 3643766
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-v10-2.8.14.patch) = 04ee708e9532ae7d04460992927e47de7f1a7ea29b8d91ae5f87725653bfae43
Index: mail/postfix29/Makefile
===================================================================
--- mail/postfix29/Makefile (revision 340145)
+++ mail/postfix29/Makefile (working copy)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= postfix
-PORTVERSION= 2.9.8
+PORTVERSION= 2.9.9
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -11,8 +11,8 @@
ftp://ftp.samurai.com/pub/postfix/official/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
MASTER_SITE_SUBDIR= . old related/postfix
+PKGNAMESUFFIX= 29
DIST_SUBDIR= ${PORTNAME}
-PKGNAMESUFFIX= 29
MAINTAINER= sahil@FreeBSD.org
COMMENT= Secure alternative to widely-used Sendmail
@@ -23,8 +23,9 @@
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
VDAVERSION= 2.9.6
-CONFLICTS= courier-0.* postfix-1.* postfix2[78]-* \
- postfix-2.10.* postfix-base-2.10.* postfix-current-2.* \
+CONFLICTS= courier-0.* postfix-1.* postfix2[78]-* postfix2[78]-base-* \
+ postfix210-* postfix210-base-* \
+ postfix-2.11.* postfix-base-2.11.* postfix-current-2.* \
postfix-current-base-2.* sendmail-8.* sendmail+*-8.* \
smail-3.* zmailer-2.* opensmtpd-[0-9]*
@@ -92,7 +93,7 @@
scache.8.html tlsmgr.8.html
.if !defined(BATCH) && !defined(PACKAGE_BUILDING) && exists(/etc/mail/mailer.conf)
-OLD_MAILER!= ${GREP} -m 1 '^purgestat' /etc/mail/mailer.conf || true
+OLD_MAILER!= ${GREP} -m 1 '^purgestat' /etc/mail/mailer.conf || ${ECHO_CMD}
.if !empty(OLD_MAILER)
IS_INTERACTIVE= yes
.endif
@@ -126,7 +127,7 @@
_REQUIRE= LOGIN cleanvar
.if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre
POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include
POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre
.else
@@ -134,7 +135,7 @@
.endif
.if ${PORT_OPTIONS:MSASL2}
-LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
POSTFIX_CCARGS+= -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
.endif
@@ -154,7 +155,7 @@
.endif
.if ${PORT_OPTIONS:MSASLKMIT}
-LIB_DEPENDS+= krb5:${PORTSDIR}/security/krb5
+LIB_DEPENDS+= libkrb5.so:${PORTSDIR}/security/krb5
POSTFIX_AUXLIBS+= -Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err
.endif
@@ -165,7 +166,7 @@
.endif
.if ${PORT_OPTIONS:MSPF}
-LIB_DEPENDS+= spf2:${PORTSDIR}/mail/libspf2
+LIB_DEPENDS+= libspf2.so:${PORTSDIR}/mail/libspf2
PATCH_SITES+= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= mm
PATCHFILES+= postfix-2.8.0-libspf2-1.2.x-0.patch.gz
@@ -213,7 +214,7 @@
_REQUIRE+= slapd
.if ${PORT_OPTIONS:MLDAP_SASL}
.if ! ${PORT_OPTIONS:MSASL2}
-LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
.endif
POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
.endif
Index: mail/postfix29/distinfo
===================================================================
--- mail/postfix29/distinfo (revision 340145)
+++ mail/postfix29/distinfo (working copy)
@@ -1,5 +1,5 @@
-SHA256 (postfix/postfix-2.9.8.tar.gz) = 8b67005a9095d68feaf04b50da37545ac1036a2f1cd2c5226f759359fcf46488
-SIZE (postfix/postfix-2.9.8.tar.gz) = 3769844
+SHA256 (postfix/postfix-2.9.9.tar.gz) = 9fbd8d19573e9aa6fd79268b74e5a48764752d878d84d22a0415f6677065ec90
+SIZE (postfix/postfix-2.9.9.tar.gz) = 3770303
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.6.patch) = 5dc94fca86501351e8c01360aa16c1cf49a363253e4076662d0103d3d431d309
--- patch-postfix ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140118100805.67D7918845B>