pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc



Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed May  3 08:38:46 UTC 2017

Modified Files:
        pkgsrc/audio/bmpx: Makefile
        pkgsrc/audio/paman: Makefile
        pkgsrc/audio/paprefs: Makefile
        pkgsrc/audio/pavucontrol: Makefile
        pkgsrc/audio/pavumeter: Makefile
        pkgsrc/audio/taglib: Makefile
        pkgsrc/cad/kicad: Makefile
        pkgsrc/cad/librecad: Makefile
        pkgsrc/chat/swift: Makefile
        pkgsrc/converters/libetonyek: Makefile
        pkgsrc/databases/mysql-workbench: Makefile
        pkgsrc/databases/soci: Makefile
        pkgsrc/databases/sqlrelay-nodejs: Makefile
        pkgsrc/devel/aegis: Makefile
        pkgsrc/devel/atkmm: Makefile
        pkgsrc/devel/boost-jam: bjam.mk
        pkgsrc/devel/cppcheck: Makefile
        pkgsrc/devel/cre2: Makefile
        pkgsrc/devel/creduce: Makefile
        pkgsrc/devel/cssc: Makefile
        pkgsrc/devel/gconfmm: Makefile
        pkgsrc/devel/glibmm: Makefile
        pkgsrc/devel/google-glog: Makefile
        pkgsrc/devel/googletest: Makefile
        pkgsrc/devel/libglademm: Makefile
        pkgsrc/devel/libgnomemm: Makefile
        pkgsrc/devel/libgnomeuimm: Makefile
        pkgsrc/devel/libsexymm: Makefile
        pkgsrc/devel/libsigc++: Makefile
        pkgsrc/devel/libthrift: Makefile
        pkgsrc/devel/libview: Makefile
        pkgsrc/devel/open-vcdiff: Makefile
        pkgsrc/devel/pangomm: Makefile
        pkgsrc/devel/woboq_codebrowser: Makefile
        pkgsrc/editors/Sigil: Makefile
        pkgsrc/editors/codeblocks: Makefile
        pkgsrc/editors/gobby: Makefile
        pkgsrc/editors/mlview: Makefile
        pkgsrc/editors/obby: Makefile
        pkgsrc/emulators/emulationstation: Makefile
        pkgsrc/fonts/lcdftypetools: Makefile
        pkgsrc/games/ccgo: Makefile
        pkgsrc/games/pingus: Makefile
        pkgsrc/games/wesnoth: Makefile
        pkgsrc/geography/merkaartor: Makefile
        pkgsrc/graphics/blender: Makefile
        pkgsrc/graphics/exiv2-organize: Makefile
        pkgsrc/graphics/gimmage: Makefile
        pkgsrc/graphics/goocanvasmm: Makefile
        pkgsrc/graphics/inkscape: Makefile
        pkgsrc/graphics/lepton: Makefile
        pkgsrc/graphics/libgnomecanvasmm: Makefile
        pkgsrc/graphics/opencv: Makefile
        pkgsrc/graphics/opencv-contrib-face: Makefile
        pkgsrc/graphics/opencv2: Makefile
        pkgsrc/ham/fldigi: Makefile
        pkgsrc/lang/clang: Makefile.common
        pkgsrc/lang/libLLVM: Makefile
        pkgsrc/lang/llvm: Makefile
        pkgsrc/misc/gelemental: Makefile
        pkgsrc/misc/libreoffice: Makefile
        pkgsrc/misc/rocs: Makefile
        pkgsrc/multimedia/gnash: Makefile
        pkgsrc/multimedia/libvpx: Makefile
        pkgsrc/multimedia/subtitleeditor: Makefile
        pkgsrc/net/cclive: Makefile
        pkgsrc/net/ekiga: Makefile
        pkgsrc/net/libtorrent: Makefile
        pkgsrc/net/net6: Makefile
        pkgsrc/net/powerdns-recursor: Makefile
        pkgsrc/net/rtorrent: Makefile
        pkgsrc/net/synergy: Makefile
        pkgsrc/net/zeromq: Makefile
        pkgsrc/print/xetex: Makefile
        pkgsrc/security/ecap_clamav_adapter: Makefile
        pkgsrc/sysutils/gcdmaster: Makefile
        pkgsrc/sysutils/gnome-system-monitor: Makefile
        pkgsrc/sysutils/gnome-vfsmm: Makefile
        pkgsrc/sysutils/mate-system-monitor: Makefile
        pkgsrc/sysutils/open-vm-tools: Makefile
        pkgsrc/sysutils/strigi: Makefile
        pkgsrc/textproc/FlightCrew: Makefile
        pkgsrc/textproc/php-intl: Makefile
        pkgsrc/www/cppcms: Makefile
        pkgsrc/www/libecap: Makefile
        pkgsrc/www/squid3: options.mk
        pkgsrc/www/webkit-gtk: Makefile
        pkgsrc/www/webkit24-gtk: Makefile.common
        pkgsrc/www/yahttp: Makefile
        pkgsrc/x11/gtkmm: Makefile
        pkgsrc/x11/gtkmm-utils: Makefile
        pkgsrc/x11/gtkmm3: Makefile
        pkgsrc/x11/gtksourceviewmm: Makefile
        pkgsrc/x11/qt4-libs: Makefile
        pkgsrc/x11/qt5-qtbase: Makefile.common

