Date: Sat, 14 Oct 2023 19:51:21 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: c6041ed4551f - main - math/saga: Update to 9.2.0 Message-ID: <202310141951.39EJpLGg022569@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=c6041ed4551fb8986f2763e549e5e7812b889e45 commit c6041ed4551fb8986f2763e549e5e7812b889e45 Author: Rainer Hurling <rhurlin@FreeBSD.org> AuthorDate: 2023-10-14 19:37:25 +0000 Commit: Rainer Hurling <rhurlin@FreeBSD.org> CommitDate: 2023-10-14 19:37:25 +0000 math/saga: Update to 9.2.0 Besides new features, improvements and fixes, the most important changes are in the new PySAGA Python package, which was already introduced with v9.1.0. There is now a direct access from Python to most of the SAGA tools, see https://sourceforge.net/p/saga-gis/news/2023/10/saga-920-released/ Changelog: https://sourceforge.net/p/saga-gis/wiki/Changelog%209.2.0/attachment/changelog_saga_9.2.0.txt Reported by: Repology --- math/saga/Makefile | 14 ++-- math/saga/distinfo | 6 +- math/saga/files/pkg-message.in | 23 ++++-- math/saga/pkg-plist | 163 ++++++++++++++++++++++++++++++----------- 4 files changed, 145 insertions(+), 61 deletions(-) diff --git a/math/saga/Makefile b/math/saga/Makefile index 6a0fdbf6e049..2bc2b080407c 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -1,5 +1,5 @@ PORTNAME= saga -PORTVERSION= 9.1.3 +PORTVERSION= 9.2.0 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} @@ -35,7 +35,7 @@ DOS2UNIX_GLOB= *.cpp *.h USE_LDCONFIG= yes USE_WX= 3.2+ -GIT_TAGNAME= f780c664b +GIT_TAGNAME= d08ce39b8 CMAKE_ARGS= -DSVM_INCLUDE:PATH=${LOCALBASE}/include/svm.h CMAKE_ON= CMAKE_VERBOSE_MAKEFILE @@ -52,7 +52,9 @@ CMAKE_ON+= WITH_TOOLS_PROJ CMAKE_OFF= WITH_CLIPPER_ONE CMAKE_OFF+= WITH_TOOLS_RIEGL -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/saga-gis +SUB_FILES= pkg-message + +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}-gis PLIST_SUB= PORTVERSION=${PORTVERSION} @@ -75,8 +77,6 @@ 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;|' \ @@ -93,10 +93,12 @@ post-install: ${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 -# toolchains dir was moved in r2805 (and followups r2810,r2811,r2820) +# Put accessories under share/saga, python/data already under site-packages/PySAGA ;) + (cd ${WRKSRC}/src/accessories && ${RM} -R python/data) (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 diff --git a/math/saga/distinfo b/math/saga/distinfo index 827efa318849..91668a681ba4 100644 --- a/math/saga/distinfo +++ b/math/saga/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1696492017 -SHA256 (saga-9.1.3.tar.gz) = 77c9ed549be6d4857757e4fc594347eedd244f8783340d1ac7f843cfde2474de -SIZE (saga-9.1.3.tar.gz) = 8393819 +TIMESTAMP = 1696608216 +SHA256 (saga-9.2.0.tar.gz) = 8c7662d5cd4ce5641fa819ad22f23b4bd9963579b3194b2f809202bd76d28d57 +SIZE (saga-9.2.0.tar.gz) = 8676071 diff --git a/math/saga/files/pkg-message.in b/math/saga/files/pkg-message.in index 2ea3197f1c8a..b6b63f2e2b57 100644 --- a/math/saga/files/pkg-message.in +++ b/math/saga/files/pkg-message.in @@ -5,24 +5,31 @@ Your SAGA GIS installation now resides under %%PREFIX%%/lib/saga Besides the graphical user interface saga_gui, saga_cmd is of -particular importance for the processing of geodata. The -latter can be used in scripts or directly in the shell. +particular importance for processing geodata. The latter can +be used in scripts or directly in the shell. All extra material like helpers and templates are at %%DATADIR%%/ -Predefined ToolChains in xml format are located at +Predefined ToolChains in xml format are located under %%DATADIR%%/toolchains/ -You will find a ToolChains manual and a cheatsheet at +A ToolChains manual and cheatsheet can be found at %%DATADIR%%/docs -There is a SAGA Python package, PySAGA, which resides at +Using the SAGA Python package PySAGA, the majority of all +SAGA tools and functions, including the Grid Calculator, +can be used directly in Python. The PySAGA package is +located in the following directory %%PREFIX%%/lib/python%%PYTHON_VER%%/site-packages/PySAGA -Python scripts with examples, helpers and test data reside at -%%DATADIR%%/python/. A good starting point is the script - saga_python_example.py. +Python scripts with examples, utilities, and test data +are located at: + %%DATADIR%%/python/ + +A good starting point is the script saga_python_example.py. +Another good example can be found at + https://sourceforge.net/p/saga-gis/news/2023/10/saga-920-released/ EOM } ] diff --git a/math/saga/pkg-plist b/math/saga/pkg-plist index 6d8c751ab12f..48028904ace1 100644 --- a/math/saga/pkg-plist +++ b/math/saga/pkg-plist @@ -37,7 +37,85 @@ lib/libsaga_gdi.so.9 lib/libsaga_gdi.so.%%PORTVERSION%% %%PYTHON_SITELIBDIR%%/PySAGA/__init__.py %%PYTHON_SITELIBDIR%%/PySAGA/_saga_api.so +%%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/saga_api.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/_tool_chains_uncategorized.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/climate_tools.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/contrib_perego.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/db_odbc.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/db_pgsql.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/docs_html.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/docs_pdf.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/grid_analysis.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/grid_calculus.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/grid_filter.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/grid_gridding.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/grid_spline.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/grid_tools.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/grid_visualisation.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/grids_tools.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/imagery_classification.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/imagery_isocluster.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/imagery_maxent.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/imagery_opencv.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/imagery_photogrammetry.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/imagery_segmentation.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/imagery_svm.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/imagery_tools.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/imagery_vigra.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/io_esri_e00.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/io_gdal.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/io_gps.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/io_grid.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/io_grid_image.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/io_pdal.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/io_riegl_rdb.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/io_shapes.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/io_table.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/io_virtual.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/io_webservices.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/pj_georeference.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/pj_geotrans.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/pj_proj4.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/pointcloud_tools.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/shapes_grid.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/shapes_lines.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/shapes_points.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/shapes_polygons.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/shapes_tools.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/shapes_transect.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/sim_air_flow.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/sim_cellular_automata.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/sim_ecosystems_hugget.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/sim_erosion.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/sim_fire_spreading.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/sim_geomorphology.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/sim_hydrology.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/sim_ihacres.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/sim_landscape_evolution.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/sim_qm_of_esp.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/sim_rivflow.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/statistics_grid.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/statistics_kriging.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/statistics_points.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/statistics_regression.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/ta_channels.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/ta_cliffmetrics.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/ta_compound.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/ta_hydrology.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/ta_lighting.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/ta_morphometry.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/ta_preprocessor.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/ta_profiles.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/ta_slope_stability.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/table_calculus.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/table_tools.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/tin_tools.py +%%PYTHON_SITELIBDIR%%/PySAGA/tools/tta_tools.py lib/saga/libclimate_tools.so lib/saga/libcontrib_perego.so lib/saga/libdb_odbc.so @@ -145,31 +223,21 @@ share/pixmaps/saga.png %%DATADIR%%/helper/make_macos_bundle.sh %%DATADIR%%/helper/make_python_api.bat %%DATADIR%%/helper/make_python_api_all.bat +%%DATADIR%%/helper/make_python_toolboxes.bat %%DATADIR%%/helper/make_saga4qgis_toolboxes.bat %%DATADIR%%/helper/make_saga_api_doc.bat %%DATADIR%%/helper/make_saga_release.bat %%DATADIR%%/helper/make_saga_snapshot.bat -%%DATADIR%%/helper/make_tools_interface.bat %%DATADIR%%/helper/make_translation_files.bat %%DATADIR%%/helper/saga_python_version_tester.bat %%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/helpers/print_version.py -%%DATADIR%%/python/helpers/saga_cmd_param_interface/environment.py -%%DATADIR%%/python/helpers/saga_cmd_param_interface/param_interface.py -%%DATADIR%%/python/helpers/saga_cmd_param_interface/tools.py +%%DATADIR%%/python/helper.py %%DATADIR%%/python/saga_python_example.bat %%DATADIR%%/python/saga_python_example.py %%DATADIR%%/python/saga_python_readme.txt -%%DATADIR%%/python/test_data/test.mgrd -%%DATADIR%%/python/test_data/test.sdat -%%DATADIR%%/python/test_data/test.sgrd -%%DATADIR%%/python/test_data/test_ascii.asc -%%DATADIR%%/python/test_data/test_pts.dbf -%%DATADIR%%/python/test_data/test_pts.mshp -%%DATADIR%%/python/test_data/test_pts.shp -%%DATADIR%%/python/test_data/test_pts.shx -%%DATADIR%%/python/test_data/test_pts_xyz.xyz %%DATADIR%%/saga.bra.txt %%DATADIR%%/saga.ger.txt %%DATADIR%%/saga.lng.txt @@ -185,39 +253,46 @@ share/pixmaps/saga.png %%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool.h %%DATADIR%%/templates/template4saga-tools/readme.txt %%DATADIR%%/toolchains/climate_tools.xml -%%DATADIR%%/toolchains/cluster_terrain.xml -%%DATADIR%%/toolchains/gc_filter_gaussian.xml -%%DATADIR%%/toolchains/gc_filter_laplacian.xml -%%DATADIR%%/toolchains/gc_filter_rank.xml -%%DATADIR%%/toolchains/gc_filter_simple.xml -%%DATADIR%%/toolchains/gc_longitudinal_range.xml -%%DATADIR%%/toolchains/gc_tools.xml -%%DATADIR%%/toolchains/grid_and_polygon_to_table.xml %%DATADIR%%/toolchains/grid_filter.xml -%%DATADIR%%/toolchains/grid_list_simple_filter.xml -%%DATADIR%%/toolchains/grid_notch_filter.xml -%%DATADIR%%/toolchains/grid_statistics_for_directions.xml +%%DATADIR%%/toolchains/grid_filter_notch.xml +%%DATADIR%%/toolchains/grid_filter_sieve_and_clump.xml +%%DATADIR%%/toolchains/grid_filter_simple_bulk.xml +%%DATADIR%%/toolchains/grid_tools.xml %%DATADIR%%/toolchains/grid_tools_bulk_no-data_change.xml %%DATADIR%%/toolchains/gridding.xml -%%DATADIR%%/toolchains/group_files.xml -%%DATADIR%%/toolchains/imagery.xml -%%DATADIR%%/toolchains/imagery_classify_majority.xml -%%DATADIR%%/toolchains/imagery_lczc.xml -%%DATADIR%%/toolchains/import_text_tables.xml -%%DATADIR%%/toolchains/obia.xml -%%DATADIR%%/toolchains/points_to_contour.xml -%%DATADIR%%/toolchains/polygons_max_interior_circles.xml -%%DATADIR%%/toolchains/polygons_remove_from_boundary.xml -%%DATADIR%%/toolchains/shapes_select_delete.xml -%%DATADIR%%/toolchains/sieve_and_clump.xml -%%DATADIR%%/toolchains/ta_flow_accumulation.xml -%%DATADIR%%/toolchains/ta_ls_factor.xml -%%DATADIR%%/toolchains/ta_summits.xml -%%DATADIR%%/toolchains/temperature_downscaling_bulk.xml -%%DATADIR%%/toolchains/terrain_analysis.xml -%%DATADIR%%/toolchains/terrain_segmentation.xml +%%DATADIR%%/toolchains/grids_tools.xml +%%DATADIR%%/toolchains/grids_tools_filter_gaussian.xml +%%DATADIR%%/toolchains/grids_tools_filter_laplacian.xml +%%DATADIR%%/toolchains/grids_tools_filter_rank.xml +%%DATADIR%%/toolchains/grids_tools_filter_simple.xml +%%DATADIR%%/toolchains/grids_tools_longitudinal_range.xml +%%DATADIR%%/toolchains/imagery_classification.xml +%%DATADIR%%/toolchains/imagery_classification_lczc.xml +%%DATADIR%%/toolchains/imagery_classification_majority.xml +%%DATADIR%%/toolchains/imagery_segmentation.xml +%%DATADIR%%/toolchains/imagery_segmentation_obia.xml +%%DATADIR%%/toolchains/io_table.xml +%%DATADIR%%/toolchains/io_table_import_text_tables.xml +%%DATADIR%%/toolchains/shapes_grid.xml +%%DATADIR%%/toolchains/shapes_grid_and_polygon_to_points.xml +%%DATADIR%%/toolchains/shapes_points.xml +%%DATADIR%%/toolchains/shapes_points_to_contour.xml +%%DATADIR%%/toolchains/shapes_polygons.xml +%%DATADIR%%/toolchains/shapes_polygons_max_interior_circles.xml +%%DATADIR%%/toolchains/shapes_polygons_remove_from_boundary.xml +%%DATADIR%%/toolchains/shapes_tools.xml +%%DATADIR%%/toolchains/shapes_tools_select_delete.xml +%%DATADIR%%/toolchains/statistics_grid.xml +%%DATADIR%%/toolchains/statistics_grid_directions.xml +%%DATADIR%%/toolchains/ta_hydrology.xml +%%DATADIR%%/toolchains/ta_hydrology_flow_accumulation.xml +%%DATADIR%%/toolchains/ta_hydrology_ls_factor.xml +%%DATADIR%%/toolchains/ta_hydrology_twi.xml +%%DATADIR%%/toolchains/ta_hydrology_upslope_height.xml +%%DATADIR%%/toolchains/ta_morphometry.xml +%%DATADIR%%/toolchains/ta_morphometry_clustering.xml +%%DATADIR%%/toolchains/ta_morphometry_segmentation.xml +%%DATADIR%%/toolchains/ta_morphometry_summits.xml %%DATADIR%%/toolchains/tta_LandCover.xml %%DATADIR%%/toolchains/tta_TravelTime.xml %%DATADIR%%/toolchains/tta_tools.xml -%%DATADIR%%/toolchains/twi.xml -%%DATADIR%%/toolchains/upslope_height.xml
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310141951.39EJpLGg022569>