Mesa-6.0 packages now use LIBTOOL and finally build

9 files changed, 149 insertions, 22 deletions

diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index a7d05d73746..b0e6632f6f2 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.29 2004/01/20 12:18:15 agc Exp $
+# $NetBSD: Makefile,v 1.30 2004/01/22 12:58:19 adam Exp $
+#
 
-PKGNAME=		MesaLib-${MESA_VERSION}
-MAINTAINER=		rh@NetBSD.org
-COMMENT=		Graphics library similar to SGI's OpenGL
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKGNAME=	MesaLib-${MESA_VERSION}
+COMMENT=	Graphics library similar to SGI's OpenGL
 
 .include "../../graphics/Mesa/Makefile.common"
 
-WRKSRC=			${WRKDIR}/${DISTNAME:S/Lib//}
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=		yes
-USE_X11=		yes
-#USE_PKGINSTALL=		yes
 #CONF_FILES=		${PREFIX}/share/examples/mesa/mesa.conf		\
 #			${PKG_SYSCONFDIR}/mesa.conf
 
-INSTLIBS=		libGL.so.1.5 libGLw.so.1.0 libOSMesa.so.6.0
+INSTLIBS=	${WRKSRC}/src/mesa/libGL.la \
+		${WRKSRC}/src/glw/libGLw.la \
+		${WRKSRC}/src/mesa/libOSMesa.la
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -25,7 +24,7 @@ CONFIGURE_ARGS+=	--disable-sparc
 .endif
 
 pre-build:
-	${RM} -fr ${WRKSRC}/src/glu
+	cd ${WRKSRC} && ${RM} -fr src/glu src/glut progs
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/GL
diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST
index 0ca51f1cf26..cb60d731c66 100644
--- a/graphics/MesaLib/PLIST
+++ b/graphics/MesaLib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2004/01/20 02:48:33 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/01/22 12:58:19 adam Exp $
 include/GL/gl.h
 include/GL/gl_mangle.h
 include/GL/glext.h
@@ -9,15 +9,18 @@ include/GL/osmesa.h
 include/GL/xmesa.h
 include/GL/xmesa_x.h
 include/GL/xmesa_xf86.h
-lib/libGL_pic.a
+lib/libGL.a
+lib/libGL.la
 lib/libGL.so
 lib/libGL.so.1
 lib/libGL.so.1.5
-lib/libGLw_pic.a
+lib/libGLw.a
+lib/libGLw.la
 lib/libGLw.so
 lib/libGLw.so.1
 lib/libGLw.so.1.0
-lib/libOSMesa_pic.a
+lib/libOSMesa.a
+lib/libOSMesa.la
 lib/libOSMesa.so
 lib/libOSMesa.so.6
 lib/libOSMesa.so.6.0
diff --git a/graphics/MesaLib/buildlink2.mk b/graphics/MesaLib/buildlink2.mk
index 02882bac7b0..c2bf7de8492 100644
--- a/graphics/MesaLib/buildlink2.mk
+++ b/graphics/MesaLib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.17 2003/11/23 07:22:10 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.18 2004/01/22 12:58:19 adam Exp $
 
 .if !defined(MESALIB_BUILDLINK2_MK)
 MESALIB_BUILDLINK2_MK=	# defined
@@ -24,6 +24,7 @@ BUILDLINK_FILES.MesaLib+=	include/GL/xmesa.h
 BUILDLINK_FILES.MesaLib+=	include/GL/xmesa_x.h
 BUILDLINK_FILES.MesaLib+=	include/GL/xmesa_xf86.h
 BUILDLINK_FILES.MesaLib+=	lib/libGL.*
+BUILDLINK_FILES.MesaLib+=	lib/libGLw.*
 BUILDLINK_FILES.MesaLib+=	lib/libOSMesa.*
 
 USE_X11=			# defined
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 9fc28ce7562..a548b27d125 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.17 2004/01/20 03:46:38 jschauma Exp $
+$NetBSD: distinfo,v 1.18 2004/01/22 12:58:19 adam 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) = fb0c20f46b1a060d559d7157c991ab1d10aac28a
-SHA1 (patch-ab) = 0426be52c00f40b9a631813d3cbdf2cee47c39cb
+SHA1 (patch-ab) = c1c17e4a752d895a173dd217397b2ce2bcabf915
 SHA1 (patch-ac) = 97d7257c14998706f725bc8420bd4b34ee27dba4
