[149336] trunk/dports/science/openscad
dstrubbe at macports.org
dstrubbe at macports.org
Mon Jun 13 12:46:13 PDT 2016
Revision: 149336
https://trac.macports.org/changeset/149336
Author: dstrubbe at macports.org
Date: 2016-06-13 12:46:13 -0700 (Mon, 13 Jun 2016)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/dports/science/openscad/Portfile
Added Paths:
-----------
trunk/dports/science/openscad/files/
trunk/dports/science/openscad/files/patch-src-colormap.h.diff
trunk/dports/science/openscad/files/patch-src-scintillaeditor.h.diff
Modified: trunk/dports/science/openscad/Portfile
===================================================================
--- 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)
@@ -5,13 +5,12 @@
PortGroup qmake 1.0
name openscad
-version 2014.03
-revision 4
+version 2015.03-3
license GPL-2
-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. \
+categories science cad
+maintainers dstrubbe openmaintainer
+description Software for creating solid 3D CAD objects
+long_description ${description}. \
Unlike most free software for creating 3D models (such as the \
famous application Blender) it does not focus on the artistic \
aspects of 3D modelling but instead on the CAD aspects. Thus \
@@ -29,7 +28,7 @@
constructive solid geometry (aka CSG) and second there is extrusion \
of 2D outlines. As data exchange format format for this 2D outlines \
Autocad DXF files are used. In addition to 2D paths for extrusion \
- it is also possible to read design parametes from DXF files. Besides \
+ it is also possible to read design parameters from DXF files. Besides \
DXF files OpenSCAD can read and create 3D models in the STL and OFF \
file formats.
platforms darwin
@@ -38,8 +37,8 @@
master_sites http://files.openscad.org
distfiles ${distname}.src${extract.suffix}
-checksums rmd160 ea55d3d5e467e528654d5e98f5f149e10181a371 \
- sha256 865fdc637a3ceb0678d35e88995411d8e70e8a7937625d7ede147a1570a561c3
+checksums rmd160 323eda5bd96b2093d4fbb2274763f7a0ae4eb7f4 \
+ sha256 5d2a7d83c32f4201ee0d17445a36baccaebc0bc7facd009fc8dd86ee537c5a36
depends_build-append \
port:bison \
@@ -58,6 +57,12 @@
configure.pre_args-append \
VERSION=${version} CONFIG-=debug openscad.pro
+# 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
+
use_parallel_build yes
post-destroot {
@@ -67,9 +72,7 @@
move ${destroot}${prefix}/bin/OpenSCAD.app ${destroot}${applications_dir}
# Examples
- 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/*]
+ move ${destroot}${prefix}/share/openscad/examples ${destroot}${applications_dir}/OpenSCAD.app/Contents/Resources/examples
# Library bitmaps
file mkdir ${destroot}${applications_dir}/OpenSCAD.app/Contents/Resources/libraries/MCAD/bitmap
@@ -90,6 +93,8 @@
file delete ${destroot}${prefix}/share/pixmaps/openscad.png
}
+# test: cmake in tests directory; make test.
+
livecheck.type regex
livecheck.url [lindex ${master_sites} 0]
-livecheck.regex ${name}-(\[0-9.\]+).src${extract.suffix}
+livecheck.regex ${name}-(\[0-9.-\]+).src${extract.suffix}
Added: trunk/dports/science/openscad/files/patch-src-colormap.h.diff
===================================================================
--- 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)
@@ -0,0 +1,12 @@
+--- 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;
+
Added: trunk/dports/science/openscad/files/patch-src-scintillaeditor.h.diff
===================================================================
--- 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)
@@ -0,0 +1,13 @@
+--- 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
+ {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160613/837d96bb/attachment.html>
More information about the macports-changes
mailing list