Revision: 89591 http://trac.macports.org/changeset/89591 Author: mmoll@macports.org Date: 2012-02-03 09:25:12 -0800 (Fri, 03 Feb 2012) Log Message: ----------- math/qhull: update version to 2012.1 Modified Paths: -------------- trunk/dports/math/qhull/Portfile trunk/dports/math/qhull/files/patch-CMakeLists.txt.diff Added Paths: ----------- trunk/dports/math/qhull/files/patch-nested-const-iterator.diff Removed Paths: ------------- trunk/dports/math/qhull/files/patch-QhullPointSet.h.diff Modified: trunk/dports/math/qhull/Portfile =================================================================== --- trunk/dports/math/qhull/Portfile 2012-02-03 17:18:28 UTC (rev 89590) +++ trunk/dports/math/qhull/Portfile 2012-02-03 17:25:12 UTC (rev 89591) @@ -5,8 +5,7 @@ PortGroup cmake 1.0 name qhull -version 2011.2 -revision 1 +version 2012.1 categories math platforms darwin maintainers mmoll @@ -27,11 +26,11 @@ master_sites ${homepage}/download distname ${name}-${version}-src extract.suffix .tgz -checksums md5 4f4bac7769a5b1e0c6470ea457e2d4d2 \ - sha1 627825d741753573e3589dae1640b7bfc4efbc0b \ - rmd160 db1e2a810b52cd1291d48515c3816f21ee501171 +checksums md5 ed81aa19b203aa0fdb75b41fe6f7a40f \ + sha1 7982ce08436d0b1797d311abd8944c35218639dc \ + rmd160 9923f5dc89d5dd79dd1a304cf5c9083f07291ccd patchfiles patch-CMakeLists.txt.diff \ - patch-QhullPointSet.h.diff + patch-nested-const-iterator.diff # last patch is for g++-4.0 / Leopard, see #31053 worksrcdir ${name}-${version} configure.args-append -DDOC_INSTALL_DIR=share/doc/qhull -DMAN_INSTALL_DIR=share/man/man1 @@ -39,11 +38,6 @@ ln -s ${prefix}/include/libqhull ${destroot}${prefix}/include/qhull ln -s ${prefix}/include/libqhull/libqhull.h ${destroot}${prefix}/include/libqhull/qhull.h # ln -s ${prefix}/include/libqhull/qhull.h-deprecated ${destroot}${prefix}/include/libqhull/qhull.h - if {[variant_isset debug]} { - ln -s ${prefix}/lib/libqhull_d6.dylib ${destroot}${prefix}/lib/libqhull.dylib - } else { - ln -s ${prefix}/lib/libqhull6.dylib ${destroot}${prefix}/lib/libqhull.dylib - } ln -s ${prefix}/lib/libqhullstatic.a ${destroot}${prefix}/lib/libqhull.a } livecheck.type regex Modified: trunk/dports/math/qhull/files/patch-CMakeLists.txt.diff =================================================================== --- trunk/dports/math/qhull/files/patch-CMakeLists.txt.diff 2012-02-03 17:18:28 UTC (rev 89590) +++ trunk/dports/math/qhull/files/patch-CMakeLists.txt.diff 2012-02-03 17:25:12 UTC (rev 89591) @@ -1,15 +1,15 @@ ---- CMakeLists.txt.orig 2011-09-01 08:32:18.000000000 -0500 -+++ CMakeLists.txt 2011-09-01 08:43:55.000000000 -0500 -@@ -181,7 +181,6 @@ +--- CMakeLists.txt.orig 2012-02-03 11:03:32.000000000 -0600 ++++ CMakeLists.txt 2012-02-03 11:03:47.000000000 -0600 +@@ -242,7 +242,6 @@ qhull_TARGETS - ${qhull_CPP} ${qhull_SHARED} ${qhull_STATIC} ${qhull_STATICP} + ${qhull_CPP} ${qhull_STATIC} ${qhull_STATICP} ${qhull_SHARED} ${qhull_SHAREDP} qhull rbox qconvex qdelaunay qvoronoi qhalf -- user_eg user_eg2 user_eg3 +- user_eg user_eg2 user_eg3 testqset ) - # --------------------------------------- -@@ -254,33 +253,21 @@ +@@ -342,33 +341,21 @@ + add_executable(qhull ${qhull_SOURCES}) target_link_libraries(qhull ${qhull_STATIC}) -set_target_properties(qhull PROPERTIES @@ -40,5 +40,5 @@ -set_target_properties(qhalf PROPERTIES - VERSION ${qhull_VERSION}) - add_executable(user_eg2 ${user_eg2_SOURCES}) - target_link_libraries(user_eg2 ${qhull_STATIC}) + # --------------------------------------- + # Define testqset linked to qset.o and mem.o Deleted: trunk/dports/math/qhull/files/patch-QhullPointSet.h.diff =================================================================== --- trunk/dports/math/qhull/files/patch-QhullPointSet.h.diff 2012-02-03 17:18:28 UTC (rev 89590) +++ trunk/dports/math/qhull/files/patch-QhullPointSet.h.diff 2012-02-03 17:25:12 UTC (rev 89591) @@ -1,11 +0,0 @@ ---- src/libqhullcpp/QhullPointSet.h.orig 2011-05-14 09:38:34.000000000 -0500 -+++ src/libqhullcpp/QhullPointSet.h 2011-08-31 15:44:20.000000000 -0500 -@@ -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; Added: trunk/dports/math/qhull/files/patch-nested-const-iterator.diff =================================================================== --- trunk/dports/math/qhull/files/patch-nested-const-iterator.diff (rev 0) +++ trunk/dports/math/qhull/files/patch-nested-const-iterator.diff 2012-02-03 17:25:12 UTC (rev 89591) @@ -0,0 +1,36 @@ +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;