Changes 6.0.1:

New:
- upgraded glext.h to version 22
- new build targets (Dan Schikore)
- new linux-x86-opteron build target (Heath Feather)
Bug fixes:
- glBindProgramARB didn't update all necessary state
- fixed build problems on OpenBSD
- omit CVS directories from tarballs
- glGetTexImage(GL_COLOR_INDEX) was broken
- fixed an infinite loop in t&l module
- silenced some valgrind warnings about using unitialized memory
- fixed some compilation/link glitches on IRIX (Mike Stephens)
- glBindProgram wasn't getting compiled into display lists
- GLX_FBCONFIG_ID wasn't recognized in glXChooseFBConfig() (bug 888079)
- two-sided lighting and vertex program didn't work (bug 887330)
- stores to program parameter registers in vertex state programs
  didn't work.
- fixed glOrtho bug found with gcc 3.2.2 (RH9)
- glXCreateWindow() wasn't fully implemented (bug 890894)
- generic vertex attribute arrays didn't work in display lists
- vertex buffer objects' default usage and access fields were wrong
- glDrawArrays with start!=0 was broken
- fragment program PK2H, UP2H, UP4B and UP4UB instructions were broken
- linux-osmesa16-static config didn't work
- fixed a few color index rendering problems (bug 910687)
- glInterleavedArrays didn't respect GL_CLIENT_ACTIVE_TEXTURE
- OSMesa RGB and BGR modes were broken
- glProgramStringARB mistakenly required a null-terminated string
- fragment program XPD instruction was incorrect
- glGetMaterial() didn't work reliably

13 files changed, 64 insertions, 75 deletions

diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index 37a0f7c8cb5..b9e5b2b6159 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2004/02/11 02:25:07 jlam Exp $
+# $NetBSD: Makefile.common,v 1.30 2004/04/09 13:05:52 adam Exp $
 #
 
 DISTNAME=	MesaLib-${MESA_VERSION}
@@ -9,7 +9,7 @@ CATEGORIES=	graphics
 MASTER_SITES= 	${MASTER_SITE_SOURCEFORGE:=mesa3d/}
 EXTRACT_SUFX=	.tar.bz2
 
-MESA_VERSION=	6.0
+MESA_VERSION=	6.0.1
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.mesa3d.org/
diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index 51f76f7f68b..fb5261da894 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2004/03/15 18:04:34 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/09 13:08:20 adam Exp $
 
 PKGNAME=	MesaDemos-${MESA_VERSION}
-PKGREVISION=	1
 COMMENT=	OpenGL examples and Demos
 
 PATCHDIR=		${.CURDIR}/patches
diff --git a/graphics/MesaDemos/PLIST b/graphics/MesaDemos/PLIST
index 388cf09b53c..87951832395 100644
--- a/graphics/MesaDemos/PLIST
+++ b/graphics/MesaDemos/PLIST
@@ -1,9 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2004/01/20 02:48:33 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/04/09 13:08:20 adam Exp $
 share/examples/${PKGNAME}/demos/README
-share/examples/${PKGNAME}/demos/Windows/CVS/Entries
-share/examples/${PKGNAME}/demos/Windows/CVS/Repository
-share/examples/${PKGNAME}/demos/Windows/CVS/Root
-share/examples/${PKGNAME}/demos/Windows/CVS/Template
 share/examples/${PKGNAME}/demos/Windows/all.dsp
 share/examples/${PKGNAME}/demos/Windows/bounce.dsp
 share/examples/${PKGNAME}/demos/Windows/clearspd.dsp
@@ -147,10 +143,6 @@ share/examples/${PKGNAME}/demos/winpos.c
 share/examples/${PKGNAME}/ggi/asc-view.c
 share/examples/${PKGNAME}/ggi/gears.c
 share/examples/${PKGNAME}/ggi/gears2.c
-share/examples/${PKGNAME}/images/CVS/Entries
-share/examples/${PKGNAME}/images/CVS/Repository
-share/examples/${PKGNAME}/images/CVS/Root
-share/examples/${PKGNAME}/images/CVS/Template
 share/examples/${PKGNAME}/images/bw.rgb
 share/examples/${PKGNAME}/images/girl.rgb
 share/examples/${PKGNAME}/images/reflect.rgb