Log Message:
Convert CXXFLAGS setting C++ standard to USE_LANGUAGES.


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 pkgsrc/audio/bmpx/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/audio/paman/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/audio/paprefs/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/audio/pavucontrol/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/audio/pavumeter/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/audio/taglib/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/cad/kicad/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/cad/librecad/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/chat/swift/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/converters/libetonyek/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/databases/mysql-workbench/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/databases/soci/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/sqlrelay-nodejs/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/aegis/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/atkmm/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/boost-jam/bjam.mk
cvs rdiff -u -r1.45 -r1.46 pkgsrc/devel/cppcheck/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/cre2/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/creduce/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/devel/cssc/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/devel/gconfmm/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/devel/glibmm/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/google-glog/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/googletest/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/devel/libglademm/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/devel/libgnomemm/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/devel/libgnomeuimm/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/libsexymm/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/devel/libsigc++/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/devel/libthrift/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/libview/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/open-vcdiff/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/devel/pangomm/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/woboq_codebrowser/Makefile
cvs rdiff -u -r1.94 -r1.95 pkgsrc/editors/Sigil/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/editors/codeblocks/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/editors/gobby/Makefile
cvs rdiff -u -r1.78 -r1.79 pkgsrc/editors/mlview/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/editors/obby/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/emulators/emulationstation/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/lcdftypetools/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/games/ccgo/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/games/pingus/Makefile
cvs rdiff -u -r1.126 -r1.127 pkgsrc/games/wesnoth/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/geography/merkaartor/Makefile
cvs rdiff -u -r1.131 -r1.132 pkgsrc/graphics/blender/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/graphics/exiv2-organize/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/graphics/gimmage/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/graphics/goocanvasmm/Makefile
cvs rdiff -u -r1.147 -r1.148 pkgsrc/graphics/inkscape/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/lepton/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/graphics/libgnomecanvasmm/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/graphics/opencv/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/opencv-contrib-face/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/opencv2/Makefile
cvs rdiff -u -r1.86 -r1.87 pkgsrc/ham/fldigi/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/clang/Makefile.common
cvs rdiff -u -r1.22 -r1.23 pkgsrc/lang/libLLVM/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/llvm/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/misc/gelemental/Makefile
cvs rdiff -u -r1.111 -r1.112 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/misc/rocs/Makefile
cvs rdiff -u -r1.105 -r1.106 pkgsrc/multimedia/gnash/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/multimedia/libvpx/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/multimedia/subtitleeditor/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/cclive/Makefile
cvs rdiff -u -r1.75 -r1.76 pkgsrc/net/ekiga/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/net/libtorrent/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/net6/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/powerdns-recursor/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/net/rtorrent/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/net/synergy/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/net/zeromq/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/print/xetex/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/ecap_clamav_adapter/Makefile
cvs rdiff -u -r1.82 -r1.83 pkgsrc/sysutils/gcdmaster/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/sysutils/gnome-system-monitor/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/sysutils/gnome-vfsmm/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/mate-system-monitor/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/sysutils/open-vm-tools/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/sysutils/strigi/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/textproc/FlightCrew/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/textproc/php-intl/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/cppcms/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/libecap/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/squid3/options.mk
cvs rdiff -u -r1.125 -r1.126 pkgsrc/www/webkit-gtk/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/webkit24-gtk/Makefile.common
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/yahttp/Makefile
cvs rdiff -u -r1.109 -r1.110 pkgsrc/x11/gtkmm/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/gtkmm-utils/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/gtkmm3/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/gtksourceviewmm/Makefile
cvs rdiff -u -r1.115 -r1.116 pkgsrc/x11/qt4-libs/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/qt5-qtbase/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/bmpx/Makefile
diff -u pkgsrc/audio/bmpx/Makefile:1.87 pkgsrc/audio/bmpx/Makefile:1.88
--- pkgsrc/audio/bmpx/Makefile:1.87     Sun Apr 30 01:21:27 2017
+++ pkgsrc/audio/bmpx/Makefile  Wed May  3 08:38:38 2017
@@ -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/sit
 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"

Index: pkgsrc/audio/paman/Makefile
diff -u pkgsrc/audio/paman/Makefile:1.43 pkgsrc/audio/paman/Makefile:1.44
--- pkgsrc/audio/paman/Makefile:1.43    Sun Feb 12 06:25:04 2017
+++ pkgsrc/audio/paman/Makefile Wed May  3 08:38:38 2017
@@ -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
 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"

Index: pkgsrc/audio/paprefs/Makefile
diff -u pkgsrc/audio/paprefs/Makefile:1.50 pkgsrc/audio/paprefs/Makefile:1.51
--- pkgsrc/audio/paprefs/Makefile:1.50  Sun Feb 12 06:25:04 2017
+++ pkgsrc/audio/paprefs/Makefile       Wed May  3 08:38:38 2017
@@ -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 Pu
 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"

Index: pkgsrc/audio/pavucontrol/Makefile
diff -u pkgsrc/audio/pavucontrol/Makefile:1.50 pkgsrc/audio/pavucontrol/Makefile:1.51
--- pkgsrc/audio/pavucontrol/Makefile:1.50      Sun Feb 12 06:25:04 2017
+++ pkgsrc/audio/pavucontrol/Makefile   Wed May  3 08:38:39 2017
@@ -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") f
 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"

Index: pkgsrc/audio/pavumeter/Makefile
diff -u pkgsrc/audio/pavumeter/Makefile:1.48 pkgsrc/audio/pavumeter/Makefile:1.49
--- pkgsrc/audio/pavumeter/Makefile:1.48        Sun Feb 12 06:25:05 2017
+++ pkgsrc/audio/pavumeter/Makefile     Wed May  3 08:38:39 2017
@@ -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
 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"

Index: pkgsrc/audio/taglib/Makefile
diff -u pkgsrc/audio/taglib/Makefile:1.38 pkgsrc/audio/taglib/Makefile:1.39
--- pkgsrc/audio/taglib/Makefile:1.38   Fri Nov  4 14:03:14 2016
+++ pkgsrc/audio/taglib/Makefile        Wed May  3 08:38:39 2017
@@ -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

Index: pkgsrc/cad/kicad/Makefile
diff -u pkgsrc/cad/kicad/Makefile:1.18 pkgsrc/cad/kicad/Makefile:1.19
--- pkgsrc/cad/kicad/Makefile:1.18      Sun Apr 30 01:21:28 2017
+++ pkgsrc/cad/kicad/Makefile   Wed May  3 08:38:39 2017
@@ -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 
 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"

Index: pkgsrc/cad/librecad/Makefile
diff -u pkgsrc/cad/librecad/Makefile:1.38 pkgsrc/cad/librecad/Makefile:1.39
--- pkgsrc/cad/librecad/Makefile:1.38   Sun Apr 30 01:21:28 2017
+++ pkgsrc/cad/librecad/Makefile        Wed May  3 08:38:39 2017
@@ -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

Index: pkgsrc/chat/swift/Makefile
diff -u pkgsrc/chat/swift/Makefile:1.23 pkgsrc/chat/swift/Makefile:1.24
--- pkgsrc/chat/swift/Makefile:1.23     Sun Apr 30 01:21:29 2017
+++ pkgsrc/chat/swift/Makefile  Wed May  3 08:38:39 2017
@@ -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

