<!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>[141197] trunk/dports/cad/freecad</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/141197">141197</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-10-12 09:14:25 -0700 (Mon, 12 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>freecad:
+ update to 0.15.4671;
+ add gmail.com:mschamschula as comaintainer;
+ fix building with new Qt4 install location;
+ add code to create stub App;
+ add new dependencies on py27-matplotlib and py27-pyside-tools;
+ remove integrated patch;
+ allow building with any MacPorts gfortran;
+ tweak configure args for new release requirements;
+ addresses tickets #48953, #47760, and #47369.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportscadfreecadPortfile">trunk/dports/cad/freecad/Portfile</a></li>
<li><a href="#trunkdportscadfreecadfilessrcAppFreeCADInitpydiff">trunk/dports/cad/freecad/files/src-App-FreeCADInit.py.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportscadfreecadfilesFreeCAD">trunk/dports/cad/freecad/files/FreeCAD</a></li>
<li><a href="#trunkdportscadfreecadfilesFreeCADicns">trunk/dports/cad/freecad/files/FreeCAD.icns</a></li>
<li><a href="#trunkdportscadfreecadfilesInfoplist">trunk/dports/cad/freecad/files/Info.plist</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportscadfreecadfilessrcModSketcherCMakeListstxtdiff">trunk/dports/cad/freecad/files/src-Mod-Sketcher-CMakeLists.txt.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportscadfreecadPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/cad/freecad/Portfile (141196 => 141197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/cad/freecad/Portfile 2015-10-12 16:09:05 UTC (rev 141196)
+++ trunk/dports/cad/freecad/Portfile 2015-10-12 16:14:25 UTC (rev 141197)
</span><span class="lines">@@ -3,14 +3,15 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup cmake 1.0
</span><ins>+PortGroup qt4 1.0
</ins><span class="cx"> PortGroup compilers 1.0
</span><span class="cx">
</span><span class="cx"> name freecad
</span><del>-version 0.14.3702
-revision 1
</del><ins>+version 0.15.4671
</ins><span class="cx"> categories cad
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers gmail.com:mark.brethen \
</span><ins>+ gmail.com:mschamschula \
</ins><span class="cx"> openmaintainer
</span><span class="cx"> license LGPL-2+
</span><span class="cx">
</span><span class="lines">@@ -27,9 +28,11 @@
</span><span class="cx">
</span><span class="cx"> homepage http://www.freecadweb.org/
</span><span class="cx"> master_sites sourceforge:project/free-cad/FreeCAD%20Source/
</span><ins>+distname ${name}_${version}
+worksrcdir ${name}-${version}
</ins><span class="cx">
</span><del>-checksums rmd160 b62582b1283c874f07d9407c7e7a87bb94591f66 \
- sha256 ee24cf3542bfb1a887a12d2df52458bcc0e3e82679370c449b9d8b5b473b9dc9
</del><ins>+checksums rmd160 384e482431c45872af24abb0228ef0aa8c864186 \
+ sha256 8dda8f355cb59866a55c9c6096f39a3ebc5347892284db4c305352cc9be03bbc
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:python27 \
</span><span class="cx"> port:boost \
</span><span class="lines">@@ -38,19 +41,19 @@
</span><span class="cx"> port:oce \
</span><span class="cx"> port:swig \
</span><span class="cx"> port:eigen3 \
</span><del>- port:qt4-mac \
</del><span class="cx"> port:freetype \
</span><span class="cx"> port:Coin-framework \
</span><span class="cx"> port:SoQt \
</span><ins>+ port:py27-matplotlib \
</ins><span class="cx"> port:py27-shiboken \
</span><span class="cx"> port:py27-pyside \
</span><ins>+ port:py27-pyside-tools \
</ins><span class="cx"> port:swig-python
</span><span class="cx">
</span><span class="cx"> depends_run port:qt4-mac-sqlite3-plugin
</span><span class="cx">
</span><span class="cx"> patchfiles cMake-FindCoin3D.cmake.diff \
</span><del>- src-App-FreeCADInit.py.diff \
- src-Mod-Sketcher-CMakeLists.txt.diff
</del><ins>+ src-App-FreeCADInit.py.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|QLibraryInfo::location.*|QLatin1String\(\"${applications_dir}/Qt4/\"\);|" \
</span><span class="lines">@@ -61,7 +64,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> compilers.choose fc
</span><del>-compilers.setup -dragonegg -g95 -gcc gcc48 require_fortran
</del><ins>+compilers.setup -dragonegg -g95 require_fortran
</ins><span class="cx">
</span><span class="cx"> configure.args-delete -DCMAKE_INSTALL_RPATH=${prefix}/lib \
</span><span class="cx"> -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
</span><span class="lines">@@ -71,7 +74,9 @@
</span><span class="cx"> -DCMAKE_INSTALL_PREFIX=${prefix}/libexec/${name} \
</span><span class="cx"> -DCMAKE_INSTALL_DATADIR=${prefix}/share/${name} \
</span><span class="cx"> -DCMAKE_INSTALL_DOCDIR=${prefix}/share/doc/${name} \
</span><del>- -DCMAKE_FRAMEWORK_PATH=${frameworks_dir}
</del><ins>+ -DCMAKE_FRAMEWORK_PATH=${frameworks_dir} \
+ -DPYSIDEUIC4BINARY=${prefix}/bin/pyside-uic-2.7 \
+ -DPYSIDERCC4BINARY=${prefix}/bin/pyside-rcc-2.7
</ins><span class="cx">
</span><span class="cx"> pre-configure {
</span><span class="cx"> # The c++ compiler is used for linking instead of fc.
</span><span class="lines">@@ -81,7 +86,7 @@
</span><span class="cx"> configure.ldflags-append "-L[file dirname ${libgfortran}]"
</span><span class="cx">
</span><span class="cx"> set python_prefix [exec ${prefix}/bin/python2.7-config --prefix]
</span><del>- configure.args-append -DFREECAD_BUILD_ROBOT=OFF \
</del><ins>+ configure.args-append -DBUILD_ROBOT=NO \
</ins><span class="cx"> -DPYTHON_LIBRARY=${python_prefix}/Python \
</span><span class="cx"> -DPYTHON_INCLUDE_DIR=${python_prefix}/Headers \
</span><span class="cx"> -DPYTHON_EXECUTABLE=${python_prefix}/bin/python2.7 \
</span><span class="lines">@@ -97,6 +102,18 @@
</span><span class="cx">
</span><span class="cx"> ln -s ${prefix}/libexec/${name}/bin/FreeCADCmd \
</span><span class="cx"> ${destroot}${prefix}/bin
</span><ins>+
+ # create stub App
+ set appdir ${destroot}${applications_dir}/FreeCAD.app
+ xinstall -d ${appdir}/Contents/MacOS
+ xinstall -d ${appdir}/Contents/Resources
+
+ xinstall -m 644 ${filespath}/Info.plist ${appdir}/Contents/
+ xinstall -m 644 ${filespath}/FreeCAD.icns ${appdir}/Contents/Resources/
+ xinstall -m 755 ${filespath}/FreeCAD ${appdir}/Contents/MacOS
+
+ reinplace -W ${appdir}/Contents "s,@@VERSION@@,${version},g" Info.plist
+ reinplace -W ${appdir}/Contents/MacOS "s,@@PREFIX@@,${prefix},g" FreeCAD
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.regex ${name}.(\[0-9.\]+)${extract.suffix}
</span></span></pre></div>
<a id="trunkdportscadfreecadfilesFreeCAD"></a>
<div class="addfile"><h4>Added: trunk/dports/cad/freecad/files/FreeCAD (0 => 141197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/cad/freecad/files/FreeCAD (rev 0)
+++ trunk/dports/cad/freecad/files/FreeCAD 2015-10-12 16:14:25 UTC (rev 141197)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+#!/bin/sh
+
+@@PREFIX@@/bin/freecad
</ins></span></pre></div>
<a id="trunkdportscadfreecadfilesFreeCADicns"></a>
<div class="binary"><h4>Added: trunk/dports/cad/freecad/files/FreeCAD.icns</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/dports/cad/freecad/files/FreeCAD.icns
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkdportscadfreecadfilesInfoplist"></a>
<div class="binary"><h4>Added: trunk/dports/cad/freecad/files/Info.plist</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/dports/cad/freecad/files/Info.plist
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkdportscadfreecadfilessrcAppFreeCADInitpydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/cad/freecad/files/src-App-FreeCADInit.py.diff (141196 => 141197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/cad/freecad/files/src-App-FreeCADInit.py.diff 2015-10-12 16:09:05 UTC (rev 141196)
+++ trunk/dports/cad/freecad/files/src-App-FreeCADInit.py.diff 2015-10-12 16:14:25 UTC (rev 141197)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- src/App/FreeCADInit.py.orig 2014-07-13 10:33:02.000000000 -0500
</span><span class="cx"> +++ src/App/FreeCADInit.py 2014-07-17 20:19:20.000000000 -0500
</span><del>-@@ -102,6 +102,7 @@
</del><ins>+@@ -101,6 +101,7 @@
</ins><span class="cx"> Log('Init: Initializing ' + Dir + '... done\n')
</span><span class="cx"> else:
</span><span class="cx"> Log('Init: Initializing ' + Dir + '(Init.py not found)... ignore\n')
</span></span></pre></div>
<a id="trunkdportscadfreecadfilessrcModSketcherCMakeListstxtdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/cad/freecad/files/src-Mod-Sketcher-CMakeLists.txt.diff (141196 => 141197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/cad/freecad/files/src-Mod-Sketcher-CMakeLists.txt.diff 2015-10-12 16:09:05 UTC (rev 141196)
+++ trunk/dports/cad/freecad/files/src-Mod-Sketcher-CMakeLists.txt.diff 2015-10-12 16:14:25 UTC (rev 141197)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>---- src/Mod/Sketcher/CMakeLists.txt.orig 2014-07-13 10:33:02.000000000 -0500
-+++ src/Mod/Sketcher/CMakeLists.txt 2014-07-18 19:14:23.000000000 -0500
-@@ -11,7 +11,16 @@
- SketcherExample.py
- TestSketcherApp.py
- TestSketcherGui.py
-+ Profiles.py
- DESTINATION
- Mod/Sketcher
- )
-
-+INSTALL(
-+ FILES
-+ ProfileLib/Hexagon.py
-+ ProfileLib/__init__.py
-+ DESTINATION
-+ Mod/Sketcher/ProfileLib
-+)
-+
</del></span></pre>
</div>
</div>
</body>
</html>