math/saga: Update to 7.5.0

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

3 files changed, 20 insertions, 26 deletions

diff --git a/math/saga/Makefile b/math/saga/Makefile
index 2c1935ea990f..6eca7aed7f6b 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	saga
-PORTVERSION=	7.3.0
-PORTREVISION=	4
+PORTVERSION=	7.5.0
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}
 
@@ -13,7 +12,7 @@ COMMENT=	System for Automated Geoscientific Analyses
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	clang${LLVM_VER}:devel/llvm${LLVM_VER} \
+BUILD_DEPENDS=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
 		swig3.0:devel/swig30
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libfftw3.so:math/fftw3 \
@@ -30,10 +29,10 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libtiff.so:graphics/tiff
 RUN_DEPENDS:=	swig3.0:devel/swig30
 
-USES=		autoreconf compiler:c++11-lib desktop-file-utils dos2unix gnome \
+USES=		autoreconf compiler:c++11-lib dos2unix gnome \
 		iconv:wchar_t libtool localbase pkgconfig python
 USE_LDCONFIG=	yes
-USE_WX=		3.0+
+USE_WX=		3.1+
 
 CONFIGURE_ARGS=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		--enable-python --with-system-svm
@@ -56,11 +55,11 @@ OPENMP_DESC=	Enable Multiprocessing (only amd64 and i386)
 VIGRA_DESC=	Enable 'Vision with Generic Algorithms' Library
 
 OPENMP_CONFIGURE_ENABLE=	openmp
+OPENMP_LIB_DEPENDS=	libomp.so:devel/openmp
 OPENMP_LDFLAGS=		-L${LOCALBASE}/lib -lm
