<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a341c4e0cd907fbbcee85054282154317abdef7c">https://github.com/macports/macports-ports/commit/a341c4e0cd907fbbcee85054282154317abdef7c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a341c4e0cd907fbbcee85054282154317abdef7c
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Mon Nov 4 09:12:19 2024 +0100
<span style='display:block; white-space:pre;color:#404040;'> gdal: use latest version of PROJ
</span>---
gis/gdal/Portfile | 33 +++++++--------------------------
1 file changed, 7 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/Portfile b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 891226dd2ec..9b54396b504 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,6 +78,7 @@ depends_lib-append \
</span> port:lz4 \
path:lib/libssl.dylib:openssl \
port:pcre2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj \
</span> port:qhull \
port:spatialite \
port:sqlite3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -281,6 +282,7 @@ configure.args-append \
</span> -DGDAL_USE_PDFIUM=OFF \
-DGDAL_USE_PNG=ON \
-DGDAL_USE_POSTGRESQL=ON \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGDAL_USE_PROJ=ON \
</span> -DGDAL_USE_QHULL=ON \
-DGDAL_USE_SPATIALITE=ON \
-DGDAL_USE_SQLITE3=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -290,9 +292,11 @@ configure.args-append \
</span> -DGDAL_USE_XERCESC=OFF \
-DGDAL_USE_ZSTD=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLIBAEC_INCLUDE_DIR=${prefix}/lib/libaec/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLIBAEC_LIBRARY=${prefix}/lib/libaec/lib/libaec.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBAEC_INCLUDE_DIR=${prefix}/lib/libaec/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBAEC_LIBRARY=${prefix}/lib/libaec/lib/libaec.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROJ_INCLUDE_DIR=${prefix}/lib/proj9/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROJ_LIBRARY_RELEASE=${prefix}/lib/proj9/lib/libproj.dylib
</span>
# Always choose internal libjson code (#44098)
configure.args-append -DGDAL_USE_JSONC_INTERNAL=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -587,29 +591,6 @@ if {$subport eq $name} {
</span> "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # PROJ variants
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set proj_variants {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach pjver ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend proj_variants proj${pjver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach proj_ver ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set index [lsearch -exact ${proj_variants} proj${proj_ver}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cflcts [lreplace ${proj_variants} ${index} ${index}]
</span><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;'>- depends_lib-append port:proj${proj_ver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DGDAL_USE_PROJ=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPROJ_INCLUDE_DIR=${prefix}/lib/proj${proj_ver}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPROJ_LIBRARY_RELEASE=${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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set projdf "if {"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach pv ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set projdf "${projdf}!\[variant_isset proj${pv}\] && "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set projdf [string range ${projdf} 0 end-4]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set projdf "${projdf}} { default_variants +proj${pv} }"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval ${projdf}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant xerces description {Enable Xerces XML support for GML file format} {
depends_lib-append path:include/xercesc/util/XercesVersion.hpp:xercesc3
configure.args-replace -DGDAL_USE_XERCESC=OFF -DGDAL_USE_XERCESC=ON
</pre><pre style='margin:0'>
</pre>