[pkgsrc/trunk]: pkgsrc/graphics/MesaLib Fix the last commit which didn't reco...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4ca814fe772b
branches:  trunk
changeset: 489606:4ca814fe772b
user:      veego <veego%pkgsrc.org@localhost>
date:      Thu Feb 24 06:24:03 2005 +0000

description:
Fix the last commit which didn't record the correct rpath for the X11
libraries due too the usage of two -rpath options for libtool:

libtool: link: warning: ignoring multiple `-rpath's for a libtool library

According to the gnu libtool page you have to use -R:
-R libdir
    If output-file is a program, add libdir to its run-time path. If
    output-file is a library, add -Rlibdir to its dependency_libs, so
    that, whenever the library is linked into a program, libdir will be
    added to its run-time path.

diffstat:

 graphics/MesaLib/distinfo         |  4 ++--
 graphics/MesaLib/patches/patch-ag |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 4d7abb0bc152 -r 4ca814fe772b graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Thu Feb 24 03:37:28 2005 +0000
+++ b/graphics/MesaLib/distinfo Thu Feb 24 06:24:03 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2005/02/23 13:57:35 grant Exp $
+$NetBSD: distinfo,v 1.24 2005/02/24 06:24:03 veego Exp $
 
 SHA1 (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = 7c4fb46ae17b066e85e90592ace496ac6b36c189
 Size (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = 1627520 bytes
@@ -10,5 +10,5 @@
 SHA1 (patch-ad) = 0d8bee8806d2c5c23acf2bf4744f64efc1c73d7d
 SHA1 (patch-ae) = b7fd3c2af1e40536f9e5a2b0409342aaee7fef1f
 SHA1 (patch-af) = fce796cba87fb5f1bab32bfd095dcb1d4320fdc8
-SHA1 (patch-ag) = 696fc3000edbfdba41dd4ebc48b1384e1fda4d04
+SHA1 (patch-ag) = 53723bb74760a43b2ff21f154886b0a6b450058c
 SHA1 (patch-ah) = 8ccfd1734accf9ed3920d42e9208eef5a9d233cf
diff -r 4d7abb0bc152 -r 4ca814fe772b graphics/MesaLib/patches/patch-ag
--- a/graphics/MesaLib/patches/patch-ag Thu Feb 24 03:37:28 2005 +0000
+++ b/graphics/MesaLib/patches/patch-ag Thu Feb 24 06:24:03 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.5 2005/02/23 13:57:35 grant Exp $
+$NetBSD: patch-ag,v 1.6 2005/02/24 06:24:03 veego Exp $
 
 --- src/glut/glx/Makefile.orig 2004-12-06 05:00:20.000000000 +1100
 +++ src/glut/glx/Makefile
@@ -20,7 +20,7 @@
 -              $(GLUT_LIB_DEPS) $(OBJECTS)
 +      ${LIBTOOL} --mode=link ${CC} -o ${GLUT_LIB_NAME:.so=.la} ${OBJECTS:.o=.lo} \
 +              -rpath ${PREFIX}/lib \
-+              -L${X11BASE}/lib -rpath ${X11BASE}/lib -lXi \
++              -L${X11BASE}/lib -R ${X11BASE}/lib -lXi \
 +              -version-info ${GLUT_MAJOR}:${GLUT_MINOR}