diff --git a/math/saga/Makefile b/math/saga/Makefile index eb45c9682d35..f878fb25f57a 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -1,109 +1,110 @@ 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 COMMENT= System for Automated Geoscientific Analyses WWW= http://www.saga-gis.org/en/index.html LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi .if !exists(/usr/include/omp.h) BROKEN= requires OpenMP support that is missing on this architecture .endif BUILD_DEPENDS= swig:devel/swig LIB_DEPENDS= libcurl.so:ftp/curl \ libexiv2.so:graphics/exiv2 \ libfftw3.so:math/fftw3 \ libgdal.so:graphics/gdal \ libhdf5.so:science/hdf5 \ libhpdf.so:print/libharu \ libodbc.so:databases/unixODBC \ libopencv_core.so:graphics/opencv \ libpdalcpp.so:math/pdal \ libproj.so:graphics/proj \ libsvm.so:science/libsvm \ libsz.so:science/libaec \ 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 CMAKE_ON= CMAKE_VERBOSE_MAKEFILE CMAKE_ON+= WITH_DEV_TOOLS CMAKE_ON+= WITH_EXCERCISES CMAKE_ON+= WITH_EXIV2 CMAKE_ON+= WITH_LIFETIME_TRACKER CMAKE_ON+= WITH_MRMR CMAKE_ON+= WITH_SYSTEM_SVM CMAKE_ON+= WITH_TOOLS_HPDF CMAKE_ON+= WITH_TOOLS_OPENCV CMAKE_ON+= WITH_PYTHON_PKG CMAKE_ON+= WITH_TOOLS_POSTGRES CMAKE_ON+= WITH_TOOLS_PROJ CMAKE_OFF= WITH_CLIPPER_ONE CMAKE_OFF+= WITH_TOOLS_RIEGL SUB_FILES= pkg-message WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}-gis PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= PGSQL OPENMP VIGRA OPTIONS_DEFAULT= PGSQL VIGRA OPTIONS_DEFAULT_amd64= OPENMP OPTIONS_DEFAULT_i386= OPENMP OPTIONS_DEFAULT_powerpc64= OPENMP OPTIONS_DEFAULT_powerpc64le= OPENMP NO_OPTIONS_SORT= yes OPTIONS_SUB= yes OPENMP_DESC= Enable Multiprocessing (only amd64, i386 and powerpc64*) VIGRA_DESC= Enable 'Vision with Generic Algorithms' Library OPENMP_CONFIGURE_ENABLE= openmp PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= postgresql VIGRA_BUILD_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra VIGRA_RUN_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra .include SUB_FILES= pkg-message post-patch: .if ${ARCH} == "powerpc" @${REINPLACE_CMD} -e 's|typedef unsigned long DWORD;|typedef unsigned int DWORD;|' \ ${WRKSRC}/src/saga_core/saga_api/api_core.h .endif @${REINPLACE_CMD} -e 's|GIT_TAGNAME|${GIT_TAGNAME}|g' \ ${WRKSRC}/src/saga_core/saga_gui/CMakeLists.txt \ ${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp @${REINPLACE_CMD} -e 's|-lgomp|-lomp|' \ ${WRKSRC}/src/saga_core/saga_api/saga_api_to_python.py post-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga*.txt ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.png ${STAGEDIR}${DATADIR} ${RM} ${STAGEDIR}${DATADIR}/saga_dic.txt ${STAGEDIR}${DATADIR}/saga_srs.txt # Put accessories under share/saga, python/data already under site-packages/PySAGA ;) (cd ${WRKSRC}/src/accessories && ${RM} -R python) (cd ${WRKSRC}/src/accessories && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) ${RM} -R ${STAGEDIR}${DATADIR}/CMakeLists.txt ${RM} -R ${STAGEDIR}${DATADIR}/classification ${RM} -R ${STAGEDIR}${DATADIR}/color_ramps ${RM} -R ${STAGEDIR}${DATADIR}/templates/template4saga-tools/my_tool_library/Makefile.bak # library helper files are not needed and cripple some math/qgis extensions @${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.la .include 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 - #include - #include -+#include - - #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 + #include + #include ++#include + + #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)
"; - #endif -- #ifdef GIT_HASH -- if( *GIT_HASH ) -- { -- s += "
Git commit hash
[ #" GIT_HASH " ]
"; -- } -- #endif -+ s += "
Git commit hash
[ #" + wxString("GIT_TAGNAME") + " ]
"; - s += "
"; - s += "saga-gis.org"; - +@@ -165,12 +165,7 @@ wxString CDLG_About::_Get_Version(void) + #else + s += " (32 bit)
"; + #endif +- #ifdef GIT_HASH +- if( *GIT_HASH ) +- { +- s += "
Git commit hash
[ #" GIT_HASH " ]
"; +- } +- #endif ++ s += "
Git commit hash
[ #" + wxString("GIT_TAGNAME") + " ]
"; + s += "
"; + s += "saga-gis.org"; + 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 -+#include - #else - #include "svm/svm.h" - #endif + #include "MLB_Interface.h" + + #if defined(SYSTEM_SVM) +-#include ++#include + #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 -+ #include - #else - #include "svm/svm.h" - #endif + + //--------------------------------------------------------- + #if defined(SYSTEM_SVM) +- #include ++ #include + #else + #include "svm/svm.h" + #endif