diff --git a/math/saga/Makefile b/math/saga/Makefile index 404af68d20f9..49777ce408ad 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -1,120 +1,119 @@ # Created by: Rainer Hurling PORTNAME= saga -PORTVERSION= 7.9.0 -PORTREVISION= 6 +PORTVERSION= 7.9.1 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} MAINTAINER= rhurlin@FreeBSD.org COMMENT= System for Automated Geoscientific Analyses LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi BUILD_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \ swig:devel/swig LIB_DEPENDS= libcurl.so:ftp/curl \ libfftw3.so:math/fftw3 \ libgdal.so:graphics/gdal \ libhpdf.so:print/libharu \ libjasper.so:graphics/jasper \ liblas12.so:devel/liblas12 \ libodbc.so:databases/unixODBC \ libopencv_core.so:graphics/opencv \ libpdal_base.so:math/pdal \ libproj.so:graphics/proj \ libsvm.so:science/libsvm \ libtbb.so:devel/onetbb \ libtiff.so:graphics/tiff RUN_DEPENDS:= swig:devel/swig USES= autoreconf compiler:c++11-lib dos2unix gnome \ iconv:wchar_t libtool localbase pkgconfig python USE_LDCONFIG= yes USE_WX= 3.0+ CONFIGURE_ARGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ --enable-python --with-system-svm CONFIGURE_ENV= SWIG="${LOCALBASE}/bin/swig" GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} INSTALLS_ICONS= yes DOS2UNIX_GLOB= *.cpp *.h PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= PGSQL OPENMP VIGRA OPTIONS_DEFAULT= PGSQL VIGRA OPTIONS_DEFAULT_amd64= OPENMP OPTIONS_DEFAULT_i386= OPENMP NO_OPTIONS_SORT= yes OPTIONS_SUB= yes OPENMP_DESC= Enable Multiprocessing (only amd64 and i386) VIGRA_DESC= Enable 'Vision with Generic Algorithms' Library OPENMP_CONFIGURE_ENABLE= openmp PGSQL_CONFIGURE_WITH= postgresql PGSQL_USES= pgsql VIGRA_BUILD_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra VIGRA_RUN_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra INSTALL_TARGET= install-strip .include # make describe needs them here CPP= clang-cpp${LLVM_DEFAULT} CC= clang${LLVM_DEFAULT} CXX= clang++${LLVM_DEFAULT} SUB_FILES= pkg-message post-extract: @${REINPLACE_CMD} -e 's|wx-config |${WX_CONFIG} |g' \ ${WRKSRC}/configure.ac \ ${WRKSRC}/src/saga_core/saga_api/Makefile.am \ ${WRKSRC}/src/saga_core/saga_cmd/Makefile.am \ ${WRKSRC}/src/saga_core/saga_gdi/Makefile.am \ ${WRKSRC}/src/saga_core/saga_gui/Makefile.am \ ${WRKSRC}/src/tools/garden/garden_3d_viewer/Makefile.am \ ${WRKSRC}/src/tools/garden/garden_webservices/Makefile.am \ ${WRKSRC}/src/tools/io/io_grid_image/Makefile.am \ ${WRKSRC}/src/tools/io/io_shapes/Makefile.am \ ${WRKSRC}/src/tools/io/io_virtual/Makefile.am \ ${WRKSRC}/src/tools/io/io_webservices/Makefile.am \ ${WRKSRC}/src/tools/pointcloud/pointcloud_tools/Makefile.am \ ${WRKSRC}/src/tools/pointcloud/pointcloud_viewer/Makefile.am \ ${WRKSRC}/src/tools/statistics/statistics_kriging/Makefile.am \ ${WRKSRC}/src/tools/tin/tin_viewer/Makefile.am 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|PORTVERSION|${PORTVERSION}|' \ ${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp @${REINPLACE_CMD} -e 's|-lgomp|-lomp|' \ ${WRKSRC}/src/accessories/templates/template4saga-tools/my_tool_library/Makefile post-configure: @${REINPLACE_CMD} -e 's|^LDFLAGS = .*|& -lopencv_core|' \ ${WRKSRC}/src/tools/imagery/imagery_opencv/Makefile 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 # toolchains dir was moved in r2805 (and followups r2810,r2811,r2820) (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 ${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 .include diff --git a/math/saga/distinfo b/math/saga/distinfo index 935f8b347b32..26366aa83144 100644 --- a/math/saga/distinfo +++ b/math/saga/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1608486072 -SHA256 (saga-7.9.0.tar.gz) = a1bdb725b42707134ed5003ccd484b8e0a3960147dd29c26f094fad9bb0f05d8 -SIZE (saga-7.9.0.tar.gz) = 5529296 +TIMESTAMP = 1628004746 +SHA256 (saga-7.9.1.tar.gz) = 26ad4b84149e26eabd4a5365fe4a3923cfa39e36672cc7c660d3549f3556a3bc +SIZE (saga-7.9.1.tar.gz) = 5512365 diff --git a/math/saga/files/patch-configure.ac b/math/saga/files/patch-configure.ac index c77bc0675693..ad0db9408e5a 100644 --- a/math/saga/files/patch-configure.ac +++ b/math/saga/files/patch-configure.ac @@ -1,31 +1,31 @@ ---- configure.ac.orig 2020-02-09 11:18:36 UTC +--- configure.ac.orig 2021-08-03 15:33:59 UTC +++ configure.ac @@ -20,7 +20,7 @@ AC_PROG_LIBTOOL AC_CHECK_LIB([opencv_core], [cvGetRows], CVFOUND=1,,) AC_CHECK_LIB([geotrans], [Set_Mercator_Coordinates]) AC_CHECK_LIB([fftw3],[fftw_execute],FFTWFOUND=1,) -AC_CHECK_LIB([las], [LAS_GetVersion], LASFOUND=1,,) +AC_CHECK_LIB([las12], [LAS_GetVersion], LASFOUND=1,,) - AC_CHECK_LIB([pdal], [versionString], PDALFOUND=1,,) AC_CHECK_LIB(hpdf, HPDF_Pages_New, HARUFOUND=1,,) AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOUND=1,[ODBC \(libodbc\) library not found]) -@@ -31,8 +31,8 @@ AC_CHECK_HEADER([projects.h],[AC_CHECK_HEADER([proj.h] + # PROJ4 has projects.h and old API function: +@@ -30,8 +30,8 @@ AC_CHECK_HEADER([projects.h],[AC_CHECK_HEADER([proj.h] # PROJ6 has dropped projects.h in favour of proj.h and has new API function: AC_CHECK_HEADER([proj.h],[AC_CHECK_LIB([proj], [proj_info], PROJ6FOUND=1,,)]) AC_CHECK_LIB([vigraimpex], [VIGRA_RGBE_ReadPixels_Raw],VIGRAFOUND=1,) -AC_CHECK_LIB([gomp], [omp_get_num_threads], GOMPFOUND=1,,) -AC_CHECK_HEADER([libsvm/svm.h],[AC_CHECK_LIB([svm], [svm_get_svm_type], SVMFOUND=1,,)]) +AC_CHECK_LIB([omp], [omp_get_num_threads], GOMPFOUND=1,,) +AC_CHECK_HEADER([svm.h],[AC_CHECK_LIB([svm], [svm_get_svm_type], SVMFOUND=1,,)]) PKG_CHECK_MODULES([DXFLIB], [dxflib], [LIBDXFFOUND=1],[LIBDXFFOUND=0]) PKG_CHECK_MODULES([HDF5],[hdf5],LIBHDF5FOUND=1,LIBHDF5FOUND=0) LIBCURL_CHECK_CONFIG([yes], [7.7.2],,) -@@ -168,7 +168,7 @@ AC_ARG_ENABLE(openmp, +@@ -163,7 +163,7 @@ AC_ARG_ENABLE(openmp, else if test -n "$GOMPFOUND" ; then AC_MSG_RESULT([ Building with OpenMP support using libgomp]) - GOMPFLAGS="-fopenmp -lgomp" + GOMPFLAGS="-fopenmp -lomp" else AC_MSG_RESULT([ libgomp not found, OpenMP support disabled]) GOMPFLAGS="" diff --git a/math/saga/pkg-plist b/math/saga/pkg-plist index 5c4b9fe0eda1..b20593a5dc59 100644 --- a/math/saga/pkg-plist +++ b/math/saga/pkg-plist @@ -1,237 +1,238 @@ bin/saga_cmd bin/saga_gui include/saga/saga_core/saga_api/api_core.h include/saga/saga_core/saga_api/data_manager.h include/saga/saga_core/saga_api/dataobject.h include/saga/saga_core/saga_api/datetime.h include/saga/saga_core/saga_api/geo_tools.h include/saga/saga_core/saga_api/grid.h include/saga/saga_core/saga_api/grid_pyramid.h include/saga/saga_core/saga_api/grids.h include/saga/saga_core/saga_api/mat_tools.h include/saga/saga_core/saga_api/metadata.h include/saga/saga_core/saga_api/parameters.h include/saga/saga_core/saga_api/pointcloud.h include/saga/saga_core/saga_api/saga_api.h include/saga/saga_core/saga_api/shapes.h include/saga/saga_core/saga_api/table.h include/saga/saga_core/saga_api/table_dbase.h include/saga/saga_core/saga_api/table_value.h include/saga/saga_core/saga_api/tin.h include/saga/saga_core/saga_api/tool.h include/saga/saga_core/saga_api/tool_library.h include/saga/saga_core/saga_gdi/3d_view.h include/saga/saga_core/saga_gdi/3d_view_tools.h include/saga/saga_core/saga_gdi/saga_gdi.h include/saga/saga_core/saga_gdi/sgdi_controls.h include/saga/saga_core/saga_gdi/sgdi_core.h include/saga/saga_core/saga_gdi/sgdi_diagram.h include/saga/saga_core/saga_gdi/sgdi_dialog.h include/saga/saga_core/saga_gdi/sgdi_helper.h include/saga/saga_core/saga_gdi/sgdi_layout_items.h lib/libsaga_api-%%PORTVERSION%%.so lib/libsaga_api.so lib/libsaga_gdi-%%PORTVERSION%%.so lib/libsaga_gdi.so -%%PYTHON_SITELIBDIR%%/__pycache__/saga_api.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/__pycache__/saga_api.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/__pycache__/saga_api%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/__pycache__/saga_api%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/_saga_api-%%PORTVERSION%%.so %%PYTHON_SITELIBDIR%%/_saga_api.a %%PYTHON_SITELIBDIR%%/_saga_api.so %%PYTHON_SITELIBDIR%%/saga_api.py lib/saga/libclimate_tools.so lib/saga/libcontrib_perego.so lib/saga/libdb_odbc.so %%PGSQL%%lib/saga/libdb_pgsql.so lib/saga/libdocs_html.so lib/saga/libdocs_pdf.so lib/saga/libgarden_3d_viewer.so lib/saga/libgarden_fractals.so lib/saga/libgarden_games.so lib/saga/libgarden_learn_to_program.so lib/saga/libgarden_webservices.so lib/saga/libgrid_analysis.so lib/saga/libgrid_calculus.so lib/saga/libgrid_calculus_bsl.so lib/saga/libgrid_filter.so lib/saga/libgrid_gridding.so lib/saga/libgrid_spline.so lib/saga/libgrid_tools.so lib/saga/libgrid_visualisation.so lib/saga/libgrids_tools.so lib/saga/libimagery_classification.so +lib/saga/libimagery_isocluster.so lib/saga/libimagery_maxent.so lib/saga/libimagery_opencv.so lib/saga/libimagery_photogrammetry.so lib/saga/libimagery_segmentation.so lib/saga/libimagery_svm.so lib/saga/libimagery_tools.so %%VIGRA%%lib/saga/libimagery_vigra.so lib/saga/libio_esri_e00.so lib/saga/libio_gdal.so lib/saga/libio_gps.so lib/saga/libio_grid.so lib/saga/libio_grid_image.so lib/saga/libio_shapes.so lib/saga/libio_shapes_dxf.so lib/saga/libio_shapes_las.so lib/saga/libio_table.so lib/saga/libio_virtual.so lib/saga/libio_webservices.so lib/saga/libpj_georeference.so lib/saga/libpj_proj4.so lib/saga/libpointcloud_tools.so lib/saga/libpointcloud_viewer.so lib/saga/libshapes_grid.so lib/saga/libshapes_lines.so lib/saga/libshapes_points.so lib/saga/libshapes_polygons.so lib/saga/libshapes_tools.so lib/saga/libshapes_transect.so lib/saga/libsim_air_flow.so lib/saga/libsim_cellular_automata.so lib/saga/libsim_ecosystems_hugget.so lib/saga/libsim_erosion.so lib/saga/libsim_fire_spreading.so lib/saga/libsim_geomorphology.so lib/saga/libsim_hydrology.so lib/saga/libsim_ihacres.so lib/saga/libsim_landscape_evolution.so lib/saga/libsim_qm_of_esp.so lib/saga/libsim_rivflow.so lib/saga/libstatistics_grid.so lib/saga/libstatistics_kriging.so lib/saga/libstatistics_points.so lib/saga/libstatistics_regression.so lib/saga/libta_channels.so lib/saga/libta_cliffmetrics.so lib/saga/libta_compound.so lib/saga/libta_hydrology.so lib/saga/libta_lighting.so lib/saga/libta_morphometry.so lib/saga/libta_preprocessor.so lib/saga/libta_profiles.so lib/saga/libta_slope_stability.so lib/saga/libtable_calculus.so lib/saga/libtable_tools.so lib/saga/libtin_tools.so lib/saga/libtin_viewer.so man/man1/saga_cmd.1.gz man/man1/saga_gui.1.gz share/applications/saga.desktop share/icons/hicolor/128x128/apps/saga.png share/icons/hicolor/16x16/apps/saga.png share/icons/hicolor/192x192/apps/saga.png share/icons/hicolor/22x22/apps/saga.png share/icons/hicolor/24x24/apps/saga.png share/icons/hicolor/256x256/apps/saga.png share/icons/hicolor/32x32/apps/saga.png share/icons/hicolor/48x48/apps/saga.png share/icons/hicolor/64x64/apps/saga.png share/icons/hicolor/72x72/apps/saga.png share/icons/hicolor/80x80/apps/saga.png share/icons/hicolor/8x8/apps/saga.png share/icons/hicolor/96x96/apps/saga.png share/metainfo/org.saga-gis.saga-gui.appdata.xml share/pixmaps/saga.png @mode 0777 @dir %%DATADIR%% @mode 0666 %%DATADIR%%/docs/saga_on_mac.odt %%DATADIR%%/docs/saga_toolchains_cheat_sheet.xml %%DATADIR%%/docs/saga_toolchains_manual.odt %%DATADIR%%/helper/doxygen_saga_api_chm %%DATADIR%%/helper/doxygen_saga_api_html %%DATADIR%%/helper/make_arcsaga_toolboxes.bat %%DATADIR%%/helper/make_python_api.bat %%DATADIR%%/helper/make_python_api_all.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 @mode 0755 %%DATADIR%%/python/examples/00_grid_create_dummy.py %%DATADIR%%/python/examples/01_grid_asc_to_saga.py %%DATADIR%%/python/examples/02_grid_morphometry.py %%DATADIR%%/python/examples/03_grid_difference.py %%DATADIR%%/python/examples/04_grid_contour.py %%DATADIR%%/python/examples/05_shp2xyz.py %%DATADIR%%/python/examples/06_xyz2shp.py %%DATADIR%%/python/examples/07_grid_tpi.py %%DATADIR%%/python/examples/saga_helper.py %%DATADIR%%/python/examples/test_all.bat %%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 @mode 0666 %%DATADIR%%/python/saga_python_api.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 %%DATADIR%%/saga.png %%DATADIR%%/saga.rus.txt %%DATADIR%%/saga_prj.dic %%DATADIR%%/saga_prj.srs %%DATADIR%%/saga_tip.txt %%DATADIR%%/templates/template4saga-tools/my_tool_library/Makefile %%DATADIR%%/templates/template4saga-tools/my_tool_library/Makefile.am %%DATADIR%%/templates/template4saga-tools/my_tool_library/TLB_Interface.cpp %%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool.cpp %%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool.h %%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library.cbp %%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library.layout %%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library.vcxproj %%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library.vcxproj.filters %%DATADIR%%/templates/template4saga-tools/my_tools.vc14.sln %%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_tools_bulk_no-data_change.xml %%DATADIR%%/toolchains/gridding.xml %%DATADIR%%/toolchains/group_files.xml %%DATADIR%%/toolchains/imagery.xml %%DATADIR%%/toolchains/imagery_fmask_clouds.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.xml %%DATADIR%%/toolchains/temperature_downscaling_bulk.xml %%DATADIR%%/toolchains/terrain_analysis.xml %%DATADIR%%/toolchains/terrain_segmentation.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 @mode