Convert CXXFLAGS setting C++ standard to USE_LANGUAGES.

21 files changed, 47 insertions, 91 deletions

diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile
index 908a271dcf2..a3a69b00b6a 100644
--- a/devel/aegis/Makefile
+++ b/devel/aegis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2017/04/30 01:21:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.38 2017/05/03 08:38:39 jperkin Exp $
 #
 
 DISTNAME=	aegis-4.24.2
@@ -14,16 +14,10 @@ LICENSE=	gnu-gpl-v3
 MAKE_JOBS_SAFE=		no
 
 GNU_CONFIGURE=		yes
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c gnu++0x
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		groff gsoelim msgfmt perl:run yacc patch:run
 
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(PKGSRC_COMPILER:Mgcc)
-CXXFLAGS+=	-std=gnu++0x
-.endif
-
 AEGIS_USER_UID?=	3
 AEGIS_USER_GID?=	3
 
diff --git a/devel/atkmm/Makefile b/devel/atkmm/Makefile
index 570534dc1d3..808b1c30bad 100644
--- a/devel/atkmm/Makefile
+++ b/devel/atkmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/04/26 13:16:11 prlw1 Exp $
+# $NetBSD: Makefile,v 1.21 2017/05/03 08:38:39 jperkin Exp $
 
 DISTNAME=	atkmm-2.24.2
 PKGREVISION=	4
@@ -14,14 +14,12 @@ LICENSE=	gnu-lgpl-v2.1 AND gnu-gpl-v2
 
 CONFLICTS+=	gtkmm<2.22.0
 
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c c++11
 USE_LIBTOOL=		yes
 USE_TOOLS+=		bsdtar gmake perl pkg-config
 GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE+=	atk/atkmm.pc.in
 
-CXXFLAGS+=		-std=c++11
-
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/glibmm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/boost-jam/bjam.mk b/devel/boost-jam/bjam.mk
index cce60be61d8..af04537d6c8 100644
--- a/devel/boost-jam/bjam.mk
+++ b/devel/boost-jam/bjam.mk
@@ -1,21 +1,20 @@
-# $NetBSD: bjam.mk,v 1.17 2016/02/28 23:54:11 minskim Exp $
+# $NetBSD: bjam.mk,v 1.18 2017/05/03 08:38:40 jperkin Exp $
 
 .include "../../devel/boost-jam/buildlink3.mk"
-
 .include "../../devel/boost-build/toolset.mk"
-.include "../../mk/bsd.prefs.mk"
 
 BJAM=			${BUILDLINK_PREFIX.boost-jam}/bin/bjam
 
-.if !empty(MAKE_JOBS)
-BJAM_ARGS+=		-j${MAKE_JOBS}
-.endif
+BJAM_ARGS+=		${MAKE_JOBS:D-j${MAKE_JOBS}}
 BJAM_ARGS+=		--builddir=${WRKSRC}/build
 BJAM_ARGS+=		--layout=system
 BJAM_ARGS+=		--toolset=${BOOST_TOOLSET}
 BJAM_ARGS+=		--disable-long-double
 BJAM_ARGS+=		${BJAM_BUILD}
 
+# XXX: we can't use USE_LANGUAGES here as it needs to be set before
+# including compiler.mk.  Perhaps we should just enforce c++11?
+#
 .include "../../mk/compiler.mk"
 
 .if !empty(PKGSRC_COMPILER:Mgcc)
@@ -34,7 +33,7 @@ CXXFLAGS+=		-std=c++14
 .if !empty(PKGSRC_COMPILER:Mclang)
 BJAM_ARGS+=		cxxflags=-std=c++11
 CXXFLAGS+=		-std=c++11
-.  if !empty(OPSYS:MDarwin)
+.  if ${OPSYS} == "Darwin"
 BJAM_ARGS+=		cxxflags=-stdlib=libc++ linkflags=-stdlib=libc++
 .  endif
 .endif
diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 81455edcbc5..467ad7d354b 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2017/04/22 21:03:30 adam Exp $
+# $NetBSD: Makefile,v 1.46 2017/05/03 08:38:40 jperkin Exp $
 
 DISTNAME=	cppcheck-1.76.1
 PKGREVISION=	6
@@ -15,7 +15,7 @@ BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c c++0x
 USE_TOOLS+=		gmake
 
 BUILD_TARGET=		all man
@@ -33,9 +33,6 @@ MAKE_FLAGS+=		INCLUDE_FOR_TEST="-Ilib -Icli -Iexternals/simplecpp"
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.tinyxml2}/include
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.tinyxml2}/lib -L${BUILDLINK_PREFIX.tinyxml2}/lib -ltinyxml2
 
