CVS commit: pkgsrc/math/qhull

["Dr. Thomas Orgis" <thor%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thor
Date:           Tue Jun 15 04:07:20 UTC 2021

Modified Files:
        pkgsrc/math/qhull: Makefile PLIST buildlink3.mk

Log Message:
math/qhull: install the old non-reentrant lib for existing users


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/math/qhull/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/qhull/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/qhull/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/qhull/Makefile
diff -u pkgsrc/math/qhull/Makefile:1.8 pkgsrc/math/qhull/Makefile:1.9
--- pkgsrc/math/qhull/Makefile:1.8      Sun Feb  7 15:23:47 2021
+++ pkgsrc/math/qhull/Makefile  Tue Jun 15 04:07:20 2021
@@ -1,11 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2021/02/07 15:23:47 adam Exp $
+# $NetBSD: Makefile,v 1.9 2021/06/15 04:07:20 thor Exp $
 
-DISTNAME=      qhull-2020-src-8.0.2
+DISTNAME=      qhull-2020-src-${LIBVERSION}
 PKGNAME=       qhull-2020.2
+PKGREVISION=   1
 CATEGORIES=    math
 MASTER_SITES=  http://www.qhull.org/download/
 EXTRACT_SUFX=  .tgz
 
+LIBVERSION=    ${LIBMAJOR}.2
+LIBMAJOR=      8.0
+PLIST_SUBST+=  LIBVERSION=${LIBVERSION} LIBMAJOR=${LIBMAJOR}
+
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.qhull.org/
 COMMENT=       Computing the convex hull
@@ -23,4 +28,10 @@ CMAKE_ARGS+= -DMAN_INSTALL_DIR:PATH=${PR
 post-extract:
        rm -f ${WRKSRC}/eg/q_benchmark ${WRKSRC}/eg/qhull-zip.sh
 
+post-build:
+       cd ${WRKSRC} && make libqhull
+
+post-install:
+       cp ${WRKSRC}/libqhull.* ${DESTDIR}${PREFIX}/lib/
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/qhull/PLIST
diff -u pkgsrc/math/qhull/PLIST:1.5 pkgsrc/math/qhull/PLIST:1.6
--- pkgsrc/math/qhull/PLIST:1.5 Sat Jan 23 23:19:16 2021
+++ pkgsrc/math/qhull/PLIST     Tue Jun 15 04:07:20 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2021/01/23 23:19:16 gdt Exp $
+@comment $NetBSD: PLIST,v 1.6 2021/06/15 04:07:20 thor Exp $
 bin/qconvex
 bin/qdelaunay
 bin/qhalf
@@ -58,9 +58,12 @@ lib/cmake/Qhull/QhullConfig.cmake
 lib/cmake/Qhull/QhullConfigVersion.cmake
 lib/cmake/Qhull/QhullTargets-noconfig.cmake
 lib/cmake/Qhull/QhullTargets.cmake
+lib/libqhull.so
+lib/libqhull.so.${LIBMAJOR}
+lib/libqhull.so.${LIBVERSION}
 lib/libqhull_r.so
-lib/libqhull_r.so.8.0
-lib/libqhull_r.so.8.0.2
+lib/libqhull_r.so.${LIBMAJOR}
+lib/libqhull_r.so.${LIBVERSION}
 lib/libqhullcpp.a
 lib/libqhullstatic.a
 lib/libqhullstatic_r.a

Index: pkgsrc/math/qhull/buildlink3.mk
diff -u pkgsrc/math/qhull/buildlink3.mk:1.3 pkgsrc/math/qhull/buildlink3.mk:1.4
--- pkgsrc/math/qhull/buildlink3.mk:1.3 Wed Feb  3 16:05:56 2016
+++ pkgsrc/math/qhull/buildlink3.mk     Tue Jun 15 04:07:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/02/03 16:05:56 nros Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2021/06/15 04:07:20 thor Exp $
 
 BUILDLINK_TREE+=       qhull
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        qhull
 QHULL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qhull+=  qhull>=2003.1
-BUILDLINK_ABI_DEPENDS.qhull+=  qhull>=2015.1
+BUILDLINK_ABI_DEPENDS.qhull+=  qhull>=2020.2nb1
 BUILDLINK_PKGSRCDIR.qhull?=    ../../math/qhull
 .endif # QHULL_BUILDLINK3_MK