Mon Jun 21 10:49:20 2021 UTC ()
qhull: install libqhull properly; fixes install_name on Darwin


(adam)
diff -r1.9 -r1.10 pkgsrc/math/qhull/Makefile
diff -r1.8 -r1.9 pkgsrc/math/qhull/distinfo
diff -r1.3 -r1.4 pkgsrc/math/qhull/patches/patch-CMakeLists.txt
cvs diff -r1.9 -r1.10 pkgsrc/math/qhull/Makefile (expand / switch to unified diff)

--- pkgsrc/math/qhull/Makefile 2021/06/15 04:07:20 1.9
+++ pkgsrc/math/qhull/Makefile 2021/06/21 10:49:20 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.9 2021/06/15 04:07:20 thor Exp $ 1# $NetBSD: Makefile,v 1.10 2021/06/21 10:49:20 adam Exp $
2 2
3DISTNAME= qhull-2020-src-${LIBVERSION} 3DISTNAME= qhull-2020-src-${LIBVERSION}
4PKGNAME= qhull-2020.2 4PKGNAME= qhull-2020.2
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= math 6CATEGORIES= math
7MASTER_SITES= http://www.qhull.org/download/ 7MASTER_SITES= http://www.qhull.org/download/
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10LIBVERSION= ${LIBMAJOR}.2 10LIBVERSION= ${LIBMAJOR}.2
11LIBMAJOR= 8.0 11LIBMAJOR= 8.0
12PLIST_SUBST+= LIBVERSION=${LIBVERSION} LIBMAJOR=${LIBMAJOR} 12PLIST_SUBST+= LIBVERSION=${LIBVERSION} LIBMAJOR=${LIBMAJOR}
13 13
14MAINTAINER= pkgsrc-users@NetBSD.org 14MAINTAINER= pkgsrc-users@NetBSD.org
@@ -18,20 +18,18 @@ COMMENT= Computing the convex hull @@ -18,20 +18,18 @@ COMMENT= Computing the convex hull
18WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 18WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
19 19
20USE_CMAKE= yes 20USE_CMAKE= yes
21USE_LANGUAGES= c c++ 21USE_LANGUAGES= c c++
22TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC} 22TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}
23TEST_TARGET= test 23TEST_TARGET= test
24 24
25CMAKE_ARGS+= -DMAN_INSTALL_DIR:PATH=${PREFIX}/${PKGMANDIR}/man1 25CMAKE_ARGS+= -DMAN_INSTALL_DIR:PATH=${PREFIX}/${PKGMANDIR}/man1
26 26
27# Remove non-portable file not used in build or test. 27# Remove non-portable file not used in build or test.
28post-extract: 28post-extract:
29 rm -f ${WRKSRC}/eg/q_benchmark ${WRKSRC}/eg/qhull-zip.sh 29 rm -f ${WRKSRC}/eg/q_benchmark ${WRKSRC}/eg/qhull-zip.sh
30 30
 31# libqhull is deprecated
31post-build: 32post-build:
32 cd ${WRKSRC} && make libqhull 33 cd ${WRKSRC} && make libqhull
33 34
34post-install: 
35 cp ${WRKSRC}/libqhull.* ${DESTDIR}${PREFIX}/lib/ 
36 
37.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/math/qhull/distinfo (expand / switch to unified diff)

--- pkgsrc/math/qhull/distinfo 2021/02/07 15:23:47 1.8
+++ pkgsrc/math/qhull/distinfo 2021/06/21 10:49:20 1.9
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.8 2021/02/07 15:23:47 adam Exp $ 1$NetBSD: distinfo,v 1.9 2021/06/21 10:49:20 adam Exp $
2 2
3SHA1 (qhull-2020-src-8.0.2.tgz) = 2dbc240919560ac008a92363984754a70677b353 3SHA1 (qhull-2020-src-8.0.2.tgz) = 2dbc240919560ac008a92363984754a70677b353
4RMD160 (qhull-2020-src-8.0.2.tgz) = c407ff5f09edefe093d69349fe4476a62ca7a982 4RMD160 (qhull-2020-src-8.0.2.tgz) = c407ff5f09edefe093d69349fe4476a62ca7a982
5SHA512 (qhull-2020-src-8.0.2.tgz) = 63d42442f1444ddb09a09680bfdb4d4ffd54295add31f19ec977c1a5bd02a74665f57fdb8503c882720a317cf741c8511b458dcc1ae0930cabe08069ba1496fd 5SHA512 (qhull-2020-src-8.0.2.tgz) = 63d42442f1444ddb09a09680bfdb4d4ffd54295add31f19ec977c1a5bd02a74665f57fdb8503c882720a317cf741c8511b458dcc1ae0930cabe08069ba1496fd
6Size (qhull-2020-src-8.0.2.tgz) = 1298874 bytes 6Size (qhull-2020-src-8.0.2.tgz) = 1298874 bytes
7SHA1 (patch-CMakeLists.txt) = da53c23d845c790f0fa69464a2e14410419c6827 7SHA1 (patch-CMakeLists.txt) = 4bf55cf1dc9b29f8708b337967f86bbaffce3b91
cvs diff -r1.3 -r1.4 pkgsrc/math/qhull/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/math/qhull/patches/patch-CMakeLists.txt 2021/02/07 15:23:47 1.3
+++ pkgsrc/math/qhull/patches/patch-CMakeLists.txt 2021/06/21 10:49:20 1.4
@@ -1,15 +1,34 @@ @@ -1,15 +1,34 @@
1$NetBSD: patch-CMakeLists.txt,v 1.3 2021/02/07 15:23:47 adam Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.4 2021/06/21 10:49:20 adam Exp $
2 2
 3Also install libqhull.
3Fix library name on Darwin. 4Fix library name on Darwin.
4 5
5--- CMakeLists.txt.orig 2021-02-07 15:06:02.000000000 +0000 6--- CMakeLists.txt.orig 2020-09-04 01:23:31.000000000 +0000
6+++ CMakeLists.txt 7+++ CMakeLists.txt
 8@@ -344,7 +344,7 @@ set(qhull_SHAREDP qhull_p) # libqhull a
 9
 10 set(qhull_TARGETS_APPLICATIONS qhull rbox qconvex qdelaunay qvoronoi qhalf)
 11 set(qhull_TARGETS_STATIC ${qhull_CPP} ${qhull_STATIC} ${qhull_STATICR})
 12-set(qhull_TARGETS_SHARED ${qhull_SHAREDR})
 13+set(qhull_TARGETS_SHARED ${qhull_SHARED} ${qhull_SHAREDR})
 14
 15 set(
 16 qhull_TARGETS_TEST # Unused
7@@ -370,8 +370,6 @@ set_target_properties(${qhull_SHAREDR} P 17@@ -370,8 +370,6 @@ set_target_properties(${qhull_SHAREDR} P
8 if(UNIX) 18 if(UNIX)
9 target_link_libraries(${qhull_SHAREDR} m) 19 target_link_libraries(${qhull_SHAREDR} m)
10 if(APPLE) 20 if(APPLE)
11- set_target_properties(${qhull_SHAREDR} PROPERTIES  21- set_target_properties(${qhull_SHAREDR} PROPERTIES
12- INSTALL_NAME_DIR "${LIB_INSTALL_DIR}") 22- INSTALL_NAME_DIR "${LIB_INSTALL_DIR}")
13 else() 23 else()
14 set_target_properties(${qhull_SHAREDR} PROPERTIES  24 set_target_properties(${qhull_SHAREDR} PROPERTIES
15 INSTALL_RPATH "${LIB_INSTALL_DIR}" 25 INSTALL_RPATH "${LIB_INSTALL_DIR}"
 26@@ -397,8 +395,6 @@ set_target_properties(${qhull_SHARED} PR
 27 if(UNIX)
 28 target_link_libraries(${qhull_SHARED} m)
 29 if(APPLE)
 30- set_target_properties(${qhull_SHARED} PROPERTIES
 31- INSTALL_NAME_DIR "${LIB_INSTALL_DIR}")
 32 else()
 33 set_target_properties(${qhull_SHARED} PROPERTIES
 34 INSTALL_RPATH "${LIB_INSTALL_DIR}"