@@ -403,6 +395,7 @@ share/examples/${PKGNAME}/xdemos/pbinfo.c
 share/examples/${PKGNAME}/xdemos/pbutil.c
 share/examples/${PKGNAME}/xdemos/pbutil.h
 share/examples/${PKGNAME}/xdemos/shape.c
+share/examples/${PKGNAME}/xdemos/testgl5.c
 share/examples/${PKGNAME}/xdemos/vgears.c
 share/examples/${PKGNAME}/xdemos/vindex.c
 share/examples/${PKGNAME}/xdemos/vtest.c
@@ -417,10 +410,8 @@ share/examples/${PKGNAME}/xdemos/xfont.c
 @dirrm share/examples/${PKGNAME}/util
 @dirrm share/examples/${PKGNAME}/samples
 @dirrm share/examples/${PKGNAME}/redbook
-@dirrm share/examples/${PKGNAME}/images/CVS
 @dirrm share/examples/${PKGNAME}/images
 @dirrm share/examples/${PKGNAME}/ggi
-@dirrm share/examples/${PKGNAME}/demos/Windows/CVS
 @dirrm share/examples/${PKGNAME}/demos/Windows
 @dirrm share/examples/${PKGNAME}/demos
 @dirrm share/examples/${PKGNAME}
diff --git a/graphics/MesaDemos/distinfo b/graphics/MesaDemos/distinfo
index 30855b4ef90..a1689391dc6 100644
--- a/graphics/MesaDemos/distinfo
+++ b/graphics/MesaDemos/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.9 2004/03/15 18:04:34 jlam Exp $
+$NetBSD: distinfo,v 1.10 2004/04/09 13:08:20 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 (Mesa-6.0.1/MesaLib-6.0.1.tar.bz2) = e396e28d693cd7abfe8e3d4d726dfc28b3b335a2
+Size (Mesa-6.0.1/MesaLib-6.0.1.tar.bz2) = 1496291 bytes
+SHA1 (Mesa-6.0.1/MesaDemos-6.0.1.tar.bz2) = 8831d9af0a1afbdee29838460d5340f4612d7cd6
+Size (Mesa-6.0.1/MesaDemos-6.0.1.tar.bz2) = 915558 bytes
 SHA1 (patch-aa) = 4be9b5fadff758d3bcaea22abc5a61e89ccadbe0
-SHA1 (patch-ab) = 3d53af4d2036259bb23979ad0b411af63eacbbd1
-SHA1 (patch-ac) = 97d7257c14998706f725bc8420bd4b34ee27dba4
+SHA1 (patch-ab) = 15687f90c7727d8167ca829ffb185e457e87e5d7
+SHA1 (patch-ac) = 9c780cee963a99801b3a29176c00942fc5ef938f
 SHA1 (patch-ad) = 41a417d37ad82a99a3b1e7ef4c54f052947a8a1b
 SHA1 (patch-ae) = 1cc774b4c012fa6a53b80968f94cc99780d5733b
 SHA1 (patch-af) = a66af6ebab7569d85693a9fa58b2d8f9b35149c1
diff --git a/graphics/MesaDemos/patches/patch-ab b/graphics/MesaDemos/patches/patch-ab
index 9b79706c0ba..f885ef8608c 100644
--- a/graphics/MesaDemos/patches/patch-ab
+++ b/graphics/MesaDemos/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2004/03/15 18:04:34 jlam Exp $
+$NetBSD: patch-ab,v 1.9 2004/04/09 13:08:20 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-03-30 14:47:13.000000000 +0000
++++ Make-config
+@@ -1172,19 +1172,14 @@ mklinux:
  	"GLUT_CFLAGS = -fexceptions" \
  	"APP_LIB_DEPS = -lmoto -L/usr/X11/lib -lXmu -lX11 -lm"
  
diff --git a/graphics/MesaDemos/patches/patch-ac b/graphics/MesaDemos/patches/patch-ac
index c512585aa9a..7e8986b0141 100644
--- a/graphics/MesaDemos/patches/patch-ac
+++ b/graphics/MesaDemos/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.5 2004/01/20 02:48:33 jschauma Exp $
+$NetBSD: patch-ac,v 1.6 2004/04/09 13:08:20 adam Exp $
 
