From 08f82cf375a382d456e64d513dfbfc0275f254df Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 24 Oct 2003 05:27:13 +0000 Subject: Remove libglut from this port (it is now located in graphics/libglut) and mark it IGNORE on XFree86-4. --- graphics/mesagl/Makefile | 32 ++++-------------- graphics/mesagl/files/patch-ad | 4 +-- .../patch-si-glu::libnurbs::interface::Makefile.in | 14 -------- .../patch-si-glu::libnurbs::internals::Makefile.in | 14 -------- .../mesagl/files/patch-si-glu::libtess::memalloc.h | 14 -------- graphics/mesagl/files/patch-src-glut::glutbitmap.h | 14 -------- graphics/mesagl/files/patch-src-glut::glutint.h | 14 -------- graphics/mesagl/pkg-descr | 3 +- graphics/mesagl/pkg-plist | 39 ++++++++++------------ 9 files changed, 27 insertions(+), 121 deletions(-) delete mode 100644 graphics/mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in delete mode 100644 graphics/mesagl/files/patch-si-glu::libnurbs::internals::Makefile.in delete mode 100644 graphics/mesagl/files/patch-si-glu::libtess::memalloc.h delete mode 100644 graphics/mesagl/files/patch-src-glut::glutbitmap.h delete mode 100644 graphics/mesagl/files/patch-src-glut::glutint.h (limited to 'graphics') diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile index 6c44d501da68..5d09c88be3e9 100644 --- a/graphics/mesagl/Makefile +++ b/graphics/mesagl/Makefile @@ -7,10 +7,8 @@ PORTNAME= Mesa PORTVERSION= 5.0.1 -PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - ftp://iris.ssec.wisc.edu/pub/Mesa/ \ ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/ MASTER_SITE_SUBDIR= mesa3d DISTFILES= MesaLib-${PORTVERSION}${EXTRACT_SUFX} \ @@ -28,33 +26,22 @@ LIB_DEPENDS= ggi.2:${PORTSDIR}/graphics/libggi CONFIGURE_ARGS+=--with-ggi=${LOCALBASE} .endif -GLUTVER= 3 USE_X_PREFIX= yes USE_LIBTOOL= yes USE_GMAKE= yes -CONFIGURE_ENV+= GLVER="${GLVER}" GLUTVER="${GLUTVER}" \ - LIBS="-lm" -PLIST_SUB= GLVER="${GLVER}" GLUTVER="${GLUTVER}" - -.include - -.if ${XFREE86_VERSION} == 3 +CONFIGURE_ENV+= GLVER="${GLVER}" LIBS="-lm" SUB_GL= src si-glu src-glu INCLUDE_GL= include GLVER= 14 -PLIST_SUB+= XFREE3:="" -.else -SUB_GL= -INCLUDE_GL= -GLVER= 2 -PLIST_SUB+= XFREE3:="@comment " -MAKE_ENV= INCLUDES="-I${X11BASE}/include -I${WRKSRC}/include -DGLCALLBACKPCAST=\*" -MAKE_ARGS= -e -.endif - MAKE_ENV+= SUB_GL="${SUB_GL}" \ INCLUDE_GL=${INCLUDE_GL} +.include + +.if ${XFREE86_VERSION} != 3 +IGNORE= is unnecessary because libGL and libGLU come with XFree86 4.0 and higher +.endif + .ifdef USE_MESA .error You have `USE_MESA' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif @@ -66,10 +53,5 @@ 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/glutf90.h \ - ${WRKSRC}/include/GL/glut.h ${PREFIX}/include/GL -.endif .include diff --git a/graphics/mesagl/files/patch-ad b/graphics/mesagl/files/patch-ad index 0cd0c99d1261..1d3a45ba3641 100644 --- a/graphics/mesagl/files/patch-ad +++ b/graphics/mesagl/files/patch-ad @@ -9,8 +9,8 @@ $FreeBSD$ -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 ++DIST_SUBDIRS = $(INCLUDE_GL) $(SUB_GL) $(SUB_DEMOS) util ++SUBDIRS = $(INCLUDE_GL) $(SUB_GL) $(sel_sub_demos) 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 diff --git a/graphics/mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in b/graphics/mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in deleted file mode 100644 index 4f6c1b8ffcc7..000000000000 --- a/graphics/mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$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 deleted file mode 100644 index a05d626d55a5..000000000000 --- a/graphics/mesagl/files/patch-si-glu::libnurbs::internals::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$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 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 - #else - # include diff --git a/graphics/mesagl/files/patch-src-glut::glutbitmap.h b/graphics/mesagl/files/patch-src-glut::glutbitmap.h deleted file mode 100644 index f781759cf43c..000000000000 --- a/graphics/mesagl/files/patch-src-glut::glutbitmap.h +++ /dev/null @@ -1,14 +0,0 @@ - -$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 -+#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 deleted file mode 100644 index 1db32532ef3e..000000000000 --- a/graphics/mesagl/files/patch-src-glut::glutint.h +++ /dev/null @@ -1,14 +0,0 @@ - -$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 -+#include "../include/GL/glut.h" - - #if defined(MESA) && defined(_WIN32) && !defined(__CYGWIN32__) - #include diff --git a/graphics/mesagl/pkg-descr b/graphics/mesagl/pkg-descr index 6c688e072076..47eecf190e50 100644 --- a/graphics/mesagl/pkg-descr +++ b/graphics/mesagl/pkg-descr @@ -4,8 +4,7 @@ or state machine, it is being used with authorization from Silicon Graphics, Inc. However, the author makes no claim that Mesa is in any way a compatible replacement for OpenGL or associated with Silicon Graphics, Inc. Those who want a licensed implementation of OpenGL should contact a licensed -vendor. This software is distributed under the terms of the GNU Library -General Public License, see the LICENSE file for details. +vendor. paulo@isr.uc.pt diff --git a/graphics/mesagl/pkg-plist b/graphics/mesagl/pkg-plist index 26d0c733c953..5a6abf581411 100644 --- a/graphics/mesagl/pkg-plist +++ b/graphics/mesagl/pkg-plist @@ -1,24 +1,19 @@ -%%XFREE3:%%etc/mesa.conf -%%XFREE3:%%include/GL/gl.h -%%XFREE3:%%include/GL/gl_mangle.h -%%XFREE3:%%include/GL/glu.h -%%XFREE3:%%include/GL/glu_mangle.h -include/GL/glut.h -include/GL/glutf90.h -%%XFREE3:%%include/GL/glx.h -%%XFREE3:%%include/GL/glx_mangle.h -%%XFREE3:%%include/GL/glext.h -%%XFREE3:%%include/GL/osmesa.h -%%XFREE3:%%include/GL/xmesa.h -%%XFREE3:%%include/GL/xmesa_x.h -%%XFREE3:%%include/GL/xmesa_xf86.h -%%XFREE3:%%lib/libGL.so -%%XFREE3:%%lib/libGL.so.%%GLVER%% -%%XFREE3:%%lib/libGLU.so -%%XFREE3:%%lib/libGLU.so.%%GLVER%% +etc/mesa.conf +include/GL/gl.h +include/GL/gl_mangle.h +include/GL/glu.h +include/GL/glu_mangle.h +include/GL/glx.h +include/GL/glx_mangle.h +include/GL/glext.h +include/GL/osmesa.h +include/GL/xmesa.h +include/GL/xmesa_x.h +include/GL/xmesa_xf86.h +lib/libGL.so +lib/libGL.so.14 +lib/libGLU.so +lib/libGLU.so.14 lib/libMesaGL.so lib/libMesaGLU.so -lib/libglut.a -lib/libglut.so -lib/libglut.so.%%GLUTVER%% -%%XFREE3:%%@dirrm include/GL +@dirrm include/GL -- cgit v1.2.3