[135137] trunk/dports/math/qhull

[mmoll at macports.org]

Revision: 135137
          https://trac.macports.org/changeset/135137
Author:   mmoll at macports.org
Date:     2015-04-16 07:42:23 -0700 (Thu, 16 Apr 2015)
Log Message:
-----------
math/qhull: use STL iterator. Closes #47472

Modified Paths:
--------------
    trunk/dports/math/qhull/Portfile

Added Paths:
-----------
    trunk/dports/math/qhull/files/patch-use-stl-iterator.diff

Modified: trunk/dports/math/qhull/Portfile
===================================================================
--- trunk/dports/math/qhull/Portfile	2015-04-16 12:15:53 UTC (rev 135136)
+++ trunk/dports/math/qhull/Portfile	2015-04-16 14:42:23 UTC (rev 135137)
@@ -32,8 +32,9 @@
 checksums           md5     d0f978c0d8dfb2e919caefa56ea2953c \
                     sha1    60f61580e1d6fbbd28e6df2ff625c98d15b5fbc6 \
                     rmd160  4199d326414087512efbbca25db8be51f69ef730
-# patch for g++-4.0 / Leopard, see #31053
-patchfiles          patch-nested-const-iterator.diff
+# first patch for g++-4.0 / Leopard, see #31053
+# second patch for clang-3.5 and above, see https://bugs.freebsd.org/bugzilla/attachment.cgi?id=150764 and #47472
+patchfiles          patch-nested-const-iterator.diff patch-use-stl-iterator.diff
 worksrcdir          ${name}-${version}
 configure.args-append   -DDOC_INSTALL_DIR=share/doc/qhull -DMAN_INSTALL_DIR=share/man/man1
 post-destroot {

Added: trunk/dports/math/qhull/files/patch-use-stl-iterator.diff
===================================================================
--- trunk/dports/math/qhull/files/patch-use-stl-iterator.diff	                        (rev 0)
+++ trunk/dports/math/qhull/files/patch-use-stl-iterator.diff	2015-04-16 14:42:23 UTC (rev 135137)
@@ -0,0 +1,23 @@
+--- 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 {
+
+--- 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"
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150416/4adfdf2d/attachment-0001.html>