Attachment 177695 Details for Bug 215078 – [patch] update math/qhull to 2015.2

[patch] [patch] update math/qhull to 2015.2

pr-qhull-2015.2.diff (text/plain), 8.62 KB, created by John Hein on 2016-12-05 19:53:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2016-12-05 19:53:43 UTC

Size: 8.62 KB

patch

obsolete

>Index: math/qhull/Makefile
>===================================================================
>--- math/qhull/Makefile	(revision 427775)
>+++ math/qhull/Makefile	(working copy)
>@@ -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
>Index: math/qhull/distinfo
>===================================================================
>--- math/qhull/distinfo	(revision 427775)
>+++ math/qhull/distinfo	(working copy)
>@@ -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
>Index: math/qhull/files/patch-CMakeLists.txt
>===================================================================
>--- math/qhull/files/patch-CMakeLists.txt	(revision 0)
>+++ math/qhull/files/patch-CMakeLists.txt	(working copy)
>@@ -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)
>
>Property changes on: math/qhull/files/patch-CMakeLists.txt
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: math/qhull/files/patch-src__libqhullcpp__QhullIterator.h
>===================================================================
>--- math/qhull/files/patch-src__libqhullcpp__QhullIterator.h	(revision 427775)
>+++ math/qhull/files/patch-src__libqhullcpp__QhullIterator.h	(working copy)
>@@ -1,12 +0,0 @@
>---- src/libqhullcpp/QhullIterator.h.orig	2012-01-26 04:32:05.000000000 +0100
>-+++ src/libqhullcpp/QhullIterator.h	2014-12-19 15:19:26.000000000 +0100
>-@@ -16,8 +16,7 @@
>- #include <assert.h>
>- #include <string>
>- #include <vector>
>--//! Avoid dependence on <iterator>
>--namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }
>-+#include <iterator>
>- 
>- namespace orgQhull {
>- 
>Index: math/qhull/files/patch-src__libqhullcpp__QhullLinkedList.h
>===================================================================
>--- math/qhull/files/patch-src__libqhullcpp__QhullLinkedList.h	(revision 427775)
>+++ math/qhull/files/patch-src__libqhullcpp__QhullLinkedList.h	(working copy)
>@@ -1,11 +0,0 @@
>---- src/libqhullcpp/QhullLinkedList.h.orig	2012-01-26 04:32:05.000000000 +0100
>-+++ src/libqhullcpp/QhullLinkedList.h	2014-12-19 15:19:26.000000000 +0100
>-@@ -9,7 +9,7 @@
>- #ifndef QHULLLINKEDLIST_H
>- #define QHULLLINKEDLIST_H
>- 
>--namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }
>-+#include <iterator>
>- 
>- #include "QhullError.h"
>- 
>Index: math/qhull/files/patch-src_libqhullcpp_QhullSet.h
>===================================================================
>--- math/qhull/files/patch-src_libqhullcpp_QhullSet.h	(revision 0)
>+++ math/qhull/files/patch-src_libqhullcpp_QhullSet.h	(working copy)
>@@ -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++);
>
>Property changes on: math/qhull/files/patch-src_libqhullcpp_QhullSet.h
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: math/qhull/pkg-plist
>===================================================================
>--- math/qhull/pkg-plist	(revision 427775)
>+++ math/qhull/pkg-plist	(working copy)
>@@ -5,27 +5,27 @@
> 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/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 @@
> %%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

Flags:

jcfyecrayz: maintainer-approval? (stephen)

Actions: View | Diff

Attachments on bug 215078: 177695 | 177808