- Update devel/icu to 57.1.

- Clean up the Makefile.
- Follow some upstream recommendations (--with-data-packaging=archive,
  --disable-renaming, -DICU_NO_USER_DATA_OVERRIDE).
- Patch makefiles to install static libraries with INSTALL_DATA so they
  aren't stripped.
- Patch config/mh-bsd-gcc to sync with config/mh-linux-gcc.
- Fix endianness detection in ICU.  The code wanted to use BYTE_ORDER
  defined in machine/endian.h, but this isn't visible because ICU is
  compiled with _XOPEN_SOURCE.  Patch the code to use _BYTE_ORDER instead.
- Compile ICU with C++11 compiler to enable move constructors.
- Patch ICU to fix a problem with atomics in the case of a C++11 compiler
  without C++11 header <atomic> (like Clang on FreeBSD 9).
- Bump all ports that depend on it due to library version change.
- Add USES=compiler:c++0x to some ports that pick up -std=c++0x from ICU
  pkgconfig files.
- Add USES=compiler:c++11-lib to graphics/libcdr01 because it also needs
  a C++11 runtime library now.  Add this to all ports that depend on it
  so their executables load the right libstdc++.so on FreeBSD 9.

PR:		205120
Exp-run by:	antoine
Approved by:	portmgr (antoine)

27 files changed, 255 insertions, 81 deletions

diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile
index a53c060de755..0ba82852d817 100644
--- a/devel/boost-libs/Makefile
+++ b/devel/boost-libs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	boost-libs
-PORTREVISION=	12
+PORTREVISION=	13
 
 COMMENT=	Free portable C++ libraries (without Boost.Python)
 
diff --git a/devel/dee/Makefile b/devel/dee/Makefile
index 33bf609fb90e..327b6b835ce9 100644
--- a/devel/dee/Makefile
+++ b/devel/dee/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dee
 PORTVERSION=	1.2.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	https://launchpadlibrarian.net/151383425/ \
 	https://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 91915557e27b..95e17742600c 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	glib
 PORTVERSION=	2.46.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/hs-text-icu/Makefile b/devel/hs-text-icu/Makefile
index 65b2ca0d03f8..6be718ab0c04 100644
--- a/devel/hs-text-icu/Makefile
+++ b/devel/hs-text-icu/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	text-icu
 PORTVERSION=	0.7.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/icu/Makefile b/devel/icu/Makefile
index 8f6211a19433..5e4ab3da709d 100644
--- a/devel/icu/Makefile
+++ b/devel/icu/Makefile
@@ -2,72 +2,44 @@
 # $FreeBSD$
 
 PORTNAME=	icu
-PORTVERSION=	55.1
+DISTVERSION=	57_1
 PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://download.icu-project.org/files/icu4c/${PORTVERSION}/ \
-		SF/${PORTNAME}/ICU4C/${PORTVERSION}/
-DISTNAME=	icu4c-${PORTVERSION:S/./_/g}
-EXTRACT_SUFX=	-src.tgz
+MASTER_SITES=	http://download.icu-project.org/files/icu4c/${PORTVERSION}/
+DISTNAME=	icu4c-${DISTVERSION}-src
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	International Components for Unicode (from IBM)
 
 LICENSE=	ICU
 LICENSE_NAME=	ICU license
-LICENSE_FILE=	${WRKSRC}/../license.html
+LICENSE_FILE=	${WRKSRC}/../LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-OPTIONS_DEFINE=	THREADS
-OPTIONS_DEFAULT=	THREADS
-THREADS_DESC=	Build thread-safe version of the library
-
-USE_LDCONFIG=		yes
-
-WRKSRC=			${WRKDIR}/icu/source
-
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-data-packaging=library \
-			--disable-samples \
-			--enable-release \
-			--enable-shared \
-			--enable-static
-
-.if defined(X_BUILD_FOR)
-CONFIGURE_ARGS+=	--with-cross-build
-.endif
-
-
-USES=			gmake pathfix
+CONFIGURE_ARGS+=--with-data-packaging=archive \
+		--disable-renaming \
+		--disable-samples \
+		--enable-static
+CPPFLAGS+=	-DICU_NO_USER_DATA_OVERRIDE
+MAKE_ARGS=	VERBOSE=1
+TEST_TARGET=	check
+USES=		compiler:c++0x gmake pathfix tar:tgz
+USE_LDCONFIG=	yes
+WRKSRC=		${WRKDIR}/icu/source
 
 ICUMAJOR=	${PORTVERSION:C/\..*//}
 PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION}
 
