<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e8822a33971934d6587492b3f65865b46fa002d7">https://github.com/macports/macports-ports/commit/e8822a33971934d6587492b3f65865b46fa002d7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e8822a33971934d6587492b3f65865b46fa002d7
</span>Author: Ryan Schmidt <git@ryandesign.com>
AuthorDate: Sat Mar 3 18:28:14 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> qgis: Use cmake 1.1 portgroup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/55905
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/47197
</span>---
gis/qgis/Portfile | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis/Portfile b/gis/qgis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c7b15d5..d887c18 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup compiler_blacklist_versions 1.0
#PortGroup github 1.0
PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,10 +51,6 @@ depends_build-append \
</span> port:bison \
port:ld64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "mkdir build"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace -E "s|@PREFIX@|${prefix}|g" \
${worksrcpath}/mac/app.info.plist.in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +61,7 @@ compiler.blacklist {clang < 500}
</span>
set Py_FRM ${frameworks_dir}/Python.framework/Versions/2.7
<span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.install_prefix ${applications_dir}
</span> #configure.args-append "--trace"
configure.args-append "-DWITH_GRASS=OFF"
configure.args-append "-DWITH_GRASS7=OFF"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,11 +83,8 @@ configure.args-append "-DQT_LRELEASE_EXECUTABLE=${prefix}/libexec/qt4/bin/lrel
</span> configure.args-append "-DQSCINTILLA_INCLUDE_DIR=${prefix}/libexec/qt4/include"
configure.args-append "-DQSCINTILLA_LIBRARY=${prefix}/libexec/qt4/lib/libqscintilla2_qt4.dylib"
configure.args-append "-DQJSON_DIR=${prefix}/lib/cmake/qjson"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DCMAKE_CXX_COMPILER=${configure.cxx}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DCMAKE_C_COMPILER=${configure.cc}"
</span> configure.args-append "-DEXPAT_INCLUDE_DIR=${prefix}/include"
configure.args-append "-DEXPAT_LIBRARY=${prefix}/lib/libexpat.dylib"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DCMAKE_INSTALL_PREFIX=${applications_dir}"
</span> configure.args-append "-DQGIS_MACAPP_BUNDLE=0"
configure.args-append "-DGDAL_CONFIG=${prefix}/bin/gdal-config"
configure.args-append "-DGDAL_INCLUDE_DIR=${prefix}/include"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,8 +97,6 @@ configure.args-append "-DPROJ_INCLUDE_DIR=${prefix}/include"
</span> configure.args-append "-DPROJ_LIBRARY=${prefix}/lib/libproj.dylib"
configure.args-append \
"-DSPATIALINDEX_LIBRARY=${prefix}/lib/libspatialindex.dylib"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#configure.args-append "-DCMAKE_BUILD_TYPE=DEBUG"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DCMAKE_BUILD_TYPE=RELEASE"
</span>
depends_lib-append port:python27 \
port:py27-pyqt4 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,9 +170,3 @@ variant grass description "Build Grass 7 plugin" {
</span> configure.args-append "-DWITH_GRASS7=ON"
configure.args-append -DGRASS_PREFIX7=${prefix}/share/grass-${grass_version}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.dir ${worksrcpath}/build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd cmake ..
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.dir ${worksrcpath}/build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target install
</span></pre><pre style='margin:0'>
</pre>