diff --git a/math/saga/Makefile b/math/saga/Makefile index 2470aed43027..3ebce2c46fae 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -1,105 +1,104 @@ PORTNAME= saga -PORTVERSION= 8.4.0 -PORTREVISION= 2 +PORTVERSION= 8.4.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 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= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \ swig:devel/swig LIB_DEPENDS= libcurl.so:ftp/curl \ libfftw3.so:math/fftw3 \ libgdal.so:graphics/gdal \ libhdf5.so:science/hdf5 \ libhpdf.so:print/libharu \ libjasper.so:graphics/jasper \ libodbc.so:databases/unixODBC \ libopencv_core.so:graphics/opencv \ libpdal_base.so:math/pdal \ libproj.so:graphics/proj \ libqhull_r.so:math/qhull \ libsvm.so:science/libsvm \ libsz.so:science/libaec \ libtiff.so:graphics/tiff RUN_DEPENDS:= swig:devel/swig USES= cmake compiler:c++11-lib dos2unix gnome \ iconv:wchar_t libtool localbase pkgconfig python DOS2UNIX_GLOB= *.cpp *.h USE_LDCONFIG= yes USE_WX= 3.2+ -GIT_TAGNAME= eeff83616 +GIT_TAGNAME= e0cb3e2f0 -CMAKE_ARGS+= -DSVM_INCLUDE:PATH=${LOCALBASE}/include/svm.h -CMAKE_OFF= WITH_CLIPPER_ONE -CMAKE_ON+= WITH_DEV_TOOLS WITH_EXCERCISES WITH_MRMR WITH_SYSTEM_SVM +CMAKE_ARGS= -DSVM_INCLUDE:PATH=${LOCALBASE}/include/svm.h +CMAKE_ON= WITH_DEV_TOOLS WITH_EXCERCISES WITH_MRMR WITH_SYSTEM_SVM CMAKE_ON+= CMAKE_VERBOSE_MAKEFILE +CMAKE_OFF= WITH_CLIPPER_ONE CMAKE_OFF+= WITH_TOOLS_LAS WITH_TRIANGLE WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/saga-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 # make describe needs them here CPP= clang-cpp${LLVM_DEFAULT} CC= clang${LLVM_DEFAULT} CXX= clang++${LLVM_DEFAULT} 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/accessories/templates/template4saga-tools/my_tool_library/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 ba33392c19a1..39ce41007017 100644 --- a/math/saga/distinfo +++ b/math/saga/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666720434 -SHA256 (saga-8.4.0.tar.gz) = bfa0cfc15db47dcb339eb11a149934fdec14e33ddc4e3cd862e2e4c8cc122d5d -SIZE (saga-8.4.0.tar.gz) = 8459973 +TIMESTAMP = 1668445726 +SHA256 (saga-8.4.1.tar.gz) = 4a6a95e3ca44de507e854d9db11ac55163f8aa1a4126047b19024a0236ed36d2 +SIZE (saga-8.4.1.tar.gz) = 8461892 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 eeacfc3ca8fc..2c580f5ba3f2 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 2022-08-31 16:51:39 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") ++ 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/pkg-plist b/math/saga/pkg-plist index b7854aaa8f72..e054a8a9975d 100644 --- a/math/saga/pkg-plist +++ b/math/saga/pkg-plist @@ -1,232 +1,233 @@ bin/saga_cmd bin/saga_gui include/saga/saga_api/api_core.h include/saga/saga_api/data_manager.h include/saga/saga_api/dataobject.h include/saga/saga_api/datetime.h include/saga/saga_api/geo_tools.h include/saga/saga_api/grid.h include/saga/saga_api/grid_pyramid.h include/saga/saga_api/grids.h include/saga/saga_api/mat_tools.h include/saga/saga_api/metadata.h include/saga/saga_api/parameters.h include/saga/saga_api/pointcloud.h include/saga/saga_api/saga_api.h include/saga/saga_api/shapes.h include/saga/saga_api/table.h include/saga/saga_api/table_dbase.h include/saga/saga_api/table_value.h include/saga/saga_api/tin.h include/saga/saga_api/tool.h include/saga/saga_api/tool_library.h include/saga/saga_gdi/3d_view.h include/saga/saga_gdi/3d_view_tools.h include/saga/saga_gdi/saga_gdi.h include/saga/saga_gdi/sgdi_controls.h include/saga/saga_gdi/sgdi_core.h include/saga/saga_gdi/sgdi_diagram.h include/saga/saga_gdi/sgdi_dialog.h include/saga/saga_gdi/sgdi_helper.h include/saga/saga_gdi/sgdi_layout_items.h lib/libsaga_api.so lib/libsaga_api.so.8 lib/libsaga_api.so.%%PORTVERSION%% lib/libsaga_gdi.so lib/libsaga_gdi.so.8 lib/libsaga_gdi.so.%%PORTVERSION%% %%PYTHON_SITELIBDIR%%/_saga_api.so %%PYTHON_SITELIBDIR%%/saga_api.py %%PYTHON_SITELIBDIR%%/saga_helper.py lib/saga/libclimate_tools.so lib/saga/libcontrib_perego.so lib/saga/libdb_odbc.so %%PGSQL%%lib/saga/libdb_pgsql.so lib/saga/libdev_exercises.so lib/saga/libdev_tools.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_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_pdal.so lib/saga/libio_shapes.so lib/saga/libio_table.so lib/saga/libio_virtual.so lib/saga/libio_webservices.so lib/saga/libpj_georeference.so lib/saga/libpj_geotrans.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 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/man/man1/saga_cmd.1.gz share/man/man1/saga_gui.1.gz share/metainfo/org.saga-gis.saga-gui.appdata.xml share/pixmaps/saga.png %%DATADIR%%/docs/saga_on_mac.md %%DATADIR%%/docs/saga_toolchains_cheat_sheet.xml %%DATADIR%%/docs/saga_toolchains_manual.odt @mode 0777 @dir %%DATADIR%% @mode 0666 %%DATADIR%%/helper/doxygen_saga_api_chm %%DATADIR%%/helper/doxygen_saga_api_html %%DATADIR%%/helper/make_arcsaga_toolboxes.bat +%%DATADIR%%/helper/make_macos_bundle.sh %%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/CMakeLists.txt %%DATADIR%%/templates/template4saga-tools/my_tool_library/Makefile %%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/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_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