<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9bc787f838942a25557b91f8dfc67b4e19a1b0d5">https://github.com/macports/macports-ports/commit/9bc787f838942a25557b91f8dfc67b4e19a1b0d5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9bc787f LibreCAD: update to 2.1.3
</span>9bc787f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9bc787f838942a25557b91f8dfc67b4e19a1b0d5
</span>Author: ken-cunningham-webuse <ken.cunningham.webuse@gmail.com>
AuthorDate: Mon May 21 23:10:20 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> LibreCAD: update to 2.1.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> LibreCAD-devel: new port
</span><span style='display:block; white-space:pre;color:#404040;'> change both to qt5
</span><span style='display:block; white-space:pre;color:#404040;'> add cxx11 1.1 PG
</span><span style='display:block; white-space:pre;color:#404040;'> simplify Portfile structure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/43276
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/48806
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/54722
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/55834
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/56024
</span>---
cad/LibreCAD/Portfile | 96 ++++++++++++++++++++++-----------------------------
1 file changed, 41 insertions(+), 55 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/LibreCAD/Portfile b/cad/LibreCAD/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 762a6e1..8a75a09 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cad/LibreCAD/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cad/LibreCAD/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,15 +2,47 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name LibreCAD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport LibreCAD-devel {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+qt5.depends_component qtsvg qttranslations qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "${name}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts LibreCAD-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup LibreCAD LibreCAD 2.1.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 2f50b879e95c0ecc019dd5b7f6a218f62744cc1b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5d0bc37efa1006742785c06ec30737c7866b0366048553c5560e06a3e442f7b3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22416015
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|lrelease|${qt_bins_dir}/lrelease|g" scripts/postprocess-osx.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${subport} eq "${name}-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts LibreCAD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup LibreCAD LibreCAD 58deefa34cb07a3b7b4ed97cd1ac70f9b7fc56d0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.2.0-20180216
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 ad84d422534a69c49a85017e0f04ba050115fb89 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c23e6a1ccd0368c089e74772c02a420a5b475fdeb205ae6be39a93b3abeda965 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13578523
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} ${version} requires an OS supporting qt5 to function."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible OS X version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup LibreCAD LibreCAD 2.0.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span> categories cad
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers rvt.dds.nl:librecad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gmail.com:dongxuli2011 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span>
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,61 +56,15 @@ long_description LibreCAD is a free Open Source CAD application for \
</span>
homepage http://librecad.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d5dc079046ac43265b971bd00f85dfae77e14b92 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ec13e47f3c960ae716040a16da0b688c58cd85e63f7c17cd44afc5bf73b01b84
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:boost \
port:freetype \
port:libxmlxx2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append CONFIG+=\"build_muparser\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.compiler macports-gcc-4.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -r ensure's that we will build all Makefiles when QMake get's executed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args -r
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fixing -Xarch_X86_64 issues within the Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "Removing -Xarch_x86_64 from Makefiles"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse Makefile ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match "*/Makefile" ${Makefile}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "Fixing Xarch ${Makefile}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-Xarch_x86_64||" ${Makefile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC="${configure.cc} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LINK="${configure.cxx} [get_canonical_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append CONFIG+=\"build_muparser\"
</span>
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # copy libgcc files over to within the application, a bug in macdeployqt prevent's this from happening correctly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set librecad "${worksrcpath}/LibreCAD.app/Contents/MacOS/LibreCAD"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${worksrcpath}/LibreCAD.app/Contents/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dep [exec otool -L ${librecad} | grep libgcc] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [string match -nocase "*/libgcc*.dylib" ${dep}] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "Copy libgcc files over from ${dep} to ${worksrcpath}/LibreCAD.app/Contents/Frameworks"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${dep} ${worksrcpath}/LibreCAD.app/Contents/Frameworks/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set these libgcc libraries to local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: Put these in the foreach loop somehow
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -change /opt/local/lib/libgcc/libstdc++.6.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @executable_path/../Frameworks/libstdc++.6.dylib ${librecad}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -change /opt/local/lib/libgcc/libgcc_s.1.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @executable_path/../Frameworks/libgcc_s.1.dylib ${librecad}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to make a self-contained application for deployment, the following command can be uncommented
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # system -W ${worksrcpath} "${qt_bins_dir}/macdeployqt LibreCAD.app"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "${qt_bins_dir}/macdeployqt LibreCAD.app"
</span> copy ${worksrcpath}/LibreCAD.app ${destroot}${applications_dir}
}
</pre><pre style='margin:0'>
</pre>