svn commit: r460870 - head/mail/postfix-current

[Olli Hauer]

Author: ohauer
Date: Sun Feb  4 07:16:53 2018
New Revision: 460870
URL: https://svnweb.freebsd.org/changeset/ports/460870

Log:
  - update to 3.4.20180203
  - license is now dual (see Changelog 20180203)
  - make EAI optional but on by default [1]
  
  20180128
    Documentation: the tcp_table(5) manpage now documents the
    absence of substring lookups. File: proto/tcp_table.
  
  20180203
    Licence: in addition to the historical IBM Public License
    1.0, this software is now also distributed with the more
    recent Eclipse Public License 2.0. Recipients can choose
    to take the software under the license of their choice.
    Those who are more comfortable with the IPL can continue
    with that license. File: LICENSE.
  
  PR:             ports/221619 [1]
  Submitted by:   Kubilay Kocak (koobs@)

Modified:
  head/mail/postfix-current/Makefile
  head/mail/postfix-current/distinfo

Modified: head/mail/postfix-current/Makefile
==============================================================================
--- head/mail/postfix-current/Makefile	Sun Feb  4 05:13:43 2018	(r460869)
+++ head/mail/postfix-current/Makefile	Sun Feb  4 07:16:53 2018	(r460870)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postfix
-DISTVERSION=	3.3-20180121
+DISTVERSION=	3.4-20180203
 PORTREVISION?=	0
 PORTEPOCH=	5
 CATEGORIES=	mail ipv6
@@ -20,13 +20,12 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	ohauer at FreeBSD.org
 COMMENT=	Experimental Postfix version
 
-LICENSE=	IPL10
-LICENSE_NAME=	IBM PUBLIC LICENSE VERSION 1.0
+LICENSE=	IPL10 EPL
+LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_NAME_IPL10=	IBM PUBLIC LICENSE VERSION 1.0
+LICENSE_PERMS_IPL10=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libicuuc.so:devel/icu
-
 CONFLICTS_INSTALL?=	courier-0.* opensmtpd-[0-9]* \
 		sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* postfix211-* \
 		postfix-[2|3].* postfix-base-[2|3].* postfix-sasl-[2|3].*
@@ -41,15 +40,16 @@ USE_SUBMAKE=	yes
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	BDB CDB DOCS INST_BASE LDAP LDAP_SASL LMDB MYSQL \
+OPTIONS_DEFINE=	BDB CDB DOCS EAI INST_BASE LDAP LDAP_SASL LMDB MYSQL \
 		NIS PCRE PGSQL SASL SQLITE TEST TLS
 
 OPTIONS_RADIO=		RG1
 OPTIONS_RADIO_RG1=	SASLKRB5 SASLKMIT
-OPTIONS_DEFAULT=	PCRE TLS
+OPTIONS_DEFAULT=	EAI PCRE TLS
 
 BDB_USES=		bdb
 CDB_LIB_DEPENDS=	libcdb.so:databases/tinycdb
+EAI_LIB_DEPENDS=	libicuuc.so:devel/icu
 LDAP_USE=		OPENLDAP=yes
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 MYSQL_USE=		MYSQL=yes
@@ -61,6 +61,7 @@ SQLITE_USES=		sqlite
 TLS_USES=		ssl
 
 CDB_DESC=	CDB maps lookups
+EAI_DESC=	Email Address Internationalization (SMTPUTF8) support
 INST_BASE_DESC=	Install into /usr and /etc/postfix
 LDAP_DESC=	LDAP maps (uses WITH_OPENLDAP_VER)
 LDAP_SASL_DESC=	LDAP client-to-server SASL auth
@@ -151,9 +152,12 @@ _REQUIRE=		LOGIN cleanvar dovecot
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH
 
 # Email Address Internationalization (EAI, RFC 6531..6533)
-# This is now mandantory!
+.if ${PORT_OPTIONS:MEAI}
 POSTFIX_CCARGS+=	-DHAS_EAI -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -licuuc
+.else
+POSTFIX_CCARGS+=	-DNO_EAI
+.endif
 
 .if ${PORT_OPTIONS:MPCRE}
 DYN_EXT+=		pcre

Modified: head/mail/postfix-current/distinfo
==============================================================================
--- head/mail/postfix-current/distinfo	Sun Feb  4 05:13:43 2018	(r460869)
+++ head/mail/postfix-current/distinfo	Sun Feb  4 07:16:53 2018	(r460870)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516574591
-SHA256 (postfix/postfix-3.3-20180121.tar.gz) = 4ff28ebda935756df9ca259da8ee1cd0373371de289c10796091957abf33b8b5
-SIZE (postfix/postfix-3.3-20180121.tar.gz) = 4416991
+TIMESTAMP = 1517705400
+SHA256 (postfix/postfix-3.4-20180203.tar.gz) = b0610cf669982662d7dffa0bb591b54fea935fbc2c2eb2ca604e6e44922291a5
+SIZE (postfix/postfix-3.4-20180203.tar.gz) = 4420728