Tue Aug 25 22:52:26 2015 UTC ()
Fix build when setting CFLAGS


(khorben)
diff -r1.17 -r1.18 pkgsrc/sysutils/deforaos-browser/Makefile
diff -r1.6 -r1.7 pkgsrc/sysutils/deforaos-browser/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/deforaos-browser/patches/patch-src_plugins_Makefile
cvs diff -r1.17 -r1.18 pkgsrc/sysutils/deforaos-browser/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/deforaos-browser/Makefile 2015/08/16 17:34:45 1.17
+++ pkgsrc/sysutils/deforaos-browser/Makefile 2015/08/25 22:52:25 1.18
@@ -1,36 +1,37 @@ @@ -1,36 +1,37 @@
1# $NetBSD: Makefile,v 1.17 2015/08/16 17:34:45 joerg Exp $ 1# $NetBSD: Makefile,v 1.18 2015/08/25 22:52:25 khorben Exp $
2# 2#
3 3
4DISTNAME= Browser-0.4.13 4DISTNAME= Browser-0.4.13
5PKGNAME= deforaos-browser-0.4.13 5PKGNAME= deforaos-browser-0.4.13
6PKGREVISION= 2 6PKGREVISION= 2
7CATEGORIES= sysutils 7CATEGORIES= sysutils
8MASTER_SITES= http://www.defora.org/os/download/download/4310/ 8MASTER_SITES= http://www.defora.org/os/download/download/4310/
9 9
10MAINTAINER= khorben@defora.org 10MAINTAINER= khorben@defora.org
11HOMEPAGE= http://www.defora.org/ 11HOMEPAGE= http://www.defora.org/
12COMMENT= DeforaOS desktop file manager and desktop handler 12COMMENT= DeforaOS desktop file manager and desktop handler
13 13
14LICENSE= gnu-gpl-v3 14LICENSE= gnu-gpl-v3
15 15
16USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
17USE_TOOLS+= xgettext 17USE_TOOLS+= xgettext
18 18
19BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 19BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
20BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 20BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
21 21
22MAKE_FLAGS+= DESTDIR=${DESTDIR} 22MAKE_FLAGS+= DESTDIR=${DESTDIR}
23MAKE_FLAGS+= PREFIX=${PREFIX} 23MAKE_FLAGS+= PREFIX=${PREFIX}
 24MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
24AUTO_MKDIRS= yes 25AUTO_MKDIRS= yes
25 26
26.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
27 28
28.if ${PKGMANDIR} != "share/man" 29.if ${PKGMANDIR} != "share/man"
29post-install: 30post-install:
30 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/browser.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/browser.1 31 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/browser.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/browser.1
31 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/copy.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/copy.1 32 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/copy.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/copy.1
32 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/delete.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/delete.1 33 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/delete.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/delete.1
33 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/desktop.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/desktop.1 34 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/desktop.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/desktop.1
34 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/desktopctl.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/desktopctl.1 35 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/desktopctl.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/desktopctl.1
35 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/move.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/move.1 36 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/move.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/move.1
36 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/open.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/open.1 37 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/open.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/open.1
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/deforaos-browser/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/deforaos-browser/distinfo 2014/03/21 14:19:31 1.6
+++ pkgsrc/sysutils/deforaos-browser/distinfo 2015/08/25 22:52:25 1.7
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.6 2014/03/21 14:19:31 jperkin Exp $ 1$NetBSD: distinfo,v 1.7 2015/08/25 22:52:25 khorben Exp $
2 2
3SHA1 (Browser-0.4.13.tar.gz) = 2a7eec2032bc224864000a149ba0afc2b8562cbd 3SHA1 (Browser-0.4.13.tar.gz) = 2a7eec2032bc224864000a149ba0afc2b8562cbd
4RMD160 (Browser-0.4.13.tar.gz) = 0cee3c24a8bc40a513aab6bd794bbd9865ac73f7 4RMD160 (Browser-0.4.13.tar.gz) = 0cee3c24a8bc40a513aab6bd794bbd9865ac73f7
5Size (Browser-0.4.13.tar.gz) = 129587 bytes 5Size (Browser-0.4.13.tar.gz) = 129587 bytes
6SHA1 (patch-data_pkgconfig.sh) = 4d331028b647bcd671fadeda613ecc29d56d3017 6SHA1 (patch-data_pkgconfig.sh) = 4d331028b647bcd671fadeda613ecc29d56d3017
7SHA1 (patch-src_callbacks.c) = 81cc77f99c58a1c0de61f4096808d77d99cce4fd 7SHA1 (patch-src_callbacks.c) = 81cc77f99c58a1c0de61f4096808d77d99cce4fd
 8SHA1 (patch-src_plugins_Makefile) = 3a275dfcda3a8acc0e87daa8953ffd3ad3fb5181
8SHA1 (patch-src_plugins_dirtree.c) = 9abeac0ad6947d19435276708aefe0c9235e9b92 9SHA1 (patch-src_plugins_dirtree.c) = 9abeac0ad6947d19435276708aefe0c9235e9b92
9SHA1 (patch-src_vfs.c) = e604b316be270e210c95b889d2c853aefd8bbc46 10SHA1 (patch-src_vfs.c) = e604b316be270e210c95b889d2c853aefd8bbc46
10SHA1 (patch-tools_dirtree.c) = 1c404e749464d30773360a43485117010d1cbd15 11SHA1 (patch-tools_dirtree.c) = 1c404e749464d30773360a43485117010d1cbd15
File Added: pkgsrc/sysutils/deforaos-browser/patches/Attic/patch-src_plugins_Makefile
$NetBSD: patch-src_plugins_Makefile,v 1.1 2015/08/25 22:52:26 khorben Exp $

Fix build when setting CFLAGS

--- src/plugins/Makefile.orig	2013-10-06 13:34:26.000000000 +0000
+++ src/plugins/Makefile
@@ -5,8 +5,8 @@ LIBDIR	= $(PREFIX)/lib
 CC	= cc
 CPPFLAGSF= -I ../../include
 CPPFLAGS=
-CFLAGSF	= -W `pkg-config --cflags libDesktop`
-CFLAGS	= -Wall -g -O2 -pedantic -fPIC
+CFLAGSF	= `pkg-config --cflags libDesktop` -fPIC
+CFLAGS	= -W -Wall -g -O2 -pedantic
 LDFLAGSF= `pkg-config --libs libDesktop`
 AR	= ar
 RANLIB	= ranlib