CVS commit: pkgsrc/math/qhull

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug 19 17:28:59 UTC 2024

Modified Files:
        pkgsrc/math/qhull: Makefile

Log Message:
qhull: convert to cmake/build.mk


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/math/qhull/Makefile

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.11 pkgsrc/math/qhull/Makefile:1.12
--- pkgsrc/math/qhull/Makefile:1.11     Wed Sep  6 13:22:43 2023
+++ pkgsrc/math/qhull/Makefile  Mon Aug 19 17:28:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2023/09/06 13:22:43 nros Exp $
+# $NetBSD: Makefile,v 1.12 2024/08/19 17:28:58 wiz Exp $
 
 DISTNAME=      qhull-2020-src-${LIBVERSION}
 PKGNAME=       qhull-2020.2
@@ -7,21 +7,20 @@ 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
 
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 
-USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 TEST_ENV+=     LD_LIBRARY_PATH=${WRKSRC}
 TEST_TARGET=   test
 
+LIBVERSION=    ${LIBMAJOR}.2
+LIBMAJOR=      8.0
+PLIST_SUBST+=  LIBVERSION=${LIBVERSION} LIBMAJOR=${LIBMAJOR}
+
 CMAKE_ARGS+=   -DMAN_INSTALL_DIR:PATH=${PREFIX}/${PKGMANDIR}/man1
 
 PKGCONFIG_OVERRIDE=    build/qhull.pc.in
@@ -32,6 +31,7 @@ post-extract:
 
 # libqhull is deprecated
 post-build:
-       cd ${WRKSRC} && make libqhull
+       cd ${WRKSRC}/${CMAKE_BUILD_DIR} && make libqhull
 
+.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"