diff options
| author | thierry <thierry@FreeBSD.org> | 2017-02-08 05:20:47 +0800 |
|---|---|---|
| committer | thierry <thierry@FreeBSD.org> | 2017-02-08 05:20:47 +0800 |
| commit | 4708d2249a62437fea82b1476fd989e2d5c54cf6 (patch) | |
| tree | b4b08fb1b4afa97076a2850b83e23e0388a192ac /science | |
| parent | 047fb18109b1cf7e2620b05da1798a130fff2bd1 (diff) | |
| download | freebsd-ports-gnome-4708d2249a62437fea82b1476fd989e2d5c54cf6.tar.gz freebsd-ports-gnome-4708d2249a62437fea82b1476fd989e2d5c54cf6.tar.zst freebsd-ports-gnome-4708d2249a62437fea82b1476fd989e2d5c54cf6.zip | |
Re-enable the opthion for math/qhull.
Don't bump PORTREVISION because it is not [yet] enabled by default.
Diffstat (limited to 'science')
| -rw-r--r-- | science/gnudatalanguage/Makefile | 11 | ||||
| -rw-r--r-- | science/gnudatalanguage/files/patch-CMakeModules_FindQHULL.cmake | 11 |
2 files changed, 16 insertions, 6 deletions
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile index 6f9cb80d6c32..3e5b7dd8127b 100644 --- a/science/gnudatalanguage/Makefile +++ b/science/gnudatalanguage/Makefile @@ -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 diff --git a/science/gnudatalanguage/files/patch-CMakeModules_FindQHULL.cmake b/science/gnudatalanguage/files/patch-CMakeModules_FindQHULL.cmake new file mode 100644 index 000000000000..8124df9e074a --- /dev/null +++ b/science/gnudatalanguage/files/patch-CMakeModules_FindQHULL.cmake @@ -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 ) |