Attachment 212614 Details for Bug 244979 – update math/saga from 7.5.0 to 7.6.2

[patch] update math/saga from 7.5.0 to 7.6.2

patch-saga_7.5.0-7.6.2.diff (text/plain), 4.01 KB, created by Rainer Hurling on 2020-03-22 15:31:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2020-03-22 15:31:01 UTC

Size: 4.01 KB

patch

obsolete

>diff -urN saga.orig/Makefile saga/Makefile
>--- saga.orig/Makefile	2020-03-09 21:31:17.601549000 +0100
>+++ saga/Makefile	2020-03-21 21:02:59.064804000 +0100
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/math/saga/Makefile 528082 2020-03-08 21:56:36Z jbeich $
> 
> PORTNAME=	saga
>-PORTVERSION=	7.5.0
>-PORTREVISION=	2
>+PORTVERSION=	7.6.2
> CATEGORIES=	math
> MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}
> 
>@@ -24,6 +23,7 @@
> 		libodbc.so:databases/unixODBC \
> 		libopencv_core.so:graphics/opencv-core \
> 		libopencv_ml.so:graphics/opencv \
>+		libpdal_base.so:math/pdal \
> 		libproj.so:graphics/proj \
> 		libsvm.so:science/libsvm \
> 		libtbb.so:devel/tbb \
>@@ -56,7 +56,7 @@
> VIGRA_DESC=	Enable 'Vision with Generic Algorithms' Library
> 
> OPENMP_CONFIGURE_ENABLE=	openmp
>-PGSQL_CONFIGURE_WITH=	pg
>+PGSQL_CONFIGURE_WITH=	postgresql
> PGSQL_USES=		pgsql
> VIGRA_BUILD_DEPENDS=	${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra
> VIGRA_RUN_DEPENDS=	${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra
>@@ -84,6 +84,7 @@
> 		${WRKSRC}/src/tools/io/io_grid_image/Makefile.am \
> 		${WRKSRC}/src/tools/io/io_shapes/Makefile.am \
> 		${WRKSRC}/src/tools/io/io_virtual/Makefile.am \
>+		${WRKSRC}/src/tools/io/io_webservices/Makefile.am \
> 		${WRKSRC}/src/tools/pointcloud/pointcloud_tools/Makefile.am \
> 		${WRKSRC}/src/tools/pointcloud/pointcloud_viewer/Makefile.am \
> 		${WRKSRC}/src/tools/statistics/statistics_kriging/Makefile.am \
>diff -urN saga.orig/distinfo saga/distinfo
>--- saga.orig/distinfo	2020-01-13 22:03:45.329826000 +0100
>+++ saga/distinfo	2020-03-21 20:43:48.944409000 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1578949425
>-SHA256 (saga-7.5.0.tar.gz) = d95c1cba60586916608fd6b262bf75a795a47d6a9b44c2c59a9477015049a168
>-SIZE (saga-7.5.0.tar.gz) = 4994149
>+TIMESTAMP = 1584819828
>+SHA256 (saga-7.6.2.tar.gz) = a02e9f0e605ad7bc1e73513c4bc76d7786e62a4844e10984f1027b559faa4526
>+SIZE (saga-7.6.2.tar.gz) = 5019078
>diff -urN saga.orig/files/patch-configure.ac saga/files/patch-configure.ac
>--- saga.orig/files/patch-configure.ac	2020-01-05 16:32:40.644144000 +0100
>+++ saga/files/patch-configure.ac	2020-03-21 20:58:01.722204000 +0100
>@@ -1,4 +1,4 @@
>---- configure.ac.orig	2019-04-09 17:14:15 UTC
>+--- configure.ac.orig	2020-02-09 11:18:36 UTC
> +++ configure.ac
> @@ -20,7 +20,7 @@ AC_PROG_LIBTOOL
>  AC_CHECK_LIB([opencv_core], [cvGetRows], CVFOUND=1,,)
>@@ -6,10 +6,10 @@
>  AC_CHECK_LIB([fftw3],[fftw_execute],FFTWFOUND=1,)
> -AC_CHECK_LIB([las], [LAS_GetVersion], LASFOUND=1,,)
> +AC_CHECK_LIB([las12], [LAS_GetVersion], LASFOUND=1,,)
>+ AC_CHECK_LIB([pdal], [versionString], PDALFOUND=1,,)
>  AC_CHECK_LIB(hpdf, HPDF_Pages_New, HARUFOUND=1,,)
>  AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOUND=1,[ODBC $libodbc$ library not found])
>- # PROJ4 has projects.h and old API function:
>-@@ -30,8 +30,8 @@ AC_CHECK_HEADER([projects.h],[AC_CHECK_HEADER([proj.h]
>+@@ -31,8 +31,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,)
>@@ -20,3 +20,12 @@
>  PKG_CHECK_MODULES([DXFLIB], [dxflib], [LIBDXFFOUND=1],[LIBDXFFOUND=0])
>  PKG_CHECK_MODULES([HDF5],[hdf5],LIBHDF5FOUND=1,LIBHDF5FOUND=0)
>  LIBCURL_CHECK_CONFIG([yes], [7.7.2],,)
>+@@ -168,7 +168,7 @@ AC_ARG_ENABLE(openmp,
>+   else
>+     if test -n "$GOMPFOUND" ; then 
>+       AC_MSG_RESULT([        Building with OpenMP support using libgomp])
>+-      GOMPFLAGS="-fopenmp -lgomp"
>++      GOMPFLAGS="-fopenmp -lomp"
>+     else 
>+       AC_MSG_RESULT([        libgomp not found, OpenMP support disabled]) 
>+       GOMPFLAGS=""
>diff -urN saga.orig/pkg-plist saga/pkg-plist
>--- saga.orig/pkg-plist	2020-01-14 06:57:57.063951000 +0100
>+++ saga/pkg-plist	2020-03-21 21:10:02.068760000 +0100
>@@ -75,6 +75,7 @@
> lib/saga/libio_shapes_las.so
> lib/saga/libio_table.so
> lib/saga/libio_virtual.so
>+lib/saga/libio_webservices.so
> lib/saga/libpj_georeference.so
> lib/saga/libpj_proj4.so
> lib/saga/libpointcloud_tools.so

Flags:

rhurlin: maintainer-approval+

Actions: View | Diff

Attachments on bug 244979: 212614