mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00
Code Issues Releases Activity

- Update to 5.0.2.

Browse Source 
- Slightly adjust CONFLICTS.
- IGNORE only when PACKAGE_BUILDING.

PR:		94036
Submitted by:	Pedro F. Giffuni <giffunip@asme.org>
Approved by:	arved (mentor)
This commit is contained in:
Stefan Walter 2006-07-03 16:17:46 +00:00
parent c4b8c509f8
commit 5898d416a0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=166852
7 changed files with 36 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/mesagl/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= Mesa
PORTVERSION= 5.0.1
PORTREVISION= 3
PORTVERSION= 5.0.2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
@ -18,7 +17,7 @@ DISTFILES= MesaLib-${PORTVERSION}${EXTRACT_SUFX} \
MAINTAINER= ports@FreeBSD.org
COMMENT= A graphics library similar to SGI's OpenGL
CONFLICTS= XFree86-libraries-[0-9]* xorg-libraries-[0-9]*
CONFLICTS= XFree86-libraries-[4-9]* xorg-libraries-[6-9]*
USE_BZIP2= yes
INSTALLS_SHLIB= yes
@ -40,7 +39,7 @@ MAKE_ENV+= SUB_GL="${SUB_GL}" \
.include <bsd.port.pre.mk>
.if ${X_WINDOW_SYSTEM:L} != xfree86-3
.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

12
graphics/mesagl/distinfo
View File

@ -1,6 +1,6 @@
MD5 (MesaLib-5.0.1.tar.bz2) = 513b4bbd7d38951f05027179063d876b
SHA256 (MesaLib-5.0.1.tar.bz2) = e8fa8e31f640b1a9d1b87468e101e0daa0ec77cbc9eb33954f243da77aa695e8
SIZE (MesaLib-5.0.1.tar.bz2) = 1661508
MD5 (MesaDemos-5.0.1.tar.bz2) = 37190374a98c3c892f0698be9ca3acf0
SHA256 (MesaDemos-5.0.1.tar.bz2) = 27b16b55e74e63a90474356fc28cb9cf4ab90743737bec9bd365b8a6e20df6ae
SIZE (MesaDemos-5.0.1.tar.bz2) = 889575
MD5 (MesaLib-5.0.2.tar.bz2) = 7b4bf9261657c2fca03796d4955e6f50
SHA256 (MesaLib-5.0.2.tar.bz2) = e63d42092d65dac4d1b2493a5c14ec0bcb1d3b8dfe6769e0ca4914b559aa5eb3
SIZE (MesaLib-5.0.2.tar.bz2) = 1719544
MD5 (MesaDemos-5.0.2.tar.bz2) = b81fafff90995025d2f25ea02b786642
SHA256 (MesaDemos-5.0.2.tar.bz2) = 7e5ec6d2e524cdd765171742156185974955e4b164b26df66adb9d84c46226dc
SIZE (MesaDemos-5.0.2.tar.bz2) = 901632

19
graphics/mesagl/files/patch-aa
View File

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

19
graphics/mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in
View File

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

19
graphics/mesagl/files/patch-si-glu::libnurbs::internals::Makefile.in
View File

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

14
graphics/mesagl/files/patch-si-glu::libtess::memalloc.h
View File

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

6
graphics/mesagl/pkg-plist
View File

@ -13,15 +13,15 @@ include/GL/osmesa.h
include/GL/xmesa.h
include/GL/xmesa_x.h
include/GL/xmesa_xf86.h
lib/libGL.a
lib/libGL.la
lib/libGL.so
lib/libGL.so.14
lib/libGLU.a
lib/libGLU.la
lib/libGLU.so
lib/libGLU.so.14
lib/libMesaGL.so
lib/libMesaGLU.so
lib/libOSMesa.a
lib/libOSMesa.la
lib/libOSMesa.so
lib/libOSMesa.so.4
@dirrm include/GL