Mon Feb 22 12:20:02 2016 UTC ()
Add support for LDFLAGS

Fixes build with the default settings.


(khorben)
diff -r1.11 -r1.12 pkgsrc/graphics/deforaos-camera/Makefile
diff -r1.3 -r1.4 pkgsrc/graphics/deforaos-camera/distinfo
diff -r0 -r1.1 pkgsrc/graphics/deforaos-camera/patches/patch-src_widget_Makefile
cvs diff -r1.11 -r1.12 pkgsrc/graphics/deforaos-camera/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/deforaos-camera/Makefile 2016/02/20 02:28:14 1.11
+++ pkgsrc/graphics/deforaos-camera/Makefile 2016/02/22 12:20:01 1.12
@@ -1,36 +1,37 @@ @@ -1,36 +1,37 @@
1# $NetBSD: Makefile,v 1.11 2016/02/20 02:28:14 khorben Exp $ 1# $NetBSD: Makefile,v 1.12 2016/02/22 12:20:01 khorben Exp $
2# 2#
3 3
4DISTNAME= Camera-0.2.0 4DISTNAME= Camera-0.2.0
5PKGNAME= deforaos-camera-0.2.0 5PKGNAME= deforaos-camera-0.2.0
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= graphics 7CATEGORIES= graphics
8MASTER_SITES= http://www.defora.org/os/download/download/4419/ 8MASTER_SITES= http://www.defora.org/os/download/download/4419/
9 9
10MAINTAINER= khorben@defora.org 10MAINTAINER= khorben@defora.org
11HOMEPAGE= http://www.defora.org/ 11HOMEPAGE= http://www.defora.org/
12COMMENT= DeforaOS desktop camera 12COMMENT= DeforaOS desktop camera
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} 23MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
 24MAKE_FLAGS+= LDFLAGS=${LDFLAGS: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/html1/camera.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/camera.html 31 ${MV} ${DESTDIR}${PREFIX}/share/man/html1/camera.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/camera.html
31 ${MV} ${DESTDIR}${PREFIX}/share/man/html1/gallery.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/gallery.html 32 ${MV} ${DESTDIR}${PREFIX}/share/man/html1/gallery.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/gallery.html
32 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/camera.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/camera.1 33 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/camera.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/camera.1
33 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/gallery.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gallery.1 34 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/gallery.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gallery.1
34 ${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1 35 ${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1
35 ${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1 36 ${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1
36 ${RMDIR} ${DESTDIR}${PREFIX}/share/man 37 ${RMDIR} ${DESTDIR}${PREFIX}/share/man
cvs diff -r1.3 -r1.4 pkgsrc/graphics/deforaos-camera/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/deforaos-camera/distinfo 2016/02/20 01:18:22 1.3
+++ pkgsrc/graphics/deforaos-camera/distinfo 2016/02/22 12:20:01 1.4
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.3 2016/02/20 01:18:22 khorben Exp $ 1$NetBSD: distinfo,v 1.4 2016/02/22 12:20:01 khorben Exp $
2 2
3SHA1 (Camera-0.2.0.tar.gz) = 6931f4edca80376a7680fc541f8763ff09b1f665 3SHA1 (Camera-0.2.0.tar.gz) = 6931f4edca80376a7680fc541f8763ff09b1f665
4RMD160 (Camera-0.2.0.tar.gz) = 375cfd997b98e10a0f48ea67fd4c45ed4b5c79f6 4RMD160 (Camera-0.2.0.tar.gz) = 375cfd997b98e10a0f48ea67fd4c45ed4b5c79f6
5SHA512 (Camera-0.2.0.tar.gz) = 1ef8573f1d452c26540bd9b850756e192a6047bad69c7484e9ca9493b0cbdf27edad07241b33952bbfe92f9d81e8ed271d374f6ca30742883b755ee4403e41be 5SHA512 (Camera-0.2.0.tar.gz) = 1ef8573f1d452c26540bd9b850756e192a6047bad69c7484e9ca9493b0cbdf27edad07241b33952bbfe92f9d81e8ed271d374f6ca30742883b755ee4403e41be
6Size (Camera-0.2.0.tar.gz) = 25892 bytes 6Size (Camera-0.2.0.tar.gz) = 25892 bytes
 7SHA1 (patch-src_widget_Makefile) = bc5a5b8093a8dbfb23cda47987882cbce98a9e54
File Added: pkgsrc/graphics/deforaos-camera/patches/patch-src_widget_Makefile
$NetBSD: patch-src_widget_Makefile,v 1.1 2016/02/22 12:20:02 khorben Exp $

Fix build for the camera Widget.

--- src/widget/Makefile.orig	2016-02-20 01:06:42.000000000 +0000
+++ src/widget/Makefile
@@ -6,8 +6,8 @@ LIBDIR	= $(PREFIX)/lib
 CC	= cc
 CPPFLAGSF=
 CPPFLAGS=
-CFLAGSF	= `pkg-config --cflags libDesktop`
-CFLAGS	= -W -Wall -g -O2 -fPIC -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
+CFLAGSF	= `pkg-config --cflags libDesktop` -fPIC
+CFLAGS	= -W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all
 LDFLAGSF= `pkg-config --libs libDesktop` -lintl
 LDFLAGS	= -Wl,-z,relro -Wl,-z,now
 EXEEXT	=