[136010] trunk/dports/finance/bitcoin

[easieste at macports.org]

Revision: 136010
          https://trac.macports.org/changeset/136010
Author:   easieste at macports.org
Date:     2015-05-09 06:58:44 -0700 (Sat, 09 May 2015)
Log Message:
-----------
Update to finance/bitcoin-0.10.1

Modified Paths:
--------------
    trunk/dports/finance/bitcoin/Portfile

Added Paths:
-----------
    trunk/dports/finance/bitcoin/files/
    trunk/dports/finance/bitcoin/files/src-rpcrawtransaction.cpp.diff

Modified: trunk/dports/finance/bitcoin/Portfile
===================================================================
--- trunk/dports/finance/bitcoin/Portfile	2015-05-09 12:25:22 UTC (rev 136009)
+++ trunk/dports/finance/bitcoin/Portfile	2015-05-09 13:58:44 UTC (rev 136010)
@@ -5,7 +5,7 @@
 
 name                bitcoin
 categories          finance crypto
-version             0.10.0
+version             0.10.1
 platforms           darwin
 license             MIT
 maintainers         easieste yopmail.com:sami.laine openmaintainer
@@ -17,11 +17,11 @@
                     operating through the nodes of the network.
 homepage            http://www.bitcoin.org/
 
-master_sites        https://github.com/[string repeat "$name/" 2]archive/
-distname            v${version}
+master_sites        https://bitcoin.org/bin/bitcoin-core-0.10.1/
+
 worksrcdir          ${name}-${version}
-checksums           rmd160  4f0148a29071f7aff727cc1d617abc4d4932889e \
-                    sha256  be57f3b0d64a797873189e45851f3b3510832e14ff18b5f563e1ba8911d145ac
+checksums           rmd160  5aeaaeeff59d77b9f8e1a5a3bba04379d7190c73 \
+                    sha256  287873f9ba4fd49cd4e4be7eba070d2606878f1690c5be0273164d37cbf3c138
 
 depends_build       port:pkgconfig \
                     port:autoconf \
@@ -34,18 +34,15 @@
                     port:miniupnpc \
                     port:protobuf-cpp
 
-use_autoreconf      yes
-autoreconf.cmd      ./autogen.sh
-autoreconf.args  
-
-#configure.args --with-gui=no
-#build.args          
 use_parallel_build  no
 
+patchfiles      \
+    src-rpcrawtransaction.cpp.diff
+
 # TODO: Restore GUI: needs to move to qt5, as it doesn't look like qt4 is going to get fixed.
 default_variants     +daemon
 
-variant gui description {BROKEN in qt4 moc of boost headers Attempt build with qt4} {
+variant gui description {NOT WORKING Build with qt4 (Broken in qt4 moc inclusion of boost headers) } {
     configure.cmd-append    --with-gui=qt4
     depends_lib-append      port:qt4-mac
     build.args-add          appbundle
@@ -58,11 +55,11 @@
 
 destroot {
     xinstall -d ${destroot}${prefix}/bin
-    if {![variant_isset daemon]} {
-        set bundle_name Bitcoin-Qt.app
-        xinstall -m 755 -d ${destroot}${applications_dir}
-        copy ${worksrcpath}/${bundle_name} ${destroot}${applications_dir}/${bundle_name}
-    }
+#    if {![variant_isset daemon]} {
+#        set bundle_name Bitcoin-Qt.app
+#        xinstall -m 755 -d ${destroot}${applications_dir}
+#        copy ${worksrcpath}/${bundle_name} ${destroot}${applications_dir}/${bundle_name}
+#    }
     xinstall -m 755 -W ${worksrcpath} src/bitcoind ${destroot}${prefix}/bin
     xinstall -m 755 -W ${worksrcpath} src/bitcoin-cli ${destroot}${prefix}/bin
 

Added: trunk/dports/finance/bitcoin/files/src-rpcrawtransaction.cpp.diff
===================================================================
--- trunk/dports/finance/bitcoin/files/src-rpcrawtransaction.cpp.diff	                        (rev 0)
+++ trunk/dports/finance/bitcoin/files/src-rpcrawtransaction.cpp.diff	2015-05-09 13:58:44 UTC (rev 136010)
@@ -0,0 +1,13 @@
+# Adapted from fix <https://github.com/bitcoin/bitcoin/issues/6056>
+diff -r 23cbba64aefc src/rpcrawtransaction.cpp
+--- src/rpcrawtransaction.cpp	Sat Apr 25 10:04:50 2015 +0200
++++ src/rpcrawtransaction.cpp	Sat May 09 15:40:41 2015 +0200
+@@ -287,7 +287,7 @@
+         if (pk.IsPayToScriptHash()) {
+             CTxDestination address;
+             if (ExtractDestination(pk, address)) {
+-                const CScriptID& hash = boost::get<const CScriptID&>(address);
++                const CScriptID& hash = boost::get<CScriptID>(address);
+                 CScript redeemScript;
+                 if (pwalletMain->GetCScript(hash, redeemScript))
+                     entry.push_back(Pair("redeemScript", HexStr(redeemScript.begin(), redeemScript.end())));
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150509/104f778b/attachment.html>