December 2014 - macports-changes - lists.macosforge.org

[130416] trunk/dports/python
by larryv＠macports.org 30 Dec '14

30 Dec '14

Revision: 130416 https://trac.macports.org/changeset/130416 Author: larryv(a)macports.org Date: 2014-12-29 22:41:41 -0800 (Mon, 29 Dec 2014) Log Message: ----------- py{24,25,31,32}-dnspython: Replace with py{27,34} Modified Paths: -------------- trunk/dports/python/py-dnspython/Portfile trunk/dports/python/py-graveyard/Portfile Modified: trunk/dports/python/py-dnspython/Portfile =================================================================== --- trunk/dports/python/py-dnspython/Portfile 2014-12-30 06:41:38 UTC (rev 130415) +++ trunk/dports/python/py-dnspython/Portfile 2014-12-30 06:41:41 UTC (rev 130416) @@ -21,7 +21,7 @@ master_sites ${homepage}kits/${version} distname dnspython-${version} -python.versions 24 25 26 27 31 32 33 34 +python.versions 26 27 33 34 checksums rmd160 e17bd5b87b45e6ca3192110bed1997be2c43861c \ sha256 03fb82af866001c4afa58c48027bcc4b80bbf0a7f27e1d861cf06393eea4724f Modified: trunk/dports/python/py-graveyard/Portfile =================================================================== --- trunk/dports/python/py-graveyard/Portfile 2014-12-30 06:41:38 UTC (rev 130415) +++ trunk/dports/python/py-graveyard/Portfile 2014-12-30 06:41:41 UTC (rev 130416) @@ -136,6 +136,7 @@ py-django-nose 1.2 25 32 py-djvubind 1.2.1_2 31 32 py-dns 2.3.4_1 24 25 26 +py-dnspython 1.12.0_1 24 25 31 32 py-docopt 0.6.2_1 25 26 32 33 py-dsv 1.4.0_2 24 py-dynd 0.6.5_1 26 33

1 0

[130415] trunk/dports/python/py-dnspython/Portfile
by larryv＠macports.org 30 Dec '14

30 Dec '14

Revision: 130415 https://trac.macports.org/changeset/130415 Author: larryv(a)macports.org Date: 2014-12-29 22:41:38 -0800 (Mon, 29 Dec 2014) Log Message: ----------- py-dnspython: Add Python 3.4 subport Modified Paths: -------------- trunk/dports/python/py-dnspython/Portfile Modified: trunk/dports/python/py-dnspython/Portfile =================================================================== --- trunk/dports/python/py-dnspython/Portfile 2014-12-30 06:41:36 UTC (rev 130414) +++ trunk/dports/python/py-dnspython/Portfile 2014-12-30 06:41:38 UTC (rev 130415) @@ -21,7 +21,7 @@ master_sites ${homepage}kits/${version} distname dnspython-${version} -python.versions 24 25 26 27 31 32 33 +python.versions 24 25 26 27 31 32 33 34 checksums rmd160 e17bd5b87b45e6ca3192110bed1997be2c43861c \ sha256 03fb82af866001c4afa58c48027bcc4b80bbf0a7f27e1d861cf06393eea4724f

1 0

[130414] trunk/dports/python
by larryv＠macports.org 30 Dec '14

30 Dec '14

Revision: 130414 https://trac.macports.org/changeset/130414 Author: larryv(a)macports.org Date: 2014-12-29 22:41:36 -0800 (Mon, 29 Dec 2014) Log Message: ----------- py{31,32}-djvubind: Replace with py34 Modified Paths: -------------- trunk/dports/python/py-djvubind/Portfile trunk/dports/python/py-graveyard/Portfile Modified: trunk/dports/python/py-djvubind/Portfile =================================================================== --- trunk/dports/python/py-djvubind/Portfile 2014-12-30 06:41:30 UTC (rev 130413) +++ trunk/dports/python/py-djvubind/Portfile 2014-12-30 06:41:36 UTC (rev 130414) @@ -7,7 +7,7 @@ name py-djvubind version 1.2.1 revision 1 -python.versions 31 32 33 34 +python.versions 33 34 platforms darwin supported_archs noarch maintainers raphael openmaintainer Modified: trunk/dports/python/py-graveyard/Portfile =================================================================== --- trunk/dports/python/py-graveyard/Portfile 2014-12-30 06:41:30 UTC (rev 130413) +++ trunk/dports/python/py-graveyard/Portfile 2014-12-30 06:41:36 UTC (rev 130414) @@ -134,6 +134,7 @@ py-distutils-extra 1.91.2_1 25 26 py-django 1.5.1_1 32 py-django-nose 1.2 25 32 +py-djvubind 1.2.1_2 31 32 py-dns 2.3.4_1 24 25 26 py-docopt 0.6.2_1 25 26 32 33 py-dsv 1.4.0_2 24

1 0

[130413] trunk/dports/python/py-djvubind/Portfile
by larryv＠macports.org 30 Dec '14

30 Dec '14

Revision: 130413 https://trac.macports.org/changeset/130413 Author: larryv(a)macports.org Date: 2014-12-29 22:41:30 -0800 (Mon, 29 Dec 2014) Log Message: ----------- py-djvubind: Add Python 3.4 subport Modified Paths: -------------- trunk/dports/python/py-djvubind/Portfile Modified: trunk/dports/python/py-djvubind/Portfile =================================================================== --- trunk/dports/python/py-djvubind/Portfile 2014-12-30 06:37:23 UTC (rev 130412) +++ trunk/dports/python/py-djvubind/Portfile 2014-12-30 06:41:30 UTC (rev 130413) @@ -7,8 +7,7 @@ name py-djvubind version 1.2.1 revision 1 -python.versions 31 32 33 -python.default_version 32 +python.versions 31 32 33 34 platforms darwin supported_archs noarch maintainers raphael openmaintainer

1 0

[130412] trunk/dports/lang/libcxx/Portfile
by jeremyhu＠macports.org 30 Dec '14

30 Dec '14

Revision: 130412 https://trac.macports.org/changeset/130412 Author: jeremyhu(a)macports.org Date: 2014-12-29 22:37:23 -0800 (Mon, 29 Dec 2014) Log Message: ----------- libcxx: Bump to 3.5.0 Modified Paths: -------------- trunk/dports/lang/libcxx/Portfile Modified: trunk/dports/lang/libcxx/Portfile =================================================================== --- trunk/dports/lang/libcxx/Portfile 2014-12-30 06:32:59 UTC (rev 130411) +++ trunk/dports/lang/libcxx/Portfile 2014-12-30 06:37:23 UTC (rev 130412) @@ -4,7 +4,7 @@ PortGroup compiler_blacklist_versions 1.0 name libcxx -version 3.4.2 +version 3.5.0 epoch 1 categories lang platforms darwin @@ -17,12 +17,13 @@ master_sites http://www.llvm.org/releases/${version}/ dist_subdir llvm - -extract.suffix .src.tar.gz + +use_xz yes +extract.suffix .src.tar.xz worksrcdir ${name}-${version}.src -checksums rmd160 7984caf2d055ea967544107ae1f948c77556d764 \ - sha256 826543ee2feb5d3313b0705145255ebb2ed8d52eace878279c2525ccde6e727c +checksums rmd160 ced5e8f98ba32ad792e77e5977b527d2e3388aa2 \ + sha256 8045da845a63e50c201939eda8290d45e5752a9385d4d626214300d4a4d0b1c0 variant universal {} use_configure no

1 0

[130411] trunk/dports/lang/libcxx/Portfile
by jeremyhu＠macports.org 30 Dec '14

30 Dec '14

Revision: 130411 https://trac.macports.org/changeset/130411 Author: jeremyhu(a)macports.org Date: 2014-12-29 22:32:59 -0800 (Mon, 29 Dec 2014) Log Message: ----------- libcxx: dist_subdir llvm Modified Paths: -------------- trunk/dports/lang/libcxx/Portfile Modified: trunk/dports/lang/libcxx/Portfile =================================================================== --- trunk/dports/lang/libcxx/Portfile 2014-12-30 06:32:29 UTC (rev 130410) +++ trunk/dports/lang/libcxx/Portfile 2014-12-30 06:32:59 UTC (rev 130411) @@ -16,6 +16,7 @@ homepage http://libcxx.llvm.org/ master_sites http://www.llvm.org/releases/${version}/ +dist_subdir llvm extract.suffix .src.tar.gz worksrcdir ${name}-${version}.src

