- Update to 5.0.2.

- Slightly adjust CONFLICTS.
- IGNORE only when PACKAGE_BUILDING.

PR:		94036
Submitted by:	Pedro F. Giffuni <giffunip@asme.org>
Approved by:	arved (mentor)

4 files changed, 24 insertions, 47 deletions

diff --git a/graphics/mesagl/files/patch-aa b/graphics/mesagl/files/patch-aa
index b3a8a6f07baa..d63f547591fc 100644
--- a/graphics/mesagl/files/patch-aa
+++ b/graphics/mesagl/files/patch-aa
@@ -1,12 +1,9 @@
-
-$FreeBSD$
-
---- configure.orig	Thu May  1 22:01:58 2003
-+++ configure	Thu May  1 22:03:29 2003
-@@ -1406,10 +1406,10 @@
+--- configure.orig	Fri Nov  7 12:00:34 2003
++++ configure	Thu Mar  2 16:13:38 2006
+@@ -1885,10 +1885,10 @@
  
  # For Mesa-specific libs like libOSMesa.
- LIBMESA_VERSION_INFO=4:${MESA_VERSION}:0    # Mesa 5.0.1
+ LIBMESA_VERSION_INFO=4:${MESA_VERSION}:0    # Mesa 5.0.2
 -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
@@ -16,9 +13,9 @@ $FreeBSD$
 +SI_GLU_VERSION_INFO=${GLVER}:0
 +LIBGLUT_VERSION_INFO=${GLUTVER}:0
  
- ac_config_headers="$ac_config_headers conf.h"
  
-@@ -6453,6 +6453,7 @@
+ 
+@@ -7920,6 +7920,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -26,9 +23,9 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7221,7 +7222,7 @@
+@@ -8849,7 +8850,7 @@
  
-     echo "$as_me:7222: result: yes" >&5
+     echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
 -    CFLAGS="$CFLAGS -D_REENTRANT -DPTHREADS"
 +    CFLAGS="$CFLAGS -D_THREAD_SAFE -D_REENTRANT -DPTHREADS"
diff --git a/graphics/mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in b/graphics/mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in
index 4f6c1b8ffcc7..b85f82fabfda 100644
--- a/graphics/mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in
+++ b/graphics/mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in
@@ -1,14 +1,11 @@
-
-$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 @@
+--- si-glu/libnurbs/interface/Makefile.in.orig	Fri Nov  7 11:58:16 2003
++++ si-glu/libnurbs/interface/Makefile.in	Thu Mar  2 16:38:17 2006
+@@ -201,7 +201,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
- 
+-AM_CXXFLAGS = -DLIBRARYBUILD -DNDEBUG
++AM_CXXFLAGS = -DLIBRARYBUILD -DNDEBUG @CXXFLAGS@
+ libNIFac_la_SOURCES = \
+ 	bezierEval.cc \
+ 	bezierEval.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
index a05d626d55a5..c5b1372096ea 100644
--- a/graphics/mesagl/files/patch-si-glu::libnurbs::internals::Makefile.in
+++ b/graphics/mesagl/files/patch-si-glu::libnurbs::internals::Makefile.in
@@ -1,14 +1,11 @@
-
-$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 @@
+--- si-glu/libnurbs/internals/Makefile.in.orig	Fri Nov  7 11:58:17 2003
++++ si-glu/libnurbs/internals/Makefile.in	Thu Mar  2 16:44:45 2006
+@@ -201,7 +201,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
- 
+-AM_CXXFLAGS = -DLIBRARYBUILD -DNDEBUG
++AM_CXXFLAGS = -DLIBRARYBUILD -DNDEBUG @CXXFLAGS@
+ libNInt_la_SOURCES = \
+ 	arc.cc \
+ 	arc.h \
diff --git a/graphics/mesagl/files/patch-si-glu::libtess::memalloc.h b/graphics/mesagl/files/patch-si-glu::libtess::memalloc.h
deleted file mode 100644
index 9ab581ae36a5..000000000000
--- a/graphics/mesagl/files/patch-si-glu::libtess::memalloc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$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>