Index: head/math/saga/pkg-message =================================================================== --- head/math/saga/pkg-message (revision 399239) +++ head/math/saga/pkg-message (nonexistent) @@ -1,31 +0,0 @@ - -###################################################################### - -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. - -###################################################################### - -Since version 2.1.0 it is not necessary any more, to use a leading -"lib" for module library names on Unix-like systems. Now you will have -to alter back your scripts by removing "lib" from the name (like it is -on MS Windows). - -e.g.: - saga_cmd ta_morphometry instead of saga_cmd libta_morphometry - -###################################################################### Property changes on: head/math/saga/pkg-message ___________________________________________________________________ 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/Makefile =================================================================== --- head/math/saga/Makefile (revision 399239) +++ head/math/saga/Makefile (revision 399240) @@ -1,115 +1,117 @@ # Created by: Rainer Hurling # $FreeBSD$ PORTNAME= saga -PORTVERSION= 2.2.0 -PORTREVISION= 1 +PORTVERSION= 2.2.1 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" -CFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -lopencv_contrib +LDFLAGS+= -lopencv_contrib USE_LDCONFIG= yes USE_CXXSTD= c++11 USE_WX= 3.0+ -USES= autoreconf compiler:gcc-c++11-lib iconv:wchar_t dos2unix libtool python:2 +USES= autoreconf libtool localbase compiler:gcc-c++11-lib \ + iconv:wchar_t dos2unix python:2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -WX_UNICODE= yes 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_LIB_DEPENDS= libpq.so:${PORTSDIR}/databases/postgresql93-client 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/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 r2537)" + "\\n"|' \ + @${REINPLACE_CMD} -e 's|wxString(SAGA_VERSION) + "\\n"|wxString(SAGA_VERSION) + " (SVN r2600)" + "\\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} + ${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) ${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 399239) +++ head/math/saga/distinfo (revision 399240) @@ -1,2 +1,2 @@ -SHA256 (saga_2.2.0.tar.gz) = 50b2e642331c817606bc954302e53757c4ffa6f6d6f468e12caeaaa7a182edaf -SIZE (saga_2.2.0.tar.gz) = 3914509 +SHA256 (saga_2.2.1.tar.gz) = 325e0890c28dc19c4ec727f58672be67480b2a4dd6604252c0cc4cc08aad34d0 +SIZE (saga_2.2.1.tar.gz) = 4007209 Index: head/math/saga/files/patch-src_modules_imagery_imagery__opencv_opencv__nnet.cpp =================================================================== --- head/math/saga/files/patch-src_modules_imagery_imagery__opencv_opencv__nnet.cpp (revision 399239) +++ head/math/saga/files/patch-src_modules_imagery_imagery__opencv_opencv__nnet.cpp (nonexistent) @@ -1,13 +0,0 @@ ---- src/modules/imagery/imagery_opencv/opencv_nnet.cpp.orig 2015-02-26 07:51:59 UTC -+++ src/modules/imagery/imagery_opencv/opencv_nnet.cpp -@@ -60,8 +60,8 @@ - - //--------------------------------------------------------- - #include "opencv_nnet.h" --#include "opencv\cxcore.h" --#include "opencv\ml.h" -+#include -+#include - - /////////////////////////////////////////////////////////// - // // Property changes on: head/math/saga/files/patch-src_modules_imagery_imagery__opencv_opencv__nnet.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_modules_imagery_imagery__opencv_opencv__nnet.h =================================================================== --- head/math/saga/files/patch-src_modules_imagery_imagery__opencv_opencv__nnet.h (revision 399239) +++ head/math/saga/files/patch-src_modules_imagery_imagery__opencv_opencv__nnet.h (nonexistent) @@ -1,13 +0,0 @@ ---- src/modules/imagery/imagery_opencv/opencv_nnet.h.orig 2015-02-26 07:51:59 UTC -+++ src/modules/imagery/imagery_opencv/opencv_nnet.h -@@ -64,8 +64,8 @@ - - //--------------------------------------------------------- - #include "MLB_Interface.h" --#include "opencv\cxcore.h" --#include "opencv\ml.h" -+#include -+#include - - /////////////////////////////////////////////////////////// - // // Property changes on: head/math/saga/files/patch-src_modules_imagery_imagery__opencv_opencv__nnet.h ___________________________________________________________________ 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/pkg-message.in =================================================================== --- head/math/saga/files/pkg-message.in (nonexistent) +++ head/math/saga/files/pkg-message.in (revision 399240) @@ -0,0 +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/ + +Python scripts with examples, helpers and test data reside at + %%DATADIR%%/scripting/python/ + +###################################################################### + Property changes on: head/math/saga/files/pkg-message.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/saga/pkg-plist =================================================================== --- head/math/saga/pkg-plist (revision 399239) +++ head/math/saga/pkg-plist (revision 399240) @@ -1,123 +1,156 @@ 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_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 -%%DATADIR%%/saga_tip.txt @mode %%DATADIR%%/saga.png %%DATADIR%%/saga_prj.dic %%DATADIR%%/saga_prj.srs +%%DATADIR%%/saga_tip.txt +%%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/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