math/saga: Update to 7.1.1

PR:		234522
Submitted by:	Rainer Hurling <rhurlin@gwdg.de> (maintainer)

4 files changed, 18 insertions, 13 deletions

diff --git a/math/saga/Makefile b/math/saga/Makefile
index 15b5168ebd5a..91d40125a3be 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	saga
-PORTVERSION=	7.0.0
+PORTVERSION=	7.1.1
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}
 
@@ -12,7 +12,7 @@ COMMENT=	System for Automated Geoscientific Analyses
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	clang60:devel/llvm60 \
+BUILD_DEPENDS=	clang70:devel/llvm70 \
 		swig3.0:devel/swig30
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libfftw3.so:math/fftw3 \
@@ -33,10 +33,12 @@ USES=		autoreconf compiler:c++11-lib desktop-file-utils dos2unix \
 		iconv:wchar_t libtool localbase pkgconfig python:2.7
 USE_LDCONFIG=	yes
 USE_WX=		3.0+
+
 CONFIGURE_ARGS=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		--enable-python --with-system-svm
 CONFIGURE_ENV=	SWIG="${LOCALBASE}/bin/swig3.0"
 GNU_CONFIGURE=	yes
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 INSTALLS_ICONS=	yes
@@ -54,8 +56,8 @@ VIGRA_DESC=	Enable 'Vision with Generic Algorithms' Library
 
 OPENMP_CONFIGURE_ENABLE=	openmp
 OPENMP_LDFLAGS=		-L${LOCALBASE}/lib -lm
-# Use OpenMP from lang/llvm60
-OPENMP_LDFLAGS+=	-L${LOCALBASE}/llvm60/lib -lomp
+# Use OpenMP from lang/llvm70
+OPENMP_LDFLAGS+=	-L${LOCALBASE}/llvm70/lib -lomp
 PGSQL_CONFIGURE_OFF=	--with-postgresql=no
 PGSQL_CONFIGURE_ON=	--with-postgresql=${LOCALBASE}/bin/pg_config
 PGSQL_USES=		pgsql
@@ -67,9 +69,9 @@ INSTALL_TARGET=	install-strip
 .include <bsd.port.pre.mk>
 
 # make describe needs them here
-CPP=		clang-cpp60
-CC=		clang60
-CXX=		clang++60
+CPP=		clang-cpp70
+CC=		clang70
+CXX=		clang++70
 
 SUB_FILES=	pkg-message
 
diff --git a/math/saga/distinfo b/math/saga/distinfo
index 5fbbba7f6fbc..d0b37fc63a7c 100644
--- a/math/saga/distinfo
+++ b/math/saga/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542872258
-SHA256 (saga-7.0.0.tar.gz) = b30418eb60c28324536011c0331a4da14f8f3881ddf2ac240e35944229fdc592
-SIZE (saga-7.0.0.tar.gz) = 4646132
+TIMESTAMP = 1546094790
+SHA256 (saga-7.1.1.tar.gz) = 8ebb720fe721afb94e3586d9ed80854c74a07efe38db236c063accbc89fdea78
+SIZE (saga-7.1.1.tar.gz) = 4666041
diff --git a/math/saga/files/patch-src_tools_io_io__shapes__las_Makefile.am b/math/saga/files/patch-src_tools_io_io__shapes__las_Makefile.am
index b7d311cbfb1d..1ae2d2bbadf4 100644
--- a/math/saga/files/patch-src_tools_io_io__shapes__las_Makefile.am
+++ b/math/saga/files/patch-src_tools_io_io__shapes__las_Makefile.am
@@ -1,4 +1,4 @@
---- src/tools/io/io_shapes_las/Makefile.am.orig	2016-11-17 08:03:02 UTC
+--- src/tools/io/io_shapes_las/Makefile.am.orig	2018-10-24 14:16:06 UTC
 +++ src/tools/io/io_shapes_las/Makefile.am
 @@ -6,7 +6,7 @@ DBGFLAGS = -g -DDEBUG
  endif
@@ -6,6 +6,6 @@
  if HAVE_LLAS
 -DEP_LIBS           = -llas
 +DEP_LIBS           = -llas12
- DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
+ DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
  CXX_INCS           = -I$(top_srcdir)/src/saga_core
  AM_CXXFLAGS        = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
diff --git a/math/saga/pkg-plist b/math/saga/pkg-plist
index 18f26807a3ab..2f6f25554de2 100644
--- a/math/saga/pkg-plist
+++ b/math/saga/pkg-plist
@@ -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.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/saga_api.pyo
 lib/saga/libclimate_tools.so
 lib/saga/libcontrib_perego.so
 lib/saga/libdb_odbc.so
@@ -192,6 +192,7 @@ share/pixmaps/saga.png
 %%DATADIR%%/toolchains/gc_filter_laplacian.xml
 %%DATADIR%%/toolchains/gc_filter_rank.xml
 %%DATADIR%%/toolchains/gc_filter_simple.xml
+%%DATADIR%%/toolchains/gc_longitudinal_range.xml
 %%DATADIR%%/toolchains/gc_tools.xml
 %%DATADIR%%/toolchains/grid_filter.xml
 %%DATADIR%%/toolchains/grid_list_simple_filter.xml
@@ -200,12 +201,14 @@ share/pixmaps/saga.png
 %%DATADIR%%/toolchains/gridding.xml
 %%DATADIR%%/toolchains/group_files.xml
 %%DATADIR%%/toolchains/imagery.xml
+%%DATADIR%%/toolchains/imagery_fmask_clouds.xml
 %%DATADIR%%/toolchains/imagery_lczc.xml
 %%DATADIR%%/toolchains/import_text_tables.xml
 %%DATADIR%%/toolchains/obia.xml
 %%DATADIR%%/toolchains/points_to_contour.xml
 %%DATADIR%%/toolchains/polygons_max_interior_circles.xml
 %%DATADIR%%/toolchains/polygons_remove_from_boundary.xml
+%%DATADIR%%/toolchains/shapes_select_delete.xml
 %%DATADIR%%/toolchains/sieve_and_clump.xml
 %%DATADIR%%/toolchains/temperature_downscaling.xml
 %%DATADIR%%/toolchains/temperature_downscaling_bulk.xml