git: 32d0835aa379 - main - math/saga: Update to 9.12.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Rainer Hurling <rhurlin_at_FreeBSD.org>
Date: Fri, 17 Apr 2026 05:57:11 UTC
The branch main has been updated by rhurlin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=32d0835aa37975b6bdeb5ef8e86285639d90ab16

commit 32d0835aa37975b6bdeb5ef8e86285639d90ab16
Author:     Rainer Hurling <rhurlin@FreeBSD.org>
AuthorDate: 2026-04-17 05:45:15 +0000
Commit:     Rainer Hurling <rhurlin@FreeBSD.org>
CommitDate: 2026-04-17 05:57:02 +0000

    math/saga: Update to 9.12.2
    
    Fixes a crash in the landsat_scene_import tool in GDALOpen(Ex)(),
    when trying to open a non-existing file
    
    Unfortunately, the tarball still contains many files with CRLF line
    endings, so dos2unix is used again.
    
    Changelog:      https://sourceforge.net/p/saga-gis/wiki/Changelog%209.12.2/attachment/changelog_saga_9.12.2.txt
---
 math/saga/Makefile                                 |  7 +++--
 math/saga/distinfo                                 |  6 ++--
 math/saga/files/patch-CMakeLists.txt               | 20 +++++++-------
 .../patch-src_saga__core_saga__cmd_saga__cmd.cpp   | 32 +++++++++++-----------
 .../patch-src_saga__core_saga__gui_CMakeLists.txt  | 18 ++++++------
 .../patch-src_saga__core_saga__gui_dlg__about.cpp  | 28 +++++++++----------
 ...c_tools_imagery_imagery__svm_MLB__Interface.cpp | 16 +++++------
 ...tch-src_tools_imagery_imagery__svm_svm__grids.h | 16 +++++------
 8 files changed, 72 insertions(+), 71 deletions(-)

diff --git a/math/saga/Makefile b/math/saga/Makefile
index eb45c9682d35..f878fb25f57a 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	saga
-PORTVERSION=	9.12.1
+PORTVERSION=	9.12.2
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/([0-9]).*/\1/1}/SAGA%20-%20${PORTVERSION}
 MAINTAINER=	rhurlin@FreeBSD.org
@@ -29,12 +29,13 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libtiff.so:graphics/tiff
 RUN_DEPENDS:=	swig:devel/swig
 
-USES=		cmake compiler:c++17-lang desktop-file-utils \
+USES=		cmake compiler:c++17-lang desktop-file-utils dos2unix \
 		gnome iconv:wchar_t localbase pkgconfig python
+DOS2UNIX_GLOB=	*.cpp *.h *.txt
 USE_LDCONFIG=	yes
 USE_WX=		3.2+
 
-GIT_TAGNAME=	ded80db7a
+GIT_TAGNAME=	39fdd74b1
 
 CMAKE_ARGS=	-DSVM_INCLUDE:PATH=${LOCALBASE}/include/svm.h \
 		-DWITH_TOOLS_PDAL:BOOL=TRUE
diff --git a/math/saga/distinfo b/math/saga/distinfo
index 3b26937c783a..0ae94664ca3a 100644
--- a/math/saga/distinfo
+++ b/math/saga/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1776101974
-SHA256 (saga-9.12.1.tar.gz) = a56264ce9dafc54abd03748f7aa3b524453659e3ed826f558b1467ab20ea9075
-SIZE (saga-9.12.1.tar.gz) = 10631570
+TIMESTAMP = 1776401970
+SHA256 (saga-9.12.2.tar.gz) = d6aeff7418665d26a3d1b10653c1003897ac476b1f9d03d52ba0d52fd4c3dd5d
+SIZE (saga-9.12.2.tar.gz) = 10630688
diff --git a/math/saga/files/patch-CMakeLists.txt b/math/saga/files/patch-CMakeLists.txt
index cdf09f9cf8b6..9098c1961d8a 100644
--- a/math/saga/files/patch-CMakeLists.txt
+++ b/math/saga/files/patch-CMakeLists.txt
@@ -1,13 +1,13 @@
 --- CMakeLists.txt.orig	2026-04-10 09:39:33 UTC
 +++ CMakeLists.txt
 @@ -25,6 +25,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE STRING "The C
