<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/38979605a009a9d6affb20c35ac262e4d39a0e82">https://github.com/macports/macports-ports/commit/38979605a009a9d6affb20c35ac262e4d39a0e82</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 3897960 qgis3: add a +server option for qgis-server. Also odds-and-ends fixing stuff.
</span>3897960 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 38979605a009a9d6affb20c35ac262e4d39a0e82
</span>Author: Veence <vince@macports.org>
AuthorDate: Thu Mar 21 14:30:13 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> qgis3: add a +server option for qgis-server. Also odds-and-ends fixing stuff.
</span>---
gis/qgis3/Portfile | 97 +++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 67 insertions(+), 30 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 98c49a5..b6bd762 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;'>@@ -6,10 +6,12 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup cxx11 1.1
PortGroup github 1.0
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span>
github.setup qgis QGIS 3_6_0 final-
name qgis3
version [string map {_ .} ${github.version}]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories gis
maintainers {vince @Veence} openmaintainer
description QGIS 3 is a user-friendly GIS based on Qt 5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,23 +29,12 @@ checksums rmd160 b227ab566fd03371e4ef886fd2f18832aa40968c \
</span> sha256 d11507783e2ee3f7ed22ba693c8c8497372a47fdb6bc34460cf8066a92d21903 \
size 92706111
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Qt version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set QtVer 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset qt59]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set QtVer 59
</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 qt59 description "Build with Qt 5.9 instead of 5.11" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Work under progress!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:libiconv \
port:expat \
port:libtasn1 \
port:libzip \
path:lib/libssl.dylib:openssl \
port:gsl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fcgi \
</span> port:geos \
port:gdal \
port:exiv2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,16 +42,16 @@ depends_lib-append port:libiconv \
</span> port:spatialite \
port:spatialindex \
port:postgis2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt${QtVer}-qtwebkit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt${QtVer}-qtscript \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt${QtVer}-sqlite-plugin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt${QtVer}-qtscxml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt${QtVer}-qtxmlpatterns \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qca-qt${QtVer} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qca-qt${QtVer}-ossl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qtkeychain-qt${QtVer} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qwt-qt${QtVer} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qjson-qt${QtVer}
</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:qt5-qtscxml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qt5-qtxmlpatterns \
</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:#e0e0e0;'>@@ -83,14 +74,24 @@ compiler.blacklist {clang < 500}
</span> configure.sdkroot ${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
cmake.install_prefix ${applications_dir}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#HD5/MPI related things
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![catch {set result [active_variants hdf5 mpi]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup mpi 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpi.setup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpi.enforce_variant hdf5
</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;'>+
</span> # Plug-ins
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DWITH_GRASS=OFF"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DWITH_GRASS7=OFF"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append "-DWITH_GRASS=OFF"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append "-DWITH_GRASS7=OFF"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append "-DWITH_QSPATIALITE=OFF"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append "-DWITH_GLOBE=OFF"
</span> #configure.args-append "--trace"
configure.ldflags "-Wl,-rpath,${prefix}/libexec/qt5/lib"
configure.args-append "-DWITH_3D=ON"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DWITH_GLOBE=OFF"
</span> configure.args-append "-DLIBZIP_CONF_INCLUDE_DIR=${prefix}/lib/pkgconfig"
configure.args-append "-DWITH_BINDINGS=FALSE"
configure.args-append "-DQCA_INCLUDE_DIR=${prefix}/libexec/qt5/include/QtCrypto"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,16 +102,51 @@ configure.args-append "-DQSCI_SIP_DIR=${frameworks_dir}/Python.framework/Versi
</span> configure.args-append "-DQWT_LIBRARY=${prefix}/libexec/qt5/lib/qwt.framework/Versions/Current/qwt"
configure.args-append "-DQWT_INCLUDE_DIR=${prefix}/libexec/qt5/lib/qwt.framework/Versions/Current/Headers"
configure.args-append "-DWITH_QWTPOLAR=ON"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append "-DWITH_INTERNAL_QWTPOLAR=ON"
</span> configure.args-append "-DQT_LRELEASE_EXECUTABLE=${prefix}/libexec/qt5/bin/lrelease"
configure.args-append "-DAPPLE_APPKIT_LIBRARY=${configure.sdkroot}/System/Library/Frameworks/AppKit.framework"
configure.args-append "-DAPPLE_APPLICATIONSERVICES_LIBRARY=${configure.sdkroot}/System/Library/Frameworks/ApplicationServices.framework"
configure.args-append "-DAPPLE_COREFOUNDATION_LIBRARY=${configure.sdkroot}/System/Library/Frameworks/CoreFoundation.framework"
configure.args-append "-DAPPLE_IOKIT_LIBRARY=${configure.sdkroot}/System/Library/Frameworks/IOKit.framework"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Server does not build so far
</span> configure.args-append "-DWITH_SERVER=OFF"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant server description "Builds with the server (FCGI) option" {
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:fcgi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete "-DWITH_SERVER=OFF"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append "-DWITH_SERVER=ON"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix wrong @loader_path/... library paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set r "${applications_dir}/Qgis3.app/Contents"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set w "@loader_path/.."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set d "${destroot}${r}/MacOS/lib/qgis/server"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lib {"libdummy.so" "libwcs.so" "libwfs.so" "libwms.so" "libwmts.so"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exec install_name_tool -change "${w}/../Frameworks/qgis_native.framework/qgis_native" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${r}/Frameworks/qgis_native.framework/qgis_native" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${d}/${lib}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exec install_name_tool -change "${w}/../Frameworks/qgis_core.framework/qgis_core" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${r}/Frameworks/qgis_core.framework/qgis_core" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${d}/${lib}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exec install_name_tool -change "${w}/../Frameworks/qgis_analysis.framework/qgis_analysis" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${r}/Frameworks/qgis_analysis.framework/qgis_analysis" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${d}/${lib}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exec install_name_tool -change "${w}/lib/libqgispython.3.6.0.dylib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${r}/MacOS/lib/libqgispython.3.6.0.dylib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${d}/${lib}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exec install_name_tool -change "${w}/lib/libqgis_server.3.6.0.dylib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${r}/MacOS/lib/libqgis_server.3.6.0.dylib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${d}/${lib}"
</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;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Database variants (from the GDAL port)
set postgresql_suffixes {11 10 95 96}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,6 +165,7 @@ foreach suffix ${postgresql_suffixes} {
</span> depends_lib-append port:${vrt}
configure.args-append \
-DPOSTGRES_CONFIG=${prefix}/lib/${vrt}/bin/pg_config
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_PGTEST=ON
</span> "
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,8 +197,8 @@ foreach pyver ${python_suffixes} {
</span>
variant ${vrt} description "Use Python ${pyversion}" conflicts {*}${conf} "
depends_lib-append port:python${pyver} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${pyver}-pyqt${QtVer} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${pyver}-qscintilla-qt${QtVer} \
</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> port:py${pyver}-gdal \
port:py${pyver}-six
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,8 +214,8 @@ foreach pyver ${python_suffixes} {
</span>
configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python${pyversion}
configure.args-append -DWITH_BINDINGS=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYUIC_PROGRAM=${prefix}/bin/pyuic${QtVer}-${pyversion}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYRCC_PROGRAM=${prefix}/bin/pyrcc${QtVer}-${pyversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYUIC_PROGRAM=${prefix}/bin/pyuic5-${pyversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYRCC_PROGRAM=${prefix}/bin/pyrcc5-${pyversion}
</span>
post-patch {
reinplace -E \"s|@PYVERSION@|${pyversion}|\" \
</pre><pre style='margin:0'>
</pre>