Index: pkgsrc/converters/libetonyek/Makefile
diff -u pkgsrc/converters/libetonyek/Makefile:1.14 pkgsrc/converters/libetonyek/Makefile:1.15
--- pkgsrc/converters/libetonyek/Makefile:1.14  Sun Apr 30 01:21:20 2017
+++ pkgsrc/converters/libetonyek/Makefile       Wed May  3 08:38:39 2017
@@ -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/
 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

Index: pkgsrc/databases/mysql-workbench/Makefile
diff -u pkgsrc/databases/mysql-workbench/Makefile:1.56 pkgsrc/databases/mysql-workbench/Makefile:1.57
--- pkgsrc/databases/mysql-workbench/Makefile:1.56      Sat Apr 22 21:03:27 2017
+++ pkgsrc/databases/mysql-workbench/Makefile   Wed May  3 08:38:39 2017
@@ -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 
 .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"

Index: pkgsrc/databases/soci/Makefile
diff -u pkgsrc/databases/soci/Makefile:1.20 pkgsrc/databases/soci/Makefile:1.21
--- pkgsrc/databases/soci/Makefile:1.20 Sun Apr 30 01:21:31 2017
+++ pkgsrc/databases/soci/Makefile      Wed May  3 08:38:39 2017
@@ -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"

Index: pkgsrc/databases/sqlrelay-nodejs/Makefile
diff -u pkgsrc/databases/sqlrelay-nodejs/Makefile:1.9 pkgsrc/databases/sqlrelay-nodejs/Makefile:1.10
--- pkgsrc/databases/sqlrelay-nodejs/Makefile:1.9       Sun Apr 30 01:21:31 2017
+++ pkgsrc/databases/sqlrelay-nodejs/Makefile   Wed May  3 08:38:39 2017
@@ -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
 

Index: pkgsrc/devel/aegis/Makefile
diff -u pkgsrc/devel/aegis/Makefile:1.37 pkgsrc/devel/aegis/Makefile:1.38
--- pkgsrc/devel/aegis/Makefile:1.37    Sun Apr 30 01:21:32 2017
+++ pkgsrc/devel/aegis/Makefile Wed May  3 08:38:39 2017
@@ -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
 

Index: pkgsrc/devel/atkmm/Makefile
diff -u pkgsrc/devel/atkmm/Makefile:1.20 pkgsrc/devel/atkmm/Makefile:1.21
--- pkgsrc/devel/atkmm/Makefile:1.20    Wed Apr 26 13:16:11 2017
+++ pkgsrc/devel/atkmm/Makefile Wed May  3 08:38:39 2017
@@ -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"

Index: pkgsrc/devel/boost-jam/bjam.mk
diff -u pkgsrc/devel/boost-jam/bjam.mk:1.17 pkgsrc/devel/boost-jam/bjam.mk:1.18
--- pkgsrc/devel/boost-jam/bjam.mk:1.17 Sun Feb 28 23:54:11 2016
+++ pkgsrc/devel/boost-jam/bjam.mk      Wed May  3 08:38:40 2017
@@ -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

Index: pkgsrc/devel/cppcheck/Makefile
diff -u pkgsrc/devel/cppcheck/Makefile:1.45 pkgsrc/devel/cppcheck/Makefile:1.46
--- pkgsrc/devel/cppcheck/Makefile:1.45 Sat Apr 22 21:03:30 2017
+++ pkgsrc/devel/cppcheck/Makefile      Wed May  3 08:38:40 2017
@@ -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]*:../../tex
 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 -I
 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

Index: pkgsrc/devel/cre2/Makefile
diff -u pkgsrc/devel/cre2/Makefile:1.4 pkgsrc/devel/cre2/Makefile:1.5
--- pkgsrc/devel/cre2/Makefile:1.4      Sun Dec 25 21:43:56 2016
+++ pkgsrc/devel/cre2/Makefile  Wed May  3 08:38:40 2017
@@ -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-mod
 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
 

Index: pkgsrc/devel/creduce/Makefile
diff -u pkgsrc/devel/creduce/Makefile:1.3 pkgsrc/devel/creduce/Makefile:1.4
--- pkgsrc/devel/creduce/Makefile:1.3   Fri Nov 18 18:20:05 2016
+++ pkgsrc/devel/creduce/Makefile       Wed May  3 08:38:40 2017
@@ -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]*:../../
 
 TEST_TARGET=   check
 
-.include "../../mk/bsd.prefs.mk"
-
-CXXFLAGS+=     -std=c++11
-
 .include "../../lang/clang/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/cssc/Makefile
diff -u pkgsrc/devel/cssc/Makefile:1.34 pkgsrc/devel/cssc/Makefile:1.35
--- pkgsrc/devel/cssc/Makefile:1.34     Sat Mar 14 14:24:48 2015
+++ pkgsrc/devel/cssc/Makefile  Wed May  3 08:38:40 2017
@@ -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/cs
 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"

Index: pkgsrc/devel/gconfmm/Makefile
diff -u pkgsrc/devel/gconfmm/Makefile:1.65 pkgsrc/devel/gconfmm/Makefile:1.66
--- pkgsrc/devel/gconfmm/Makefile:1.65  Sat Jul  9 06:38:06 2016
+++ pkgsrc/devel/gconfmm/Makefile       Wed May  3 08:38:40 2017
@@ -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@localhost
 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

Index: pkgsrc/devel/glibmm/Makefile
diff -u pkgsrc/devel/glibmm/Makefile:1.71 pkgsrc/devel/glibmm/Makefile:1.72
--- pkgsrc/devel/glibmm/Makefile:1.71   Tue Apr 25 18:11:58 2017
+++ pkgsrc/devel/glibmm/Makefile        Wed May  3 08:38:40 2017
@@ -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

Index: pkgsrc/devel/google-glog/Makefile
diff -u pkgsrc/devel/google-glog/Makefile:1.7 pkgsrc/devel/google-glog/Makefile:1.8
--- pkgsrc/devel/google-glog/Makefile:1.7       Wed Apr 19 11:24:37 2017
+++ pkgsrc/devel/google-glog/Makefile   Wed May  3 08:38:40 2017
@@ -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"

Index: pkgsrc/devel/googletest/Makefile
diff -u pkgsrc/devel/googletest/Makefile:1.12 pkgsrc/devel/googletest/Makefile:1.13
--- pkgsrc/devel/googletest/Makefile:1.12       Mon Oct 31 16:43:17 2016
+++ pkgsrc/devel/googletest/Makefile    Wed May  3 08:38:40 2017
@@ -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"

