From 55a2c2de4602e2e897b54c4b5fdf0500bac1d183 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 1 Dec 2014 12:39:16 +0000
Subject: Support cwrappers for packages appending arguments in the wrappers.

---
 cad/openscad/Makefile              |  3 ++-
 converters/libwpd/Makefile         |  3 ++-
 converters/libwps/Makefile         |  3 ++-
 databases/sqlrelay/Makefile.common |  3 ++-
 editors/Sigil/Makefile             |  3 ++-
 emulators/mame/Makefile.common     | 12 +++++++++++-
 emulators/tme/Makefile             | 10 +++++++++-
 geography/merkaartor/Makefile      |  3 ++-
 graphics/exiv2-organize/Makefile   |  4 +++-
 graphics/gtkimageview/Makefile     |  3 ++-
 lang/sather/Makefile               |  3 ++-
 mail/mail-notification/Makefile    |  3 ++-
 mail/milter-regex/Makefile         |  3 ++-
 multimedia/libdvbpsi/Makefile      |  4 +++-
 net/gst-plugins1-libnice/Makefile  |  3 ++-
 net/libnice/Makefile               |  3 ++-
 net/libsoup24/Makefile             |  4 +++-
 net/synergy/Makefile               |  3 ++-
 net/tightvnc/Makefile              |  3 ++-
 net/vnc/Makefile                   |  3 ++-
 sysutils/open-vm-tools/Makefile    |  3 ++-
 textproc/FlightCrew/Makefile       |  4 +++-
 wm/fluxconf/Makefile               |  3 ++-
 x11/gnustep-preferences/Makefile   |  3 ++-
 24 files changed, 68 insertions(+), 24 deletions(-)

diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index 1f30705d715..c4366bbe101 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2014/11/07 19:39:27 adam Exp $
+# $NetBSD: Makefile,v 1.31 2014/12/01 12:39:16 joerg Exp $
 #
 
 PKGNAME=	openscad-2011.12
@@ -38,6 +38,7 @@ pre-build:
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CXX+=	-std=c++11 -Wno-c++11-narrowing
+CWRAPPERS_APPEND.cxx+=	-std=c++11 -Wno-c++11-narrowing
 .endif
 
 # DragonFly requires FlexLexer.h from pkgsrc - base doesn't cut it.
diff --git a/converters/libwpd/Makefile b/converters/libwpd/Makefile
index 40c4b469c1a..5b80c425a5e 100644
--- a/converters/libwpd/Makefile
+++ b/converters/libwpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2014/07/22 10:52:24 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2014/12/01 12:39:16 joerg Exp $
 
 DISTNAME=	libwpd-0.10.0
 CATEGORIES=	converters
@@ -21,6 +21,7 @@ PKGCONFIG_OVERRIDE+=	libwpd.pc.in
 
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CXX+=	-Wno-unused-private-field
+CWRAPPERS_APPEND.cxx+=	-Wno-unused-private-field
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/converters/libwps/Makefile b/converters/libwps/Makefile
index 9280f1cc5d1..6ff0acf832d 100644
--- a/converters/libwps/Makefile
+++ b/converters/libwps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/07/23 06:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2014/12/01 12:39:16 joerg Exp $
 
 DISTNAME=	libwps-0.3.0
 CATEGORIES=	converters
@@ -22,6 +22,7 @@ BUILDLINK_TRANSFORM+=	rm:-Werror
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CXX+=	-Wno-unused-private-field -Wno-unused-const-variable
+CWRAPPERS_APPEND.cxx+=	-Wno-unused-private-field -Wno-unused-const-variable
 .endif
 
 .include "../../converters/librevenge/buildlink3.mk"
diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common
index ea3a69b3917..61bbbadd1a3 100644
--- a/databases/sqlrelay/Makefile.common
+++ b/databases/sqlrelay/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2014/10/30 11:51:34 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.6 2014/12/01 12:39:16 joerg Exp $
 # used by databases/p5-sqlrelay/Makefile
 # used by databases/php-sqlrelay/Makefile
 # used by databases/py-sqlrelay/Makefile
