sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Back out C++11 changes for ICU >= 59

Browse source 
r449608, r449609, r449610, r449611, r449612, r449613, r449614,
r449621, r449661, r449662 are reverted. ICU will pull char16_t typedef
in C++98 mode instead.

Pointy hat to:	jbeich
PR:		218788 222222 222225
This commit is contained in:
Jan Beich 2017-09-12 13:01:22 +00:00
parent 427492612c
commit fb8c6ffaed
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=449685
11 changed files with 22 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
databases/evolution-data-server/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= evolution-data-server PORTNAME= evolution-data-server
PORTVERSION= 3.24.2 PORTVERSION= 3.24.2
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= databases gnome CATEGORIES= databases gnome
MASTER_SITES= GNOME MASTER_SITES= GNOME
DIST_SUBDIR= gnome3 DIST_SUBDIR= gnome3
@ -33,7 +33,6 @@ PORTSCOUT= limitw:1,even
USES= bdb:5 cmake compiler:c++11-lib gettext gnome gperf \ USES= bdb:5 cmake compiler:c++11-lib gettext gnome gperf \
iconv localbase pathfix pkgconfig python:3.3+,build\ iconv localbase pathfix pkgconfig python:3.3+,build\
sqlite tar:xz sqlite tar:xz
USE_CXXSTD= gnu++11
USE_GNOME= cairo gdkpixbuf2 gtk30 intltool introspection:build libxml2 USE_GNOME= cairo gdkpixbuf2 gtk30 intltool introspection:build libxml2
USE_LDCONFIG= yes USE_LDCONFIG= yes

5
devel/icu-le-hb/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= icu-le-hb PORTNAME= icu-le-hb
DISTVERSION= 1.0.3-3 DISTVERSION= 1.0.3-3
DISTVERSIONSUFFIX= -gb8a3163 DISTVERSIONSUFFIX= -gb8a3163
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= devel print CATEGORIES= devel print
MAINTAINER= office@FreeBSD.org MAINTAINER= office@FreeBSD.org
@ -20,8 +20,7 @@ LIB_DEPENDS= libicuuc.so:devel/icu \
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= behdad GH_ACCOUNT= behdad
USES= autoreconf compiler:c++11-lib gmake libtool pathfix pkgconfig USES= autoreconf gmake libtool pathfix pkgconfig
USE_CXXSTD= gnu++11
USE_LDCONFIG= yes USE_LDCONFIG= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip INSTALL_TARGET= install-strip

5
devel/pecl-intl/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= intl PORTNAME= intl
PORTVERSION= 3.0.0 PORTVERSION= 3.0.0
PORTREVISION= 8 PORTREVISION= 9
CATEGORIES= devel pear CATEGORIES= devel pear
MAINTAINER= sunpoet@FreeBSD.org MAINTAINER= sunpoet@FreeBSD.org
@ -14,7 +14,6 @@ LICENSE= PHP301
LIB_DEPENDS= libicui18n.so:devel/icu LIB_DEPENDS= libicui18n.so:devel/icu
IGNORE_WITH_PHP=70 71 IGNORE_WITH_PHP=70 71
USES= compiler:c++11-lib php:pecl USES= php:pecl
USE_CXXSTD= gnu++11
.include <bsd.port.mk> .include <bsd.port.mk>

5
devel/php70-intl/Makefile
View file

@ -1,14 +1,11 @@
# Created by: Alex Dupre <ale@FreeBSD.org> # Created by: Alex Dupre <ale@FreeBSD.org>
# $FreeBSD$ # $FreeBSD$
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= devel CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php70 MASTERDIR= ${.CURDIR}/../../lang/php70
PKGNAMESUFFIX= -intl PKGNAMESUFFIX= -intl
USES= compiler:c++11-lib
USE_CXXSTD= gnu++11
.include "${MASTERDIR}/Makefile" .include "${MASTERDIR}/Makefile"

