13 files changed, 25 insertions, 17 deletions

diff --git a/archivers/unarchiver/Makefile b/archivers/unarchiver/Makefile
index 69085911bf9c..6f795df263c9 100644
--- a/archivers/unarchiver/Makefile
+++ b/archivers/unarchiver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	unar
 PORTVERSION=	1.10.1
+PORTREVISION=	1
 CATEGORIES=	archivers gnustep
 MASTER_SITES=	http://wakaba.c3.cx/releases/TheUnarchiver/
 DISTNAME=	${PORTNAME}${PORTVERSION}_src
@@ -15,6 +16,7 @@ LICENSE_FILE=	${WRKSRC}/License.txt
 
 # XXX: USES=gnustep overrides MAKEFILE we set below, so depend explicitly
 LIB_DEPENDS=	libgnustep-base.so:lang/gnustep-base \
+		libicuuc.so:devel/icu \
 		libwavpack.so:audio/wavpack
 
 USES=		gmake zip
diff --git a/astro/viking/Makefile b/astro/viking/Makefile
index f853450eb4b5..795e0cabb14e 100644
--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	viking
 PORTVERSION=	1.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/
 
@@ -65,6 +65,7 @@ GPSD_LIB_DEPENDS=	libgpsd.so:astro/gpsd
 GPSD_CONFIGURE_ENABLE=	realtime-gps-tracking
 
 MAPNIK_LIB_DEPENDS=	libmapnik.so:graphics/mapnik
+MAPNIK_CONFIGURE_ENV=	ac_cv_lib_icuuc_main=no # indirect
 MAPNIK_CONFIGURE_ENABLE=	mapnik
 
 MBTILES_USES=		sqlite
@@ -74,6 +75,7 @@ JOSM_RUN_DEPENDS=	josm:astro/josm
 MERKAATOR_RUN_DEPENDS=	merkaartor:astro/merkaartor
 
 post-patch:
+	@${REINPLACE_CMD} -e '/as_fn_error.*libicuuc/d' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^AM_CFLAGS/s| -g | |' ${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|Science;|Education;Science;|' \
 		${WRKSRC}/src/viking.desktop.in
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index ac04e669a69d..cb64281d3535 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fcitx
 PORTVERSION=	4.2.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	chinese x11
 MASTER_SITES=	http://download.fcitx-im.org/fcitx/:fcitx \
 		http://download.fcitx-im.org/data/:data