-# needs C++0x
-CXXFLAGS+=		-std=c++0x
-
 .include "../../mk/compiler.mk"
 .if !empty(CC_VERSION:Mgcc-4.[0-5]*) || !empty(CC_VERSION:Mgcc-3.*)
 CXXFLAGS+= -include lib/cxx11emu.h
diff --git a/devel/cre2/Makefile b/devel/cre2/Makefile
index c6a242a01bc..7abef02ee5d 100644
--- a/devel/cre2/Makefile
+++ b/devel/cre2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/12/25 21:43:56 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2017/05/03 08:38:40 jperkin Exp $
 
 DISTNAME=	cre2
 PKGNAME=	cre2-0.1b6
@@ -16,8 +16,6 @@ CONFIGURE_ARGS+=	--enable-maintainer-mode
 USE_LIBTOOL=	yes
 USE_LANGUAGES+=	c c++
 USE_TOOLS+=	autoconf autoreconf automake gmake makeinfo
-# to avoid configure: error: test for RE2 header failed
-CXXFLAGS+=	-std=c++11
 
 INFO_FILES=	yes
 
diff --git a/devel/creduce/Makefile b/devel/creduce/Makefile
index 08a4700d54e..d70973155b7 100644
--- a/devel/creduce/Makefile
+++ b/devel/creduce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/11/18 18:20:05 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2017/05/03 08:38:40 jperkin Exp $
 
 DISTNAME=	creduce-2.5.0
 PKGREVISION=	1
@@ -13,7 +13,7 @@ LICENSE=	2-clause-bsd
 GNU_CONFIGURE=	yes
 
 USE_TOOLS+=	flex perl:run gmake
-USE_LANGUAGES=	c c++
+USE_LANGUAGES=	c c++11
 
 DEPENDS+=	p5-Exporter-Lite-[0-9]*:../../devel/p5-Exporter-Lite
 DEPENDS+=	p5-File-Which-[0-9]*:../../devel/p5-File-Which
@@ -24,9 +24,5 @@ DEPENDS+=	p5-Regexp-Common-[0-9]*:../../textproc/p5-Regexp-Common
 
 TEST_TARGET=	check
 
-.include "../../mk/bsd.prefs.mk"
-
-CXXFLAGS+=	-std=c++11
-
 .include "../../lang/clang/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cssc/Makefile b/devel/cssc/Makefile
index 6e72a0b6a15..b95c5493ad7 100644
--- a/devel/cssc/Makefile
+++ b/devel/cssc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2015/03/14 14:24:48 tnn Exp $
+# $NetBSD: Makefile,v 1.35 2017/05/03 08:38:40 jperkin Exp $
 #
 
 DISTNAME=	CSSC-1.4.0
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.gnu.org/software/cssc/
 COMMENT=	GNU workalike for the source code control system SCCS
 LICENSE=	gnu-gpl-v3
 
-USE_LANGUAGES=	c c++
+USE_LANGUAGES=	c c++11
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--enable-binary
 CONFIGURE_ENV+=	CONFIG_DIFF_COMMAND=${TOOLS_DIFF:Q}
@@ -21,10 +21,5 @@ TEST_TARGET=	check
 TEXINFO_REQD=	4.0
 INFO_FILES=	yes
 
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-CXXFLAGS+=	-std=c++11
-.endif
-
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index 5b2161e59f2..bd3789ee4b1 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2016/07/09 06:38:06 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2017/05/03 08:38:40 jperkin Exp $
 
 DISTNAME=	gconfmm-2.28.3
 PKGREVISION=	18
@@ -10,8 +10,7 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://gtkmm.sourceforge.net/
 COMMENT=	C++ bindings for gconf
 
-USE_LANGUAGES=		c c++
-CXXFLAGS+=		-std=c++11
+USE_LANGUAGES=		c c++11
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config perl
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 07e8f2e4ba7..ef069610c0f 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2017/04/25 18:11:58 adam Exp $
+# $NetBSD: Makefile,v 1.72 2017/05/03 08:38:40 jperkin Exp $
 
 DISTNAME=	glibmm-2.50.1
 CATEGORIES=	devel gnome
@@ -11,8 +11,7 @@ COMMENT=	C++ bindings for glib
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
 
 GCC_REQD+=		4.8
-USE_LANGUAGES=		c c++
-CXXFLAGS+=		-std=c++11
+USE_LANGUAGES=		c c++11
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config perl:run
diff --git a/devel/google-glog/Makefile b/devel/google-glog/Makefile
index 0129931fa0d..7fd05df85fc 100644
--- a/devel/google-glog/Makefile
+++ b/devel/google-glog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/04/19 11:24:37 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2017/05/03 08:38:40 jperkin Exp $
 
 DISTNAME=	glog-0.3.4
 PKGNAME=	google-${DISTNAME}
