net-p2p/bitcoin: Update to 0.14.2

PR:		220897
Submitted by:	kbowling
Approved by:	robbak@robbak.com (maintainer)
Differential Revision:	https://reviews.freebsd.org/D11684

5 files changed, 18 insertions, 28 deletions

diff --git a/net-p2p/bitcoin-daemon/Makefile b/net-p2p/bitcoin-daemon/Makefile
index bc08adba22f2..52820693c101 100644
--- a/net-p2p/bitcoin-daemon/Makefile
+++ b/net-p2p/bitcoin-daemon/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../bitcoin
-PORTREVISION=	7
 PKGNAMESUFFIX=	-daemon
 
 COMMENT=	Virtual Peer-to-Peer Currency (Daemon)
@@ -23,7 +22,8 @@ CONFIGURE_ARGS=	--with-daemon \
 		--without-qrencode \
 		--without-utils
 
-PLIST_FILES=	bin/bitcoind
+PLIST_FILES=	bin/bitcoind \
+		man/man1/bitcoind.1.gz
 
 USE_RC_SUBR=	bitcoind
 
diff --git a/net-p2p/bitcoin-utils/Makefile b/net-p2p/bitcoin-utils/Makefile
index 30db8bdd4aa6..f63ad4f33914 100644
--- a/net-p2p/bitcoin-utils/Makefile
+++ b/net-p2p/bitcoin-utils/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../bitcoin
-PORTREVISION=	6
 PKGNAMESUFFIX=	-utils
 
 COMMENT=	Virtual Peer-to-Peer Currency (CLI and Utilities)
@@ -17,9 +16,11 @@ CONFIGURE_ARGS=	--without-daemon \
 		--without-gui \
 		--without-libs \
 		--without-qrencode \
+		--without-miniupnpc \
 		--with-utils \
 		--disable-wallet
 
-PLIST_FILES=	bin/bitcoin-cli bin/bitcoin-tx
+PLIST_FILES=	bin/bitcoin-cli bin/bitcoin-tx \
+		man/man1/bitcoin-cli.1.gz man/man1/bitcoin-tx.1.gz
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile
index 49a0efe5090c..2497418b5750 100644
--- a/net-p2p/bitcoin/Makefile
+++ b/net-p2p/bitcoin/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	bitcoin
-PORTVERSION=	0.12.1
+PORTVERSION=	0.14.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	12
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	robbak@robbak.com
@@ -17,7 +16,7 @@ LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
 
 BROKEN_powerpc64=	fails to compile: util.cpp: undefined reference to boost::program_options::to_internal
 
-USES=		autoreconf compiler:c++0x gmake libtool pkgconfig shebangfix ssl
+USES=		autoreconf compiler:c++11-lib gmake libtool pkgconfig shebangfix ssl
 SHEBANG_FILES=	src/test/*.py
 USE_GITHUB=	yes
 GNU_CONFIGURE=	yes
@@ -26,13 +25,13 @@ SLAVE_PORT?=	no
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
 USES+=		desktop-file-utils
-USE_QT4=	corelib gui moc_build linguisttools_build network qmake_build \
-		rcc_build uic_build
+USE_QT5=	core gui network widgets \
+		buildtools_build linguisttools_build qmake_build
 
 BUILD_DEPENDS+=	protoc:devel/protobuf
 LIB_DEPENDS+=	libprotobuf.so:devel/protobuf
 
-TESTS_USE=		QT4=testlib
+TESTS_USE=		QT5=testlib
 TESTS_PLIST_FILES=	bin/test_bitcoin-qt \
 			bin/test_bitcoin
 .endif
@@ -47,8 +46,8 @@ TESTS_DESC=	Build test binary and unit tests
 WALLET_DESC=	Wallet Management Support
 ZMQ_DESC=	Block and transaction broadcasting with ZeroMQ
 
-DBUS_CONFIGURE_WITH=	qtdbus
-DBUS_USE=		QT4=dbus
+DBUS_CONFIGURE_WITH=	dbus
+DBUS_USE=		QT5=dbus
 
 DEBUG_CONFIGURE_ENABLE=		debug
 DEBUG_INSTALL_TARGET_OFF=	install-strip
@@ -81,7 +80,7 @@ ZMQ_RUN_DEPENDS=	libzmq4>0:net/libzmq4
 GH_ACCOUNT=	bitcoin
 
 CONFIGURE_ARGS?=	--without-libs \
-			--with-gui=qt4 \
+			--with-gui=qt5 \
 			--without-daemon \
 			--without-utils
 
@@ -90,8 +89,8 @@ CONFIGURE_ENV=	CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcr
 		OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}"
 MAKE_ENV+=	V=1
 
-PLIST_FILES?=	bin/bitcoin-qt share/applications/bitcoin-qt.desktop \
-		share/pixmaps/bitcoin128.png
+PLIST_FILES?=	bin/bitcoin-qt man/man1/bitcoin-qt.1.gz \
+		share/applications/bitcoin-qt.desktop share/pixmaps/bitcoin128.png
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
 
diff --git a/net-p2p/bitcoin/distinfo b/net-p2p/bitcoin/distinfo
index cfd7d66485f9..f6a7edca348b 100644
--- a/net-p2p/bitcoin/distinfo
+++ b/net-p2p/bitcoin/distinfo
@@ -1,2 +1,3 @@
-SHA256 (bitcoin-bitcoin-v0.12.1_GH0.tar.gz) = 7bdc287575067461c123e1afcb48843f9f78eb5e6cac95b413e2e09f1f7fc7bd
-SIZE (bitcoin-bitcoin-v0.12.1_GH0.tar.gz) = 6751284
+TIMESTAMP = 1500590635
+SHA256 (bitcoin-bitcoin-v0.14.2_GH0.tar.gz) = e0ac23f01a953fcc6290c96799deeffb32aa76ca8e216c564d20c18e75a25219
+SIZE (bitcoin-bitcoin-v0.14.2_GH0.tar.gz) = 7180535
diff --git a/net-p2p/bitcoin/files/patch-src_leveldb_helpers_memenv_memenv.cc b/net-p2p/bitcoin/files/patch-src_leveldb_helpers_memenv_memenv.cc
deleted file mode 100644
index 98e900ffdd58..000000000000
--- a/net-p2p/bitcoin/files/patch-src_leveldb_helpers_memenv_memenv.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/leveldb/helpers/memenv/memenv.cc.orig	2015-07-10 17:23:55 UTC
-+++ src/leveldb/helpers/memenv/memenv.cc
-@@ -2,6 +2,8 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file. See the AUTHORS file for names of contributors.
- 
-+#define __STDC_LIMIT_MACROS
-+
- #include "helpers/memenv/memenv.h"
- 
- #include "leveldb/env.h"