Index: head/math/saga/Makefile =================================================================== --- head/math/saga/Makefile (revision 410033) +++ head/math/saga/Makefile (revision 410034) @@ -1,118 +1,115 @@ # Created by: Rainer Hurling # $FreeBSD$ PORTNAME= saga -PORTVERSION= 2.2.3 +PORTVERSION= 2.2.4 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:${PORTSDIR}/devel/swig30 LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj \ libgdal.so:${PORTSDIR}/graphics/gdal \ libhpdf.so:${PORTSDIR}/print/libharu \ libjasper.so:${PORTSDIR}/graphics/jasper \ libtiff.so:${PORTSDIR}/graphics/tiff \ libodbc.so:${PORTSDIR}/databases/unixODBC \ liblas.so:${PORTSDIR}/devel/liblas12 \ libopencv_ml.so:${PORTSDIR}/graphics/opencv RUN_DEPENDS:= ${BUILD_DEPENDS} CONFIGURE_ARGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ --enable-python CONFIGURE_ENV= SWIG="${LOCALBASE}/bin/swig3.0" GNU_CONFIGURE= yes LDFLAGS+= -lopencv_contrib 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:${PORTSDIR}/graphics/vigra VIGRA_RUN_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/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 post-patch: - @${REINPLACE_CMD} -e 's|-lcv|-lopencv_core -lopencv_imgproc|g' \ - ${WRKSRC}/src/modules/imagery/imagery_opencv/Makefile.am - @${REINPLACE_CMD} -e 's|\[cv\]|\[opencv_core\]|' \ - ${WRKSRC}/configure.ac - @${REINPLACE_CMD} -e 's|wxString(SAGA_VERSION) + "\\n"|wxString(SAGA_VERSION) + " (SVN r2737)" + "\\n"|' \ + @${REINPLACE_CMD} -e 's|wxString(SAGA_VERSION) + "\\n"|wxString(SAGA_VERSION) + " (SVN r2832)" + "\\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 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.png ${STAGEDIR}${DATADIR} ${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 410033) +++ head/math/saga/distinfo (revision 410034) @@ -1,2 +1,2 @@ -SHA256 (saga_2.2.3.tar.gz) = f26591c097c8766df9db266bf50e1b38a5bebe0119b44a9b70ae793d0d8bade3 -SIZE (saga_2.2.3.tar.gz) = 4075266 +SHA256 (saga-2.2.4.tar.gz) = efdcb86ce3dcde1b21da2b2d4863b32196bd423588c76d4d5ec301cc93b34582 +SIZE (saga-2.2.4.tar.gz) = 4266724 Index: head/math/saga/files/patch-src_saga__core_saga__api_table.cpp =================================================================== --- head/math/saga/files/patch-src_saga__core_saga__api_table.cpp (revision 410033) +++ head/math/saga/files/patch-src_saga__core_saga__api_table.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/saga_core/saga_api/table.cpp.orig 2015-12-21 09:38:29 UTC -+++ src/saga_core/saga_api/table.cpp -@@ -175,7 +175,7 @@ bool CSG_Table::Create(const CSG_String - SG_UI_Msg_Add(CSG_String::Format("%s: %s...", _TL("Load table"), File_Name.c_str()), true); - - //----------------------------------------------------- -- bool bResult = File_Name.BeforeFirst(':').Cmp("PGSQL") && SG_File_Exists(File_Name) && Load(File_Name, (int)Format, NULL); -+ bool bResult = File_Name.BeforeFirst(':').Cmp("PGSQL") && SG_File_Exists(File_Name) && Load(File_Name, (int)Format, '\0'); - - if( bResult ) - { Property changes on: head/math/saga/files/patch-src_saga__core_saga__api_table.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/saga/files/patch-src_saga__core_saga__api_table__io.cpp =================================================================== --- head/math/saga/files/patch-src_saga__core_saga__api_table__io.cpp (revision 410033) +++ head/math/saga/files/patch-src_saga__core_saga__api_table__io.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/saga_core/saga_api/table_io.cpp.orig 2015-12-21 09:38:29 UTC -+++ src/saga_core/saga_api/table_io.cpp -@@ -118,7 +118,7 @@ bool CSG_Table::Load(const CSG_String &F - //--------------------------------------------------------- - bool CSG_Table::Save(const CSG_String &File_Name, int Format) - { -- return( Save(File_Name, Format, NULL) ); -+ return( Save(File_Name, Format, '\0') ); - } - - //--------------------------------------------------------- Property changes on: head/math/saga/files/patch-src_saga__core_saga__api_table__io.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp =================================================================== --- head/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp (revision 410033) +++ head/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp (revision 410034) @@ -1,42 +1,29 @@ ---- src/saga_core/saga_gui/dlg_about.cpp.orig 2015-12-21 09:38:29 UTC +--- src/saga_core/saga_gui/dlg_about.cpp.orig 2016-02-28 15:31:41 UTC +++ src/saga_core/saga_gui/dlg_about.cpp -@@ -65,6 +65,7 @@ - #include - - #include -+#include - - #include "helper.h" - -@@ -188,7 +189,7 @@ wxString CDLG_About::_Get_Version(void) - s += "System for Automated Geoscientific Analyses\n"; - s += "http://www.saga-gis.org\n"; - s += "\n"; -- s += "Version: " + wxString(SAGA_VERSION) + "\n"; -+ s += "Version: " + wxString(SAGA_VERSION) + " (SVN r2737)" + "\n"; - - #ifdef _SAGA_MSW - #ifdef _WIN64 -@@ -264,7 +265,21 @@ wxString CDLG_About::_Get_Version(void) +@@ -264,7 +264,25 @@ wxString CDLG_About::_Get_Version(void) #elif defined(__GNUWIN32__) "Gnu-Win32 compiler" #elif defined(__GNUG__) - "Gnu C++" -+ #if wxCHECK_GCC_VERSION(5,1) ++ #if wxCHECK_GCC_VERSION(5,3) ++ "Gnu C++ 5.3" ++ #elif wxCHECK_GCC_VERSION(5,2) ++ "Gnu C++ 5.2" ++ #elif wxCHECK_GCC_VERSION(5,1) + "Gnu C++ 5.1" -+ #elif wxCHECK_GCC_VERSION(5,0) ++ #elif wxCHECK_GCC_VERSION(5,0) + "Gnu C++ 5.0" + #elif wxCHECK_GCC_VERSION(4,9) + "Gnu C++ 4.9" + #elif wxCHECK_GCC_VERSION(4,8) + "Gnu C++ 4.8" -+ #elif wxCHECK_GCC_VERSION(4,7) ++ #elif wxCHECK_GCC_VERSION(4,7) + "Gnu C++ 4.7" + #elif wxCHECK_GCC_VERSION(4,6) + "Gnu C++ 4.6" + #else + "Gnu C++" + #endif #elif defined(__VISUALC__) // The value of this macro corresponds to the compiler version: 1020 for 4.2 (the first supported version), 1100 for 5.0, 1200 for 6.0 and so on #if __VISUALC__ == 1020 "Microsoft Visual C++ 4.2" Index: head/math/saga/files/pkg-message.in =================================================================== --- head/math/saga/files/pkg-message.in (revision 410033) +++ head/math/saga/files/pkg-message.in (revision 410034) @@ -1,32 +1,32 @@ ###################################################################### Unlike to windows systems, saga_cmd should be instantly available in the shell as it is usually installed in %%PREFIX%%/bin. Next you have to set the environmental variable SAGA_MLB to make SAGA know where the SAGA module libraries exist on your system. You can do this permanently by adding the following command to your .bashrc file or by defining it temporarily on the command line before executing SAGA CMD: export SAGA_MLB=/yourPathToSAGA_modules e.g.: export SAGA_MLB=%%PREFIX%%/lib/saga Now your system is prepared for using SAGA CMD to execute SAGA modules. ###################################################################### From SAGA GIS 2.2.0 on, there is some example and test data installed. Predefined ToolChains are located at - %%DATADIR%%/scripting/toolchains/ + %%DATADIR%%/toolchains/ Python scripts with examples, helpers and test data reside at %%DATADIR%%/scripting/python/ ###################################################################### Index: head/math/saga/pkg-plist =================================================================== --- head/math/saga/pkg-plist (revision 410033) +++ head/math/saga/pkg-plist (revision 410034) @@ -1,163 +1,168 @@ 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/pixmaps/saga.png @mode 0777 @dir %%DATADIR%% @mode 0666 %%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%%/scripting/toolchains/cluster_terrain.xml -%%DATADIR%%/scripting/toolchains/gridding.xml -%%DATADIR%%/scripting/toolchains/imagery_lczc.xml -%%DATADIR%%/scripting/toolchains/obia.xml -%%DATADIR%%/scripting/toolchains/points_to_contour.xml -%%DATADIR%%/scripting/toolchains/sieve_and_clump.xml -%%DATADIR%%/scripting/toolchains/temperature_downscaling.xml -%%DATADIR%%/scripting/toolchains/terrain_analysis.xml -%%DATADIR%%/scripting/toolchains/terrain_segmentation.xml -%%DATADIR%%/scripting/toolchains/twi.xml -%%DATADIR%%/scripting/toolchains/upslope_height.xml +%%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