Index: pkgsrc/devel/libglademm/Makefile
diff -u pkgsrc/devel/libglademm/Makefile:1.42 pkgsrc/devel/libglademm/Makefile:1.43
--- pkgsrc/devel/libglademm/Makefile:1.42       Sun Feb 12 06:24:40 2017
+++ pkgsrc/devel/libglademm/Makefile    Wed May  3 08:38:40 2017
@@ -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@localhost
 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

Index: pkgsrc/devel/libgnomemm/Makefile
diff -u pkgsrc/devel/libgnomemm/Makefile:1.60 pkgsrc/devel/libgnomemm/Makefile:1.61
--- pkgsrc/devel/libgnomemm/Makefile:1.60       Sun Feb 12 06:24:40 2017
+++ pkgsrc/devel/libgnomemm/Makefile    Wed May  3 08:38:40 2017
@@ -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@localhost
 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

Index: pkgsrc/devel/libgnomeuimm/Makefile
diff -u pkgsrc/devel/libgnomeuimm/Makefile:1.62 pkgsrc/devel/libgnomeuimm/Makefile:1.63
--- pkgsrc/devel/libgnomeuimm/Makefile:1.62     Sun Feb 12 06:24:40 2017
+++ pkgsrc/devel/libgnomeuimm/Makefile  Wed May  3 08:38:40 2017
@@ -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@localhost
 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

Index: pkgsrc/devel/libsexymm/Makefile
diff -u pkgsrc/devel/libsexymm/Makefile:1.31 pkgsrc/devel/libsexymm/Makefile:1.32
--- pkgsrc/devel/libsexymm/Makefile:1.31        Sun Feb 12 06:24:41 2017
+++ pkgsrc/devel/libsexymm/Makefile     Wed May  3 08:38:40 2017
@@ -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
 

Index: pkgsrc/devel/libsigc++/Makefile
diff -u pkgsrc/devel/libsigc++/Makefile:1.51 pkgsrc/devel/libsigc++/Makefile:1.52
--- pkgsrc/devel/libsigc++/Makefile:1.51        Fri Nov 25 15:39:51 2016
+++ pkgsrc/devel/libsigc++/Makefile     Wed May  3 08:38:41 2017
@@ -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

Index: pkgsrc/devel/libthrift/Makefile
diff -u pkgsrc/devel/libthrift/Makefile:1.58 pkgsrc/devel/libthrift/Makefile:1.59
--- pkgsrc/devel/libthrift/Makefile:1.58        Sun Apr 30 01:21:33 2017
+++ pkgsrc/devel/libthrift/Makefile     Wed May  3 08:38:41 2017
@@ -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-n
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/libview/Makefile
diff -u pkgsrc/devel/libview/Makefile:1.26 pkgsrc/devel/libview/Makefile:1.27
--- pkgsrc/devel/libview/Makefile:1.26  Sun Feb 12 06:24:41 2017
+++ pkgsrc/devel/libview/Makefile       Wed May  3 08:38:41 2017
@@ -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
 

Index: pkgsrc/devel/open-vcdiff/Makefile
diff -u pkgsrc/devel/open-vcdiff/Makefile:1.2 pkgsrc/devel/open-vcdiff/Makefile:1.3
--- pkgsrc/devel/open-vcdiff/Makefile:1.2       Thu May  9 20:05:36 2013
+++ pkgsrc/devel/open-vcdiff/Makefile   Wed May  3 08:38:41 2017
@@ -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"

Index: pkgsrc/devel/pangomm/Makefile
diff -u pkgsrc/devel/pangomm/Makefile:1.45 pkgsrc/devel/pangomm/Makefile:1.46
--- pkgsrc/devel/pangomm/Makefile:1.45  Sun Feb 12 06:24:41 2017
+++ pkgsrc/devel/pangomm/Makefile       Wed May  3 08:38:41 2017
@@ -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"

Index: pkgsrc/devel/woboq_codebrowser/Makefile
diff -u pkgsrc/devel/woboq_codebrowser/Makefile:1.2 pkgsrc/devel/woboq_codebrowser/Makefile:1.3
--- pkgsrc/devel/woboq_codebrowser/Makefile:1.2 Sun Nov 27 08:51:55 2016
+++ pkgsrc/devel/woboq_codebrowser/Makefile     Wed May  3 08:38:41 2017
@@ -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=${
                -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"

Index: pkgsrc/editors/Sigil/Makefile
diff -u pkgsrc/editors/Sigil/Makefile:1.94 pkgsrc/editors/Sigil/Makefile:1.95
--- pkgsrc/editors/Sigil/Makefile:1.94  Sun Apr 30 01:21:34 2017
+++ pkgsrc/editors/Sigil/Makefile       Wed May  3 08:38:41 2017
@@ -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"

Index: pkgsrc/editors/codeblocks/Makefile
diff -u pkgsrc/editors/codeblocks/Makefile:1.5 pkgsrc/editors/codeblocks/Makefile:1.6
--- pkgsrc/editors/codeblocks/Makefile:1.5      Sun Feb 12 06:25:14 2017
+++ pkgsrc/editors/codeblocks/Makefile  Wed May  3 08:38:41 2017
@@ -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}.rele
 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]*:../../archive
 
 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"

Index: pkgsrc/editors/gobby/Makefile
diff -u pkgsrc/editors/gobby/Makefile:1.47 pkgsrc/editors/gobby/Makefile:1.48
--- pkgsrc/editors/gobby/Makefile:1.47  Sun Feb 12 06:25:15 2017
+++ pkgsrc/editors/gobby/Makefile       Wed May  3 08:38:41 2017
@@ -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"

Index: pkgsrc/editors/mlview/Makefile
diff -u pkgsrc/editors/mlview/Makefile:1.78 pkgsrc/editors/mlview/Makefile:1.79
--- pkgsrc/editors/mlview/Makefile:1.78 Sun Feb 12 06:25:16 2017
+++ pkgsrc/editors/mlview/Makefile      Wed May  3 08:38:41 2017
@@ -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 enviro
 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"

