<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[131982] trunk/dports/science/solid</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/131982">131982</a></dd>
<dt>Author</dt> <dd>mmoll@macports.org</dd>
<dt>Date</dt> <dd>2015-01-22 11:55:17 -0800 (Thu, 22 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencesolidPortfile">trunk/dports/science/solid/Portfile</a></li>
<li><a href="#trunkdportssciencesolidfilespatchconfigureacdiff">trunk/dports/science/solid/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssciencesolidfilespatchGLUTdiff">trunk/dports/science/solid/files/patch-GLUT.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencesolidfilespatchexamplesgldemocppdiff">trunk/dports/science/solid/files/patch-examples-gldemo.cpp.diff</a></li>
<li><a href="#trunkdportssciencesolidfilespatchexamplesmnmcppdiff">trunk/dports/science/solid/files/patch-examples-mnm.cpp.diff</a></li>
<li><a href="#trunkdportssciencesolidfilespatchexamplesphysicscppdiff">trunk/dports/science/solid/files/patch-examples-physics.cpp.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencesolidPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/solid/Portfile (131981 => 131982)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3,47 +3,30 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name solid
</span><del>-version 3.5.6
-revision 1
</del><ins>+version 3.5.7
</ins><span class="cx"> categories science math devel
</span><span class="cx"> platforms darwin
</span><del>-license LGPL-2
</del><ins>+license {GPL-2 QPL-1}
</ins><span class="cx"> maintainers mww openmaintainer
</span><span class="cx"> description SOLID is a software library for collision detection of geometric objects in 3D space
</span><span class="cx"> long_description ${description}
</span><span class="cx">
</span><span class="cx"> homepage http://www.dtecta.com/
</span><span class="cx"> master_sites http://www.dtecta.com/files/
</span><del>-checksums rmd160 0b2e305c323caef96e182ec75529bad92c41f35a \
- sha256 4acfa20266f0aa5722732794f8e93d7bb446e467719c947a3ca583f197923af0
</del><ins>+checksums rmd160 3040717b9e890bde74c71f4f0c8c4bcc8b8c666e \
+ sha256 7f78cffd83bbed93b0ec4421866ebd97d16db74a8068b25e45df231a49cc7d04
+use_zip yes
+patchfiles patch-configure.ac.diff patch-GLUT.diff
</ins><span class="cx">
</span><del>-extract.suffix .tgz
-patchfiles patch-examples-mnm.cpp.diff patch-examples-physics.cpp.diff \
- patch-examples-gldemo.cpp.diff patch-configure.ac.diff
-
</del><span class="cx"> depends_lib port:qhull
</span><span class="cx">
</span><span class="cx"> # This project has buggy C++ code
</span><span class="cx"> compiler.blacklist *clang*
</span><ins>+compiler.fallback macports-gcc-4.9
</ins><span class="cx">
</span><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span><del>-autoreconf.env AUTOMAKE="automake --foreign"
</del><span class="cx">
</span><del>-configure.cflags -fno-gcse -fno-strict-aliasing -DNDEBUG -fpermissive
-configure.cxxflags -fno-gcse -fno-strict-aliasing -DNDEBUG -fpermissive
-
</del><span class="cx"> build.args GLLIBS="-framework OpenGL -framework GLUT"
</span><span class="cx">
</span><del>-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"
- }
- }
-}
-
</del><span class="cx"> livecheck.type none
</span></span></pre></div>
<a id="trunkdportssciencesolidfilespatchGLUTdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/solid/files/patch-GLUT.diff (0 => 131982)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+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"
</ins></span></pre></div>
<a id="trunkdportssciencesolidfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/solid/files/patch-configure.ac.diff (131981 => 131982)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,23 +1,38 @@
</span><del>---- 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.
</del><ins>+--- 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
</ins></span></pre></div>
<a id="trunkdportssciencesolidfilespatchexamplesgldemocppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/solid/files/patch-examples-gldemo.cpp.diff (131981 => 131982)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- 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
</del></span></pre></div>
<a id="trunkdportssciencesolidfilespatchexamplesmnmcppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/solid/files/patch-examples-mnm.cpp.diff (131981 => 131982)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- 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"
</del></span></pre></div>
<a id="trunkdportssciencesolidfilespatchexamplesphysicscppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/solid/files/patch-examples-physics.cpp.diff (131981 => 131982)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- 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"
</del></span></pre>
</div>
</div>
</body>
</html>