11 files changed, 119 insertions, 50 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index c502833af963..f155fc6892c9 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -209,6 +209,7 @@
     SUBDIR += linux_mesa3
     SUBDIR += lodju
     SUBDIR += maverik
+    SUBDIR += mesagl
     SUBDIR += meshviewer
     SUBDIR += metapixel
     SUBDIR += mgp-gallery
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index 058a4f88a044..bdea142072e1 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	Mesa
-PORTVERSION=	3.4.2
-PORTREVISION=	2
+PORTVERSION=	5.0.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://iris.ssec.wisc.edu/pub/Mesa/ \
@@ -39,14 +38,14 @@ PLIST_SUB=	GLVER="${GLVER}" GLUTVER="${GLUTVER}"
 .include <bsd.port.pre.mk>
 
 .if ${XFREE86_VERSION} == 3
-SUB_GL=		src src-glu
+SUB_GL=		src si-glu src-glu
 INCLUDE_GL=	include
 GLVER=		14
 PLIST_SUB+=	XFREE3:=""
 .else
 SUB_GL=
 INCLUDE_GL=
-GLVER=		1
+GLVER=		2
 PLIST_SUB+=	XFREE3:="@comment "
 MAKE_ENV=	INCLUDES="-I${X11BASE}/include -I${WRKSRC}/include -DGLCALLBACKPCAST=\*"
 MAKE_ARGS=	-e
@@ -62,16 +61,14 @@ MAKE_ENV+=	SUB_GL="${SUB_GL}"		\
 pre-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
-post-configure:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/src/config.c
-
 post-install:
 .for lib in GL GLU
 	@${LN} -sf ${PREFIX}/lib/lib${lib}.so ${PREFIX}/lib/libMesa${lib}.so
 .endfor
 .if ${XFREE86_VERSION} > 3
 	${MKDIR} ${PREFIX}/include/GL
-	${INSTALL_DATA} ${WRKSRC}/include/GL/glut.h ${PREFIX}/include/GL
+	${INSTALL_DATA} ${WRKSRC}/include/GL/glutf90.h \
+		${WRKSRC}/include/GL/glut.h ${PREFIX}/include/GL
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/mesagl/distinfo b/graphics/mesagl/distinfo
index 355c390a4f71..9900d4dcf25d 100644
--- a/graphics/mesagl/distinfo
+++ b/graphics/mesagl/distinfo
@@ -1,2 +1,2 @@
-MD5 (MesaLib-3.4.2.tar.bz2) = 5bad47f1f86a87b2a35e8c8c33d97e4a
-MD5 (MesaDemos-3.4.2.tar.bz2) = b3a7b01dae8b1f09f951f9257c242b08
+MD5 (MesaLib-5.0.1.tar.bz2) = 513b4bbd7d38951f05027179063d876b
+MD5 (MesaDemos-5.0.1.tar.bz2) = 37190374a98c3c892f0698be9ca3acf0
diff --git a/graphics/mesagl/files/patch-aa b/graphics/mesagl/files/patch-aa
index 80847a17c8d3..54458f0e86bf 100644
--- a/graphics/mesagl/files/patch-aa
+++ b/graphics/mesagl/files/patch-aa
@@ -1,18 +1,37 @@
 
 $FreeBSD$
 
---- configure.orig	Fri May 18 10:51:10 2001
-+++ configure	Fri May 18 10:52:30 2001
-@@ -823,9 +823,9 @@
- MESA_MAJOR=3
- MESA_MINOR=4
- MESA_TINY=2
--LIBGL_VERSION=1:2:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY}
--LIBGLU_VERSION=1:1:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY}
--LIBGLUT_VERSION=3:7:0
-+LIBGL_VERSION=${GLVER}:0
-+LIBGLU_VERSION=${GLVER}:0
-+LIBGLUT_VERSION=${GLUTVER}:0
+--- configure.orig	Thu May  1 22:01:58 2003
++++ configure	Thu May  1 22:03:29 2003
+@@ -1406,10 +1406,10 @@
  
