[148369] trunk/dports/math/qhull

[vince at macports.org]

Revision: 148369
          https://trac.macports.org/changeset/148369
Author:   vince at macports.org
Date:     2016-05-05 10:33:15 -0700 (Thu, 05 May 2016)
Log Message:
-----------
qhull: bump to 7.2 (a.k.a. 2015.2)

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

Removed Paths:
-------------
    trunk/dports/math/qhull/files/patch-nested-const-iterator.diff
    trunk/dports/math/qhull/files/patch-use-stl-iterator.diff

Modified: trunk/dports/math/qhull/Portfile
===================================================================
--- trunk/dports/math/qhull/Portfile	2016-05-05 17:13:02 UTC (rev 148368)
+++ trunk/dports/math/qhull/Portfile	2016-05-05 17:33:15 UTC (rev 148369)
@@ -6,9 +6,10 @@
 cmake.out_of_source yes
 
 name                qhull
-version             2012.1
-revision            3
-dist_subdir         ${name}/${version}_1
+set                 vyear   2015
+set                 vext    2
+version             ${vyear}.${vext}
+#dist_subdir         ${name}/${version}_1
 categories          math
 platforms           darwin
 maintainers         mmoll
@@ -27,16 +28,23 @@
 
 homepage            http://www.qhull.org
 master_sites        ${homepage}/download
-distname            ${name}-${version}-src
+distname            ${name}-${vyear}-src-7.${vext}.0
 extract.suffix      .tgz
-checksums           md5     d0f978c0d8dfb2e919caefa56ea2953c \
-                    sha1    60f61580e1d6fbbd28e6df2ff625c98d15b5fbc6 \
-                    rmd160  4199d326414087512efbbca25db8be51f69ef730
+
+checksums           rmd160  1176d0477771294eb096cf6ed2d26cb8186b8613 \
+                    sha256  78b010925c3b577adc3d58278787d7df08f7c8fb02c3490e375eab91bb58a436
+
 # 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
+#patchfiles          patch-nested-const-iterator.diff patch-use-stl-iterator.diff
 worksrcdir          ${name}-${version}
+
+variant perf {
+    configure.optflags  -O3 -pipe -march=native
+}
+
 configure.args-append   -DDOC_INSTALL_DIR=share/doc/qhull -DMAN_INSTALL_DIR=share/man/man1
+
 post-destroot {
     ln -s ${prefix}/include/libqhull ${destroot}${prefix}/include/qhull
     ln -s ${prefix}/include/libqhull/libqhull.h ${destroot}${prefix}/include/libqhull/qhull.h

Deleted: trunk/dports/math/qhull/files/patch-nested-const-iterator.diff
===================================================================
--- trunk/dports/math/qhull/files/patch-nested-const-iterator.diff	2016-05-05 17:13:02 UTC (rev 148368)
+++ trunk/dports/math/qhull/files/patch-nested-const-iterator.diff	2016-05-05 17:33:15 UTC (rev 148369)
@@ -1,36 +0,0 @@
-diff -rubw src/libqhullcpp.orig/Coordinates.h src/libqhullcpp/Coordinates.h
---- src/libqhullcpp.orig/Coordinates.h	2012-02-03 11:06:38.000000000 -0600
-+++ src/libqhullcpp/Coordinates.h	2012-02-03 11:09:06.000000000 -0600
-@@ -148,7 +148,7 @@
- 
-     private:
-         std::vector<coordT>::iterator i;
--        friend class    const_iterator;
-+        friend class    Coordinates::const_iterator;
- 
-     public:
-         typedef std::random_access_iterator_tag  iterator_category;
-diff -rubw src/libqhullcpp.orig/QhullLinkedList.h src/libqhullcpp/QhullLinkedList.h
---- src/libqhullcpp.orig/QhullLinkedList.h	2012-02-03 11:06:38.000000000 -0600
-+++ src/libqhullcpp/QhullLinkedList.h	2012-02-03 11:09:08.000000000 -0600
-@@ -112,7 +112,7 @@
- 
-     private:
-         T               i;
--        friend class    const_iterator;
-+        friend class    QhullLinkedList::const_iterator;
- 
-     public:
-         typedef std::bidirectional_iterator_tag  iterator_category;
-diff -rubw src/libqhullcpp.orig/QhullPointSet.h src/libqhullcpp/QhullPointSet.h
---- src/libqhullcpp.orig/QhullPointSet.h	2012-02-03 11:06:38.000000000 -0600
-+++ src/libqhullcpp/QhullPointSet.h	2012-02-03 11:09:10.000000000 -0600
-@@ -111,7 +111,7 @@
- 
-     // before const_iterator for conversion with comparison operators
-     class iterator {
--        friend class    const_iterator;
-+        friend class    QhullPointSet::const_iterator;
- 
-     private:
-         coordT        **i;

Deleted: trunk/dports/math/qhull/files/patch-use-stl-iterator.diff
===================================================================
--- trunk/dports/math/qhull/files/patch-use-stl-iterator.diff	2016-05-05 17:13:02 UTC (rev 148368)
+++ trunk/dports/math/qhull/files/patch-use-stl-iterator.diff	2016-05-05 17:33:15 UTC (rev 148369)
@@ -1,23 +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 {
-
---- 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/20160505/b5f4d8c4/attachment.html>