+SHA1 (patch-ad) = d2857f354c1f42b69b38fbb4d69edb1301e14b65
+SHA1 (patch-ae) = 0cd3971c7d379733811a6033255529e529932146
+SHA1 (patch-af) = dc9b8fd55d6fd31d9ff14897afe21e4447bad129
+SHA1 (patch-ag) = 4efec519cf8ea515af21cd01cd51c866e169ae02
diff --git a/graphics/MesaLib/patches/patch-ab b/graphics/MesaLib/patches/patch-ab
index c7b7d52f4f6..ad68e85bb77 100644
--- a/graphics/MesaLib/patches/patch-ab
+++ b/graphics/MesaLib/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2004/01/20 02:48:33 jschauma Exp $
+$NetBSD: patch-ab,v 1.10 2004/01/22 12:58:19 adam Exp $
 
---- Make-config.orig	2004-01-15 09:23:54.000000000 -0500
-+++ Make-config	2004-01-19 18:29:14.000000000 -0500
-@@ -778,19 +778,14 @@
+--- Make-config.orig	2004-01-15 14:23:54.000000000 +0000
++++ Make-config
+@@ -778,19 +778,14 @@ mklinux:
  	"GLUT_CFLAGS = -fexceptions" \
  	"APP_LIB_DEPS = -lmoto -L/usr/X11/lib -lXmu -lX11 -lm"
  
