summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorminskim <minskim>2005-06-07 14:31:48 +0000
committerminskim <minskim>2005-06-07 14:31:48 +0000
commita618c5371f4a950bb89462b7dac98de715440565 (patch)
tree282ae03b95c1fdc27f6ae4b75f16f1ece6403792 /graphics
parent6bb11d5944dbdddb5d591574d0e9544f0d1e2992 (diff)
downloadpkgsrc-a618c5371f4a950bb89462b7dac98de715440565.tar.gz
Make the glut library link against required libraries. Bump
PKGREVISION of glut.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/MesaLib/distinfo4
-rw-r--r--graphics/MesaLib/patches/patch-ag8
-rw-r--r--graphics/glut/Makefile4
3 files changed, 8 insertions, 8 deletions
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 445964f822d..99895b905dd 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -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-ac) = 9a0717105fef41e84b5faebaa8bd91d1c0964b86
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 --git a/graphics/MesaLib/patches/patch-ag b/graphics/MesaLib/patches/patch-ag
index 2b61e0e6814..d4521db80ab 100644
--- a/graphics/MesaLib/patches/patch-ag
+++ b/graphics/MesaLib/patches/patch-ag
@@ -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 @@ $NetBSD: patch-ag,v 1.6 2005/02/24 06:24:03 veego Exp $
- $(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 --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index db10ca59f36..efc30287705 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -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]*