Index: pkgsrc/editors/obby/Makefile
diff -u pkgsrc/editors/obby/Makefile:1.12 pkgsrc/editors/obby/Makefile:1.13
--- pkgsrc/editors/obby/Makefile:1.12   Mon Sep 19 13:04:18 2016
+++ pkgsrc/editors/obby/Makefile        Wed May  3 08:38:41 2017
@@ -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
 

Index: pkgsrc/emulators/emulationstation/Makefile
diff -u pkgsrc/emulators/emulationstation/Makefile:1.10 pkgsrc/emulators/emulationstation/Makefile:1.11
--- pkgsrc/emulators/emulationstation/Makefile:1.10     Sun Apr 30 01:21:35 2017
+++ pkgsrc/emulators/emulationstation/Makefile  Wed May  3 08:38:41 2017
@@ -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
 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

Index: pkgsrc/fonts/lcdftypetools/Makefile
diff -u pkgsrc/fonts/lcdftypetools/Makefile:1.4 pkgsrc/fonts/lcdftypetools/Makefile:1.5
--- pkgsrc/fonts/lcdftypetools/Makefile:1.4     Thu Oct 27 11:02:41 2016
+++ pkgsrc/fonts/lcdftypetools/Makefile Wed May  3 08:38:42 2017
@@ -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
 

Index: pkgsrc/games/ccgo/Makefile
diff -u pkgsrc/games/ccgo/Makefile:1.59 pkgsrc/games/ccgo/Makefile:1.60
--- pkgsrc/games/ccgo/Makefile:1.59     Sun Feb 12 06:25:19 2017
+++ pkgsrc/games/ccgo/Makefile  Wed May  3 08:38:42 2017
@@ -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
 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"

Index: pkgsrc/games/pingus/Makefile
diff -u pkgsrc/games/pingus/Makefile:1.23 pkgsrc/games/pingus/Makefile:1.24
--- pkgsrc/games/pingus/Makefile:1.23   Sun Apr 30 01:21:40 2017
+++ pkgsrc/games/pingus/Makefile        Wed May  3 08:38:42 2017
@@ -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} && \

Index: pkgsrc/games/wesnoth/Makefile
diff -u pkgsrc/games/wesnoth/Makefile:1.126 pkgsrc/games/wesnoth/Makefile:1.127
--- pkgsrc/games/wesnoth/Makefile:1.126 Sun Apr 30 01:21:41 2017
+++ pkgsrc/games/wesnoth/Makefile       Wed May  3 08:38:42 2017
@@ -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]*:../../tex
 
 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"

Index: pkgsrc/geography/merkaartor/Makefile
diff -u pkgsrc/geography/merkaartor/Makefile:1.61 pkgsrc/geography/merkaartor/Makefile:1.62
--- pkgsrc/geography/merkaartor/Makefile:1.61   Sun Apr 30 01:21:41 2017
+++ pkgsrc/geography/merkaartor/Makefile        Wed May  3 08:38:42 2017
@@ -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@localhost
 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"

Index: pkgsrc/graphics/blender/Makefile
diff -u pkgsrc/graphics/blender/Makefile:1.131 pkgsrc/graphics/blender/Makefile:1.132
--- pkgsrc/graphics/blender/Makefile:1.131      Sun Apr 30 01:21:42 2017
+++ pkgsrc/graphics/blender/Makefile    Wed May  3 08:38:42 2017
@@ -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=${
 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

Index: pkgsrc/graphics/exiv2-organize/Makefile
diff -u pkgsrc/graphics/exiv2-organize/Makefile:1.31 pkgsrc/graphics/exiv2-organize/Makefile:1.32
--- pkgsrc/graphics/exiv2-organize/Makefile:1.31        Sun Apr 30 01:21:42 2017
+++ pkgsrc/graphics/exiv2-organize/Makefile     Wed May  3 08:38:42 2017
@@ -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"

Index: pkgsrc/graphics/gimmage/Makefile
diff -u pkgsrc/graphics/gimmage/Makefile:1.37 pkgsrc/graphics/gimmage/Makefile:1.38
--- pkgsrc/graphics/gimmage/Makefile:1.37       Sun Apr 30 01:21:42 2017
+++ pkgsrc/graphics/gimmage/Makefile    Wed May  3 08:38:42 2017
@@ -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 progr
 
 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
 

Index: pkgsrc/graphics/goocanvasmm/Makefile
diff -u pkgsrc/graphics/goocanvasmm/Makefile:1.41 pkgsrc/graphics/goocanvasmm/Makefile:1.42
--- pkgsrc/graphics/goocanvasmm/Makefile:1.41   Sun Feb 12 06:25:28 2017
+++ pkgsrc/graphics/goocanvasmm/Makefile        Wed May  3 08:38:42 2017
@@ -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
 

Index: pkgsrc/graphics/inkscape/Makefile
diff -u pkgsrc/graphics/inkscape/Makefile:1.147 pkgsrc/graphics/inkscape/Makefile:1.148
--- pkgsrc/graphics/inkscape/Makefile:1.147     Tue May  2 13:37:31 2017
+++ pkgsrc/graphics/inkscape/Makefile   Wed May  3 08:38:42 2017
@@ -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]*:../
 
 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

Index: pkgsrc/graphics/lepton/Makefile
diff -u pkgsrc/graphics/lepton/Makefile:1.2 pkgsrc/graphics/lepton/Makefile:1.3
--- pkgsrc/graphics/lepton/Makefile:1.2 Tue Jul 19 06:04:30 2016
+++ pkgsrc/graphics/lepton/Makefile     Wed May  3 08:38:42 2017
@@ -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:

Index: pkgsrc/graphics/libgnomecanvasmm/Makefile
diff -u pkgsrc/graphics/libgnomecanvasmm/Makefile:1.42 pkgsrc/graphics/libgnomecanvasmm/Makefile:1.43
--- pkgsrc/graphics/libgnomecanvasmm/Makefile:1.42      Sun Feb 12 06:24:45 2017
+++ pkgsrc/graphics/libgnomecanvasmm/Makefile   Wed May  3 08:38:42 2017
@@ -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@localhost
 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

Index: pkgsrc/graphics/opencv/Makefile
diff -u pkgsrc/graphics/opencv/Makefile:1.70 pkgsrc/graphics/opencv/Makefile:1.71
--- pkgsrc/graphics/opencv/Makefile:1.70        Thu Mar 16 21:59:13 2017
+++ pkgsrc/graphics/opencv/Makefile     Wed May  3 08:38:43 2017
@@ -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 pro
 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/libopen
 
 .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

