Upgrade to Mesa-3.1

Submitted by:	Will Andrews <andrews@technologist.com>
PR:		ports/17029

8 files changed, 84 insertions, 208 deletions

diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile
index d5c33bb99089..e92df7a5bda0 100644
--- a/graphics/Mesa3/Makefile
+++ b/graphics/Mesa3/Makefile
@@ -1,53 +1,39 @@
 # New ports collection makefile for:    Mesa
-# Version required:     3.0
+# Version required:     3.1
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
 # $FreeBSD$
 #
 
-DISTNAME=       MesaLib-3.0
-PKGNAME=	Mesa-3.0
+DISTNAME=	MesaLib-${VERSION}
+PKGNAME=	Mesa-${VERSION}
 CATEGORIES=	graphics
-MASTER_SITES= 	ftp://iris.ssec.wisc.edu/pub/Mesa/ \
+MASTER_SITES= 	http://download.sourceforge.net/mesa3d/ \
+		ftp://iris.ssec.wisc.edu/pub/Mesa/ \
 		ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} MesaDemos-3.0.tar.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} MesaDemos-${VERSION}.tar.gz
 
 MAINTAINER=	jseger@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/Mesa-3.0
-
-USE_X_PREFIX=	yes
-LIBS=		libMesaGL libMesaGLU
-
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-ALL_TARGET=	freebsd-elf
-SHLIB_VERSION=	14
-GLUT_VERSION=	3
-.else
-ALL_TARGET=	freebsd
-SHLIB_VERSION=	14.0
-GLUT_VERSION=	3.7
+.if defined(WANT_GGI)
+LIB_DEPENDS=	ggi.2:${PORTSDIR}/graphics/libggi
+CONFIGURE_ARGS+=--with-ggi=${LOCALBASE}
 .endif
 
-do-install:
-.for file in ${LIBS}
-	${INSTALL_DATA} ${WRKSRC}/lib/${file}.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/lib/${file}.so.${SHLIB_VERSION} ${PREFIX}/lib
-	${LN} -fs ${file}.so.${SHLIB_VERSION} ${PREFIX}/lib/${file}.so
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/lib/libglut.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/lib/libglut.so.${GLUT_VERSION} ${PREFIX}/lib
-	${LN} -fs libglut.so.${GLUT_VERSION} ${PREFIX}/lib/libglut.so
-.for file in GL GLU
-	@${LN} -fs libMesa${file}.a ${PREFIX}/lib/lib${file}.a
-	@${LN} -fs libMesa${file}.so.${SHLIB_VERSION} ${PREFIX}/lib/lib${file}.so.${SHLIB_VERSION}
-	@${LN} -fs libMesa${file}.so ${PREFIX}/lib/lib${file}.so
+VERSION=	3.1
+GLVER=		14
+GLUTVER=	3
+WRKSRC=		${WRKDIR}/${PKGNAME}
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV+=	GLVER="${GLVER}" GLUTVER="${GLUTVER}"
+PLIST_SUB=	GLVER="${GLVER}" GLUTVER="${GLUTVER}"
+
+post-install:
+.for lib in GL GLU
+	@${LN} -sf ${PREFIX}/lib/lib${lib}.so ${PREFIX}/lib/libMesa${lib}.so
 .endfor
