academic/qhull: Updated for version 2015.2.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 29 insertions, 20 deletions

diff --git a/academic/qhull/README b/academic/qhull/README
index 72cc21539e..f024abba13 100644
--- a/academic/qhull/README
+++ b/academic/qhull/README
@@ -1,13 +1,19 @@
-Qhull computes  the  convex  hull,  Delaunay   triangulation,  Voronoi
-diagram, halfspace intersection  about a point, furthest-site Delaunay
+Qhull computes the convex hull, Delaunay triangulation, Voronoi
+diagram, halfspace intersection about a point, furthest-site Delaunay
 triangulation, and furthest-site Voronoi diagram. The source code runs
-in 2-d, 3-d, 4-d, and higher dimensions. It implements the Quickhull
-algorithm for computing the convex hull. Qhull handles roundoff errors
-from floating point arithmetic. It computes volumes, surface areas,
-and approximations to the convex hull.
+in 2-d, 3-d, 4-d, and higher dimensions. Qhull implements the
+Quickhull algorithm for computing the convex hull. It handles roundoff
+errors from floating point arithmetic. It computes volumes, surface
+areas, and approximations to the convex hull.
 
-Qhull does not support constrained Delaunay triangulations, triangulation of
-non-convex surfaces, mesh generation of non-convex objects, or medium-sized
-inputs in 9-D and higher.
+Qhull does not support triangulation of non-convex surfaces, mesh
+generation of non-convex objects, medium-sized inputs in 9-D and
+higher, alpha shapes, weighted Voronoi diagrams, Voronoi volumes, or
+constrained Delaunay triangulations,
+
+Qhull 2015.2 introduces reentrant Qhull. It allows concurrent Qhull
+runs and simplifies the C++ interface to Qhull. If you call Qhull from
+your program, you should use reentrant Qhull (libqhull_r) instead of
+qh_QHpointer (libqhull).
 
 qhull is an optional dependency for the octave package.
diff --git a/academic/qhull/qhull.SlackBuild b/academic/qhull/qhull.SlackBuild
index 67e4314228..ec8f8a6b1b 100644
--- a/academic/qhull/qhull.SlackBuild
+++ b/academic/qhull/qhull.SlackBuild
@@ -24,7 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qhull
-VERSION=${VERSION:-2012.1}
+VERSION=${VERSION:-2015.2}
+BUILD_VERSION=${BUILD_VERSION:-7.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +62,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-src.tgz
+tar xvf $CWD/$PRGNAM-${VERSION%.*}-src-${BUILD_VERSION}.tgz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -76,7 +77,9 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBIN_INSTALL_DIR=/usr/bin \
     -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
+    -DINCLUDE_INSTALL_DIR=/usr/include \
     -DMAN_INSTALL_DIR=/usr/man/man1 \
     -DDOC_INSTALL_DIR=/usr/doc/$PRGNAM-$VERSION \
     -DCMAKE_BUILD_TYPE=Release ..
diff --git a/academic/qhull/qhull.info b/academic/qhull/qhull.info
index 1f79c201a3..2124edbf51 100644
--- a/academic/qhull/qhull.info
+++ b/academic/qhull/qhull.info
@@ -1,8 +1,8 @@
 PRGNAM="qhull"
-VERSION="2012.1"
+VERSION="2015.2"
 HOMEPAGE="http://www.qhull.org/"
-DOWNLOAD="http://www.qhull.org/download/qhull-2012.1-src.tgz"
-MD5SUM="d0f978c0d8dfb2e919caefa56ea2953c"
+DOWNLOAD="http://www.qhull.org/download/qhull-2015-src-7.2.0.tgz"
+MD5SUM="e6270733a826a6a7c32b796e005ec3dc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/qhull/slack-desc b/academic/qhull/slack-desc
index 2c2a35ab14..3bfbb742e5 100644
--- a/academic/qhull/slack-desc
+++ b/academic/qhull/slack-desc
@@ -8,12 +8,12 @@
      |-----handy-ruler------------------------------------------------------|
 qhull: qhull (Implements the Quickhull Algorithm)
 qhull:
-qhull: Qhull computes  the  convex  hull,  Delaunay   triangulation,  Voronoi
-qhull: diagram, halfspace intersection  about a point, furthest-site Delaunay
+qhull: Qhull computes the convex hull, Delaunay triangulation, Voronoi
+qhull: diagram, halfspace intersection about a point, furthest-site Delaunay
 qhull: triangulation, and furthest-site Voronoi diagram. The source code runs
-qhull: in 2-d, 3-d, 4-d, and higher dimensions. It implements the Quickhull
-qhull: algorithm for computing the convex hull. Qhull handles roundoff errors
-qhull: from floating point arithmetic. It computes volumes, surface areas,
-qhull: and approximations to the convex hull.
+qhull: in 2-d, 3-d, 4-d, and higher dimensions. Qhull implements the
+qhull: Quickhull algorithm for computing the convex hull. It handles roundoff
+qhull: errors from floating point arithmetic. It computes volumes, surface
+qhull: areas, and approximations to the convex hull.
 qhull:
 qhull: