diff -urN saga.orig/Makefile saga/Makefile --- saga.orig/Makefile 2019-02-28 07:16:22.892661000 +0100 +++ saga/Makefile 2019-06-24 18:49:38.670932000 +0200 @@ -2,7 +2,7 @@ # $FreeBSD: head/math/saga/Makefile 494086 2019-02-27 21:19:45Z swills $ PORTNAME= saga -PORTVERSION= 7.2.0 +PORTVERSION= 7.3.0 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} @@ -12,7 +12,7 @@ LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -BUILD_DEPENDS= clang70:devel/llvm70 \ +BUILD_DEPENDS= clang${LLVM_VER}:devel/llvm${LLVM_VER} \ swig3.0:devel/swig30 LIB_DEPENDS= libcurl.so:ftp/curl \ libfftw3.so:math/fftw3 \ @@ -30,7 +30,7 @@ RUN_DEPENDS:= swig3.0:devel/swig30 USES= autoreconf compiler:c++11-lib desktop-file-utils dos2unix \ - iconv:wchar_t libtool localbase pkgconfig python:2.7 + iconv:wchar_t libtool localbase pkgconfig python USE_LDCONFIG= yes USE_WX= 3.0+ @@ -56,8 +56,8 @@ OPENMP_CONFIGURE_ENABLE= openmp OPENMP_LDFLAGS= -L${LOCALBASE}/lib -lm -# Use OpenMP from lang/llvm70 -OPENMP_LDFLAGS+= -L${LOCALBASE}/llvm70/lib -lomp +# 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 PGSQL_USES= pgsql @@ -69,9 +69,10 @@ .include # make describe needs them here -CPP= clang-cpp70 -CC= clang70 -CXX= clang++70 +LLVM_VER= 80 +CPP= clang-cpp${LLVM_VER} +CC= clang${LLVM_VER} +CXX= clang++${LLVM_VER} SUB_FILES= pkg-message diff -urN saga.orig/distinfo saga/distinfo --- saga.orig/distinfo 2019-02-28 07:16:22.891828000 +0100 +++ saga/distinfo 2019-06-24 18:36:57.104449000 +0200 @@ -1,3 +1,3 @@ -TIMESTAMP = 1550398605 -SHA256 (saga-7.2.0.tar.gz) = 56152aa39e90e60fb8bcd2b9ded30706176d3a7f50084505138fcfc26a61f281 -SIZE (saga-7.2.0.tar.gz) = 4676920 +TIMESTAMP = 1561394217 +SHA256 (saga-7.3.0.tar.gz) = f3c0f805bd48c3afbad56a35b6b0aa40e8e92799ed0ef0d682aea275fa36fbbc +SIZE (saga-7.3.0.tar.gz) = 4742356 diff -urN saga.orig/files/patch-configure.ac saga/files/patch-configure.ac --- saga.orig/files/patch-configure.ac 2018-12-27 20:19:47.565480000 +0100 +++ saga/files/patch-configure.ac 2019-06-24 18:39:40.290707000 +0200 @@ -1,6 +1,6 @@ ---- configure.ac.orig 2018-11-22 07:53:05 UTC +--- configure.ac.orig 2019-04-09 17:14:15 UTC +++ configure.ac -@@ -20,13 +20,13 @@ AC_PROG_LIBTOOL +@@ -20,7 +20,7 @@ AC_PROG_LIBTOOL AC_CHECK_LIB([opencv_core], [cvGetRows], CVFOUND=1,,) AC_CHECK_LIB([geotrans], [Set_Mercator_Coordinates]) AC_CHECK_LIB([fftw3],[fftw_execute],FFTWFOUND=1,) @@ -8,7 +8,10 @@ +AC_CHECK_LIB([las12], [LAS_GetVersion], LASFOUND=1,,) AC_CHECK_LIB(hpdf, HPDF_Pages_New, HARUFOUND=1,,) AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOUND=1,[ODBC \(libodbc\) library not found]) - AC_CHECK_LIB([proj], [pj_is_latlong], PROJFOUND=1,,) + # PROJ4 has projects.h and old API function: +@@ -30,8 +30,8 @@ AC_CHECK_HEADER([projects.h],[AC_CHECK_HEADER([proj.h] + # PROJ6 has dropped projects.h in favour of proj.h and has new API function: + AC_CHECK_HEADER([proj.h],[AC_CHECK_LIB([proj], [proj_info], PROJ6FOUND=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,,)]) diff -urN saga.orig/files/patch-src_tools_io_io__shapes__las_las__export.cpp saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp --- saga.orig/files/patch-src_tools_io_io__shapes__las_las__export.cpp 2018-07-03 09:34:10.000000000 +0200 +++ saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp 2019-06-24 18:43:56.623542000 +0200 @@ -1,9 +1,9 @@ ---- src/tools/io/io_shapes_las/las_export.cpp.orig 2018-06-19 12:39:11 UTC +--- src/tools/io/io_shapes_las/las_export.cpp.orig 2019-06-24 16:41:27 UTC +++ src/tools/io/io_shapes_las/las_export.cpp -@@ -61,9 +61,9 @@ - //--------------------------------------------------------- - #include "las_export.h" +@@ -59,9 +59,9 @@ + /////////////////////////////////////////////////////////// + //--------------------------------------------------------- -#include -#include -#include @@ -13,4 +13,3 @@ #include #include #include - diff -urN saga.orig/files/patch-src_tools_io_io__shapes__las_las__import.cpp saga/files/patch-src_tools_io_io__shapes__las_las__import.cpp --- saga.orig/files/patch-src_tools_io_io__shapes__las_las__import.cpp 2018-06-18 17:49:50.000000000 +0200 +++ saga/files/patch-src_tools_io_io__shapes__las_las__import.cpp 2019-06-24 18:46:39.062751000 +0200 @@ -1,9 +1,9 @@ ---- src/tools/io/io_shapes_las/las_import.cpp.orig 2018-05-01 09:07:10 UTC +--- src/tools/io/io_shapes_las/las_import.cpp.orig 2019-06-24 16:44:36 UTC +++ src/tools/io/io_shapes_las/las_import.cpp -@@ -60,9 +60,9 @@ - //--------------------------------------------------------- - #include "las_import.h" +@@ -58,9 +58,9 @@ + /////////////////////////////////////////////////////////// + //--------------------------------------------------------- -#include -#include -#include diff -urN saga.orig/files/patch-src_tools_io_io__shapes__las_las__info.h saga/files/patch-src_tools_io_io__shapes__las_las__info.h --- saga.orig/files/patch-src_tools_io_io__shapes__las_las__info.h 2018-06-18 17:49:50.000000000 +0200 +++ saga/files/patch-src_tools_io_io__shapes__las_las__info.h 2019-06-24 18:48:31.189494000 +0200 @@ -1,9 +1,9 @@ ---- src/tools/io/io_shapes_las/las_info.h.orig 2018-05-01 09:07:11 UTC +--- src/tools/io/io_shapes_las/las_info.h.orig 2019-06-24 16:47:07 UTC +++ src/tools/io/io_shapes_las/las_info.h -@@ -76,9 +76,9 @@ - //--------------------------------------------------------- - #include "MLB_Interface.h" +@@ -74,9 +74,9 @@ + /////////////////////////////////////////////////////////// + //--------------------------------------------------------- -#include -#include -#include diff -urN saga.orig/pkg-plist saga/pkg-plist --- saga.orig/pkg-plist 2019-02-28 07:16:22.988141000 +0100 +++ saga/pkg-plist 2019-06-24 19:01:21.888297000 +0200 @@ -31,12 +31,12 @@ lib/libsaga_api.so lib/libsaga_gdi-%%PORTVERSION%%.so lib/libsaga_gdi.so +%%PYTHON_SITELIBDIR%%/__pycache__/saga_api.cpython-36.opt-1.pyc +%%PYTHON_SITELIBDIR%%/__pycache__/saga_api.cpython-36.pyc %%PYTHON_SITELIBDIR%%/_saga_api-%%PORTVERSION%%.so %%PYTHON_SITELIBDIR%%/_saga_api.a %%PYTHON_SITELIBDIR%%/_saga_api.so %%PYTHON_SITELIBDIR%%/saga_api.py -%%PYTHON_SITELIBDIR%%/saga_api.pyc -%%PYTHON_SITELIBDIR%%/saga_api.pyo lib/saga/libclimate_tools.so lib/saga/libcontrib_perego.so lib/saga/libdb_odbc.so @@ -210,6 +210,7 @@ %%DATADIR%%/toolchains/polygons_remove_from_boundary.xml %%DATADIR%%/toolchains/shapes_select_delete.xml %%DATADIR%%/toolchains/sieve_and_clump.xml +%%DATADIR%%/toolchains/ta_flow_accumulation.xml %%DATADIR%%/toolchains/ta_summits.xml %%DATADIR%%/toolchains/temperature_downscaling.xml %%DATADIR%%/toolchains/temperature_downscaling_bulk.xml