[pkgsrc/trunk]: pkgsrc When building graphics/MesaDemos, Pass the correct rpa...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ebef934d8982
branches:  trunk
changeset: 471022:ebef934d8982
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Mar 15 18:04:34 2004 +0000

description:
When building graphics/MesaDemos, Pass the correct rpath flags to the
compiler so that the X11R6 libraries are found at run-time.  Bump the
PKGREVISION to 1.

diffstat:

 doc/CHANGES                         |  3 ++-
 graphics/MesaDemos/Makefile         |  4 ++--
 graphics/MesaDemos/distinfo         |  4 ++--
 graphics/MesaDemos/patches/patch-ab |  4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diffs (62 lines):

diff -r 379b2a48fcfb -r ebef934d8982 doc/CHANGES
--- a/doc/CHANGES       Mon Mar 15 17:55:31 2004 +0000
+++ b/doc/CHANGES       Mon Mar 15 18:04:34 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5258 2004/03/15 17:17:08 kleink Exp $
+$NetBSD: CHANGES,v 1.5259 2004/03/15 18:04:36 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -1470,3 +1470,4 @@
        Updated postfix to 2.0.19 [martti 2004-03-14]
        Updated fprot-workstation-bin to 4.4.0 [wiz 2004-03-15]
        Updated jwhois to 3.2.2nb3 [kleink 2004-03-15]
+       Updated MesaDemos to 6.0nb1 [jlam 2004-03-15]
diff -r 379b2a48fcfb -r ebef934d8982 graphics/MesaDemos/Makefile
--- a/graphics/MesaDemos/Makefile       Mon Mar 15 17:55:31 2004 +0000
+++ b/graphics/MesaDemos/Makefile       Mon Mar 15 18:04:34 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/02/11 02:05:14 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.16 2004/03/15 18:04:34 jlam Exp $
 
 PKGNAME=       MesaDemos-${MESA_VERSION}
+PKGREVISION=   1
 COMMENT=       OpenGL examples and Demos
 
 PATCHDIR=              ${.CURDIR}/patches
diff -r 379b2a48fcfb -r ebef934d8982 graphics/MesaDemos/distinfo
--- a/graphics/MesaDemos/distinfo       Mon Mar 15 17:55:31 2004 +0000
+++ b/graphics/MesaDemos/distinfo       Mon Mar 15 18:04:34 2004 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.8 2004/01/22 13:02:33 adam Exp $
+$NetBSD: distinfo,v 1.9 2004/03/15 18:04:34 jlam Exp $
 
 SHA1 (Mesa-6.0/MesaLib-6.0.tar.bz2) = 00f0ac27fbc3eddfdbc84de482f16b64b904d60c
 Size (Mesa-6.0/MesaLib-6.0.tar.bz2) = 1487379 bytes
 SHA1 (Mesa-6.0/MesaDemos-6.0.tar.bz2) = f57a76d0b9b4f70197860eda15f5241a02017a91
 Size (Mesa-6.0/MesaDemos-6.0.tar.bz2) = 915060 bytes
 SHA1 (patch-aa) = 4be9b5fadff758d3bcaea22abc5a61e89ccadbe0
-SHA1 (patch-ab) = 19ec1a6d36654185ae57abddc1bd00b62d6ad4fc
+SHA1 (patch-ab) = 3d53af4d2036259bb23979ad0b411af63eacbbd1
 SHA1 (patch-ac) = 97d7257c14998706f725bc8420bd4b34ee27dba4
 SHA1 (patch-ad) = 41a417d37ad82a99a3b1e7ef4c54f052947a8a1b
 SHA1 (patch-ae) = 1cc774b4c012fa6a53b80968f94cc99780d5733b
diff -r 379b2a48fcfb -r ebef934d8982 graphics/MesaDemos/patches/patch-ab
--- a/graphics/MesaDemos/patches/patch-ab       Mon Mar 15 17:55:31 2004 +0000
+++ b/graphics/MesaDemos/patches/patch-ab       Mon Mar 15 18:04:34 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.7 2004/01/22 13:02:33 adam Exp $
+$NetBSD: patch-ab,v 1.8 2004/03/15 18:04:34 jlam Exp $
 
 --- Make-config.orig   2004-01-15 09:23:54.000000000 -0500
 +++ Make-config        2004-01-19 18:29:14.000000000 -0500
@@ -20,7 +20,7 @@
 -      "CXXFLAGS = -O2 -fPIC"  \
 -      "GLUT_CFLAGS = -fexceptions" \
 -      "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
-+      "APP_LIB_DEPS = -L${PREFIX}/lib -L${X11PREFIX}/lib -Wl,-R${PREFIX}/lib -Wl,-R${X11PREFIX}/lib -lXext -lXmu -lXi -lX11 -lm"
++      "APP_LIB_DEPS = ${LDFLAGS} -lXext -lXmu -lXi -lX11 -lm"
  
  openbsd:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \