svn commit: r461290 - in head: databases/evolution-data-server devel/icu devel/icu-le-hb devel/icu/files devel/pecl-intl devel/php70-intl devel/php71-intl devel/php72-intl games/openttd lang/phanto...

Jan Beich jbeich at FreeBSD.org
Fri Feb 9 09:12:51 UTC 2018 

Author: jbeich
Date: Fri Feb  9 09:12:48 2018
New Revision: 461290
URL: https://svnweb.freebsd.org/changeset/ports/461290

Log:
  devel/icu: drop C++98 compatibility workarounds
  
  Now that both USE_GCC and -CURRENT default to C++14 there's little
  reason to complicate maintenance. Revert r449685 to usher consumers
  into post-C++11 world.
  
  PR:		222433 222434 222435

Added:
  head/lang/phantomjs/files/patch-src_qt_qtbase_config.tests_unix_icu_icu.pro   (contents, props changed)
Deleted:
  head/devel/icu/files/patch-common_unicode_umachine.h
  head/devel/icu/files/patch-common_unicode_unistr.h
  head/devel/icu/files/patch-revert-r40077
Modified:
  head/databases/evolution-data-server/Makefile   (contents, props changed)
  head/devel/icu-le-hb/Makefile   (contents, props changed)
  head/devel/icu/Makefile   (contents, props changed)
  head/devel/icu/files/patch-common_unicode_platform.h   (contents, props changed)
  head/devel/pecl-intl/Makefile   (contents, props changed)
  head/devel/php70-intl/Makefile   (contents, props changed)
  head/devel/php71-intl/Makefile   (contents, props changed)
  head/devel/php72-intl/Makefile   (contents, props changed)
  head/games/openttd/Makefile   (contents, props changed)
  head/lang/v8-devel/Makefile   (contents, props changed)
  head/misc/sword/Makefile   (contents, props changed)
  head/print/tex-xetex/Makefile   (contents, props changed)
  head/print/texlive-base/Makefile   (contents, props changed)
  head/sysutils/gdisk/Makefile   (contents, props changed)
  head/www/cppcms/Makefile   (contents, props changed)

Modified: head/databases/evolution-data-server/Makefile
==============================================================================
--- head/databases/evolution-data-server/Makefile	Fri Feb  9 09:02:49 2018	(r461289)
+++ head/databases/evolution-data-server/Makefile	Fri Feb  9 09:12:48 2018	(r461290)
@@ -3,7 +3,7 @@
 
 PORTNAME=	evolution-data-server
 PORTVERSION=	3.24.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -33,6 +33,7 @@ PORTSCOUT=	limitw:1,even
 USES=		bdb:5 cmake compiler:c++11-lib gettext gnome gperf \
 		iconv localbase pathfix pkgconfig python:3.3+,build\
 		sqlite tar:xz
+USE_CXXSTD=	gnu++11
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool introspection:build libxml2
 USE_LDCONFIG=	yes
 

Modified: head/devel/icu-le-hb/Makefile
==============================================================================
--- head/devel/icu-le-hb/Makefile	Fri Feb  9 09:02:49 2018	(r461289)
+++ head/devel/icu-le-hb/Makefile	Fri Feb  9 09:12:48 2018	(r461290)
@@ -3,7 +3,7 @@
 PORTNAME=	icu-le-hb
 DISTVERSION=	1.0.3-3
 DISTVERSIONSUFFIX=	-gb8a3163
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel print
 
 MAINTAINER=	office at FreeBSD.org
@@ -20,7 +20,8 @@ LIB_DEPENDS=	libicuuc.so:devel/icu \
 USE_GITHUB=	yes
 GH_ACCOUNT=	behdad
 
-USES=		autoreconf gmake libtool pathfix pkgconfig
+USES=		autoreconf compiler:c++11-lib gmake libtool pathfix pkgconfig
+USE_CXXSTD=	gnu++11
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip

