Index: mail/postfix/Makefile
===================================================================
--- mail/postfix/Makefile
+++ mail/postfix/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	3.1.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/ \
@@ -23,8 +23,6 @@
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libicuuc.so:devel/icu
-
 PORTSCOUT=	limit:^3\.1\.
 
 CONFLICTS_INSTALL?=	courier-0.* opensmtpd-[0-9]* \
@@ -41,15 +39,19 @@
 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
+EAI_VARS=		POSTFIX_CCARGS+="-DHAS_EAI -I${LOCALBASE}/include" \
+			POSTFIX_AUXLIBS+="-L${LOCALBASE}/lib -licuuc"
+EAI_VARS_OFF=		POSTFIX_CCARGS+=-DNO_EAI
 LDAP_USE=		OPENLDAP=yes
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 MYSQL_USE=		MYSQL=yes
@@ -61,6 +63,7 @@
 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
@@ -150,11 +153,6 @@
 # see Postfix HISTORY 20051222
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH
 
-# Email Address Internationalization (EAI, RFC 6531..6533)
-# This is now mandantory!
-POSTFIX_CCARGS+=	-DHAS_EAI -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -licuuc
-
 .if ${PORT_OPTIONS:MPCRE}
 DYN_EXT+=		pcre
 POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include