+ # For Mesa-specific libs like libOSMesa.
+ LIBMESA_VERSION_INFO=4:${MESA_VERSION}:0    # Mesa 5.0.1
+-LIBGL_VERSION_INFO=5:${MESA_VERSION}:4      # OpenGL 1.4
+-LIBGLU_VERSION_INFO=2:${MESA_VERSION}:1     # GLU 1.1
+-SI_GLU_VERSION_INFO=4:${MESA_VERSION}:3     # GLU 1.3
+-LIBGLUT_VERSION_INFO=10:1:7                 # GLUT 3.7
++LIBGL_VERSION_INFO=${GLVER}:0
++LIBGLU_VERSION_INFO=${GLVER}:0
++SI_GLU_VERSION_INFO=${GLVER}:0
++LIBGLUT_VERSION_INFO=${GLUTVER}:0
  
+ ac_config_headers="$ac_config_headers conf.h"
  
+@@ -6453,6 +6453,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -7221,7 +7222,7 @@
+ 
+     echo "$as_me:7222: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-    CFLAGS="$CFLAGS -D_REENTRANT -DPTHREADS"
++    CFLAGS="$CFLAGS -D_THREAD_SAFE -D_REENTRANT -DPTHREADS"
+     THREAD_LIBS="$THREAD_LIBS -lc_r"
+ else
+   echo "$as_me: failed program was:" >&5
diff --git a/graphics/mesagl/files/patch-ad b/graphics/mesagl/files/patch-ad
index 147ed95df496..0cd0c99d1261 100644
--- a/graphics/mesagl/files/patch-ad
+++ b/graphics/mesagl/files/patch-ad
@@ -1,23 +1,16 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Thu May 17 01:28:53 2001
-+++ Makefile.in	Tue Jun  5 17:34:13 2001
-@@ -95,7 +95,7 @@
+--- Makefile.in	2003/05/01 18:09:21	1.1
++++ Makefile.in	2003/05/01 18:10:49
+@@ -113,8 +113,8 @@
+ @USE_SI_GLU_TRUE@sel_sub_glu = si-glu
+ @USE_SI_GLU_FALSE@sel_sub_glu = src-glu
  
- @NEED_GLUT_TRUE@SUB_GLUT = src-glut
+-DIST_SUBDIRS = include src si-glu src-glu @glut_dir@ $(SUB_DEMOS) util
+-SUBDIRS = include src $(sel_sub_glu) $(sel_sub_glut) $(sel_sub_demos) util
++DIST_SUBDIRS = $(INCLUDE_GL) $(SUB_GL) @glut_dir@ $(SUB_DEMOS) util
++SUBDIRS = $(INCLUDE_GL) $(SUB_GL) $(sel_sub_glut) $(sel_sub_demos) util
  
--SUBDIRS = include src src-glu $(SUB_GLUT) $(DEMO_DIRS) util
-+SUBDIRS = $(INCLUDE_GL) $(SUB_GL) $(SUB_GLUT) $(DEMO_DIRS) util
+ EXTRA_DIST =  	3Dfx 	BeOS 	OpenStep 	WIN32 	docs 	ggi 	images 	m4 	macos 	mtdemos 	src-glut.beos 	src-glut.dja 	tests 	vms 	widgets-mesa 	widgets-sgi 	bootstrap 	MESADOS.BAT 	MESAFX.BAT 	Make-config 	Makefile.DJ 	Makefile.X11 	Makefile.dja 	Makefile.win 	Mingw32.bat 	Names.win 	STARTUP.MK 	common.dja 	descrip.mms 	fixam 	mesaw32.BAT 	mesawin32.mak 	mms-config 	win32-openstep.sh 	xlib.opt
  
