Date: Thu, 8 Dec 2016 13:32:59 +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: r428116 - in head/math: plplot qhull qhull/files Message-ID: <201612081332.uB8DWxPD068764@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: stephen Date: Thu Dec 8 13:32:59 2016 New Revision: 428116 URL: https://svnweb.freebsd.org/changeset/ports/428116 Log: qhull: - Update to 2015.2. - Install docs in DOCSDIR. - Add a workaround patch for 9.x base compiler. plplot: - Accomodate changes to qhull, including port revision bump. PR: ports/215078 Submitted by: John Hein <z7dr6ut7gs@snkmail.com> Added: head/math/qhull/files/patch-CMakeLists.txt (contents, props changed) head/math/qhull/files/patch-src_libqhullcpp_QhullSet.h (contents, props changed) Deleted: head/math/qhull/files/patch-src__libqhullcpp__QhullIterator.h head/math/qhull/files/patch-src__libqhullcpp__QhullLinkedList.h Modified: head/math/plplot/Makefile head/math/qhull/Makefile head/math/qhull/distinfo head/math/qhull/pkg-plist Modified: head/math/plplot/Makefile ============================================================================== --- head/math/plplot/Makefile Thu Dec 8 13:11:02 2016 (r428115) +++ head/math/plplot/Makefile Thu Dec 8 13:32:59 2016 (r428116) @@ -40,8 +40,8 @@ FREEFONT_DIR= ${LOCALBASE}/share/fonts/f OPTIONS_DEFINE= FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11 DOCS OPTIONS_RADIO= QHULL -OPTIONS_RADIO_QHULL= QHULL2012 QHULL2003 -OPTIONS_DEFAULT= QHULL2012 THREADS X11 +OPTIONS_RADIO_QHULL= QHULL2015 QHULL2003 +OPTIONS_DEFAULT= QHULL2015 THREADS X11 OPTIONS_SUB= yes FORTRAN_USES= fortran @@ -64,11 +64,11 @@ PYTHON_CONFIGURE_ENV= PYTHON_VERSION="${ PYTHON_CMAKE_OFF= -DENABLE_python:BOOL=OFF QHULL2003_DESC= Legacy Qhull support -QHULL2012_DESC= Latest Qhull support -QHULL2012_LIB_DEPENDS= libqhull.so.6:math/qhull +QHULL2015_DESC= Latest Qhull support +QHULL2015_LIB_DEPENDS= libqhull.so.7:math/qhull QHULL2003_LIB_DEPENDS= libqhull.so.5:math/qhull5 -QHULL2012_CMAKE_ON= -DQHULL_INCLUDE_DIRS="${LOCALBASE}/include/libqhull" -QHULL2012_2FIX= lib/nn/delaunay.c src/plgridd.c +QHULL2015_CMAKE_ON= -DQHULL_INCLUDE_DIRS="${LOCALBASE}/include/libqhull" +QHULL2015_2FIX= lib/nn/delaunay.c src/plgridd.c TCLTK_LIB_DEPENDS= libitk.so:x11-toolkits/itk TCLTK_RUN_DEPENDS= iwidgets>0:x11-toolkits/iwidgets @@ -114,8 +114,8 @@ pre-configure: ${WRKSRC}/cmake/modules/FindLTDL.cmake ${GREP} -lR "/usr/local" ${WRKSRC}/cmake/modules | ${XARGS} \ ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' -.if ${PORT_OPTIONS:MQHULL2012} -. for src in ${QHULL2012_2FIX} +.if ${PORT_OPTIONS:MQHULL2015} +. for src in ${QHULL2015_2FIX} ${REINPLACE_CMD} -e 's|qhull/qhull_a|libqhull/qhull_a|' \ ${WRKSRC}/${src} . endfor Modified: head/math/qhull/Makefile ============================================================================== --- head/math/qhull/Makefile Thu Dec 8 13:11:02 2016 (r428115) +++ head/math/qhull/Makefile Thu Dec 8 13:32:59 2016 (r428116) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= qhull -PORTVERSION= 2012.1 +PORTVERSION= 2015.2 CATEGORIES= math MASTER_SITES= http://www.qhull.org/download/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-src +DISTNAME= ${PORTNAME}-2015-src-7.2.0 MAINTAINER= stephen@FreeBSD.org COMMENT= Qhull computes convex hulls, Delaunay triangulations, and halfspaces Modified: head/math/qhull/distinfo ============================================================================== --- head/math/qhull/distinfo Thu Dec 8 13:11:02 2016 (r428115) +++ head/math/qhull/distinfo Thu Dec 8 13:32:59 2016 (r428116) @@ -1,2 +1,3 @@ -SHA256 (qhull-2012.1-src.tgz) = a35ecaa610550b7f05c3ce373d89c30cf74b059a69880f03080c556daebcff88 -SIZE (qhull-2012.1-src.tgz) = 716665 +TIMESTAMP = 1472570343 +SHA256 (qhull-2015-src-7.2.0.tgz) = 78b010925c3b577adc3d58278787d7df08f7c8fb02c3490e375eab91bb58a436 +SIZE (qhull-2015-src-7.2.0.tgz) = 1010153 Added: head/math/qhull/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/qhull/files/patch-CMakeLists.txt Thu Dec 8 13:32:59 2016 (r428116) @@ -0,0 +1,25 @@ +Install docs into share/doc/ rather than include/ + +--- CMakeLists.txt.orig 2016-01-19 00:21:32 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) +@@ -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) Added: head/math/qhull/files/patch-src_libqhullcpp_QhullSet.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/qhull/files/patch-src_libqhullcpp_QhullSet.h Thu Dec 8 13:32:59 2016 (r428116) @@ -0,0 +1,18 @@ +c++ 4.2 (in base 9.x) gives a bogus error: +/usr/ports/math/qhull/work/qhull-2015.2/src/libqhullcpp/QhullSet.h:330: error: expected `;' before 'i' + + Work around that by removing overspecified part of type declaration. + +--- src/libqhullcpp/QhullSet.h.orig 2016-01-18 19:45:12 UTC ++++ src/libqhullcpp/QhullSet.h +@@ -327,8 +327,8 @@ template <typename T> + std::vector<T> QhullSet<T>:: + toStdVector() const + { +- QhullSet<T>::const_iterator i= begin(); +- QhullSet<T>::const_iterator e= end(); ++ const_iterator i= begin(); ++ const_iterator e= end(); + std::vector<T> vs; + while(i!=e){ + vs.push_back(*i++); Modified: head/math/qhull/pkg-plist ============================================================================== --- head/math/qhull/pkg-plist Thu Dec 8 13:11:02 2016 (r428115) +++ head/math/qhull/pkg-plist Thu Dec 8 13:32:59 2016 (r428116) @@ -5,27 +5,27 @@ bin/qhull bin/qvoronoi bin/rbox include/libqhull/geom.h -include/libqhull/index.htm include/libqhull/io.h include/libqhull/libqhull.h include/libqhull/mem.h include/libqhull/merge.h include/libqhull/poly.h -include/libqhull/qh-geom.htm -include/libqhull/qh-globa.htm -include/libqhull/qh-io.htm -include/libqhull/qh-mem.htm -include/libqhull/qh-merge.htm -include/libqhull/qh-poly.htm -include/libqhull/qh-qhull.htm -include/libqhull/qh-set.htm -include/libqhull/qh-stat.htm -include/libqhull/qh-user.htm 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 @@ -50,15 +50,19 @@ include/libqhullcpp/RboxPoints.h include/libqhullcpp/RoadError.h include/libqhullcpp/RoadLogEvent.h include/libqhullcpp/RoadTest.h -include/libqhullcpp/UsingLibQhull.h include/libqhullcpp/functionObjects.h lib/libqhull.so -lib/libqhull.so.6 +lib/libqhull.so.7 +lib/libqhull.so.7.2.0 lib/libqhull_p.so -lib/libqhull_p.so.6 +lib/libqhull_p.so.7 +lib/libqhull_p.so.7.2.0 +lib/libqhull_r.so +lib/libqhull_r.so.7 +lib/libqhull_r.so.7.2.0 lib/libqhullcpp.a lib/libqhullstatic.a -lib/libqhullstatic_p.a +lib/libqhullstatic_r.a man/man1/qhull.1.gz man/man1/rbox.1.gz %%PORTDOCS%%%%DOCSDIR%%/Announce.txt @@ -66,6 +70,29 @@ man/man1/rbox.1.gz %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612081332.uB8DWxPD068764>