Sun Aug 23 23:18:31 2015 UTC ()
Fix build with clang and support for setting CFLAGS


(khorben)
diff -r1.15 -r1.16 pkgsrc/x11/deforaos-locker/Makefile
diff -r1.3 -r1.4 pkgsrc/x11/deforaos-locker/distinfo
diff -r0 -r1.4 pkgsrc/x11/deforaos-locker/patches/patch-src_auth_Makefile
diff -r0 -r1.1 pkgsrc/x11/deforaos-locker/patches/patch-src_demos_Makefile
diff -r0 -r1.1 pkgsrc/x11/deforaos-locker/patches/patch-src_plugins_Makefile
cvs diff -r1.15 -r1.16 pkgsrc/x11/deforaos-locker/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/deforaos-locker/Makefile 2015/08/23 23:04:20 1.15
+++ pkgsrc/x11/deforaos-locker/Makefile 2015/08/23 23:18:31 1.16
@@ -1,35 +1,36 @@ @@ -1,35 +1,36 @@
1# $NetBSD: Makefile,v 1.15 2015/08/23 23:04:20 khorben Exp $ 1# $NetBSD: Makefile,v 1.16 2015/08/23 23:18:31 khorben Exp $
2# 2#
3 3
4DISTNAME= Locker-0.3.0 4DISTNAME= Locker-0.3.0
5PKGNAME= deforaos-locker-0.3.0 5PKGNAME= deforaos-locker-0.3.0
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= http://www.defora.org/os/download/download/4347/ 7MASTER_SITES= http://www.defora.org/os/download/download/4347/
8 8
9MAINTAINER= khorben@defora.org 9MAINTAINER= khorben@defora.org
10HOMEPAGE= http://www.defora.org/ 10HOMEPAGE= http://www.defora.org/
11COMMENT= DeforaOS desktop screensaver 11COMMENT= DeforaOS desktop screensaver
12 12
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
15USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
16USE_TOOLS+= xgettext 16USE_TOOLS+= xgettext
17 17
18BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 18BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
19BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 19BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
20 20
21MAKE_FLAGS+= DESTDIR=${DESTDIR} 21MAKE_FLAGS+= DESTDIR=${DESTDIR}
22MAKE_FLAGS+= PREFIX=${PREFIX} 22MAKE_FLAGS+= PREFIX=${PREFIX}
 23MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
23AUTO_MKDIRS= yes 24AUTO_MKDIRS= yes
24 25
25.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
26 27
27.if ${PKGMANDIR} != "share/man" 28.if ${PKGMANDIR} != "share/man"
28post-install: 29post-install:
29 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/locker.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/locker.1 30 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/locker.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/locker.1
30 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/lockerctl.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/lockerctl.1 31 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/lockerctl.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/lockerctl.1
31 ${MV} ${DESTDIR}${PREFIX}/share/man/html1/locker.html ${DESTDIR}${PREFIX}/share/doc/html/Locker/locker.html 32 ${MV} ${DESTDIR}${PREFIX}/share/man/html1/locker.html ${DESTDIR}${PREFIX}/share/doc/html/Locker/locker.html
32 ${MV} ${DESTDIR}${PREFIX}/share/man/html1/lockerctl.html ${DESTDIR}${PREFIX}/share/doc/html/Locker/lockerctl.html 33 ${MV} ${DESTDIR}${PREFIX}/share/man/html1/lockerctl.html ${DESTDIR}${PREFIX}/share/doc/html/Locker/lockerctl.html
33 ${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1 34 ${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1
34 ${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1 35 ${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1
35 ${RMDIR} ${DESTDIR}${PREFIX}/share/man 36 ${RMDIR} ${DESTDIR}${PREFIX}/share/man
cvs diff -r1.3 -r1.4 pkgsrc/x11/deforaos-locker/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/deforaos-locker/distinfo 2015/06/13 21:55:01 1.3
+++ pkgsrc/x11/deforaos-locker/distinfo 2015/08/23 23:18:31 1.4
@@ -1,5 +1,8 @@ @@ -1,5 +1,8 @@
1$NetBSD: distinfo,v 1.3 2015/06/13 21:55:01 khorben Exp $ 1$NetBSD: distinfo,v 1.4 2015/08/23 23:18:31 khorben Exp $
2 2
3SHA1 (Locker-0.3.0.tar.gz) = 8ea2f5cc854085eda06a39c88bd5a07fab10eff2 3SHA1 (Locker-0.3.0.tar.gz) = 8ea2f5cc854085eda06a39c88bd5a07fab10eff2
4RMD160 (Locker-0.3.0.tar.gz) = 773e3638f610e6500f7674995337a5114ae1fb46 4RMD160 (Locker-0.3.0.tar.gz) = 773e3638f610e6500f7674995337a5114ae1fb46
5Size (Locker-0.3.0.tar.gz) = 57770 bytes 5Size (Locker-0.3.0.tar.gz) = 57770 bytes
 6SHA1 (patch-src_auth_Makefile) = c31af40326342f7899c406acdb8387e1eaff2df0
 7SHA1 (patch-src_demos_Makefile) = 2525cdf5a00fdd84058a1d0a7f62eaae228df56a
 8SHA1 (patch-src_plugins_Makefile) = fd24d890c9a14482f2fd3642e8021b4ff73d3b96
File Added: pkgsrc/x11/deforaos-locker/patches/Attic/patch-src_auth_Makefile
$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
File Added: pkgsrc/x11/deforaos-locker/patches/Attic/patch-src_demos_Makefile
$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
File Added: pkgsrc/x11/deforaos-locker/patches/Attic/patch-src_plugins_Makefile
$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