svn commit: r433621 - in head/science/gnudatalanguage: . files

[Thierry Thomas]

Author: thierry
Date: Tue Feb  7 21:20:47 2017
New Revision: 433621
URL: https://svnweb.freebsd.org/changeset/ports/433621

Log:
  Re-enable the opthion for math/qhull.
  
  Don't bump PORTREVISION because it is not [yet] enabled by default.

Added:
  head/science/gnudatalanguage/files/patch-CMakeModules_FindQHULL.cmake   (contents, props changed)
Modified:
  head/science/gnudatalanguage/Makefile

Modified: head/science/gnudatalanguage/Makefile
==============================================================================
--- head/science/gnudatalanguage/Makefile	Tue Feb  7 20:58:09 2017	(r433620)
+++ head/science/gnudatalanguage/Makefile	Tue Feb  7 21:20:47 2017	(r433621)
@@ -42,7 +42,7 @@ LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 SLAVEDIRS=	science/py-gnudatalanguage
 
-OPTIONS_DEFINE=	EIGEN EXAMPLES FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 MPICH2 NETCDF PYTHON UDUNITS
+OPTIONS_DEFINE=	EIGEN EXAMPLES FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 MPICH2 NETCDF PYTHON QHULL UDUNITS
 OPTIONS_DEFAULT=EIGEN FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 NETCDF PYTHON UDUNITS
 
 EIGEN_DESC=	Eigen3 support (boost performance)
@@ -89,11 +89,10 @@ PYTHON_RUN_DEPENDS=	${PYNUMPY} \
 PYTHON_CMAKE_ON=	-DPYTHON:BOOL=YES -DPYTHONVERSION:STRING="${PYTHON_VER}"
 PYTHON_CMAKE_OFF=	-DPYTHON:BOOL=NO
 
-# math/qhull conflicts with math/plplot
-#QHULL_DESC=		Enable Qhull support
-#QHULL_LIB_DEPENDS=	libqhull.so:math/qhull
-#QHULL_CMAKE_ON=		-DQHULL:BOOL=YES
-#QHULL_CMAKE_OFF=	-DQHULL:BOOL=NO
+QHULL_DESC=		Enable Qhull support
+QHULL_LIB_DEPENDS=	libqhull.so:math/qhull
+QHULL_CMAKE_ON=		-DQHULL:BOOL=YES
+QHULL_CMAKE_OFF=	-DQHULL:BOOL=NO
 
 UDUNITS_LIB_DEPENDS=	libudunits2.so:science/udunits
 UDUNITS_CMAKE_ON=	-DUDUNITS:BOOL=YES

Added: head/science/gnudatalanguage/files/patch-CMakeModules_FindQHULL.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/gnudatalanguage/files/patch-CMakeModules_FindQHULL.cmake	Tue Feb  7 21:20:47 2017	(r433621)
@@ -0,0 +1,11 @@
+--- CMakeModules/FindQHULL.cmake.orig	2017-02-07 21:12:49 UTC
++++ CMakeModules/FindQHULL.cmake
+@@ -16,7 +16,7 @@ find_path(
+ if( QHULL_INCLUDE_DIR )
+   find_library(
+     QHULL_LIBRARY
+-    NAMES libqhullstatic libqhull qhullstatic qhull 
++    NAMES libqhull qhull
+     PATHS /usr/lib64 /usr/local/lib /usr/lib
+   )
+   if( QHULL_LIBRARY )