[pkgsrc/trunk]: pkgsrc/graphics Make the glut library link against required l...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8c855172f4c3
branches:  trunk
changeset: 495360:8c855172f4c3
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Tue Jun 07 14:31:48 2005 +0000

description:
Make the glut library link against required libraries.  Bump
PKGREVISION of glut.

diffstat:

 graphics/MesaLib/distinfo         |  4 ++--
 graphics/MesaLib/patches/patch-ag |  8 ++++----
 graphics/glut/Makefile            |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diffs (52 lines):

diff -r ee8f7b1f6023 -r 8c855172f4c3 graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Tue Jun 07 14:24:30 2005 +0000
+++ b/graphics/MesaLib/distinfo Tue Jun 07 14:31:48 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2005/06/07 14:21:42 minskim Exp $
+$NetBSD: distinfo,v 1.28 2005/06/07 14:31:48 minskim Exp $
 
 SHA1 (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = 7c4fb46ae17b066e85e90592ace496ac6b36c189
 RMD160 (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = cfc5e8db61289c017ff20dd6b4c6db5c7b66855b
@@ -12,5 +12,5 @@
 SHA1 (patch-ad) = 000d115933e3f75ca096effa47e8d19c900fe95c
 SHA1 (patch-ae) = a92133c77b1b958dcfe9b37ddc317d6ff31157d0
 SHA1 (patch-af) = 8f77d0a0e7c63de6bcc44a653767ccd04107c98c
-SHA1 (patch-ag) = 53723bb74760a43b2ff21f154886b0a6b450058c
+SHA1 (patch-ag) = 3d05125b389c26b04884775f3f631247faa8a716
 SHA1 (patch-ah) = 8ccfd1734accf9ed3920d42e9208eef5a9d233cf
diff -r ee8f7b1f6023 -r 8c855172f4c3 graphics/MesaLib/patches/patch-ag
--- a/graphics/MesaLib/patches/patch-ag Tue Jun 07 14:24:30 2005 +0000
+++ b/graphics/MesaLib/patches/patch-ag Tue Jun 07 14:31:48 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.6 2005/02/24 06:24:03 veego Exp $
+$NetBSD: patch-ag,v 1.7 2005/06/07 14:31:48 minskim Exp $
 
---- src/glut/glx/Makefile.orig 2004-12-06 05:00:20.000000000 +1100
+--- src/glut/glx/Makefile.orig 2004-12-05 12:00:20.000000000 -0600
 +++ src/glut/glx/Makefile
 @@ -79,6 +79,7 @@ OBJECTS = $(SOURCES:.c=.o)
  ##### RULES #####
@@ -20,8 +20,8 @@
 -              $(GLUT_LIB_DEPS) $(OBJECTS)
 +      ${LIBTOOL} --mode=link ${CC} -o ${GLUT_LIB_NAME:.so=.la} ${OBJECTS:.o=.lo} \
 +              -rpath ${PREFIX}/lib \
-+              -L${X11BASE}/lib -R ${X11BASE}/lib -lXi \
-+              -version-info ${GLUT_MAJOR}:${GLUT_MINOR}
++              -version-info ${GLUT_MAJOR}:${GLUT_MINOR} \
++              -L${X11BASE}/lib ${GLUT_LIB_DEPS:M-l*} -R${X11BASE}/lib
  
  
  clean:
diff -r ee8f7b1f6023 -r 8c855172f4c3 graphics/glut/Makefile
--- a/graphics/glut/Makefile    Tue Jun 07 14:24:30 2005 +0000
+++ b/graphics/glut/Makefile    Tue Jun 07 14:31:48 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2005/06/01 18:02:56 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/06/07 14:31:48 minskim Exp $
 
 PKGNAME=       ${DISTNAME:S/MesaLib/glut/}
-PKGREVISION=   2
+PKGREVISION=   3
 COMMENT=       GLUT Graphics library similar to SGI's OpenGL
 
 CONFLICTS+=    Mesa-glx-[0-9]*