1 0

[130410] trunk/dports/lang/libcxxabi/Portfile
by jeremyhu＠macports.org 30 Dec '14

30 Dec '14

Revision: 130410 https://trac.macports.org/changeset/130410 Author: jeremyhu(a)macports.org Date: 2014-12-29 22:32:29 -0800 (Mon, 29 Dec 2014) Log Message: ----------- libcxxabi: dist_subdir llvm Modified Paths: -------------- trunk/dports/lang/libcxxabi/Portfile Modified: trunk/dports/lang/libcxxabi/Portfile =================================================================== --- trunk/dports/lang/libcxxabi/Portfile 2014-12-30 06:28:28 UTC (rev 130409) +++ trunk/dports/lang/libcxxabi/Portfile 2014-12-30 06:32:29 UTC (rev 130410) @@ -17,6 +17,7 @@ homepage http://libcxxabi.llvm.org/ master_sites http://www.llvm.org/releases/${version}/ +dist_subdir llvm use_xz yes extract.suffix .src.tar.xz

1 0

[130409] trunk/dports/lang/libcxxabi/Portfile
by jeremyhu＠macports.org 30 Dec '14

30 Dec '14

Revision: 130409 https://trac.macports.org/changeset/130409 Author: jeremyhu(a)macports.org Date: 2014-12-29 22:28:28 -0800 (Mon, 29 Dec 2014) Log Message: ----------- libcxxabi: Bump to 3.5.0 Modified Paths: -------------- trunk/dports/lang/libcxxabi/Portfile Modified: trunk/dports/lang/libcxxabi/Portfile =================================================================== --- trunk/dports/lang/libcxxabi/Portfile 2014-12-30 06:21:01 UTC (rev 130408) +++ trunk/dports/lang/libcxxabi/Portfile 2014-12-30 06:28:28 UTC (rev 130409) @@ -4,6 +4,8 @@ PortGroup compiler_blacklist_versions 1.0 name libcxxabi +version 3.5.0 +epoch 1 categories lang platforms darwin license MIT NCSA @@ -14,12 +16,15 @@ homepage http://libcxxabi.llvm.org/ -fetch.type svn -svn.revision 213214 -version ${svn.revision} -worksrcdir trunk -svn.url http://llvm.org/svn/llvm-project/libcxxabi/trunk +master_sites http://www.llvm.org/releases/${version}/ + +use_xz yes +extract.suffix .src.tar.xz +worksrcdir ${name}-${version}.src +checksums rmd160 e4db7c7b07580304c5ae9cf03895d7b6470ecd0b \ + sha256 53c6be6a2dd2371f6d92c968cb8a59fbe13c6153583025433df067f706bfacd9 + set root_path ${prefix}/var/host/${name}-${version}-${revision} patch.pre_args -p1

1 0

[130408] trunk/dports/lang/libcxxabi/Portfile
by jeremyhu＠macports.org 30 Dec '14

30 Dec '14

Revision: 130408 https://trac.macports.org/changeset/130408 Author: jeremyhu(a)macports.org Date: 2014-12-29 22:21:01 -0800 (Mon, 29 Dec 2014) Log Message: ----------- libcxxabi: Bump to r213214 and drop dependency on libunwind-headers Revision Links: -------------- https://trac.macports.org/changeset/213214 Modified Paths: -------------- trunk/dports/lang/libcxxabi/Portfile Modified: trunk/dports/lang/libcxxabi/Portfile =================================================================== --- trunk/dports/lang/libcxxabi/Portfile 2014-12-30 06:13:53 UTC (rev 130407) +++ trunk/dports/lang/libcxxabi/Portfile 2014-12-30 06:21:01 UTC (rev 130408) @@ -15,7 +15,7 @@ homepage http://libcxxabi.llvm.org/ fetch.type svn -svn.revision 210661 +svn.revision 213214 version ${svn.revision} worksrcdir trunk svn.url http://llvm.org/svn/llvm-project/libcxxabi/trunk @@ -45,11 +45,6 @@ # 3.5 and 3.6 are blacklisted to prevent dependency cycles compiler.blacklist *gcc* {clang < 100} macports-clang-3.5 macports-clang-3.6 - depends_build port:libunwind-headers - # libunwind-headers' contents moved in r127042. - configure.cppflags-append \ - -isystem ${prefix}/Developer/SDKs/Darwin${os.major}.sdk/usr/include - supported_archs i386 x86_64 build.dir ${worksrcpath}/lib

