cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-enable the opthion for math/qhull.

Browse Source 
Don't bump PORTREVISION because it is not [yet] enabled by default.
This commit is contained in:
Thierry Thomas 2017-02-07 21:20:47 +00:00
parent 94de393d7d
commit 679732cbd2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=433621
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
science/gnudatalanguage/Makefile
View File

@ -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

11
science/gnudatalanguage/files/patch-CMakeModules_FindQHULL.cmake Normal file
View File

@ -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 )