Index: pkgsrc/graphics/opencv-contrib-face/Makefile
diff -u pkgsrc/graphics/opencv-contrib-face/Makefile:1.9 pkgsrc/graphics/opencv-contrib-face/Makefile:1.10
--- pkgsrc/graphics/opencv-contrib-face/Makefile:1.9    Tue Mar 28 11:29:50 2017
+++ pkgsrc/graphics/opencv-contrib-face/Makefile        Wed May  3 08:38:43 2017
@@ -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/open
 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
 

Index: pkgsrc/graphics/opencv2/Makefile
diff -u pkgsrc/graphics/opencv2/Makefile:1.9 pkgsrc/graphics/opencv2/Makefile:1.10
--- pkgsrc/graphics/opencv2/Makefile:1.9        Sun Feb 12 06:25:30 2017
+++ pkgsrc/graphics/opencv2/Makefile    Wed May  3 08:38:43 2017
@@ -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 pro
 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/libopen
 
 .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
 

Index: pkgsrc/ham/fldigi/Makefile
diff -u pkgsrc/ham/fldigi/Makefile:1.86 pkgsrc/ham/fldigi/Makefile:1.87
--- pkgsrc/ham/fldigi/Makefile:1.86     Sun Apr 30 01:21:44 2017
+++ pkgsrc/ham/fldigi/Makefile  Wed May  3 08:38:43 2017
@@ -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_exec
 
 .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"

Index: pkgsrc/lang/clang/Makefile.common
diff -u pkgsrc/lang/clang/Makefile.common:1.19 pkgsrc/lang/clang/Makefile.common:1.20
--- pkgsrc/lang/clang/Makefile.common:1.19      Fri Mar 17 22:38:17 2017
+++ pkgsrc/lang/clang/Makefile.common   Wed May  3 08:38:43 2017
@@ -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/p
 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
 

Index: pkgsrc/lang/libLLVM/Makefile
diff -u pkgsrc/lang/libLLVM/Makefile:1.22 pkgsrc/lang/libLLVM/Makefile:1.23
--- pkgsrc/lang/libLLVM/Makefile:1.22   Mon May  1 00:43:07 2017
+++ pkgsrc/lang/libLLVM/Makefile        Wed May  3 08:38:43 2017
@@ -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_LIBNAM
 
 .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

Index: pkgsrc/lang/llvm/Makefile
diff -u pkgsrc/lang/llvm/Makefile:1.18 pkgsrc/lang/llvm/Makefile:1.19
--- pkgsrc/lang/llvm/Makefile:1.18      Mon May  1 00:41:29 2017
+++ pkgsrc/lang/llvm/Makefile   Wed May  3 08:38:43 2017
@@ -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

Index: pkgsrc/misc/gelemental/Makefile
diff -u pkgsrc/misc/gelemental/Makefile:1.32 pkgsrc/misc/gelemental/Makefile:1.33
--- pkgsrc/misc/gelemental/Makefile:1.32        Sun Feb 12 06:25:44 2017
+++ pkgsrc/misc/gelemental/Makefile     Wed May  3 08:38:43 2017
@@ -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
 

Index: pkgsrc/misc/libreoffice/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.111 pkgsrc/misc/libreoffice/Makefile:1.112
--- pkgsrc/misc/libreoffice/Makefile:1.111      Tue May  2 13:37:31 2017
+++ pkgsrc/misc/libreoffice/Makefile    Wed May  3 08:38:43 2017
@@ -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]*:.
 # and this option will hopefully become unneeded in the future
 WRAPPER_SKIP_TRANSFORM=yes
 
-USE_LANGUAGES+=                c c++
-
 LDFLAGS+=              -lboost_system
 
 USE_LIBTOOL=           yes

Index: pkgsrc/misc/rocs/Makefile
diff -u pkgsrc/misc/rocs/Makefile:1.44 pkgsrc/misc/rocs/Makefile:1.45
--- pkgsrc/misc/rocs/Makefile:1.44      Sun Apr 30 01:21:53 2017
+++ pkgsrc/misc/rocs/Makefile   Wed May  3 08:38:43 2017
@@ -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"
 

Index: pkgsrc/multimedia/gnash/Makefile
diff -u pkgsrc/multimedia/gnash/Makefile:1.105 pkgsrc/multimedia/gnash/Makefile:1.106
--- pkgsrc/multimedia/gnash/Makefile:1.105      Sun Apr 30 01:21:54 2017
+++ pkgsrc/multimedia/gnash/Makefile    Wed May  3 08:38:43 2017
@@ -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-in
 .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"

Index: pkgsrc/multimedia/libvpx/Makefile
diff -u pkgsrc/multimedia/libvpx/Makefile:1.67 pkgsrc/multimedia/libvpx/Makefile:1.68
--- pkgsrc/multimedia/libvpx/Makefile:1.67      Mon Jan 16 12:12:59 2017
+++ pkgsrc/multimedia/libvpx/Makefile   Wed May  3 08:38:43 2017
@@ -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.
 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-gc
 .  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

Index: pkgsrc/multimedia/subtitleeditor/Makefile
diff -u pkgsrc/multimedia/subtitleeditor/Makefile:1.36 pkgsrc/multimedia/subtitleeditor/Makefile:1.37
--- pkgsrc/multimedia/subtitleeditor/Makefile:1.36      Sun Feb 12 06:25:48 2017
+++ pkgsrc/multimedia/subtitleeditor/Makefile   Wed May  3 08:38:43 2017
@@ -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"

Index: pkgsrc/net/cclive/Makefile
diff -u pkgsrc/net/cclive/Makefile:1.14 pkgsrc/net/cclive/Makefile:1.15
--- pkgsrc/net/cclive/Makefile:1.14     Sun Apr 30 01:21:56 2017
+++ pkgsrc/net/cclive/Makefile  Wed May  3 08:38:44 2017
@@ -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"

Index: pkgsrc/net/ekiga/Makefile
diff -u pkgsrc/net/ekiga/Makefile:1.75 pkgsrc/net/ekiga/Makefile:1.76
--- pkgsrc/net/ekiga/Makefile:1.75      Sat Apr 22 21:03:48 2017
+++ pkgsrc/net/ekiga/Makefile   Wed May  3 08:38:44 2017
@@ -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"

