math/qhull: Renaming ports

qhull renamed to qhull7.
qhull8 renamed to qhull.
qhull7 marked deprecated.
Dependencies updated.
This commit is contained in:
Stephen Montgomery-Smith 2022-02-18 15:15:30 -06:00
parent c2a26c7a01
commit 5693794683
22 changed files with 124 additions and 120 deletions

View File

@ -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

View File

@ -957,7 +957,7 @@
SUBDIR += qalculate
SUBDIR += qd
SUBDIR += qhull
SUBDIR += qhull8
SUBDIR += qhull7
SUBDIR += qposases
SUBDIR += qrupdate
SUBDIR += qtiplot-doc

View File

@ -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 \

View File

@ -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"

View File

@ -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} \

View File

@ -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>

View File

@ -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

View File

@ -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"

View File

@ -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()

View File

@ -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

View File

@ -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
DEPRECATED= Conflicts with qhull
USES= cmake
USE_GITHUB= yes
USE_LDCONFIG= yes
CONFLICTS= qhull afni qhull5
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>

3
math/qhull7/distinfo Normal file
View File

@ -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

View File

@ -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})

View File

@ -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)

View File

@ -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

View File

@ -1,3 +0,0 @@
TIMESTAMP = 1641507199
SHA256 (qhull-2020-src-8.0.2.tgz) = b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e
SIZE (qhull-2020-src-8.0.2.tgz) = 1298874

View File

@ -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()

View File

@ -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

View File

@ -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 \

View File

@ -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}

View File

@ -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}