-# This builds thread-safe, but not the thread-using version:
-THREADS_CONFIGURE_ON=	--enable-weak-threads
-THREADS_CONFIGURE_OFF=	--enable-threads=no
-
 .include <bsd.port.options.mk>
 
-# For all Bigendian systems, set CPPFLAGS so that icu compiles and checks correctly
-.if ${ARCH} == "mips" || ${ARCH} == "mips64" || ${ARCH} == "sparc64" || ${ARCH} == "powerpc" || ${ARCH} == "powerpc64"
-CPPFLAGS+=	-DU_IS_BIG_ENDIAN=1
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e '/CXXFLAGS=/s/-ansi//' \
-		${WRKSRC}/configure
-.if ! ${PORT_OPTIONS:MTHREADS}
-	@${REINPLACE_CMD} -e 's,\(THREADSC.*FLAGS\).*,\1=,g' ${WRKSRC}/config/mh-bsd-gcc
+.if ${ARCH} == "mips" || ${ARCH} == "mips64" || ${ARCH} == "sparc64" \
+ || ${ARCH} == "powerpc" || ${ARCH} == "powerpc64"
+PLIST_FILES+=	%%DATADIR%%/%%ICUVER%%/icudt%%ICUMAJOR%%b.dat
+.else
+PLIST_FILES+=	%%DATADIR%%/%%ICUVER%%/icudt%%ICUMAJOR%%l.dat
 .endif
 
