Date: Fri, 22 Dec 2023 20:11:39 GMT From: Rainer Hurling <rhurlin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a7de7a4e023f - main - math/saga: Update to 9.3.0 Message-ID: <202312222011.3BMKBdd6042451@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=a7de7a4e023f3da3180b5de3d7e23fd33124cbe5 commit a7de7a4e023f3da3180b5de3d7e23fd33124cbe5 Author: Rainer Hurling <rhurlin@FreeBSD.org> AuthorDate: 2023-12-22 20:03:44 +0000 Commit: Rainer Hurling <rhurlin@FreeBSD.org> CommitDate: 2023-12-22 20:11:23 +0000 math/saga: Update to 9.3.0 Again, besides new features, improvements and fixes, the most important changes are in the PySAGA Python package. For a list of backward incompatible changes have a look at https://sourceforge.net/p/saga-gis/code/ci/master/tree/saga-gis/changes.md Changelog: https://sourceforge.net/p/saga-gis/wiki/Changelog%209.3.0/attachment/changelog_saga_9.3.0.txt Reported by: portscout, Repology --- math/saga/Makefile | 12 ++++++------ math/saga/distinfo | 6 +++--- .../saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp | 6 +++--- math/saga/pkg-plist | 13 ++++++++----- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/math/saga/Makefile b/math/saga/Makefile index 7801e45db674..282d4b37b12b 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -1,5 +1,5 @@ PORTNAME= saga -PORTVERSION= 9.2.1 +PORTVERSION= 9.3.0 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} @@ -35,12 +35,13 @@ DOS2UNIX_GLOB= *.cpp *.h USE_LDCONFIG= yes USE_WX= 3.2+ -GIT_TAGNAME= cef0761a5 +GIT_TAGNAME= b1f8012c7 CMAKE_ARGS= -DSVM_INCLUDE:PATH=${LOCALBASE}/include/svm.h CMAKE_ON= CMAKE_VERBOSE_MAKEFILE CMAKE_ON+= WITH_DEV_TOOLS CMAKE_ON+= WITH_EXCERCISES +CMAKE_ON+= WITH_LIFETIME_TRACKER CMAKE_ON+= WITH_MRMR CMAKE_ON+= WITH_SYSTEM_SVM CMAKE_ON+= WITH_TOOLS_HPDF @@ -77,6 +78,8 @@ VIGRA_RUN_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra .include <bsd.port.pre.mk> +SUB_FILES= pkg-message + post-patch: .if ${ARCH} == "powerpc" @${REINPLACE_CMD} -e 's|typedef unsigned long DWORD;|typedef unsigned int DWORD;|' \ @@ -94,13 +97,10 @@ post-install: ${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/data) + (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}/templates/template4saga-tools/my_tool_library/Makefile.bak - ${RM} -R ${STAGEDIR}${DATADIR}/python/tools - ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.desktop \ - ${STAGEDIR}${PREFIX}/share/applications/ # library helper files are not needed and cripple some math/qgis extensions @${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.la diff --git a/math/saga/distinfo b/math/saga/distinfo index cffdfbb2b0b9..29998265edf5 100644 --- a/math/saga/distinfo +++ b/math/saga/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1702480110 -SHA256 (saga-9.2.1.tar.gz) = ab6879ebd182b67afe27b1cf7a3d383acb15e6620293ce8f8ae644869aed392a -SIZE (saga-9.2.1.tar.gz) = 8678505 +TIMESTAMP = 1703011415 +SHA256 (saga-9.3.0.tar.gz) = cc1769e04cb3a5cdb5ce1036f940fa2eb5cd1feb127dbd1abceb1cc426c6c631 +SIZE (saga-9.3.0.tar.gz) = 9085741 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 c1c029cae9ea..c488bf421406 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,6 +1,6 @@ ---- src/saga_core/saga_cmd/saga_cmd.cpp.orig 2020-02-07 16:57:34 UTC +--- src/saga_core/saga_cmd/saga_cmd.cpp.orig 2023-12-11 15:05:42 UTC +++ src/saga_core/saga_cmd/saga_cmd.cpp -@@ -52,6 +52,7 @@ +@@ -50,6 +50,7 @@ #include <wx/app.h> #include <wx/utils.h> @@ -8,7 +8,7 @@ #include "config.h" #include "callback.h" -@@ -165,7 +166,7 @@ _except(1) +@@ -163,7 +164,7 @@ bool Run(int argc, char *argv[]) //--------------------------------------------------------- bool Run(int argc, char *argv[]) { diff --git a/math/saga/pkg-plist b/math/saga/pkg-plist index d3e21e534e2b..bf30787d66b2 100644 --- a/math/saga/pkg-plist +++ b/math/saga/pkg-plist @@ -37,11 +37,13 @@ lib/libsaga_gdi.so.9 lib/libsaga_gdi.so.%%PORTVERSION%% %%PYTHON_SITELIBDIR%%/PySAGA/__init__.py %%PYTHON_SITELIBDIR%%/PySAGA/_saga_api.so +%%PYTHON_SITELIBDIR%%/PySAGA/convert.py %%PYTHON_SITELIBDIR%%/PySAGA/data/chelsa.py %%PYTHON_SITELIBDIR%%/PySAGA/data/copernicus_dem.py %%PYTHON_SITELIBDIR%%/PySAGA/data/helper.py %%PYTHON_SITELIBDIR%%/PySAGA/data/srtm.py %%PYTHON_SITELIBDIR%%/PySAGA/helper.py +%%PYTHON_SITELIBDIR%%/PySAGA/plot.py %%PYTHON_SITELIBDIR%%/PySAGA/saga_api.py %%PYTHON_SITELIBDIR%%/PySAGA/tools/_tool_chains_uncategorized.py %%PYTHON_SITELIBDIR%%/PySAGA/tools/climate_tools.py @@ -213,10 +215,15 @@ share/metainfo/org.saga-gis.saga-gui.appdata.xml share/pixmaps/saga.png %%DATADIR%%/docs/saga_on_mac.md %%DATADIR%%/docs/saga_on_mac_build.sh +%%DATADIR%%/docs/saga_python_example.bat +%%DATADIR%%/docs/saga_python_example.ipynb +%%DATADIR%%/docs/saga_python_example.py +%%DATADIR%%/docs/saga_python_readme.txt %%DATADIR%%/docs/saga_toolchains_cheat_sheet.xml %%DATADIR%%/docs/saga_toolchains_manual.odt %%DATADIR%%/helper/convert2utf-8.bat %%DATADIR%%/helper/convert2utf-8.py +%%DATADIR%%/helper/create_archive.py %%DATADIR%%/helper/doxygen_saga_api_chm %%DATADIR%%/helper/doxygen_saga_api_html %%DATADIR%%/helper/make_arcsaga_toolboxes.bat @@ -233,11 +240,6 @@ share/pixmaps/saga.png %%DATADIR%%/helper/saga_python_version_tester.py %%DATADIR%%/helper/saga_setup_readme.rtf %%DATADIR%%/helper/saga_setup_x64.iss -%%DATADIR%%/python/__init__.py -%%DATADIR%%/python/helper.py -%%DATADIR%%/python/saga_python_example.bat -%%DATADIR%%/python/saga_python_example.py -%%DATADIR%%/python/saga_python_readme.txt %%DATADIR%%/saga.bra.txt %%DATADIR%%/saga.ger.txt %%DATADIR%%/saga.lng.txt @@ -260,6 +262,7 @@ share/pixmaps/saga.png %%DATADIR%%/toolchains/grid_filter_simple_bulk.xml %%DATADIR%%/toolchains/grid_tools.xml %%DATADIR%%/toolchains/grid_tools_bulk_no-data_change.xml +%%DATADIR%%/toolchains/grid_tools_bulk_two_grids_weighted_mean.xml %%DATADIR%%/toolchains/gridding.xml %%DATADIR%%/toolchains/grids_tools.xml %%DATADIR%%/toolchains/grids_tools_filter_gaussian.xml
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202312222011.3BMKBdd6042451>