-	@${MKDIR} ${PREFIX}/include/GL
-	${INSTALL_DATA} ${WRKSRC}/include/GL/* ${PREFIX}/include/GL
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/Mesa3/distinfo b/graphics/Mesa3/distinfo
index da0505ee8322..80a26e0c3900 100644
--- a/graphics/Mesa3/distinfo
+++ b/graphics/Mesa3/distinfo
@@ -1,2 +1,2 @@
-MD5 (MesaLib-3.0.tar.gz) = 34af82a8ab6b8283ea77855f3fdf7ef5
-MD5 (MesaDemos-3.0.tar.gz) = 6ec326092bf8f634a23f7203dc66baad
+MD5 (MesaLib-3.1.tar.gz) = 39af22bdf42f280f20afcacfa7ba4599
+MD5 (MesaDemos-3.1.tar.gz) = c788d5206acf290439f718d5f447724c
diff --git a/graphics/Mesa3/files/patch-aa b/graphics/Mesa3/files/patch-aa
index aacc22812ada..37fef9a37850 100644
--- a/graphics/Mesa3/files/patch-aa
+++ b/graphics/Mesa3/files/patch-aa
@@ -1,51 +1,15 @@
---- Make-config.orig	Sun Aug 30 05:27:56 1998
-+++ Make-config	Wed Sep 30 14:50:03 1998
-@@ -1,8 +1,12 @@
- # Make-config
+--- configure	Tue Dec 14 14:20:48 1999
++++ configure.new	Sat Feb 26 00:34:51 2000
+@@ -815,9 +815,9 @@
  
--MAJOR=3
-+MAJOR=14
- MINOR=0
-+.if ${PORTOBJFORMAT} == "elf"
-+VERSION=$(MAJOR)
-+.else
- VERSION=$(MAJOR).$(MINOR)
-+.endif
  
- # Mesa 3-D graphics library
- # Copyright (C) 1995-1998  Brian Paul
-@@ -281,6 +285,16 @@
- 	"MAKELIB = ../mklib.freebsd" \
- 	"XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11"
+ # CURRENT:REVISION:AGE
+-LIBGL_VERSION=3:0:2
+-LIBGLU_VERSION=3:0:2
+-LIBGLUT_VERSION=10:0:7
++LIBGL_VERSION=${GLVER}:0
++LIBGLU_VERSION=${GLVER}:0
++LIBGLUT_VERSION=${GLUTVER}:0
+ 
  
-+freebsd-elf:
-+	$(MAKE) $(MFLAGS) targets \
-+	"GL_LIB = libMesaGL.a" \
-+	"GLU_LIB = libMesaGLU.a" \
-+	"GLUT_LIB = libglut.a" \
-+	"CC = gcc" \
-+	"CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DSHM -DHZ=100" \
-+	"MAKELIB = ../mklib.freebsd" \
-+	"XLIBS = -Wl,-rpath,${X11BASE}/lib -L${X11BASE}/lib -lXext -lXmu -lXi -lX11"
-+
- freebsd-386:
- 	$(MAKE) $(MFLAGS) targets \
- 	"GL_LIB = libMesaGL.a" \
-@@ -291,6 +305,17 @@
- 	"MAKELIB = ../mklib.freebsd" \
- 	"XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11" \
- 	"ASM_SOURCES = asm_386.S"
-+
-+freebsd-386-elf:
-+	$(MAKE) $(MFLAGS) targets \
-+	"GL_LIB = libMesaGL.a" \
-+	"GLU_LIB = libMesaGLU.a" \
-+	"GLUT_LIB = libglut.a" \
-+	"CC = gcc" \
-+	"CFLAGS = -O3 -ffast-math -fPIC -pedantic -I/usr/X11R6/include -DSHM -DHZ=100 -DUSE_X86_ASM" \
-+	"MAKELIB = ../mklib.freebsd" \
-+	"XLIBS = -Wl,-rpath,${X11BASE}/lib -L${X11BASE}/lib -lXext -lXmu -lXi -lX11" \
-+	"ASM_SOURCES = asm_386.S"
  
- gcc:
- 	$(MAKE) $(MFLAGS) targets \
diff --git a/graphics/Mesa3/pkg-plist b/graphics/Mesa3/pkg-plist
index edb1058ff41c..5cc62af5e9fc 100644
--- a/graphics/Mesa3/pkg-plist
+++ b/graphics/Mesa3/pkg-plist
@@ -1,7 +1,4 @@
-include/GL/dosmesa.h
-include/GL/foomesa.h
-include/GL/fxmesa.h
-include/GL/ggimesa.h
+etc/mesa.conf
 include/GL/gl.h
 include/GL/gl_mangle.h
 include/GL/glu.h
@@ -9,27 +6,18 @@ include/GL/glu_mangle.h
 include/GL/glut.h
 include/GL/glx.h
 include/GL/glx_mangle.h
-include/GL/mglmesa.h
 include/GL/osmesa.h
-include/GL/osmesa3.h
-include/GL/svgamesa.h
-include/GL/wmesa.h
 include/GL/xmesa.h
-lib/libGL.a
+include/GL/xmesa_x.h
+include/GL/xmesa_xf86.h
 lib/libGL.so
-lib/libGL.so.14
-lib/libGLU.a
+lib/libGL.so.%%GLVER%%
 lib/libGLU.so
-lib/libGLU.so.14
-lib/libMesaGL.a
+lib/libGLU.so.%%GLVER%%
 lib/libMesaGL.so
-lib/libMesaGL.so.14
-lib/libMesaGLU.a
 lib/libMesaGLU.so
-lib/libMesaGLU.so.14
-lib/libglut.a
 lib/libglut.so
-lib/libglut.so.3.7
+lib/libglut.so.%%GLUTVER%%
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm include/GL
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index d5c33bb99089..e92df7a5bda0 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -1,53 +1,39 @@
 # New ports collection makefile for:    Mesa
-# Version required:     3.0
+# Version required:     3.1
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
 # $FreeBSD$
 #
 
-DISTNAME=       MesaLib-3.0
-PKGNAME=	Mesa-3.0
+DISTNAME=	MesaLib-${VERSION}
+PKGNAME=	Mesa-${VERSION}
 CATEGORIES=	graphics
-MASTER_SITES= 	ftp://iris.ssec.wisc.edu/pub/Mesa/ \
+MASTER_SITES= 	http://download.sourceforge.net/mesa3d/ \
+		ftp://iris.ssec.wisc.edu/pub/Mesa/ \
 		ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} MesaDemos-3.0.tar.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} MesaDemos-${VERSION}.tar.gz
 
 MAINTAINER=	jseger@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/Mesa-3.0
-
-USE_X_PREFIX=	yes
-LIBS=		libMesaGL libMesaGLU
-
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-ALL_TARGET=	freebsd-elf
-SHLIB_VERSION=	14
-GLUT_VERSION=	3
-.else
-ALL_TARGET=	freebsd
-SHLIB_VERSION=	14.0
-GLUT_VERSION=	3.7
+.if defined(WANT_GGI)
+LIB_DEPENDS=	ggi.2:${PORTSDIR}/graphics/libggi
+CONFIGURE_ARGS+=--with-ggi=${LOCALBASE}
 .endif
 
-do-install:
-.for file in ${LIBS}
-	${INSTALL_DATA} ${WRKSRC}/lib/${file}.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/lib/${file}.so.${SHLIB_VERSION} ${PREFIX}/lib
-	${LN} -fs ${file}.so.${SHLIB_VERSION} ${PREFIX}/lib/${file}.so
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/lib/libglut.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/lib/libglut.so.${GLUT_VERSION} ${PREFIX}/lib
-	${LN} -fs libglut.so.${GLUT_VERSION} ${PREFIX}/lib/libglut.so
-.for file in GL GLU
-	@${LN} -fs libMesa${file}.a ${PREFIX}/lib/lib${file}.a
-	@${LN} -fs libMesa${file}.so.${SHLIB_VERSION} ${PREFIX}/lib/lib${file}.so.${SHLIB_VERSION}
-	@${LN} -fs libMesa${file}.so ${PREFIX}/lib/lib${file}.so
+VERSION=	3.1
+GLVER=		14
+GLUTVER=	3
+WRKSRC=		${WRKDIR}/${PKGNAME}
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV+=	GLVER="${GLVER}" GLUTVER="${GLUTVER}"
+PLIST_SUB=	GLVER="${GLVER}" GLUTVER="${GLUTVER}"
+
+post-install:
+.for lib in GL GLU
+	@${LN} -sf ${PREFIX}/lib/lib${lib}.so ${PREFIX}/lib/libMesa${lib}.so
 .endfor
-	@${MKDIR} ${PREFIX}/include/GL
-	${INSTALL_DATA} ${WRKSRC}/include/GL/* ${PREFIX}/include/GL
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/mesagl/distinfo b/graphics/mesagl/distinfo
index da0505ee8322..80a26e0c3900 100644
--- a/graphics/mesagl/distinfo
+++ b/graphics/mesagl/distinfo
@@ -1,2 +1,2 @@
-MD5 (MesaLib-3.0.tar.gz) = 34af82a8ab6b8283ea77855f3fdf7ef5
-MD5 (MesaDemos-3.0.tar.gz) = 6ec326092bf8f634a23f7203dc66baad
+MD5 (MesaLib-3.1.tar.gz) = 39af22bdf42f280f20afcacfa7ba4599
+MD5 (MesaDemos-3.1.tar.gz) = c788d5206acf290439f718d5f447724c
diff --git a/graphics/mesagl/files/patch-aa b/graphics/mesagl/files/patch-aa
index aacc22812ada..37fef9a37850 100644
--- a/graphics/mesagl/files/patch-aa
+++ b/graphics/mesagl/files/patch-aa
@@ -1,51 +1,15 @@
---- Make-config.orig	Sun Aug 30 05:27:56 1998
-+++ Make-config	Wed Sep 30 14:50:03 1998
-@@ -1,8 +1,12 @@
- # Make-config
+--- configure	Tue Dec 14 14:20:48 1999
++++ configure.new	Sat Feb 26 00:34:51 2000
+@@ -815,9 +815,9 @@
  
--MAJOR=3
-+MAJOR=14
- MINOR=0
-+.if ${PORTOBJFORMAT} == "elf"
-+VERSION=$(MAJOR)
-+.else
- VERSION=$(MAJOR).$(MINOR)
-+.endif
  
- # Mesa 3-D graphics library
- # Copyright (C) 1995-1998  Brian Paul
-@@ -281,6 +285,16 @@
- 	"MAKELIB = ../mklib.freebsd" \
- 	"XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11"
+ # CURRENT:REVISION:AGE
+-LIBGL_VERSION=3:0:2
+-LIBGLU_VERSION=3:0:2
+-LIBGLUT_VERSION=10:0:7
++LIBGL_VERSION=${GLVER}:0
++LIBGLU_VERSION=${GLVER}:0
++LIBGLUT_VERSION=${GLUTVER}:0
+ 
  
-+freebsd-elf:
-+	$(MAKE) $(MFLAGS) targets \
-+	"GL_LIB = libMesaGL.a" \
-+	"GLU_LIB = libMesaGLU.a" \
-+	"GLUT_LIB = libglut.a" \
-+	"CC = gcc" \
-+	"CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DSHM -DHZ=100" \
-+	"MAKELIB = ../mklib.freebsd" \
-+	"XLIBS = -Wl,-rpath,${X11BASE}/lib -L${X11BASE}/lib -lXext -lXmu -lXi -lX11"
-+
- freebsd-386:
- 	$(MAKE) $(MFLAGS) targets \
- 	"GL_LIB = libMesaGL.a" \
-@@ -291,6 +305,17 @@
- 	"MAKELIB = ../mklib.freebsd" \
- 	"XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11" \
- 	"ASM_SOURCES = asm_386.S"
-+
-+freebsd-386-elf:
-+	$(MAKE) $(MFLAGS) targets \
-+	"GL_LIB = libMesaGL.a" \
-+	"GLU_LIB = libMesaGLU.a" \
-+	"GLUT_LIB = libglut.a" \
-+	"CC = gcc" \
-+	"CFLAGS = -O3 -ffast-math -fPIC -pedantic -I/usr/X11R6/include -DSHM -DHZ=100 -DUSE_X86_ASM" \
-+	"MAKELIB = ../mklib.freebsd" \
-+	"XLIBS = -Wl,-rpath,${X11BASE}/lib -L${X11BASE}/lib -lXext -lXmu -lXi -lX11" \
-+	"ASM_SOURCES = asm_386.S"
  
- gcc:
- 	$(MAKE) $(MFLAGS) targets \
diff --git a/graphics/mesagl/pkg-plist b/graphics/mesagl/pkg-plist
index edb1058ff41c..5cc62af5e9fc 100644
--- a/graphics/mesagl/pkg-plist
+++ b/graphics/mesagl/pkg-plist
@@ -1,7 +1,4 @@
-include/GL/dosmesa.h
-include/GL/foomesa.h
-include/GL/fxmesa.h
-include/GL/ggimesa.h
+etc/mesa.conf
 include/GL/gl.h
 include/GL/gl_mangle.h
 include/GL/glu.h
@@ -9,27 +6,18 @@ include/GL/glu_mangle.h
 include/GL/glut.h
 include/GL/glx.h
 include/GL/glx_mangle.h
-include/GL/mglmesa.h
 include/GL/osmesa.h
-include/GL/osmesa3.h
-include/GL/svgamesa.h
-include/GL/wmesa.h
 include/GL/xmesa.h
-lib/libGL.a
+include/GL/xmesa_x.h
+include/GL/xmesa_xf86.h
 lib/libGL.so
-lib/libGL.so.14
-lib/libGLU.a
+lib/libGL.so.%%GLVER%%
 lib/libGLU.so
-lib/libGLU.so.14
-lib/libMesaGL.a
+lib/libGLU.so.%%GLVER%%
 lib/libMesaGL.so
-lib/libMesaGL.so.14
-lib/libMesaGLU.a
 lib/libMesaGLU.so
-lib/libMesaGLU.so.14
-lib/libglut.a
 lib/libglut.so
-lib/libglut.so.3.7
+lib/libglut.so.%%GLUTVER%%
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm include/GL