---- Makefile.orig	2004-01-19 18:31:20.000000000 -0500
-+++ Makefile	2004-01-19 18:31:54.000000000 -0500
-@@ -79,7 +79,7 @@
- 	@echo "  make linux-icc             for Linux with the Intel C/C++ compiler"
+--- Makefile.orig	2004-04-02 23:29:33.000000000 +0000
++++ Makefile
+@@ -104,7 +104,7 @@ default:
+ 	@echo "  make linux-ia64-ecc-static-nothreads  for Linux IA64 with the Intel C/C++ compiler, static, no threads"
  	@echo "  make lynxos                for LynxOS systems with GCC"
  	@echo "  make mklinux               for Linux on Power Macintosh"
 -	@echo "  make netbsd                for NetBSD 1.0 systems with GCC"
@@ -11,12 +11,12 @@ $NetBSD: patch-ac,v 1.5 2004/01/20 02:48:33 jschauma Exp $
  	@echo "  make openbsd               for OpenBSD systems"
  	@echo "  make openstep              for OpenStep/MacOSX Server systems"
  	@echo "  make osf1                  for DEC Alpha systems with OSF/1"
-@@ -115,7 +115,7 @@
+@@ -152,7 +152,7 @@ linux-glide linux-x86-glide linux-glide-
  linux-alpha-static linux-alpha \
  linux-ppc-static linux-ppc \
  linux-sparc linux-sparc5 linux-sparc-ultra \
--mklinux netbsd osf1 openbsd qnx \
-+mklinux pkgsrc osf1 openbsd qnx \
+-mklinux netbsd osf1 osf1-nothreads openbsd qnx \
++mklinux pkgsrc osf1 osf1-nothreads openbsd qnx \
  solaris-x86 solaris-x86-gcc \
  sunos4 sunos4-sl sunos4-gcc sunos4-gcc-sl sunos4-gcc-x11r6-sl \
  sunos5 sunos5-smp sunos5-gcc sunos5-gcc-debug \
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index a548b27d125..c0873df74e5 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.18 2004/01/22 12:58:19 adam Exp $
+$NetBSD: distinfo,v 1.19 2004/04/09 13:06:06 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 (Mesa-6.0.1/MesaLib-6.0.1.tar.bz2) = e396e28d693cd7abfe8e3d4d726dfc28b3b335a2
+Size (Mesa-6.0.1/MesaLib-6.0.1.tar.bz2) = 1496291 bytes
+SHA1 (Mesa-6.0.1/MesaDemos-6.0.1.tar.bz2) = 8831d9af0a1afbdee29838460d5340f4612d7cd6
+Size (Mesa-6.0.1/MesaDemos-6.0.1.tar.bz2) = 915558 bytes
 SHA1 (patch-aa) = fb0c20f46b1a060d559d7157c991ab1d10aac28a
-SHA1 (patch-ab) = c1c17e4a752d895a173dd217397b2ce2bcabf915
-SHA1 (patch-ac) = 97d7257c14998706f725bc8420bd4b34ee27dba4
-SHA1 (patch-ad) = d2857f354c1f42b69b38fbb4d69edb1301e14b65
-SHA1 (patch-ae) = 0cd3971c7d379733811a6033255529e529932146
-SHA1 (patch-af) = dc9b8fd55d6fd31d9ff14897afe21e4447bad129
-SHA1 (patch-ag) = 4efec519cf8ea515af21cd01cd51c866e169ae02
+SHA1 (patch-ab) = 81919e13455eeacc8830869fc96e3e9379c2a559
+SHA1 (patch-ac) = 9c780cee963a99801b3a29176c00942fc5ef938f
+SHA1 (patch-ad) = 20f6f7eb1fc9b36d37e5aa147c3ed6914b365710
+SHA1 (patch-ae) = 21f1a8cfb13fca033196daf25e3d9183d74d6441
+SHA1 (patch-af) = c4f604ca18ead3aa0f55b68751ca6a870bfbdfe0
+SHA1 (patch-ag) = 8455363b6a7d94b43784209c21133b3015cfde70
diff --git a/graphics/MesaLib/patches/patch-ab b/graphics/MesaLib/patches/patch-ab
index ad68e85bb77..ca93eb2f385 100644
--- a/graphics/MesaLib/patches/patch-ab
+++ b/graphics/MesaLib/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.10 2004/01/22 12:58:19 adam Exp $
+$NetBSD: patch-ab,v 1.11 2004/04/09 13:06:06 adam Exp $
 