diff --git a/graphics/MesaLib/patches/patch-ad b/graphics/MesaLib/patches/patch-ad
new file mode 100644
index 00000000000..103a389834b
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-ad
@@ -0,0 +1,42 @@
+$NetBSD: patch-ad,v 1.3 2004/01/22 12:58:53 adam Exp $
+
+--- src/mesa/Makefile.X11.orig	2004-01-08 23:39:39.000000000 +0000
++++ src/mesa/Makefile.X11
+@@ -53,10 +53,10 @@ OBJECTS = \
+ ##### RULES #####
+ 
+ .c.o:
+-	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
++	${LIBTOOL} --mode=compile $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
+ 
+ .S.o:
+-	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
++	${LIBTOOL} --mode=compile $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
+ 
+ 
+ # need some special rules here, unfortunately
+@@ -95,19 +95,16 @@ targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$
+ 
+ # Make the GL library
+ $(LIBDIR)/$(GL_LIB): $(OBJECTS)
+-	$(TOP)/bin/mklib -o $(GL_LIB_NAME) -major $(GL_MAJOR) \
+-		-minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIBDIR) \
+-		$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS)
++	${LIBTOOL} --mode=link ${CC} -o ${GL_LIB:.so=.la} ${OBJECTS:.o=.lo} \
++		-rpath ${PREFIX}/lib -version-info ${GL_MAJOR}:${GL_MINOR}
+ 
+ 
+ # Make the OSMesa library
+ $(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS)
+ 	if [ ${OSMESA_LIB} ] ; then \
+-		$(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) -major $(MESA_MAJOR) \
+-			-minor $(MESA_MINOR) -patch $(GL_TINY) -L$(LIBDIR) \
+-			-l$(GL_LIB_NAME) $(OSMESA_LIB_DEPS) \
+-			-install $(LIBDIR) \
+-			$(MKLIB_OPTIONS) $(OSMESA_OBJECTS) ; \
++	    ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB:.so=.la} \
++		${OSMESA_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \
++		-version-info ${MESA_MAJOR}:${MESA_MINOR} ; \
+ 	fi
+ 
+ 
diff --git a/graphics/MesaLib/patches/patch-ae b/graphics/MesaLib/patches/patch-ae
new file mode 100644
index 00000000000..9080b1e29f9
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-ae
@@ -0,0 +1,25 @@
+$NetBSD: patch-ae,v 1.3 2004/01/22 12:58:53 adam Exp $
+
+--- src/glw/Makefile.X11.orig	2004-01-22 11:46:07.000000000 +0000
++++ src/glw/Makefile.X11
+@@ -28,7 +28,7 @@ OBJECTS = $(SOURCES:.c=.o)
+ ##### RULES #####
+ 
+ .c.o:
+-	$(CC) -c $(INCDIRS) $(CFLAGS) $<
++	${LIBTOOL} --mode=compile $(CC) -c $(INCDIRS) $(CFLAGS) $<
+ 
+ 
+ 
+@@ -45,9 +45,8 @@ targets: $(LIBDIR)/$(GLW_LIB) message
+ 
+ # Make the library
+ $(LIBDIR)/$(GLW_LIB): $(OBJECTS)
+-	$(TOP)/bin/mklib -o GLw -major $(MAJOR) -minor $(MINOR) \
+-		-patch $(TINY) $(GLW_LIB_DEPS) -install $(LIBDIR) \
+-		$(MKLIB_OPTIONS) $(OBJECTS)
++	${LIBTOOL} --mode=link ${CC} -o ${GLW_LIB:.so=.la} ${OBJECTS:.o=.lo} \
++		-rpath ${PREFIX}/lib -version-info ${MAJOR}:${MINOR}
+ 
+ 
+ message:
diff --git a/graphics/MesaLib/patches/patch-af b/graphics/MesaLib/patches/patch-af
new file mode 100644
index 00000000000..397b18922ae
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-af
@@ -0,0 +1,29 @@
+$NetBSD: patch-af,v 1.1 2004/01/22 12:58:53 adam Exp $
+
+--- src/glu/sgi/Makefile.X11.orig	2004-01-22 12:08:07.000000000 +0000
++++ src/glu/sgi/Makefile.X11
+@@ -119,9 +119,11 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS)
+ ##### RULES #####
+ 
+ .c.o:
++	${LIBTOOL} --mode=compile \
+ 	$(CC) -c $(INCDIRS) $(CFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@
+ 
+ .cc.o:
++	${LIBTOOL} --mode=compile \
+ 	$(CXX) -c $(INCDIRS) $(CXXFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@
+ 
+ 
+@@ -140,10 +142,8 @@ targets: $(LIBDIR)/$(GLU_LIB)
+ 
+ # Make the library:
+ $(LIBDIR)/$(GLU_LIB): $(OBJECTS)
+-	$(TOP)/bin/mklib -o $(GLU_LIB_NAME) -major $(GLU_MAJOR) \
+-		-minor $(GLU_MINOR) -patch $(GLU_TINY) \
+-		$(GLU_LIB_DEPS) -cplusplus -install $(LIBDIR) \
+-		$(MKLIB_OPTIONS) $(OBJECTS)
++	${LIBTOOL} --mode=link ${CXX} -o ${GLU_LIB:.so=.la} ${OBJECTS:.o=.lo} \
++		-rpath ${PREFIX}/lib -version-info ${GLU_MAJOR}:${GLU_MINOR}
+ 
+ 
+ 
diff --git a/graphics/MesaLib/patches/patch-ag b/graphics/MesaLib/patches/patch-ag
new file mode 100644
index 00000000000..6efbe15ab33
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-ag
@@ -0,0 +1,24 @@
+$NetBSD: patch-ag,v 1.1 2004/01/22 12:58:53 adam Exp $
+
+--- src/glut/glx/Makefile.X11.orig	2004-01-22 12:23:17.000000000 +0000
++++ src/glut/glx/Makefile.X11
+@@ -82,6 +82,7 @@ OBJECTS = $(SOURCES:.c=.o)
+ ##### RULES #####
+ 
+ .c.o:
++	${LIBTOOL} --mode=compile \
+ 	$(CC) -c -I$(INCDIR) $(CFLAGS) $(GLUT_CFLAGS) $<
+ 
+ 
+@@ -101,9 +102,8 @@ targets: $(LIBDIR)/$(GLUT_LIB)
+ 
+ # Make the library
+ $(LIBDIR)/$(GLUT_LIB): $(OBJECTS)
+-	$(TOP)/bin/mklib -o glut -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
+-		-patch $(GLUT_TINY) $(GLUT_LIB_DEPS) -install $(LIBDIR) \
+-		$(MKLIB_OPTIONS) $(OBJECTS)
++	${LIBTOOL} --mode=link ${CC} -o ${GLUT_LIB:.so=.la} ${OBJECTS:.o=.lo} \
++		-rpath ${PREFIX}/lib -version-info ${GLUT_MAJOR}:${GLUT_MINOR}
+ 
+ include $(TOP)/Make-config
+