Date: Mon, 23 Jan 2017 23:30:20 +0000 (UTC) From: Wen Heping <wen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432306 - in head/math/saga: . files Message-ID: <201701232330.v0NNUKNu083108@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wen Date: Mon Jan 23 23:30:20 2017 New Revision: 432306 URL: https://svnweb.freebsd.org/changeset/ports/432306 Log: - Update from 2.3.1 to 3.0.0 - Add dependency science/libsvm - Add USES=pkgconfig - Sort USES alphabetical - INSTALL_TARGET=install-strip PR: 216367 Submitted by: rhurlin@gwdg.de(maintainer) Added: head/math/saga/files/patch-configure.ac (contents, props changed) head/math/saga/files/patch-src_tools_imagery_imagery__opencv_opencv.h (contents, props changed) Deleted: head/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv.h Modified: head/math/saga/Makefile head/math/saga/distinfo head/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp head/math/saga/files/pkg-message.in head/math/saga/pkg-plist Modified: head/math/saga/Makefile ============================================================================== --- head/math/saga/Makefile Mon Jan 23 23:01:39 2017 (r432305) +++ head/math/saga/Makefile Mon Jan 23 23:30:20 2017 (r432306) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= saga -PORTVERSION= 2.3.1 -PORTREVISION= 4 +PORTVERSION= 3.0.0 CATEGORIES= math -MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION} +MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= rhurlin@gwdg.de @@ -24,6 +23,7 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \ libopencv_ml.so:graphics/opencv2 \ libopencv_core.so:graphics/opencv2-core \ libproj.so:graphics/proj \ + libsvm.so:science/libsvm \ libtbb.so:devel/tbb \ libtiff.so:graphics/tiff RUN_DEPENDS:= ${BUILD_DEPENDS} @@ -34,9 +34,9 @@ CONFIGURE_ENV= SWIG="${LOCALBASE}/bin/sw 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 +USE_WX= 3.0 +USES= autoreconf desktop-file-utils libtool localbase compiler:gcc-c++11-lib \ + iconv:wchar_t dos2unix pkgconfig python:2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} INSTALLS_ICONS= yes @@ -58,6 +58,8 @@ 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 <bsd.port.pre.mk> SUB_FILES= pkg-message @@ -69,31 +71,31 @@ post-extract: ${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 + ${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/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 @${REINPLACE_CMD} -e 's|/usr/include/opencv|${LOCALBASE}/include/opencv ${LOCALBASE}/include|g' \ - ${WRKSRC}/src/modules/imagery/imagery_opencv/Makefile.am + ${WRKSRC}/src/tools/imagery/imagery_opencv/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:C/\./-/g}|' \ + @${REINPLACE_CMD} -e 's|PORTVERSION|${PORTVERSION}|' \ ${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp post-configure: @${REINPLACE_CMD} -e 's|cd $$(pkgdatadir);|cd ${STAGEDIR}${DATADIR};|g' \ ${WRKSRC}/src/saga_core/saga_gui/Makefile @${REINPLACE_CMD} -e 's|^LDFLAGS = .*|& -lopencv_contrib|' \ - ${WRKSRC}/src/modules/imagery/imagery_opencv/Makefile + ${WRKSRC}/src/tools/imagery/imagery_opencv/Makefile post-install: ${MKDIR} ${STAGEDIR}${DATADIR} @@ -101,15 +103,11 @@ post-install: ${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) - @${RM} -R ${STAGEDIR}${DATADIR}/scripting/toolchains + ${MKDIR} ${STAGEDIR}${DATADIR}/accessories + (cd ${WRKSRC}/src/accessories && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/accessories) + ${RM} -R ${STAGEDIR}${DATADIR}/accessories/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 Modified: head/math/saga/distinfo ============================================================================== --- head/math/saga/distinfo Mon Jan 23 23:01:39 2017 (r432305) +++ head/math/saga/distinfo Mon Jan 23 23:30:20 2017 (r432306) @@ -1,3 +1,3 @@ -TIMESTAMP = 1468057142 -SHA256 (saga_2.3.1.tar.gz) = 58f5c183f839ef753261a7a83c902ba9d67f814c5f21172aae02fcd4a29b9fc0 -SIZE (saga_2.3.1.tar.gz) = 4290583 +TIMESTAMP = 1485032140 +SHA256 (saga_3.0.0.tar.gz) = fa8b8f5f95705bfa72f6969a23e75195f2d939f835b7243f8dcb9f780df3627f +SIZE (saga_3.0.0.tar.gz) = 4313979 Added: head/math/saga/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/saga/files/patch-configure.ac Mon Jan 23 23:30:20 2017 (r432306) @@ -0,0 +1,12 @@ +--- configure.ac.orig 2016-08-23 13:23:41 UTC ++++ configure.ac +@@ -26,7 +26,7 @@ AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOU + AC_CHECK_LIB([proj], [pj_is_latlong], PROJFOUND=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_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) + + Modified: head/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp ============================================================================== --- head/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp Mon Jan 23 23:01:39 2017 (r432305) +++ head/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp Mon Jan 23 23:30:20 2017 (r432306) @@ -1,4 +1,4 @@ ---- src/saga_core/saga_cmd/saga_cmd.cpp.orig 2015-12-21 09:38:29 UTC +--- src/saga_core/saga_cmd/saga_cmd.cpp.orig 2016-06-29 05:55:46 UTC +++ src/saga_core/saga_cmd/saga_cmd.cpp @@ -65,6 +65,7 @@ Added: head/math/saga/files/patch-src_tools_imagery_imagery__opencv_opencv.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/saga/files/patch-src_tools_imagery_imagery__opencv_opencv.h Mon Jan 23 23:30:20 2017 (r432306) @@ -0,0 +1,12 @@ +--- src/tools/imagery/imagery_opencv/opencv.h.orig 2016-06-29 05:55:46 UTC ++++ src/tools/imagery/imagery_opencv/opencv.h +@@ -74,7 +74,8 @@ + + //--------------------------------------------------------- + #include <opencv/cv.h> +- ++#include <opencv2/core/core_c.h> ++#include <opencv2/imgproc/imgproc_c.h> + + /////////////////////////////////////////////////////////// + // // Modified: head/math/saga/files/pkg-message.in ============================================================================== --- head/math/saga/files/pkg-message.in Mon Jan 23 23:01:39 2017 (r432305) +++ head/math/saga/files/pkg-message.in Mon Jan 23 23:30:20 2017 (r432306) @@ -10,7 +10,7 @@ this permanently by adding the following or by defining it temporarily on the command line before executing SAGA CMD: - export SAGA_MLB=/yourPathToSAGA_modules + export SAGA_MLB=/yourPathToSAGA_tools e.g.: export SAGA_MLB=%%PREFIX%%/lib/saga @@ -26,7 +26,7 @@ Predefined ToolChains are located at %%DATADIR%%/toolchains/ Python scripts with examples, helpers and test data reside at - %%DATADIR%%/scripting/python/ + %%DATADIR%%/accessories/python/ ###################################################################### Modified: head/math/saga/pkg-plist ============================================================================== --- head/math/saga/pkg-plist Mon Jan 23 23:01:39 2017 (r432305) +++ head/math/saga/pkg-plist Mon Jan 23 23:30:20 2017 (r432306) @@ -10,8 +10,6 @@ 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 @@ -20,6 +18,8 @@ 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 @@ -36,7 +36,7 @@ lib/libsaga_gdi.so %%PYTHON_SITELIBDIR%%/_saga_api.so %%PYTHON_SITELIBDIR%%/saga_api.py %%PYTHON_SITELIBDIR%%/saga_api.pyc -%%PYTHON_SITELIBDIR%%/saga_api.pyo +%%PYTHON_SITELIBDIR%%/saga_api.%%PYTHON_PYOEXTENSION%% lib/saga/libclimate_tools.so lib/saga/libcontrib_perego.so lib/saga/libdb_odbc.so @@ -57,7 +57,6 @@ lib/saga/libgrid_spline.so lib/saga/libgrid_tools.so lib/saga/libgrid_visualisation.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 @@ -127,6 +126,47 @@ 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 +%%DATADIR%%/accessories/helper/make_arcsaga_toolboxes.bat +%%DATADIR%%/accessories/helper/make_saga_release.bat +%%DATADIR%%/accessories/helper/make_saga_snapshot.bat +%%DATADIR%%/accessories/helper/make_tools_interface.bat +%%DATADIR%%/accessories/helper/make_translation_files.bat +%%DATADIR%%/accessories/python/examples/00_grid_create_dummy.py +%%DATADIR%%/accessories/python/examples/01_grid_asc_to_saga.py +%%DATADIR%%/accessories/python/examples/02_grid_morphometry.py +%%DATADIR%%/accessories/python/examples/03_grid_difference.py +%%DATADIR%%/accessories/python/examples/04_grid_contour.py +%%DATADIR%%/accessories/python/examples/05_shp2xyz.py +%%DATADIR%%/accessories/python/examples/06_xyz2shp.py +%%DATADIR%%/accessories/python/helpers/print_version.py +%%DATADIR%%/accessories/python/helpers/saga_cmd_param_interface/environment.py +%%DATADIR%%/accessories/python/helpers/saga_cmd_param_interface/param_interface.py +%%DATADIR%%/accessories/python/helpers/saga_cmd_param_interface/tools.py +%%DATADIR%%/accessories/python/saga_python_api.txt +%%DATADIR%%/accessories/python/test_data/test.mgrd +%%DATADIR%%/accessories/python/test_data/test.sdat +%%DATADIR%%/accessories/python/test_data/test.sgrd +%%DATADIR%%/accessories/python/test_data/test_ascii.asc +%%DATADIR%%/accessories/python/test_data/test_pts.dbf +%%DATADIR%%/accessories/python/test_data/test_pts.mshp +%%DATADIR%%/accessories/python/test_data/test_pts.shp +%%DATADIR%%/accessories/python/test_data/test_pts.shx +%%DATADIR%%/accessories/python/test_data/test_pts_xyz.xyz +%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/Makefile +%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/Makefile.am +%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/TLB_Interface.cpp +%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/TLB_Interface.h +%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool.cpp +%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool.h +%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool_library.cbp +%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool_library.layout +%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool_library_link2bin.vcxproj +%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool_library_link2bin.vcxproj.filters +%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool_library_link2src.vcxproj +%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool_library_link2src.vcxproj.filters +%%DATADIR%%/accessories/templates/template4saga-tools/my_tools_link2bin.vc10.sln +%%DATADIR%%/accessories/templates/template4saga-tools/my_tools_link2src.vc10.sln +%%DATADIR%%/accessories/templates/template4saga-tools/readme.txt @mode 0777 @dir %%DATADIR%% @mode 0666 @@ -138,32 +178,6 @@ share/pixmaps/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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701232330.v0NNUKNu083108>