diff --git a/math/qhull/Makefile b/math/qhull/Makefile index 0e2e2c23718d..b0d7af7d7cce 100644 --- a/math/qhull/Makefile +++ b/math/qhull/Makefile @@ -1,32 +1,32 @@ PORTNAME= qhull DISTVERSION= 8.0.2 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= math MASTER_SITES= http://www.qhull.org/download/ DISTNAME= ${PORTNAME}-2020-src-${DISTVERSION} MAINTAINER= stephen@FreeBSD.org COMMENT= Qhull computes convex hulls, Delaunay triangulations, and halfspaces WWW= http://www.qhull.org LICENSE= Qhull LICENSE_NAME= Qhull License LICENSE_FILE= ${WRKSRC}/COPYING.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= cmake tar:tgz USE_LDCONFIG= yes CFLAGS+= -fPIC CONFLICTS= afni qhull7 WRKSRC= ${WRKDIR}/${PORTNAME}-2020.2 OPTIONS_DEFINE= DOCS PORTDOCS= * DOCS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-CMakeLists.txt .include diff --git a/math/qhull/files/patch-CMakeLists.txt b/math/qhull/files/patch-CMakeLists.txt index e1e5abb35816..b245216a38a0 100644 --- a/math/qhull/files/patch-CMakeLists.txt +++ b/math/qhull/files/patch-CMakeLists.txt @@ -1,22 +1,13 @@ Install docs into share/doc/ rather than include/ ---- CMakeLists.txt.orig 2021-09-27 03:45:38 UTC +--- CMakeLists.txt.orig 2020-09-04 01:23:31 UTC +++ CMakeLists.txt -@@ -128,7 +128,7 @@ else() - endif() - if(MAN_INSTALL_DIR) - else() -- set(MAN_INSTALL_DIR share/man/man1) -+ set(MAN_INSTALL_DIR man/man1) - endif() - if(DOC_INSTALL_DIR) - else() @@ -737,7 +737,7 @@ foreach(pkgconfig IN ITEMS "${qhull_SHAREDR};Qhull ree if(LIBRARY_NAME STREQUAL "libqhull") set(LIBRARY_NAME "qhull") endif() - if(CMAKE_BUILD_TYPE STREQUAL "Debug") + if(FALSE AND CMAKE_BUILD_TYPE STREQUAL "Debug") string(REGEX REPLACE "_(.)$" "_\\1d" LIBRARY_NAME ${LIBRARY_NAME}) string(REGEX REPLACE "([^d])$" "\\1_d" LIBRARY_NAME ${LIBRARY_NAME}) endif() diff --git a/math/qhull/pkg-plist b/math/qhull/pkg-plist index 61cdd17977a6..7422521f0d2b 100644 --- a/math/qhull/pkg-plist +++ b/math/qhull/pkg-plist @@ -1,71 +1,71 @@ bin/qconvex bin/qdelaunay bin/qhalf bin/qhull bin/qvoronoi bin/rbox include/libqhull/DEPRECATED.txt include/libqhull/geom.h include/libqhull/io.h include/libqhull/libqhull.h include/libqhull/mem.h include/libqhull/merge.h include/libqhull/poly.h include/libqhull/qhull_a.h include/libqhull/qset.h include/libqhull/random.h include/libqhull/stat.h include/libqhull/user.h include/libqhull_r/geom_r.h include/libqhull_r/io_r.h include/libqhull_r/libqhull_r.h include/libqhull_r/mem_r.h include/libqhull_r/merge_r.h include/libqhull_r/poly_r.h include/libqhull_r/qhull_ra.h include/libqhull_r/qset_r.h include/libqhull_r/random_r.h include/libqhull_r/stat_r.h include/libqhull_r/user_r.h include/libqhullcpp/Coordinates.h include/libqhullcpp/PointCoordinates.h include/libqhullcpp/Qhull.h include/libqhullcpp/QhullError.h include/libqhullcpp/QhullFacet.h include/libqhullcpp/QhullFacetList.h include/libqhullcpp/QhullFacetSet.h include/libqhullcpp/QhullHyperplane.h include/libqhullcpp/QhullIterator.h include/libqhullcpp/QhullLinkedList.h include/libqhullcpp/QhullPoint.h include/libqhullcpp/QhullPointSet.h include/libqhullcpp/QhullPoints.h include/libqhullcpp/QhullQh.h include/libqhullcpp/QhullRidge.h include/libqhullcpp/QhullSet.h include/libqhullcpp/QhullSets.h include/libqhullcpp/QhullStat.h include/libqhullcpp/QhullUser.h include/libqhullcpp/QhullVertex.h include/libqhullcpp/QhullVertexSet.h include/libqhullcpp/RboxPoints.h include/libqhullcpp/RoadError.h include/libqhullcpp/RoadLogEvent.h include/libqhullcpp/RoadTest.h include/libqhullcpp/functionObjects.h lib/cmake/Qhull/QhullConfig.cmake lib/cmake/Qhull/QhullConfigVersion.cmake lib/cmake/Qhull/QhullTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qhull/QhullTargets.cmake lib/libqhull_r.so lib/libqhull_r.so.8.0 lib/libqhull_r.so.8.0.2 lib/libqhullcpp.a lib/libqhullstatic.a lib/libqhullstatic_r.a libdata/pkgconfig/qhull_r.pc libdata/pkgconfig/qhullcpp.pc libdata/pkgconfig/qhullstatic.pc libdata/pkgconfig/qhullstatic_r.pc -man/man1/qhull.1.gz -man/man1/rbox.1.gz +share/man/man1/qhull.1.gz +share/man/man1/rbox.1.gz