Fix build with clang and support for setting CFLAGS

5 files changed, 57 insertions, 2 deletions

diff --git a/x11/deforaos-locker/Makefile b/x11/deforaos-locker/Makefile
index 9767c34b031..257f0c3758b 100644
--- a/x11/deforaos-locker/Makefile
+++ b/x11/deforaos-locker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2015/08/23 23:04:20 khorben Exp $
+# $NetBSD: Makefile,v 1.16 2015/08/23 23:18:31 khorben Exp $
 #
 
 DISTNAME=	Locker-0.3.0
@@ -20,6 +20,7 @@ BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 
 MAKE_FLAGS+=	DESTDIR=${DESTDIR}
 MAKE_FLAGS+=	PREFIX=${PREFIX}
+MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
 AUTO_MKDIRS=	yes
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/deforaos-locker/distinfo b/x11/deforaos-locker/distinfo
index 785dc9913eb..b7f25064eae 100644
--- a/x11/deforaos-locker/distinfo
+++ b/x11/deforaos-locker/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.3 2015/06/13 21:55:01 khorben Exp $
+$NetBSD: distinfo,v 1.4 2015/08/23 23:18:31 khorben Exp $
 
 SHA1 (Locker-0.3.0.tar.gz) = 8ea2f5cc854085eda06a39c88bd5a07fab10eff2
 RMD160 (Locker-0.3.0.tar.gz) = 773e3638f610e6500f7674995337a5114ae1fb46
 Size (Locker-0.3.0.tar.gz) = 57770 bytes
+SHA1 (patch-src_auth_Makefile) = c31af40326342f7899c406acdb8387e1eaff2df0
+SHA1 (patch-src_demos_Makefile) = 2525cdf5a00fdd84058a1d0a7f62eaae228df56a
+SHA1 (patch-src_plugins_Makefile) = fd24d890c9a14482f2fd3642e8021b4ff73d3b96
diff --git a/x11/deforaos-locker/patches/patch-src_auth_Makefile b/x11/deforaos-locker/patches/patch-src_auth_Makefile
new file mode 100644
index 00000000000..f57d68cabb6
--- /dev/null
+++ b/x11/deforaos-locker/patches/patch-src_auth_Makefile
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_auth_Makefile,v 1.4 2015/08/23 23:18:31 khorben Exp $
+
+Fix build with CFLAGS set
+
+--- src/auth/Makefile.orig	2015-03-16 00:09:01.000000000 +0000
++++ src/auth/Makefile
+@@ -6,8 +6,8 @@ LIBDIR	= $(PREFIX)/lib
+ CC	= cc
+ CPPFLAGSF= -I ../../include
+ CPPFLAGS=
+-CFLAGSF	= -W `pkg-config --cflags libSystem gtk+-2.0`
+-CFLAGS	= -Wall -g -O2 -pedantic -fPIC
++CFLAGSF	= `pkg-config --cflags libSystem gtk+-2.0` -fPIC
++CFLAGS	= -W -Wall -g -O2 -pedantic
+ LDFLAGSF= -W `pkg-config --libs libSystem gtk+-2.0`
+ AR	= ar
+ RANLIB	= ranlib
diff --git a/x11/deforaos-locker/patches/patch-src_demos_Makefile b/x11/deforaos-locker/patches/patch-src_demos_Makefile
new file mode 100644
index 00000000000..8c33d7bd5fe
--- /dev/null
+++ b/x11/deforaos-locker/patches/patch-src_demos_Makefile
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_demos_Makefile,v 1.1 2015/08/23 23:18:31 khorben Exp $
+
+Fix build with CFLAGS set
+
+--- src/demos/Makefile.orig	2015-03-16 00:09:01.000000000 +0000
++++ src/demos/Makefile
+@@ -6,8 +6,8 @@ LIBDIR	= $(PREFIX)/lib
+ CC	= cc
+ CPPFLAGSF= -I ../../include
+ CPPFLAGS=
+-CFLAGSF	= -W `pkg-config --cflags libSystem gtk+-2.0 x11`
+-CFLAGS	= -Wall -g -O2 -pedantic -fPIC
++CFLAGSF	= `pkg-config --cflags libSystem gtk+-2.0 x11` -fPIC
++CFLAGS	= -W -Wall -g -O2 -pedantic
+ LDFLAGSF= -W `pkg-config --libs libSystem gtk+-2.0 x11`
+ AR	= ar
+ RANLIB	= ranlib
diff --git a/x11/deforaos-locker/patches/patch-src_plugins_Makefile b/x11/deforaos-locker/patches/patch-src_plugins_Makefile
new file mode 100644
index 00000000000..8c44ab920c0
--- /dev/null
+++ b/x11/deforaos-locker/patches/patch-src_plugins_Makefile
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_plugins_Makefile,v 1.1 2015/08/23 23:18:31 khorben Exp $
+
+Fix build with CFLAGS set
+
+--- src/plugins/Makefile.orig	2015-03-16 00:09:01.000000000 +0000
++++ src/plugins/Makefile
+@@ -6,8 +6,8 @@ LIBDIR	= $(PREFIX)/lib
+ CC	= cc
+ CPPFLAGSF= -I ../../include
+ CPPFLAGS=
+-CFLAGSF	= -W `pkg-config --cflags libSystem gtk+-2.0`
+-CFLAGS	= -Wall -g -O2 -pedantic -fPIC
++CFLAGSF	= `pkg-config --cflags libSystem gtk+-2.0` -fPIC
++CFLAGS	= -W -Wall -g -O2 -pedantic
+ LDFLAGSF= -W `pkg-config --libs libSystem gtk+-2.0`
+ AR	= ar
+ RANLIB	= ranlib