- set(CMAKE_CXX_STANDARD          14 CACHE STRING "C++ standard to be used")
- set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE STRING "The C++ standard is required")
- 
-+# Get Compiler info for about dialog
-+set(COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
-+add_definitions(-DCOMPILER="${COMPILER}")
-+
- # Platform dependent compiler requirements and options
- if(MSVC)
- 	set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE)
+ set(CMAKE_CXX_STANDARD          14 CACHE STRING "C++ standard to be used")
+ set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE STRING "The C++ standard is required")
+ 
++# Get Compiler info for about dialog
++set(COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
++add_definitions(-DCOMPILER="${COMPILER}")
++
+ # Platform dependent compiler requirements and options
+ if(MSVC)
+ 	set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE)
diff --git a/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp b/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp
index b69af21541ad..25106bf03d6c 100644
--- a/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp
+++ b/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp
@@ -1,19 +1,19 @@
 --- src/saga_core/saga_cmd/saga_cmd.cpp.orig	2026-04-10 09:39:33 UTC
 +++ src/saga_core/saga_cmd/saga_cmd.cpp
 @@ -51,6 +51,7 @@
- #include <wx/app.h>
- #include <wx/utils.h>
- #include <wx/filename.h>
-+#include <clocale>
- 
- #include "config.h"
- #include "callback.h"
-@@ -186,7 +187,7 @@ bool		Run(int argc, char *argv[])
- //---------------------------------------------------------
- bool		Run(int argc, char *argv[])
- {
--	setlocale(LC_NUMERIC, "C");
-+	std::setlocale(LC_NUMERIC, "C");
- 
- 	SG_Set_UI_Callback(CMD_Get_Callback());
- 
+ #include <wx/app.h>
+ #include <wx/utils.h>
+ #include <wx/filename.h>
++#include <clocale>
+ 
+ #include "config.h"
+ #include "callback.h"
+@@ -186,7 +187,7 @@ bool		Run(int argc, char *argv[])
+ //---------------------------------------------------------
+ bool		Run(int argc, char *argv[])
+ {
+-	setlocale(LC_NUMERIC, "C");
++	std::setlocale(LC_NUMERIC, "C");
+ 
+ 	SG_Set_UI_Callback(CMD_Get_Callback());
+ 
diff --git a/math/saga/files/patch-src_saga__core_saga__gui_CMakeLists.txt b/math/saga/files/patch-src_saga__core_saga__gui_CMakeLists.txt
index 54c6be85067b..bd60cc73b253 100644
--- a/math/saga/files/patch-src_saga__core_saga__gui_CMakeLists.txt
+++ b/math/saga/files/patch-src_saga__core_saga__gui_CMakeLists.txt
@@ -1,11 +1,11 @@
 --- src/saga_core/saga_gui/CMakeLists.txt.orig	2026-04-10 09:39:33 UTC
 +++ src/saga_core/saga_gui/CMakeLists.txt
-@@ -241,7 +241,7 @@ if(GIT_FOUND)
- 			OUTPUT_VARIABLE GIT_HASH
- 			OUTPUT_STRIP_TRAILING_WHITESPACE
- 		)
--		message("git hash: ${GIT_HASH} to ${PROJECT_SOURCE_DIR}/git_hash.h")
-+		message("git hash: https://sourceforge.net/p/saga-gis/code/ci/GIT_TAGNAME to ${PROJECT_SOURCE_DIR}/git_hash.h")
- 	else()
- 		message("not a git repository, git hash not found")
- 	endif()
+@@ -241,7 +241,7 @@ if(GIT_FOUND)
+ 			OUTPUT_VARIABLE GIT_HASH
+ 			OUTPUT_STRIP_TRAILING_WHITESPACE
+ 		)
+-		message("git hash: ${GIT_HASH} to ${PROJECT_SOURCE_DIR}/git_hash.h")
++		message("git hash: https://sourceforge.net/p/saga-gis/code/ci/GIT_TAGNAME to ${PROJECT_SOURCE_DIR}/git_hash.h")
+ 	else()
+ 		message("not a git repository, git hash not found")
+ 	endif()
diff --git a/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp b/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp
index 50600dba59ee..ee67934e4e72 100644
--- a/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp
+++ b/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp
@@ -1,16 +1,16 @@
 --- src/saga_core/saga_gui/dlg_about.cpp.orig	2026-04-10 09:39:33 UTC
 +++ src/saga_core/saga_gui/dlg_about.cpp