1 0

[130407] trunk/dports/lang/libcxxabi
by jeremyhu＠macports.org 30 Dec '14

30 Dec '14

Revision: 130407 https://trac.macports.org/changeset/130407 Author: jeremyhu(a)macports.org Date: 2014-12-29 22:13:53 -0800 (Mon, 29 Dec 2014) Log Message: ----------- libcxxabi: Bump to r210661 Revision Links: -------------- https://trac.macports.org/changeset/210661 Modified Paths: -------------- trunk/dports/lang/libcxxabi/Portfile Added Paths: ----------- trunk/dports/lang/libcxxabi/files/ trunk/dports/lang/libcxxabi/files/0001-Revert-Make-libc-abi-use-the-implementation-of-__num.patch Modified: trunk/dports/lang/libcxxabi/Portfile =================================================================== --- trunk/dports/lang/libcxxabi/Portfile 2014-12-30 05:56:40 UTC (rev 130406) +++ trunk/dports/lang/libcxxabi/Portfile 2014-12-30 06:13:53 UTC (rev 130407) @@ -15,13 +15,17 @@ homepage http://libcxxabi.llvm.org/ fetch.type svn -svn.revision 197063 +svn.revision 210661 version ${svn.revision} worksrcdir trunk svn.url http://llvm.org/svn/llvm-project/libcxxabi/trunk set root_path ${prefix}/var/host/${name}-${version}-${revision} +patch.pre_args -p1 +patchfiles \ + 0001-Revert-Make-libc-abi-use-the-implementation-of-__num.patch + variant universal {} use_configure no Added: trunk/dports/lang/libcxxabi/files/0001-Revert-Make-libc-abi-use-the-implementation-of-__num.patch =================================================================== --- trunk/dports/lang/libcxxabi/files/0001-Revert-Make-libc-abi-use-the-implementation-of-__num.patch (rev 0) +++ trunk/dports/lang/libcxxabi/files/0001-Revert-Make-libc-abi-use-the-implementation-of-__num.patch 2014-12-30 06:13:53 UTC (rev 130407) @@ -0,0 +1,179 @@ +From d912ab33ad802340ad7aa5e7e39b9d1bea5fe89a Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu(a)apple.com> +Date: Mon, 29 Dec 2014 22:05:22 -0800 +Subject: [PATCH] Revert "Make libc++abi use the implementation of __numstr + from libc++. No functionality change, just removal of duplicated code." + +This reverts commit f7a83f7f3b5788e3ead1c7f2063994699df55085. +--- + src/stdexcept.cpp | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 127 insertions(+), 6 deletions(-) + +diff --git a/src/stdexcept.cpp b/src/stdexcept.cpp +index bd6789e..246eea4 100644 +--- a/src/stdexcept.cpp ++++ b/src/stdexcept.cpp +@@ -7,7 +7,6 @@ + // + //===----------------------------------------------------------------------===// + +-#include "__refstring" + #include "stdexcept" + #include "new" + #include <cstdlib> +@@ -15,25 +14,147 @@ + #include <cstdint> + #include <cstddef> + +-static_assert(sizeof(std::__libcpp_refstring) == sizeof(const char *), ""); ++#if __APPLE__ ++#include <dlfcn.h> ++#include <mach-o/dyld.h> ++#endif ++ ++// Note: optimize for size ++ ++#pragma GCC visibility push(hidden) ++ ++namespace ++{ ++ ++class __libcpp_nmstr ++{ ++private: ++ const char* str_; ++ ++ typedef int count_t; ++ ++ struct _Rep_base ++ { ++ std::size_t len; ++ std::size_t cap; ++ count_t count; ++ }; ++ ++ static const std::ptrdiff_t offset = static_cast<std::ptrdiff_t>(sizeof(_Rep_base)); ++ ++ count_t& count() const _NOEXCEPT {return ((_Rep_base*)(str_ - offset))->count;} ++ ++#if __APPLE__ ++ static ++ const void* ++ compute_gcc_empty_string_storage() _NOEXCEPT ++ { ++ void* handle = dlopen("/usr/lib/libstdc++.6.dylib", RTLD_NOLOAD); ++ if (handle == 0) ++ return 0; ++ return (const char*)dlsym(handle, "_ZNSs4_Rep20_S_empty_rep_storageE") + offset; ++ } ++ ++ static ++ const void* ++ get_gcc_empty_string_storage() _NOEXCEPT ++ { ++ static const void* p = compute_gcc_empty_string_storage(); ++ return p; ++ } ++#endif ++ ++public: ++ explicit __libcpp_nmstr(const char* msg); ++ __libcpp_nmstr(const __libcpp_nmstr& s) _NOEXCEPT; ++ __libcpp_nmstr& operator=(const __libcpp_nmstr& s) _NOEXCEPT; ++ ~__libcpp_nmstr(); ++ const char* c_str() const _NOEXCEPT {return str_;} ++}; ++ ++__libcpp_nmstr::__libcpp_nmstr(const char* msg) ++{ ++ std::size_t len = strlen(msg); ++ str_ = static_cast<const char*>(::operator new(len + 1 + offset)); ++ _Rep_base* c = (_Rep_base*)str_; ++ c->len = c->cap = len; ++ str_ += offset; ++ count() = 0; ++ std::memcpy(const_cast<char*>(c_str()), msg, len + 1); ++} ++ ++inline ++__libcpp_nmstr::__libcpp_nmstr(const __libcpp_nmstr& s) _NOEXCEPT ++ : str_(s.str_) ++{ ++#if __APPLE__ ++ if (str_ != get_gcc_empty_string_storage()) ++#endif ++ __sync_add_and_fetch(&count(), 1); ++} ++ ++__libcpp_nmstr& ++__libcpp_nmstr::operator=(const __libcpp_nmstr& s) _NOEXCEPT ++{ ++ const char* p = str_; ++ str_ = s.str_; ++#if __APPLE__ ++ if (str_ != get_gcc_empty_string_storage()) ++#endif ++ __sync_add_and_fetch(&count(), 1); ++#if __APPLE__ ++ if (p != get_gcc_empty_string_storage()) ++#endif ++ if (__sync_add_and_fetch((count_t*)(p-sizeof(count_t)), count_t(-1)) < 0) ++ { ++ ::operator delete(const_cast<char*>(p-offset)); ++ } ++ return *this; ++} ++ ++inline ++__libcpp_nmstr::~__libcpp_nmstr() ++{ ++#if __APPLE__ ++ if (str_ != get_gcc_empty_string_storage()) ++#endif ++ if (__sync_add_and_fetch(&count(), count_t(-1)) < 0) ++ { ++ ::operator delete(const_cast<char*>(str_ - offset)); ++ } ++} ++ ++} ++ ++#pragma GCC visibility pop + + namespace std // purposefully not using versioning namespace + { + +-logic_error::~logic_error() _NOEXCEPT {} ++logic_error::~logic_error() _NOEXCEPT ++{ ++ __libcpp_nmstr& s = (__libcpp_nmstr&)__imp_; ++ s.~__libcpp_nmstr(); ++} + + const char* + logic_error::what() const _NOEXCEPT + { +- return __imp_.c_str(); ++ __libcpp_nmstr& s = (__libcpp_nmstr&)__imp_; ++ return s.c_str(); + } + +-runtime_error::~runtime_error() _NOEXCEPT {} ++runtime_error::~runtime_error() _NOEXCEPT ++{ ++ __libcpp_nmstr& s = (__libcpp_nmstr&)__imp_; ++ s.~__libcpp_nmstr(); ++} + + const char* + runtime_error::what() const _NOEXCEPT + { +- return __imp_.c_str(); ++ __libcpp_nmstr& s = (__libcpp_nmstr&)__imp_; ++ return s.c_str(); + } + + domain_error::~domain_error() _NOEXCEPT {} +-- +2.2.1 +

1 0