5 files changed, 45 insertions, 54 deletions

diff --git a/math/qhull/Makefile b/math/qhull/Makefile
index 1dec31e1a603..a9816b8e0051 100644
--- a/math/qhull/Makefile
+++ b/math/qhull/Makefile
@@ -1,11 +1,11 @@
 # Created by: pusto@web.de
 
 PORTNAME=	qhull
-DISTVERSIONPREFIX=	v
-DISTVERSION=	7.3.2
-PORTREVISION=	2
-PORTEPOCH=	1
+DISTVERSION=	8.0.2
+PORTREVISION=	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
@@ -15,11 +15,12 @@ LICENSE_NAME=	Qhull License
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		cmake
-USE_GITHUB=	yes
+USES=		cmake tar:tgz
 USE_LDCONFIG=	yes
 
-CONFLICTS=	qhull8 afni qhull5
+CONFLICTS=	afni qhull5 qhull7
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-2020.2
 
 OPTIONS_DEFINE=	DOCS
 
@@ -27,7 +28,4 @@ PORTDOCS=	*
 
 DOCS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-CMakeLists.txt
 
-post-install:
-	${RM} ${STAGEDIR}${PREFIX}/lib/cmake/Qhull/QhullTargets-${CMAKE_BUILD_TYPE:tl}.cmake
-
 .include <bsd.port.mk>
diff --git a/math/qhull/distinfo b/math/qhull/distinfo
index 177095e4e0e3..517ca413869f 100644
--- a/math/qhull/distinfo
+++ b/math/qhull/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632709037
-SHA256 (qhull-qhull-v7.3.2_GH0.tar.gz) = 619c8a954880d545194bc03359404ef36a1abd2dde03678089459757fd790cb0
-SIZE (qhull-qhull-v7.3.2_GH0.tar.gz) = 1275679
+TIMESTAMP = 1641507199
+SHA256 (qhull-2020-src-8.0.2.tgz) = b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e
+SIZE (qhull-2020-src-8.0.2.tgz) = 1298874
diff --git a/math/qhull/files/extra-patch-CMakeLists.txt b/math/qhull/files/extra-patch-CMakeLists.txt
index 85f9945962cb..fa6cb16cb2c2 100644
--- a/math/qhull/files/extra-patch-CMakeLists.txt
+++ b/math/qhull/files/extra-patch-CMakeLists.txt
@@ -1,8 +1,12 @@
---- CMakeLists.txt-orig	2012-11-03 23:37:35.000000000 +0000
-+++ CMakeLists.txt	2012-11-03 23:38:47.000000000 +0000
-@@ -428,5 +428,3 @@
+--- CMakeLists.txt-orig	2021-09-26 22:47:09.634188000 -0500
++++ CMakeLists.txt	2021-09-26 22:47:25.546756000 -0500
+@@ -752,9 +752,6 @@
  install(FILES ${libqhullcpp_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhullcpp)
  install(FILES html/qhull.man         DESTINATION ${MAN_INSTALL_DIR} RENAME qhull.1)
  install(FILES html/rbox.man          DESTINATION ${MAN_INSTALL_DIR} RENAME rbox.1)
 -install(FILES ${doc_FILES}           DESTINATION ${DOC_INSTALL_DIR})
--install(DIRECTORY html/              DESTINATION ${DOC_INSTALL_DIR})
+-install(DIRECTORY html/              DESTINATION ${DOC_INSTALL_DIR}/html)
+-install(FILES src/Changes.txt        DESTINATION ${DOC_INSTALL_DIR}/src)
+ 
+ add_custom_target(uninstall
+     COMMENT "uninstall Qhull by deleting files in install_manifest.txt"
diff --git a/math/qhull/files/patch-CMakeLists.txt b/math/qhull/files/patch-CMakeLists.txt
index d68bcf84d8bc..e1e5abb35816 100644
--- a/math/qhull/files/patch-CMakeLists.txt
+++ b/math/qhull/files/patch-CMakeLists.txt
@@ -1,34 +1,22 @@
 Install docs into share/doc/ rather than include/
 
---- CMakeLists.txt.orig	2018-12-28 23:33:58 UTC
+--- CMakeLists.txt.orig	2021-09-27 03:45:38 UTC
 +++ CMakeLists.txt
-@@ -91,7 +91,7 @@ else()
-     if(WIN32)
-         set(MAN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/man/man1)
-     else()
--        set(MAN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/man/man1)
-+        set(MAN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/man/man1)
-     endif()
+@@ -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)
-@@ -330,7 +330,7 @@ set(
- 
- include_directories(${CMAKE_SOURCE_DIR}/src)
- 
--if(CMAKE_BUILD_TYPE MATCHES "[dD]ebug")
-+if(FALSE AND CMAKE_BUILD_TYPE MATCHES "[dD]ebug")
-     set(qhull_CPP qhullcpp_d)
-     set(qhull_SHARED qhull_d) 
-     set(qhull_SHAREDP qhull_pd)
-@@ -616,9 +616,9 @@ install(TARGETS ${qhull_TARGETS_INSTALL}
-         ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
- 
- install(FILES ${libqhull_HEADERS}    DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull)
--install(FILES ${libqhull_DOC}        DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull)
-+install(FILES ${libqhull_DOC}        DESTINATION ${DOC_INSTALL_DIR}/libqhull)
- install(FILES ${libqhullr_HEADERS}    DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull_r)
--install(FILES ${libqhullr_DOC}        DESTINATION ${INCLUDE_INSTALL_DIR}/libqhull_r)
-+install(FILES ${libqhullr_DOC}        DESTINATION ${DOC_INSTALL_DIR}/libqhull_r)
- install(FILES ${libqhullcpp_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/libqhullcpp)
- install(FILES html/qhull.man         DESTINATION ${MAN_INSTALL_DIR} RENAME qhull.1)
- install(FILES html/rbox.man          DESTINATION ${MAN_INSTALL_DIR} RENAME rbox.1)
+ 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 65982b42341c..1c08a85c08eb 100644
--- a/math/qhull/pkg-plist
+++ b/math/qhull/pkg-plist
@@ -4,6 +4,7 @@ bin/qhalf
 bin/qhull
 bin/qvoronoi
 bin/rbox
+include/libqhull/DEPRECATED.txt
 include/libqhull/geom.h
 include/libqhull/io.h
 include/libqhull/libqhull.h
@@ -44,6 +45,7 @@ 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
@@ -53,18 +55,17 @@ include/libqhullcpp/RoadTest.h
 include/libqhullcpp/functionObjects.h
 lib/cmake/Qhull/QhullConfig.cmake
 lib/cmake/Qhull/QhullConfigVersion.cmake
+lib/cmake/Qhull/QhullTargets-release.cmake
 lib/cmake/Qhull/QhullTargets.cmake
-lib/libqhull.so
-lib/libqhull.so.7
-lib/libqhull.so.7.3.2
-lib/libqhull_p.so
-lib/libqhull_p.so.7
-lib/libqhull_p.so.7.3.2
 lib/libqhull_r.so
-lib/libqhull_r.so.7
-lib/libqhull_r.so.7.3.2
+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