Sun Sep 12 19:03:45 2010 UTC ()
Add rpath for expat, so that builtin expat will work.
Addresses PR 43862.


(wiz)
diff -r1.17 -r1.18 pkgsrc/graphics/cambevao/Makefile
diff -r1.5 -r1.6 pkgsrc/graphics/cambevao/distinfo
diff -r0 -r1.1 pkgsrc/graphics/cambevao/patches/patch-ad
cvs diff -r1.17 -r1.18 pkgsrc/graphics/cambevao/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/cambevao/Makefile 2010/01/18 09:58:56 1.17
+++ pkgsrc/graphics/cambevao/Makefile 2010/09/12 19:03:45 1.18
@@ -1,33 +1,35 @@ @@ -1,33 +1,35 @@
1# $NetBSD: Makefile,v 1.17 2010/01/18 09:58:56 wiz Exp $ 1# $NetBSD: Makefile,v 1.18 2010/09/12 19:03:45 wiz Exp $
2# 2#
3 3
4DISTNAME= cambevao-2.2 4DISTNAME= cambevao-2.2
5PKGREVISION= 6 5PKGREVISION= 6
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= http://coto.marsrakete.de/projects/cambevao/ 7MASTER_SITES= http://coto.marsrakete.de/projects/cambevao/
8 8
9MAINTAINER= abs@NetBSD.org 9MAINTAINER= abs@NetBSD.org
10HOMEPAGE= http://coto.marsrakete.de/projects/cambevao/ 10HOMEPAGE= http://coto.marsrakete.de/projects/cambevao/
11COMMENT= Grabs jpg images from bktr and ov511+ based USB webcams 11COMMENT= Grabs jpg images from bktr and ov511+ based USB webcams
12 12
13MAKE_ENV+= prefix=${PREFIX:Q} 13MAKE_ENV+= prefix=${PREFIX:Q}
14MAKE_FLAGS+= INSTALL=${INSTALL_PROGRAM:Q} 14MAKE_FLAGS+= INSTALL=${INSTALL_PROGRAM:Q}
15RCD_SCRIPTS= cambevao 15RCD_SCRIPTS= cambevao
16RCD_SCRIPT_SRC.cambevao= ${WRKSRC}/cambevao.rc.d 16RCD_SCRIPT_SRC.cambevao= ${WRKSRC}/cambevao.rc.d
17 17
18INSTALLATION_DIRS= bin share/examples/cambevao share/examples/rc.d 18INSTALLATION_DIRS= bin share/examples/cambevao share/examples/rc.d
19 19
20ONLY_FOR_PLATFORM= NetBSD-*-* FreeBSD-*-* DragonFly-*-* 20ONLY_FOR_PLATFORM= NetBSD-*-* FreeBSD-*-* DragonFly-*-*
21PKG_DESTDIR_SUPPORT= user-destdir 21PKG_DESTDIR_SUPPORT= user-destdir
22 22
23INSTALLATION_DIRS+= ${PREFIX}/share/examples/cambevao 23INSTALLATION_DIRS+= ${PREFIX}/share/examples/cambevao
24INSTALLATION_DIRS+= ${PREFIX}/share/doc 24INSTALLATION_DIRS+= ${PREFIX}/share/doc
 25
 26MAKE_FLAGS+= EXPAT_PATH=${BUILDLINK_PREFIX.expat}/lib
25 27
26do-install: 28do-install:
27 ${INSTALL_PROGRAM} ${WRKSRC}/cambevao ${DESTDIR}${PREFIX}/bin 29 ${INSTALL_PROGRAM} ${WRKSRC}/cambevao ${DESTDIR}${PREFIX}/bin
28 ${INSTALL_DATA} ${WRKSRC}/cambevao.xml ${DESTDIR}${PREFIX}/share/examples/cambevao 30 ${INSTALL_DATA} ${WRKSRC}/cambevao.xml ${DESTDIR}${PREFIX}/share/examples/cambevao
29 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cambevao.README 31 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cambevao.README
30 32
31.include "../../graphics/jpeg/buildlink3.mk" 33.include "../../graphics/jpeg/buildlink3.mk"
32.include "../../textproc/expat/buildlink3.mk" 34.include "../../textproc/expat/buildlink3.mk"
33.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/graphics/cambevao/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/cambevao/distinfo 2008/06/21 20:59:32 1.5
+++ pkgsrc/graphics/cambevao/distinfo 2010/09/12 19:03:45 1.6
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.5 2008/06/21 20:59:32 joerg Exp $ 1$NetBSD: distinfo,v 1.6 2010/09/12 19:03:45 wiz Exp $
2 2
3SHA1 (cambevao-2.2.tar.gz) = 98d67a1e8e79cdb5b3cc8b099065f90c2c204b36 3SHA1 (cambevao-2.2.tar.gz) = 98d67a1e8e79cdb5b3cc8b099065f90c2c204b36
4RMD160 (cambevao-2.2.tar.gz) = 922fc6e98503917e503ab4e5a7271dc882be3455 4RMD160 (cambevao-2.2.tar.gz) = 922fc6e98503917e503ab4e5a7271dc882be3455
5Size (cambevao-2.2.tar.gz) = 158557 bytes 5Size (cambevao-2.2.tar.gz) = 158557 bytes
6SHA1 (patch-aa) = 9b37747201dca6e86484c69f50e57ca9dd91339c 6SHA1 (patch-aa) = 9b37747201dca6e86484c69f50e57ca9dd91339c
7SHA1 (patch-ab) = 4c489afb31b8e713ab75776dc154d8545d4833e0 7SHA1 (patch-ab) = 4c489afb31b8e713ab75776dc154d8545d4833e0
8SHA1 (patch-ac) = e9490b52ca8b61efce9d9bdbb66314aec25cd8b1 8SHA1 (patch-ac) = e9490b52ca8b61efce9d9bdbb66314aec25cd8b1
 9SHA1 (patch-ad) = c7180c06eda35e52357a1f86dbb327b127bda007
File Added: pkgsrc/graphics/cambevao/patches/patch-ad
$NetBSD: patch-ad,v 1.1 2010/09/12 19:03:45 wiz Exp $

--- Makefile.orig	2004-11-20 14:04:33.000000000 +0000
+++ Makefile
@@ -14,7 +14,7 @@ RM      = rm -f
 INSTALL = /usr/bin/install -c -s -o root -g wheel -m 555
 CFLAGS  = -Wall -O2 -I$(includedir) -DPROGRAM=\"$(PROGRAM)\" -DMAX_CONN=3
 # CFLAGS  = -Wall -g -I$(includedir) -DPROGRAM=\"$(PROGRAM)\" -DMAX_CONN=3
-LDFLAGS =  -L$(libdir) -Wl,-R$(libdir)
+LDFLAGS =  -L$(libdir) -Wl,-R$(libdir) -L$(EXPAT_PATH) -Wl,-R$(EXPAT_PATH)
 LDLIBS  = -lexpat -ljpeg -lutil -lm
 #this for FreeBSD
 #LDLIBS  = -lexpat -ljpeg -lm