- 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)
svn path=/head/; revision=422711
2024-11-19 00:13:33 +00:00 · 2016-09-24 11:06:57 +00:00 · 2016-09-24 11:06:57 +00:00 · 48f4591035 · 2021-03-31 03:12:20 +00:00
commit 48f4591035
parent 2f52ed1ee6
110 changed files with 351 additions and 157 deletions
--- a/archivers/unarchiver/Makefile
+++ b/archivers/unarchiver/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	unar
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	archivers gnustep
 MASTER_SITES=	http://wakaba.c3.cx/releases/TheUnarchiver/
 DISTNAME=	${PORTNAME}${PORTVERSION}_src
--- a/astro/osmium/Makefile
+++ b/astro/osmium/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	osmium
 PORTVERSION=	git20130522
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	astro geography devel

 MAINTAINER=	amdmi3@FreeBSD.org
--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	viking
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/

--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	musicpd
 PORTVERSION=	0.19.15
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio ipv6
 MASTER_SITES=	http://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	ncmpcpp
 PORTVERSION=	0.7.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://ncmpcpp.rybczak.net/stable/

--- a/cad/freecad/Makefile
+++ b/cad/freecad/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	FreeCAD
 DISTVERSION=	0.17.g20160907
+PORTREVISION=	1
 CATEGORIES=	cad

 MAINTAINER=	pfg@FreeBSD.org
@ -31,7 +32,7 @@ LIB_DEPENDS=	libexpat.so:textproc/expat2		\
 USE_GITHUB=	yes
 GH_TAGNAME=	1ed3562

-USES=		compiler:c++11-lang cmake:outsource jpeg python localbase
+USES=		compiler:c++11-lib cmake:outsource jpeg python localbase
 USE_XORG=	ice sm x11 xext xt
 USE_GL=		gl glu
 USE_QT4=	qmake_build corelib gui moc_build network opengl rcc_build \
--- a/cad/gmsh-occ/Makefile
+++ b/cad/gmsh-occ/Makefile
@ -1,8 +1,7 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$

-PORTNAME=	gmsh
-CATEGORIES=	cad
+PORTREVISION=	1
 PKGNAMESUFFIX=	-occ

 MAINTAINER=	thierry@FreeBSD.org
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	gmsh
 PORTVERSION=	2.12.0
+PORTREVISION?=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.geuz.org/gmsh/src/ \
 		http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/
@ -11,8 +12,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	gmsh
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}

-MAINTAINER=	jrm@ftfl.ca
-COMMENT=	Automatic 3D finite element mesh generator
+MAINTAINER?=	jrm@ftfl.ca
+COMMENT?=	Automatic 3D finite element mesh generator

 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
 		libpng.so:graphics/png \
@ -25,7 +26,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-source

 SLAVEDIRS=	cad/gmsh-occ

-USES=		cmake fortran gmake jpeg tar:tgz
+USES=		cmake compiler:c++11-lib fortran gmake jpeg tar:tgz
 USE_GL=		yes
 ALL_TARGET=	all

--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	opencascade
 PORTVERSION=	6.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad science
 MASTER_SITES=	LOCAL/thierry

@ -21,8 +21,8 @@ RUN_DEPENDS=	bash:shells/bash

 # Check ${WRKSRC}/dox/overview/Overview.md
 # and ${WRKSRC}/dox/dev_guides/building
