From owner-svn-ports-all@freebsd.org Mon Dec 11 13:03:00 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C37E0E914C8; Mon, 11 Dec 2017 13:03:00 +0000 (UTC) (envelope-from bhughes@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9B56A6436B; Mon, 11 Dec 2017 13:03:00 +0000 (UTC) (envelope-from bhughes@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBBD2xw9046429; Mon, 11 Dec 2017 13:02:59 GMT (envelope-from bhughes@FreeBSD.org) Received: (from bhughes@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBBD2xT9046424; Mon, 11 Dec 2017 13:02:59 GMT (envelope-from bhughes@FreeBSD.org) Message-Id: <201712111302.vBBD2xT9046424@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bhughes set sender to bhughes@FreeBSD.org using -f From: "Bradley T. Hughes" Date: Mon, 11 Dec 2017 13:02:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456027 - in head/math/saga: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bhughes X-SVN-Commit-Paths: in head/math/saga: . files X-SVN-Commit-Revision: 456027 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Dec 2017 13:03:00 -0000 Author: bhughes Date: Mon Dec 11 13:02:58 2017 New Revision: 456027 URL: https://svnweb.freebsd.org/changeset/ports/456027 Log: math/saga: Update 4.1.0 -> 6.1.0 PR: 223890 Submitted by: Rainer Hurling (maintainer) Approved by: robak (mentor) Differential Revision: https://reviews.freebsd.org/D13436 Added: head/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp (contents, props changed) head/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h (contents, props changed) Modified: head/math/saga/Makefile head/math/saga/distinfo head/math/saga/pkg-plist Modified: head/math/saga/Makefile ============================================================================== --- head/math/saga/Makefile Mon Dec 11 12:41:56 2017 (r456026) +++ head/math/saga/Makefile Mon Dec 11 13:02:58 2017 (r456027) @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= saga -PORTVERSION= 4.1.0 -PORTREVISION= 2 +PORTVERSION= 6.1.0 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} -#DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= rhurlin@gwdg.de COMMENT= System for Automated Geoscientific Analyses @@ -21,23 +19,23 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \ libjasper.so:graphics/jasper \ liblas.so:devel/liblas12 \ libodbc.so:databases/unixODBC \ - libopencv_ml.so:graphics/opencv \ libopencv_core.so:graphics/opencv-core \ + libopencv_ml.so:graphics/opencv \ libproj.so:graphics/proj \ libsvm.so:science/libsvm \ libtbb.so:devel/tbb \ libtiff.so:graphics/tiff RUN_DEPENDS:= ${BUILD_DEPENDS} +USES= autoreconf compiler:gcc-c++11-lib desktop-file-utils dos2unix \ + iconv:wchar_t libtool localbase pkgconfig python:2 +USE_LDCONFIG= yes +USE_CXXSTD= c++11 +USE_WX= 3.0+ CONFIGURE_ARGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ - --enable-python + --enable-python --with-system-svm CONFIGURE_ENV= SWIG="${LOCALBASE}/bin/swig3.0" GNU_CONFIGURE= yes -USE_LDCONFIG= yes -USE_CXXSTD= c++11 -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 Modified: head/math/saga/distinfo ============================================================================== --- head/math/saga/distinfo Mon Dec 11 12:41:56 2017 (r456026) +++ head/math/saga/distinfo Mon Dec 11 13:02:58 2017 (r456027) @@ -1,3 +1,3 @@ -TIMESTAMP = 1497487742 -SHA256 (saga-4.1.0.tar.gz) = e62651e862ff73d2e9e25d0d2b14aab59eb3cad3b7012af51431d10615c45c29 -SIZE (saga-4.1.0.tar.gz) = 4490330 +TIMESTAMP = 1511371377 +SHA256 (saga-6.1.0.tar.gz) = da5767d339c3a2cd9d5905a66251e44b8be7325aa10b673db7ea55a8d4bffe6e +SIZE (saga-6.1.0.tar.gz) = 4574237 Added: head/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp Mon Dec 11 13:02:58 2017 (r456027) @@ -0,0 +1,11 @@ +--- src/tools/imagery/imagery_svm/MLB_Interface.cpp.orig 2017-01-29 14:18:09 UTC ++++ src/tools/imagery/imagery_svm/MLB_Interface.cpp +@@ -62,7 +62,7 @@ + #include "MLB_Interface.h" + + #if defined(SYSTEM_SVM) +-#include ++#include + #else + #include "svm/svm.h" + #endif Added: head/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h Mon Dec 11 13:02:58 2017 (r456027) @@ -0,0 +1,11 @@ +--- src/tools/imagery/imagery_svm/svm_grids.h.orig 2017-01-29 14:18:09 UTC ++++ src/tools/imagery/imagery_svm/svm_grids.h +@@ -73,7 +73,7 @@ + #include "MLB_Interface.h" + + #if defined(SYSTEM_SVM) +-#include ++#include + #else + #include "svm/svm.h" + #endif Modified: head/math/saga/pkg-plist ============================================================================== --- head/math/saga/pkg-plist Mon Dec 11 12:41:56 2017 (r456026) +++ head/math/saga/pkg-plist Mon Dec 11 13:02:58 2017 (r456027) @@ -1,13 +1,13 @@ 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/grids.h include/saga/saga_core/saga_api/mat_tools.h include/saga/saga_core/saga_api/metadata.h include/saga/saga_core/saga_api/parameters.h @@ -56,6 +56,7 @@ 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_maxent.so lib/saga/libimagery_opencv.so @@ -91,6 +92,7 @@ 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 @@ -127,6 +129,9 @@ 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%%/accessories/CMakeLists.txt %%DATADIR%%/accessories/helper/make_arcsaga_toolboxes.bat %%DATADIR%%/accessories/helper/make_saga_release.bat @@ -169,9 +174,6 @@ share/pixmaps/saga.png %%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 %%DATADIR%%/saga.bra.txt %%DATADIR%%/saga.ger.txt %%DATADIR%%/saga.lng.txt @@ -182,7 +184,11 @@ share/pixmaps/saga.png %%DATADIR%%/saga_tip.txt %%DATADIR%%/toolchains/climate.xml %%DATADIR%%/toolchains/cluster_terrain.xml +%%DATADIR%%/toolchains/gc_simple_filter.xml +%%DATADIR%%/toolchains/gc_tools.xml +%%DATADIR%%/toolchains/grid_filter.xml %%DATADIR%%/toolchains/grid_list_simple_filter.xml +%%DATADIR%%/toolchains/grid_notch_filter.xml %%DATADIR%%/toolchains/gridding.xml %%DATADIR%%/toolchains/group_files.xml %%DATADIR%%/toolchains/imagery.xml