-iotest cintltst intltest:
-	# Performing the ${.TARGET} test
-	-${MAKE_CMD} -C ${WRKSRC}/test
-	cd ${WRKSRC}/test/${.TARGET} && ${SETENV} \
-	    LD_LIBRARY_PATH=${WRKSRC}/lib:${WRKSRC}/tools/ctestfw \
-	    ./${.TARGET}
-
 post-stage:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/g* \
 		${STAGEDIR}${PREFIX}/bin/*conv \
@@ -75,8 +47,5 @@ post-stage:
 		${STAGEDIR}${PREFIX}/bin/derb \
 		${STAGEDIR}${PREFIX}/bin/pkgdata
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libicuda*.so.*
-
-test regression-test: iotest cintltst intltest
 
 .include <bsd.port.mk>
diff --git a/devel/icu/distinfo b/devel/icu/distinfo
index 57f78850bb0e..26b29c40a625 100644
--- a/devel/icu/distinfo
+++ b/devel/icu/distinfo
@@ -1,2 +1,3 @@
-SHA256 (icu4c-55_1-src.tgz) = e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b
-SIZE (icu4c-55_1-src.tgz) = 25600847
+TIMESTAMP = 1464596691
+SHA256 (icu4c-57_1-src.tgz) = ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581
+SIZE (icu4c-57_1-src.tgz) = 22360664
diff --git a/devel/icu/files/patch-common_Makefile.in b/devel/icu/files/patch-common_Makefile.in
new file mode 100644
index 000000000000..501313e53726
--- /dev/null
+++ b/devel/icu/files/patch-common_Makefile.in
@@ -0,0 +1,11 @@
+--- common/Makefile.in.orig	2016-03-23 20:50:12 UTC
++++ common/Makefile.in
+@@ -146,7 +146,7 @@ install-local: install-headers install-l
+ install-library: all-local
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+ ifneq ($(ENABLE_STATIC),)
+-	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+ 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
diff --git a/devel/icu/files/patch-common_umutex.cpp b/devel/icu/files/patch-common_umutex.cpp
new file mode 100644
index 000000000000..024225bff10a
--- /dev/null
+++ b/devel/icu/files/patch-common_umutex.cpp
@@ -0,0 +1,25 @@
+--- common/umutex.cpp.orig	2016-03-23 20:50:10 UTC
++++ common/umutex.cpp
+@@ -264,19 +264,19 @@ static pthread_cond_t initCondition = PT
+ U_COMMON_API UBool U_EXPORT2
+ umtx_initImplPreInit(UInitOnce &uio) {
+     pthread_mutex_lock(&initMutex);
+-    int32_t state = uio.fState;
++    int32_t state = umtx_loadAcquire(uio.fState);
+     if (state == 0) {
+         umtx_storeRelease(uio.fState, 1);
+         pthread_mutex_unlock(&initMutex);
+         return TRUE;   // Caller will next call the init function.
+     } else {
+-        while (uio.fState == 1) {
++        while (umtx_loadAcquire(uio.fState) == 1) {
+             // Another thread is currently running the initialization.
+             // Wait until it completes.
+             pthread_cond_wait(&initCondition, &initMutex);
+         }
+         pthread_mutex_unlock(&initMutex);
+-        U_ASSERT(uio.fState == 2);
++        U_ASSERT(umtx_loadAcquire(uio.fState) == 2);
+         return FALSE;
+     }
+ }
diff --git a/devel/icu/files/patch-common_unicode_platform.h b/devel/icu/files/patch-common_unicode_platform.h
new file mode 100644
index 000000000000..895bb50e3de0
--- /dev/null
+++ b/devel/icu/files/patch-common_unicode_platform.h
@@ -0,0 +1,13 @@
+--- common/unicode/platform.h.orig	2016-03-23 20:49:58 UTC
++++ common/unicode/platform.h
+@@ -379,8 +379,8 @@
+  */
+ #ifdef U_IS_BIG_ENDIAN
+     /* Use the predefined value. */
+-#elif defined(BYTE_ORDER) && defined(BIG_ENDIAN)
+-#   define U_IS_BIG_ENDIAN (BYTE_ORDER == BIG_ENDIAN)
++#elif defined(_BYTE_ORDER) && defined(_BIG_ENDIAN)
++#   define U_IS_BIG_ENDIAN (_BYTE_ORDER == _BIG_ENDIAN)
+ #elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__)
+     /* gcc */
+ #   define U_IS_BIG_ENDIAN (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
diff --git a/devel/icu/files/patch-common_unicode_uconfig.h b/devel/icu/files/patch-common_unicode_uconfig.h
new file mode 100644
index 000000000000..523ae7cf27a9
--- /dev/null
+++ b/devel/icu/files/patch-common_unicode_uconfig.h
@@ -0,0 +1,11 @@
+--- common/unicode/uconfig.h.orig	2016-03-23 20:49:54 UTC
++++ common/unicode/uconfig.h
+@@ -87,7 +87,7 @@
+  * @internal
+  */
+ #ifndef U_DISABLE_RENAMING
+-#define U_DISABLE_RENAMING 0
++#define U_DISABLE_RENAMING 1
+ #endif
+ 
+ /**
diff --git a/devel/icu/files/patch-config__mh-bsd-gcc b/devel/icu/files/patch-config__mh-bsd-gcc
deleted file mode 100644
index d5576fd75111..000000000000
--- a/devel/icu/files/patch-config__mh-bsd-gcc
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./config/mh-bsd-gcc.orig	2011-10-19 01:13:00.000000000 +0200
-+++ ./config/mh-bsd-gcc	2012-01-14 21:01:17.083384507 +0100
-@@ -23,9 +23,6 @@
- ## Compiler switch to embed a library name
- LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
- 
--## Shared library options
--LD_SOOPTIONS= -Wl,-Bsymbolic
--
- ## Shared object suffix
- SO = so
- ## Non-shared intermediate object suffix
diff --git a/devel/icu/files/patch-config_mh-bsd-gcc b/devel/icu/files/patch-config_mh-bsd-gcc
new file mode 100644
index 000000000000..b4583b6ec1d8
--- /dev/null
+++ b/devel/icu/files/patch-config_mh-bsd-gcc
@@ -0,0 +1,82 @@
+--- config/mh-bsd-gcc.orig	2016-03-23 20:50:50 UTC
++++ config/mh-bsd-gcc
+@@ -4,8 +4,8 @@
+ ## others. All Rights Reserved.
+ 
+ ## Commands to generate dependency files
+-GEN_DEPS.c=	$(CC) -E -MM $(DEFS) $(CPPFLAGS)
+-GEN_DEPS.cc=	$(CXX) -E -MM $(DEFS) $(CPPFLAGS)
++GEN_DEPS.c=  $(CC) -E -MM $(DEFS) $(CPPFLAGS)
++GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) $(CXXFLAGS)
+ 
+ ## Flags for position independent code
+ SHAREDLIBCFLAGS = -fPIC
+@@ -18,10 +18,16 @@ LIBCPPFLAGS =
+ 
+ ## Compiler switch to embed a runtime search path
+ LD_RPATH=	
+-LD_RPATH_PRE=	-Wl,-rpath,
++LD_RPATH_PRE = -Wl,-rpath,
++
++## These are the library specific LDFLAGS
++LDFLAGSICUDT=-nodefaultlibs -nostdlib
+ 
+ ## Compiler switch to embed a library name
+-LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
++# The initial tab in the next line is to prevent icu-config from reading it.
++	LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
++#SH# # We can't depend on MIDDLE_SO_TARGET being set.
++#SH# LD_SONAME=
+ 
+ ## Shared library options
+ LD_SOOPTIONS= -Wl,-Bsymbolic
+@@ -33,27 +39,27 @@ STATIC_O = ao
+ 
+ ## Compilation rules
+ %.$(STATIC_O): $(srcdir)/%.c
+-	$(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
++	$(call SILENT_COMPILE,$(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -o $@ $<)
+ %.o: $(srcdir)/%.c
+-	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
++	$(call SILENT_COMPILE,$(strip $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS)) -o $@ $<)
+ 
+ %.$(STATIC_O): $(srcdir)/%.cpp
+-	$(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $<
++	$(call SILENT_COMPILE,$(strip $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS)) -o $@ $<)
+ %.o: $(srcdir)/%.cpp
+-	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
++	$(call SILENT_COMPILE,$(strip $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS)) -o $@ $<)
+ 
+ 
+ ## Dependency rules
+ %.d: $(srcdir)/%.c
+-	@echo "generating dependency information for $<"
++	$(call ICU_MSG,(deps)) $<
+ 	@$(SHELL) -ec '$(GEN_DEPS.c) $< \
+-		| sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
++		| sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
+ 		[ -s $@ ] || rm -f $@'
+ 
+ %.d: $(srcdir)/%.cpp
+-	@echo "generating dependency information for $<"
++	$(call ICU_MSG,(deps)) $<
+ 	@$(SHELL) -ec '$(GEN_DEPS.cc) $< \
+-		| sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
++		| sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
+ 		[ -s $@ ] || rm -f $@'
+ 
+ ## Versioned libraries rules
+@@ -64,7 +70,7 @@ STATIC_O = ao
+ 	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
+ 
+ ##  Bind internal references
+- 
++
+ # LDflags that pkgdata will use
+ BIR_LDFLAGS= -Wl,-Bsymbolic
+ 
+@@ -77,4 +83,3 @@ STATIC_PREFIX = 
+ 
+ ## End BSD-specific setup
+ 
+-
diff --git a/devel/icu/files/patch-i18n_Makefile.in b/devel/icu/files/patch-i18n_Makefile.in
new file mode 100644
index 000000000000..ea934c0f4cb9
--- /dev/null
+++ b/devel/icu/files/patch-i18n_Makefile.in
@@ -0,0 +1,11 @@
+--- i18n/Makefile.in.orig	2016-03-23 20:49:38 UTC
++++ i18n/Makefile.in
+@@ -135,7 +135,7 @@ install-local: install-headers install-l
+ install-library: all-local
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+ ifneq ($(ENABLE_STATIC),)
+-	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+ 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
diff --git a/devel/icu/files/patch-install b/devel/icu/files/patch-install
deleted file mode 100644
index 9af0afc80593..000000000000
--- a/devel/icu/files/patch-install
+++ /dev/null
@@ -1,8 +0,0 @@
---- Makefile.in	2007-12-12 13:58:06.000000000 -0500
-+++ Makefile.in	2008-01-28 15:20:56.000000000 -0500
-@@ -126,5 +126,4 @@
- 	$(INSTALL_DATA) @platform_make_fragment@ $(DESTDIR)$(pkgdatadir)/config/@platform_make_fragment_name@
- 	$(INSTALL_SCRIPT) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/mkinstalldirs
--	$(INSTALL_SCRIPT) $(top_srcdir)/install-sh $(DESTDIR)$(pkgdatadir)/install-sh
- 	$(INSTALL_DATA) $(top_srcdir)/../license.html $(DESTDIR)$(pkgdatadir)/license.html
- 	$(INSTALL_SCRIPT) $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config
diff --git a/devel/icu/files/patch-io_Makefile.in b/devel/icu/files/patch-io_Makefile.in
new file mode 100644
index 000000000000..9d44a6211a08
--- /dev/null
+++ b/devel/icu/files/patch-io_Makefile.in
@@ -0,0 +1,11 @@
+--- io/Makefile.in.orig	2016-03-23 20:50:52 UTC
++++ io/Makefile.in
+@@ -96,7 +96,7 @@ install-local: install-headers install-l
+ install-library: all-local
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+ ifneq ($(ENABLE_STATIC),)
+-	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+ 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
diff --git a/devel/icu/files/patch-layout_Makefile.in b/devel/icu/files/patch-layout_Makefile.in
new file mode 100644
index 000000000000..d5c881287eb5
--- /dev/null
+++ b/devel/icu/files/patch-layout_Makefile.in
@@ -0,0 +1,11 @@
+--- layout/Makefile.in.orig	2016-03-23 20:56:48 UTC
++++ layout/Makefile.in
+@@ -180,7 +180,7 @@ install-local: install-headers install-l
+ install-library: all-local
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+ ifneq ($(ENABLE_STATIC),)
+-	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+ 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
diff --git a/devel/icu/files/patch-layoutex_Makefile.in b/devel/icu/files/patch-layoutex_Makefile.in
new file mode 100644
index 000000000000..2b6dc2076b1f
--- /dev/null
+++ b/devel/icu/files/patch-layoutex_Makefile.in
@@ -0,0 +1,11 @@
+--- layoutex/Makefile.in.orig	2016-03-23 20:56:38 UTC
++++ layoutex/Makefile.in
+@@ -109,7 +109,7 @@ endif
+ install-library: all-local
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+ ifneq ($(ENABLE_STATIC),)
+-	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+ 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
diff --git a/devel/icu/files/patch-stubdata_Makefile.in b/devel/icu/files/patch-stubdata_Makefile.in
new file mode 100644
index 000000000000..64496fc4eecb
--- /dev/null
+++ b/devel/icu/files/patch-stubdata_Makefile.in
@@ -0,0 +1,11 @@
+--- stubdata/Makefile.in.orig	2016-03-23 20:50:52 UTC
++++ stubdata/Makefile.in
+@@ -82,7 +82,7 @@ install-local: install-library
+ install-library: all-local
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+ ifneq ($(ENABLE_STATIC),)
+-	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+ 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
diff --git a/devel/icu/files/patch-tools_ctestfw_Makefile.in b/devel/icu/files/patch-tools_ctestfw_Makefile.in
new file mode 100644
index 000000000000..23d88a42587f
--- /dev/null
+++ b/devel/icu/files/patch-tools_ctestfw_Makefile.in
@@ -0,0 +1,11 @@
+--- tools/ctestfw/Makefile.in.orig	2016-03-23 20:50:16 UTC
++++ tools/ctestfw/Makefile.in
+@@ -78,7 +78,7 @@ install-local: install-library
+ install-library: all-local
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+ ifneq ($(ENABLE_STATIC),)
+-	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+ 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
diff --git a/devel/icu/files/patch-tools_toolutil_Makefile.in b/devel/icu/files/patch-tools_toolutil_Makefile.in
new file mode 100644
index 000000000000..cbf12cd84446
--- /dev/null
+++ b/devel/icu/files/patch-tools_toolutil_Makefile.in
@@ -0,0 +1,11 @@
+--- tools/toolutil/Makefile.in.orig	2016-03-23 20:50:26 UTC
++++ tools/toolutil/Makefile.in
+@@ -89,7 +89,7 @@ install-local: install-library
+ install-library: all-local
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+ ifneq ($(ENABLE_STATIC),)
+-	$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(TARGET) $(DESTDIR)$(libdir)
+ endif
+ ifneq ($(ENABLE_SHARED),)
+ 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
diff --git a/devel/icu/pkg-plist b/devel/icu/pkg-plist
index 1e52caaec70b..ba1c6ac0b102 100644
--- a/devel/icu/pkg-plist
+++ b/devel/icu/pkg-plist
@@ -132,6 +132,7 @@ include/unicode/schriter.h
 include/unicode/scientificnumberformatter.h
 include/unicode/search.h
 include/unicode/selfmt.h
+include/unicode/simpleformatter.h
 include/unicode/simpletz.h
 include/unicode/smpdtfmt.h
 include/unicode/sortkey.h
@@ -202,6 +203,7 @@ include/unicode/uobject.h
 include/unicode/upluralrules.h
 include/unicode/uregex.h
 include/unicode/uregion.h
+include/unicode/ureldatefmt.h
 include/unicode/urename.h
 include/unicode/urep.h
 include/unicode/ures.h
@@ -254,6 +256,7 @@ man/man8/genccode.8.gz
 man/man8/gencmn.8.gz
 man/man8/gensprep.8.gz
 man/man8/icupkg.8.gz
+%%DATADIR%%/%%ICUVER%%/install-sh
 %%DATADIR%%/%%ICUVER%%/mkinstalldirs
-%%DATADIR%%/%%ICUVER%%/license.html
+%%DATADIR%%/%%ICUVER%%/LICENSE
 %%DATADIR%%/%%ICUVER%%/config/mh-bsd-gcc
diff --git a/devel/objecthash/Makefile b/devel/objecthash/Makefile
index 73321be4ffef..e27ac18900b1 100644
--- a/devel/objecthash/Makefile
+++ b/devel/objecthash/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	objecthash
 PORTVERSION=	20160121
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/devel/pecl-intl/Makefile b/devel/pecl-intl/Makefile
index 324fe5a94570..c1f3f6ef7b6b 100644
--- a/devel/pecl-intl/Makefile
+++ b/devel/pecl-intl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	intl
 PORTVERSION=	3.0.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel pear
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
diff --git a/devel/php70-intl/Makefile b/devel/php70-intl/Makefile
index 7fbefd3675e5..b54eb5e69759 100644
--- a/devel/php70-intl/Makefile
+++ b/devel/php70-intl/Makefile
@@ -1,6 +1,7 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MASTERDIR=	${.CURDIR}/../../lang/php70
diff --git a/devel/py-pyicu/Makefile b/devel/py-pyicu/Makefile
index 43694bc843b6..30298c8682b7 100644
--- a/devel/py-pyicu/Makefile
+++ b/devel/py-pyicu/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pyicu
 PORTVERSION=	1.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile
index b06c315cf5ba..215edaa2c324 100644
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	corelib
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile
index d46aee2f0515..61fa76aec44a 100644
--- a/devel/qt5-core/Makefile
+++ b/devel/qt5-core/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	core
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-