Date: Sat, 2 Mar 2019 19:53:43 +0000 (UTC) From: Stephen Montgomery-Smith <stephen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494452 - in head/math: plplot qhull qhull/files Message-ID: <201903021953.x22JrhdH086462@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: stephen Date: Sat Mar 2 19:53:43 2019 New Revision: 494452 URL: https://svnweb.freebsd.org/changeset/ports/494452 Log: - Update math/qhull to 7.2.1. - Bump portrevision of dependent port math/plplot, PR: 236142 Submitted by: Yuri Victorovich <yuri@freebsd.org> Deleted: head/math/qhull/files/patch-src_libqhullcpp_QhullSet.h Modified: head/math/plplot/Makefile head/math/qhull/Makefile head/math/qhull/distinfo head/math/qhull/files/patch-CMakeLists.txt head/math/qhull/pkg-plist Modified: head/math/plplot/Makefile ============================================================================== --- head/math/plplot/Makefile Sat Mar 2 19:19:57 2019 (r494451) +++ head/math/plplot/Makefile Sat Mar 2 19:53:43 2019 (r494452) @@ -3,7 +3,7 @@ PORTNAME= plplot PORTVERSION= 5.12.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math science MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source Modified: head/math/qhull/Makefile ============================================================================== --- head/math/qhull/Makefile Sat Mar 2 19:19:57 2019 (r494451) +++ head/math/qhull/Makefile Sat Mar 2 19:53:43 2019 (r494452) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= qhull -PORTVERSION= 2015.2 +DISTVERSIONPREFIX= v +DISTVERSION= 7.2.1 +PORTEPOCH= 1 CATEGORIES= math -MASTER_SITES= http://www.qhull.org/download/ -DISTNAME= ${PORTNAME}-2015-src-7.2.0 MAINTAINER= stephen@FreeBSD.org COMMENT= Qhull computes convex hulls, Delaunay triangulations, and halfspaces @@ -15,18 +15,16 @@ 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 +USES= cmake +USE_GITHUB= yes USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -CONFLICTS= qhull-1.0* afni-[0-9]* qhull5-* +CONFLICTS= qhull afni qhull5 OPTIONS_DEFINE= DOCS -DOCS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-CMakeLists.txt +PORTDOCS= * -post-patch: - ${REINPLACE_CMD} -e 's#share/man/man#man/man#g' \ - ${WRKSRC}/CMakeLists.txt +DOCS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-CMakeLists.txt .include <bsd.port.mk> Modified: head/math/qhull/distinfo ============================================================================== --- head/math/qhull/distinfo Sat Mar 2 19:19:57 2019 (r494451) +++ head/math/qhull/distinfo Sat Mar 2 19:53:43 2019 (r494452) @@ -1,3 +1,3 @@ -TIMESTAMP = 1472570343 -SHA256 (qhull-2015-src-7.2.0.tgz) = 78b010925c3b577adc3d58278787d7df08f7c8fb02c3490e375eab91bb58a436 -SIZE (qhull-2015-src-7.2.0.tgz) = 1010153 +TIMESTAMP = 1551483695 +SHA256 (qhull-qhull-v7.2.1_GH0.tar.gz) = 6fc251e0b75467e00943bfb7191e986fce0e1f8f6f0251f9c6ce5a843821ea78 +SIZE (qhull-qhull-v7.2.1_GH0.tar.gz) = 1047843 Modified: head/math/qhull/files/patch-CMakeLists.txt ============================================================================== --- head/math/qhull/files/patch-CMakeLists.txt Sat Mar 2 19:19:57 2019 (r494451) +++ head/math/qhull/files/patch-CMakeLists.txt Sat Mar 2 19:53:43 2019 (r494452) @@ -1,6 +1,6 @@ Install docs into share/doc/ rather than include/ ---- CMakeLists.txt.orig 2016-01-19 00:21:32 UTC +--- CMakeLists.txt.orig 2018-12-28 23:33:58 UTC +++ CMakeLists.txt @@ -91,7 +91,7 @@ else() if(WIN32) @@ -11,6 +11,15 @@ Install docs into share/doc/ rather than include/ 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}) Modified: head/math/qhull/pkg-plist ============================================================================== --- head/math/qhull/pkg-plist Sat Mar 2 19:19:57 2019 (r494451) +++ head/math/qhull/pkg-plist Sat Mar 2 19:53:43 2019 (r494452) @@ -65,64 +65,3 @@ lib/libqhullstatic.a lib/libqhullstatic_r.a man/man1/qhull.1.gz man/man1/rbox.1.gz -%%PORTDOCS%%%%DOCSDIR%%/Announce.txt -%%PORTDOCS%%%%DOCSDIR%%/COPYING.txt -%%PORTDOCS%%%%DOCSDIR%%/README.txt -%%PORTDOCS%%%%DOCSDIR%%/REGISTER.txt -%%PORTDOCS%%%%DOCSDIR%%/index.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull/DEPRECATED.txt -%%PORTDOCS%%%%DOCSDIR%%/libqhull/index.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-geom.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-globa.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-io.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-mem.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-merge.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-poly.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-qhull.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-set.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-stat.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull/qh-user.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/index.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-geom_r.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-globa_r.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-io_r.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-mem_r.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-merge_r.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-poly_r.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-qhull_r.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-set_r.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-stat_r.htm -%%PORTDOCS%%%%DOCSDIR%%/libqhull_r/qh-user_r.htm -%%PORTDOCS%%%%DOCSDIR%%/normal_voronoi_knauss_oesterle.jpg -%%PORTDOCS%%%%DOCSDIR%%/qconvex.htm -%%PORTDOCS%%%%DOCSDIR%%/qdelau_f.htm -%%PORTDOCS%%%%DOCSDIR%%/qdelaun.htm -%%PORTDOCS%%%%DOCSDIR%%/qh--4d.gif -%%PORTDOCS%%%%DOCSDIR%%/qh--cone.gif -%%PORTDOCS%%%%DOCSDIR%%/qh--dt.gif -%%PORTDOCS%%%%DOCSDIR%%/qh--geom.gif -%%PORTDOCS%%%%DOCSDIR%%/qh--half.gif -%%PORTDOCS%%%%DOCSDIR%%/qh--rand.gif -%%PORTDOCS%%%%DOCSDIR%%/qh-code.htm -%%PORTDOCS%%%%DOCSDIR%%/qh-eg.htm -%%PORTDOCS%%%%DOCSDIR%%/qh-faq.htm -%%PORTDOCS%%%%DOCSDIR%%/qh-get.htm -%%PORTDOCS%%%%DOCSDIR%%/qh-impre.htm -%%PORTDOCS%%%%DOCSDIR%%/qh-optc.htm -%%PORTDOCS%%%%DOCSDIR%%/qh-optf.htm -%%PORTDOCS%%%%DOCSDIR%%/qh-optg.htm -%%PORTDOCS%%%%DOCSDIR%%/qh-opto.htm -%%PORTDOCS%%%%DOCSDIR%%/qh-optp.htm -%%PORTDOCS%%%%DOCSDIR%%/qh-optq.htm -%%PORTDOCS%%%%DOCSDIR%%/qh-optt.htm -%%PORTDOCS%%%%DOCSDIR%%/qh-quick.htm -%%PORTDOCS%%%%DOCSDIR%%/qhalf.htm -%%PORTDOCS%%%%DOCSDIR%%/qhull-cpp.xml -%%PORTDOCS%%%%DOCSDIR%%/qhull.htm -%%PORTDOCS%%%%DOCSDIR%%/qhull.man -%%PORTDOCS%%%%DOCSDIR%%/qhull.txt -%%PORTDOCS%%%%DOCSDIR%%/qvoron_f.htm -%%PORTDOCS%%%%DOCSDIR%%/qvoronoi.htm -%%PORTDOCS%%%%DOCSDIR%%/rbox.htm -%%PORTDOCS%%%%DOCSDIR%%/rbox.man -%%PORTDOCS%%%%DOCSDIR%%/rbox.txt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903021953.x22JrhdH086462>