From nobody Fri Dec 22 20:11:39 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sxdjl5rsmz54Q2d; Fri, 22 Dec 2023 20:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sxdjl53dQz4LqV; Fri, 22 Dec 2023 20:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703275899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NHy8GGFYUcRXcOGcMGGP8Lg9HVcUgpqTsuoCHj+I6LE=; b=a2mZhsIiNY3mxFs/5L1KKCJV3zV03SjYw5v5sI4Af5l1mG4vn4O1tij/l2bo87PCPKzyAO aMBRnJLl4nGubfhEzDR/21zbso1U5eoqObXc9qCjQc1r0/njYM4oxHFprNSi8evuAZPIT8 FYPfkyEWxaPTxqBRZuI0Rr+2iZ62mjPZ6Qs2CwtpTqwJgOvbR/2oCNpx69EbAqdl/Rcal0 gwr5ugBUrU4QImsgQD7t3X5Q5sSMijwUx4XMYEoLHGN4+9ChGxYqNuKCbW/WNGlu68Y+Oq IKUS57/eBZuV2FvR76g0RckKftjj/UUB7K42A3uOpbljBwB1OD4oSsBvpGOd9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703275899; a=rsa-sha256; cv=none; b=TcRvVkqk56XMrmb5jbA1tDB/WPhRpbt+K+4HEl+8kKHw1ACZpNBeIcoS/p+6gO0N/76msG Tw5WRiT4+bXZV+95fGnMTqUOTUuo5QAEJoeKoq1Jxu6WaQE+Itz7IJ8V3j7NCpxVoKaSbs yRDHChtVqIcLi2VFvyjzyHpYnjC2w08w+xGfLktDX7NVv8Wds37HJ2sext8XBOlGVh8DzF r6kBIqjswPLzrZ25wSPBDaXXKavtbeAsLFAJdLn66CzSXs5gemSpdDdchaJLYnssxD8/It nd6QVAoNWQCaU6POJkkTDOadz7eQ8TOVZr50f6QiVPHxZ/oZHspM61pyKlO1tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703275899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NHy8GGFYUcRXcOGcMGGP8Lg9HVcUgpqTsuoCHj+I6LE=; b=OzY52LwVM+0sB2bGo1rWrdQXXkgnCDD5+qAEPVH/XffiG9SHDj7FPWe9xJdeL2DXRX2j4G V0uYuPmKsj6h81TZh8i9bsVqJcH+XrbE1t3xBMWdOmVvkT68fY/fTFOZeqVemMVGIQCkcT 0r0k3uUQYL4xS5Cz+MxMqwlez8h3/shfpkYWPTOxRIzVdZvZfhoRP57neMd1v/QZgPdPNX uXQ4DJdGdPUGqZXO+Yr1XMarYL+w3jpQ/qeli15J0myBTsVjMvEMohemDJbfQEz6JHHx6D D5bRWGe2b9gvUSxdK7JyVbcnmO8fHosp1pJqDX+r5K1K6zT8jfFLg7gFM/bh7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sxdjl46YbzVZf; Fri, 22 Dec 2023 20:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BMKBd4u042454; Fri, 22 Dec 2023 20:11:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BMKBdd6042451; Fri, 22 Dec 2023 20:11:39 GMT (envelope-from git) Date: Fri, 22 Dec 2023 20:11:39 GMT Message-Id: <202312222011.3BMKBdd6042451@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rainer Hurling Subject: git: a7de7a4e023f - main - math/saga: Update to 9.3.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rhurlin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7de7a4e023f3da3180b5de3d7e23fd33124cbe5 Auto-Submitted: auto-generated The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=a7de7a4e023f3da3180b5de3d7e23fd33124cbe5 commit a7de7a4e023f3da3180b5de3d7e23fd33124cbe5 Author: Rainer Hurling AuthorDate: 2023-12-22 20:03:44 +0000 Commit: Rainer Hurling 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 +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 #include @@ -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