svn commit: r385291 - in head/net-p2p: bitcoin bitcoin-daemon

[Jan Beich]

Author: jbeich
Date: Sun May  3 16:58:04 2015
New Revision: 385291
URL: https://svnweb.freebsd.org/changeset/ports/385291

Log:
  net-p2p/bitcoin*: update to 0.10.1 and fix conflicts
  
  Work around bin/test_bitcoin installed more than once by leaving
  TESTS=on by default only in net-p2p/bitcoin-utils.
  
  Changes:	https://bitcoin.org/en/release/v0.10.1
  PR:		198826 [1]
  PR:		199856
  Reported by:	peter [1]
  Submitted by:	robbak at gmail.com (maintainer, other mail)

Modified:
  head/net-p2p/bitcoin-daemon/Makefile   (contents, props changed)
  head/net-p2p/bitcoin/Makefile   (contents, props changed)
  head/net-p2p/bitcoin/distinfo   (contents, props changed)

Modified: head/net-p2p/bitcoin-daemon/Makefile
==============================================================================
--- head/net-p2p/bitcoin-daemon/Makefile	Sun May  3 16:57:33 2015	(r385290)
+++ head/net-p2p/bitcoin-daemon/Makefile	Sun May  3 16:58:04 2015	(r385291)
@@ -8,7 +8,7 @@ COMMENT=	Virtual Peer-to-Peer Currency (
 SLAVE_PORT=	yes
 
 OPTIONS_DEFINE=		DEBUG HARDENING TESTS UPNP WALLET
-OPTIONS_DEFAULT=	HARDENING TESTS WALLET
+OPTIONS_DEFAULT=	HARDENING WALLET
 
 CONFIGURE_ARGS=	--with-daemon \
 		--without-gui \

Modified: head/net-p2p/bitcoin/Makefile
==============================================================================
--- head/net-p2p/bitcoin/Makefile	Sun May  3 16:57:33 2015	(r385290)
+++ head/net-p2p/bitcoin/Makefile	Sun May  3 16:58:04 2015	(r385291)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	bitcoin
-PORTVERSION=	0.10.0
-PORTREVISION=	1
+PORTVERSION=	0.10.1
+DISTVERSIONPREFIX=	v
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	robbak at robbak.com
@@ -13,7 +13,7 @@ LICENSE=	MIT
 
 LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
 
-USES=		autoreconf gmake libtool pkgconfig
+USES=		autoreconf compiler:c++0x gmake libtool pkgconfig
 USE_GITHUB=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
@@ -34,7 +34,7 @@ TESTS_PLIST_FILES=	%%QT_BINDIR%%/test_bi
 .endif
 
 OPTIONS_DEFINE?=	DBUS DEBUG HARDENING QRCODES TESTS UPNP WALLET
-OPTIONS_DEFAULT?=	HARDENING QRCODES TESTS WALLET
+OPTIONS_DEFAULT?=	HARDENING QRCODES WALLET
 OPTIONS_SUB=		yes
 
 HARDENING_DESC=	Attempt to harden binaries (PIE for ASLR, NX Stack)
@@ -69,8 +69,6 @@ WALLET_LIBS=			-L${BDB_LIB_DIR}
 WALLET_USE=			BDB=48
 
 GH_ACCOUNT=	bitcoin
-GH_COMMIT=	58810d2
-GH_TAGNAME=	v${PORTVERSION}
 
 CONFIGURE_ARGS?=	--without-daemon \
 			--with-gui \

Modified: head/net-p2p/bitcoin/distinfo
==============================================================================
--- head/net-p2p/bitcoin/distinfo	Sun May  3 16:57:33 2015	(r385290)
+++ head/net-p2p/bitcoin/distinfo	Sun May  3 16:58:04 2015	(r385291)
@@ -1,2 +1,2 @@
-SHA256 (bitcoin-0.10.0.tar.gz) = 8723a955fa0f86dc35d5e8bd37484b37fdb3a3977dad50947fa334ac80ee7df7
-SIZE (bitcoin-0.10.0.tar.gz) = 5018463
+SHA256 (bitcoin-bitcoin-v0.10.1_GH0.tar.gz) = d83e2872de37a17c60b7f5d86a5d9cfe2e7e706bf270ea59d7cd846d2fbf8102
+SIZE (bitcoin-bitcoin-v0.10.1_GH0.tar.gz) = 5049043