-@@ -165,12 +165,7 @@ wxString CDLG_About::_Get_Version(void)
- 	#else
- 		s	+= " (32 bit)</b><br>";
- 	#endif
--	#ifdef GIT_HASH
--		if( *GIT_HASH )
--		{
--			s	+= "<br><i>Git commit hash</i><br>[ <a href=\"https://sourceforge.net/p/saga-gis/code/ci/" GIT_HASH "\">#" GIT_HASH "</a> ]<br>";
--		}
--	#endif
-+	s	+= "<br><i>Git commit hash</i><br>[ <a href=\"https://sourceforge.net/p/saga-gis/code/ci/GIT_TAGNAME \">#" + wxString("GIT_TAGNAME") + "</a> ]<br>";
- 	s	+= "<br>";
- 	s	+= "<a href=\"https://saga-gis.sourceforge.io/\">saga-gis.org</a>";
- 
+@@ -165,12 +165,7 @@ wxString CDLG_About::_Get_Version(void)
+ 	#else
+ 		s	+= " (32 bit)</b><br>";
+ 	#endif
+-	#ifdef GIT_HASH
+-		if( *GIT_HASH )
+-		{
+-			s	+= "<br><i>Git commit hash</i><br>[ <a href=\"https://sourceforge.net/p/saga-gis/code/ci/" GIT_HASH "\">#" GIT_HASH "</a> ]<br>";
+-		}
+-	#endif
++	s	+= "<br><i>Git commit hash</i><br>[ <a href=\"https://sourceforge.net/p/saga-gis/code/ci/GIT_TAGNAME \">#" + wxString("GIT_TAGNAME") + "</a> ]<br>";
+ 	s	+= "<br>";
+ 	s	+= "<a href=\"https://saga-gis.sourceforge.io/\">saga-gis.org</a>";
+ 
diff --git a/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp b/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp
index d6576a8c4c16..6df996899887 100644
--- a/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp
+++ b/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp
@@ -1,11 +1,11 @@
 --- src/tools/imagery/imagery_svm/MLB_Interface.cpp.orig	2026-04-10 09:39:35 UTC
 +++ src/tools/imagery/imagery_svm/MLB_Interface.cpp
 @@ -61,7 +61,7 @@
- #include "MLB_Interface.h"
- 
- #if defined(SYSTEM_SVM)
--#include <libsvm/svm.h>
-+#include <svm.h>
- #else
- #include "svm/svm.h"
- #endif
+ #include "MLB_Interface.h"
+ 
+ #if defined(SYSTEM_SVM)
+-#include <libsvm/svm.h>
++#include <svm.h>
+ #else
+ #include "svm/svm.h"
+ #endif
diff --git a/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h b/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h
index 263c5d7be303..aea31c28a8e8 100644
--- a/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h
+++ b/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h
@@ -1,11 +1,11 @@
 --- src/tools/imagery/imagery_svm/svm_grids.h.orig	2026-04-10 09:39:35 UTC
 +++ src/tools/imagery/imagery_svm/svm_grids.h
 @@ -61,7 +61,7 @@
- 
- //---------------------------------------------------------
- #if defined(SYSTEM_SVM)
--	#include <libsvm/svm.h>
-+	#include <svm.h>
- #else
- 	#include "svm/svm.h"
- #endif
+ 
+ //---------------------------------------------------------
+ #if defined(SYSTEM_SVM)
+-	#include <libsvm/svm.h>
++	#include <svm.h>
+ #else
+ 	#include "svm/svm.h"
+ #endif