Link against required libraries explicitly, so that dependency_libs in

.la files is set correctly.

Bump PKGREVISION.

4 files changed, 20 insertions, 14 deletions

diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index cb99bc816c6..34cca3e510e 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2004/10/31 00:53:10 minskim Exp $
+# $NetBSD: Makefile,v 1.39 2005/06/05 15:39:06 minskim Exp $
 
 PKGNAME=	MesaLib-${MESA_VERSION}
+PKGREVISION=	1
 COMMENT=	Graphics library similar to SGI's OpenGL
 
 .include "../Mesa/Makefile.common"
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index b136989d979..4108458e134 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2005/02/24 08:45:02 agc Exp $
+$NetBSD: distinfo,v 1.26 2005/06/05 15:39:06 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
@@ -9,8 +9,8 @@ Size (Mesa-6.2.1/MesaDemos-6.2.1.tar.bz2) = 1004511 bytes
 SHA1 (patch-aa) = 90457ea124a42150e3a37b48e1e0691597668606
 SHA1 (patch-ab) = 8de78b793e384578d8821a4ef487bb2b39ebfcb6
 SHA1 (patch-ac) = 9a0717105fef41e84b5faebaa8bd91d1c0964b86
-SHA1 (patch-ad) = 0d8bee8806d2c5c23acf2bf4744f64efc1c73d7d
-SHA1 (patch-ae) = b7fd3c2af1e40536f9e5a2b0409342aaee7fef1f
+SHA1 (patch-ad) = 000d115933e3f75ca096effa47e8d19c900fe95c
+SHA1 (patch-ae) = a92133c77b1b958dcfe9b37ddc317d6ff31157d0
 SHA1 (patch-af) = fce796cba87fb5f1bab32bfd095dcb1d4320fdc8
 SHA1 (patch-ag) = 53723bb74760a43b2ff21f154886b0a6b450058c
 SHA1 (patch-ah) = 8ccfd1734accf9ed3920d42e9208eef5a9d233cf
diff --git a/graphics/MesaLib/patches/patch-ad b/graphics/MesaLib/patches/patch-ad
index c0d5b338fed..379013a1883 100644
--- a/graphics/MesaLib/patches/patch-ad
+++ b/graphics/MesaLib/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.5 2004/10/26 13:55:37 adam Exp $
+$NetBSD: patch-ad,v 1.6 2005/06/05 15:39:06 minskim Exp $
 
---- src/mesa/Makefile.orig	2004-08-16 17:11:10.000000000 +0000
+--- src/mesa/Makefile.orig	2004-10-04 09:44:50.000000000 -0500
 +++ src/mesa/Makefile
 @@ -12,10 +12,10 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$
  
@@ -15,7 +15,7 @@ $NetBSD: patch-ad,v 1.5 2004/10/26 13:55:37 adam Exp $
  
  
  # Figure out what to make here
-@@ -112,22 +112,20 @@ subdirs:
+@@ -112,22 +112,23 @@ subdirs:
  
  # Make the GL library
  $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
@@ -24,7 +24,8 @@ $NetBSD: patch-ad,v 1.5 2004/10/26 13:55:37 adam Exp $
 -		$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)
 +	${LIBTOOL} --mode=link ${CC} -o ${GL_LIB_NAME:.so=.la} \
 +		${STAND_ALONE_OBJECTS:.o=.lo} \
-+		-rpath ${PREFIX}/lib -version-info ${GL_MAJOR}:${GL_MINOR}
++		-rpath ${PREFIX}/lib -version-info ${GL_MAJOR}:${GL_MINOR} \
++		-L${X11BASE}/lib ${GL_LIB_DEPS:M-l*} -R ${X11BASE}/lib
  
  # Make the OSMesa library
  $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
@@ -35,7 +36,8 @@ $NetBSD: patch-ad,v 1.5 2004/10/26 13:55:37 adam Exp $
 -			$(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \
 +	    ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB_NAME:.so=.la} \
 +		${OSMESA16_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \
-+		-version-info ${MESA_MAJOR}:${MESA_MINOR} ; \
++		-version-info ${MESA_MAJOR}:${MESA_MINOR} \
++		${OSMESA_LIB_DEPS:M-l*:S|-lGL|libGL.la|} ; \
  	else \
 -		CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \
 -			-minor $(MESA_MINOR) -patch $(GL_TINY) \
@@ -43,7 +45,8 @@ $NetBSD: patch-ad,v 1.5 2004/10/26 13:55:37 adam Exp $
 -			$(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \
 +	    ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB_NAME:.so=.la} \
 +		${OSMESA_DRIVER_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \
-+		-version-info ${MESA_MAJOR}:${MESA_MINOR} ; \
++		-version-info ${MESA_MAJOR}:${MESA_MINOR} \
++		${OSMESA_LIB_DEPS:M-l*:S|-lGL|libGL.la|} ; \
  	fi
  
  
diff --git a/graphics/MesaLib/patches/patch-ae b/graphics/MesaLib/patches/patch-ae
index d3f15db4b6c..79ae3680348 100644
--- a/graphics/MesaLib/patches/patch-ae
+++ b/graphics/MesaLib/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.5 2004/10/26 13:55:37 adam Exp $
+$NetBSD: patch-ae,v 1.6 2005/06/05 15:39:06 minskim Exp $
 
---- src/glw/Makefile.orig	2004-06-25 22:51:39.000000000 +0000
+--- src/glw/Makefile.orig	2004-06-25 17:51:39.000000000 -0500
 +++ src/glw/Makefile
 @@ -17,7 +17,7 @@ OBJECTS = $(GLW_SOURCES:.c=.o)
  ##### RULES #####
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.5 2004/10/26 13:55:37 adam Exp $
  
  
  
-@@ -33,9 +33,8 @@ clean:
+@@ -33,9 +33,10 @@ clean:
  
  # Make the library
  $(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
@@ -19,7 +19,9 @@ $NetBSD: patch-ae,v 1.5 2004/10/26 13:55:37 adam Exp $
 -		-patch $(TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \
 -		$(GLW_LIB_DEPS) $(OBJECTS)
 +	${LIBTOOL} --mode=link ${CC} -o ${GLW_LIB_NAME:.so=.la} ${OBJECTS:.o=.lo} \
-+		-rpath ${PREFIX}/lib -version-info ${MAJOR}:${MINOR}
++		-rpath ${PREFIX}/lib -version-info ${MAJOR}:${MINOR} \
++		-L${X11BASE}/lib ${GLW_LIB_DEPS:M-l*:S|-lGL|libGL.la}} \
++		-R ${X11BASE}/lib
  
  
  #