5 files changed, 124 insertions, 4 deletions
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
+