This is the real update for NetBSD and V2.4

4 files changed, 50 insertions, 26 deletions

diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index 6d2ea6d7522..88fa6e0a1fd 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -3,39 +3,41 @@
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
-# $NetBSD: Makefile,v 1.2 1997/11/03 00:39:10 hubertf Exp $
-# FreeBSD Id: Makefile,v 1.19 1997/09/30 19:21:40 max Exp
+# $Id: Makefile,v 1.3 1997/11/03 00:46:13 hubertf Exp $
 #
 
-DISTNAME=       Mesa-2.2
+DISTNAME=       MesaLib-2.4
+PKGNAME=	Mesa-2.4
 CATEGORIES=	graphics
 MASTER_SITES= 	ftp://iris.ssec.wisc.edu/pub/Mesa/
+DISTFILES=	MesaLib-${SHLIB_VERSION}${EXTRACT_SUFX} \
+		MesaDemos-${SHLIB_VERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.ORG
 
-ALL_TARGET=	freebsd
+WRKSRC=         ${WRKDIR}/${PKGNAME}
+ALL_TARGET=	netbsd
 USE_X11=	yes
 LIBS=		libMesaGL libMesaGLU libMesaaux libMesatk
-SHLIB_VERSION=	13.2
+SHLIB_VERSION=	2.4
 
 do-install:
 .for file in ${LIBS}
-	${INSTALL_DATA} ${WRKSRC}/lib/${file}.a ${PREFIX}/lib
-	ranlib ${PREFIX}/lib/${file}.a
+	${INSTALL_DATA} ${WRKSRC}/lib/${file}_pic.a ${PREFIX}/lib
+	ranlib ${PREFIX}/lib/${file}_pic.a
 	${INSTALL_DATA} ${WRKSRC}/lib/${file}.so.${SHLIB_VERSION} ${PREFIX}/lib
 .endfor
 .for file in GL GLU
-	@ln -fs ${PREFIX}/lib/libMesa${file}.a ${PREFIX}/lib/lib${file}.a
+	@ln -fs ${PREFIX}/lib/libMesa${file}_pic.a ${PREFIX}/lib/lib${file}_pic.a
 	@ln -fs ${PREFIX}/lib/libMesa${file}.so.${SHLIB_VERSION} ${PREFIX}/lib/lib${file}.so.${SHLIB_VERSION}
 .endfor
-	@${MKDIR} ${PREFIX}/include/GL
+	@${MKDIR} -p ${PREFIX}/include/GL
 	${INSTALL_DATA} ${WRKSRC}/include/GL/* ${PREFIX}/include/GL
-	@${MKDIR} ${PREFIX}/share/examples/Mesa
+	@${MKDIR} -p ${PREFIX}/share/examples/Mesa
 	${CP} -Rp ${WRKSRC}/samples ${PREFIX}/share/examples/Mesa
 	${CP} -Rp ${WRKSRC}/demos ${PREFIX}/share/examples/Mesa
 	${CP} -Rp ${WRKSRC}/book ${PREFIX}/share/examples/Mesa
 	${CP} -Rp ${WRKSRC}/widgets-sgi ${PREFIX}/share/examples/Mesa
-	@${RM} -f ${PREFIX}/share/examples/Mesa/widgets-sgi/Makefile~
 	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/graphics/Mesa/files/md5 b/graphics/Mesa/files/md5
index bf22cc3e41b..414e6705a1b 100644
--- a/graphics/Mesa/files/md5
+++ b/graphics/Mesa/files/md5
@@ -1 +1,2 @@
-MD5 (Mesa-2.2.tar.gz) = 6606b168dfcb15fdde7de1076d9adfa9
+MD5 (MesaLib-2.4.tar.gz) = f7dde6a4f9b41439316a632b12ce2b06
+MD5 (MesaDemos-2.4.tar.gz) = f38d5eedf88b8cc85334d929d906386b
diff --git a/graphics/Mesa/patches/patch-aa b/graphics/Mesa/patches/patch-aa
new file mode 100644
index 00000000000..cfe1e14d13c
--- /dev/null
+++ b/graphics/Mesa/patches/patch-aa
@@ -0,0 +1,11 @@
+--- Make-config.BAK	Sun Nov  2 04:30:16 1997
++++ Make-config	Sun Nov  2 04:30:34 1997
+@@ -590,7 +590,7 @@
+ 	"TK_LIB = libMesatk.so.$(VERSION)" \
+ 	"AUX_LIB = libMesaaux.so.$(VERSION)" \
+ 	"CC = gcc" \
+-	"CFLAGS = -O2 -m486 -fPIC -I/usr/X11R6/include -DHZ=100"  \
++	"CFLAGS = -O2 -fPIC -I/usr/X11R6/include -DHZ=100"  \
+ 	"MAKELIB = ../mklib.netbsd" \
+ 	"RANLIB = true" \
+ 	"XLIBS = -L/usr/X11R6/lib -lX11"
diff --git a/graphics/Mesa/pkg/PLIST b/graphics/Mesa/pkg/PLIST
index 0a9832d9281..02c067cbaee 100644
--- a/graphics/Mesa/pkg/PLIST
+++ b/graphics/Mesa/pkg/PLIST
@@ -11,22 +11,28 @@ include/GL/osmesa.h
 include/GL/svgamesa.h
 include/GL/wmesa.h
 include/GL/xmesa.h
-lib/libGL.a
-lib/libGL.so.13.2
-lib/libGLU.a
-lib/libGLU.so.13.2
-lib/libMesaGL.a
-lib/libMesaGL.so.13.2
-lib/libMesaGLU.a
-lib/libMesaGLU.so.13.2
-lib/libMesaaux.a
-lib/libMesaaux.so.13.2
-lib/libMesatk.a
-lib/libMesatk.so.13.2
+include/GL/fxmesa.h
+include/GL/mglmesa.h
+lib/libMesaGL.so.2.4
+@exec ln %D/%F %D/lib/libGL.so.2.4
+@unexec rm %D/lib/libGL.so.2.4
+lib/libMesaGLU.so.2.4
+@exec ln %D/%F %D/lib/libGLU.so.2.4
+@unexec rm %D/lib/libGLU.so.2.4
+lib/libMesaGL_pic.a
+@exec ln %D/%F %D/lib/libGL_pic.a
+@unexec rm %D/lib/libGL_pic.a
+lib/libMesaGLU_pic.a
+@exec ln %D/%F %D/lib/libGLU_pic.a
+@unexec rm %D/lib/libGLU_pic.a
+lib/libMesaaux.so.2.4
+lib/libMesaaux_pic.a
+lib/libMesatk.so.2.4
+lib/libMesatk_pic.a
 @exec ldconfig -m %B
+@unexec ldconfig -m %B
 share/examples/Mesa/book/Imakefile
 share/examples/Mesa/book/Makefile
-share/examples/Mesa/book/NOTES
 share/examples/Mesa/book/README
 share/examples/Mesa/book/accanti
 share/examples/Mesa/book/accanti.c
@@ -170,6 +176,8 @@ share/examples/Mesa/book/xfont
 share/examples/Mesa/book/xfont.c
 share/examples/Mesa/demos/Imakefile
 share/examples/Mesa/demos/Makefile
+share/examples/Mesa/demos/Makefile.DJ
+share/examples/Mesa/demos/Makefile.cygnus
 share/examples/Mesa/demos/bounce
 share/examples/Mesa/demos/bounce.c
 share/examples/Mesa/demos/clearspd.c
@@ -195,6 +203,7 @@ share/examples/Mesa/demos/osdemo
 share/examples/Mesa/demos/osdemo.c
 share/examples/Mesa/demos/reflect
 share/examples/Mesa/demos/reflect.c
+share/examples/Mesa/demos/shape.c
 share/examples/Mesa/demos/spectex.c
 share/examples/Mesa/demos/spin
 share/examples/Mesa/demos/spin.c
@@ -203,6 +212,7 @@ share/examples/Mesa/demos/stex3d.c
 share/examples/Mesa/demos/tess_demo.c
 share/examples/Mesa/demos/test0
 share/examples/Mesa/demos/test0.c
+share/examples/Mesa/demos/texcyl.c
 share/examples/Mesa/demos/texobj
 share/examples/Mesa/demos/texobj.c
 share/examples/Mesa/demos/trispd.c
@@ -219,7 +229,7 @@ share/examples/Mesa/samples/3.rgb
 share/examples/Mesa/samples/4.rgb
 share/examples/Mesa/samples/Imakefile
 share/examples/Mesa/samples/Makefile
-share/examples/Mesa/samples/NOTES
+share/examples/Mesa/samples/Makefile.DJ
 share/examples/Mesa/samples/README
 share/examples/Mesa/samples/accum
 share/examples/Mesa/samples/accum.c