Modified: head/devel/icu/Makefile
==============================================================================
--- head/devel/icu/Makefile	Fri Feb  9 09:02:49 2018	(r461289)
+++ head/devel/icu/Makefile	Fri Feb  9 09:12:48 2018	(r461290)
@@ -3,7 +3,7 @@
 
 PORTNAME=	icu
 DISTVERSION=	60_2
-PORTREVISION?=	1 # keep for icu-lx
+PORTREVISION?=	2 # keep for icu-lx
 PORTEPOCH?=	1
 CATEGORIES?=	devel
 MASTER_SITES=	http://download.icu-project.org/files/icu4c/${PORTVERSION}/ \

Modified: head/devel/icu/files/patch-common_unicode_platform.h
==============================================================================
--- head/devel/icu/files/patch-common_unicode_platform.h	Fri Feb  9 09:02:49 2018	(r461289)
+++ head/devel/icu/files/patch-common_unicode_platform.h	Fri Feb  9 09:12:48 2018	(r461290)
@@ -11,21 +11,3 @@
  #elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__)
      /* gcc */
  #   define U_IS_BIG_ENDIAN (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
-@@ -498,11 +498,15 @@
- #   define U_CPLUSPLUS_VERSION 1
- #endif
- 
--#if (U_PLATFORM == U_PF_AIX || U_PLATFORM == U_PF_OS390) && defined(__cplusplus) &&(U_CPLUSPLUS_VERSION < 11)
-+#if defined(__cplusplus) && (U_CPLUSPLUS_VERSION < 11)
- // add in std::nullptr_t
- namespace std {
-+#if (U_PLATFORM == U_PF_AIX || U_PLATFORM == U_PF_OS390)
-   typedef decltype(nullptr) nullptr_t;
--};
-+#elif defined(__GNUC__) && !defined(__clang__)
-+  typedef __decltype(__null) nullptr_t;
-+#endif
-+}
- #endif
- 
- /**

Modified: head/devel/pecl-intl/Makefile
==============================================================================
--- head/devel/pecl-intl/Makefile	Fri Feb  9 09:02:49 2018	(r461289)
+++ head/devel/pecl-intl/Makefile	Fri Feb  9 09:12:48 2018	(r461290)
@@ -3,7 +3,7 @@
 
 PORTNAME=	intl
 PORTVERSION=	3.0.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	devel pear
 
 MAINTAINER=	sunpoet at FreeBSD.org
@@ -14,6 +14,7 @@ LICENSE=	PHP301
 LIB_DEPENDS=	libicui18n.so:devel/icu
 
 IGNORE_WITH_PHP=70 71 72
-USES=		php:pecl
+USES=		compiler:c++11-lib php:pecl
+USE_CXXSTD=	gnu++11
 
 .include <bsd.port.mk>

Modified: head/devel/php70-intl/Makefile
==============================================================================
--- head/devel/php70-intl/Makefile	Fri Feb  9 09:02:49 2018	(r461289)
+++ head/devel/php70-intl/Makefile	Fri Feb  9 09:12:48 2018	(r461290)
@@ -1,10 +1,14 @@
 # Created by: Alex Dupre <ale at FreeBSD.org>
 # $FreeBSD$
 
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MASTERDIR=	${.CURDIR}/../../lang/php70
 
 PKGNAMESUFFIX=	-intl
+
+USES=		compiler:c++11-lib
+USE_CXXSTD=	gnu++11
 
 .include "${MASTERDIR}/Makefile"

Modified: head/devel/php71-intl/Makefile
==============================================================================
--- head/devel/php71-intl/Makefile	Fri Feb  9 09:02:49 2018	(r461289)
+++ head/devel/php71-intl/Makefile	Fri Feb  9 09:12:48 2018	(r461290)
@@ -1,9 +1,13 @@
 # $FreeBSD$
 
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MASTERDIR=	${.CURDIR}/../../lang/php71
 
 PKGNAMESUFFIX=	-intl
+
+USES=		compiler:c++11-lib
+USE_CXXSTD=	gnu++11
 
 .include "${MASTERDIR}/Makefile"

Modified: head/devel/php72-intl/Makefile
==============================================================================
--- head/devel/php72-intl/Makefile	Fri Feb  9 09:02:49 2018	(r461289)
+++ head/devel/php72-intl/Makefile	Fri Feb  9 09:12:48 2018	(r461290)
@@ -1,9 +1,13 @@
 # $FreeBSD$
 
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MASTERDIR=	${.CURDIR}/../../lang/php72
 
 PKGNAMESUFFIX=	-intl
+
+USES=		compiler:c++11-lib
+USE_CXXSTD=	gnu++11
 
 .include "${MASTERDIR}/Makefile"

Modified: head/games/openttd/Makefile
==============================================================================
--- head/games/openttd/Makefile	Fri Feb  9 09:02:49 2018	(r461289)
+++ head/games/openttd/Makefile	Fri Feb  9 09:12:48 2018	(r461290)
@@ -3,6 +3,7 @@
 
 PORTNAME=	openttd
 DISTVERSION=	1.7.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://ca.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \
 		http://cz.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \
@@ -57,6 +58,8 @@ CONFIGURE_ARGS+=	--enable-dedicated
 CFLAGS+=	-I${LOCALBASE}/include
 USE_RC_SUBR=	${PORTNAME}
 .else
+USES+=		compiler:c++11-lib
+USE_CXXSTD=	gnu++11
 LIB_DEPENDS+=	libfreetype.so:print/freetype2 \
 		libicui18n.so:devel/icu \
 		libicu-le-hb.so:devel/icu-le-hb \

Added: head/lang/phantomjs/files/patch-src_qt_qtbase_config.tests_unix_icu_icu.pro
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/phantomjs/files/patch-src_qt_qtbase_config.tests_unix_icu_icu.pro	Fri Feb  9 09:12:48 2018	(r461290)
@@ -0,0 +1,17 @@
+Fixes build on FreeBSD 10.* with ICU >= 59
+
+In file included from icu.cpp:34:
+In file included from /usr/local/include/unicode/utypes.h:38:
+/usr/local/include/unicode/umachine.h:347:13: error: unknown type name 'char16_t'
+    typedef char16_t UChar;
+            ^
+
+--- src/qt/qtbase/config.tests/unix/icu/icu.pro.orig	2015-12-12 12:58:05 UTC
++++ src/qt/qtbase/config.tests/unix/icu/icu.pro
+@@ -1,5 +1,5 @@
+ SOURCES = icu.cpp
+-CONFIG += console
++CONFIG += c++11 console
+ CONFIG -= qt dylib
+ 
+ include($$PWD/../../../src/3rdparty/icu_dependency.pri)

Modified: head/lang/v8-devel/Makefile
==============================================================================
--- head/lang/v8-devel/Makefile	Fri Feb  9 09:02:49 2018	(r461289)
+++ head/lang/v8-devel/Makefile	Fri Feb  9 09:12:48 2018	(r461290)
@@ -3,7 +3,7 @@
 
 PORTNAME=	v8
 PORTVERSION=	3.27.7
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	lang
 MASTER_SITES=	LOCAL/vanilla
 PKGNAMESUFFIX=	-devel
@@ -23,7 +23,8 @@ ALL_TARGET=	native
 MAKE_ARGS=	library=shared use_system_icu=on
 MAKE_ENV=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
 USE_LDCONFIG=	yes
-USES=		compiler cpe gmake localbase python:2 shebangfix tar:xz
+USE_CXXSTD=	gnu++11
+USES=		compiler:c++11-lib cpe gmake localbase python:2 shebangfix tar:xz
 
 CPE_VENDOR=	google
 

Modified: head/misc/sword/Makefile
==============================================================================
--- head/misc/sword/Makefile	Fri Feb  9 09:02:49 2018	(r461289)
+++ head/misc/sword/Makefile	Fri Feb  9 09:12:48 2018	(r461290)
@@ -3,7 +3,7 @@
 
 PORTNAME=	sword
 PORTVERSION=	1.7.4
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v${PORTVERSION:R}/ \
 		http://crosswire.org/ftpmirror/pub/sword/source/v${PORTVERSION:R}/
@@ -45,6 +45,8 @@ CONFIGURE_ARGS+=	--without-curl
 .endif
 
 .if ${PORT_OPTIONS:MCLUCENE}
+USES+=		compiler:c++11-lib
+USE_CXXSTD=	gnu++11
 LIB_DEPENDS+=	libclucene-core.so:textproc/clucene \
 		libicudata.so:devel/icu
 CONFIGURE_ARGS+=	--with-clucene=${LOCALBASE} --with-icu

Modified: head/print/tex-xetex/Makefile
==============================================================================
--- head/print/tex-xetex/Makefile	Fri Feb  9 09:02:49 2018	(r461289)
+++ head/print/tex-xetex/Makefile	Fri Feb  9 09:12:48 2018	(r461290)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xetex
 PORTVERSION=	0.99992
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
 PKGNAMEPREFIX=	tex-
@@ -24,7 +24,8 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libpoppler.so:graphics/poppler \
 		libTECkit.so:textproc/teckit
 
-USES=		pkgconfig tar:xz
+USES=		compiler:c++11-lib pkgconfig tar:xz
+USE_CXXSTD=	gnu++11
 USE_TEX=	kpathsea web2c texmf formats fmtutil dvipdfmx
 USE_XORG=	pixman
 USE_GNOME=	cairo

Modified: head/print/texlive-base/Makefile
==============================================================================
--- head/print/texlive-base/Makefile	Fri Feb  9 09:02:49 2018	(r461289)
+++ head/print/texlive-base/Makefile	Fri Feb  9 09:12:48 2018	(r461290)
@@ -2,7 +2,7 @@
 
 PORTNAME=	texlive
 PORTVERSION=	20150521
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	print
 MASTER_SITES=	TEX_CTAN/systems/texlive/Source/
 PKGNAMESUFFIX=	-base
@@ -31,6 +31,7 @@ CONFLICTS_INSTALL=	texlive-texmf-201[234]*
 USE_TEX=	web2c kpathsea ptexenc tlmgr texhash-bootstrap
 USES=		compiler:c++11-lib ghostscript pkgconfig perl5 \
 		python:run shebangfix tar:xz
+USE_CXXSTD=	gnu++11
 USE_PERL5=	run
 # during build phase gnu configure is run a lot
 MAKE_ENV+=	CONFIG_SITE=${CONFIG_SITE}

Modified: head/sysutils/gdisk/Makefile
==============================================================================
--- head/sysutils/gdisk/Makefile	Fri Feb  9 09:02:49 2018	(r461289)
+++ head/sysutils/gdisk/Makefile	Fri Feb  9 09:12:48 2018	(r461290)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gdisk
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/gptfdisk/gptfdisk/${PORTVERSION}
 DISTNAME=	gptfdisk-${PORTVERSION}
@@ -30,7 +31,9 @@ UTF16_DESC=	Support for Unicode partition names
 
 CGDISK_ALL_TARGET=	cgdisk
 CGDISK_USES=		ncurses
+UTF16_USES=		compiler:c++11-lib
 UTF16_CPPFLAGS=		-DUSE_UTF16
+UTF16_CXXFLAGS=		-std=gnu++11
 UTF16_LDFLAGS=		-licuio -licuuc
 UTF16_LIB_DEPENDS=	libicuuc.so:devel/icu
 

Modified: head/www/cppcms/Makefile
==============================================================================
--- head/www/cppcms/Makefile	Fri Feb  9 09:02:49 2018	(r461289)
+++ head/www/cppcms/Makefile	Fri Feb  9 09:12:48 2018	(r461290)
@@ -2,6 +2,7 @@
 
 PORTNAME=	cppcms
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/cppcms/${PORTNAME}/${PORTVERSION}
 
@@ -25,6 +26,8 @@ ICU_DESC=		ICU unicode support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MICU}
+USES+=		compiler:c++11-lib
+USE_CXXSTD=	gnu++11
 LIB_DEPENDS+=	libicuuc.so:devel/icu
 CMAKE_ARGS+=	-DDISABLE_ICONV:BOOL=ON
 .else

More information about the svn-ports-head mailing list