<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/22cc4b254657bc84a954611db028c7c9ef763554">https://github.com/macports/macports-ports/commit/22cc4b254657bc84a954611db028c7c9ef763554</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 22cc4b254657bc84a954611db028c7c9ef763554
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Tue Oct 31 13:09:25 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> qgis3{-ltr}: update to 3.34.0 and 3.28.12 (LTR)
</span>---
gis/qgis3/Portfile | 70 ++++++++++++++++++++++++++++++++++--------------------
1 file changed, 44 insertions(+), 26 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 13c6a48e99a..da7e6e7b261 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;'>@@ -25,23 +25,25 @@ subport ${name-ltr} {}
</span>
if {${subport} eq ${name}} {
# Latest version
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup qgis QGIS 3_32_3 final-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup qgis QGIS 3_34_0 final-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> conflicts ${name-ltr}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 44049183bd98f2545ce12378a0d364556ca3f840 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8359a56c08e5b3d71b69f8b5b98e2af2664458c297a5567ebfb13b36640c5ad6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 187407338
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 430a8c2578515939857dcc32172a183a9ab126a2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0dbe9d3a4d956f59e8f5d50efa29b0f0032aec7b0c2a43628a093074ae3050b2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 194901904
</span> } else {
# LTR version
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup qgis QGIS 3_28_11 final-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup qgis QGIS 3_28_12 final-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> conflicts ${name}
description {*}${description} (LTR)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 45268b6ec7356d0fbb8930f95206cb81cbc9e744 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1b5021d5373afb844a5fecc156a5e293fec72cbd66740ae5adaf5549291c2566 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 184686261
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 8f50db65c3ae86fc1dd1d45a2e4115c0312f85e6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9de2578a6504a55ef07cef9af6023117efc21cb6e7b39a10bd5a00c87613d03a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 184748381
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-findpdal-cmake.diff
</span> }
version [string map {_ .} ${github.version}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,11 +102,10 @@ qt5.depends_component \
</span> qtxmlpatterns \
sqlite-plugin
<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:#e0ffe0;'>+patchfiles-append patch-app_info_plist_in.diff \
</span> patch-CMakelists_txt.diff \
patch-MacBundleMacros.cmake.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-SIPMacros.cmake.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-findpdal-cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-SIPMacros.cmake.diff
</span>
post-patch {
reinplace -E "s|@PREFIX@|${prefix}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,15 +144,11 @@ configure.args-append \
</span> -DAPPLE_APPLICATIONSERVICES_LIBRARY=${configure.sdkroot}/System/Library/Frameworks/ApplicationServices.framework \
-DAPPLE_COREFOUNDATION_LIBRARY=${configure.sdkroot}/System/Library/Frameworks/CoreFoundation.framework \
-DAPPLE_IOKIT_LIBRARY=${configure.sdkroot}/System/Library/Frameworks/IOKit.framework \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_WITH_QT6=OFF \
</span> -DEXPAT_INCLUDE_DIR=${prefix}/include \
-DEXPAT_LIBRARY=${prefix}/lib/libexpat.dylib \
-DGDAL_CONFIG=${prefix}/bin/gdal-config \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGDAL_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGDAL_LIBRARY=${prefix}/lib/libgdal.dylib \
</span> -DGEOS_CONFIG=${prefix}/bin/geos-config \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGEOS_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGEOS_LIBRARY=${prefix}/lib/libgeos_c.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGSL_CONFIG=${prefix}/bin/gsl-config \
</span> -DLIBZIP_CONF_INCLUDE_DIR=${prefix}/lib/pkgconfig \
-DQCA_INCLUDE_DIR=${prefix}/libexec/qt5/include/QtCrypto \
-DQCA_LIBRARY=${prefix}/libexec/qt5/lib/libqca-qt5.dylib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,19 +159,32 @@ configure.args-append \
</span> -DQWT_INCLUDE_DIR=${prefix}/libexec/qt5/lib/qwt.framework/Versions/Current/Headers \
-DQWT_LIBRARY=${prefix}/libexec/qt5/lib/qwt.framework/Versions/Current/qwt \
-DSPATIALINDEX_LIBRARY=${prefix}/lib/libspatialindex.dylib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DSPATIALITE_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DSPATIALITE_LIBRARY=${prefix}/lib/libspatialite.dylib \
</span> -DUSE_OPENCL=OFF \
-DWITH_3D=ON \
-DWITH_BINDINGS=FALSE \
-DWITH_GRASS7=OFF \
-DWITH_GRASS8=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_GSL=ON \
</span> -DWITH_INTERNAL_QWTPOLAR=ON \
-DWITH_PDAL=ON \
-DWITH_QSPATIALITE=OFF \
-DWITH_QWTPOLAR=ON \
-DWITH_SERVER=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_DRACO=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGDAL_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGDAL_LIBRARY=${prefix}/lib/libgdal.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGEOS_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGEOS_LIBRARY=${prefix}/lib/libgeos_c.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGSL_CONFIG=${prefix}/bin/gsl-config \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSPATIALITE_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSPATIALITE_LIBRARY=${prefix}/lib/libspatialite.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.ldflags "-Wl,-rpath,${prefix}/libexec/qt5/lib"
# GRASS variants
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -242,12 +252,20 @@ foreach pjver ${proj_versions} {
</span> foreach proj_ver ${proj_versions} {
set index [lsearch -exact ${proj_variants} proj${proj_ver}]
set cflcts [lreplace ${proj_variants} ${index} ${index}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant proj${proj_ver} description "Use Proj${proj_ver}" conflicts {*}${cflcts} "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:proj${proj_ver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPROJ_INCLUDE_DIR=${prefix}/lib/proj${proj_ver}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPROJ_LIBRARY=${prefix}/lib/proj${proj_ver}/lib/libproj.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant proj${proj_ver} description "Use Proj${proj_ver}" conflicts {*}${cflcts} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj${proj_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPROJ_ROOT=${prefix}/lib/proj${proj_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append -I${prefix}/lib/proj${proj_ver}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -L${prefix}/lib/proj${proj_ver}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant proj${proj_ver} description "Use Proj${proj_ver}" conflicts {*}${cflcts} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj${proj_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPROJ_INCLUDE_DIR=${prefix}/lib/proj${proj_ver}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROJ_LIBRARY=${prefix}/lib/proj${proj_ver}/lib/libproj.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
set projdf "if {"
foreach pv ${proj_versions} {
</pre><pre style='margin:0'>
</pre>