diff options
| author | jperkin <jperkin@pkgsrc.org> | 2017-05-03 08:38:38 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2017-05-03 08:38:38 +0000 |
| commit | ca7c86855e9536834aeadcc2cb1bc8436ae6ee16 (patch) | |
| tree | 2fa540b3172e66294abe7de0bde1aa824c38da93 | |
| parent | 3ef956f123a6b414874b463757ad4273afe87371 (diff) | |
| download | pkgsrc-ca7c86855e9536834aeadcc2cb1bc8436ae6ee16.tar.gz | |
Convert CXXFLAGS setting C++ standard to USE_LANGUAGES.
95 files changed, 208 insertions, 446 deletions
diff --git a/audio/bmpx/Makefile b/audio/bmpx/Makefile index fe025c42617..3b983d86ee5 100644 --- a/audio/bmpx/Makefile +++ b/audio/bmpx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2017/04/30 01:21:27 ryoon Exp $ +# $NetBSD: Makefile,v 1.88 2017/05/03 08:38:38 jperkin Exp $ DISTNAME= bmpx-0.40.14 PKGREVISION= 60 @@ -11,7 +11,7 @@ HOMEPAGE= http://bmpx.backtrace.info/site/BMPx_Homepage COMMENT= Audio player to be used with a frontend or as a daemon GNU_CONFIGURE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_TOOLS+= gmake intltool msgfmt pkg-config zip USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes @@ -23,7 +23,6 @@ CHECK_WRKREF_SKIP+= bin/bmp2 CHECK_WRKREF_SKIP+= libexec/beep-media-player-2-bin GCC_REQD+= 4.8 -CXXFLAGS+= -std=c++11 .include "../../mk/bsd.fast.prefs.mk" .if ${OPSYS} == "Linux" diff --git a/audio/paman/Makefile b/audio/paman/Makefile index 8e3b2ffe972..4d3ae199318 100644 --- a/audio/paman/Makefile +++ b/audio/paman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2017/02/12 06:25:04 ryoon Exp $ +# $NetBSD: Makefile,v 1.44 2017/05/03 08:38:38 jperkin Exp $ # DISTNAME= paman-0.9.4 @@ -12,13 +12,11 @@ COMMENT= GTK frontend for the PulseAudio sound server LICENSE= gnu-gpl-v2 GNU_CONFIGURE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_TOOLS+= pkg-config gmake CONFIGURE_ARGS+= --disable-lynx -CXXFLAGS+= -std=c++11 - .include "../../audio/pulseaudio/buildlink3.mk" .include "../../devel/glibmm/buildlink3.mk" .include "../../devel/libglademm/buildlink3.mk" diff --git a/audio/paprefs/Makefile b/audio/paprefs/Makefile index 94bb53aa717..4b36c05dc3a 100644 --- a/audio/paprefs/Makefile +++ b/audio/paprefs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2017/02/12 06:25:04 ryoon Exp $ +# $NetBSD: Makefile,v 1.51 2017/05/03 08:38:38 jperkin Exp $ # DISTNAME= paprefs-0.9.10 @@ -12,13 +12,11 @@ COMMENT= Configuration dialog for the PulseAudio sound server LICENSE= gnu-gpl-v2 GNU_CONFIGURE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_TOOLS+= pkg-config gmake intltool perl msgfmt CONFIGURE_ARGS+= --disable-lynx -CXXFLAGS+= -std=c++11 - .include "../../audio/pulseaudio/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gconfmm/buildlink3.mk" diff --git a/audio/pavucontrol/Makefile b/audio/pavucontrol/Makefile index 869c1bc0148..000770d9487 100644 --- a/audio/pavucontrol/Makefile +++ b/audio/pavucontrol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2017/02/12 06:25:04 ryoon Exp $ +# $NetBSD: Makefile,v 1.51 2017/05/03 08:38:39 jperkin Exp $ # DISTNAME= pavucontrol-3.0 @@ -13,13 +13,11 @@ COMMENT= Volume control tool ("mixer") for the PulseAudio sound server LICENSE= gnu-gpl-v2 GNU_CONFIGURE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_TOOLS+= pkg-config gmake intltool perl msgfmt CONFIGURE_ARGS+= --disable-lynx -CXXFLAGS+= -std=c++11 - .include "../../audio/libcanberra/buildlink3.mk" .include "../../audio/pulseaudio/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" diff --git a/audio/pavumeter/Makefile b/audio/pavumeter/Makefile index a4a51843efe..99ca0a9c91c 100644 --- a/audio/pavumeter/Makefile +++ b/audio/pavumeter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2017/02/12 06:25:05 ryoon Exp $ +# $NetBSD: Makefile,v 1.49 2017/05/03 08:38:39 jperkin Exp $ # DISTNAME= pavumeter-0.9.3 @@ -12,13 +12,11 @@ COMMENT= Volume meter for the PulseAudio sound server LICENSE= gnu-gpl-v2 GNU_CONFIGURE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_TOOLS+= pkg-config gmake intltool perl CONFIGURE_ARGS+= --disable-lynx -CXXFLAGS+= -std=c++11 - .include "../../audio/libcanberra/buildlink3.mk" .include "../../audio/pulseaudio/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile index bf1ade5772a..196caf51046 100644 --- a/audio/taglib/Makefile +++ b/audio/taglib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2016/11/04 14:03:14 maya Exp $ +# $NetBSD: Makefile,v 1.39 2017/05/03 08:38:39 jperkin Exp $ DISTNAME= taglib-1.11.1 CATEGORIES= audio @@ -9,8 +9,7 @@ HOMEPAGE= http://taglib.github.io/ COMMENT= Library for accessing id tags in various media files LICENSE= gnu-lgpl-v2.1 OR mpl-1.1 -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 GCC_REQD+= 4.7 USE_CMAKE= YES diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index ee2833d610b..4bd4fc943ba 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2017/04/30 01:21:28 ryoon Exp $ +# $NetBSD: Makefile,v 1.19 2017/05/03 08:38:39 jperkin Exp $ # V= 4.0.4 @@ -14,7 +14,7 @@ COMMENT= Schematic and PCB CAD software (stable branch) LICENSE= gnu-gpl-v2 USE_PKGLOCALEDIR= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_CMAKE= yes CMAKE_ARGS+= -DKICAD_REPO_NAME=stable -DKICAD_BUILD_VERSION=${V} @@ -53,7 +53,6 @@ SUBST_SED.netbsd5= -e 's/fabsl/fabs/g' .if !empty(PKGSRC_COMPILER:Mclang) CXXFLAGS+= -Wno-error=non-pod-varargs .endif -CXXFLAGS+= -std=c++11 .include "../../devel/swig/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile index 3f2e61f3bcf..a0698d78f1e 100644 --- a/cad/librecad/Makefile +++ b/cad/librecad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2017/04/30 01:21:28 ryoon Exp $ +# $NetBSD: Makefile,v 1.39 2017/05/03 08:38:39 jperkin Exp $ # DISTNAME= LibreCAD-2.1.3 @@ -14,11 +14,10 @@ LICENSE= gnu-gpl-v2 EXTRACT_USING= bsdtar -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_TOOLS+= pax pkg-config USE_LIBTOOL= yes -# package uses -std=c++11 flag GCC_REQD+= 4.7 SUBST_CLASSES+= qtdir diff --git a/chat/swift/Makefile b/chat/swift/Makefile index 5468d13977d..8653770565b 100644 --- a/chat/swift/Makefile +++ b/chat/swift/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2017/04/30 01:21:29 ryoon Exp $ +# $NetBSD: Makefile,v 1.24 2017/05/03 08:38:39 jperkin Exp $ DISTNAME= swift-3.0 PKGREVISION= 12 @@ -12,11 +12,9 @@ LICENSE= gnu-gpl-v3 DEPENDS+= scons>=1.3:../../devel/scons -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_TOOLS+= pkg-config -CXXFLAGS+= -std=c++11 - INSTALLATION_DIRS= ${PKGMANDIR}/man1 SUBST_CLASSES+= path diff --git a/converters/libetonyek/Makefile b/converters/libetonyek/Makefile index a654cfa896a..96a68fff7ca 100644 --- a/converters/libetonyek/Makefile +++ b/converters/libetonyek/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2017/04/30 01:21:20 ryoon Exp $ +# $NetBSD: Makefile,v 1.15 2017/05/03 08:38:39 jperkin Exp $ DISTNAME= libetonyek-0.1.6 PKGREVISION= 3 @@ -16,10 +16,7 @@ TOOL_DEPENDS+= gperf-[0-9]*:../../devel/gperf GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config -USE_LANGUAGES= c c++ - -# Boost qi.hpp -CXXFLAGS+= -std=c++0x +USE_LANGUAGES= c c++0x CONFIGURE_ARGS+= --disable-tests CONFIGURE_ARGS+= --without-docs diff --git a/databases/mysql-workbench/Makefile b/databases/mysql-workbench/Makefile index f5b873f656e..b8a04784f90 100644 --- a/databases/mysql-workbench/Makefile +++ b/databases/mysql-workbench/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2017/04/22 21:03:27 adam Exp $ +# $NetBSD: Makefile,v 1.57 2017/05/03 08:38:39 jperkin Exp $ DISTNAME= mysql-workbench-gpl-5.2.33b-src PKGNAME= ${DISTNAME:S/-gpl//:S/b-src$//} @@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2 WRKSRC= ${WRKDIR}/${DISTNAME:S/b-src$/-src/} -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_TOOLS+= bash gmake pkg-config GNU_CONFIGURE= yes @@ -51,11 +51,6 @@ SUBST_SED.osx-gl= -e 's,-lGL,-framework OpenGL,g' .include "../../graphics/MesaLib/buildlink3.mk" .endif -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - .include "../../archivers/libzip/buildlink3.mk" .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/boost-headers/buildlink3.mk" diff --git a/databases/soci/Makefile b/databases/soci/Makefile index a3e58176705..66dfeb6eda2 100644 --- a/databases/soci/Makefile +++ b/databases/soci/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2017/04/30 01:21:31 ryoon Exp $ +# $NetBSD: Makefile,v 1.21 2017/05/03 08:38:39 jperkin Exp $ # DISTNAME= soci-3.2.2 @@ -12,13 +12,9 @@ COMMENT= C++ database access library LICENSE= boost-license USE_CMAKE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c gnu++11 CMAKE_ARGS+= -DSOCI_LIBDIR=lib - -.include "../../mk/bsd.prefs.mk" - -CXXFLAGS.Cygwin+= -std=gnu++11 CMAKE_ARGS+= -DCMAKE_CXX_FLAGS=${CXXFLAGS:Q} .include "options.mk" diff --git a/databases/sqlrelay-nodejs/Makefile b/databases/sqlrelay-nodejs/Makefile index 583c5a18d4f..520b6101ea3 100644 --- a/databases/sqlrelay-nodejs/Makefile +++ b/databases/sqlrelay-nodejs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2017/04/30 01:21:31 ryoon Exp $ +# $NetBSD: Makefile,v 1.10 2017/05/03 08:38:39 jperkin Exp $ PKGNAME= ${DISTNAME:S/sqlrelay/sqlrelay-nodejs/} PKGREVISION= 1 @@ -6,6 +6,8 @@ COMMENT= node.js API for SQL Relay .include "../../databases/sqlrelay/Makefile.common" +USE_LANGUAGES+= c++11 + DEPENDS+= nodejs-[0-9]*:../../lang/nodejs LICENSE= gnu-lgpl-v2 @@ -18,8 +20,6 @@ CONFIGURE_ARGS+= --disable-mysql BUILD_DIRS= src/api/nodejs -CXXFLAGS+= -std=c++11 - # Benign reference inside an object file CHECK_WRKREF_SKIP+= lib/node_modules/sqlrelay/sqlrelay.node diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile index 908a271dcf2..a3a69b00b6a 100644 --- a/devel/aegis/Makefile +++ b/devel/aegis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2017/04/30 01:21:32 ryoon Exp $ +# $NetBSD: Makefile,v 1.38 2017/05/03 08:38:39 jperkin Exp $ # DISTNAME= aegis-4.24.2 @@ -14,16 +14,10 @@ LICENSE= gnu-gpl-v3 MAKE_JOBS_SAFE= no GNU_CONFIGURE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c gnu++0x USE_PKGLOCALEDIR= yes USE_TOOLS+= groff gsoelim msgfmt perl:run yacc patch:run -.include "../../mk/bsd.prefs.mk" - -.if !empty(PKGSRC_COMPILER:Mgcc) -CXXFLAGS+= -std=gnu++0x -.endif - AEGIS_USER_UID?= 3 AEGIS_USER_GID?= 3 diff --git a/devel/atkmm/Makefile b/devel/atkmm/Makefile index 570534dc1d3..808b1c30bad 100644 --- a/devel/atkmm/Makefile +++ b/devel/atkmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2017/04/26 13:16:11 prlw1 Exp $ +# $NetBSD: Makefile,v 1.21 2017/05/03 08:38:39 jperkin Exp $ DISTNAME= atkmm-2.24.2 PKGREVISION= 4 @@ -14,14 +14,12 @@ LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 CONFLICTS+= gtkmm<2.22.0 -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_TOOLS+= bsdtar gmake perl pkg-config GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= atk/atkmm.pc.in -CXXFLAGS+= -std=c++11 - .include "../../devel/atk/buildlink3.mk" .include "../../devel/glibmm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/boost-jam/bjam.mk b/devel/boost-jam/bjam.mk index cce60be61d8..af04537d6c8 100644 --- a/devel/boost-jam/bjam.mk +++ b/devel/boost-jam/bjam.mk @@ -1,21 +1,20 @@ -# $NetBSD: bjam.mk,v 1.17 2016/02/28 23:54:11 minskim Exp $ +# $NetBSD: bjam.mk,v 1.18 2017/05/03 08:38:40 jperkin Exp $ .include "../../devel/boost-jam/buildlink3.mk" - .include "../../devel/boost-build/toolset.mk" -.include "../../mk/bsd.prefs.mk" BJAM= ${BUILDLINK_PREFIX.boost-jam}/bin/bjam -.if !empty(MAKE_JOBS) -BJAM_ARGS+= -j${MAKE_JOBS} -.endif +BJAM_ARGS+= ${MAKE_JOBS:D-j${MAKE_JOBS}} BJAM_ARGS+= --builddir=${WRKSRC}/build BJAM_ARGS+= --layout=system BJAM_ARGS+= --toolset=${BOOST_TOOLSET} BJAM_ARGS+= --disable-long-double BJAM_ARGS+= ${BJAM_BUILD} +# XXX: we can't use USE_LANGUAGES here as it needs to be set before +# including compiler.mk. Perhaps we should just enforce c++11? +# .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mgcc) @@ -34,7 +33,7 @@ CXXFLAGS+= -std=c++14 .if !empty(PKGSRC_COMPILER:Mclang) BJAM_ARGS+= cxxflags=-std=c++11 CXXFLAGS+= -std=c++11 -. if !empty(OPSYS:MDarwin) +. if ${OPSYS} == "Darwin" BJAM_ARGS+= cxxflags=-stdlib=libc++ linkflags=-stdlib=libc++ . endif .endif diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile index 81455edcbc5..467ad7d354b 100644 --- a/devel/cppcheck/Makefile +++ b/devel/cppcheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2017/04/22 21:03:30 adam Exp $ +# $NetBSD: Makefile,v 1.46 2017/05/03 08:38:40 jperkin Exp $ DISTNAME= cppcheck-1.76.1 PKGREVISION= 6 @@ -15,7 +15,7 @@ BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++0x USE_TOOLS+= gmake BUILD_TARGET= all man @@ -33,9 +33,6 @@ MAKE_FLAGS+= INCLUDE_FOR_TEST="-Ilib -Icli -Iexternals/simplecpp" CPPFLAGS+= -I${BUILDLINK_PREFIX.tinyxml2}/include LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.tinyxml2}/lib -L${BUILDLINK_PREFIX.tinyxml2}/lib -ltinyxml2 -# needs C++0x -CXXFLAGS+= -std=c++0x - .include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc-4.[0-5]*) || !empty(CC_VERSION:Mgcc-3.*) CXXFLAGS+= -include lib/cxx11emu.h diff --git a/devel/cre2/Makefile b/devel/cre2/Makefile index c6a242a01bc..7abef02ee5d 100644 --- a/devel/cre2/Makefile +++ b/devel/cre2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/12/25 21:43:56 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2017/05/03 08:38:40 jperkin Exp $ DISTNAME= cre2 PKGNAME= cre2-0.1b6 @@ -16,8 +16,6 @@ CONFIGURE_ARGS+= --enable-maintainer-mode USE_LIBTOOL= yes USE_LANGUAGES+= c c++ USE_TOOLS+= autoconf autoreconf automake gmake makeinfo -# to avoid configure: error: test for RE2 header failed -CXXFLAGS+= -std=c++11 INFO_FILES= yes diff --git a/devel/creduce/Makefile b/devel/creduce/Makefile index 08a4700d54e..d70973155b7 100644 --- a/devel/creduce/Makefile +++ b/devel/creduce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2016/11/18 18:20:05 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2017/05/03 08:38:40 jperkin Exp $ DISTNAME= creduce-2.5.0 PKGREVISION= 1 @@ -13,7 +13,7 @@ LICENSE= 2-clause-bsd GNU_CONFIGURE= yes USE_TOOLS+= flex perl:run gmake -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 DEPENDS+= p5-Exporter-Lite-[0-9]*:../../devel/p5-Exporter-Lite DEPENDS+= p5-File-Which-[0-9]*:../../devel/p5-File-Which @@ -24,9 +24,5 @@ DEPENDS+= p5-Regexp-Common-[0-9]*:../../textproc/p5-Regexp-Common TEST_TARGET= check -.include "../../mk/bsd.prefs.mk" - -CXXFLAGS+= -std=c++11 - .include "../../lang/clang/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cssc/Makefile b/devel/cssc/Makefile index 6e72a0b6a15..b95c5493ad7 100644 --- a/devel/cssc/Makefile +++ b/devel/cssc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2015/03/14 14:24:48 tnn Exp $ +# $NetBSD: Makefile,v 1.35 2017/05/03 08:38:40 jperkin Exp $ # DISTNAME= CSSC-1.4.0 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnu.org/software/cssc/ COMMENT= GNU workalike for the source code control system SCCS LICENSE= gnu-gpl-v3 -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 GNU_CONFIGURE= YES CONFIGURE_ARGS+=--enable-binary CONFIGURE_ENV+= CONFIG_DIFF_COMMAND=${TOOLS_DIFF:Q} @@ -21,10 +21,5 @@ TEST_TARGET= check TEXINFO_REQD= 4.0 INFO_FILES= yes -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile index 5b2161e59f2..bd3789ee4b1 100644 --- a/devel/gconfmm/Makefile +++ b/devel/gconfmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2016/07/09 06:38:06 wiz Exp $ +# $NetBSD: Makefile,v 1.66 2017/05/03 08:38:40 jperkin Exp $ DISTNAME= gconfmm-2.28.3 PKGREVISION= 18 @@ -10,8 +10,7 @@ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://gtkmm.sourceforge.net/ COMMENT= C++ bindings for gconf -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake pkg-config perl diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile index 07e8f2e4ba7..ef069610c0f 100644 --- a/devel/glibmm/Makefile +++ b/devel/glibmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2017/04/25 18:11:58 adam Exp $ +# $NetBSD: Makefile,v 1.72 2017/05/03 08:38:40 jperkin Exp $ DISTNAME= glibmm-2.50.1 CATEGORIES= devel gnome @@ -11,8 +11,7 @@ COMMENT= C++ bindings for glib LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 GCC_REQD+= 4.8 -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake pkg-config perl:run diff --git a/devel/google-glog/Makefile b/devel/google-glog/Makefile index 0129931fa0d..7fd05df85fc 100644 --- a/devel/google-glog/Makefile +++ b/devel/google-glog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2017/04/19 11:24:37 jperkin Exp $ +# $NetBSD: Makefile,v 1.8 2017/05/03 08:38:40 jperkin Exp $ DISTNAME= glog-0.3.4 PKGNAME= google-${DISTNAME} @@ -15,7 +15,7 @@ LICENSE= modified-bsd GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 PKGCONFIG_OVERRIDE+= libglog.pc.in @@ -25,10 +25,5 @@ PKGCONFIG_OVERRIDE+= libglog.pc.in LIBS+= -lexecinfo .endif -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - .include "../../devel/googletest/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/googletest/Makefile b/devel/googletest/Makefile index 2648fe2902f..6b50419e194 100644 --- a/devel/googletest/Makefile +++ b/devel/googletest/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2016/10/31 16:43:17 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2017/05/03 08:38:40 jperkin Exp $ DISTNAME= googletest-1.8.0 CATEGORIES= devel @@ -13,7 +13,6 @@ LICENSE= modified-bsd INSTALLATION_DIRS= bin USE_CMAKE= yes -USE_LANGUAGES= c++ c -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 .include "../../mk/bsd.pkg.mk" diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile index dd420c37698..12df4891608 100644 --- a/devel/libglademm/Makefile +++ b/devel/libglademm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2017/02/12 06:24:40 ryoon Exp $ +# $NetBSD: Makefile,v 1.43 2017/05/03 08:38:40 jperkin Exp $ DISTNAME= libglademm-2.6.7 PKGREVISION= 25 @@ -10,8 +10,7 @@ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://www.gtkmm.org/ COMMENT= C++ bindings for libglade -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gm4 gmake pkg-config diff --git a/devel/libgnomemm/Makefile b/devel/libgnomemm/Makefile index 9af3177df0a..4c5847fda3c 100644 --- a/devel/libgnomemm/Makefile +++ b/devel/libgnomemm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2017/02/12 06:24:40 ryoon Exp $ +# $NetBSD: Makefile,v 1.61 2017/05/03 08:38:40 jperkin Exp $ DISTNAME= libgnomemm-2.30.0 PKGREVISION= 27 @@ -10,8 +10,7 @@ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://gtkmm.sourceforge.net/ COMMENT= C++ bindings for libgnome -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gm4 gmake pkg-config diff --git a/devel/libgnomeuimm/Makefile b/devel/libgnomeuimm/Makefile index e6249068029..f13566068d2 100644 --- a/devel/libgnomeuimm/Makefile +++ b/devel/libgnomeuimm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2017/02/12 06:24:40 ryoon Exp $ +# $NetBSD: Makefile,v 1.63 2017/05/03 08:38:40 jperkin Exp $ DISTNAME= libgnomeuimm-2.28.0 PKGREVISION= 35 @@ -10,8 +10,7 @@ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://gtkmm.sourceforge.net/ COMMENT= C++ bindings for libgnomeui -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gm4 gmake pkg-config diff --git a/devel/libsexymm/Makefile b/devel/libsexymm/Makefile index 596004e0539..e15d93b1c7b 100644 --- a/devel/libsexymm/Makefile +++ b/devel/libsexymm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2017/02/12 06:24:41 ryoon Exp $ +# $NetBSD: Makefile,v 1.32 2017/05/03 08:38:40 jperkin Exp $ # DISTNAME= libsexymm-0.1.9 @@ -13,8 +13,7 @@ COMMENT= C++ bindings for libsexy GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config gmake -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 PKGCONFIG_OVERRIDE+= libsexy/libsexymm.pc.in diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile index 3d8e4491f0f..5415a21bf0f 100644 --- a/devel/libsigc++/Makefile +++ b/devel/libsigc++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2016/11/25 15:39:51 prlw1 Exp $ +# $NetBSD: Makefile,v 1.52 2017/05/03 08:38:41 jperkin Exp $ DISTNAME= libsigc++-2.10.0 CATEGORIES= devel gnome @@ -10,7 +10,7 @@ HOMEPAGE= http://libsigc.sourceforge.net/ COMMENT= Type-safe callback system for C++ programs LICENSE= gnu-lgpl-v2.1 -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_TOOLS+= gm4 gmake perl:build GNU_CONFIGURE= yes @@ -18,7 +18,6 @@ PKGCONFIG_OVERRIDE= sigc++.pc.in CONFLICTS+= libsigc++2-[0-9]* GCC_REQD+= 4.8 -CXXFLAGS+= -std=c++11 # use something that can extract long filenames in GNU format on NetBSD 1.6.x EXTRACT_USING= bsdtar diff --git a/devel/libthrift/Makefile b/devel/libthrift/Makefile index 9aef0fadd2d..45607559ab7 100644 --- a/devel/libthrift/Makefile +++ b/devel/libthrift/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2017/04/30 01:21:33 ryoon Exp $ +# $NetBSD: Makefile,v 1.59 2017/05/03 08:38:41 jperkin Exp $ DISTNAME= thrift-${THRIFT_VERSION} PKGNAME= libthrift-${THRIFT_VERSION} @@ -15,7 +15,7 @@ LICENSE= apache-2.0 # No rule to make target 'gen-cpp/Service.cpp', needed by 'Service.lo'. Stop. MAKE_JOBS_SAFE= no -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake pkg-config yacc @@ -32,7 +32,7 @@ pre-build: .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -Wno-error=c++11-narrowing +CXXFLAGS+= -Wno-error=c++11-narrowing .endif .include "options.mk" @@ -41,5 +41,4 @@ CXXFLAGS+= -std=c++11 -Wno-error=c++11-narrowing .include "../../devel/zlib/buildlink3.mk" .include "../../devel/libevent/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/devel/libview/Makefile b/devel/libview/Makefile index 2c709ea3e63..805bb15d561 100644 --- a/devel/libview/Makefile +++ b/devel/libview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2017/02/12 06:24:41 ryoon Exp $ +# $NetBSD: Makefile,v 1.27 2017/05/03 08:38:41 jperkin Exp $ # DISTNAME= libview-0.6.4 @@ -14,8 +14,7 @@ LICENSE= modified-bsd GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 PKGCONFIG_OVERRIDE+= libview.pc.in diff --git a/devel/open-vcdiff/Makefile b/devel/open-vcdiff/Makefile index 07d113bb7c2..ae274bca07a 100644 --- a/devel/open-vcdiff/Makefile +++ b/devel/open-vcdiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/05/09 20:05:36 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2017/05/03 08:38:41 jperkin Exp $ # DISTNAME= open-vcdiff-0.8.3 @@ -13,13 +13,13 @@ LICENSE= apache-2.0 GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_LANGUAGES+= c c++ +USE_LANGUAGES+= c c++11 AUTO_MKDIRS= yes .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -Wno-error=c++11-narrowing +CXXFLAGS+= -Wno-error=c++11-narrowing .endif .include "../../mk/pthread.buildlink3.mk" diff --git a/devel/pangomm/Makefile b/devel/pangomm/Makefile index 6b5d38cf6f1..a22804414cd 100644 --- a/devel/pangomm/Makefile +++ b/devel/pangomm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2017/02/12 06:24:41 ryoon Exp $ +# $NetBSD: Makefile,v 1.46 2017/05/03 08:38:41 jperkin Exp $ DISTNAME= pangomm-2.40.1 PKGREVISION= 2 @@ -13,15 +13,13 @@ LICENSE= gnu-lgpl-v2.1 CONFLICTS+= gtkmm<=2.13.5 -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake pkg-config perl:run GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= pango/pangomm.pc.in -CXXFLAGS+= -std=c++11 - BUILDLINK_API_DEPENDS.mm-common+= mm-common>=0.9.10 .include "../../devel/mm-common/buildlink3.mk" .include "../../devel/glibmm/buildlink3.mk" diff --git a/devel/woboq_codebrowser/Makefile b/devel/woboq_codebrowser/Makefile index 2596a820e30..1db469f0e50 100644 --- a/devel/woboq_codebrowser/Makefile +++ b/devel/woboq_codebrowser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2016/11/27 08:51:55 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2017/05/03 08:38:41 jperkin Exp $ DISTNAME= woboq_codebrowser-2.0.1 CATEGORIES= devel lang @@ -16,7 +16,7 @@ CMAKE_ARGS+= -DLLVM_CONFIG_EXECUTABLE=${LLVM_CONFIG_PATH:Q} \ -DCMAKE_BUILD_TYPE=Release USE_TOOLS+= pax -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 INSTALLATION_DIRS+= bin share/woboq_codebrowser @@ -25,9 +25,5 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/indexgenerator/codebrowser_indexgenerator ${DESTDIR}${PREFIX}/bin cd ${WRKSRC}/data && pax -rwpp . ${DESTDIR}${PREFIX}/share/woboq_codebrowser -.include "../../mk/bsd.prefs.mk" - -CXXFLAGS+= -std=c++11 - .include "../../lang/clang/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/Sigil/Makefile b/editors/Sigil/Makefile index 2eac6b554f8..a83961d456c 100644 --- a/editors/Sigil/Makefile +++ b/editors/Sigil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.94 2017/04/30 01:21:34 ryoon Exp $ +# $NetBSD: Makefile,v 1.95 2017/05/03 08:38:41 jperkin Exp $ DISTNAME= Sigil-0.9.8 PKGREVISION= 2 @@ -24,7 +24,7 @@ ALL_ENV+= Qt5_DIR=${Qt5_DIR} BUILDLINK_TRANSFORM+= opt:-O2:-O0 #MAKE_ENV+= CXX_FLAGS="-g" -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++0x USE_CMAKE= yes USE_TOOLS+= pkg-config @@ -40,13 +40,6 @@ BUILDLINK_TRANSFORM+= l:zlib:z PYTHON_VERSIONS_INCOMPATIBLE= 27 REPLACE_PYTHON+= src/Sigil/Resource_Files/plugin_launchers/python/*.py -.include "../../mk/compiler.mk" -# GCC 4.4 and above needs this -.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*) -_WRAP_EXTRA_ARGS.CXX+= -std=c++0x -CWRAPPERS_APPEND.cxx+= -std=c++0x -.endif - .include "../../textproc/xerces-c/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" diff --git a/editors/codeblocks/Makefile b/editors/codeblocks/Makefile index d303e8cde68..7a99725c6d0 100644 --- a/editors/codeblocks/Makefile +++ b/editors/codeblocks/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2017/02/12 06:25:14 ryoon Exp $ +# $NetBSD: Makefile,v 1.6 2017/05/03 08:38:41 jperkin Exp $ # DISTNAME= codeblocks_16.01 @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}.release GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config gmake -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 CONFIGURE_ARGS+= --with-contrib-plugins=AutoVersioning,BrowseTracker,byogames,cbkoders,codesnippets,codestat,dragscroll,envvars,help,keybinder,libfinder,profiler,regex,exporter,symtab # wxsmith makes error in build process @@ -25,11 +25,6 @@ BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip PKGCONFIG_OVERRIDE+= codeblocks.pc.in -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - .include "../../databases/shared-mime-info/mimedb.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile index af14b7e6aa3..84f16281359 100644 --- a/editors/gobby/Makefile +++ b/editors/gobby/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2017/02/12 06:25:15 ryoon Exp $ +# $NetBSD: Makefile,v 1.48 2017/05/03 08:38:41 jperkin Exp $ DISTNAME= gobby-0.4.12 PKGREVISION= 29 @@ -10,13 +10,11 @@ HOMEPAGE= http://gobby.0x539.de/ COMMENT= Collaborative Editor LICENSE= gnu-gpl-v2 -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake intltool msgfmt pkg-config GNU_CONFIGURE= yes -CXXFLAGS+= -std=c++11 - .include "options.mk" .include "../../devel/glibmm/buildlink3.mk" diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile index e6ecfe19079..3003f1c621b 100644 --- a/editors/mlview/Makefile +++ b/editors/mlview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2017/02/12 06:25:16 ryoon Exp $ +# $NetBSD: Makefile,v 1.79 2017/05/03 08:38:41 jperkin Exp $ # DISTNAME= mlview-0.9.0 @@ -14,14 +14,12 @@ COMMENT= XML editor for the GNOME environment GNU_CONFIGURE= yes USE_TOOLS+= gmake intltool msgfmt pkg-config USE_LIBTOOL= yes -USE_LANGUAGES+= c c++ +USE_LANGUAGES+= c c++11 USE_PKGLOCALEDIR= yes MAKE_JOBS_SAFE= no GCONF_SCHEMAS= mlview.schemas -CXXFLAGS+= -std=c++11 - .include "../../devel/GConf/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/editors/obby/Makefile b/editors/obby/Makefile index 3f1cf5498f9..4983a38a379 100644 --- a/editors/obby/Makefile +++ b/editors/obby/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2016/09/19 13:04:18 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2017/05/03 08:38:41 jperkin Exp $ # DISTNAME= obby-0.4.8 @@ -15,9 +15,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config USE_PKGLOCALEDIR= yes -USE_LANGUAGES= c c++ - -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 PKGCONFIG_OVERRIDE+= obby-0.4.pc.in diff --git a/emulators/emulationstation/Makefile b/emulators/emulationstation/Makefile index d1d96b0028e..171c234eb75 100644 --- a/emulators/emulationstation/Makefile +++ b/emulators/emulationstation/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2017/04/30 01:21:35 ryoon Exp $ +# $NetBSD: Makefile,v 1.11 2017/05/03 08:38:41 jperkin Exp $ DISTNAME= abba19584636c28cd98e3810e857f493cb63d06c PKGNAME= emulationstation-2.0.0_rc1_20150210 @@ -14,14 +14,9 @@ COMMENT= Themeable multi-system emulator frontend LICENSE= mit USE_CMAKE= yes -USE_LANGUAGES+= c c++ +USE_LANGUAGES+= c c++11 GCC_REQD+= 4.7 # C++11 -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - WRKSRC= ${WRKDIR}/EmulationStation-${DISTNAME} INSTALLATION_DIRS= bin share/doc/emulationstation diff --git a/fonts/lcdftypetools/Makefile b/fonts/lcdftypetools/Makefile index 600712a43c2..787ae65c4c5 100644 --- a/fonts/lcdftypetools/Makefile +++ b/fonts/lcdftypetools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/10/27 11:02:41 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2017/05/03 08:38:42 jperkin Exp $ DISTNAME= texlive-20160523-source PKGNAME= lcdftypetools-2.105 @@ -18,12 +18,10 @@ EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \ GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_TOOLS+= pkg-config WRKSRC= ${WRKDIR}/${DISTNAME}/texk/lcdf-typetools -CXXFLAGS+= -std=c++11 - CONFIG_GUESS_OVERRIDE+= ${WRKDIR}/${DISTNAME}/build-aux/config.guess CONFIG_SUB_OVERRIDE+= ${WRKDIR}/${DISTNAME}/build-aux/config.sub diff --git a/games/ccgo/Makefile b/games/ccgo/Makefile index b2b7633ad8f..1cbcd2b0430 100644 --- a/games/ccgo/Makefile +++ b/games/ccgo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2017/02/12 06:25:19 ryoon Exp $ +# $NetBSD: Makefile,v 1.60 2017/05/03 08:38:42 jperkin Exp $ DISTNAME= ccgo-0.3.6.5 PKGREVISION= 2 @@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3 DEPENDS+= gnugo>=3.4:../../games/gnugo -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_TOOLS+= msgfmt pkg-config USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes @@ -23,10 +23,6 @@ SUBST_FILES.ccgo= game_setup.cc settings.cc SUBST_MESSAGE.ccgo= Fixing paths to gnugo. SUBST_SED.ccgo= -e 's|/usr/games/gnugo|${LOCALBASE}/bin/gnugo|g' -.include "../../mk/bsd.prefs.mk" - -CXXFLAGS+= -std=c++11 - .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gconfmm/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/games/pingus/Makefile b/games/pingus/Makefile index a51c13fcadf..6a7ac81f2ef 100644 --- a/games/pingus/Makefile +++ b/games/pingus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2017/04/30 01:21:40 ryoon Exp $ +# $NetBSD: Makefile,v 1.24 2017/05/03 08:38:42 jperkin Exp $ DISTNAME= pingus-0.7.3 PKGREVISION= 17 @@ -11,19 +11,13 @@ HOMEPAGE= http://pingus.seul.org/ COMMENT= Lemmings(TM) Clone BUILD_DEPENDS+= scons>=0.96:../../devel/scons -USE_LANGUAGES+= c c++ +USE_LANGUAGES= c c++11 MAKE_JOBS?= 1 -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -SCONS_CXX= ${CXX} -std=c++11 -.else -SCONS_CXX= ${CXX} -.endif do-configure: cd ${WRKSRC} && \ - ${PKGSRC_SETENV} ${MAKE_ENV} scons configure CXX=${SCONS_CXX:Q} CPPPATH=${PREFIX}/include LIBPATH=${PREFIX}/lib + ${PKGSRC_SETENV} ${MAKE_ENV} scons configure CXX=${CXX:Q} CPPPATH=${PREFIX}/include LIBPATH=${PREFIX}/lib do-build: cd ${WRKSRC} && \ diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index e119ff5b4d9..f7a034e4017 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.126 2017/04/30 01:21:41 ryoon Exp $ +# $NetBSD: Makefile,v 1.127 2017/05/03 08:38:42 jperkin Exp $ DISTNAME= wesnoth-1.12.6 PKGREVISION= 6 @@ -15,7 +15,7 @@ BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt USE_CMAKE= yes USE_LIBTOOL= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_TOOLS+= pkg-config USE_TOOLS+= perl:run msgfmt USE_TOOLS+= bash @@ -63,11 +63,6 @@ BUILDLINK_TRANSFORM+= rm:-Werror USE_TOOLS+= gmake .endif -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - PLIST_VARS+= icons .if ${OPSYS} != "Darwin" && ${OPSYS} != "Cygwin" diff --git a/geography/merkaartor/Makefile b/geography/merkaartor/Makefile index c361990334b..28f033c9ebf 100644 --- a/geography/merkaartor/Makefile +++ b/geography/merkaartor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2017/04/30 01:21:41 ryoon Exp $ +# $NetBSD: Makefile,v 1.62 2017/05/03 08:38:42 jperkin Exp $ # DISTNAME= merkaartor-0.17.2 @@ -11,7 +11,7 @@ MAINTAINER= jkunz@NetBSD.org HOMEPAGE= http://www.merkaartor.be/ COMMENT= Merkaartor is an OpenStreetMap mapping program -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes QMAKE= ${QTDIR}/bin/qmake CONFIGURE_ARGS= PREFIX=${PREFIX} NODEBUG=1 OSMARENDER=1 PROJ=1 GDAL=1 \ @@ -32,12 +32,6 @@ do-configure: ${QMAKE} ${CONFIGURE_ARGS} Merkaartor.pro && \ ${MAKE} qmake -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -_WRAP_EXTRA_ARGS.CXX+= -std=c++11 -CWRAPPERS_APPEND.cxx+= -std=c++11 -.endif - .include "../../devel/boost-headers/buildlink3.mk" .include "../../geography/gdal-lib/buildlink3.mk" .include "../../geography/gpsd/buildlink3.mk" diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 88a57f02a46..a86db82618b 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.131 2017/04/30 01:21:42 ryoon Exp $ +# $NetBSD: Makefile,v 1.132 2017/05/03 08:38:42 jperkin Exp $ DISTNAME= blender-2.77a PKGREVISION= 6 @@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2 USE_TOOLS+= gmake sed USE_CMAKE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 CMAKE_OPTS+= -DWITH_OPENAL:BOOL=OFF CMAKE_OPTS+= -DPYVERSSUFFIX:STRING=${PYVERSSUFFIX} CMAKE_OPTS+= -DPYTHON_VERSION:STRING=${PYVERSSUFFIX} @@ -32,7 +32,6 @@ CMAKE_OPTS+= -D_OPENGL_LIB_PATH:PATH=${BUILDLINK_PREFIX.MesaLib}/lib CMAKE_OPTS+= -D_OPENGL_INCLUDE_PATH:PATH=${BUILDLINK_PREFIX.MesaLib}/include CMAKE_OPTS+= -DOPENGL_glu_LIBRARY:STRING=GLU -CXXFLAGS+= -std=c++11 CMAKE_OPTS+= -DCMAKE_CXX_FLAGS:STRING=${CXXFLAGS:Q} PYTHON_VERSIONS_INCOMPATIBLE= 27 diff --git a/graphics/exiv2-organize/Makefile b/graphics/exiv2-organize/Makefile index 33ac025e757..4afe5af5ee3 100644 --- a/graphics/exiv2-organize/Makefile +++ b/graphics/exiv2-organize/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.31 2017/04/30 01:21:42 ryoon Exp $ +# $NetBSD: Makefile,v 1.32 2017/05/03 08:38:42 jperkin Exp $ PKGREVISION= 3 .include "../../graphics/exiv2/Makefile.common" PKGNAME= ${DISTNAME:S/exiv2/exiv2-organize/} +USE_LANGUAGES+= c++0x USE_TOOLS+= pkg-config BUILD_DIRS= contrib/organize INSTALLATION_DIRS= bin @@ -13,16 +14,6 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/contrib/organize/organize \ ${DESTDIR}${PREFIX}/bin/exiv2-organize -.include "../../mk/compiler.mk" -# GCC 4.4 and above needs this -.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*) -_WRAP_EXTRA_ARGS.CXX+= -std=c++0x -CWRAPPERS_APPEND.cxx+= -std=c++0x -.elif !empty(PKGSRC_COMPILER:Mclang) -_WRAP_EXTRA_ARGS.CXX+= -std=c++11 -CWRAPPERS_APPEND.cxx+= -std=c++11 -.endif - .include "../../graphics/exiv2/buildlink3.mk" .include "../../devel/boost-headers/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" diff --git a/graphics/gimmage/Makefile b/graphics/gimmage/Makefile index 1a447add8d6..0abd5fb6887 100644 --- a/graphics/gimmage/Makefile +++ b/graphics/gimmage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2017/04/30 01:21:42 ryoon Exp $ +# $NetBSD: Makefile,v 1.38 2017/05/03 08:38:42 jperkin Exp $ # DISTNAME= gimmage-0.2.3 @@ -12,8 +12,7 @@ COMMENT= GTKMM-based image viewing program GNU_CONFIGURE= yes INSTALLATION_DIRS= share/doc/gimmage -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 USE_PKGLOCALEDIR= yes USE_TOOLS+= pkg-config diff --git a/graphics/goocanvasmm/Makefile b/graphics/goocanvasmm/Makefile index 5c99516ae33..ce97f11a30f 100644 --- a/graphics/goocanvasmm/Makefile +++ b/graphics/goocanvasmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2017/02/12 06:25:28 ryoon Exp $ +# $NetBSD: Makefile,v 1.42 2017/05/03 08:38:42 jperkin Exp $ # DISTNAME= goocanvasmm-0.15.4 @@ -14,8 +14,7 @@ LICENSE= gnu-lgpl-v2.1 GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config perl -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 PKGCONFIG_OVERRIDE+= goocanvas/goocanvasmm.pc.in diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index 557358d1786..553f68aeac8 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.147 2017/05/02 13:37:31 wiz Exp $ +# $NetBSD: Makefile,v 1.148 2017/05/03 08:38:42 jperkin Exp $ DISTNAME= inkscape-0.92.1 PKGREVISION= 4 @@ -20,10 +20,9 @@ DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml EXTRACT_USING= bsdtar GCC_REQD+= 4.5.2 -CXXFLAGS+= -std=c++11 USE_CMAKE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= intltool msgfmt msgmerge perl:run pkg-config diff --git a/graphics/lepton/Makefile b/graphics/lepton/Makefile index 9b9970c1f80..2cbb4f6b4d6 100644 --- a/graphics/lepton/Makefile +++ b/graphics/lepton/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2016/07/19 06:04:30 agc Exp $ +# $NetBSD: Makefile,v 1.3 2017/05/03 08:38:42 jperkin Exp $ DISTNAME= lepton-1.2.1 CATEGORIES= graphics @@ -12,15 +12,9 @@ LICENSE= modified-bsd GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_LANGUAGES+= c c++ +USE_LANGUAGES+= c c++11 USE_TOOLS+= autoconf autoreconf automake gmake makeinfo -.include "../../mk/compiler.mk" - -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - AUTO_MKDIRS= yes pre-configure: diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile index c0775ea1f8d..fc7c0c0dad5 100644 --- a/graphics/libgnomecanvasmm/Makefile +++ b/graphics/libgnomecanvasmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2017/02/12 06:24:45 ryoon Exp $ +# $NetBSD: Makefile,v 1.43 2017/05/03 08:38:42 jperkin Exp $ DISTNAME= libgnomecanvasmm-2.26.0 PKGREVISION= 25 @@ -10,8 +10,7 @@ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://gtkmm.sourceforge.net/ COMMENT= C++ bindings for libgnomecanvas -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gm4 gmake pkg-config diff --git a/graphics/opencv-contrib-face/Makefile b/graphics/opencv-contrib-face/Makefile index 1a0b95f0230..1c81228d755 100644 --- a/graphics/opencv-contrib-face/Makefile +++ b/graphics/opencv-contrib-face/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2017/03/28 11:29:50 markd Exp $ +# $NetBSD: Makefile,v 1.10 2017/05/03 08:38:43 jperkin Exp $ DISTNAME= opencv_contrib-3.2.0 PKGNAME= ${DISTNAME:S/_contrib/-contrib-face/} @@ -15,7 +15,7 @@ LICENSE= modified-bsd DISTFILES= ${DEFAULT_DISTFILES} opencv-${PKGVERSION_NOREV}.zip USE_CMAKE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake pkg-config @@ -29,11 +29,6 @@ PATCHDIR= ${.CURDIR}/../../graphics/opencv/patches CMAKE_ARGS+= -D WITH_FFMPEG=OFF CMAKE_ARGS+= -D BUILD_DOCS=OFF -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - # jasper uses SIZE_MAX and friends in its headers. CXXFLAGS+= -D__STDC_LIMIT_MACROS diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index fad3664816f..310c06f38f1 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2017/03/16 21:59:13 prlw1 Exp $ +# $NetBSD: Makefile,v 1.71 2017/05/03 08:38:43 jperkin Exp $ DISTNAME= opencv-3.2.0 CATEGORIES= graphics devel @@ -11,7 +11,7 @@ COMMENT= Library for computer vision problems LICENSE= modified-bsd USE_CMAKE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake pkg-config @@ -30,11 +30,6 @@ CHECK_WRKREF_SKIP= ${PREFIX}/lib/libopencv_core.* .include "options.mk" -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN} CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib} CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=NO diff --git a/graphics/opencv2/Makefile b/graphics/opencv2/Makefile index be529dfd6fb..2a1aebf6a85 100644 --- a/graphics/opencv2/Makefile +++ b/graphics/opencv2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2017/02/12 06:25:30 ryoon Exp $ +# $NetBSD: Makefile,v 1.10 2017/05/03 08:38:43 jperkin Exp $ DISTNAME= opencv-2.4.11 PKGREVISION= 6 @@ -12,7 +12,7 @@ COMMENT= Library for computer vision problems LICENSE= modified-bsd USE_CMAKE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake pkg-config @@ -35,11 +35,6 @@ CHECK_WRKREF_SKIP= ${PREFIX}/lib/libopencv_core.* .include "options.mk" -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib} CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=NO diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile index ffd40ca2c21..9dfca2471a2 100644 --- a/ham/fldigi/Makefile +++ b/ham/fldigi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.86 2017/04/30 01:21:44 ryoon Exp $ +# $NetBSD: Makefile,v 1.87 2017/05/03 08:38:43 jperkin Exp $ DISTNAME= fldigi-3.23.21 PKGREVISION= 1 @@ -11,7 +11,7 @@ COMMENT= Digital radio modem LICENSE= gnu-gpl-v3 USE_TOOLS+= gmake pkg-config -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 GNU_CONFIGURE= yes # NetBSD 5.1 fails to find strip - install: exec of strip failed: @@ -45,7 +45,7 @@ CONFIGURE_ENV.NetBSD+= ac_cv_header_execinfo_h=no .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -Wno-error=c++11-narrowing +CXXFLAGS+= -Wno-error=c++11-narrowing .endif .include "../../audio/libsamplerate/buildlink3.mk" diff --git a/lang/clang/Makefile.common b/lang/clang/Makefile.common index a403d830ca3..4c30b4e0146 100644 --- a/lang/clang/Makefile.common +++ b/lang/clang/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2017/03/17 22:38:17 adam Exp $ +# $NetBSD: Makefile.common,v 1.20 2017/05/03 08:38:43 jperkin Exp $ # used by lang/clang/Makefile # used by lang/clang-static-analyzer/Makefile @@ -17,7 +17,7 @@ PATCHDIR= ${.CURDIR}/../../lang/clang/patches CONFIGURE_DIRS= ${WRKDIR}/build CMAKE_ARG_PATH= ${WRKSRC} -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_CMAKE= yes GCC_REQD+= 4.8 @@ -115,10 +115,6 @@ CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF CMAKE_ARGS+= -DCLANG_INCLUDE_TESTS=OFF .endif -# At least LLVM 3.9.0 and subprojects don't correctly add C++11 flags -# automatically. -CXXFLAGS+= -std=c++11 - post-extract: ${RUN} mkdir -p ${WRKDIR}/build diff --git a/lang/libLLVM/Makefile b/lang/libLLVM/Makefile index 2bb8288823b..5d58561736e 100644 --- a/lang/libLLVM/Makefile +++ b/lang/libLLVM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2017/05/01 00:43:07 maya Exp $ +# $NetBSD: Makefile,v 1.23 2017/05/03 08:38:43 jperkin Exp $ DISTNAME= llvm-4.0.0.src PKGNAME= ${DISTNAME:S/llvm/libLLVM/:S/.src//} @@ -12,7 +12,7 @@ HOMEPAGE= http://llvm.org/ COMMENT= Low Level Virtual Machine shared library LICENSE= modified-bsd -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_CMAKE= yes GCC_REQD+= 4.8 PYTHON_FOR_BUILD_ONLY= yes @@ -112,10 +112,6 @@ PLIST_SUBST+= LLVM_LIBNAME=${LLVM_LIBNAME} .include "options.mk" -# At least LLVM 3.9.0 and subprojects don't correctly add C++11 flags -# automatically. -CXXFLAGS+= -std=c++11 - # needs std::atomic with 64-bit CAS .if ${MACHINE_ARCH} == "i386" CXXFLAGS+= -march=i586 diff --git a/lang/llvm/Makefile b/lang/llvm/Makefile index c01318ac733..7c787319729 100644 --- a/lang/llvm/Makefile +++ b/lang/llvm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2017/05/01 00:41:29 maya Exp $ +# $NetBSD: Makefile,v 1.19 2017/05/03 08:38:43 jperkin Exp $ # # when updating this, please also update: # devel/include-what-you-use @@ -21,7 +21,7 @@ HOMEPAGE= http://llvm.org/ COMMENT= Low Level Virtual Machine compiler infrastructure LICENSE= modified-bsd -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_CMAKE= yes GCC_REQD+= 4.8 PYTHON_FOR_BUILD_ONLY= yes @@ -103,10 +103,6 @@ PLIST.notdylib= yes .endif PLIST_SUBST+= SOEXT=${SOEXT} -# At least LLVM 3.9.0 and subprojects don't correctly add C++11 flags -# automatically. -CXXFLAGS+= -std=c++11 - # needs std::atomic with 64-bit CAS .if ${MACHINE_ARCH} == "i386" CXXFLAGS+= -march=i586 diff --git a/misc/gelemental/Makefile b/misc/gelemental/Makefile index e1515dab954..7096aac8f18 100644 --- a/misc/gelemental/Makefile +++ b/misc/gelemental/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2017/02/12 06:25:44 ryoon Exp $ +# $NetBSD: Makefile,v 1.33 2017/05/03 08:38:43 jperkin Exp $ # DISTNAME= gelemental-1.2.0 @@ -14,8 +14,7 @@ COMMENT= Periodic table viewer GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config intltool gmake msgfmt -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 PKGCONFIG_OVERRIDE+= data/libelemental.pc.in diff --git a/misc/libreoffice/Makefile b/misc/libreoffice/Makefile index 69ae132cf7d..4cfb34f081f 100644 --- a/misc/libreoffice/Makefile +++ b/misc/libreoffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.111 2017/05/02 13:37:31 wiz Exp $ +# $NetBSD: Makefile,v 1.112 2017/05/03 08:38:43 jperkin Exp $ VERREL= 5.3.2 VERRC= 2 @@ -14,6 +14,8 @@ HOMEPAGE= http://www.libreoffice.org/ COMMENT= Office productivity suite from The Document Foundation LICENSE= gnu-lgpl-v3 +USE_LANGUAGES= c gnu++11 + SUBST_CLASSES+= use-bash SUBST_STAGE.use-bash= pre-configure SUBST_MESSAGE.use-bash= Using bash for configure script @@ -126,8 +128,6 @@ DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat # and this option will hopefully become unneeded in the future WRAPPER_SKIP_TRANSFORM=yes -USE_LANGUAGES+= c c++ - LDFLAGS+= -lboost_system USE_LIBTOOL= yes diff --git a/misc/rocs/Makefile b/misc/rocs/Makefile index 033fea02826..bc705d8ada6 100644 --- a/misc/rocs/Makefile +++ b/misc/rocs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2017/04/30 01:21:53 ryoon Exp $ +# $NetBSD: Makefile,v 1.45 2017/05/03 08:38:43 jperkin Exp $ DISTNAME= rocs-${_KDE_VERSION} PKGREVISION= 9 @@ -7,12 +7,9 @@ COMMENT= KDE graph theory IDE .include "../../meta-pkgs/kde4/Makefile.kde4" -CMAKE_ARGS+= -DKDE4_BUILD_TESTS:BOOL=OFF +USE_LANGUAGES+= c++11 -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) || !empty(PKGSRC_COMPILER:Mgcc) -CXXFLAGS+= -std=c++11 -.endif +CMAKE_ARGS+= -DKDE4_BUILD_TESTS:BOOL=OFF .include "../../meta-pkgs/kde4/kde4.mk" diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile index 5f31d9b99ca..368584395bf 100644 --- a/multimedia/gnash/Makefile +++ b/multimedia/gnash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.105 2017/04/30 01:21:54 ryoon Exp $ +# $NetBSD: Makefile,v 1.106 2017/05/03 08:38:43 jperkin Exp $ DISTNAME= gnash-0.8.10 PKGREVISION= 52 @@ -12,7 +12,7 @@ COMMENT= GPL SWF player LICENSE= gnu-gpl-v3 USE_PKGLOCALEDIR= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= bash gmake msgfmt pkg-config @@ -53,9 +53,4 @@ BUILDLINK_TRANSFORM+= rm:-fvisibility-inlines-hidden .include "../../x11/libXi/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile index 319620d15b1..9cb274218c2 100644 --- a/multimedia/libvpx/Makefile +++ b/multimedia/libvpx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2017/01/16 12:12:59 wiz Exp $ +# $NetBSD: Makefile,v 1.68 2017/05/03 08:38:43 jperkin Exp $ DISTNAME= libvpx-1.6.1 CATEGORIES= multimedia @@ -11,7 +11,7 @@ HOMEPAGE= https://chromium.googlesource.com/webm/libvpx COMMENT= On2 VP8 library from Google LICENSE= modified-bsd -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_TOOLS+= gmake bash:build perl:build HAS_CONFIGURE= yes @@ -83,9 +83,7 @@ CONFIGURE_ARGS+= --target=x86-solaris-gcc . endif .endif -.include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 . if ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin" # https://bugzilla.mozilla.org/show_bug.cgi?id=982693 SUBST_CLASSES+= clang diff --git a/multimedia/subtitleeditor/Makefile b/multimedia/subtitleeditor/Makefile index 61d6b2e0a20..b19e98745ae 100644 --- a/multimedia/subtitleeditor/Makefile +++ b/multimedia/subtitleeditor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2017/02/12 06:25:48 ryoon Exp $ +# $NetBSD: Makefile,v 1.37 2017/05/03 08:38:43 jperkin Exp $ # DISTNAME= subtitleeditor-0.30.0 @@ -15,9 +15,7 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes USE_TOOLS+= gmake intltool pkg-config msgfmt GNU_CONFIGURE= yes -USE_LANGUAGES= c c++ - -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 BUILDLINK_API_DEPENDS.glibmm+= glibmm>=2.16.3 .include "../../devel/glibmm/buildlink3.mk" diff --git a/net/cclive/Makefile b/net/cclive/Makefile index cb613d94f5f..6f558e298e6 100644 --- a/net/cclive/Makefile +++ b/net/cclive/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2017/04/30 01:21:56 ryoon Exp $ +# $NetBSD: Makefile,v 1.15 2017/05/03 08:38:44 jperkin Exp $ DISTNAME= cclive-0.7.16 PKGREVISION= 13 @@ -13,16 +13,10 @@ LICENSE= gnu-gpl-v3 DEPENDS+= libquvi-scripts>=0.4.0:../../net/libquvi-scripts -USE_LANGUAGES= c++ c +USE_LANGUAGES= c c++0x USE_TOOLS+= pkg-config GNU_CONFIGURE= yes -.include "../../mk/compiler.mk" -# GCC 4.4 and above needs this -.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*) -CXXFLAGS+= -std=c++0x -.endif - .include "../../net/libquvi/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile index bc502e0c656..381feb455f1 100644 --- a/net/ekiga/Makefile +++ b/net/ekiga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2017/04/22 21:03:48 adam Exp $ +# $NetBSD: Makefile,v 1.76 2017/05/03 08:38:44 jperkin Exp $ # DISTNAME= ekiga-3.2.6 @@ -25,8 +25,7 @@ CONFIGURE_ARGS+= --enable-gstreamer GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 GCC_REQD+= 4.7 .include "../../mk/compiler.mk" diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile index 352e9420c96..e4bc807e034 100644 --- a/net/libtorrent/Makefile +++ b/net/libtorrent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2016/06/27 19:16:02 maya Exp $ +# $NetBSD: Makefile,v 1.57 2017/05/03 08:38:44 jperkin Exp $ DISTNAME= libtorrent-0.13.6 PKGREVISION= 1 @@ -10,7 +10,7 @@ HOMEPAGE= http://rakshasa.github.io/rtorrent/ COMMENT= BitTorrent library written in C++ for *nix LICENSE= gnu-gpl-v2 -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= yes @@ -58,10 +58,6 @@ CONFIGURE_ENV+= OPENSSL_CFLAGS=${OPENSSL_CFLAGS:Q} CONFIGURE_ENV+= OPENSSL_LIBS=${OPENSSL_LIBS:Q} .endif -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - .include "../../devel/zlib/buildlink3.mk" .include "../../devel/libsigc++/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/net6/Makefile b/net/net6/Makefile index 52262b6dddd..40799fe1d99 100644 --- a/net/net6/Makefile +++ b/net/net6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2016/09/26 01:08:42 kamil Exp $ +# $NetBSD: Makefile,v 1.17 2017/05/03 08:38:44 jperkin Exp $ # DISTNAME= net6-1.3.14 @@ -15,8 +15,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config USE_PKGLOCALEDIR= yes -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 PKGCONFIG_OVERRIDE+= net6-1.3.pc.in diff --git a/net/powerdns-recursor/Makefile b/net/powerdns-recursor/Makefile index 7338d613733..b5a0545fa42 100644 --- a/net/powerdns-recursor/Makefile +++ b/net/powerdns-recursor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2017/03/31 19:41:13 fhajny Exp $ +# $NetBSD: Makefile,v 1.22 2017/05/03 08:38:44 jperkin Exp $ # DISTNAME= pdns-recursor-4.0.4 @@ -13,7 +13,7 @@ COMMENT= PowerDNS resolver/recursing nameserver LICENSE= gnu-gpl-v2 GNU_CONFIGURE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_TOOLS+= gmake pkg-config RCD_SCRIPTS+= pdns_recursor @@ -29,7 +29,7 @@ CONF_FILES+= ${EGDIR}/recursor.conf-dist \ .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -Wno-c++11-narrowing +CXXFLAGS+= -Wno-c++11-narrowing .endif .include "options.mk" diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile index 43de650489d..73c875a14c7 100644 --- a/net/rtorrent/Makefile +++ b/net/rtorrent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2017/04/30 01:21:57 ryoon Exp $ +# $NetBSD: Makefile,v 1.66 2017/05/03 08:38:44 jperkin Exp $ DISTNAME= rtorrent-0.9.6 PKGREVISION= 4 @@ -10,7 +10,7 @@ HOMEPAGE= http://rakshasa.github.io/rtorrent/ COMMENT= Ncurses based torrent client with support for sessions LICENSE= gnu-gpl-v2 -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_NCURSES= yes # chgat USE_TOOLS+= gmake pkg-config @@ -42,10 +42,6 @@ CXXFLAGS+= -fpermissive -fno-strength-reduce -fno-thread-jumps \ CXXFLAGS+= -march=i486 .endif -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - INSTALLATION_DIRS= share/examples/rtorrent post-install: diff --git a/net/synergy/Makefile b/net/synergy/Makefile index 255304661b3..2104315f074 100644 --- a/net/synergy/Makefile +++ b/net/synergy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2017/04/30 01:21:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.42 2017/05/03 08:38:44 jperkin Exp $ DISTNAME= synergy-1.8.6 PKGREVISION= 2 @@ -11,7 +11,7 @@ HOMEPAGE= http://synergy-project.org/ COMMENT= Let a user share a mouse and keyboard among computers LICENSE= gnu-gpl-v2 -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_TOOLS+= unzip # Main configuration is CMake, but subdirectories are GNU configure. # We need to set GNU_CONFIGURE=yes for config.{guess,sub} overrides to kick in. @@ -56,10 +56,10 @@ do-install: .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) -_WRAP_EXTRA_ARGS.CXX+= -std=c++11 -Wno-switch -Wno-unused \ +_WRAP_EXTRA_ARGS.CXX+= -Wno-switch -Wno-unused \ -Wno-deprecated-register -Wno-tautological-compare \ -Wno-logical-op-parentheses -Wno-null-dereference -CWRAPPERS_APPEND.cxx+= -std=c++11 -Wno-switch -Wno-unused \ +CWRAPPERS_APPEND.cxx+= -Wno-switch -Wno-unused \ -Wno-deprecated-register -Wno-tautological-compare \ -Wno-logical-op-parentheses -Wno-null-dereference .endif diff --git a/net/zeromq/Makefile b/net/zeromq/Makefile index e9dbc51bd66..2d6c2f07491 100644 --- a/net/zeromq/Makefile +++ b/net/zeromq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2017/02/02 10:09:53 fhajny Exp $ +# $NetBSD: Makefile,v 1.25 2017/05/03 08:38:44 jperkin Exp $ DISTNAME= zeromq-4.2.1 CATEGORIES= net devel @@ -12,7 +12,7 @@ LICENSE= gnu-lgpl-v3 GITHUB_PROJECT= libzmq GITHUB_RELEASE= v${PKGVERSION_NOREV} -USE_LANGUAGES= c c++ +USE_LANGUAGES= c gnu++11 USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config @@ -23,15 +23,7 @@ PKGCONFIG_OVERRIDE+= src/libzmq.pc.in TEST_TARGET= check -.include "../../mk/compiler.mk" - -.if !empty(CC_VERSION:Mgcc-*) -CXXFLAGS+= -std=gnu++0x -.endif - -.if !empty(CC_VERSION:Mclang-*) -CXXFLAGS+= -std=gnu++11 -.endif +.include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS" .include "../../devel/libuuid/buildlink3.mk" diff --git a/print/xetex/Makefile b/print/xetex/Makefile index 3ffac81276e..bc4dbe54894 100644 --- a/print/xetex/Makefile +++ b/print/xetex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2017/05/02 13:37:33 wiz Exp $ +# $NetBSD: Makefile,v 1.61 2017/05/03 08:38:44 jperkin Exp $ DISTNAME= texlive-20160523-source PKGNAME= xetex-0.99996 @@ -21,8 +21,7 @@ EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \ ${DISTNAME}/texk/web2c GNU_CONFIGURE= yes -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_TOOLS+= gmake lex perl pkg-config yacc CONFIGURE_ARGS+= --disable-aleph --disable-etex --disable-pdftex \ diff --git a/security/ecap_clamav_adapter/Makefile b/security/ecap_clamav_adapter/Makefile index 51104fd9a61..e9ea1771b06 100644 --- a/security/ecap_clamav_adapter/Makefile +++ b/security/ecap_clamav_adapter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2016/06/23 15:17:28 prlw1 Exp $ +# $NetBSD: Makefile,v 1.3 2017/05/03 08:38:44 jperkin Exp $ DISTNAME= ecap_clamav_adapter-2.0.0 PKGREVISION= 1 @@ -11,12 +11,10 @@ COMMENT= eCAP ClamAV adapter LICENSE= 2-clause-bsd GNU_CONFIGURE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_TOOLS+= pkg-config -CXXFLAGS+= -std=c++11 - .include "../../security/clamav/buildlink3.mk" .include "../../www/libecap/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile index 2e6b03c5748..9c651d9f806 100644 --- a/sysutils/gcdmaster/Makefile +++ b/sysutils/gcdmaster/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.82 2017/02/12 06:25:59 ryoon Exp $ +# $NetBSD: Makefile,v 1.83 2017/05/03 08:38:44 jperkin Exp $ .include "../../sysutils/cdrdao/Makefile.common" @@ -14,12 +14,11 @@ WRKSRC= ${WRKDIR}/cdrdao-${CDRDAO_VER} CONFIGURE_ARGS+= --without-posix-threads CONFIGURE_ARGS+= --with-xdao INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/applications share/pixmaps +USE_LANGUAGES+= c++11 USE_TOOLS+= pkg-config INSTALL_DIRS= xdao GCONF_SCHEMAS= gcdmaster.schemas -CXXFLAGS+= -std=c++11 - .include "../../devel/libsigc++/buildlink3.mk" .include "../../x11/gtkmm/buildlink3.mk" .include "../../devel/libgnomeuimm/buildlink3.mk" diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 3ca2b27ffc1..746609651c5 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2017/02/12 06:26:00 ryoon Exp $ +# $NetBSD: Makefile,v 1.50 2017/05/03 08:38:44 jperkin Exp $ # DISTNAME= gnome-system-monitor-2.28.2 @@ -15,8 +15,7 @@ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_TOOLS+= autoconf gmake intltool msgfmt pkg-config -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 CONFLICTS+= gnome2-system-monitor-[0-9]* diff --git a/sysutils/gnome-vfsmm/Makefile b/sysutils/gnome-vfsmm/Makefile index 7b6390a9473..742d00fe395 100644 --- a/sysutils/gnome-vfsmm/Makefile +++ b/sysutils/gnome-vfsmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2017/02/12 06:24:49 ryoon Exp $ +# $NetBSD: Makefile,v 1.56 2017/05/03 08:38:45 jperkin Exp $ DISTNAME= gnome-vfsmm-2.26.0 PKGREVISION= 30 @@ -12,8 +12,7 @@ COMMENT= C++ bindings for gnome-vfs #BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gm4 gmake pkg-config diff --git a/sysutils/mate-system-monitor/Makefile b/sysutils/mate-system-monitor/Makefile index bec20651ec8..2321b7fadd8 100644 --- a/sysutils/mate-system-monitor/Makefile +++ b/sysutils/mate-system-monitor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2017/02/12 06:26:01 ryoon Exp $ +# $NetBSD: Makefile,v 1.5 2017/05/03 08:38:45 jperkin Exp $ PKGREVISION= 3 .include "../../meta-pkgs/mate/Makefile.common" @@ -11,8 +11,7 @@ COMMENT= MATE system monitor TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 # for xmllint -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 .include "../../devel/glib2/schemas.mk" diff --git a/sysutils/open-vm-tools/Makefile b/sysutils/open-vm-tools/Makefile index d5204854ec9..b918ea43015 100644 --- a/sysutils/open-vm-tools/Makefile +++ b/sysutils/open-vm-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2017/04/22 21:03:58 adam Exp $ +# $NetBSD: Makefile,v 1.71 2017/05/03 08:38:45 jperkin Exp $ DISTNAME= open-vm-tools-10.1.5-5055683 PKGNAME= open-vm-tools-10.1.5 @@ -14,11 +14,10 @@ LICENSE= gnu-lgpl-v2.1 ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-x86_64 GCC_REQD+= 4.8 -CXXFLAGS+= -std=gnu++11 BUILDLINK_TRANSFORM.NetBSD+= rm:-Werror GNU_CONFIGURE= yes -USE_LANGUAGES+= c c++ +USE_LANGUAGES+= c gnu++11 USE_LIBTOOL= yes USE_TOOLS+= pkg-config autoconf automake diff --git a/sysutils/strigi/Makefile b/sysutils/strigi/Makefile index bd33ccf52b3..db6e7d6bd85 100644 --- a/sysutils/strigi/Makefile +++ b/sysutils/strigi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2017/05/01 12:54:17 wiz Exp $ +# $NetBSD: Makefile,v 1.58 2017/05/03 08:38:45 jperkin Exp $ DISTNAME= strigi-0.7.8 PKGREVISION= 18 @@ -11,15 +11,13 @@ HOMEPAGE= http://strigi.sourceforge.net/ COMMENT= Small fast desktop searching program LICENSE= gnu-lgpl-v2 -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_TOOLS+= gmake pkg-config perl USE_CMAKE= yes PKGCONFIG_OVERRIDE+= src/streamanalyzer/libstreamanalyzer.pc.cmake PKGCONFIG_OVERRIDE+= src/streams/libstreams.pc.cmake -CXXFLAGS+= -std=c++11 - .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/pset.h) RT_LIB_SCHED= -lrt diff --git a/textproc/FlightCrew/Makefile b/textproc/FlightCrew/Makefile index 1ea0b32d33b..20d5bee93a4 100644 --- a/textproc/FlightCrew/Makefile +++ b/textproc/FlightCrew/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2017/04/30 01:22:01 ryoon Exp $ +# $NetBSD: Makefile,v 1.41 2017/05/03 08:38:45 jperkin Exp $ DISTNAME= FlightCrew-0.7.2-Code PKGNAME= ${DISTNAME:S/-Code//} @@ -14,7 +14,7 @@ LICENSE= gnu-lgpl-v3 AND cc-by-sa-v3.0 WRKSRC= ${WRKDIR} -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_CMAKE= yes BUILDLINK_TRANSFORM+= l:BoostParts:boost_date_time:boost_filesystem:boost_regex:boost_system:boost_thread:boost_program_options @@ -36,16 +36,6 @@ SUBST_FILES.d2u+= src/FlightCrew/tests/CMakeLists.txt SUBST_FILES.d2u+= src/FlightCrew/Validators/Opf/ReachabilityAnalysis.cpp SUBST_FILTER_CMD.d2u= ${TR} -d '\r' -.include "../../mk/compiler.mk" -# GCC 4.4 and above needs this -.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*) -_WRAP_EXTRA_ARGS.CXX+= -std=c++0x -CWRAPPERS_APPEND.cxx+= -std=c++0x -.elif !empty(PKGSRC_COMPILER:Mclang) -_WRAP_EXTRA_ARGS.CXX+= -std=c++11 -CWRAPPERS_APPEND.cxx+= -std=c++11 -.endif - post-extract: ${RM} -rf ${WRKDIR}/src/BoostParts ${WRKDIR}/src/Xerces ${WRKDIR}/src/zlib ${WRKDIR}/src/googlemock diff --git a/textproc/php-intl/Makefile b/textproc/php-intl/Makefile index e87d664ef67..418d6e30e4f 100644 --- a/textproc/php-intl/Makefile +++ b/textproc/php-intl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2017/04/30 22:49:54 maya Exp $ +# $NetBSD: Makefile,v 1.29 2017/05/03 08:38:45 jperkin Exp $ MODNAME= intl CATEGORIES+= textproc @@ -6,8 +6,7 @@ COMMENT= PHP extension for i18n PKGREVISION= 1 LICENSE= php -CXXFLAGS+= -std=c++11 -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_PHP_EXT_PATCHES= yes CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} diff --git a/www/cppcms/Makefile b/www/cppcms/Makefile index 8e6254a18bb..f731f365af9 100644 --- a/www/cppcms/Makefile +++ b/www/cppcms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2017/04/22 21:04:00 adam Exp $ +# $NetBSD: Makefile,v 1.16 2017/05/03 08:38:45 jperkin Exp $ DISTNAME= cppcms-1.0.4 PKGREVISION= 12 @@ -11,18 +11,11 @@ HOMEPAGE= http://cppcms.com/ COMMENT= High performance C++ web development framework LICENSE= gnu-lgpl-v3 -USE_LANGUAGES= c c++ +USE_LANGUAGES= c gnu++11 USE_CMAKE= yes CMAKE_ARGS+= -DPYTHON=${PYTHONBIN} -DDISABLE_GCRYPT=yes -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - -CXXFLAGS.Cygwin+= -std=gnu++11 - LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} TEST_TARGET= test diff --git a/www/libecap/Makefile b/www/libecap/Makefile index 9b66239c7fe..3f5584188ef 100644 --- a/www/libecap/Makefile +++ b/www/libecap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2016/06/23 15:05:38 prlw1 Exp $ +# $NetBSD: Makefile,v 1.4 2017/05/03 08:38:45 jperkin Exp $ DISTNAME= libecap-1.0.1 PKGREVISION= 2 @@ -11,12 +11,10 @@ COMMENT= C++ implementation of eCAP API LICENSE= 2-clause-bsd GNU_CONFIGURE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_TOOLS+= pkg-config -CXXFLAGS+= -std=c++11 - PKGCONFIG_OVERRIDE+= libecap.pc.in .include "../../mk/bsd.pkg.mk" diff --git a/www/squid3/options.mk b/www/squid3/options.mk index d239d204028..bfc45ba0054 100644 --- a/www/squid3/options.mk +++ b/www/squid3/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.22 2017/02/10 08:41:25 sborrill Exp $ +# $NetBSD: options.mk,v 1.23 2017/05/03 08:38:45 jperkin Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.squid PKG_SUPPORTED_OPTIONS= ecap inet6 snmp ssl squid-backend-aufs \ @@ -91,7 +91,7 @@ CONFIGURE_ARGS+= --enable-carp CONFIGURE_ARGS+= --enable-ecap USE_TOOLS+= pkg-config CHECK_WRKREF_SKIP+= sbin/squid -CXXFLAGS+= -std=c++11 +USE_LANGUAGES+= c++11 .include "../../www/libecap/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-ecap diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile index 9d6ac0ab3e3..630307cd58c 100644 --- a/www/webkit-gtk/Makefile +++ b/www/webkit-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.125 2017/04/22 21:03:18 adam Exp $ +# $NetBSD: Makefile,v 1.126 2017/05/03 08:38:45 jperkin Exp $ DISTNAME= webkitgtk-2.12.4 PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} @@ -18,7 +18,7 @@ NOT_FOR_PLATFORM= NetBSD-[1-6]*-* BUILD_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools USE_CMAKE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 #USE_LIBTOOL= yes USE_TOOLS+= automake bison gmake perl:build pkg-config msgfmt @@ -67,7 +67,7 @@ CXXFLAGS.SunOS+= -fpermissive .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -Wno-c++11-narrowing +CXXFLAGS+= -Wno-c++11-narrowing .endif .if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) diff --git a/www/webkit24-gtk/Makefile.common b/www/webkit24-gtk/Makefile.common index cb7a498bc4d..4a4b4e2b623 100644 --- a/www/webkit24-gtk/Makefile.common +++ b/www/webkit24-gtk/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2017/01/01 14:44:06 wiz Exp $ +# $NetBSD: Makefile.common,v 1.9 2017/05/03 08:38:45 jperkin Exp $ # used by www/webkit24-gtk/Makefile # used by www/webkit24-gtk3/Makefile @@ -14,7 +14,7 @@ LICENSE= 2-clause-bsd AND gnu-lgpl-v2 DISTINFO_FILE= ${.CURDIR}/../../www/webkit24-gtk/distinfo PATCHDIR= ${.CURDIR}/../../www/webkit24-gtk/patches -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_TOOLS+= automake bison gmake perl:build pkg-config msgfmt USE_TOOLS+= msgmerge xgettext @@ -66,7 +66,7 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN} CXXFLAGS.SunOS+= -fpermissive .if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -Wno-c++11-narrowing +CXXFLAGS+= -Wno-c++11-narrowing .endif .if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) diff --git a/www/yahttp/Makefile b/www/yahttp/Makefile index 47d55435de1..52f7db00423 100644 --- a/www/yahttp/Makefile +++ b/www/yahttp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2017/04/30 01:22:03 ryoon Exp $ +# $NetBSD: Makefile,v 1.8 2017/05/03 08:38:45 jperkin Exp $ DISTNAME= yahttp-0.1.5 PKGREVISION= 4 @@ -13,14 +13,9 @@ LICENSE= mit GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_TOOLS+= aclocal autoconf autoheader automake -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - pre-configure: set -e; cd ${WRKSRC}; \ aclocal; autoheader; automake -a --foreign -i; autoconf diff --git a/x11/gtkmm-utils/Makefile b/x11/gtkmm-utils/Makefile index db678b2e146..33a46b9d9d4 100644 --- a/x11/gtkmm-utils/Makefile +++ b/x11/gtkmm-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2017/02/12 06:24:54 ryoon Exp $ +# $NetBSD: Makefile,v 1.29 2017/05/03 08:38:46 jperkin Exp $ # DISTNAME= gtkmm-utils-0.4.1 @@ -11,10 +11,9 @@ HOMEPAGE= http://code.google.com/p/gtkmm-utils/ COMMENT= C++ utility and widget library based on glibmm and gtkmm GNU_CONFIGURE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_TOOLS+= pkg-config -CXXFLAGS+= -std=c++11 PKGCONFIG_OVERRIDE+= glibmm-utils/glibmm-utils.pc.in PKGCONFIG_OVERRIDE+= gtkmm-utils/gtkmm-utils.pc.in diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile index 9b17cec3018..85767f47023 100644 --- a/x11/gtkmm/Makefile +++ b/x11/gtkmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.109 2017/02/12 06:24:54 ryoon Exp $ +# $NetBSD: Makefile,v 1.110 2017/05/03 08:38:46 jperkin Exp $ DISTNAME= gtkmm-2.24.5 PKGREVISION= 2 @@ -11,8 +11,7 @@ HOMEPAGE= http://www.gtkmm.org/ COMMENT= C++ interface to Gtk+ v2 LICENSE= gnu-lgpl-v2.1 -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_TOOLS+= gmake perl:run pkg-config GNU_CONFIGURE= yes diff --git a/x11/gtkmm3/Makefile b/x11/gtkmm3/Makefile index 0970aad7d95..7bf5bd18d6a 100644 --- a/x11/gtkmm3/Makefile +++ b/x11/gtkmm3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2017/02/12 06:24:54 ryoon Exp $ +# $NetBSD: Makefile,v 1.22 2017/05/03 08:38:46 jperkin Exp $ DISTNAME= gtkmm-3.22.0 PKGNAME= ${DISTNAME:S/gtkmm/gtkmm3/1} @@ -12,8 +12,7 @@ HOMEPAGE= http://www.gtkmm.org/ COMMENT= C++ Interfaces for GTK+ and GNOME (v3) LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_TOOLS+= gmake perl pkg-config GNU_CONFIGURE= yes diff --git a/x11/gtksourceviewmm/Makefile b/x11/gtksourceviewmm/Makefile index 1f2614cdfcf..8b6b8abda1e 100644 --- a/x11/gtksourceviewmm/Makefile +++ b/x11/gtksourceviewmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2017/02/12 06:24:54 ryoon Exp $ +# $NetBSD: Makefile,v 1.15 2017/05/03 08:38:46 jperkin Exp $ # DISTNAME= gtksourceviewmm-3.2.0 @@ -15,8 +15,7 @@ LICENSE= gnu-gpl-v2 WRKSRC= ${WRKDIR}/gtksourceviewmm-3.2.0 GNU_CONFIGURE= yes USE_TOOLS+= gmake perl pkg-config -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes PKGCONFIG_OVERRIDE+= gtksourceview/gtksourceviewmm-uninstalled.pc.in diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile index 687fae6c349..441ef8432e8 100644 --- a/x11/qt4-libs/Makefile +++ b/x11/qt4-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.115 2017/02/12 06:26:14 ryoon Exp $ +# $NetBSD: Makefile,v 1.116 2017/05/03 08:38:46 jperkin Exp $ PKGNAME= qt4-libs-${QTVERSION} PKGREVISION= 6 @@ -28,9 +28,11 @@ CONFIGURE_ARGS+= -openssl-linked CONFIGURE_ARGS+= -iconv +USE_LANGUAGES+= c++11 + .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -Wno-c++11-narrowing +CXXFLAGS+= -Wno-c++11-narrowing . if empty(MACHINE_PLATFORM:MDarwin-*-*) CXXFLAGS+= -D_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC=1 . endif diff --git a/x11/qt5-qtbase/Makefile.common b/x11/qt5-qtbase/Makefile.common index 9ffbba98c17..2e93b2b78fd 100644 --- a/x11/qt5-qtbase/Makefile.common +++ b/x11/qt5-qtbase/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2017/04/26 06:12:25 wiz Exp $ +# $NetBSD: Makefile.common,v 1.21 2017/05/03 08:38:46 jperkin Exp $ # used by x11/qt5-mysql/Makefile # used by x11/qt5-odbc/Makefile # used by x11/qt5-psql/Makefile @@ -31,8 +31,7 @@ .include "../../mk/dlopen.buildlink3.mk" BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*} -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_TOOLS+= gmake perl:build pkg-config |