Index: pkgsrc/net/libtorrent/Makefile
diff -u pkgsrc/net/libtorrent/Makefile:1.56 pkgsrc/net/libtorrent/Makefile:1.57
--- pkgsrc/net/libtorrent/Makefile:1.56 Mon Jun 27 19:16:02 2016
+++ pkgsrc/net/libtorrent/Makefile      Wed May  3 08:38:44 2017
@@ -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/rtor
 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
 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"

Index: pkgsrc/net/net6/Makefile
diff -u pkgsrc/net/net6/Makefile:1.16 pkgsrc/net/net6/Makefile:1.17
--- pkgsrc/net/net6/Makefile:1.16       Mon Sep 26 01:08:42 2016
+++ pkgsrc/net/net6/Makefile    Wed May  3 08:38:44 2017
@@ -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
 

Index: pkgsrc/net/powerdns-recursor/Makefile
diff -u pkgsrc/net/powerdns-recursor/Makefile:1.21 pkgsrc/net/powerdns-recursor/Makefile:1.22
--- pkgsrc/net/powerdns-recursor/Makefile:1.21  Fri Mar 31 19:41:13 2017
+++ pkgsrc/net/powerdns-recursor/Makefile       Wed May  3 08:38:44 2017
@@ -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 na
 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-dis
 
 .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"

Index: pkgsrc/net/rtorrent/Makefile
diff -u pkgsrc/net/rtorrent/Makefile:1.65 pkgsrc/net/rtorrent/Makefile:1.66
--- pkgsrc/net/rtorrent/Makefile:1.65   Sun Apr 30 01:21:57 2017
+++ pkgsrc/net/rtorrent/Makefile        Wed May  3 08:38:44 2017
@@ -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/rtor
 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-re
 CXXFLAGS+=     -march=i486
 .endif
 
-.if !empty(PKGSRC_COMPILER:Mclang)
-CXXFLAGS+=     -std=c++11
-.endif
-
 INSTALLATION_DIRS=     share/examples/rtorrent
 
 post-install:

Index: pkgsrc/net/synergy/Makefile
diff -u pkgsrc/net/synergy/Makefile:1.41 pkgsrc/net/synergy/Makefile:1.42
--- pkgsrc/net/synergy/Makefile:1.41    Sun Apr 30 01:21:58 2017
+++ pkgsrc/net/synergy/Makefile Wed May  3 08:38:44 2017
@@ -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

Index: pkgsrc/net/zeromq/Makefile
diff -u pkgsrc/net/zeromq/Makefile:1.24 pkgsrc/net/zeromq/Makefile:1.25
--- pkgsrc/net/zeromq/Makefile:1.24     Thu Feb  2 10:09:53 2017
+++ pkgsrc/net/zeromq/Makefile  Wed May  3 08:38:44 2017
@@ -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"

Index: pkgsrc/print/xetex/Makefile
diff -u pkgsrc/print/xetex/Makefile:1.60 pkgsrc/print/xetex/Makefile:1.61
--- pkgsrc/print/xetex/Makefile:1.60    Tue May  2 13:37:33 2017
+++ pkgsrc/print/xetex/Makefile Wed May  3 08:38:44 2017
@@ -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 \

Index: pkgsrc/security/ecap_clamav_adapter/Makefile
diff -u pkgsrc/security/ecap_clamav_adapter/Makefile:1.2 pkgsrc/security/ecap_clamav_adapter/Makefile:1.3
--- pkgsrc/security/ecap_clamav_adapter/Makefile:1.2    Thu Jun 23 15:17:28 2016
+++ pkgsrc/security/ecap_clamav_adapter/Makefile        Wed May  3 08:38:44 2017
@@ -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"

Index: pkgsrc/sysutils/gcdmaster/Makefile
diff -u pkgsrc/sysutils/gcdmaster/Makefile:1.82 pkgsrc/sysutils/gcdmaster/Makefile:1.83
--- pkgsrc/sysutils/gcdmaster/Makefile:1.82     Sun Feb 12 06:25:59 2017
+++ pkgsrc/sysutils/gcdmaster/Makefile  Wed May  3 08:38:44 2017
@@ -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"

Index: pkgsrc/sysutils/gnome-system-monitor/Makefile
diff -u pkgsrc/sysutils/gnome-system-monitor/Makefile:1.49 pkgsrc/sysutils/gnome-system-monitor/Makefile:1.50
--- pkgsrc/sysutils/gnome-system-monitor/Makefile:1.49  Sun Feb 12 06:26:00 2017
+++ pkgsrc/sysutils/gnome-system-monitor/Makefile       Wed May  3 08:38:44 2017
@@ -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]*
 

Index: pkgsrc/sysutils/gnome-vfsmm/Makefile
diff -u pkgsrc/sysutils/gnome-vfsmm/Makefile:1.55 pkgsrc/sysutils/gnome-vfsmm/Makefile:1.56
--- pkgsrc/sysutils/gnome-vfsmm/Makefile:1.55   Sun Feb 12 06:24:49 2017
+++ pkgsrc/sysutils/gnome-vfsmm/Makefile        Wed May  3 08:38:45 2017
@@ -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

Index: pkgsrc/sysutils/mate-system-monitor/Makefile
diff -u pkgsrc/sysutils/mate-system-monitor/Makefile:1.4 pkgsrc/sysutils/mate-system-monitor/Makefile:1.5
--- pkgsrc/sysutils/mate-system-monitor/Makefile:1.4    Sun Feb 12 06:26:01 2017
+++ pkgsrc/sysutils/mate-system-monitor/Makefile        Wed May  3 08:38:45 2017
@@ -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"
 

Index: pkgsrc/sysutils/open-vm-tools/Makefile
diff -u pkgsrc/sysutils/open-vm-tools/Makefile:1.70 pkgsrc/sysutils/open-vm-tools/Makefile:1.71
--- pkgsrc/sysutils/open-vm-tools/Makefile:1.70 Sat Apr 22 21:03:58 2017
+++ pkgsrc/sysutils/open-vm-tools/Makefile      Wed May  3 08:38:45 2017
@@ -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
 

Index: pkgsrc/sysutils/strigi/Makefile
diff -u pkgsrc/sysutils/strigi/Makefile:1.57 pkgsrc/sysutils/strigi/Makefile:1.58
--- pkgsrc/sysutils/strigi/Makefile:1.57        Mon May  1 12:54:17 2017
+++ pkgsrc/sysutils/strigi/Makefile     Wed May  3 08:38:45 2017
@@ -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

