Convert CXXFLAGS setting C++ standard to USE_LANGUAGES.

5 files changed, 10 insertions, 28 deletions

diff --git a/editors/Sigil/Makefile b/editors/Sigil/Makefile
index 2eac6b554f8..a83961d456c 100644
--- a/editors/Sigil/Makefile
+++ b/editors/Sigil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2017/04/30 01:21:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.95 2017/05/03 08:38:41 jperkin Exp $
 
 DISTNAME=	Sigil-0.9.8
 PKGREVISION=	2
@@ -24,7 +24,7 @@ ALL_ENV+=	Qt5_DIR=${Qt5_DIR}
 BUILDLINK_TRANSFORM+=	opt:-O2:-O0
 #MAKE_ENV+=	CXX_FLAGS="-g"
 
-USE_LANGUAGES=	c c++
+USE_LANGUAGES=	c c++0x
 USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config
 
@@ -40,13 +40,6 @@ BUILDLINK_TRANSFORM+=	l:zlib:z
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 REPLACE_PYTHON+=	src/Sigil/Resource_Files/plugin_launchers/python/*.py
 
-.include "../../mk/compiler.mk"
-# GCC 4.4 and above needs this
-.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*)
-_WRAP_EXTRA_ARGS.CXX+=	-std=c++0x
-CWRAPPERS_APPEND.cxx+=	-std=c++0x
-.endif
-
 .include "../../textproc/xerces-c/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
diff --git a/editors/codeblocks/Makefile b/editors/codeblocks/Makefile
index d303e8cde68..7a99725c6d0 100644
--- a/editors/codeblocks/Makefile
+++ b/editors/codeblocks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/02/12 06:25:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2017/05/03 08:38:41 jperkin Exp $
 #
 
 DISTNAME=	codeblocks_16.01
@@ -16,7 +16,7 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}.release
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config gmake
-USE_LANGUAGES=	c c++
+USE_LANGUAGES=	c c++11
 
 CONFIGURE_ARGS+=	--with-contrib-plugins=AutoVersioning,BrowseTracker,byogames,cbkoders,codesnippets,codestat,dragscroll,envvars,help,keybinder,libfinder,profiler,regex,exporter,symtab
 # wxsmith makes error in build process
@@ -25,11 +25,6 @@ BUILD_DEPENDS+=	zip-[0-9]*:../../archivers/zip
 
 PKGCONFIG_OVERRIDE+=	codeblocks.pc.in
 
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-CXXFLAGS+=	-std=c++11
-.endif
-
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile
index af14b7e6aa3..84f16281359 100644
--- a/editors/gobby/Makefile
+++ b/editors/gobby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2017/02/12 06:25:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.48 2017/05/03 08:38:41 jperkin Exp $
 
 DISTNAME=	gobby-0.4.12
 PKGREVISION=	29
@@ -10,13 +10,11 @@ HOMEPAGE=	http://gobby.0x539.de/
 COMMENT=	Collaborative Editor
 LICENSE=	gnu-gpl-v2
 
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c c++11
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 GNU_CONFIGURE=		yes
 
-CXXFLAGS+=		-std=c++11
-
 .include "options.mk"
 
 .include "../../devel/glibmm/buildlink3.mk"
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index e6ecfe19079..3003f1c621b 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2017/02/12 06:25:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.79 2017/05/03 08:38:41 jperkin Exp $
 #
 
 DISTNAME=	mlview-0.9.0
@@ -14,14 +14,12 @@ COMMENT=	XML editor for the GNOME environment
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
-USE_LANGUAGES+=		c c++
+USE_LANGUAGES+=		c c++11
 USE_PKGLOCALEDIR=	yes
 MAKE_JOBS_SAFE=		no
 
 GCONF_SCHEMAS=		mlview.schemas
 
-CXXFLAGS+=		-std=c++11
-
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/editors/obby/Makefile b/editors/obby/Makefile
index 3f1cf5498f9..4983a38a379 100644
--- a/editors/obby/Makefile
+++ b/editors/obby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/09/19 13:04:18 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2017/05/03 08:38:41 jperkin Exp $
 #
 
 DISTNAME=	obby-0.4.8
@@ -15,9 +15,7 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
 USE_PKGLOCALEDIR=	yes
-USE_LANGUAGES=		c c++
-
-CXXFLAGS+=		-std=c++11
+USE_LANGUAGES=		c c++11
 
 PKGCONFIG_OVERRIDE+=	obby-0.4.pc.in