<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/dad4921aedaf93c23a5dc928851bb36f86a87a33">https://github.com/macports/macports-ports/commit/dad4921aedaf93c23a5dc928851bb36f86a87a33</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit dad4921aedaf93c23a5dc928851bb36f86a87a33
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Fri Jan 24 09:00:03 2025 +0100

<span style='display:block; white-space:pre;color:#404040;'>    gdal: add subport 'gdal-kea', replacing the 'kea' variant
</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/71904
</span>---
 gis/gdal/Portfile | 57 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 7 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 3589ebd141d..af49520b9e9 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;'>@@ -251,6 +251,7 @@ configure.args-append                                        \
</span>                     -DBUILD_JAVA_BINDINGS=OFF                \
                     -DBUILD_PYTHON_BINDINGS=OFF              \
                     -DGDAL_ENABLE_DRIVER_HDF5=OFF            \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DGDAL_ENABLE_DRIVER_KEA=OFF             \
</span>                     -DGDAL_USE_ARCHIVE=OFF                   \
                     -DGDAL_USE_ARMADILLO=OFF                 \
                     -DGDAL_USE_CFITSIO=OFF                   \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -269,6 +270,7 @@ configure.args-append                                        \
</span>                     -DGDAL_USE_IDB=OFF                       \
                     -DGDAL_USE_JXL=OFF                       \
                     -DGDAL_USE_JXL_THREADS=OFF               \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DGDAL_USE_KEA=OFF                       \
</span>                     -DGDAL_USE_LIBAEC=ON                     \
                     -DGDAL_USE_LIBLZMA=OFF                   \
                     -DGDAL_USE_MRSID=OFF                     \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -332,6 +334,8 @@ if {$subport eq $name} {
</span>                         -DGDAL_DRIVER_HDF4_PLUGIN_INSTALLATION_MESSAGE="Install the HDF4 driver with 'sudo port install gdal-hdf4'." \
                         -DGDAL_REGISTER_DRIVER_HDF5_FOR_LATER_PLUGIN=ON \
                         -DGDAL_DRIVER_HDF5_PLUGIN_INSTALLATION_MESSAGE="Install the HDF5 driver with 'sudo port install gdal-hdf4'." \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DGDAL_REGISTER_DRIVER_KEA_FOR_LATER_PLUGIN=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DGDAL_DRIVER_KEA_PLUGIN_INSTALLATION_MESSAGE="Install the KEA driver with 'sudo port install gdal-hdf4'." \
</span>                         -DGDAL_REGISTER_DRIVER_PDF_FOR_LATER_PLUGIN=ON \
                         -DGDAL_DRIVER_PDF_PLUGIN_INSTALLATION_MESSAGE="Install the PDF driver with 'sudo port install gdal-pdf'." \
                         -DGDAL_USE_POPPLER=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -342,13 +346,9 @@ if {$subport eq $name} {
</span>     depends_build-append \
                         path:lib/pkgconfig/poppler.pc:poppler \
                         port:hdf5 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:kealib \
</span>                         port:libkml
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[variant_isset kea] && ![variant_isset hdf5]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ui_msg "NOTE: KEA driver support depends on HDF5, +hdf5 variant is added."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        default_variants +hdf5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     # Set target to none
     build.target
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -441,8 +441,10 @@ if {$subport eq $name} {
</span>     }
 
     variant kea description {Enable KEA support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append      port:kealib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-append   -DGDAL_ENABLE_DRIVER_KEA=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ui_error "The '+kea' variant has been removed and replaced by the 'gdal-kea' subport."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            return -code error "unsupported variant"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>     }
 
     variant libarchive description {Enable libarchive support} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -762,6 +764,47 @@ subport gdal-hdf5 {
</span>     livecheck.type  none
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+subport gdal-kea {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    description         GDAL - KEA driver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    long_description    {*}${description}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      port:gdal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:hdf5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:kealib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set_gdal_variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # If HDF5 is built with a mpi variant, we need to know the path to "mpi.h".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Figure out HDF5's mpi include directory:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set mpl_include_dir ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {![catch {set result [active_variants hdf5 openmpi]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set mpl_include_dir "-I${prefix}/include/openmpi-mp"
</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;'>+        if {![catch {set result [active_variants hdf5 mpich]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set mpl_include_dir "-I${prefix}/include/mpich-mp"
</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;'>+        if {$mpl_include_dir ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            configure.cxxflags-append ${mpl_include_dir}
</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;'>+    configure.args-replace  -DGDAL_USE_KEA=OFF  -DGDAL_USE_KEA=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DGDAL_ENABLE_DRIVER_KEA=OFF  -DGDAL_ENABLE_DRIVER_KEA=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DGDAL_USE_HDF5=OFF  -DGDAL_USE_HDF5=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append   -DGDAL_ENABLE_DRIVER_KEA_PLUGIN=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;'>+        system -W ${destroot} "find . ! -name 'gdal_KEA.dylib' \\( -type f -or -type l \\) -exec rm -f {} +"
</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;'>+    livecheck.type  none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> subport gdal-libkml {
     description         GDAL - LIBKML driver
     long_description    {*}${description}.
</pre><pre style='margin:0'>

</pre>