Attachment #62990 for bug #94036

View | Details | Raw Unified | Return to bug 94036
Collapse All | Expand All




#

PORTNAME=	Mesa
PORTVERSION=	5.0.2
PORTREVISION=	3
CATEGORIES=	graphics
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
		ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	A graphics library similar to SGI's OpenGL

CONFLICTS=	XFree86-libraries-[4-9]* xorg-libraries-[6-9]*

USE_BZIP2=	yes
USE_REINPLACE=	yes
INSTALLS_SHLIB=	yes

.if defined(WANT_GGI)


.include <bsd.port.pre.mk>

.if defined(PACKAGE_BUILDING) && ${X_WINDOW_SYSTEM:L} != xfree86-3
IGNORE=		is unnecessary because libGL and libGLU come with XFree86 4.0 and higher
.endif


Lines 1-6 Link Here

(-)mesagl/distinfo (-6 / +6 lines)
1	MD5 (MesaLib-5.0.1.tar.bz2) = 513b4bbd7d38951f05027179063d876b	1	MD5 (MesaLib-5.0.2.tar.bz2) = 7b4bf9261657c2fca03796d4955e6f50
2	SHA256 (MesaLib-5.0.1.tar.bz2) = e8fa8e31f640b1a9d1b87468e101e0daa0ec77cbc9eb33954f243da77aa695e8	2	SHA256 (MesaLib-5.0.2.tar.bz2) = e63d42092d65dac4d1b2493a5c14ec0bcb1d3b8dfe6769e0ca4914b559aa5eb3
3	SIZE (MesaLib-5.0.1.tar.bz2) = 1661508	3	SIZE (MesaLib-5.0.2.tar.bz2) = 1719544
4	MD5 (MesaDemos-5.0.1.tar.bz2) = 37190374a98c3c892f0698be9ca3acf0	4	MD5 (MesaDemos-5.0.2.tar.bz2) = b81fafff90995025d2f25ea02b786642
5	SHA256 (MesaDemos-5.0.1.tar.bz2) = 27b16b55e74e63a90474356fc28cb9cf4ab90743737bec9bd365b8a6e20df6ae	5	SHA256 (MesaDemos-5.0.2.tar.bz2) = 7e5ec6d2e524cdd765171742156185974955e4b164b26df66adb9d84c46226dc
6	SIZE (MesaDemos-5.0.1.tar.bz2) = 889575	6	SIZE (MesaDemos-5.0.2.tar.bz2) = 901632




--- configure.orig	Fri Nov  7 12:00:34 2003
+++ configure	Thu Mar  2 16:13:38 2006
@@ -1885,10 +1885,10 @@
--- 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.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

+SI_GLU_VERSION_INFO=${GLVER}:0
+LIBGLUT_VERSION_INFO=${GLUTVER}:0
 
 ac_config_headers="$ac_config_headers conf.h"
 
 
@@ -7920,6 +7920,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"

 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -8849,7 +8850,7 @@
 
     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"




--- 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 @@
--- 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.
-AM_CXXFLAGS = -DLIBRARYBUILD -DNDEBUG
+AM_CXXFLAGS = -DLIBRARYBUILD -DNDEBUG @CXXFLAGS@
 libNIFac_la_SOURCES = \
 	bezierEval.cc \
 	bezierEval.h \




--- 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 @@
--- 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 	r
enderhints.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 \





$FreeBSD: ports/graphics/mesagl/files/patch-si-glu::libtess::memalloc.h,v 1.3 2003/10/24 05:35:25 anholt Exp $

--- 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>

Return to bug 94036

Lines 6-13 Link Here