@@ -15,7 +15,7 @@ LICENSE=	modified-bsd
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
-USE_LANGUAGES=	c c++
+USE_LANGUAGES=	c c++11
 
 PKGCONFIG_OVERRIDE+=	libglog.pc.in
 
@@ -25,10 +25,5 @@ PKGCONFIG_OVERRIDE+=	libglog.pc.in
 LIBS+=		-lexecinfo
 .endif
 
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-CXXFLAGS+=	-std=c++11
-.endif
-
 .include "../../devel/googletest/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/googletest/Makefile b/devel/googletest/Makefile
index 2648fe2902f..6b50419e194 100644
--- a/devel/googletest/Makefile
+++ b/devel/googletest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/10/31 16:43:17 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2017/05/03 08:38:40 jperkin Exp $
 
 DISTNAME=	googletest-1.8.0
 CATEGORIES=	devel
@@ -13,7 +13,6 @@ LICENSE=	modified-bsd
 INSTALLATION_DIRS=	bin
 
 USE_CMAKE=	yes
-USE_LANGUAGES=	c++ c
-CXXFLAGS+=	-std=c++11
+USE_LANGUAGES=	c c++11
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index dd420c37698..12df4891608 100644
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2017/02/12 06:24:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.43 2017/05/03 08:38:40 jperkin Exp $
 
 DISTNAME=	libglademm-2.6.7
 PKGREVISION=	25
@@ -10,8 +10,7 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.gtkmm.org/
 COMMENT=	C++ bindings for libglade
 
-USE_LANGUAGES=		c c++
-CXXFLAGS+=		-std=c++11
+USE_LANGUAGES=		c c++11
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gm4 gmake pkg-config
diff --git a/devel/libgnomemm/Makefile b/devel/libgnomemm/Makefile
index 9af3177df0a..4c5847fda3c 100644
--- a/devel/libgnomemm/Makefile
+++ b/devel/libgnomemm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2017/02/12 06:24:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.61 2017/05/03 08:38:40 jperkin Exp $
 
 DISTNAME=	libgnomemm-2.30.0
 PKGREVISION=	27
@@ -10,8 +10,7 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://gtkmm.sourceforge.net/
 COMMENT=	C++ bindings for libgnome
 
-USE_LANGUAGES=		c c++
-CXXFLAGS+=		-std=c++11
+USE_LANGUAGES=		c c++11
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gm4 gmake pkg-config
diff --git a/devel/libgnomeuimm/Makefile b/devel/libgnomeuimm/Makefile
index e6249068029..f13566068d2 100644
--- a/devel/libgnomeuimm/Makefile
+++ b/devel/libgnomeuimm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2017/02/12 06:24:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.63 2017/05/03 08:38:40 jperkin Exp $
 
 DISTNAME=	libgnomeuimm-2.28.0
 PKGREVISION=	35
@@ -10,8 +10,7 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://gtkmm.sourceforge.net/
 COMMENT=	C++ bindings for libgnomeui
 
-USE_LANGUAGES=		c c++
-CXXFLAGS+=		-std=c++11
+USE_LANGUAGES=		c c++11
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gm4 gmake pkg-config
diff --git a/devel/libsexymm/Makefile b/devel/libsexymm/Makefile
index 596004e0539..e15d93b1c7b 100644
--- a/devel/libsexymm/Makefile
+++ b/devel/libsexymm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2017/02/12 06:24:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.32 2017/05/03 08:38:40 jperkin Exp $
 #
 
 DISTNAME=	libsexymm-0.1.9
@@ -13,8 +13,7 @@ COMMENT=	C++ bindings for libsexy
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config gmake
-USE_LANGUAGES=	c c++
-CXXFLAGS+=	-std=c++11
+USE_LANGUAGES=	c c++11
 
 PKGCONFIG_OVERRIDE+=	libsexy/libsexymm.pc.in
 
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index 3d8e4491f0f..5415a21bf0f 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2016/11/25 15:39:51 prlw1 Exp $
+# $NetBSD: Makefile,v 1.52 2017/05/03 08:38:41 jperkin Exp $
 
 DISTNAME=	libsigc++-2.10.0
 CATEGORIES=	devel gnome
@@ -10,7 +10,7 @@ HOMEPAGE=	http://libsigc.sourceforge.net/
 COMMENT=	Type-safe callback system for C++ programs
 LICENSE=	gnu-lgpl-v2.1
 
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c c++11
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gm4 gmake perl:build
 GNU_CONFIGURE=		yes
@@ -18,7 +18,6 @@ PKGCONFIG_OVERRIDE=	sigc++.pc.in
 
 CONFLICTS+=		libsigc++2-[0-9]*
 GCC_REQD+=		4.8
-CXXFLAGS+=		-std=c++11
 
 # use something that can extract long filenames in GNU format on NetBSD 1.6.x
 EXTRACT_USING=		bsdtar