- EXTRA_DIST = docs/INSTALL docs/INSTALL.GNU docs/CONFIG docs/IAFA-PACKAGE 	docs/RELNOTES docs/VERSIONS docs/CONFORM  docs/COPYING 	docs/COPYRIGHT docs/README docs/README.3DFX docs/README.BEOS 	docs/README.GGI docs/README.MINGW32 docs/README.MITS 	docs/README.QUAKE docs/README.THREADS docs/README.X11 	images/girl.rgb images/reflect.rgb images/tile.rgb
- 
-@@ -113,7 +113,7 @@
- 
- TAR = gtar
- GZIP_ENV = --best
--DIST_SUBDIRS =  include src src-glu src-glut book demos samples xdemos \
-+DIST_SUBDIRS =  $(INCLUDE_GL) $(SUB_GL) src-glut book demos samples xdemos \
- util
- all: all-redirect
- .SUFFIXES:
diff --git a/graphics/mesagl/files/patch-ae b/graphics/mesagl/files/patch-ae
deleted file mode 100644
index 295ebbb601f6..000000000000
--- a/graphics/mesagl/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/config.c	2000/09/11 12:25:04	1.1
-+++ src/config.c	2000/09/11 12:25:27
-@@ -406,7 +406,7 @@
- #if defined(__WIN32__) || defined(__MSDOS__)
-    const char *filename = "mesa.cnf";
- #else
--   const char *filename = "/etc/mesa.conf"; 
-+   const char *filename = "%%PREFIX%%/etc/mesa.conf"; 
- #endif   
-    FILE *file;
-    struct cnode *list;
diff --git a/graphics/mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in b/graphics/mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in
new file mode 100644
index 000000000000..4f6c1b8ffcc7
--- /dev/null
+++ b/graphics/mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- si-glu/libnurbs/interface/Makefile.in	2003/05/01 18:57:58	1.1
++++ si-glu/libnurbs/interface/Makefile.in	2003/05/01 18:58:36
+@@ -114,7 +114,7 @@
+ 
+ # Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging
+ # switches. grep LIBRARYBUILD `find .. -name '*.h'` for details.
+-CXXFLAGS =  -DLIBRARYBUILD -DNDEBUG
++CXXFLAGS =  -DLIBRARYBUILD -DNDEBUG @CXXFLAGS@
+ 
+ libNIFac_la_SOURCES =  	bezierEval.cc 	bezierEval.h 	bezierPatch.cc 	bezierPatch.h 	bezierPatchMesh.cc 	bezierPatchMesh.h 	glcurveval.cc 	glcurveval.h 	glinterface.cc 	glrenderer.cc 	glrenderer.h 	glsurfeval.cc 	glsurfeval.h 	incurveeval.cc 	insurfeval.cc 	glimports.h 	mystdio.h 	mystdlib.h
+ 
diff --git a/graphics/mesagl/files/patch-si-glu::libnurbs::internals::Makefile.in b/graphics/mesagl/files/patch-si-glu::libnurbs::internals::Makefile.in
new file mode 100644
index 000000000000..a05d626d55a5
--- /dev/null
+++ b/graphics/mesagl/files/patch-si-glu::libnurbs::internals::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- si-glu/libnurbs/internals/Makefile.in	2003/05/01 18:57:58	1.1
++++ si-glu/libnurbs/internals/Makefile.in	2003/05/01 18:58:42
+@@ -114,7 +114,7 @@
+ 
+ # Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging
+ # switches. grep LIBRARYBUILD `find .. -name '*.h'` for details.
+-CXXFLAGS =  -DLIBRARYBUILD -DNDEBUG
++CXXFLAGS =  -DLIBRARYBUILD -DNDEBUG @CXXFLAGS@
+ 
+ libNInt_la_SOURCES =  	arc.cc 	arc.h 	arcsorter.cc 	arcsorter.h 	arctess.cc 	arctess.h 	backend.cc 	backend.h 	basiccrveval.cc 	basiccrveval.h 	basicsurfeval.cc 	basicsurfeval.h 	bezierarc.h 	bin.cc 	bin.h 	bufpool.cc 	bufpool.h 	cachingeval.cc 	cachingeval.h 	ccw.cc 	coveandtiler.cc 	coveandtiler.h 	curve.cc 	curve.h 	curvelist.cc 	curvelist.h 	curvesub.cc 	dataTransform.cc 	dataTransform.h 	defines.h 	displaylist.cc 	displaylist.h 	displaymode.h 	flist.cc 	flist.h 	flistsorter.cc 	flistsorter.h 	gridline.h 	gridtrimvertex.h 	gridvertex.h 	hull.cc 	hull.h 	intersect.cc 	jarcloc.h 	knotvector.cc 	knotvector.h 	mapdesc.cc 	mapdesc.h 	mapdescv.cc 	maplist.cc 	maplist.h 	mesher.cc 	mesher.h 	monoTriangulationBackend.cc 	monotonizer.cc 	monotonizer.h 	myassert.h 	mycode.cc 	mymath.h 	mysetjmp.h 	mystring.h 	nurbsconsts.h 	nurbsinterfac.cc 	nurbstess.cc 	nurbstess.h 	patch.cc 	patch.h 	patchlist.cc 	patchlist.h 	pwlarc.h 	quilt.cc 	quilt.h 	reader.cc 	reader.h 	renderhints.cc 	renderhints.h 	simplemath.h 	slicer.cc 	slicer.h 	sorter.cc 	sorter.h 	splitarcs.cc 	subdivider.cc 	subdivider.h 	tobezier.cc 	trimline.cc 	trimline.h 	trimregion.cc 	trimregion.h 	trimvertex.h 	trimvertpool.cc 	trimvertpool.h 	types.h 	uarray.cc 	uarray.h 	varray.cc 	varray.h
+ 
diff --git a/graphics/mesagl/files/patch-si-glu::libtess::memalloc.h b/graphics/mesagl/files/patch-si-glu::libtess::memalloc.h
new file mode 100644
index 000000000000..9ab581ae36a5
--- /dev/null
+++ b/graphics/mesagl/files/patch-si-glu::libtess::memalloc.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- si-glu/libtess/memalloc.h.orig	Fri Nov 30 21:35:22 2001
++++ si-glu/libtess/memalloc.h	Thu May  1 22:00:25 2003
+@@ -42,7 +42,7 @@
+ #ifndef __memalloc_simple_h_
+ #define __memalloc_simple_h_
+ 
+-#if defined(__VMS) || defined(darwin)
++#if defined(__VMS) || defined(darwin) || defined(__FreeBSD__)
+ # include <stdlib.h>
+ #else
+ # include <malloc.h>
diff --git a/graphics/mesagl/files/patch-src-glut::glutbitmap.h b/graphics/mesagl/files/patch-src-glut::glutbitmap.h
new file mode 100644
index 000000000000..f781759cf43c
--- /dev/null
+++ b/graphics/mesagl/files/patch-src-glut::glutbitmap.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src-glut/glutbitmap.h	2003/05/01 18:41:40	1.1
++++ src-glut/glutbitmap.h	2003/05/01 18:42:58
+@@ -9,7 +9,7 @@
+ 
+ #define GLUT_NO_LIB_PRAGMA  /* Avoid auto library linking when building
+                                the GLUT library itself. */
+-#include <GL/glut.h>
++#include "../include/GL/glut.h"
+ 
+ typedef struct {
+   const GLsizei width;
diff --git a/graphics/mesagl/files/patch-src-glut::glutint.h b/graphics/mesagl/files/patch-src-glut::glutint.h
new file mode 100644
index 000000000000..1db32532ef3e
--- /dev/null
+++ b/graphics/mesagl/files/patch-src-glut::glutint.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src-glut/glutint.h	2003/05/01 18:41:40	1.1
++++ src-glut/glutint.h	2003/05/01 18:42:48
+@@ -27,7 +27,7 @@
+ #endif
+ 
+ #define GLUT_BUILDING_LIB  /* Building the GLUT library itself. */
+-#include <GL/glut.h>
++#include "../include/GL/glut.h"
+ 
+ #if defined(MESA) && defined(_WIN32) && !defined(__CYGWIN32__)
+ #include <gl/mesa_wgl.h>