-USES=		alias:10 bison cmake compiler dos2unix gmake shebangfix tk \
-		tar:tgz
+USES=		alias:10 bison cmake compiler:c++11-lib dos2unix gmake \
+		shebangfix tk tar:tgz
 USE_XORG=	xmu
 DOS2UNIX_FILES=	adm/templates/*
 SHEBANG_FILES=	adm/templates/env.sh.in adm/templates/draw.sh		\
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	fcitx
 PORTVERSION=	4.2.9.1
+PORTREVISION=	1
 CATEGORIES=	chinese x11
 MASTER_SITES=	http://download.fcitx-im.org/fcitx/:fcitx \
 		http://download.fcitx-im.org/data/:data
--- a/chinese/tin/Makefile
+++ b/chinese/tin/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 # Don't reset PORTREVISION and keep bumping it even if PORTVERSION is changed.
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	chinese

 MAINTAINER=	ports@FreeBSD.org
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	couchdb
 PORTVERSION=	1.6.1
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	2
 CATEGORIES=	databases
 MASTER_SITES=	APACHE/couchdb/source/${PORTVERSION}
--- 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=	1
+PORTREVISION=	2
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
--- a/databases/firebird25-server/Makefile
+++ b/databases/firebird25-server/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	firebird
 PORTVERSION=	2.5.6
+PORTREVISION=	1
 CATEGORIES?=	databases
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.0//}-Release/
 PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}-server
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@ -3,7 +3,7 @@

 PORTNAME?=	postgresql
 DISTVERSION?=	9.1.23
-PORTREVISION=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
@ -231,6 +231,7 @@ post-patch:
 .  if ${PORT_OPTIONS:MICU}
 	@${REINPLACE_CMD} -E -e \
 		"s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \
+		-e '/icu/s/_57//' \
 		${WRKSRC}/configure.in
 .  endif

--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@ -3,7 +3,7 @@

 PORTNAME?=	postgresql
 DISTVERSION?=	9.2.18
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}${COMPONENT}
@ -230,6 +230,7 @@ post-patch:
 .  if defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU}
 	@${REINPLACE_CMD} -E -e \
 		"s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \
+		-e '/icu/s/_57//' \
 		${WRKSRC}/configure.in
 .  endif

--- a/databases/postgresql96-server/Makefile
+++ b/databases/postgresql96-server/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 DISTVERSION?=	9.6rc1
-PORTREVISION?=	3
+PORTREVISION?=	4

 MAINTAINER?=	pgsql@FreeBSD.org

--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	sqlite3
 PORTVERSION=	3.14.1
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://www.sqlite.org/2016/ http://www2.sqlite.org/2016/ http://www3.sqlite.org/2016/
 DISTNAME=	sqlite-autoconf-${PORTVERSION:C/\.([[:digit:]])[[:>:]]/0\1/g:S/.//g}00
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	calibre
 PORTVERSION=	2.68.0
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/

--- 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)

--- 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/
--- 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
--- 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
--- 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
+.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

-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
-.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>
--- 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
--- a/devel/icu/files/patch-common_Makefile.in
+++ 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)
--- a/devel/icu/files/patch-common_umutex.cpp
+++ 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;
+     }
+ }
--- a/devel/icu/files/patch-common_unicode_platform.h
+++ 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__)
--- a/devel/icu/files/patch-common_unicode_uconfig.h
+++ 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
+ 
+ /**
--- a/devel/icu/files/patch-config__mh-bsd-gcc
+++ b/devel/icu/files/patch-config__mh-bsd-gcc
@ -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
--- a/devel/icu/files/patch-config_mh-bsd-gcc
+++ 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
+ 
+-
--- a/devel/icu/files/patch-i18n_Makefile.in
+++ 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)
--- a/devel/icu/files/patch-install
+++ b/devel/icu/files/patch-install
@ -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
--- a/devel/icu/files/patch-io_Makefile.in
+++ 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)
--- a/devel/icu/files/patch-layout_Makefile.in
+++ 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)
--- a/devel/icu/files/patch-layoutex_Makefile.in
+++ 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)
--- a/devel/icu/files/patch-stubdata_Makefile.in
+++ 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)
--- a/devel/icu/files/patch-tools_ctestfw_Makefile.in
+++ 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)
--- a/devel/icu/files/patch-tools_toolutil_Makefile.in
+++ 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)
--- 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
--- 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
--- 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-
--- 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
--- 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}
--- 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-

--- 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-

--- a/dns/bundy/Makefile
+++ b/dns/bundy/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	bundy
 PORTVERSION=	0.20160125
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	dns
 MASTER_SITES=	LOCAL/mat/bundy SF/boost/boost/1.55.0:boost
 DISTFILES+=	boost_1_55_0.tar.bz2:boost
--- a/dns/libpsl/Makefile
+++ b/dns/libpsl/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	libpsl
 PORTVERSION=	0.13.0
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns

 MAINTAINER=	sunpoet@FreeBSD.org
--- a/editors/libreoffice4/Makefile
+++ b/editors/libreoffice4/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	libreoffice
 PORTVERSION=	4.3.7
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	editors
 MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
 		http://dev-www.libreoffice.org/extern/:ext \
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	poedit
 PORTVERSION=	1.8.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://github.com/vslavik/${PORTNAME}/releases/download/v${PORTVERSION}-oss/

--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@ -3,7 +3,7 @@

 PORTNAME=		open-vm-tools
 PORTVERSION=		${BUILD_VER}
-PORTREVISION=		14
+PORTREVISION=		15
 PORTEPOCH=		1
 CATEGORIES=		emulators
 MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-9.4.x
--- a/emulators/xcpc/Makefile
+++ b/emulators/xcpc/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	xcpc
 PORTVERSION=	20070122
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

--- a/games/0ad/Makefile
+++ b/games/0ad/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	0ad
 PORTVERSION=	0.0.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/zero-ad/releases \
 		http://releases.wildfiregames.com/
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	openttd
 DISTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://ca.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \
 		http://cz.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	inkscape
 PORTVERSION=	0.91
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics gnome
 MASTER_SITES=	https://inkscape.global.ssl.fastly.net/media/resources/file/ \
 		LOCAL/kwm
@ -22,7 +22,7 @@ LIB_DEPENDS=	libpopt.so:devel/popt \
 #RUN_DEPENDS=	p5-XML-XQL>=0:textproc/p5-XML-XQL

 USE_GNOME=	gtkmm24 intlhack libxslt
-USES=		compiler:c++0x cpe desktop-file-utils gettext gmake iconv \
+USES=		compiler:c++11-lib cpe desktop-file-utils gettext gmake iconv \
 		libtool pathfix perl5 pkgconfig python:run shebangfix tar:bzip2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
--- a/graphics/libcdr01/Makefile
+++ b/graphics/libcdr01/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	libcdr
 PORTVERSION=	0.1.3
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	LODEV
 PKGNAMESUFFIX=	01
@ -19,7 +20,7 @@ LIB_DEPENDS=	libicui18n.so:devel/icu \

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-tests --disable-werror --without-docs
-USES=	libtool pathfix pkgconfig tar:xz
+USES=		compiler:c++11-lib libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip

--- a/graphics/libfreehand/Makefile
+++ b/graphics/libfreehand/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	libfreehand
 PORTVERSION=	0.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	LODEV

--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	mapnik
 PORTVERSION=	3.0.9
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/

--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	tesseract
 PORTVERSION=	3.04.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics

 MAINTAINER=	pkubaj@anongoth.pl
--- a/irc/znc/Makefile
+++ b/irc/znc/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	znc
 PORTVERSION=	1.6.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://znc.in/releases/ \
 		http://znc.in/releases/archive/
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	gnustep-base
 PORTVERSION=	1.24.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang devel gnustep
 MASTER_SITES=	GNUSTEP/core

--- a/lang/parrot/Makefile
+++ b/lang/parrot/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	parrot
 PORTVERSION=	8.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.parrot.org/pub/parrot/releases/supported/${PORTVERSION}/ \
 		LOCAL/sunpoet
--- a/lang/phantomjs/Makefile
+++ b/lang/phantomjs/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	phantomjs
 PORTVERSION=	2.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang
 MASTER_SITES=	https://bitbucket.org/ariya/phantomjs/downloads/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
--- a/lang/swift/Makefile
+++ b/lang/swift/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	swift
 PORTVERSION=	2.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang

 MAINTAINER=	swills@FreeBSD.org
--- a/lang/v8-devel/Makefile
+++ b/lang/v8-devel/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	v8
 PORTVERSION=	3.27.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	LOCAL/vanilla
 PKGNAMESUFFIX=	-devel
--- a/mail/dovecot2-antispam-plugin/Makefile
+++ b/mail/dovecot2-antispam-plugin/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	dovecot2-antispam-plugin
 PORTVERSION=	20130429
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	mail
 MASTER_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
--- a/mail/dovecot2-pigeonhole/Makefile
+++ b/mail/dovecot2-pigeonhole/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	dovecot-pigeonhole
 PORTVERSION=	0.4.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
 DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@ -14,7 +14,7 @@

 PORTNAME=	dovecot
 PORTVERSION=	2.2.25
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/${PORTVERSION:R}/
 PKGNAMESUFFIX=	2
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	postfix
 DISTVERSION=	3.2-20160917
+PORTREVISION=	1
 PORTEPOCH=	4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/ \
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	postfix
 PORTVERSION=	3.1.2
 PORTEPOCH=	1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/ \
 		http://de.postfix.org/ftpmirror/ \
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	thunderbird
 DISTVERSION=	45.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
--- a/math/R/Makefile
+++ b/math/R/Makefile
@ -3,7 +3,7 @@

 PORTNAME?=		R
 PORTVERSION=		3.3.1
-PORTREVISION=		3
+PORTREVISION=		4
 CATEGORIES=		math lang
 MASTER_SITES=		http://cran.r-project.org/%SUBDIR%/ \
 			ftp://cran.r-project.org/pub/R/%SUBDIR%/ \
--- a/math/rpy2/Makefile
+++ b/math/rpy2/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	rpy2
 PORTVERSION=	2.7.8
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	CHEESESHOP

--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	sword
 PORTVERSION=	1.7.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v${PORTVERSION:R}/ \
 		http://crosswire.org/ftpmirror/pub/sword/source/v${PORTVERSION:R}/
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	aegisub
 PORTVERSION=	3.2.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	http://ftp.aegisub.org/pub/archives/releases/source/ \
 		ftp://ftp.aegisub.org/pub/archives/releases/source/ \
--- a/multimedia/subtitlecomposer-kde4/Makefile
+++ b/multimedia/subtitlecomposer-kde4/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	subtitlecomposer
 PORTVERSION=	0.5.7
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia kde

 MAINTAINER=	makc@FreeBSD.org
--- a/net-p2p/twister/Makefile
+++ b/net-p2p/twister/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	twister-core
 PORTVERSION=	0.9.34
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	net-p2p
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	yaz
 PORTVERSION=	5.16.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.indexdata.dk/pub/yaz/

--- a/net/zebra-server/Makefile
+++ b/net/zebra-server/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	zebra-server
 PORTVERSION=	2.0.55
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.indexdata.dk/pub/zebra/
 DISTNAME=	idzebra-${PORTVERSION}
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	tin
 PORTVERSION=	2.3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	news ipv6
 MASTER_SITES=	ftp://ftp.tin.org/pub/news/clients/tin/v${PORTVERSION:R}/ \
 		ftp://ftp.sunet.se/pub/news/readers/tin/v${PORTVERSION:R}/ \
--- a/print/harfbuzz/Makefile
+++ b/print/harfbuzz/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	harfbuzz
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.freedesktop.org/software/harfbuzz/release/

@ -14,7 +15,7 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgraphite2.so:graphics/graphite2

 USE_LDCONFIG=	yes
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
+USES=		compiler:c++0x gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME=	cairo glib20 introspection:build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-graphite2 --with-gobject=yes
--- a/print/libmspub01/Makefile
+++ b/print/libmspub01/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	libmspub
 PORTVERSION=	0.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print graphics devel
 MASTER_SITES=	http://dev-www.libreoffice.org/src/${PORTNAME}/
 PKGNAMESUFFIX=	01
@ -19,7 +19,7 @@ LIB_DEPENDS=	libicui18n.so:devel/icu \

 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		libtool pathfix pkgconfig tar:xz
+USES=		compiler:c++0x libtool pathfix pkgconfig tar:xz
 INSTALL_TARGET=	install-strip

 CONFIGURE_ARGS=	--disable-werror --without-docs
--- a/print/tex-xetex/Makefile
+++ b/print/tex-xetex/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	xetex
 PORTVERSION=	0.99992
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
 PKGNAMEPREFIX=	tex-
--- a/print/texlive-base/Makefile
+++ b/print/texlive-base/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	texlive
 PORTVERSION=	20150521
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	print
 MASTER_SITES=	TEX_CTAN/systems/texlive/Source/
 PKGNAMESUFFIX=	-base
--- a/security/certificate-transparency/Makefile
+++ b/security/certificate-transparency/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	certificate-transparency
 PORTVERSION=	20160102
+PORTREVISION=	1
 CATEGORIES=	security

 MAINTAINER=	ports@FreeBSD.org
--- a/sysutils/gdisk/Makefile
+++ b/sysutils/gdisk/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	gdisk
 PORTVERSION=	0.8.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/gptfdisk/gptfdisk/${PORTVERSION}
 DISTNAME=	gptfdisk-${PORTVERSION}
--- a/sysutils/osquery/Makefile
+++ b/sysutils/osquery/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	osquery
 PORTVERSION=	1.4.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils

 MAINTAINER=	zi@FreeBSD.org
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	tracker
 PORTVERSION=	1.6.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME

--- a/textproc/R-cran-stringi/Makefile
+++ b/textproc/R-cran-stringi/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	stringi
 DISTVERSION=	1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}

--- a/textproc/dwdiff/Makefile
+++ b/textproc/dwdiff/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	dwdiff
 PORTVERSION=	2.0.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	http://os.ghalkes.nl/dist/ \
 		http://fossies.org/unix/privat/
--- a/textproc/ibus-qt/Makefile
+++ b/textproc/ibus-qt/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	ibus-qt
 PORTVERSION=	1.3.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/${PORTVERSION}/ \
 		http://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/${PORTVERSION}/
--- a/textproc/libe-book/Makefile
+++ b/textproc/libe-book/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	libe-book
 PORTVERSION=	0.1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	SF/libebook/${PORTNAME}-${PORTVERSION}/

--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	liblrdf
 PORTVERSION=	0.5.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	textproc
 MASTER_SITES=	GENTOO

--- a/textproc/libvisio01/Makefile
+++ b/textproc/libvisio01/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	libvisio
 PORTVERSION=	0.1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc devel
 MASTER_SITES=	http://dev-www.libreoffice.org/src/${PORTNAME}/
 PKGNAMESUFFIX=	01
@ -23,7 +23,7 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 USE_GNOME=	libxml2
-USES=		gmake gperf libtool pathfix perl5 pkgconfig tar:xz
+USES=		compiler:c++0x gmake gperf libtool pathfix perl5 pkgconfig tar:xz
 INSTALL_TARGET=	install-strip

 post-patch:
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	raptor2
 PORTVERSION=	2.0.15
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.librdf.org/source/ \
 		SF/librdf/${PORTNAME}/${PORTVERSION}
--- a/textproc/rubygem-charlock_holmes/Makefile
+++ b/textproc/rubygem-charlock_holmes/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	charlock_holmes
 PORTVERSION=	0.7.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG

--- a/textproc/zorba/Makefile
+++ b/textproc/zorba/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	zorba
 PORTVERSION=	2.7.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	textproc
 MASTER_SITES=	https://launchpadlibrarian.net/119058962/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	chromium
 PORTVERSION=	52.0.2743.116
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
--- a/www/cppcms/Makefile
+++ b/www/cppcms/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	cppcms
 PORTVERSION=	1.0.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	SF/cppcms/${PORTNAME}/${PORTVERSION}

--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	firefox
 DISTVERSION=	45.4.0
 DISTVERSIONSUFFIX=esr.source
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
--- a/Show More
+++ b/Show More