Index: pkgsrc/textproc/FlightCrew/Makefile
diff -u pkgsrc/textproc/FlightCrew/Makefile:1.40 pkgsrc/textproc/FlightCrew/Makefile:1.41
--- pkgsrc/textproc/FlightCrew/Makefile:1.40    Sun Apr 30 01:22:01 2017
+++ pkgsrc/textproc/FlightCrew/Makefile Wed May  3 08:38:45 2017
@@ -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/C
 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
 

Index: pkgsrc/textproc/php-intl/Makefile
diff -u pkgsrc/textproc/php-intl/Makefile:1.28 pkgsrc/textproc/php-intl/Makefile:1.29
--- pkgsrc/textproc/php-intl/Makefile:1.28      Sun Apr 30 22:49:54 2017
+++ pkgsrc/textproc/php-intl/Makefile   Wed May  3 08:38:45 2017
@@ -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}
 

Index: pkgsrc/www/cppcms/Makefile
diff -u pkgsrc/www/cppcms/Makefile:1.15 pkgsrc/www/cppcms/Makefile:1.16
--- pkgsrc/www/cppcms/Makefile:1.15     Sat Apr 22 21:04:00 2017
+++ pkgsrc/www/cppcms/Makefile  Wed May  3 08:38:45 2017
@@ -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

Index: pkgsrc/www/libecap/Makefile
diff -u pkgsrc/www/libecap/Makefile:1.3 pkgsrc/www/libecap/Makefile:1.4
--- pkgsrc/www/libecap/Makefile:1.3     Thu Jun 23 15:05:38 2016
+++ pkgsrc/www/libecap/Makefile Wed May  3 08:38:45 2017
@@ -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"

Index: pkgsrc/www/squid3/options.mk
diff -u pkgsrc/www/squid3/options.mk:1.22 pkgsrc/www/squid3/options.mk:1.23
--- pkgsrc/www/squid3/options.mk:1.22   Fri Feb 10 08:41:25 2017
+++ pkgsrc/www/squid3/options.mk        Wed May  3 08:38:45 2017
@@ -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

Index: pkgsrc/www/webkit-gtk/Makefile
diff -u pkgsrc/www/webkit-gtk/Makefile:1.125 pkgsrc/www/webkit-gtk/Makefile:1.126
--- pkgsrc/www/webkit-gtk/Makefile:1.125        Sat Apr 22 21:03:18 2017
+++ pkgsrc/www/webkit-gtk/Makefile      Wed May  3 08:38:45 2017
@@ -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*)

Index: pkgsrc/www/webkit24-gtk/Makefile.common
diff -u pkgsrc/www/webkit24-gtk/Makefile.common:1.8 pkgsrc/www/webkit24-gtk/Makefile.common:1.9
--- pkgsrc/www/webkit24-gtk/Makefile.common:1.8 Sun Jan  1 14:44:06 2017
+++ pkgsrc/www/webkit24-gtk/Makefile.common     Wed May  3 08:38:45 2017
@@ -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)

Index: pkgsrc/www/yahttp/Makefile
diff -u pkgsrc/www/yahttp/Makefile:1.7 pkgsrc/www/yahttp/Makefile:1.8
--- pkgsrc/www/yahttp/Makefile:1.7      Sun Apr 30 01:22:03 2017
+++ pkgsrc/www/yahttp/Makefile  Wed May  3 08:38:45 2017
@@ -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

Index: pkgsrc/x11/gtkmm/Makefile
diff -u pkgsrc/x11/gtkmm/Makefile:1.109 pkgsrc/x11/gtkmm/Makefile:1.110
--- pkgsrc/x11/gtkmm/Makefile:1.109     Sun Feb 12 06:24:54 2017
+++ pkgsrc/x11/gtkmm/Makefile   Wed May  3 08:38:46 2017
@@ -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

Index: pkgsrc/x11/gtkmm-utils/Makefile
diff -u pkgsrc/x11/gtkmm-utils/Makefile:1.28 pkgsrc/x11/gtkmm-utils/Makefile:1.29
--- pkgsrc/x11/gtkmm-utils/Makefile:1.28        Sun Feb 12 06:24:54 2017
+++ pkgsrc/x11/gtkmm-utils/Makefile     Wed May  3 08:38:46 2017
@@ -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
 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

Index: pkgsrc/x11/gtkmm3/Makefile
diff -u pkgsrc/x11/gtkmm3/Makefile:1.21 pkgsrc/x11/gtkmm3/Makefile:1.22
--- pkgsrc/x11/gtkmm3/Makefile:1.21     Sun Feb 12 06:24:54 2017
+++ pkgsrc/x11/gtkmm3/Makefile  Wed May  3 08:38:46 2017
@@ -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

Index: pkgsrc/x11/gtksourceviewmm/Makefile
diff -u pkgsrc/x11/gtksourceviewmm/Makefile:1.14 pkgsrc/x11/gtksourceviewmm/Makefile:1.15
--- pkgsrc/x11/gtksourceviewmm/Makefile:1.14    Sun Feb 12 06:24:54 2017
+++ pkgsrc/x11/gtksourceviewmm/Makefile Wed May  3 08:38:46 2017
@@ -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

Index: pkgsrc/x11/qt4-libs/Makefile
diff -u pkgsrc/x11/qt4-libs/Makefile:1.115 pkgsrc/x11/qt4-libs/Makefile:1.116
--- pkgsrc/x11/qt4-libs/Makefile:1.115  Sun Feb 12 06:26:14 2017
+++ pkgsrc/x11/qt4-libs/Makefile        Wed May  3 08:38:46 2017
@@ -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

Index: pkgsrc/x11/qt5-qtbase/Makefile.common
diff -u pkgsrc/x11/qt5-qtbase/Makefile.common:1.20 pkgsrc/x11/qt5-qtbase/Makefile.common:1.21
--- pkgsrc/x11/qt5-qtbase/Makefile.common:1.20  Wed Apr 26 06:12:25 2017
+++ pkgsrc/x11/qt5-qtbase/Makefile.common       Wed May  3 08:38:46 2017
@@ -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
 



Home | Main Index | Thread Index | Old Index