Index: head/math/saga/Makefile =================================================================== --- head/math/saga/Makefile (revision 412496) +++ head/math/saga/Makefile (revision 412497) @@ -1,119 +1,112 @@ # Created by: Rainer Hurling # $FreeBSD$ PORTNAME= saga -PORTVERSION= 2.2.4 -PORTREVISION= 1 +PORTVERSION= 2.2.6 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION} +DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= rhurlin@gwdg.de COMMENT= System for Automated Geoscientific Analyses LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi BUILD_DEPENDS= swig3.0:devel/swig30 LIB_DEPENDS= libproj.so:graphics/proj \ libgdal.so:graphics/gdal \ libhpdf.so:print/libharu \ libjasper.so:graphics/jasper \ libtiff.so:graphics/tiff \ libodbc.so:databases/unixODBC \ liblas.so:devel/liblas12 \ libopencv_ml.so:graphics/opencv RUN_DEPENDS:= ${BUILD_DEPENDS} CONFIGURE_ARGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ --enable-python CONFIGURE_ENV= SWIG="${LOCALBASE}/bin/swig3.0" GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_CXXSTD= c++11 USE_WX= 3.0+ USES= autoreconf libtool localbase compiler:gcc-c++11-lib \ iconv:wchar_t dos2unix python:2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -DESKTOP_ENTRIES= "SAGA GIS" "${COMMENT}" "${DATADIR}/saga.png" \ - "saga_gui" "Science;Geoscience;Math;" true INSTALLS_ICONS= yes DOS2UNIX_GLOB= *.cpp *.h PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= PGSQL OPENMP VIGRA OPTIONS_DEFAULT= PGSQL OPENMP VIGRA NO_OPTIONS_SORT= yes OPTIONS_SUB= yes OPENMP_DESC= Enable Multiprocessing VIGRA_DESC= Enable 'Vision with Generic Algorithms' Library OPENMP_CONFIGURE_ENABLE= openmp OPENMP_LDFLAGS= -pthread PGSQL_CONFIGURE_OFF= --with-postgresql=no PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE}/bin/pg_config PGSQL_USES= pgsql VIGRA_BUILD_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra VIGRA_RUN_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra .include 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/modules/garden/garden_3d_viewer/Makefile.am \ ${WRKSRC}/src/modules/garden/garden_webservices/Makefile.am \ ${WRKSRC}/src/modules/io/io_grid_image/Makefile.am \ ${WRKSRC}/src/modules/io/io_shapes/Makefile.am \ ${WRKSRC}/src/modules/io/io_virtual/Makefile.am \ ${WRKSRC}/src/modules/pointcloud/pointcloud_tools/Makefile.am \ ${WRKSRC}/src/modules/pointcloud/pointcloud_viewer/Makefile.am \ ${WRKSRC}/src/modules/tin/tin_viewer/Makefile.am \ ${WRKSRC}/src/modules/statistics/statistics_kriging/Makefile.am @${REINPLACE_CMD} -e 's|/usr/include/opencv|${LOCALBASE}/include/opencv ${LOCALBASE}/include|g' \ ${WRKSRC}/src/modules/imagery/imagery_opencv/Makefile.am post-patch: - @${REINPLACE_CMD} -e 's|wxString(SAGA_VERSION) + "\\n"|wxString(SAGA_VERSION) + " (SVN r2832)" + "\\n"|' \ + @${REINPLACE_CMD} -e 's|wxString(SAGA_VERSION) + "\\n"|wxString(SAGA_VERSION) + " (SVN r2877)" + "\\n"|' \ ${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp .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 post-configure: @${REINPLACE_CMD} -e 's|cd $$(pkgdatadir);|cd ${STAGEDIR}${DATADIR};|g' \ ${WRKSRC}/src/saga_core/saga_gui/Makefile - @${REINPLACE_CMD} -e 's|mv saga_srs.txt saga_prj.srs|mv ${STAGEDIR}${DATADIR}/saga_srs.txt ${STAGEDIR}${DATADIR}/saga_prj.srs|g' \ - ${WRKSRC}/src/saga_core/saga_gui/Makefile - @${REINPLACE_CMD} -e 's|mv saga_dic.txt saga_prj.dic|mv ${STAGEDIR}${DATADIR}/saga_dic.txt ${STAGEDIR}${DATADIR}/saga_prj.dic|g' \ - ${WRKSRC}/src/saga_core/saga_gui/Makefile @${REINPLACE_CMD} -e 's|^LDFLAGS = .*|& -lopencv_contrib|' \ ${WRKSRC}/src/modules/imagery/imagery_opencv/Makefile post-install: ${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga_tip.txt ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.lng.txt ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.ger.txt ${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) ${MKDIR} ${STAGEDIR}${DATADIR}/scripting (cd ${WRKSRC}/src/scripting && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripting) -# toolchains only needed in one place @${RM} -R ${STAGEDIR}${DATADIR}/scripting/toolchains ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.desktop \ ${STAGEDIR}${PREFIX}/share/applications/ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsaga_api-${PORTVERSION}.so @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_saga_api-${PORTVERSION}.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsaga_gdi-${PORTVERSION}.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/saga/*.so # library helper files are not needed and cripple some math/qgis extensions @${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.la .include Index: head/math/saga/distinfo =================================================================== --- head/math/saga/distinfo (revision 412496) +++ head/math/saga/distinfo (revision 412497) @@ -1,2 +1,2 @@ -SHA256 (saga-2.2.4.tar.gz) = efdcb86ce3dcde1b21da2b2d4863b32196bd423588c76d4d5ec301cc93b34582 -SIZE (saga-2.2.4.tar.gz) = 4266724 +SHA256 (saga_2.2.6.tar.gz) = 159fc611b06d13fa446868fa0bf6e8e9c42a83d947428ba2616ff9e4462b4399 +SIZE (saga_2.2.6.tar.gz) = 4238581 Index: head/math/saga/pkg-plist =================================================================== --- head/math/saga/pkg-plist (revision 412496) +++ head/math/saga/pkg-plist (revision 412497) @@ -1,168 +1,180 @@ bin/saga_cmd bin/saga_gui include/saga/saga_core/saga_api/api_core.h include/saga/saga_core/saga_api/compatibility.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/mat_tools.h include/saga/saga_core/saga_api/metadata.h include/saga/saga_core/saga_api/module.h include/saga/saga_core/saga_api/module_library.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_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_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 lib/libsaga_api-%%PORTVERSION%%.so lib/libsaga_api.so lib/libsaga_gdi-%%PORTVERSION%%.so lib/libsaga_gdi.so %%PYTHON_SITELIBDIR%%/_saga_api-%%PORTVERSION%%.so %%PYTHON_SITELIBDIR%%/_saga_api.a %%PYTHON_SITELIBDIR%%/_saga_api.so %%PYTHON_SITELIBDIR%%/saga_api.py %%PYTHON_SITELIBDIR%%/saga_api.pyc %%PYTHON_SITELIBDIR%%/saga_api.pyo 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/libimagery_classification.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_grib2.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/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_cellular_automata.so lib/saga/libsim_ecosystems_hugget.so lib/saga/libsim_erosion.so lib/saga/libsim_fire_spreading.so lib/saga/libsim_hydrology.so lib/saga/libsim_ihacres.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_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/appdata/saga.appdata.xml 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/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/pixmaps/saga.png @mode 0777 @dir %%DATADIR%% @mode 0666 +%%DATADIR%%/saga.bra.txt %%DATADIR%%/saga.ger.txt %%DATADIR%%/saga.lng.txt @mode %%DATADIR%%/saga.png %%DATADIR%%/saga_prj.dic %%DATADIR%%/saga_prj.srs %%DATADIR%%/saga_tip.txt %%DATADIR%%/scripting/helper/make_arcsaga_toolboxes.bat %%DATADIR%%/scripting/helper/make_saga_release.bat %%DATADIR%%/scripting/helper/make_saga_snapshot.bat %%DATADIR%%/scripting/helper/make_tools_interface.bat %%DATADIR%%/scripting/helper/make_translation_files.bat %%DATADIR%%/scripting/python/examples/00_grid_create_dummy.py %%DATADIR%%/scripting/python/examples/01_grid_asc_to_saga.py %%DATADIR%%/scripting/python/examples/02_grid_morphometry.py %%DATADIR%%/scripting/python/examples/03_grid_difference.py %%DATADIR%%/scripting/python/examples/04_grid_contour.py %%DATADIR%%/scripting/python/examples/05_shp2xyz.py %%DATADIR%%/scripting/python/examples/06_xyz2shp.py %%DATADIR%%/scripting/python/helpers/print_version.py %%DATADIR%%/scripting/python/helpers/saga_cmd_param_interface/environment.py %%DATADIR%%/scripting/python/helpers/saga_cmd_param_interface/param_interface.py %%DATADIR%%/scripting/python/helpers/saga_cmd_param_interface/tools.py %%DATADIR%%/scripting/python/saga_python_api.txt %%DATADIR%%/scripting/python/test_data/test.mgrd %%DATADIR%%/scripting/python/test_data/test.sdat %%DATADIR%%/scripting/python/test_data/test.sgrd %%DATADIR%%/scripting/python/test_data/test_ascii.asc %%DATADIR%%/scripting/python/test_data/test_pts.dbf %%DATADIR%%/scripting/python/test_data/test_pts.mshp %%DATADIR%%/scripting/python/test_data/test_pts.shp %%DATADIR%%/scripting/python/test_data/test_pts.shx %%DATADIR%%/scripting/python/test_data/test_pts_xyz.xyz %%DATADIR%%/toolchains/climate.xml %%DATADIR%%/toolchains/cluster_terrain.xml %%DATADIR%%/toolchains/gridding.xml %%DATADIR%%/toolchains/imagery.xml %%DATADIR%%/toolchains/imagery_lczc.xml %%DATADIR%%/toolchains/obia.xml %%DATADIR%%/toolchains/points_to_contour.xml %%DATADIR%%/toolchains/sieve_and_clump.xml %%DATADIR%%/toolchains/temperature_downscaling.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