From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Mar 2 22:20:05 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F02716A420 for ; Thu, 2 Mar 2006 22:20:05 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE43743D46 for ; Thu, 2 Mar 2006 22:20:04 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k22MK4QQ082783 for ; Thu, 2 Mar 2006 22:20:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k22MK4MV082782; Thu, 2 Mar 2006 22:20:04 GMT (envelope-from gnats) Resent-Date: Thu, 2 Mar 2006 22:20:04 GMT Resent-Message-Id: <200603022220.k22MK4MV082782@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Pedro F. Giffuni" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A067516A427 for ; Thu, 2 Mar 2006 22:13:45 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F7E343D48 for ; Thu, 2 Mar 2006 22:13:45 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k22MDjfP053702 for ; Thu, 2 Mar 2006 22:13:45 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k22MDjlZ053701; Thu, 2 Mar 2006 22:13:45 GMT (envelope-from nobody) Message-Id: <200603022213.k22MDjlZ053701@www.freebsd.org> Date: Thu, 2 Mar 2006 22:13:45 GMT From: "Pedro F. Giffuni" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/94036: Minor graphics/mesagl update to 5.0.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2006 22:20:05 -0000 >Number: 94036 >Category: ports >Synopsis: Minor graphics/mesagl update to 5.0.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Mar 02 22:20:04 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Pedro F. Giffuni >Release: 6.0-Release (amd64) >Organization: >Environment: FreeBSD etoile.cable.net.co 6.0-RELEASE FreeBSD 6.0-RELEASE #12: Sat Feb 11 13:45:47 COT 2006 root@etoile.cable.net.co:/usr/src/sys/amd64/compile/DIMENSION amd64 >Description: mesagl still makes sense to keep up to date: pre-built versions of mesa are known to cause problems on cad/calculix. Also someone might want to use it with GGI. The build process for the recent versions of this package have changed a lot, and I'm not sure how to build them with DRI or GGI suport, for now I just did a minor update to the port (apparently this is the last version that uses GNU configure), trying to be more specific on the conflicts. >How-To-Repeat: >Fix: diff -ruN mesagl.orig/Makefile mesagl/Makefile --- mesagl.orig/Makefile Wed Mar 1 23:34:50 2006 +++ mesagl/Makefile Thu Mar 2 16:56:36 2006 @@ -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,10 +17,9 @@ 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 -USE_REINPLACE= yes INSTALLS_SHLIB= yes .if defined(WANT_GGI) @@ -41,7 +39,7 @@ .include -.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 diff -ruN mesagl.orig/distinfo mesagl/distinfo --- mesagl.orig/distinfo Wed Mar 1 23:34:50 2006 +++ mesagl/distinfo Thu Mar 2 16:02:26 2006 @@ -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 diff -ruN mesagl.orig/files/patch-aa mesagl/files/patch-aa --- mesagl.orig/files/patch-aa Wed Mar 1 23:34:50 2006 +++ mesagl/files/patch-aa Thu Mar 2 16:59:59 2006 @@ -1,12 +1,9 @@ - -$FreeBSD: ports/graphics/mesagl/files/patch-aa,v 1.23 2003/05/13 17:27:49 sobomax Exp $ - ---- 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 @@ +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 @@ # 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 -ruN mesagl.orig/files/patch-si-glu::libnurbs::interface::Makefile.in mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in --- mesagl.orig/files/patch-si-glu::libnurbs::interface::Makefile.in Wed Mar 1 23:34:50 2006 +++ mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in Thu Mar 2 16:43:11 2006 @@ -1,14 +1,11 @@ - -$FreeBSD: ports/graphics/mesagl/files/patch-si-glu::libnurbs::interface::Makefile.in,v 1.3 2003/10/24 05:35:25 anholt Exp $ - ---- 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 -ruN mesagl.orig/files/patch-si-glu::libnurbs::internals::Makefile.in mesagl/files/patch-si-glu::libnurbs::internals::Makefile.in --- mesagl.orig/files/patch-si-glu::libnurbs::internals::Makefile.in Wed Mar 1 23:34:50 2006 +++ mesagl/files/patch-si-glu::libnurbs::internals::Makefile.in Thu Mar 2 16:45:33 2006 @@ -1,14 +1,11 @@ - -$FreeBSD: ports/graphics/mesagl/files/patch-si-glu::libnurbs::internals::Makefile.in,v 1.3 2003/10/24 05:35:25 anholt Exp $ - ---- 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 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 \ diff -ruN mesagl.orig/files/patch-si-glu::libtess::memalloc.h mesagl/files/patch-si-glu::libtess::memalloc.h --- mesagl.orig/files/patch-si-glu::libtess::memalloc.h Wed Mar 1 23:34:50 2006 +++ mesagl/files/patch-si-glu::libtess::memalloc.h Wed Dec 31 19:00:00 1969 @@ -1,14 +0,0 @@ - -$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 - #else - # include >Release-Note: >Audit-Trail: >Unformatted: