CVS commit: pkgsrc/math/qhull

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jun 21 10:49:20 UTC 2021

Modified Files:
        pkgsrc/math/qhull: Makefile distinfo
        pkgsrc/math/qhull/patches: patch-CMakeLists.txt

Log Message:
qhull: install libqhull properly; fixes install_name on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/math/qhull/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/math/qhull/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/qhull/patches/patch-CMakeLists.txt

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.9 pkgsrc/math/qhull/Makefile:1.10
--- pkgsrc/math/qhull/Makefile:1.9      Tue Jun 15 04:07:20 2021
+++ pkgsrc/math/qhull/Makefile  Mon Jun 21 10:49:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/06/15 04:07:20 thor Exp $
+# $NetBSD: Makefile,v 1.10 2021/06/21 10:49:20 adam Exp $
 
 DISTNAME=      qhull-2020-src-${LIBVERSION}
 PKGNAME=       qhull-2020.2
@@ -28,10 +28,8 @@ CMAKE_ARGS+= -DMAN_INSTALL_DIR:PATH=${PR
 post-extract:
        rm -f ${WRKSRC}/eg/q_benchmark ${WRKSRC}/eg/qhull-zip.sh
 
+# libqhull is deprecated
 post-build:
        cd ${WRKSRC} && make libqhull
 
-post-install:
-       cp ${WRKSRC}/libqhull.* ${DESTDIR}${PREFIX}/lib/
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/qhull/distinfo
diff -u pkgsrc/math/qhull/distinfo:1.8 pkgsrc/math/qhull/distinfo:1.9
--- pkgsrc/math/qhull/distinfo:1.8      Sun Feb  7 15:23:47 2021
+++ pkgsrc/math/qhull/distinfo  Mon Jun 21 10:49:20 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2021/02/07 15:23:47 adam Exp $
+$NetBSD: distinfo,v 1.9 2021/06/21 10:49:20 adam Exp $
 
 SHA1 (qhull-2020-src-8.0.2.tgz) = 2dbc240919560ac008a92363984754a70677b353
 RMD160 (qhull-2020-src-8.0.2.tgz) = c407ff5f09edefe093d69349fe4476a62ca7a982
 SHA512 (qhull-2020-src-8.0.2.tgz) = 63d42442f1444ddb09a09680bfdb4d4ffd54295add31f19ec977c1a5bd02a74665f57fdb8503c882720a317cf741c8511b458dcc1ae0930cabe08069ba1496fd
 Size (qhull-2020-src-8.0.2.tgz) = 1298874 bytes
-SHA1 (patch-CMakeLists.txt) = da53c23d845c790f0fa69464a2e14410419c6827
+SHA1 (patch-CMakeLists.txt) = 4bf55cf1dc9b29f8708b337967f86bbaffce3b91

Index: pkgsrc/math/qhull/patches/patch-CMakeLists.txt
diff -u pkgsrc/math/qhull/patches/patch-CMakeLists.txt:1.3 pkgsrc/math/qhull/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/math/qhull/patches/patch-CMakeLists.txt:1.3  Sun Feb  7 15:23:47 2021
+++ pkgsrc/math/qhull/patches/patch-CMakeLists.txt      Mon Jun 21 10:49:20 2021
@@ -1,9 +1,19 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2021/02/07 15:23:47 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2021/06/21 10:49:20 adam Exp $
 
+Also install libqhull.
 Fix library name on Darwin.
 
---- CMakeLists.txt.orig        2021-02-07 15:06:02.000000000 +0000
+--- CMakeLists.txt.orig        2020-09-04 01:23:31.000000000 +0000
 +++ CMakeLists.txt
+@@ -344,7 +344,7 @@ set(qhull_SHAREDP qhull_p)  # libqhull a
+ 
+ set(qhull_TARGETS_APPLICATIONS qhull rbox qconvex qdelaunay qvoronoi qhalf)
+ set(qhull_TARGETS_STATIC ${qhull_CPP} ${qhull_STATIC} ${qhull_STATICR})
+-set(qhull_TARGETS_SHARED ${qhull_SHAREDR})
++set(qhull_TARGETS_SHARED ${qhull_SHARED} ${qhull_SHAREDR})
+ 
+ set(
+     qhull_TARGETS_TEST   # Unused
 @@ -370,8 +370,6 @@ set_target_properties(${qhull_SHAREDR} P
  if(UNIX)
      target_link_libraries(${qhull_SHAREDR} m)
@@ -13,3 +23,12 @@ Fix library name on Darwin.
      else()
          set_target_properties(${qhull_SHAREDR} PROPERTIES 
              INSTALL_RPATH "${LIB_INSTALL_DIR}"
+@@ -397,8 +395,6 @@ set_target_properties(${qhull_SHARED} PR
+ if(UNIX)
+     target_link_libraries(${qhull_SHARED} m)
+     if(APPLE)
+-        set_target_properties(${qhull_SHARED} PROPERTIES 
+-            INSTALL_NAME_DIR "${LIB_INSTALL_DIR}")
+     else()
+         set_target_properties(${qhull_SHARED} PROPERTIES 
+             INSTALL_RPATH "${LIB_INSTALL_DIR}"