diff --git a/devel/libthrift/Makefile b/devel/libthrift/Makefile
index 9aef0fadd2d..45607559ab7 100644
--- a/devel/libthrift/Makefile
+++ b/devel/libthrift/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2017/04/30 01:21:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.59 2017/05/03 08:38:41 jperkin Exp $
 
 DISTNAME=	thrift-${THRIFT_VERSION}
 PKGNAME=	libthrift-${THRIFT_VERSION}
@@ -15,7 +15,7 @@ LICENSE=	apache-2.0
 # No rule to make target 'gen-cpp/Service.cpp', needed by 'Service.lo'.  Stop.
 MAKE_JOBS_SAFE=		no
 
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c c++11
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config yacc
@@ -32,7 +32,7 @@ pre-build:
 .include "../../mk/compiler.mk"
 
 .if !empty(PKGSRC_COMPILER:Mclang)
-CXXFLAGS+=	-std=c++11 -Wno-error=c++11-narrowing
+CXXFLAGS+=	-Wno-error=c++11-narrowing
 .endif
 
 .include "options.mk"
@@ -41,5 +41,4 @@ CXXFLAGS+=	-std=c++11 -Wno-error=c++11-narrowing
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libview/Makefile b/devel/libview/Makefile
index 2c709ea3e63..805bb15d561 100644
--- a/devel/libview/Makefile
+++ b/devel/libview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2017/02/12 06:24:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.27 2017/05/03 08:38:41 jperkin Exp $
 #
 
 DISTNAME=	libview-0.6.4
@@ -14,8 +14,7 @@ LICENSE=	modified-bsd
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
-USE_LANGUAGES=	c c++
-CXXFLAGS+=	-std=c++11
+USE_LANGUAGES=	c c++11
 
 PKGCONFIG_OVERRIDE+=	libview.pc.in
 
diff --git a/devel/open-vcdiff/Makefile b/devel/open-vcdiff/Makefile
index 07d113bb7c2..ae274bca07a 100644
--- a/devel/open-vcdiff/Makefile
+++ b/devel/open-vcdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/09 20:05:36 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2017/05/03 08:38:41 jperkin Exp $
 #
 
 DISTNAME=	open-vcdiff-0.8.3
@@ -13,13 +13,13 @@ LICENSE=	apache-2.0
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
-USE_LANGUAGES+=	c c++
+USE_LANGUAGES+=	c c++11
 
 AUTO_MKDIRS=	yes
 
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
-CXXFLAGS+=	-std=c++11 -Wno-error=c++11-narrowing
+CXXFLAGS+=	-Wno-error=c++11-narrowing
 .endif
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/pangomm/Makefile b/devel/pangomm/Makefile
index 6b5d38cf6f1..a22804414cd 100644
--- a/devel/pangomm/Makefile
+++ b/devel/pangomm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2017/02/12 06:24:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.46 2017/05/03 08:38:41 jperkin Exp $
 
 DISTNAME=	pangomm-2.40.1
 PKGREVISION=	2
@@ -13,15 +13,13 @@ LICENSE=	gnu-lgpl-v2.1
 
 CONFLICTS+=		gtkmm<=2.13.5
 
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c c++11
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config perl:run
 GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE+=	pango/pangomm.pc.in
 
-CXXFLAGS+=		-std=c++11
-
 BUILDLINK_API_DEPENDS.mm-common+=      mm-common>=0.9.10
 .include "../../devel/mm-common/buildlink3.mk"
 .include "../../devel/glibmm/buildlink3.mk"
diff --git a/devel/woboq_codebrowser/Makefile b/devel/woboq_codebrowser/Makefile
index 2596a820e30..1db469f0e50 100644
--- a/devel/woboq_codebrowser/Makefile
+++ b/devel/woboq_codebrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/11/27 08:51:55 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2017/05/03 08:38:41 jperkin Exp $
 
 DISTNAME=	woboq_codebrowser-2.0.1
 CATEGORIES=	devel lang
@@ -16,7 +16,7 @@ CMAKE_ARGS+=	-DLLVM_CONFIG_EXECUTABLE=${LLVM_CONFIG_PATH:Q} \
 		-DCMAKE_BUILD_TYPE=Release
 
 USE_TOOLS+=	pax
-USE_LANGUAGES=	c c++
+USE_LANGUAGES=	c c++11
 
 INSTALLATION_DIRS+=	bin share/woboq_codebrowser
 
@@ -25,9 +25,5 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/indexgenerator/codebrowser_indexgenerator ${DESTDIR}${PREFIX}/bin
 	cd ${WRKSRC}/data && pax -rwpp . ${DESTDIR}${PREFIX}/share/woboq_codebrowser
 
-.include "../../mk/bsd.prefs.mk"
-
-CXXFLAGS+=	-std=c++11
-
 .include "../../lang/clang/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"