git: 569379468387 - main - math/qhull: Renaming ports
- Reply: Thierry Thomas : "Re: git: 569379468387 - main - math/qhull: Renaming ports"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 18 Feb 2022 21:17:43 UTC
The branch main has been updated by stephen:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5693794683876c2478f2a8029a6c0a47dc53c184
commit 5693794683876c2478f2a8029a6c0a47dc53c184
Author: Stephen Montgomery-Smith <stephen@FreeBSD.org>
AuthorDate: 2022-02-18 21:15:30 +0000
Commit: Stephen Montgomery-Smith <stephen@FreeBSD.org>
CommitDate: 2022-02-18 21:15:30 +0000
math/qhull: Renaming ports
qhull renamed to qhull7.
qhull8 renamed to qhull.
qhull7 marked deprecated.
Dependencies updated.
---
graphics/gdal/Makefile | 4 +-
math/Makefile | 2 +-
math/octave/Makefile | 4 +-
math/plplot/Makefile | 4 +-
math/py-matplotlib/Makefile | 4 +-
math/qhull/Makefile | 18 ++++-----
math/qhull/distinfo | 6 +--
math/qhull/files/extra-patch-CMakeLists.txt | 12 ++++--
math/qhull/files/patch-CMakeLists.txt | 46 ++++++++--------------
math/qhull/pkg-plist | 17 ++++----
math/{qhull8 => qhull7}/Makefile | 21 ++++++----
math/qhull7/distinfo | 3 ++
.../files/extra-patch-CMakeLists.txt | 12 ++----
math/qhull7/files/patch-CMakeLists.txt | 34 ++++++++++++++++
math/{qhull8 => qhull7}/pkg-descr | 0
math/{qhull8 => qhull7}/pkg-plist | 17 ++++----
math/qhull8/distinfo | 3 --
math/qhull8/files/patch-CMakeLists.txt | 22 -----------
math/saga/Makefile | 4 +-
misc/visp/Makefile | 4 +-
science/afni/Makefile | 4 +-
science/py-fresnel/Makefile | 3 +-
22 files changed, 124 insertions(+), 120 deletions(-)
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index c1d3235637fb..896061a45655 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gdal
PORTVERSION= 3.4.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics geography
MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \
LOCAL/sunpoet
@@ -20,7 +20,7 @@ LIB_DEPENDS= libgeotiff.so:graphics/libgeotiff \
libjson-c.so:devel/json-c \
libpng.so:graphics/png \
libproj.so:graphics/proj \
- libqhull_r.so:math/qhull8 \
+ libqhull_r.so:math/qhull \
libtiff.so:graphics/tiff
OPTIONS_DEFINE= ARMADILLO CFITSIO CHARLS CRYPTOPP CURL DEFLATE DODS ECW EXPAT EXR FREEXL GEOS GTA HDF5 HEIF JASPER KML LERC LIBXML2 LZ4 MYSQL NETCDF ODBC OPENJPEG PCRE PCRE2 PGSQL RASTERLITE2 SFCGAL SPATIALITE SQLITE TILEDB WEBP XERCES ZSTD
diff --git a/math/Makefile b/math/Makefile
index 3aa375cb5464..10e63f033293 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -957,7 +957,7 @@
SUBDIR += qalculate
SUBDIR += qd
SUBDIR += qhull
- SUBDIR += qhull8
+ SUBDIR += qhull7
SUBDIR += qposases
SUBDIR += qrupdate
SUBDIR += qtiplot-doc
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 3c6e4c24b330..27c68963fe74 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -2,7 +2,7 @@
PORTNAME= octave
PORTVERSION= ${OCTAVE_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= math
MASTER_SITES= GNU
@@ -27,7 +27,7 @@ LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick \
libftgl.so:graphics/ftgl \
libhdf5.so:science/hdf5 \
libpcre.so:devel/pcre \
- libqhull_r.so:math/qhull8 \
+ libqhull_r.so:math/qhull \
libqrupdate.so:math/qrupdate \
libamd.so:math/suitesparse-amd \
libcamd.so:math/suitesparse-camd \
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index c34fd5938c2f..86a83a9c6304 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -2,7 +2,7 @@
PORTNAME= plplot
DISTVERSION= 5.15.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= math science
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
@@ -78,7 +78,7 @@ LUA_CMAKE_BOOL= ENABLE_lua
LUA_CMAKE_ON= -DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}"
QHULL2020_DESC= Latest Qhull support
-QHULL2020_LIB_DEPENDS= libqhull_r.so:math/qhull8
+QHULL2020_LIB_DEPENDS= libqhull_r.so:math/qhull
QHULL2020_CMAKE_BOOL= PL_HAVE_QHULL HAS_LIBQHULL_INCLUDE
QHULL2020_CMAKE_ON= -DQHULL_RPATH=:FILEPATH="${LOCALBASE}/lib/libqhull_r.so"
diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile
index a8952bd712ba..b2a668c827d9 100644
--- a/math/py-matplotlib/Makefile
+++ b/math/py-matplotlib/Makefile
@@ -2,7 +2,7 @@
PORTNAME= matplotlib
PORTVERSION= 3.4.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}certifi>=0.10:security/py-certifi@${PY_FLAVOR}
LIB_DEPENDS= libfreetype.so:print/freetype2 \
- libqhull_r.so:math/qhull8 \
+ libqhull_r.so:math/qhull \
libpng.so:graphics/png \
libfontconfig.so:x11-fonts/fontconfig
RUN_DEPENDS= ${PYNUMPY} \
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
diff --git a/math/qhull8/Makefile b/math/qhull7/Makefile
similarity index 62%
rename from math/qhull8/Makefile
rename to math/qhull7/Makefile
index 44cc9e02c229..3923f304ba4a 100644
--- a/math/qhull8/Makefile
+++ b/math/qhull7/Makefile
@@ -1,11 +1,12 @@
# Created by: pusto@web.de
PORTNAME= qhull
-DISTVERSION= 8.0.2
+DISTVERSIONPREFIX= v
+DISTVERSION= 7.3.2
+PORTREVISION= 2
+PORTEPOCH= 1
CATEGORIES= math
-MASTER_SITES= http://www.qhull.org/download/
-PKGNAMESUFFIX= 8
-DISTNAME= ${PORTNAME}-2020-src-${DISTVERSION}
+PKGNAMESUFFIX= 7
MAINTAINER= stephen@FreeBSD.org
COMMENT= Qhull computes convex hulls, Delaunay triangulations, and halfspaces
@@ -15,12 +16,13 @@ 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
+DEPRECATED= Conflicts with qhull
-CONFLICTS= qhull afni qhull5
+USES= cmake
+USE_GITHUB= yes
+USE_LDCONFIG= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}-2020.2
+CONFLICTS= qhull8 afni qhull5
OPTIONS_DEFINE= DOCS
@@ -28,4 +30,7 @@ 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/qhull7/distinfo b/math/qhull7/distinfo
new file mode 100644
index 000000000000..177095e4e0e3
--- /dev/null
+++ b/math/qhull7/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1632709037
+SHA256 (qhull-qhull-v7.3.2_GH0.tar.gz) = 619c8a954880d545194bc03359404ef36a1abd2dde03678089459757fd790cb0
+SIZE (qhull-qhull-v7.3.2_GH0.tar.gz) = 1275679
diff --git a/math/qhull8/files/extra-patch-CMakeLists.txt b/math/qhull7/files/extra-patch-CMakeLists.txt
similarity index 54%
rename from math/qhull8/files/extra-patch-CMakeLists.txt
rename to math/qhull7/files/extra-patch-CMakeLists.txt
index fa6cb16cb2c2..85f9945962cb 100644
--- a/math/qhull8/files/extra-patch-CMakeLists.txt
+++ b/math/qhull7/files/extra-patch-CMakeLists.txt
@@ -1,12 +1,8 @@
---- 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 @@
+--- 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 @@
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}/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"
+-install(DIRECTORY html/ DESTINATION ${DOC_INSTALL_DIR})
diff --git a/math/qhull7/files/patch-CMakeLists.txt b/math/qhull7/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..d68bcf84d8bc
--- /dev/null
+++ b/math/qhull7/files/patch-CMakeLists.txt
@@ -0,0 +1,34 @@
+Install docs into share/doc/ rather than include/
+
+--- CMakeLists.txt.orig 2018-12-28 23:33:58 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()
+ 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)
diff --git a/math/qhull8/pkg-descr b/math/qhull7/pkg-descr
similarity index 100%
rename from math/qhull8/pkg-descr
rename to math/qhull7/pkg-descr
diff --git a/math/qhull8/pkg-plist b/math/qhull7/pkg-plist
similarity index 86%
rename from math/qhull8/pkg-plist
rename to math/qhull7/pkg-plist
index 1c08a85c08eb..65982b42341c 100644
--- a/math/qhull8/pkg-plist
+++ b/math/qhull7/pkg-plist
@@ -4,7 +4,6 @@ bin/qhalf
bin/qhull
bin/qvoronoi
bin/rbox
-include/libqhull/DEPRECATED.txt
include/libqhull/geom.h
include/libqhull/io.h
include/libqhull/libqhull.h
@@ -45,7 +44,6 @@ 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
@@ -55,17 +53,18 @@ 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.8.0
-lib/libqhull_r.so.8.0.2
+lib/libqhull_r.so.7
+lib/libqhull_r.so.7.3.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
diff --git a/math/qhull8/distinfo b/math/qhull8/distinfo
deleted file mode 100644
index 517ca413869f..000000000000
--- a/math/qhull8/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1641507199
-SHA256 (qhull-2020-src-8.0.2.tgz) = b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e
-SIZE (qhull-2020-src-8.0.2.tgz) = 1298874
diff --git a/math/qhull8/files/patch-CMakeLists.txt b/math/qhull8/files/patch-CMakeLists.txt
deleted file mode 100644
index e1e5abb35816..000000000000
--- a/math/qhull8/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Install docs into share/doc/ rather than include/
-
---- CMakeLists.txt.orig 2021-09-27 03:45:38 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/saga/Makefile b/math/saga/Makefile
index 4fe9df669a78..4415893539bc 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -2,7 +2,7 @@
PORTNAME= saga
PORTVERSION= 8.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}
@@ -24,7 +24,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \
libopencv_core.so:graphics/opencv \
libpdal_base.so:math/pdal \
libproj.so:graphics/proj \
- libqhull_r.so:math/qhull8 \
+ libqhull_r.so:math/qhull \
libsvm.so:science/libsvm \
libsz.so:science/szip \
libtiff.so:graphics/tiff
diff --git a/misc/visp/Makefile b/misc/visp/Makefile
index bcfa60152efb..e34559b618f3 100644
--- a/misc/visp/Makefile
+++ b/misc/visp/Makefile
@@ -1,6 +1,6 @@
PORTNAME= visp
DISTVERSION= 3.4.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= misc
MASTER_SITES= https://visp-doc.inria.fr/download/releases/
@@ -20,7 +20,7 @@ LIB_DEPENDS= libblas.so:math/blas \
libopencv_core.so:graphics/opencv \
libopencv_videoio.so:graphics/opencv \
libpcl_common.so:graphics/pcl-pointclouds \
- libqhull_r.so:math/qhull8 \
+ libqhull_r.so:math/qhull \
libpng.so:graphics/png \
libv4l2.so:multimedia/libv4l \
liblz4.so:archivers/liblz4 \
diff --git a/science/afni/Makefile b/science/afni/Makefile
index 1d1c5b31f161..a207b4bbe01b 100644
--- a/science/afni/Makefile
+++ b/science/afni/Makefile
@@ -1,5 +1,5 @@
PORTNAME= afni
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONPREFIX= AFNI_
DISTVERSION= 22.0.10
CATEGORIES= science biology graphics perl5 python
@@ -31,7 +31,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \
# Remote execution of suma. Also needed for glxinfo.
RUN_DEPENDS= endian:sysutils/endian \
mpeg_encode:multimedia/mpeg_encode \
- qhull:math/qhull8 \
+ qhull:math/qhull \
R:math/R \
${CRAN_DEPENDS}
diff --git a/science/py-fresnel/Makefile b/science/py-fresnel/Makefile
index 625ee8d90c52..de395cb38f30 100644
--- a/science/py-fresnel/Makefile
+++ b/science/py-fresnel/Makefile
@@ -2,6 +2,7 @@ PORTNAME= fresnel
DISTVERSIONPREFIX= v
DISTVERSION= 0.13.4-4
DISTVERSIONSUFFIX= -g3ba217f
+PORTREVISION= 1
CATEGORIES= science # physics
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= pybind11>0:devel/pybind11
LIB_DEPENDS= libembree3.so:graphics/embree \
- libqhull_r.so:math/qhull8 \
+ libqhull_r.so:math/qhull \
libtbb.so:devel/onetbb
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}