---- Make-config.orig	2004-01-15 14:23:54.000000000 +0000
+--- Make-config.orig	2004-03-30 14:47:13.000000000 +0000
 +++ Make-config
-@@ -778,19 +778,14 @@ mklinux:
+@@ -1172,19 +1172,14 @@ mklinux:
  	"GLUT_CFLAGS = -fexceptions" \
  	"APP_LIB_DEPS = -lmoto -L/usr/X11/lib -lXmu -lX11 -lm"
  
diff --git a/graphics/MesaLib/patches/patch-ac b/graphics/MesaLib/patches/patch-ac
index f3a2093ebdb..4a51d050dbf 100644
--- a/graphics/MesaLib/patches/patch-ac
+++ b/graphics/MesaLib/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.4 2004/01/20 02:48:33 jschauma Exp $
+$NetBSD: patch-ac,v 1.5 2004/04/09 13:06:06 adam Exp $
 
---- Makefile.orig	2004-01-19 18:31:20.000000000 -0500
-+++ Makefile	2004-01-19 18:31:54.000000000 -0500
-@@ -79,7 +79,7 @@
- 	@echo "  make linux-icc             for Linux with the Intel C/C++ compiler"
+--- Makefile.orig	2004-04-02 23:29:33.000000000 +0000
++++ Makefile
+@@ -104,7 +104,7 @@ default:
+ 	@echo "  make linux-ia64-ecc-static-nothreads  for Linux IA64 with the Intel C/C++ compiler, static, no threads"
  	@echo "  make lynxos                for LynxOS systems with GCC"
  	@echo "  make mklinux               for Linux on Power Macintosh"
 -	@echo "  make netbsd                for NetBSD 1.0 systems with GCC"
@@ -11,12 +11,12 @@ $NetBSD: patch-ac,v 1.4 2004/01/20 02:48:33 jschauma Exp $
  	@echo "  make openbsd               for OpenBSD systems"
  	@echo "  make openstep              for OpenStep/MacOSX Server systems"
  	@echo "  make osf1                  for DEC Alpha systems with OSF/1"
-@@ -115,7 +115,7 @@
+@@ -152,7 +152,7 @@ linux-glide linux-x86-glide linux-glide-
  linux-alpha-static linux-alpha \
  linux-ppc-static linux-ppc \
  linux-sparc linux-sparc5 linux-sparc-ultra \
--mklinux netbsd osf1 openbsd qnx \
-+mklinux pkgsrc osf1 openbsd qnx \
+-mklinux netbsd osf1 osf1-nothreads openbsd qnx \
++mklinux pkgsrc osf1 osf1-nothreads openbsd qnx \
  solaris-x86 solaris-x86-gcc \
  sunos4 sunos4-sl sunos4-gcc sunos4-gcc-sl sunos4-gcc-x11r6-sl \
  sunos5 sunos5-smp sunos5-gcc sunos5-gcc-debug \
diff --git a/graphics/MesaLib/patches/patch-ad b/graphics/MesaLib/patches/patch-ad
index 103a389834b..e4263a04ed6 100644
--- a/graphics/MesaLib/patches/patch-ad
+++ b/graphics/MesaLib/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2004/01/22 12:58:53 adam Exp $
+$NetBSD: patch-ad,v 1.4 2004/04/09 13:06:06 adam Exp $
 
---- src/mesa/Makefile.X11.orig	2004-01-08 23:39:39.000000000 +0000
+--- src/mesa/Makefile.X11.orig	2004-03-24 19:27:19.000000000 +0000
 +++ src/mesa/Makefile.X11
 @@ -53,10 +53,10 @@ OBJECTS = \
  ##### RULES #####
@@ -15,7 +15,7 @@ $NetBSD: patch-ad,v 1.3 2004/01/22 12:58:53 adam Exp $
  
  
  # need some special rules here, unfortunately
-@@ -95,19 +95,16 @@ targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$
+@@ -95,18 +95,16 @@ targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$
  
  # Make the GL library
  $(LIBDIR)/$(GL_LIB): $(OBJECTS)
