<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/7f8424a5f267454af77ecfcef746a42ba3aefd53">https://github.com/macports/macports-ports/commit/7f8424a5f267454af77ecfcef746a42ba3aefd53</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7f8424a5f267454af77ecfcef746a42ba3aefd53
</span>Author: nilason <n_larsson@yahoo.com>
AuthorDate: Tue Jun 6 12:32:23 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> saga: update to version 9.0.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Transition to CMake build system.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes https://trac.macports.org/ticket/62920
</span>---
gis/saga/Portfile | 244 ++++++++++++++++++++++++------------
gis/saga/files/patch-configure.diff | 20 ---
gis/saga/files/patch-me-cpp.diff | 11 --
gis/saga/files/python_cmake.diff | 45 +++++++
gis/saga/files/shape_cpp.diff | 11 ++
5 files changed, 217 insertions(+), 114 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/saga/Portfile b/gis/saga/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0517ec01695..aecf8fc439c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/saga/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/saga/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,126 +1,204 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup mpi 1.0
</span> PortGroup wxWidgets 1.0
wxWidgets.use wxWidgets-3.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> name saga
categories gis
license GPL
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.9.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 9.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> maintainers {vince @Veence} openmaintainer
description SAGA is a GIS oriented towards statistics and analysis
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description SAGA is yet another open source GIS targeted towards\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spatial analysis and statistics. It uses wxWidgets as\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a GUI.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description SAGA - System for Automated Geoscientific Analyses - is\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a GIS software designed for an easy and effective\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implementation of spatial algorithms and offers\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a comprehensive, growing set of geoscientific methods.\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ It uses wxWidgets as a GUI.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://saga-gis.sourceforge.io/en/index.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:project/saga-gis/SAGA%20-%20[lindex [split ${version} "."] 0]/SAGA%20-%20${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.saga-gis.org/en/index.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/saga-gis/SAGA%20-%207/SAGA%20-%20${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 83251de8d7a7b1d55e6c0d6cfa0c605e91f73477 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 772aae9ee44e4251752e8fd7b0d8fd42537b59b8a692c7d3d6cf13aea07d3d71 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8348999
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 fe7b74b3627277428e17141fe216f209d587a5ef \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 26ad4b84149e26eabd4a5365fe4a3923cfa39e36672cc7c660d3549f3556a3bc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5512365
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.source_dir ${worksrcpath}/saga-gis
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-me-cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append shape_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append python_cmake.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:swig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:geos \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# SAGA 9.0.2 do not support PROJ 8+ API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:${wxWidgets.port} \
</span> port:gdal \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:liblas \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jasper \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fftw-3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libodbc.dylib:unixODBC \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qhull \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:triangle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:${wxWidgets.port}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse f ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file isfile ${f}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch [file tail ${f}] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Makefile.in {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E -q "s|wx-config|${wxWidgets.wxconfig}|" ${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:opencv4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:PDAL \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mpi.setup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pkg_config_path-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/lib/opencv4/pkgconfig"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOpenMP_SUPPORT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_GUI=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_PYTHON=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_SYSTEM_SVM=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_SYSTEM_GEOTRANS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_CLIPPER_ONE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_MRMR=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROJ_INCLUDE_DIR=${prefix}/lib/proj7/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROJ_LIBRARY=${prefix}/lib/proj7/lib/libproj.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DWITH_TOOLS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_TOOLS_OPENCV=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_TOOLS_GDAL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_TOOLS_HPDF=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_TOOLS_PDAL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_TOOLS_POSTGRES=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_TOOLS_PROJ=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_TOOLS_RIEGL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_TOOLS_VIGRA=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gui description "Build with GUI interface" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DWITH_GUI=OFF -DWITH_GUI=ON
</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;'>+# Set ODBC variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant unixodbc conflicts iodbc description {Build ODBC driver against unixODBC} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:unixODBC
</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;'>+variant iodbc conflicts unixodbc description {Build ODBC driver against iODBC} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libiodbc
</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 {![variant_isset unixodbc] && ![variant_isset iodbc]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +unixodbc
</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;'>+variant vigra description "Add VIGRA support" {
</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;'>+ if {![variant_isset openmpi]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "HDF5 has openmpi enabled, please use the same variant."
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-append -I${prefix}/lib/proj8/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append -std=c++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -L${prefix}/lib/proj8/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set result [active_variants hdf5 openmpi-devel]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset openmpi-devel]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "HDF5 has openmpi_devel enabled, please use the same variant."
</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:#ffe0e0;'>-configure.args --disable-openmp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-debug \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-libfire \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-gui
</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;'>+ if {![variant_isset mpi]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "HDF5 has mpi enabled, please use the same variant."
</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:#ffe0e0;'>-variant gui description "build the GUI interface" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set result [active_variants hdf5 mpich-devel]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset mpich-devel]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "HDF5 has mpich-devel enabled, please use the same variant."
</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:#ffe0e0;'>- configure.args-delete --disable-gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset mpich] || [variant_isset mpich-devel] || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [variant_isset openmpi] || [variant_isset openmpi_devel]} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python description "build Python 3.9 bindings" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python39 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:swig-python
</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;'>+ configure.args-replace -DWITH_TOOLS_VIGRA=OFF -DWITH_TOOLS_VIGRA=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_MRMR=OFF -DWITH_MRMR=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:vigra \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hdf5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fftw-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON=${prefix}/bin/python3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON_VERSION=3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant libharu description "Add libHaru support for PDF creation" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DWITH_TOOLS_HPDF=OFF -DWITH_TOOLS_HPDF=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libharu
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant libfire description "build with libfire" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-libfire
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Set Python variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_suffixes {39 310 311}
</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;'>-# Database variants (carried over from gdal)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set postgresql_suffixes {10 11 12 13}
</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 index [lsearch -exact ${python_variants} python${pyver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_dot_ver [string index ${pyver} 0].[string range ${pyver} 1 end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conf [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 python${pyver} description "Add Python ${py_dot_ver} API" conflicts {*}${conf} "
</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:swig-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DWITH_PYTHON=OFF -DWITH_PYTHON=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \"s|@PYVER@|${py_dot_ver}|\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/saga-gis/src/saga_core/saga_api/saga_api_python/CMakeLists.txt
</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:#ffe0e0;'>-set portsgresql_variants {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set postgresql_default_variant "if {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Set PostgreSQL variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_suffixes {10 11 12 13 14 15}
</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:#ffe0e0;'>- set postgresql_default_variant "${postgresql_default_variant}!\[variant_isset postgresql${s}] && "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_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 postgresql_variants postgresql${suffix}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set postgresql_default_variant [string range ${postgresql_default_variant} 0 end-4]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set postgresql_default_variant "${postgresql_default_variant}} {default_variants +postgresql${s}}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-eval $postgresql_default_variant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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 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;'>- variant ${p} description "Enable PostgreSQL ${s} 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 --with-postgresql=${prefix}/lib/postgresql${s}/bin/pg_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PKG_CONFIG_PATH=${prefix}/lib/postgresql${s}/pkgconfig
</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 vrt postgresql${suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch -exact ${postgresql_variants} ${vrt}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conf [lreplace ${postgresql_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${vrt} description "Use PostgreSQL ${suffix}" conflicts {*}${conf} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${vrt}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append POSTGRES_HOME=${prefix}/lib/${vrt}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DWITH_TOOLS_POSTGRES=OFF -DWITH_TOOLS_POSTGRES=ON
</span> "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset python]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${destroot}${frameworks_dir}/Python.framework/Versions/3.9/lib/python3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/lib/python3.9/site-packages \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${frameworks_dir}/Python.framework/Versions/3.9/lib/python3.9/site-packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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;'>+
</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:#ffe0e0;'>-configure.ldflags-append -gdwarf-3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append -gdwarf-3
</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 +postgresql15 }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+destroot.target install
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}_(\[0-9a-z.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex ${name}-(\[0-9a-z.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/saga/files/patch-configure.diff b/gis/saga/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b551a593381..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/saga/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2016-05-12 08:39:14.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2016-05-12 08:40:48.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17863,16 +17863,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # linking flags needed when embedding
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra linking flags" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo_n "checking python extra linking flags... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test -z "$PYTHON_EXTRA_LDFLAGS"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- conf = distutils.sysconfig.get_config_var; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- print (conf('LINKFORSHARED'))"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LDFLAGS" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PYTHON_EXTRA_LDFLAGS=
</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;'>- # final check to see if everything compiles alright
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/saga/files/patch-me-cpp.diff b/gis/saga/files/patch-me-cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 68aa3e97f90..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/saga/files/patch-me-cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/tools/imagery/imagery_maxent/me.cpp.orig 2021-07-07 17:32:32.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/tools/imagery/imagery_maxent/me.cpp 2023-04-13 19:50:07.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _SAGA_MSW
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define isinf(x) (!_finite(x))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define isinf(x) (!finite(x))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define isinf(x) (!isfinite(x))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /** The input array contains a set of log probabilities lp1, lp2, lp3
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/saga/files/python_cmake.diff b/gis/saga/files/python_cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..341d232f9f5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/saga/files/python_cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- saga-gis/src/saga_core/saga_api/saga_api_python/CMakeLists.txt.orig 2023-05-25 18:05:22.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ saga-gis/src/saga_core/saga_api/saga_api_python/CMakeLists.txt 2023-06-05 14:04:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,8 +25,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(SWIG QUIET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(SWIG_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "SWIG for Python found")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Python COMPONENTS Interpreter Development)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(Python_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(Python3 @PYVER@ EXACT COMPONENTS Interpreter Development)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(Python3_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # project(saga_api_python)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "project: ${PROJECT_NAME}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,8 +43,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(UseSWIG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include_directories("${Python_INCLUDE_DIRS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include_directories("${Python_INCLUDE_DIRS}/../PC") # msvc builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ include_directories("${Python3_INCLUDE_DIRS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ include_directories("${Python3_INCLUDE_DIRS}/../PC") # msvc builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories("..")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_SWIG_FLAGS "-D_SAGA_PYTHON -D_SWIG_WCHAR")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,14 +57,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_property(TARGET saga_api_python PROPERTY OUTPUT_NAME saga_api)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ swig_link_libraries(saga_api_python saga_api)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- swig_link_libraries(saga_api_python ${Python_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ swig_link_libraries(saga_api_python ${Python3_LIBRARIES})
</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(EXISTS ${Python_SITELIB})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(STATUS "Python site-packages: ${PYTHON_SITELIB}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(TARGETS saga_api_python DESTINATION ${Python_SITELIB})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(FILES ${CMAKE_BINARY_DIR}/src/saga_core/saga_api/saga_api_python/saga_api.py DESTINATION ${Python_SITELIB})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(FILES ${CMAKE_SOURCE_DIR}/src/accessories/python/saga.py DESTINATION ${Python_SITELIB})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(EXISTS ${Python3_SITELIB})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Python site-packages: ${Python3_SITELIB}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install(TARGETS saga_api_python DESTINATION ${Python3_SITELIB})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install(FILES ${CMAKE_BINARY_DIR}/src/saga_core/saga_api/saga_api_python/saga_api.py DESTINATION ${Python3_SITELIB})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install(FILES ${CMAKE_SOURCE_DIR}/src/accessories/python/saga.py DESTINATION ${Python3_SITELIB})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/saga/files/shape_cpp.diff b/gis/saga/files/shape_cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8545da9c0d7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/saga/files/shape_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- saga-gis/src/saga_core/saga_api/shape.cpp.orig 2023-06-05 12:52:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ saga-gis/src/saga_core/saga_api/shape.cpp 2023-06-05 12:53:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,7 +102,7 @@
</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;'>+-inline void CSG_Shape::_Invalidate(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void CSG_Shape::_Invalidate(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((CSG_Shapes *)m_pTable)->Set_Update_Flag();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>