diff options
| author | wiz <wiz@pkgsrc.org> | 2010-09-12 19:03:45 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2010-09-12 19:03:45 +0000 |
| commit | 58d2ff2cbf1ce410de965b7c51ffe619feb4e452 (patch) | |
| tree | 73e1100c2c413d44f874ec846566679bc6799b24 /graphics/cambevao | |
| parent | 7eeddea1f360b8893ba0109937111d4f0b010be9 (diff) | |
| download | pkgsrc-58d2ff2cbf1ce410de965b7c51ffe619feb4e452.tar.gz | |
Add rpath for expat, so that builtin expat will work.
Addresses PR 43862.
Diffstat (limited to 'graphics/cambevao')
| -rw-r--r-- | graphics/cambevao/Makefile | 8 | ||||
| -rw-r--r-- | graphics/cambevao/distinfo | 3 | ||||
| -rw-r--r-- | graphics/cambevao/patches/patch-ad | 13 |
3 files changed, 20 insertions, 4 deletions
diff --git a/graphics/cambevao/Makefile b/graphics/cambevao/Makefile index d139b949005..d1b16c48875 100644 --- a/graphics/cambevao/Makefile +++ b/graphics/cambevao/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2010/01/18 09:58:56 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2010/09/12 19:03:45 wiz Exp $ # DISTNAME= cambevao-2.2 @@ -20,8 +20,10 @@ INSTALLATION_DIRS= bin share/examples/cambevao share/examples/rc.d ONLY_FOR_PLATFORM= NetBSD-*-* FreeBSD-*-* DragonFly-*-* PKG_DESTDIR_SUPPORT= user-destdir -INSTALLATION_DIRS+= ${PREFIX}/share/examples/cambevao -INSTALLATION_DIRS+= ${PREFIX}/share/doc +INSTALLATION_DIRS+= ${PREFIX}/share/examples/cambevao +INSTALLATION_DIRS+= ${PREFIX}/share/doc + +MAKE_FLAGS+= EXPAT_PATH=${BUILDLINK_PREFIX.expat}/lib do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cambevao ${DESTDIR}${PREFIX}/bin diff --git a/graphics/cambevao/distinfo b/graphics/cambevao/distinfo index 6b2c5fdb9c7..1be55d3182d 100644 --- a/graphics/cambevao/distinfo +++ b/graphics/cambevao/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2008/06/21 20:59:32 joerg Exp $ +$NetBSD: distinfo,v 1.6 2010/09/12 19:03:45 wiz Exp $ SHA1 (cambevao-2.2.tar.gz) = 98d67a1e8e79cdb5b3cc8b099065f90c2c204b36 RMD160 (cambevao-2.2.tar.gz) = 922fc6e98503917e503ab4e5a7271dc882be3455 @@ -6,3 +6,4 @@ Size (cambevao-2.2.tar.gz) = 158557 bytes SHA1 (patch-aa) = 9b37747201dca6e86484c69f50e57ca9dd91339c SHA1 (patch-ab) = 4c489afb31b8e713ab75776dc154d8545d4833e0 SHA1 (patch-ac) = e9490b52ca8b61efce9d9bdbb66314aec25cd8b1 +SHA1 (patch-ad) = c7180c06eda35e52357a1f86dbb327b127bda007 diff --git a/graphics/cambevao/patches/patch-ad b/graphics/cambevao/patches/patch-ad new file mode 100644 index 00000000000..0e85e87816b --- /dev/null +++ b/graphics/cambevao/patches/patch-ad @@ -0,0 +1,13 @@ +$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 |