@@ -30,10 +30,9 @@ $NetBSD: patch-ad,v 1.3 2004/01/22 12:58:53 adam Exp $
  $(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) ; \
+-			-minor $(MESA_MINOR) -patch $(GL_TINY) \
+-			$(MKLIB_OPTIONS) -install $(LIBDIR) \
+-			$(OSMESA_LIB_DEPS) $(OSMESA_OBJECTS) ; \
 +	    ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB:.so=.la} \
 +		${OSMESA_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \
 +		-version-info ${MESA_MAJOR}:${MESA_MINOR} ; \
diff --git a/graphics/MesaLib/patches/patch-ae b/graphics/MesaLib/patches/patch-ae
index 9080b1e29f9..672153c7bb8 100644
--- a/graphics/MesaLib/patches/patch-ae
+++ b/graphics/MesaLib/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.3 2004/01/22 12:58:53 adam Exp $
+$NetBSD: patch-ae,v 1.4 2004/04/09 13:06:06 adam Exp $
 
---- src/glw/Makefile.X11.orig	2004-01-22 11:46:07.000000000 +0000
+--- src/glw/Makefile.X11.orig	2004-03-24 20:04:30.000000000 +0000
 +++ src/glw/Makefile.X11
 @@ -28,7 +28,7 @@ OBJECTS = $(SOURCES:.c=.o)
  ##### RULES #####
@@ -16,8 +16,8 @@ $NetBSD: patch-ae,v 1.3 2004/01/22 12:58:53 adam Exp $
  # 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)
+-		-patch $(TINY) $(MKLIB_OPTIONS) -install $(LIBDIR) \
+-		$(GLW_LIB_DEPS) $(OBJECTS)
 +	${LIBTOOL} --mode=link ${CC} -o ${GLW_LIB:.so=.la} ${OBJECTS:.o=.lo} \
 +		-rpath ${PREFIX}/lib -version-info ${MAJOR}:${MINOR}
  
diff --git a/graphics/MesaLib/patches/patch-af b/graphics/MesaLib/patches/patch-af
index 397b18922ae..8c50001a4c4 100644
--- a/graphics/MesaLib/patches/patch-af
+++ b/graphics/MesaLib/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1 2004/01/22 12:58:53 adam Exp $
+$NetBSD: patch-af,v 1.2 2004/04/09 13:06:06 adam Exp $
 
---- src/glu/sgi/Makefile.X11.orig	2004-01-22 12:08:07.000000000 +0000
+--- src/glu/sgi/Makefile.X11.orig	2004-03-24 20:02:03.000000000 +0000
 +++ src/glu/sgi/Makefile.X11
 @@ -119,9 +119,11 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS)
  ##### RULES #####
@@ -20,8 +20,8 @@ $NetBSD: patch-af,v 1.1 2004/01/22 12:58:53 adam Exp $
  $(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)
+-		$(MKLIB_OPTIONS) -cplusplus -install $(LIBDIR) \
+-		$(GLU_LIB_DEPS) $(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
index 6efbe15ab33..fb639ca10cf 100644
--- a/graphics/MesaLib/patches/patch-ag
+++ b/graphics/MesaLib/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.1 2004/01/22 12:58:53 adam Exp $
+$NetBSD: patch-ag,v 1.2 2004/04/09 13:06:06 adam Exp $
 
---- src/glut/glx/Makefile.X11.orig	2004-01-22 12:23:17.000000000 +0000
+--- src/glut/glx/Makefile.X11.orig	2004-03-24 20:02:51.000000000 +0000
 +++ src/glut/glx/Makefile.X11
 @@ -82,6 +82,7 @@ OBJECTS = $(SOURCES:.c=.o)
  ##### RULES #####
@@ -15,8 +15,8 @@ $NetBSD: patch-ag,v 1.1 2004/01/22 12:58:53 adam Exp $
  # 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)
+-		-patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIBDIR) \
+-		$(GLUT_LIB_DEPS) $(OBJECTS)
 +	${LIBTOOL} --mode=link ${CC} -o ${GLUT_LIB:.so=.la} ${OBJECTS:.o=.lo} \
 +		-rpath ${PREFIX}/lib -version-info ${GLUT_MAJOR}:${GLUT_MINOR}