@@ -41,6 +41,7 @@ EGDIR=			${PREFIX}/share/examples/sqlrelay
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CXX+=	-Wno-error=overloaded-virtual
+CWRAPPERS_APPEND.cxx+=	-Wno-error=overloaded-virtual
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/editors/Sigil/Makefile b/editors/Sigil/Makefile
index a389c410794..f4ee57ae215 100644
--- a/editors/Sigil/Makefile
+++ b/editors/Sigil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2014/11/23 19:27:29 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2014/12/01 12:39:17 joerg Exp $
 
 DISTNAME=	Sigil-0.8.1
 CATEGORIES=	editors
@@ -33,6 +33,7 @@ REPLACE_PYTHON+=	src/Sigil/Resource_Files/plugin_launchers/python/*.py
 # 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"
diff --git a/emulators/mame/Makefile.common b/emulators/mame/Makefile.common
index fef3a3fa855..632b6472d17 100644
--- a/emulators/mame/Makefile.common
+++ b/emulators/mame/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2014/11/27 12:46:59 wiz Exp $
+# $NetBSD: Makefile.common,v 1.19 2014/12/01 12:39:17 joerg Exp $
 #
 # used by emulators/mame/Makefile
 # used by emulators/mess/Makefile
@@ -43,6 +43,16 @@ _WRAP_EXTRA_ARGS.CC+=	-Wno-error=cast-align \
 			-Wno-error=self-assign-field \
 			-Wno-error=unused-const-variable \
 			-Wno-error=unused-function
+CWRAPPERS_APPEND.cc+=	-Wno-error=cast-align \
+			-Wno-error=constant-logical-operand \
+			-Wno-error=sometimes-uninitialized \
+			-Wno-error=shift-count-overflow \
+			-Wno-error=unused-private-field \
+			-Wno-error=tautological-constant-out-of-range-compare \
+			-Wno-error=tautological-compare \
+			-Wno-error=self-assign-field \
+			-Wno-error=unused-const-variable \
+			-Wno-error=unused-function
 MAKE_ENV+=		OPTIMIZE=2
 .endif
 
diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile
index 45e610c6219..551bbd9a07f 100644
--- a/emulators/tme/Makefile
+++ b/emulators/tme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2014/06/27 00:07:27 asau Exp $
+# $NetBSD: Makefile,v 1.54 2014/12/01 12:39:17 joerg Exp $
 #
 
 DISTNAME=		tme-0.8
@@ -28,10 +28,18 @@ _WRAP_EXTRA_ARGS.CC+=	-Wno-error=tautological-compare \
 			-Wno-error=sometimes-uninitialized \
 			-Wno-error=unused-function \
 			-Wno-error=absolute-value
+CWRAPPERS_APPEND.cc+=	-Wno-error=tautological-compare \
+			-Wno-error=sometimes-uninitialized \
+			-Wno-error=unused-function \
+			-Wno-error=absolute-value
 .elif !empty(CC_VERSION:Mgcc-4.8.*)
 _WRAP_EXTRA_ARGS.CC+=	-Wno-error=unused-but-set-variable	\
 	-Wno-error=array-bounds					\
 	-fno-strict-aliasing
+CWRAPPERS_APPEND.cc+=	-Wno-error=unused-but-set-variable	\
+	-Wno-error=array-bounds					\
+	-fno-strict-aliasing
+
 .endif
 
 PLIST_VARS+=	bsd
diff --git a/geography/merkaartor/Makefile b/geography/merkaartor/Makefile
index 43eead877e2..02447d8fa09 100644
--- a/geography/merkaartor/Makefile
+++ b/geography/merkaartor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2014/06/07 12:11:23 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2014/12/01 12:39:17 joerg Exp $
 #
 
 DISTNAME=	merkaartor-0.17.2
@@ -35,6 +35,7 @@ do-configure:
 .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"
diff --git a/graphics/exiv2-organize/Makefile b/graphics/exiv2-organize/Makefile
index 254632c7e4f..4f9324c4230 100644
--- a/graphics/exiv2-organize/Makefile
+++ b/graphics/exiv2-organize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2014/06/05 07:12:53 adam Exp $
+# $NetBSD: Makefile,v 1.26 2014/12/01 12:39:17 joerg Exp $
 
 .include "../../graphics/exiv2/Makefile.common"
 
@@ -16,8 +16,10 @@ do-install:
 # 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"
diff --git a/graphics/gtkimageview/Makefile b/graphics/gtkimageview/Makefile
index a90e36442e1..f3076892268 100644
--- a/graphics/gtkimageview/Makefile
+++ b/graphics/gtkimageview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2014/05/05 00:47:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.32 2014/12/01 12:39:17 joerg Exp $
 
 DISTNAME=	gtkimageview-1.6.4
 PKGREVISION=	20
@@ -30,6 +30,7 @@ TEST_TARGET=	check
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CC+=	-Wno-error=unused-function
+CWRAPPERS_APPEND.cc+=	-Wno-error=unused-function
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/sather/Makefile b/lang/sather/Makefile
index 93735c8ca23..0b1c63b66c7 100644
--- a/lang/sather/Makefile
+++ b/lang/sather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2014/06/29 05:12:42 dholland Exp $
+# $NetBSD: Makefile,v 1.59 2014/12/01 12:39:17 joerg Exp $
 
 DISTNAME=		sather-1.2.3
 PKGREVISION=		10
@@ -102,6 +102,7 @@ do-install:
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CC+=	-Wno-error=return-type -Wno-comment -Wno-parentheses-equality
+CWRAPPERS_APPEND.cc+=	-Wno-error=return-type -Wno-comment -Wno-parentheses-equality
 .endif
 
 .include "../../devel/boehm-gc/buildlink3.mk"
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 446f31939d0..f36ba63fe7b 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2014/08/21 13:21:33 jperkin Exp $
+# $NetBSD: Makefile,v 1.90 2014/12/01 12:39:17 joerg Exp $
 #
 
 DISTNAME=	mail-notification-5.4
@@ -55,6 +55,7 @@ CONFIGURE_ARGS+=	ssl=no
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CC+=	-Wno-unused-function
+CWRAPPERS_APPEND.cc+=	-Wno-unused-function
 .endif
 
 do-build:
diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile
index 59dc07d3b06..46ad6f8bbc5 100644
--- a/mail/milter-regex/Makefile
+++ b/mail/milter-regex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2013/10/15 14:44:42 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2014/12/01 12:39:17 joerg Exp $
 
 DISTNAME=	milter-regex-1.7
 PKGREVISION=	2
@@ -33,6 +33,7 @@ SUBST_SED.var=		-e 's|/var/spool|${VARBASE}|g'
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CC+=	-Wno-unused-const-variable
+CWRAPPERS_APPEND.cc+=	-Wno-unused-const-variable
 .endif
 
 do-install:
diff --git a/multimedia/libdvbpsi/Makefile b/multimedia/libdvbpsi/Makefile
index 4cfab143ae8..b9b82a21c3b 100644
--- a/multimedia/libdvbpsi/Makefile
+++ b/multimedia/libdvbpsi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/04/17 12:28:56 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2014/12/01 12:39:17 joerg Exp $
 
 DISTNAME=	libdvbpsi-1.2.0
 CATEGORIES=	multimedia
@@ -21,6 +21,8 @@ LIBS.SunOS+=	-lsocket -lnsl
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CC+=	-Wno-error=tautological-constant-out-of-range-compare \
 			-Wno-error=tautological-compare
+CWRAPPERS_APPEND.cc+=	-Wno-error=tautological-constant-out-of-range-compare \
+			-Wno-error=tautological-compare
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gst-plugins1-libnice/Makefile b/net/gst-plugins1-libnice/Makefile
index e870b260b79..616dea9cf9f 100644
--- a/net/gst-plugins1-libnice/Makefile
+++ b/net/gst-plugins1-libnice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/10/12 14:49:08 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2014/12/01 12:39:17 joerg Exp $
 
 DISTNAME=	libnice-0.1.8
 PKGNAME=	gst-plugins1-${DISTNAME}
@@ -35,6 +35,7 @@ BUILDLINK_TRANSFORM+=	rm:-Werror
 
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CC+=	-Wunused-but-set-variable
+CWRAPPERS_APPEND.cc+=	-Wunused-but-set-variable
 .endif
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/net/libnice/Makefile b/net/libnice/Makefile
index 67d6f232cc2..fe84fe12dfa 100644
--- a/net/libnice/Makefile
+++ b/net/libnice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2014/10/12 14:46:41 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2014/12/01 12:39:17 joerg Exp $
 #
 # Also update net/gst-plugins1-libnice when you update this!
 
@@ -30,6 +30,7 @@ BUILDLINK_TRANSFORM+=	rm:-Werror
 
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CC+=	-Wunused-but-set-variable
+CWRAPPERS_APPEND.cc+=	-Wunused-but-set-variable
 .endif
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/net/libsoup24/Makefile b/net/libsoup24/Makefile
index 93753074ae0..8224aa70c7e 100644
--- a/net/libsoup24/Makefile
+++ b/net/libsoup24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2014/10/07 16:47:13 adam Exp $
+# $NetBSD: Makefile,v 1.64 2014/12/01 12:39:17 joerg Exp $
 
 DISTNAME=	libsoup-2.44.2
 PKGNAME=	${DISTNAME:S/libsoup/libsoup24/}
@@ -33,10 +33,12 @@ TEST_TARGET=	check
 CONFIGURE_ARGS+= 	--disable-more-warnings
 .elif !emptry(CC_VERSION:Mgcc-4.[8].*)
 _WRAP_EXTRA_ARGS.CC+=	-Wno-error=format-zero-length
+CWRAPPERS_APPEND.cc+=	-Wno-error=format-zero-length
 .endif
 
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CC+=	-Wno-error=format-nonliteral
+CWRAPPERS_APPEND.cc+=	-Wno-error=format-nonliteral
 .endif
 
 REPLACE_PYTHON= libsoup/tld-parser.py
diff --git a/net/synergy/Makefile b/net/synergy/Makefile
index 53b5cff0b06..5f8636181cc 100644
--- a/net/synergy/Makefile
+++ b/net/synergy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/08/25 10:06:41 obache Exp $
+# $NetBSD: Makefile,v 1.21 2014/12/01 12:39:17 joerg Exp $
 #
 
 DISTNAME=		synergy-1.4.12-Source
@@ -50,6 +50,7 @@ do-install:
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CXX+=	-std=c++11
+CWRAPPERS_APPEND.cxx+=	-std=c++11
 .endif
 
 # tools/cryptopp562/GNUmakefile
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 37e35139407..27eeba41884 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2014/06/01 18:04:07 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2014/12/01 12:39:18 joerg Exp $
 
 DISTNAME=		tightvnc-1.3.10
 PKGREVISION=		12
@@ -36,6 +36,7 @@ CPPFLAGS+=		-Wno-error=return-type
 # seem to pick it up. Someone with strong X-fu needs to look at it.
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64)
 _WRAP_EXTRA_ARGS.CC+=	-DDDXTIME -D_XSERVER64 -DGCCUSESGAS
+CWRAPPERS_APPEND.cc+=	-DDDXTIME -D_XSERVER64 -DGCCUSESGAS
 .endif
 
 .if ${X11_TYPE} == "modular"
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index afff91beb8f..05c2eb00763 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2014/05/29 23:37:13 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2014/12/01 12:39:18 joerg Exp $
 
 DISTNAME=		vnc-3.3.3r2
 PKGNAME=		vnc-3.3.3.2
@@ -58,6 +58,7 @@ INSTALLATION_DIRS=	bin share/doc/vnc
 
 .if ${OPSYS} == "SunOS"
 _WRAP_EXTRA_ARGS.CC+=	-D_POSIX_SOURCE
+CWRAPPERS_APPEND.cc+=	-D_POSIX_SOURCE
 SPECIAL_PERMS+=	bin/Xvnc ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 2555
 .endif
 
diff --git a/sysutils/open-vm-tools/Makefile b/sysutils/open-vm-tools/Makefile
index 74592aa9c9e..00a3c48631d 100644
--- a/sysutils/open-vm-tools/Makefile
+++ b/sysutils/open-vm-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2014/10/07 16:47:35 adam Exp $
+# $NetBSD: Makefile,v 1.49 2014/12/01 12:39:18 joerg Exp $
 
 DISTNAME=	open-vm-tools-2008.08.08-109361
 PKGNAME=	open-vm-tools-2008.08.08.109361
@@ -38,6 +38,7 @@ pre-configure:
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CC+=	-Wno-error=unused-local-typedef
+CWRAPPERS_APPEND.cc+=	-Wno-error=unused-local-typedef
 .endif
 
 .include "../../net/libdnet/buildlink3.mk"
diff --git a/textproc/FlightCrew/Makefile b/textproc/FlightCrew/Makefile
index 52440379d11..fa6b47a58d3 100644
--- a/textproc/FlightCrew/Makefile
+++ b/textproc/FlightCrew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2014/11/07 19:39:42 adam Exp $
+# $NetBSD: Makefile,v 1.32 2014/12/01 12:39:18 joerg Exp $
 #
 
 DISTNAME=	FlightCrew-0.7.2-Code
@@ -41,8 +41,10 @@ SUBST_FILTER_CMD.d2u=	${TR} -d '\r'
 # 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 "../../devel/googletest/buildlink3.mk"
diff --git a/wm/fluxconf/Makefile b/wm/fluxconf/Makefile
index f60c6a46778..36760819265 100644
--- a/wm/fluxconf/Makefile
+++ b/wm/fluxconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2014/05/05 00:48:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.28 2014/12/01 12:39:18 joerg Exp $
 #
 
 DISTNAME=	fluxconf-0.9.9
@@ -20,6 +20,7 @@ USE_TOOLS+=		msgfmt pkg-config
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CC+=	-Wno-error=invalid-source-encoding -Wno-error=format-security -Wno-error=self-assign
+CWRAPPERS_APPEND.cc+=	-Wno-error=invalid-source-encoding -Wno-error=format-security -Wno-error=self-assign
 .endif
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gnustep-preferences/Makefile b/x11/gnustep-preferences/Makefile
index fd1941b3bde..873dd8d1b35 100644
--- a/x11/gnustep-preferences/Makefile
+++ b/x11/gnustep-preferences/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2014/10/07 16:47:38 adam Exp $
+# $NetBSD: Makefile,v 1.44 2014/12/01 12:39:18 joerg Exp $
 
 DISTNAME=	Preferences-1.2.0
 PKGNAME=	gnustep-${DISTNAME:S/P/p/}
@@ -30,6 +30,7 @@ SUBST_SED.gnustep_installation_dir+=	-e 's|\$$(GNUSTEP_SYSTEM_ROOT)/Library/Pref
 
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CC+=	-Wno-unused-const-variable
+CWRAPPERS_APPEND.cc+=	-Wno-unused-const-variable
 .endif
 
 .include "../../x11/gnustep-back/buildlink3.mk"
-- 
cgit v1.2.3