(-)mesagl/Makefile (-5 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= Mesa	8	PORTNAME= Mesa
9	PORTVERSION= 5.0.1	9	PORTVERSION= 5.0.2
10	PORTREVISION= 3
11	CATEGORIES= graphics	10	CATEGORIES= graphics
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
13	ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/	12	ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
Lines 18-27 Link Here
18	MAINTAINER= ports@FreeBSD.org	17	MAINTAINER= ports@FreeBSD.org
19	COMMENT= A graphics library similar to SGI's OpenGL	18	COMMENT= A graphics library similar to SGI's OpenGL
20		19
21	CONFLICTS= XFree86-libraries-[0-9]* xorg-libraries-[0-9]*	20	CONFLICTS= XFree86-libraries-[4-9]* xorg-libraries-[6-9]*
22		21
23	USE_BZIP2= yes	22	USE_BZIP2= yes
24	USE_REINPLACE= yes
25	INSTALLS_SHLIB= yes	23	INSTALLS_SHLIB= yes
26		24
27	.if defined(WANT_GGI)	25	.if defined(WANT_GGI)
Lines 41-47 Link Here
41		39
42	.include <bsd.port.pre.mk>	40	.include <bsd.port.pre.mk>
43		41
44	.if ${X_WINDOW_SYSTEM:L} != xfree86-3	42	.if defined(PACKAGE_BUILDING) && ${X_WINDOW_SYSTEM:L} != xfree86-3
45	IGNORE= is unnecessary because libGL and libGLU come with XFree86 4.0 and higher	43	IGNORE= is unnecessary because libGL and libGLU come with XFree86 4.0 and higher
46	.endif	44	.endif
47		45

Lines 1-12 Link Here

(-)mesagl/files/patch-aa (-11 / +8 lines)
1		1	--- configure.orig Fri Nov 7 12:00:34 2003
2	$FreeBSD: ports/graphics/mesagl/files/patch-aa,v 1.23 2003/05/13 17:27:49 sobomax Exp $	2	+++ configure Thu Mar 2 16:13:38 2006
3		3	@@ -1885,10 +1885,10 @@
4	--- configure.orig Thu May 1 22:01:58 2003
5	+++ configure Thu May 1 22:03:29 2003
6	@@ -1406,10 +1406,10 @@
7		4
8	# For Mesa-specific libs like libOSMesa.	5	# For Mesa-specific libs like libOSMesa.
9	LIBMESA_VERSION_INFO=4:${MESA_VERSION}:0 # Mesa 5.0.1	6	LIBMESA_VERSION_INFO=4:${MESA_VERSION}:0 # Mesa 5.0.2
10	-LIBGL_VERSION_INFO=5:${MESA_VERSION}:4 # OpenGL 1.4	7	-LIBGL_VERSION_INFO=5:${MESA_VERSION}:4 # OpenGL 1.4
11	-LIBGLU_VERSION_INFO=2:${MESA_VERSION}:1 # GLU 1.1	8	-LIBGLU_VERSION_INFO=2:${MESA_VERSION}:1 # GLU 1.1
12	-SI_GLU_VERSION_INFO=4:${MESA_VERSION}:3 # GLU 1.3	9	-SI_GLU_VERSION_INFO=4:${MESA_VERSION}:3 # GLU 1.3
Lines 16-24 Link Here
16	+SI_GLU_VERSION_INFO=${GLVER}:0	13	+SI_GLU_VERSION_INFO=${GLVER}:0
17	+LIBGLUT_VERSION_INFO=${GLUTVER}:0	14	+LIBGLUT_VERSION_INFO=${GLUTVER}:0
18		15
19	ac_config_headers="$ac_config_headers conf.h"
20		16
21	@@ -6453,6 +6453,7 @@	17
		18	@@ -7920,6 +7920,7 @@
22		19
23	# This can be used to rebuild libtool when needed	20	# This can be used to rebuild libtool when needed
24	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"	21	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
Lines 26-34 Link Here
26		23
27	# Always use our own libtool.	24	# Always use our own libtool.
28	LIBTOOL='$(SHELL) $(top_builddir)/libtool'	25	LIBTOOL='$(SHELL) $(top_builddir)/libtool'
29	@@ -7221,7 +7222,7 @@	26	@@ -8849,7 +8850,7 @@
30		27
31	echo "$as_me:7222: result: yes" >&5	28	echo "$as_me:$LINENO: result: yes" >&5
32	echo "${ECHO_T}yes" >&6	29	echo "${ECHO_T}yes" >&6
33	- CFLAGS="$CFLAGS -D_REENTRANT -DPTHREADS"	30	- CFLAGS="$CFLAGS -D_REENTRANT -DPTHREADS"
34	+ CFLAGS="$CFLAGS -D_THREAD_SAFE -D_REENTRANT -DPTHREADS"	31	+ CFLAGS="$CFLAGS -D_THREAD_SAFE -D_REENTRANT -DPTHREADS"

Lines 1-14 Link Here

(-)mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in (-11 / +8 lines)
1		1	--- si-glu/libnurbs/interface/Makefile.in.orig Fri Nov 7 11:58:16 2003
2	$FreeBSD: ports/graphics/mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in,v 1.3 2003/10/24 05:35:25 anholt Exp $	2	+++ si-glu/libnurbs/interface/Makefile.in Thu Mar 2 16:38:17 2006
3		3	@@ -201,7 +201,7 @@
4	--- si-glu/libnurbs/interface/Makefile.in 2003/05/01 18:57:58 1.1
5	+++ si-glu/libnurbs/interface/Makefile.in 2003/05/01 18:58:36
6	@@ -114,7 +114,7 @@
7		4
8	# Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging	5	# Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging
9	# switches. grep LIBRARYBUILD `find .. -name '*.h'` for details.	6	# switches. grep LIBRARYBUILD `find .. -name '*.h'` for details.
10	-CXXFLAGS = -DLIBRARYBUILD -DNDEBUG	7	-AM_CXXFLAGS = -DLIBRARYBUILD -DNDEBUG
11	+CXXFLAGS = -DLIBRARYBUILD -DNDEBUG @CXXFLAGS@	8	+AM_CXXFLAGS = -DLIBRARYBUILD -DNDEBUG @CXXFLAGS@
12		9	libNIFac_la_SOURCES = \
13	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	10	bezierEval.cc \
14		11	bezierEval.h \

Lines 1-14 Link Here

(-)mesagl/files/patch-si-glu::libnurbs::internals::Makefile.in (-11 / +8 lines)
1		1	--- si-glu/libnurbs/internals/Makefile.in.orig Fri Nov 7 11:58:17 2003
2	$FreeBSD: ports/graphics/mesagl/files/patch-si-glu::libnurbs::internals::Makefile.in,v 1.3 2003/10/24 05:35:25 anholt Exp $	2	+++ si-glu/libnurbs/internals/Makefile.in Thu Mar 2 16:44:45 2006
3		3	@@ -201,7 +201,7 @@
4	--- si-glu/libnurbs/internals/Makefile.in 2003/05/01 18:57:58 1.1
5	+++ si-glu/libnurbs/internals/Makefile.in 2003/05/01 18:58:42
6	@@ -114,7 +114,7 @@
7		4
8	# Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging	5	# Choose one of STANDALONE, LIBRARYBUILD, and GLBUILD. They are debugging
9	# switches. grep LIBRARYBUILD `find .. -name '*.h'` for details.	6	# switches. grep LIBRARYBUILD `find .. -name '*.h'` for details.
10	-CXXFLAGS = -DLIBRARYBUILD -DNDEBUG
11	+CXXFLAGS = -DLIBRARYBUILD -DNDEBUG @CXXFLAGS@
12
13	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 r
14	enderhints.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	7	enderhints.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
15		8	-AM_CXXFLAGS = -DLIBRARYBUILD -DNDEBUG
		9	+AM_CXXFLAGS = -DLIBRARYBUILD -DNDEBUG @CXXFLAGS@
		10	libNInt_la_SOURCES = \
		11	arc.cc \
		12	arc.h \

Lines 1-14 Link Here

(-)mesagl/files/patch-si-glu::libtess::memalloc.h (-14 lines)
1
2	$FreeBSD: ports/graphics/mesagl/files/patch-si-glu::libtess::memalloc.h,v 1.3 2003/10/24 05:35:25 anholt Exp $
3
4	--- si-glu/libtess/memalloc.h.orig Fri Nov 30 21:35:22 2001
5	+++ si-glu/libtess/memalloc.h Thu May 1 22:00:25 2003
6	@@ -42,7 +42,7 @@
7	#ifndef __memalloc_simple_h_
8	#define __memalloc_simple_h_
9
10	-#if defined(__VMS) \|\| defined(darwin)
11	+#if defined(__VMS) \|\| defined(darwin) \|\| defined(__FreeBSD__)
12	# include <stdlib.h>
13	#else
14	# include <malloc.h>