-# Use OpenMP from lang/llvm${LLVM_VER}
-OPENMP_LDFLAGS+=	-L${LOCALBASE}/llvm${LLVM_VER}/lib -lomp
-PGSQL_CONFIGURE_OFF=	--with-postgresql=no
-PGSQL_CONFIGURE_ON=	--with-postgresql=${LOCALBASE}/bin/pg_config
+# Use OpenMP from lang/llvm${LLVM_DEFAULT}
+OPENMP_LDFLAGS+=	-L${LOCALBASE}/llvm${LLVM_DEFAULT}/lib -lomp
+PGSQL_CONFIGURE_WITH=	pg
 PGSQL_USES=		pgsql
 VIGRA_BUILD_DEPENDS=	${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra
 VIGRA_RUN_DEPENDS=	${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra
@@ -70,10 +69,9 @@ INSTALL_TARGET=	install-strip
 .include <bsd.port.pre.mk>
 
 # make describe needs them here
-LLVM_VER=	80
-CPP=		clang-cpp${LLVM_VER}
-CC=		clang${LLVM_VER}
-CXX=		clang++${LLVM_VER}
+CPP=		clang-cpp${LLVM_DEFAULT}
+CC=		clang${LLVM_DEFAULT}
+CXX=		clang++${LLVM_DEFAULT}
 
 SUB_FILES=	pkg-message
 
@@ -111,8 +109,6 @@ post-patch-OPENMP-on:
 		${WRKSRC}/src/accessories/templates/template4saga-tools/my_tool_library/Makefile
 
 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_core|' \
 		${WRKSRC}/src/tools/imagery/imagery_opencv/Makefile
 
diff --git a/math/saga/distinfo b/math/saga/distinfo
index 52fa4c13db84..2def68c15011 100644
--- a/math/saga/distinfo
+++ b/math/saga/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561394217
-SHA256 (saga-7.3.0.tar.gz) = f3c0f805bd48c3afbad56a35b6b0aa40e8e92799ed0ef0d682aea275fa36fbbc
-SIZE (saga-7.3.0.tar.gz) = 4742356
+TIMESTAMP = 1578949425
+SHA256 (saga-7.5.0.tar.gz) = d95c1cba60586916608fd6b262bf75a795a47d6a9b44c2c59a9477015049a168
+SIZE (saga-7.5.0.tar.gz) = 4994149
diff --git a/math/saga/pkg-plist b/math/saga/pkg-plist
index b4d1bc2ad3ec..8af4f2ce4936 100644
--- a/math/saga/pkg-plist
+++ b/math/saga/pkg-plist
@@ -100,6 +100,7 @@ lib/saga/libstatistics_kriging.so
 lib/saga/libstatistics_points.so
 lib/saga/libstatistics_regression.so
 lib/saga/libta_channels.so
+lib/saga/libta_cliffmetrics.so
 lib/saga/libta_compound.so
 lib/saga/libta_hydrology.so
 lib/saga/libta_lighting.so
@@ -134,7 +135,7 @@ share/pixmaps/saga.png
 @mode 0666
 %%DATADIR%%/helper/make_arcsaga_toolboxes.bat
 %%DATADIR%%/helper/make_python_api.bat
-%%DATADIR%%/helper/make_python_api_x64.bat
+%%DATADIR%%/helper/make_python_api_all.bat
 %%DATADIR%%/helper/make_saga_release.bat
 %%DATADIR%%/helper/make_saga_snapshot.bat
 %%DATADIR%%/helper/make_tools_interface.bat
@@ -149,6 +150,7 @@ share/pixmaps/saga.png
 %%DATADIR%%/python/examples/06_xyz2shp.py
 %%DATADIR%%/python/examples/07_grid_tpi.py
 %%DATADIR%%/python/examples/saga_helper.py
+%%DATADIR%%/python/examples/test_all.bat
 %%DATADIR%%/python/helpers/print_version.py
 %%DATADIR%%/python/helpers/saga_cmd_param_interface/environment.py
 %%DATADIR%%/python/helpers/saga_cmd_param_interface/param_interface.py
@@ -168,23 +170,18 @@ share/pixmaps/saga.png
 %%DATADIR%%/saga.ger.txt
 %%DATADIR%%/saga.lng.txt
 %%DATADIR%%/saga.png
+%%DATADIR%%/saga.rus.txt
 %%DATADIR%%/saga_prj.dic
 %%DATADIR%%/saga_prj.srs
 %%DATADIR%%/saga_tip.txt
 %%DATADIR%%/templates/template4saga-tools/my_tool_library/Makefile
 %%DATADIR%%/templates/template4saga-tools/my_tool_library/Makefile.am
 %%DATADIR%%/templates/template4saga-tools/my_tool_library/TLB_Interface.cpp
-%%DATADIR%%/templates/template4saga-tools/my_tool_library/TLB_Interface.h
 %%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool.cpp
 %%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool.h
 %%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library.cbp
 %%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library.layout
-%%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library_link2bin.vcxproj
-%%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library_link2bin.vcxproj.filters
-%%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library_link2src.vcxproj
-%%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library_link2src.vcxproj.filters
-%%DATADIR%%/templates/template4saga-tools/my_tools_link2bin.vc14.sln
-%%DATADIR%%/templates/template4saga-tools/my_tools_link2src.vc14.sln
+%%DATADIR%%/templates/template4saga-tools/my_tools.vc14.sln
 %%DATADIR%%/templates/template4saga-tools/readme.txt
 %%DATADIR%%/toolchains/climate.xml
 %%DATADIR%%/toolchains/cluster_terrain.xml
@@ -211,6 +208,7 @@ share/pixmaps/saga.png
 %%DATADIR%%/toolchains/shapes_select_delete.xml
 %%DATADIR%%/toolchains/sieve_and_clump.xml
 %%DATADIR%%/toolchains/ta_flow_accumulation.xml
+%%DATADIR%%/toolchains/ta_ls_factor.xml
 %%DATADIR%%/toolchains/ta_summits.xml
 %%DATADIR%%/toolchains/temperature_downscaling.xml
 %%DATADIR%%/toolchains/temperature_downscaling_bulk.xml