<!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>[149336] trunk/dports/science/openscad</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/149336">149336</a></dd>
<dt>Author</dt> <dd>dstrubbe@macports.org</dd>
<dt>Date</dt> <dd>2016-06-13 12:46:13 -0700 (Mon, 13 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>openscad: Update to version 2015.03-3. Take over maintainership. Add 'cad' as secondary category. Fix description. Fix livecheck. Add patches for BOOST issue, and simplify examples destrooting for the fact that there are subdirectories now.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceopenscadPortfile">trunk/dports/science/openscad/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/science/openscad/files/</li>
<li><a href="#trunkdportsscienceopenscadfilespatchsrccolormaphdiff">trunk/dports/science/openscad/files/patch-src-colormap.h.diff</a></li>
<li><a href="#trunkdportsscienceopenscadfilespatchsrcscintillaeditorhdiff">trunk/dports/science/openscad/files/patch-src-scintillaeditor.h.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceopenscadPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/openscad/Portfile (149335 => 149336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/openscad/Portfile 2016-06-13 18:38:50 UTC (rev 149335)
+++ trunk/dports/science/openscad/Portfile 2016-06-13 19:46:13 UTC (rev 149336)
</span><span class="lines">@@ -5,13 +5,12 @@
</span><span class="cx"> PortGroup qmake 1.0
</span><span class="cx">
</span><span class="cx"> name openscad
</span><del>-version 2014.03
-revision 4
</del><ins>+version 2015.03-3
</ins><span class="cx"> license GPL-2
</span><del>-categories science
-maintainers nomaintainer
-description OpenSCAD is a software for creating solid 3D CAD objects
-long_description OpenSCAD is a software for creating solid 3D CAD objects. \
</del><ins>+categories science cad
+maintainers dstrubbe openmaintainer
+description Software for creating solid 3D CAD objects
+long_description ${description}. \
</ins><span class="cx"> Unlike most free software for creating 3D models (such as the \
</span><span class="cx"> famous application Blender) it does not focus on the artistic \
</span><span class="cx"> aspects of 3D modelling but instead on the CAD aspects. Thus \
</span><span class="lines">@@ -29,7 +28,7 @@
</span><span class="cx"> constructive solid geometry (aka CSG) and second there is extrusion \
</span><span class="cx"> of 2D outlines. As data exchange format format for this 2D outlines \
</span><span class="cx"> Autocad DXF files are used. In addition to 2D paths for extrusion \
</span><del>- it is also possible to read design parametes from DXF files. Besides \
</del><ins>+ it is also possible to read design parameters from DXF files. Besides \
</ins><span class="cx"> DXF files OpenSCAD can read and create 3D models in the STL and OFF \
</span><span class="cx"> file formats.
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -38,8 +37,8 @@
</span><span class="cx"> master_sites http://files.openscad.org
</span><span class="cx"> distfiles ${distname}.src${extract.suffix}
</span><span class="cx">
</span><del>-checksums rmd160 ea55d3d5e467e528654d5e98f5f149e10181a371 \
- sha256 865fdc637a3ceb0678d35e88995411d8e70e8a7937625d7ede147a1570a561c3
</del><ins>+checksums rmd160 323eda5bd96b2093d4fbb2274763f7a0ae4eb7f4 \
+ sha256 5d2a7d83c32f4201ee0d17445a36baccaebc0bc7facd009fc8dd86ee537c5a36
</ins><span class="cx">
</span><span class="cx"> depends_build-append \
</span><span class="cx"> port:bison \
</span><span class="lines">@@ -58,6 +57,12 @@
</span><span class="cx"> configure.pre_args-append \
</span><span class="cx"> VERSION=${version} CONFIG-=debug openscad.pro
</span><span class="cx">
</span><ins>+# Fix these errors, as per https://bugreports.qt.io/browse/QTBUG-22829
+#src/scintillaeditor.h -o objects/moc_scintillaeditor.cpp
+#src/QGLView.h -o objects/moc_QGLView.cpp
+#:info:build opt/local/include/boost/type_traits/detail/has_binary_operator.hp:50: Parse error at "BOOST_JOIN"
+patchfiles patch-src-scintillaeditor.h.diff patch-src-colormap.h.diff
+
</ins><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="lines">@@ -67,9 +72,7 @@
</span><span class="cx"> move ${destroot}${prefix}/bin/OpenSCAD.app ${destroot}${applications_dir}
</span><span class="cx">
</span><span class="cx"> # Examples
</span><del>- file mkdir ${destroot}${applications_dir}/OpenSCAD.app/Contents/Resources/examples
- eval xinstall -m 644 [glob ${destroot}${prefix}/share/openscad/examples/*] ${destroot}${applications_dir}/OpenSCAD.app/Contents/Resources/examples
- eval file delete [glob ${destroot}${prefix}/share/openscad/examples/*]
</del><ins>+ move ${destroot}${prefix}/share/openscad/examples ${destroot}${applications_dir}/OpenSCAD.app/Contents/Resources/examples
</ins><span class="cx">
</span><span class="cx"> # Library bitmaps
</span><span class="cx"> file mkdir ${destroot}${applications_dir}/OpenSCAD.app/Contents/Resources/libraries/MCAD/bitmap
</span><span class="lines">@@ -90,6 +93,8 @@
</span><span class="cx"> file delete ${destroot}${prefix}/share/pixmaps/openscad.png
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# test: cmake in tests directory; make test.
+
</ins><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url [lindex ${master_sites} 0]
</span><del>-livecheck.regex ${name}-(\[0-9.\]+).src${extract.suffix}
</del><ins>+livecheck.regex ${name}-(\[0-9.-\]+).src${extract.suffix}
</ins></span></pre></div>
<a id="trunkdportsscienceopenscadfilespatchsrccolormaphdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/openscad/files/patch-src-colormap.h.diff (0 => 149336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/openscad/files/patch-src-colormap.h.diff (rev 0)
+++ trunk/dports/science/openscad/files/patch-src-colormap.h.diff 2016-06-13 19:46:13 UTC (rev 149336)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+--- src/colormap.h.orig 2016-06-13 12:49:57.000000000 -0400
++++ src/colormap.h 2016-06-13 13:04:51.000000000 -0400
+@@ -7,7 +7,9 @@
+
+ #include <boost/shared_ptr.hpp>
+ #include <boost/filesystem.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/property_tree/ptree.hpp>
++#endif
+
+ namespace fs = boost::filesystem;
+
</ins></span></pre></div>
<a id="trunkdportsscienceopenscadfilespatchsrcscintillaeditorhdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/openscad/files/patch-src-scintillaeditor.h.diff (0 => 149336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/openscad/files/patch-src-scintillaeditor.h.diff (rev 0)
+++ trunk/dports/science/openscad/files/patch-src-scintillaeditor.h.diff 2016-06-13 19:46:13 UTC (rev 149336)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- src/scintillaeditor.h.orig 2016-06-13 12:19:02.000000000 -0400
++++ src/scintillaeditor.h 2016-06-13 12:27:07.000000000 -0400
+@@ -12,8 +12,10 @@
+ #include "parsersettings.h"
+
+ #include <boost/shared_ptr.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/property_tree/ptree.hpp>
+ #include <boost/property_tree/json_parser.hpp>
++#endif
+
+ class EditorColorScheme
+ {
</ins></span></pre>
</div>
</div>
</body>
</html>