<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b44d65244a43759c525b34dfb31a8fe2174c1ac6">https://github.com/macports/macports-ports/commit/b44d65244a43759c525b34dfb31a8fe2174c1ac6</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 b44d652 qgis3: bunch of improvements to the Portfile
</span>b44d652 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b44d65244a43759c525b34dfb31a8fe2174c1ac6
</span>Author: Veence <vince@macports.org>
AuthorDate: Sat Dec 2 17:56:20 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> qgis3: bunch of improvements to the Portfile
</span>---
gis/qgis3/Portfile | 163 ++++++++++++++++++++++++++++++-----------------------
1 file changed, 94 insertions(+), 69 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis3/Portfile b/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ec992d6..e72535d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,6 @@
</span> PortSystem 1.0
PortGroup cmake 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span> PortGroup qt5 1.0
name qgis3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,20 +12,19 @@ version 2.99.20171201
</span> categories gis
maintainers vince
description QGIS 3 is a user-friendly GIS based on Qt 5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description QGIS is a GIS. It can visualize, inject data into\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PostGres/PostGIS, or serve as a Qt front-end to\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Grass. Extended with Python plugins, it can become\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a quite powerful GIS of its own.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description QGIS is an open-source alternative to ArcGIS or other commercial GIS.\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ It can be used as a standalone GIS, or also as frontend to other,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ less user-friendly GIS such as Grass or Saga. Also, it can be used with\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OrfeoToolBox.
</span>
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2+
</span>
use_parallel_build no
homepage http://www.qgis.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-app_info_plist_in.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-PyQtMacros.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-app_info_plist_in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-CMakelists_txt.diff
</span>
checksums rmd160 a3d9d07479c61da4ce96e6e645eaf9a23c294c65 \
sha256 61d69356a7c53b201d733c1eb6e366c13f181bc022a7429fc17e38418e07bec0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,109 +43,135 @@ depends_lib-append port:libiconv \
</span> port:fcgi \
port:spatialindex \
port:postgis2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qtkeychain
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qt5-qtwebkit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qt5-qtscript \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qt5-sqlite-plugin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qca-qt5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qca-qt5-ossl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qtkeychain-qt5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qwt-qt5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qjson-qt5
</span>
depends_build-append \
port:bison \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ld64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ld64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# QWT must be built with qt5 dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants qwt61 qt5
</span>
post-extract {
system -W ${worksrcpath} "mkdir build"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace -E "s|@@@|${prefix}|g" \
${worksrcpath}/mac/app.info.plist.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# reinplace -E "s|Clang|AppleClang|" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Handle legacy OS/XCode
if {[vercmp $xcodeversion 4.6.3] <= 0} {
configure.compiler llvm-gcc-4.2
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Python related stuff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Plug-ins
</span> configure.args-append "-DWITH_GRASS=OFF"
configure.args-append "-DWITH_GRASS7=OFF"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DWITH_QWTPOLAR=FALSE"
</span> #configure.args-append "--trace"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set py_ver 3.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set Py_FRM ${frameworks_dir}/Python.framework/Versions/${py_ver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.ldflags "-Wl,-rpath,${prefix}/libexec/qt5/lib"
configure.args-append "-DWITH_3D=ON"
configure.args-append "-DWITH_GLOBE=OFF"
configure.args-append "-DLIBZIP_CONF_INCLUDE_DIR=${prefix}/lib/pkgconfig"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python${py_ver}"
</span> configure.args-append "-DWITH_BINDINGS=FALSE"
configure.args-append "-DQCA_INCLUDE_DIR=${prefix}/libexec/qt5/include/QtCrypto"
configure.args-append "-DQCA_LIBRARY=${prefix}/libexec/qt5/lib/libqca-qt5.dylib"
configure.args-append "-DQSCINTILLA_INCLUDE_DIR=${prefix}/libexec/qt5/include"
configure.args-append "-DQSCINTILLA_LIBRARY=${prefix}/libexec/qt5/lib/libqscintilla2_qt5.dylib"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DQWT_LIBRARY=${prefix}/libexec/qt5/lib/libqwt.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DQWT_INCLUDE_DIR=${prefix}/libexec/qt5/lib/qwt.framework/Versions/6/Headers"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append "-DQWT_LIBRARY=${prefix}/libexec/qt5/lib/qwt.framework/Versions/Current/qwt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append "-DQWT_INCLUDE_DIR=${prefix}/libexec/qt5/lib/qwt.framework/Versions/Current/Headers"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append "-DWITH_QWTPOLAR=ON"
</span> configure.args-append "-DQT_LRELEASE_EXECUTABLE=${prefix}/libexec/qt5/bin/lrelease"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Server does not build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Server does not build so far
</span> configure.args-append "-DWITH_SERVER=FALSE"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:python36 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py36-pyqt5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py36-qscintilla-qt5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py36-six \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt5-qtwebkit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt5-qtscript \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt5-sqlite-plugin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qca-qt5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qca-qt5-ossl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py36-gdal \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qwt61 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qjson-qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Database variants (from the GDAL port)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_suffixes {10 95 96}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:py36-sip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set portsgresql_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach suffix ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend portsgresql_variants postgresql${suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach suffix ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set variant postgresql${suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pgversion [string index ${suffix} 0].[string index ${suffix} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch -exact ${portsgresql_variants} ${variant}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conflicts [lreplace ${portsgresql_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${variant} description "Use PostgreSQL ${pgversion}" conflicts {*}${conflicts} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${variant}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPOSTGRES_CONFIG=${prefix}/lib/${variant}/bin/pg_config
</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;'>-depends_run-append port:py36-psycopg2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py36-requests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# postgresql default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pgdefault "if {"
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach suffix ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pgdefault "${pgdefault}!\[variant_isset postgresql${suffix}\] && "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Database variants (from the GDAL port)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set postgresql_suffixes {95 96 10}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pgdefault [string range ${pgdefault} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pgdefault "${pgdefault}} { default_variants +postgresql10 }"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set portsgresql_variants {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach s ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend portsgresql_variants postgresql${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+eval ${pgdefault}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_suffixes {34 35 36}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pyver ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend python_variants python${pyver}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach s ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set p postgresql${s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set v [string index ${s} 0].[string index ${s} 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set i [lsearch -exact ${portsgresql_variants} ${p}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set c [lreplace ${portsgresql_variants} ${i} ${i}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval [subst {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Enable PostgreSQL ${v} support" conflicts ${c} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-DPOSTGRES_CONFIG=${prefix}/lib/${p}/bin/pg_config"
</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:#e0ffe0;'>+foreach pyver ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set variant python${pyver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pyversion [string index ${pyver} 0].[string index ${pyver} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch -exact ${python_variants} ${variant}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conflicts [lreplace ${python_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${variant} description "Use Python ${pyversion}" conflicts {*}${conflicts} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python${pyver} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${pyver}-pyqt5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${pyver}-qscintilla-qt5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${pyver}-gdal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${pyver}-six
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py${pyver}-sip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:py${pyver}-psycopg2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${pyver}-requests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python${pyversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# postgresql default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pgd "if {"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach s ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set pgd "${pgd}!\[variant_isset postgresql${s}\] && "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_default "if {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pyver ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_default "${python_default}!\[variant_isset python${pyver}\] && "
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pgd [string range ${pgd} 0 end-4]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pgd "${pgd}} { default_variants +postgresql10 }"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-eval ${pgd}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_default [string range ${python_default} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_default "${python_default}} { default_variants +python36 }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+eval ${python_default}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Other variants
</span>
variant grass description "Build Grass 7 plugin" {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,6 +182,8 @@ variant grass description "Build Grass 7 plugin" {
</span> "-DGRASS_PREFIX7=${prefix}/share/grass-7.2.2"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Configure steps
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.dir ${worksrcpath}/build
configure.cmd cmake ..
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,17 +202,16 @@ configure.args-append "-DGEOS_LIBRARY=${prefix}/lib/libgeos_c.dylib"
</span> configure.args-append "-DGSL_CONFIG=${prefix}/bin/gsl-config"
configure.args-append "-DPROJ_INCLUDE_DIR=${prefix}/include"
configure.args-append "-DPROJ_LIBRARY=${prefix}/lib/libproj.dylib"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-DSPATIALINDEX_LIBRARY=${prefix}/lib/libspatialindex.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append "-DSPATIALINDEX_LIBRARY=${prefix}/lib/libspatialindex.dylib"
</span> #configure.args-append "-DCMAKE_BUILD_TYPE=DEBUG"
configure.args-append "-DCMAKE_BUILD_TYPE=RELEASE"
post-destroot {
# qgis_bench app doesn’t link properly. Who uses this anyway????
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${destroot}/Applications/MacPorts/QGIS.app/Contents/MacOS/bin "rm -rf qgis_bench.app"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${destroot}/Applications/MacPorts/Qgis3.app/Contents/MacOS/bin "rm -rf qgis_bench.app"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # system -W ${destroot}/Applications/MacPorts "mv QGIS.app QGIS3.app"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_parallel_build yes
build.dir ${worksrcpath}/build
destroot.target install
</pre><pre style='margin:0'>
</pre>