Index: head/math/plplot/Makefile =================================================================== --- head/math/plplot/Makefile (revision 494451) +++ head/math/plplot/Makefile (revision 494452) @@ -1,130 +1,130 @@ # Created by: Thomas Gellekum # $FreeBSD$ PORTNAME= plplot PORTVERSION= 5.12.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math science MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source MAINTAINER= woodsb02@FreeBSD.org COMMENT= Scientific plotting package LICENSE= LGPL21+ BUILD_DEPENDS= bash:shells/bash \ ${FREEFONT_DIR}/FreeMono.ttf:x11-fonts/freefont-ttf LIB_DEPENDS= libLASi.so:devel/lasi \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libltdl.so:devel/libltdl RUN_DEPENDS= bash:shells/bash \ ${FREEFONT_DIR}/FreeMono.ttf:x11-fonts/freefont-ttf USES= compiler:c11 cmake gettext-runtime ghostscript gnome \ localbase perl5 pathfix pkgconfig USE_GNOME= cairo pango USE_PERL5= build CMAKE_ARGS= -DENABLE_java:BOOL=OFF \ -DENABLE_octave:BOOL=OFF \ -DENABLE_pdl:BOOL=OFF \ -DENABLE_ada:BOOL=OFF \ -DENABLE_d:BOOL=OFF \ -DENABLE_ocaml:BOOL=OFF \ -DENABLE_pyqt4:BOOL=OFF \ -DPL_FREETYPE_FONT_PATH:PATH="${FREEFONT_DIR}" \ -DCMAKE_INSTALL_PKG_CONFIG_DIR:PATH="${PREFIX}/libdata/pkgconfig" \ -DPLD_plmeta:BOOL=OFF CFLAGS+= -D_IS_BUILDING_PLPLOT_PORT_ USE_LDCONFIG= yes FREEFONT_DIR= ${LOCALBASE}/share/fonts/freefont-ttf OPTIONS_DEFINE= DOCS FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11 OPTIONS_RADIO= QHULL OPTIONS_RADIO_QHULL= QHULL2015 QHULL2003 OPTIONS_DEFAULT= QHULL2015 THREADS X11 OPTIONS_SUB= yes FORTRAN_USES= fortran FORTRAN_CMAKE_BOOL= ENABLE_f95 FORTRAN_CONFIGURE_ENV= CMAKE_Fortran_COMPILER="${FC}" GD_LIB_DEPENDS= libgd.so:graphics/gd \ libpng.so:graphics/png GD_USES= jpeg GD_CMAKE_BOOL= PLD_png LUA_USES= lua:51 LUA_CMAKE_BOOL= ENABLE_lua LUA_CMAKE_ON= -DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}" PYTHON_USES= python:2.7 PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30 \ ${PYNUMPY} PYTHON_BINARY_ALIAS= swig=swig3.0 PYTHON_RUN_DEPENDS= ${PYNUMPY} PYTHON_CMAKE_BOOL= ENABLE_python PYTHON_CONFIGURE_ENV= PYTHON_VERSION="${PYTHON_VERSION}" PYTHON_BROKEN= Does not package QHULL2003_DESC= Legacy Qhull support QHULL2015_DESC= Latest Qhull support QHULL2015_LIB_DEPENDS= libqhull.so.7:math/qhull QHULL2003_LIB_DEPENDS= libqhull.so.5:math/qhull5 QHULL2015_CMAKE_ON= -DQHULL_INCLUDE_DIRS:PATH="${LOCALBASE}/include/libqhull" TCLTK_LIB_DEPENDS= libitk.so:x11-toolkits/itk TCLTK_RUN_DEPENDS= iwidgets>0:x11-toolkits/iwidgets TCLTK_USES= tk TCLTK_CMAKE_BOOL= ENABLE_tcl TCLTK_IMPLIES= X11 ITCL_VER= 3.4.1 ITK_VER= 3.3 IWIDGETS_VER= 4.0.1 TCLTK_CMAKE_ON= -DPLPLOT_TK_VERSION:STRING="${TK_VER}" \ -DPLPLOT_ITCL_VERSION:STRING="${ITCL_VER}" \ -DPLPLOT_ITK_VERSION:STRING="${ITK_VER}" \ -DIWIDGETS_VERSIONS_LIST:STRING="${IWIDGETS_VER};${ITK_VER};${ITCL_VER}" \ -DTCL_TCLSH:FILEPATH="${TCLSH}" \ -DTCL_INCLUDE_PATH:PATH="${TCL_INCLUDEDIR}" \ -DITCL_INCLUDE_PATH:PATH="${LOCALBASE}/include/itcl${ITCL_VER}" \ -DITCL_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitcl.so" \ -DTK_INCLUDE_PATH:PATH="${TK_INCLUDEDIR}" \ -DITK_INCLUDE_PATH:PATH="${LOCALBASE}/include/itk${ITK_VER}" \ -DITK_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitk.so" THREADS_CMAKE_BOOL= THREADS_HAVE_PTHREAD_ARG QT4_USES= qt:4 QT4_USE= QT=corelib,gui,svg,xml,moc_build,qmake_build,rcc_build,uic_build QT4_CMAKE_BOOL= ENABLE_qt QT4_CMAKE_BOOL_OFF= DEFAULT_NO_QT_DEVICES WXGTK_LIB_DEPENDS= libagg.so:graphics/agg WXGTK_USE= WX=3.0+ WXGTK_CMAKE_BOOL= ENABLE_wxwidgets WXGTK_CMAKE_ON= -DwxWidgets_CONFIG_EXECUTABLE:FILEPATH="${WX_CONFIG}" X11_USE= XORG=ice,sm,x11,xext X11_CMAKE_BOOL= PLD_xcairo PLD_xwin .include .if ${PORT_OPTIONS:MQT4} DEPRECATED= Qt4 has been EOL since december 2015 EXPIRATION_DATE= 2019-03-15 .endif post-patch: ${REINPLACE_CMD} -e \ 's|dl dlopen|c dlopen|' \ ${WRKSRC}/cmake/modules/FindLTDL.cmake ${GREP} -lR "/usr/local" ${WRKSRC}/cmake/modules | ${XARGS} \ ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' post-patch-QHULL2015: ${REINPLACE_CMD} -e 's|qhull/qhull_a|libqhull/qhull_a|' \ ${WRKSRC}/lib/nn/delaunay.c \ ${WRKSRC}/src/plgridd.c .include Index: head/math/qhull/Makefile =================================================================== --- head/math/qhull/Makefile (revision 494451) +++ head/math/qhull/Makefile (revision 494452) @@ -1,32 +1,30 @@ # Created by: pusto@web.de # $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 LICENSE= Qhull 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 Index: head/math/qhull/distinfo =================================================================== --- head/math/qhull/distinfo (revision 494451) +++ head/math/qhull/distinfo (revision 494452) @@ -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 Index: head/math/qhull/files/patch-src_libqhullcpp_QhullSet.h =================================================================== --- head/math/qhull/files/patch-src_libqhullcpp_QhullSet.h (revision 494451) +++ head/math/qhull/files/patch-src_libqhullcpp_QhullSet.h (nonexistent) @@ -1,18 +0,0 @@ -c++ 4.2 (in base 9.x) has a weakness that emits 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 (can remove after 9.x EOL). - ---- src/libqhullcpp/QhullSet.h.orig 2016-01-18 19:45:12 UTC -+++ src/libqhullcpp/QhullSet.h -@@ -327,8 +327,8 @@ template - std::vector QhullSet:: - toStdVector() const - { -- QhullSet::const_iterator i= begin(); -- QhullSet::const_iterator e= end(); -+ const_iterator i= begin(); -+ const_iterator e= end(); - std::vector vs; - while(i!=e){ - vs.push_back(*i++); Property changes on: head/math/qhull/files/patch-src_libqhullcpp_QhullSet.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/qhull/files/patch-CMakeLists.txt =================================================================== --- head/math/qhull/files/patch-CMakeLists.txt (revision 494451) +++ head/math/qhull/files/patch-CMakeLists.txt (revision 494452) @@ -1,25 +1,34 @@ 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) 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) Index: head/math/qhull/pkg-plist =================================================================== --- head/math/qhull/pkg-plist (revision 494451) +++ head/math/qhull/pkg-plist (revision 494452) @@ -1,128 +1,67 @@ bin/qconvex bin/qdelaunay bin/qhalf bin/qhull bin/qvoronoi bin/rbox include/libqhull/geom.h include/libqhull/io.h include/libqhull/libqhull.h include/libqhull/mem.h include/libqhull/merge.h include/libqhull/poly.h 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 include/libqhullcpp/QhullError.h include/libqhullcpp/QhullFacet.h include/libqhullcpp/QhullFacetList.h include/libqhullcpp/QhullFacetSet.h include/libqhullcpp/QhullHyperplane.h include/libqhullcpp/QhullIterator.h include/libqhullcpp/QhullLinkedList.h include/libqhullcpp/QhullPoint.h include/libqhullcpp/QhullPointSet.h include/libqhullcpp/QhullPoints.h include/libqhullcpp/QhullQh.h include/libqhullcpp/QhullRidge.h include/libqhullcpp/QhullSet.h include/libqhullcpp/QhullSets.h include/libqhullcpp/QhullStat.h include/libqhullcpp/QhullVertex.h include/libqhullcpp/QhullVertexSet.h include/libqhullcpp/RboxPoints.h include/libqhullcpp/RoadError.h include/libqhullcpp/RoadLogEvent.h include/libqhullcpp/RoadTest.h include/libqhullcpp/functionObjects.h lib/libqhull.so lib/libqhull.so.7 lib/libqhull.so.7.2.0 lib/libqhull_p.so 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_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