Page MenuHomeFreeBSD
Files F108636374

D13436.id36453.diff
No OneTemporary
Actions

D13436.id36453.diff
View Options

Index: head/math/saga/Makefile
===================================================================
--- head/math/saga/Makefile
+++ head/math/saga/Makefile
@@ -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 @@
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
Index: head/math/saga/distinfo
===================================================================
--- head/math/saga/distinfo
+++ head/math/saga/distinfo
@@ -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
Index: head/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp
===================================================================
--- head/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp
+++ head/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp
@@ -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 <libsvm/svm.h>
++#include <svm.h>
+ #else
+ #include "svm/svm.h"
+ #endif
Index: head/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h
===================================================================
--- head/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h
+++ head/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h
@@ -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 <libsvm/svm.h>
++#include <svm.h>
+ #else
+ #include "svm/svm.h"
+ #endif
Index: head/math/saga/pkg-plist
===================================================================
--- head/math/saga/pkg-plist
+++ head/math/saga/pkg-plist
@@ -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_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_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/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 @@
%%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 @@
%%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

File Metadata

Mime Type
text/plain
Expires
Tue, Jan 28, 12:43 AM (9 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16228372
Default Alt Text
D13436.id36453.diff (5 KB)

Event Timeline