@@ -25,7 +25,6 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
 		${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/extra-cmake-modules
 LIB_DEPENDS=	libcairo.so:graphics/cairo \
 		libdbus-1.so:devel/dbus \
-		libicuuc.so:devel/icu \
 		libXfixes.so:x11/libXfixes \
 		libXinerama.so:x11/libXinerama \
 		libXrender.so:x11/libXrender \
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index c31a0cb97101..2065af8c0b57 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	evolution-data-server
 PORTVERSION=	3.18.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -21,6 +21,7 @@ LIB_DEPENDS=	libsoup-gnome-2.4.so:devel/libsoup-gnome \
 		libgoa-1.0.so:net/gnome-online-accounts \
 		libgdata.so:devel/libgdata \
 		libical.so:devel/libical \
+		libicui18n.so:devel/icu \
 		libnss3.so:security/nss \
 		libtasn1.so:security/libtasn1 \
 		libsecret-1.so:security/libsecret
diff --git a/dns/bundy/Makefile b/dns/bundy/Makefile
index d757f31a6f00..b20671ba0be3 100644
--- a/dns/bundy/Makefile
+++ b/dns/bundy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bundy
 PORTVERSION=	0.20160125
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	dns
 MASTER_SITES=	LOCAL/mat/bundy SF/boost/boost/1.55.0:boost
 DISTFILES+=	boost_1_55_0.tar.bz2:boost
@@ -22,7 +22,6 @@ BUILD_DEPENDS=	${LOCALBASE}/include/log4cplus/logger.h:devel/log4cplus \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/${PYTHON_PKGNAMEPREFIX}sqlite3
 LIB_DEPENDS=	libbotan-1.10.so:security/botan110 \
 		liblog4cplus.so:devel/log4cplus \
-		libicuuc.so:devel/icu \
 		libgmp.so:math/gmp \
 		libsqlite3.so:databases/sqlite3
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/${PYTHON_PKGNAMEPREFIX}sqlite3
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index d833bdbf88d1..9dc619f306bd 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	poedit
 PORTVERSION=	1.8.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	http://github.com/vslavik/${PORTNAME}/releases/download/v${PORTVERSION}-oss/
 
@@ -16,6 +16,7 @@ LICENSE=	BSD2CLAUSE
 BUILD_DEPENDS=	zip:archivers/zip
 LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell \
 		libboost_thread.so:devel/boost-libs \
+		libicui18n.so:devel/icu \
 		liblucene++.so:textproc/luceneplusplus
 
 USES=		bdb compiler:c++11-lib desktop-file-utils gettext gmake pkgconfig
diff --git a/emulators/xcpc/Makefile b/emulators/xcpc/Makefile
index 81c647608033..5aaf2994ba8e 100644
--- a/emulators/xcpc/Makefile
+++ b/emulators/xcpc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xcpc
 PORTVERSION=	20070122
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -19,8 +19,7 @@ USE_XORG=	ice
 USE_GNOME=	glib20
 USES=		gettext iconv pkgconfig
 
-LIB_DEPENDS+=	libicui18n.so:devel/icu \
-		libpcre.so:devel/pcre \
+LIB_DEPENDS+=	libpcre.so:devel/pcre \
 		libdsk.so:emulators/libdsk
 
 OPTIONS_DEFINE=	MOTIF ATHENA XSHM DEBUG
diff --git a/games/0ad/Makefile b/games/0ad/Makefile
index f27a0719ae42..6b2ec2eda08c 100644
--- a/games/0ad/Makefile
+++ b/games/0ad/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	0ad
 PORTVERSION=	0.0.21
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://releases.wildfiregames.com/ \
 		SF/zero-ad/releases
@@ -14,6 +15,7 @@ COMMENT=	Real-time strategy (RTS) game of ancient warfare
 BUILD_DEPENDS=	zip:archivers/zip \
 		cmake:devel/cmake
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libicui18n.so:devel/icu \
 		libpng.so:graphics/png \
 		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis \
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 80676327e5b4..41accfc62d18 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openttd
 DISTVERSION=	1.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://ca.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \
 		http://cz.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \
@@ -20,6 +20,7 @@ COMMENT=	Open source clone of Microprose Transport Tycoon Deluxe
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpng.so:graphics/png \
+		libicui18n.so:devel/icu \
 		liblzo2.so:archivers/lzo2
 
 USES=		cpe gmake pkgconfig tar:xz
diff --git a/net-p2p/twister/Makefile b/net-p2p/twister/Makefile
index f17ca122b3d7..52bc59c7237b 100644
--- a/net-p2p/twister/Makefile
+++ b/net-p2p/twister/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	twister-core
 PORTVERSION=	0.9.34
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	net-p2p
@@ -18,8 +18,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BROKEN_powerpc64=	Does not build
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs	\
-		libleveldb.so:databases/leveldb	\
-		libicui18n.so:devel/icu
+		libleveldb.so:databases/leveldb
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/net/zebra-server/Makefile b/net/zebra-server/Makefile
index 50210470e36e..18b48f737a86 100644
--- a/net/zebra-server/Makefile
+++ b/net/zebra-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zebra-server
 PORTVERSION=	2.0.55
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.indexdata.dk/pub/zebra/
 DISTNAME=	idzebra-${PORTVERSION}
@@ -12,6 +12,7 @@ MAINTAINER=	ben@gibbed.org
 COMMENT=	Z39.50/SR server software
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libicui18n.so:devel/icu \
 		libyaz.so:net/yaz
 
 GNU_CONFIGURE=	yes
diff --git a/security/certificate-transparency/Makefile b/security/certificate-transparency/Makefile
index 128945672bdf..a0cf39c3dac1 100644
--- a/security/certificate-transparency/Makefile
+++ b/security/certificate-transparency/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	certificate-transparency
 PORTVERSION=	20161015
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,6 +17,7 @@ LIB_DEPENDS?=	libevent.so:devel/libevent2 \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libgmock.so:devel/googlemock \
+		libicuuc.so:devel/icu \
 		libjson-c.so:devel/json-c \
 		libleveldb.so:databases/leveldb \
 		libobjecthash.so:devel/objecthash \
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 17a0aea2ac2d..3c86f7f02a26 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnustep-gui
 PORTVERSION=	0.24.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits gnustep
 MASTER_SITES=	GNUSTEP/core
 
@@ -23,6 +23,7 @@ DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html \
 LIB_DEPENDS+=	libtiff.so:graphics/tiff
 LIB_DEPENDS+=	libpng.so:graphics/png
 LIB_DEPENDS+=	libgif.so:graphics/giflib
+LIB_DEPENDS+=	libicui18n.so:devel/icu
 LIB_DEPENDS+=	libsndfile.so:audio/libsndfile
 LIB_DEPENDS+=	libao.so:audio/libao
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libflite.a:audio/flite