There is a bug with GraphicsMagick: see

https://github.com/gnudatalanguage/gdl/issues/611

Meanwhile, switch to ImageMagick, even if GraphicsMagick is prefered.

Reported by:	Daniel O'Connor <darius (at) dons.net.au>

4 files changed, 54 insertions, 14 deletions

diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index f6792a1fb067..ae7d89491498 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	gnudatalanguage
 PORTVERSION=	0.9.9
 DISTVERSIONPREFIX=	v
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	science lang
 .if defined(BUILD_PYTHON_MODULE)
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -48,16 +48,19 @@ USE_CXXSTD=	gnu++11
 
 CMAKE_ARGS=	-DREADLINEDIR:STRING="/usr"	\
 		-DOPENMP:BOOL=NO		\
-		-DNCURSESDIR:STRING="/usr"	\
-		-DMAGICK:BOOL=OFF
+		-DNCURSESDIR:STRING="/usr"
 CPPFLAGS+=	${CFLAGS} -fno-inline -DNPY_NO_DEPRECATED_API -DNPY_1_7_API_VERSION
 CXXFLAGS+=	-std=gnu++11 -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 SLAVEDIRS=	science/py-gnudatalanguage
 
-OPTIONS_DEFINE=	EIGEN EXAMPLES FFTW GLPK GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 MPI NETCDF PYTHON UDUNITS
-OPTIONS_DEFAULT=EIGEN FFTW GLPK GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 NETCDF PYTHON UDUNITS
+# Upstream prefer GraphicsMagick over ImageMackick but ATM it fails
+# see https://github.com/gnudatalanguage/gdl/issues/611
+#OPTIONS_DEFINE=	EIGEN EXAMPLES FFTW GLPK GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 MPI NETCDF PYTHON UDUNITS
+#OPTIONS_DEFAULT=EIGEN FFTW GLPK GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 NETCDF PYTHON UDUNITS
+OPTIONS_DEFINE=	EIGEN EXAMPLES FFTW GLPK IMAGEMAGICK GRIB HDF5 LIBPROJ4 MPI NETCDF PYTHON UDUNITS
+OPTIONS_DEFAULT=EIGEN FFTW GLPK IMAGEMAGICK GRIB HDF5 LIBPROJ4 NETCDF PYTHON UDUNITS
 
 EIGEN_DESC=		Eigen3 support (boost performance)
 EIGEN_USES=		eigen:3
@@ -74,10 +77,15 @@ 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
+#GRAPHICSMAGICK_DESC=		Support GraphicsMagick
+#GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick
+#GRAPHICSMAGICK_CMAKE_ON=	-DGRAPHICSMAGICK:BOOL=YES
+#GRAPHICSMAGICK_CMAKE_OFF=	-DGRAPHICSMAGICK:BOOL=NO
+IMAGEMAGICK_DESC=	Support ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=libMagick++-6.so:graphics/ImageMagick6
+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=	libgrib_api.so:science/grib_api
diff --git a/science/gnudatalanguage/files/patch-CMakeLists.txt b/science/gnudatalanguage/files/patch-CMakeLists.txt
index 936269e7c5fc..6986bde4a20e 100644
--- a/science/gnudatalanguage/files/patch-CMakeLists.txt
+++ b/science/gnudatalanguage/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2018-03-28 19:12:21 UTC
+--- CMakeLists.txt.orig	2018-12-01 14:19:52 UTC
 +++ CMakeLists.txt
-@@ -987,7 +987,7 @@ if(NOT PYTHON_MODULE)
+@@ -1077,7 +1077,7 @@ if(NOT PYTHON_MODULE)
  endif(NOT PYTHON_MODULE)
  
  install(FILES ${CMAKE_SOURCE_DIR}/AUTHORS ${CMAKE_SOURCE_DIR}/README DESTINATION ${CMAKE_INSTALL_PREFIX}/${GDL_DATA_DIR})
diff --git a/science/gnudatalanguage/files/patch-CMakeModules_FindImageMagick.cmake b/science/gnudatalanguage/files/patch-CMakeModules_FindImageMagick.cmake
new file mode 100644
index 000000000000..0e79c4092eee
--- /dev/null
+++ b/science/gnudatalanguage/files/patch-CMakeModules_FindImageMagick.cmake
@@ -0,0 +1,32 @@
+--- CMakeModules/FindImageMagick.cmake.orig	2018-12-01 14:19:52 UTC
++++ CMakeModules/FindImageMagick.cmake
+@@ -72,7 +72,7 @@
+ 
+ # Define variables
+ set(ENV{PATH} "${MAGICKDIR}/bin:$ENV{PATH}")
+-set(ENV{PKG_CONFIG_PATH} "${MAGICKDIR}/lib/pkgconfig/:$ENV{PKG_CONFIG_PATH}")
++set(ENV{PKG_CONFIG_PATH} "${MAGICKDIR}/libdata/pkgconfig/:$ENV{PKG_CONFIG_PATH}")
+ 
+ #---------------------------------------------------------------------
+ # Helper functions
+@@ -165,17 +165,17 @@ foreach(component ${ImageMagick_FIND_COMPONENTS}
+     )
+   if(component STREQUAL "Magick++")
+     FIND_IMAGEMAGICK_API(Magick++ Magick++.h
+-      Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI
++      Magick++-6 Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
+   elseif(component STREQUAL "MagickWand")
+     FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
+-      Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI
++      MagickWand-6 Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
+   elseif(component STREQUAL "MagickCore")
+     FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
+-      Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI
++      MagickCore-6 Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
+   else()
diff --git a/science/gnudatalanguage/files/patch-src_ssrfpack.c b/science/gnudatalanguage/files/patch-src_ssrfpack.c
index 2b942e986332..9faf106aec8b 100644
--- a/science/gnudatalanguage/files/patch-src_ssrfpack.c
+++ b/science/gnudatalanguage/files/patch-src_ssrfpack.c
@@ -1,7 +1,7 @@
---- src/ssrfpack.c.orig	2018-04-07 19:40:08 UTC
+--- src/ssrfpack.c.orig	2018-12-01 14:19:52 UTC
 +++ src/ssrfpack.c
-@@ -7,6 +7,10 @@
- #define sincosf(x, s, c) __sincosf(x, s, c)
+@@ -11,6 +11,10 @@
+ #  define sincos(x,s,c) (*s = sin(x), *c = cos(x))
  #endif
  
 +#ifdef __FreeBSD__