git: 5cad1fc444c4 - main - science/gnudatalanguage: upgrade to v1.0.5

The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5cad1fc444c4e995a83b25c2afca53ab7c84708c

commit 5cad1fc444c4e995a83b25c2afca53ab7c84708c
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2024-05-23 12:48:58 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2024-05-23 15:31:30 +0000

    science/gnudatalanguage: upgrade to v1.0.5
    
    Release note at <https://github.com/gnudatalanguage/gdl/releases/tag/v1.0.5>.
---
 science/gnudatalanguage/Makefile | 23 +++++++----------------
 science/gnudatalanguage/distinfo |  6 +++---
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 15237333237f..6ccd39f43ec9 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gnudatalanguage
-PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTVERSION=	1.0.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	science lang
 .if defined(BUILD_PYTHON_MODULE)
@@ -13,7 +12,8 @@ WWW=		https://github.com/gnudatalanguage/gdl
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS+=	libgeotiff.so:graphics/libgeotiff\
+LIB_DEPENDS+=	libGraphicsMagick.so:graphics/GraphicsMagick	\
+		libgeotiff.so:graphics/libgeotiff	\
 		libexpat.so:textproc/expat2	\
 		libplplot.so:math/plplot	\
 		libtiff.so:graphics/tiff	\
@@ -38,7 +38,8 @@ USE_XORG=	x11 sm ice xext
 CMAKE_ARGS=	-DREADLINEDIR:STRING="/usr"	\
 		-DOPENMP:BOOL=ON		\
 		-DNCURSESDIR:STRING="/usr"	\
-		-DPYTHON:BOOL=NO
+		-DGRAPHICSMAGICK:BOOL=YES	\
+		-DX11:BOOL=ON
 CPPFLAGS+=	${CFLAGS} -fno-inline -DNPY_NO_DEPRECATED_API -DNPY_1_7_API_VERSION
 CXXFLAGS+=	-std=gnu++11
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
@@ -49,9 +50,9 @@ SLAVEDIRS=	science/py-gnudatalanguage
 # Upstream prefer GraphicsMagick over ImageMackick
 # see https://github.com/gnudatalanguage/gdl/issues/611
 # and https://github.com/gnudatalanguage/gdl/issues/1044 for ImageMagick 7
-OPTIONS_DEFINE=	EIGEN EXAMPLES FFTW GLPK GRAPHICSMAGICK GRIB HDF5 LIBPROJ4	\
+OPTIONS_DEFINE=	EIGEN EXAMPLES FFTW GLPK GRIB HDF5 LIBPROJ4	\
 		MPICH NETCDF PYTHON QHULL UDUNITS
-OPTIONS_DEFAULT=EIGEN FFTW GLPK GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 NETCDF PYTHON	\
+OPTIONS_DEFAULT=EIGEN FFTW GLPK GRIB HDF5 LIBPROJ4 NETCDF PYTHON	\
 		QHULL UDUNITS
 
 EIGEN_DESC=		Eigen3 support (boost performance)
@@ -69,16 +70,6 @@ GLPK_LIB_DEPENDS=	libglpk.so:math/glpk
 GLPK_CMAKE_ON=		-DGLPK=ON:BOOL=YES
 GLPK_CMAKE_OFF=		-DGLPK=OFF:BOOL=NO
 
-GRAPHICSMAGICK_DESC=		Support GraphicsMagick
-GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick
-GRAPHICSMAGICK_CMAKE_ON=	-DGRAPHICSMAGICK:BOOL=YES
-GRAPHICSMAGICK_CMAKE_OFF=	-DGRAPHICSMAGICK:BOOL=NO
-# Temporary swith to ImageMagick
-#IMAGEMAGICK_DESC=	Support ImageMagick
-#IMAGEMAGICK_LIB_DEPENDS=libMagick++-7.so:graphics/ImageMagick7
-#IMAGEMAGICK_CMAKE_ON=	-DGRAPHICSMAGICK:BOOL=NO -DMAGICK:BOOL=YES -DMAGICKDIR=${LOCALBASE}
-#IMAGEMAGICK_CMAKE_OFF=	-DMAGICK:BOOL=NO
-
 GRIB_DESC=		Support GRIB messages
 GRIB_LIB_DEPENDS=	libeccodes.so:science/eccodes
 GRIB_CMAKE_ON=		-DGRIB:BOOL=YES
diff --git a/science/gnudatalanguage/distinfo b/science/gnudatalanguage/distinfo
index c3ef0ff17152..4b5cd35ab5ac 100644
--- a/science/gnudatalanguage/distinfo
+++ b/science/gnudatalanguage/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1702826759
-SHA256 (gnudatalanguage-gdl-v1.0.4-6546898e7f2d23ae1bf67ebe70dc0f38886e5de7_GH0.tar.gz) = 48968cc919c5eaabf595bb8b3d444014b00a9050285b785d920cc3a6434e41c7
-SIZE (gnudatalanguage-gdl-v1.0.4-6546898e7f2d23ae1bf67ebe70dc0f38886e5de7_GH0.tar.gz) = 33079917
+TIMESTAMP = 1716466100
+SHA256 (gnudatalanguage-gdl-v1.0.5-6546898e7f2d23ae1bf67ebe70dc0f38886e5de7_GH0.tar.gz) = 48968cc919c5eaabf595bb8b3d444014b00a9050285b785d920cc3a6434e41c7
+SIZE (gnudatalanguage-gdl-v1.0.5-6546898e7f2d23ae1bf67ebe70dc0f38886e5de7_GH0.tar.gz) = 33079917