[131982] trunk/dports/science/solid
mmoll at macports.org
mmoll at macports.org
Thu Jan 22 11:55:17 PST 2015
Revision: 131982
https://trac.macports.org/changeset/131982
Author: mmoll at macports.org
Date: 2015-01-22 11:55:17 -0800 (Thu, 22 Jan 2015)
Log Message:
-----------
science/solid: update to version 3.5.7, consolidate GLUT patches, reenable port on Mavericks and newer, make sure compilation flags get set in autoreconf stage
Modified Paths:
--------------
trunk/dports/science/solid/Portfile
trunk/dports/science/solid/files/patch-configure.ac.diff
Added Paths:
-----------
trunk/dports/science/solid/files/patch-GLUT.diff
Removed Paths:
-------------
trunk/dports/science/solid/files/patch-examples-gldemo.cpp.diff
trunk/dports/science/solid/files/patch-examples-mnm.cpp.diff
trunk/dports/science/solid/files/patch-examples-physics.cpp.diff
Modified: trunk/dports/science/solid/Portfile
===================================================================
--- trunk/dports/science/solid/Portfile 2015-01-22 19:34:32 UTC (rev 131981)
+++ trunk/dports/science/solid/Portfile 2015-01-22 19:55:17 UTC (rev 131982)
@@ -3,47 +3,30 @@
PortSystem 1.0
name solid
-version 3.5.6
-revision 1
+version 3.5.7
categories science math devel
platforms darwin
-license LGPL-2
+license {GPL-2 QPL-1}
maintainers mww openmaintainer
description SOLID is a software library for collision detection of geometric objects in 3D space
long_description ${description}
homepage http://www.dtecta.com/
master_sites http://www.dtecta.com/files/
-checksums rmd160 0b2e305c323caef96e182ec75529bad92c41f35a \
- sha256 4acfa20266f0aa5722732794f8e93d7bb446e467719c947a3ca583f197923af0
+checksums rmd160 3040717b9e890bde74c71f4f0c8c4bcc8b8c666e \
+ sha256 7f78cffd83bbed93b0ec4421866ebd97d16db74a8068b25e45df231a49cc7d04
+use_zip yes
+patchfiles patch-configure.ac.diff patch-GLUT.diff
-extract.suffix .tgz
-patchfiles patch-examples-mnm.cpp.diff patch-examples-physics.cpp.diff \
- patch-examples-gldemo.cpp.diff patch-configure.ac.diff
-
depends_lib port:qhull
# This project has buggy C++ code
compiler.blacklist *clang*
+compiler.fallback macports-gcc-4.9
use_autoreconf yes
autoreconf.args -fvi
-autoreconf.env AUTOMAKE="automake --foreign"
-configure.cflags -fno-gcse -fno-strict-aliasing -DNDEBUG -fpermissive
-configure.cxxflags -fno-gcse -fno-strict-aliasing -DNDEBUG -fpermissive
-
build.args GLLIBS="-framework OpenGL -framework GLUT"
-platform darwin {
- if {${os.major} >= 13} {
- depends_lib
- depends_run
- pre-fetch {
- ui_error "$name does not build on Mavericks or later."
- error "unsupported platform"
- }
- }
-}
-
livecheck.type none
Added: trunk/dports/science/solid/files/patch-GLUT.diff
===================================================================
--- trunk/dports/science/solid/files/patch-GLUT.diff (rev 0)
+++ trunk/dports/science/solid/files/patch-GLUT.diff 2015-01-22 19:55:17 UTC (rev 131982)
@@ -0,0 +1,40 @@
+diff -rubw examples/gldemo.cpp examples/gldemo.cpp
+--- examples/gldemo.cpp 2015-01-21 13:58:00.000000000 -0600
++++ examples/gldemo.cpp 2006-10-03 10:55:34.000000000 -0500
+@@ -21,7 +21,7 @@
+ * use of this library.
+ */
+
+-#include <GL/glut.h>
++#include <GLUT/glut.h>
+ #include <SOLID.h>
+
+ #define DISPLAY // Interactively draw new placements
+Only in examples/: gldemo.o
+Only in examples/: mnm
+diff -rubw examples/mnm.cpp examples/mnm.cpp
+--- examples/mnm.cpp 2015-01-21 13:58:00.000000000 -0600
++++ examples/mnm.cpp 2006-10-03 10:55:34.000000000 -0500
+@@ -29,7 +29,7 @@
+ //#define DRAW_COORD
+
+ #include <new>
+-#include <GL/glut.h>
++#include <GLUT/glut.h>
+
+ #include "GEN_MinMax.h"
+ #include "MT_Point3.h"
+Only in examples/: mnm.o
+Only in examples/: physics
+diff -rubw examples/physics.cpp examples/physics.cpp
+--- examples/physics.cpp 2015-01-21 13:58:00.000000000 -0600
++++ examples/physics.cpp 2006-10-03 10:55:34.000000000 -0500
+@@ -28,7 +28,7 @@
+ //#define USE_QUADS // Idem, but now with quads
+
+ #include <new>
+-#include <GL/glut.h>
++#include <GLUT/glut.h>
+
+ #include "GEN_MinMax.h"
+ #include "MT_Point3.h"
Modified: trunk/dports/science/solid/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/science/solid/files/patch-configure.ac.diff 2015-01-22 19:34:32 UTC (rev 131981)
+++ trunk/dports/science/solid/files/patch-configure.ac.diff 2015-01-22 19:55:17 UTC (rev 131982)
@@ -1,23 +1,38 @@
---- configure.ac.orig 2013-08-07 18:31:33.000000000 -0700
-+++ configure.ac 2013-08-07 18:31:44.000000000 -0700
-@@ -39,20 +39,6 @@ AC_MSG_RESULT(no)
- fi
- AC_SUBST([TRACER_FLAG])
-
--AC_MSG_CHECKING(whether to enable debugging)
--debug_default="no"
--AC_ARG_ENABLE(debug, [ --enable-debug=[no/yes] turn on debugging
-- [default=$debug_default]],, enable_debug=$debug_default)
--if test "x$enable_debug" = "xyes"; then
-- CFLAGS="-g"
-- CXXFLAGS="-g"
--AC_MSG_RESULT(yes)
--else
-- CFLAGS="-O2 -fno-gcse -DNDEBUG"
-- CXXFLAGS="-O2 -fno-gcse -DNDEBUG"
--AC_MSG_RESULT(no)
--fi
--
- AC_CHECK_LIB([glut], [glutInit])
-
- # Checks for libraries.
+--- configure.ac 2006-10-03 10:55:34.000000000 -0500
++++ configure.ac 2015-01-21 13:42:39.000000000 -0600
+@@ -5,7 +5,7 @@
+ AC_INIT(SOLID, 3.5)
+ AC_CONFIG_SRCDIR([include/SOLID.h])
+ AC_CONFIG_HEADER([include/config.h])
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([foreign])
+
+ # Checks for programs.
+ AC_PROG_CXX
+@@ -48,8 +48,8 @@
+ CXXFLAGS="-g"
+ AC_MSG_RESULT(yes)
+ else
+- CFLAGS="-O2 -fno-gcse -DNDEBUG"
+- CXXFLAGS="-O2 -fno-gcse -DNDEBUG"
++ CFLAGS="-O2 -fno-gcse -fno-strict-aliasing -DNDEBUG"
++ CXXFLAGS="-O2 -fno-gcse -fno-strict-aliasing -fpermissive -DNDEBUG"
+ AC_MSG_RESULT(no)
+ fi
+
+@@ -78,14 +78,5 @@
+ # Checks for library functions.
+ AC_CHECK_FUNCS([memset sqrt])
+
+-AC_CONFIG_FILES([Makefile
+- doc/Makefile
+- src/broad/Makefile
+- src/convex/Makefile
+- src/complex/Makefile
+- src/qhull/Makefile
+- src/Makefile
+- include/Makefile
+- examples/dynamics/Makefile
+- examples/Makefile])
++AC_CONFIG_FILES([Makefile doc/Makefile src/broad/Makefile src/convex/Makefile src/complex/Makefile src/qhull/Makefile src/Makefile include/Makefile examples/dynamics/Makefile examples/Makefile])
+ AC_OUTPUT
Deleted: trunk/dports/science/solid/files/patch-examples-gldemo.cpp.diff
===================================================================
--- trunk/dports/science/solid/files/patch-examples-gldemo.cpp.diff 2015-01-22 19:34:32 UTC (rev 131981)
+++ trunk/dports/science/solid/files/patch-examples-gldemo.cpp.diff 2015-01-22 19:55:17 UTC (rev 131982)
@@ -1,11 +0,0 @@
---- examples/gldemo.cpp 2006-10-03 10:55:33.000000000 +0200
-+++ examples/gldemo.cpp 2012-07-19 17:09:21.000000000 +0200
-@@ -21,7 +21,7 @@
- * use of this library.
- */
-
--#include <GL/glut.h>
-+#include <GLUT/glut.h>
- #include <SOLID.h>
-
- #define DISPLAY // Interactively draw new placements
Deleted: trunk/dports/science/solid/files/patch-examples-mnm.cpp.diff
===================================================================
--- trunk/dports/science/solid/files/patch-examples-mnm.cpp.diff 2015-01-22 19:34:32 UTC (rev 131981)
+++ trunk/dports/science/solid/files/patch-examples-mnm.cpp.diff 2015-01-22 19:55:17 UTC (rev 131982)
@@ -1,11 +0,0 @@
---- examples/mnm.cpp 2006-10-03 10:55:33.000000000 +0200
-+++ examples/mnm.cpp 2012-07-19 17:06:26.000000000 +0200
-@@ -29,7 +29,7 @@
- //#define DRAW_COORD
-
- #include <new>
--#include <GL/glut.h>
-+#include <GLUT/glut.h>
-
- #include "GEN_MinMax.h"
- #include "MT_Point3.h"
Deleted: trunk/dports/science/solid/files/patch-examples-physics.cpp.diff
===================================================================
--- trunk/dports/science/solid/files/patch-examples-physics.cpp.diff 2015-01-22 19:34:32 UTC (rev 131981)
+++ trunk/dports/science/solid/files/patch-examples-physics.cpp.diff 2015-01-22 19:55:17 UTC (rev 131982)
@@ -1,11 +0,0 @@
---- examples/physics.cpp 2006-10-03 10:55:33.000000000 +0200
-+++ examples/physics.cpp 2012-07-19 17:08:04.000000000 +0200
-@@ -28,7 +28,7 @@
- //#define USE_QUADS // Idem, but now with quads
-
- #include <new>
--#include <GL/glut.h>
-+#include <GLUT/glut.h>
-
- #include "GEN_MinMax.h"
- #include "MT_Point3.h"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150122/b992462b/attachment.html>
More information about the macports-changes
mailing list