5
devel/php71-intl/Makefile
View file

@ -1,13 +1,10 @@
# $FreeBSD$ # $FreeBSD$
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= devel CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php71 MASTERDIR= ${.CURDIR}/../../lang/php71
PKGNAMESUFFIX= -intl PKGNAMESUFFIX= -intl
USES= compiler:c++11-lib
USE_CXXSTD= gnu++11
.include "${MASTERDIR}/Makefile" .include "${MASTERDIR}/Makefile"

15
devel/py-pyicu/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= pyicu PORTNAME= pyicu
PORTVERSION= 1.9.4 PORTVERSION= 1.9.4
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= devel python CATEGORIES= devel python
MASTER_SITES= CHEESESHOP MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -15,17 +15,14 @@ COMMENT= Python extension wrapping IBM's ICU C++ API #'
LICENSE= MIT LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libicudata.so:devel/icu
USES?= python USES?= python
USES+= compiler:c++11-lib
USE_CXXSTD= gnu++11
USE_PYTHON= distutils autoplist USE_PYTHON= distutils autoplist
MAKE_ENV+= PYICU_INCLUDES="${LOCALBASE}/include" \ MAKE_ENV+= PYICU_INCLUDES="${PREFIX}/include" \
PYICU_CFLAGS="${CXXFLAGS:ts:}" \ PYICU_CFLAGS="-w:-DPYICU_VER=\"${PORTVERSION}\"" \
PYICU_LFLAGS="-L${LOCALBASE}/lib" PYICU_LFLAGS="-L${PREFIX}/lib"
CFLAGS+= -w -DPYICU_VER=\"${PORTVERSION}\"
LIB_DEPENDS+= libicudata.so:devel/icu
pre-configure: pre-configure:
@if [ ! -e ${LOCALBASE}/lib/libicule.so ]; then \ @if [ ! -e ${LOCALBASE}/lib/libicule.so ]; then \

6
emulators/open-vm-tools/Makefile
View file

@ -4,7 +4,7 @@
PORTNAME= open-vm-tools PORTNAME= open-vm-tools
PORTVERSION= ${RELEASE_VER} PORTVERSION= ${RELEASE_VER}
DISTVERSIONPREFIX= stable- DISTVERSIONPREFIX= stable-
PORTREVISION= 1 PORTREVISION= 2
PORTEPOCH= 2 PORTEPOCH= 2
CATEGORIES= emulators CATEGORIES= emulators
@ -46,9 +46,7 @@ OPENSSL_CONFIGURE_WITH= ssl
WRKSRC_SUBDIR= open-vm-tools WRKSRC_SUBDIR= open-vm-tools
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
USES= autoreconf:-iv compiler:c++11-lib fuse gettext-runtime \ USES= autoreconf:-iv fuse gettext-runtime kmod libtool localbase pathfix pkgconfig
kmod libtool localbase pathfix pkgconfig
USE_CXXSTD= gnu++11
USE_GNOME= glib20 USE_GNOME= glib20
USE_GITHUB= yes USE_GITHUB= yes

6
lang/phantomjs/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= phantomjs PORTNAME= phantomjs
PORTVERSION= 2.1.1 PORTVERSION= 2.1.1
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= lang CATEGORIES= lang
MAINTAINER= feld@FreeBSD.org MAINTAINER= feld@FreeBSD.org
@ -22,9 +22,7 @@ BROKEN_sparc64= does not link on sparc64
NOT_FOR_ARCHS= armv6 NOT_FOR_ARCHS= armv6
NOT_FOR_ARCHS_REASON= Platform.h: Not supported ARM architecture NOT_FOR_ARCHS_REASON= Platform.h: Not supported ARM architecture
USES= bison:build compiler:c++11-lib gmake gperf jpeg perl5 \ USES= bison:build compiler:c++11-lang gmake gperf jpeg perl5 pkgconfig python:build ssl sqlite
pkgconfig python:build ssl sqlite
USE_CXXSTD= gnu++11
USE_GNOME+= libxml2 USE_GNOME+= libxml2
USE_PERL5= build USE_PERL5= build
USE_RUBY= yes USE_RUBY= yes

5
misc/sword/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= sword PORTNAME= sword
PORTVERSION= 1.7.4 PORTVERSION= 1.7.4
PORTREVISION= 6 PORTREVISION= 7
CATEGORIES= misc CATEGORIES= misc
MASTER_SITES= ftp://ftp.crosswire.org/pub/sword/source/v${PORTVERSION:R}/ \ MASTER_SITES= ftp://ftp.crosswire.org/pub/sword/source/v${PORTVERSION:R}/ \
http://crosswire.org/ftpmirror/pub/sword/source/v${PORTVERSION:R}/ http://crosswire.org/ftpmirror/pub/sword/source/v${PORTVERSION:R}/
@ -21,8 +21,7 @@ BROKEN_powerpc64= does not compile: libicui18n.so: undefined reference to __cxa_
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-conf --with-zlib CONFIGURE_ARGS= --with-conf --with-zlib
INSTALL_TARGET= install-strip INSTALL_TARGET= install-strip
USES= compiler:c++11-lib gmake libtool pathfix pkgconfig USES= gmake libtool pathfix pkgconfig
USE_CXXSTD= gnu++11
USE_LDCONFIG= yes USE_LDCONFIG= yes
SUB_FILES= pkg-message SUB_FILES= pkg-message

3
print/texlive-base/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= texlive PORTNAME= texlive
PORTVERSION= 20150521 PORTVERSION= 20150521
PORTREVISION= 20 PORTREVISION= 21
CATEGORIES= print CATEGORIES= print
MASTER_SITES= TEX_CTAN/systems/texlive/Source/ MASTER_SITES= TEX_CTAN/systems/texlive/Source/
PKGNAMESUFFIX= -base PKGNAMESUFFIX= -base
@ -31,7 +31,6 @@ CONFLICTS_INSTALL= texlive-texmf-201[234]*
USE_TEX= web2c kpathsea ptexenc tlmgr texhash-bootstrap USE_TEX= web2c kpathsea ptexenc tlmgr texhash-bootstrap
USES= compiler:c++11-lib ghostscript pkgconfig perl5 \ USES= compiler:c++11-lib ghostscript pkgconfig perl5 \
python:run shebangfix tar:xz python:run shebangfix tar:xz
USE_CXXSTD= gnu++11
USE_PERL5= run USE_PERL5= run
# during build phase gnu configure is run a lot # during build phase gnu configure is run a lot
MAKE_ENV+= CONFIG_SITE=${CONFIG_SITE} MAKE_ENV+= CONFIG_SITE=${CONFIG_SITE}

5
www/cppcms/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= cppcms PORTNAME= cppcms
PORTVERSION= 1.0.5 PORTVERSION= 1.0.5
PORTREVISION= 8 PORTREVISION= 9
CATEGORIES= www CATEGORIES= www
MASTER_SITES= SF/cppcms/${PORTNAME}/${PORTVERSION} MASTER_SITES= SF/cppcms/${PORTNAME}/${PORTVERSION}
@ -15,8 +15,7 @@ LIB_DEPENDS= libpcre.so:devel/pcre
BROKEN_powerpc64= Does not build: error: 'localeconv_l' was not declared in this scope BROKEN_powerpc64= Does not build: error: 'localeconv_l' was not declared in this scope
USES= cmake compiler:c++11-lib python:2 shebangfix tar:bzip2 ssl USES= cmake python:2 shebangfix tar:bzip2 ssl
USE_CXXSTD= gnu++11
USE_LDCONFIG= yes USE_LDCONFIG= yes
SHEBANG_FILES= bin/cppcms_tmpl_cc SHEBANG_FILES= bin/cppcms_tmpl_cc