Support cwrappers for packages appending arguments in the wrappers.

6 files changed, 13 insertions, 6 deletions

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