<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/8a6b6147d9df519afdb5cb2c2fa47b3cf1e0d186">https://github.com/macports/macports-ports/commit/8a6b6147d9df519afdb5cb2c2fa47b3cf1e0d186</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8a6b6147d9df519afdb5cb2c2fa47b3cf1e0d186
</span>Author: nilason <n_larsson@yahoo.com>
AuthorDate: Fri Jul 14 13:18:06 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> saga: update to version 9.1.0
</span>---
gis/saga/Portfile | 13 ++++++-----
gis/saga/files/python_cmake.diff | 49 ++++++++++++++++++++++++----------------
2 files changed, 36 insertions(+), 26 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 be6fd541652..b2864c562c3 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;'>@@ -10,8 +10,8 @@ wxWidgets.use wxWidgets-3.2
</span> name saga
categories gis
license GPL
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 9.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 9.1.0
</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:#e0e0e0;'>@@ -25,9 +25,9 @@ long_description SAGA - System for Automated Geoscientific Analyses - is\
</span> homepage https://saga-gis.sourceforge.io/en/index.html
master_sites sourceforge:project/saga-gis/SAGA%20-%20[lindex [split ${version} "."] 0]/SAGA%20-%20${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 83251de8d7a7b1d55e6c0d6cfa0c605e91f73477 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 772aae9ee44e4251752e8fd7b0d8fd42537b59b8a692c7d3d6cf13aea07d3d71 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8348999
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4dc2dda39a0f0ca52b60e1bb3122f705070f61c6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d3cda84365826b3ca7753b7cd62aa71dd177d192767e001b6a5a91748c7d0a7a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8392363
</span>
cmake.source_dir ${worksrcpath}/saga-gis
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@ depends_build-append \
</span> port:pkgconfig \
port:swig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# SAGA 9.0.2 do not support PROJ 8+ API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# SAGA 9.1.0 do not support PROJ 8+ API
</span> depends_lib-append port:${wxWidgets.port} \
port:gdal \
port:proj7 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,6 +160,7 @@ foreach pyver ${python_suffixes} {
</span> depends_lib-append port:python${pyver} \
port:swig-python
configure.args-replace -DWITH_PYTHON=OFF -DWITH_PYTHON=ON
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DWITH_PYTHON_PKG=ON
</span> post-patch {
reinplace \"s|@PYVER@|${py_dot_ver}|\" \
${worksrcpath}/saga-gis/src/saga_core/saga_api/saga_api_python/CMakeLists.txt
<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><span style='display:block; white-space:pre;color:#808080;'>index 341d232f9f5..1c748c6b722 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/saga/files/python_cmake.diff
</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;'>@@ -1,12 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 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:#ffe0e0;'>-+++ 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;'>+--- saga-gis/src/saga_core/saga_api/saga_api_python/CMakeLists.txt.orig 2023-07-11 13:21:34.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-07-14 13:44:08.000000000 +0200
</span> @@ -25,8 +25,8 @@
find_package(SWIG QUIET)
if(SWIG_FOUND)
message(STATUS "SWIG for Python found")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Python COMPONENTS Interpreter Development)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Python COMPONENTS Interpreter Development)
</span> - if(Python_FOUND)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(Python3 @PYVER@ EXACT COMPONENTS Interpreter Development)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(Python3 @PYVER@ EXACT COMPONENTS Interpreter Development)
</span> + if(Python3_FOUND)
# project(saga_api_python)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,14 +15,14 @@
</span>
include(UseSWIG)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_directories("${Python_INCLUDE_DIRS}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_directories("${Python_INCLUDE_DIRS}/../PC") # msvc builds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include_directories("${Python3_INCLUDE_DIRS}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include_directories("${Python3_INCLUDE_DIRS}/../PC") # msvc builds
</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> include_directories("..")
set(CMAKE_SWIG_FLAGS "-D_SAGA_PYTHON -D_SWIG_WCHAR")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,14 +57,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,20 +57,20 @@
</span> set_property(TARGET saga_api_python PROPERTY OUTPUT_NAME saga_api)
swig_link_libraries(saga_api_python saga_api)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,16 +30,25 @@
</span> + swig_link_libraries(saga_api_python ${Python3_LIBRARIES})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(EXISTS ${Python_SITELIB})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(STATUS "Python site-packages: ${PYTHON_SITELIB}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install(TARGETS saga_api_python DESTINATION ${Python_SITELIB})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 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:#ffe0e0;'>-- install(FILES ${CMAKE_SOURCE_DIR}/src/accessories/python/saga.py DESTINATION ${Python_SITELIB})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(EXISTS ${Python3_SITELIB})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(STATUS "Python site-packages: ${Python3_SITELIB}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install(TARGETS saga_api_python DESTINATION ${Python3_SITELIB})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 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:#ffe0e0;'>-+ install(FILES ${CMAKE_SOURCE_DIR}/src/accessories/python/saga.py DESTINATION ${Python3_SITELIB})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(EXISTS ${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;'>+ option(WITH_PYTHON_PKG "PySAGA package installation (if not checked API modules become installed directly in Python's site/dist-packages folder)" ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(WITH_PYTHON_PKG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(STATUS "SAGA-Python-API installed to: ${PYTHON_SITELIB}/PySAGA")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(TARGETS saga_api_python DESTINATION ${Python_SITELIB}/PySAGA)
</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}/PySAGA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(FILES ${CMAKE_SOURCE_DIR}/src/accessories/python/__init__.py DESTINATION ${Python_SITELIB}/PySAGA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "SAGA-Python-API installed to: ${Python3_SITELIB}/PySAGA")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install(TARGETS saga_api_python DESTINATION ${Python3_SITELIB}/PySAGA)
</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}/PySAGA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install(FILES ${CMAKE_SOURCE_DIR}/src/accessories/python/__init__.py DESTINATION ${Python3_SITELIB}/PySAGA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(STATUS "SAGA-Python-API installed to: ${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;'>++ message(STATUS "SAGA-Python-API installed to: ${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;'>+ endif()
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span></pre><pre style='margin:0'>
</pre>