Index: head/net-p2p/bitcoin/Makefile =================================================================== --- head/net-p2p/bitcoin/Makefile (revision 447812) +++ head/net-p2p/bitcoin/Makefile (revision 447813) @@ -1,114 +1,113 @@ # Created by: Shaun Amott # $FreeBSD$ PORTNAME= bitcoin -PORTVERSION= 0.12.1 +PORTVERSION= 0.14.2 DISTVERSIONPREFIX= v -PORTREVISION= 12 CATEGORIES= net-p2p finance MAINTAINER= robbak@robbak.com COMMENT?= Virtual Peer-to-Peer Currency Client (QT) LICENSE= MIT LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \ libevent.so:devel/libevent 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 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 OPTIONS_DEFINE?= DBUS DEBUG HARDENING QRCODES TESTS UPNP WALLET ZMQ OPTIONS_DEFAULT?= DBUS HARDENING QRCODES UPNP WALLET OPTIONS_SUB= yes HARDENING_DESC= Attempt to harden binaries (PIE for ASLR, NX Stack) QRCODES_DESC= Display QR Codes 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 HARDENING_CONFIGURE_ENABLE= hardening TESTS_CONFIGURE_ENABLE= tests bench .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "yes" TESTS_PLIST_FILES= bin/test_bitcoin .endif TESTS_PLIST_FILES+= bin/bench_bitcoin UPNP_CONFIGURE_WITH= miniupnpc UPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc UPNP_CPPFLAGS= -I${LOCALBASE}/include UPNP_LIBS= -L${LOCALBASE}/lib QRCODES_CONFIGURE_WITH= qrencode QRCODES_LIB_DEPENDS= libqrencode.so:graphics/libqrencode WALLET_CONFIGURE_ENABLE= wallet WALLET_CXXFLAGS= -I${BDB_INCLUDE_DIR} WALLET_LIBS= -L${BDB_LIB_DIR} WALLET_USES= bdb:48 ZMQ_CONFIGURE_ENABLE= zmq ZMQ_BUILD_DEPENDS= libzmq4>0:net/libzmq4 ZMQ_RUN_DEPENDS= libzmq4>0:net/libzmq4 GH_ACCOUNT= bitcoin CONFIGURE_ARGS?= --without-libs \ - --with-gui=qt4 \ + --with-gui=qt5 \ --without-daemon \ --without-utils CONFIGURE_ENV= CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \ SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl" \ 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" post-install: ${REINPLACE_CMD} -e 's,=/usr,=${PREFIX},' \ ${WRKSRC}/contrib/debian/bitcoin-qt.desktop ${INSTALL} ${WRKSRC}/contrib/debian/bitcoin-qt.desktop \ ${STAGEDIR}${PREFIX}/share/applications ${INSTALL} ${WRKSRC}/share/pixmaps/bitcoin128.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ .endif regression-test: build # To use this sucessfully, remove --without-daemon and --without-utils # from CONFIGURE_ARGS above. @cd ${WRKSRC} && ${GMAKE} check .include Index: head/net-p2p/bitcoin/distinfo =================================================================== --- head/net-p2p/bitcoin/distinfo (revision 447812) +++ head/net-p2p/bitcoin/distinfo (revision 447813) @@ -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 Index: head/net-p2p/bitcoin/files/patch-src_leveldb_helpers_memenv_memenv.cc =================================================================== --- head/net-p2p/bitcoin/files/patch-src_leveldb_helpers_memenv_memenv.cc (revision 447812) +++ head/net-p2p/bitcoin/files/patch-src_leveldb_helpers_memenv_memenv.cc (nonexistent) @@ -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" Property changes on: head/net-p2p/bitcoin/files/patch-src_leveldb_helpers_memenv_memenv.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-p2p/bitcoin-daemon/Makefile =================================================================== --- head/net-p2p/bitcoin-daemon/Makefile (revision 447812) +++ head/net-p2p/bitcoin-daemon/Makefile (revision 447813) @@ -1,33 +1,33 @@ # $FreeBSD$ MASTERDIR= ${.CURDIR}/../bitcoin -PORTREVISION= 7 PKGNAMESUFFIX= -daemon COMMENT= Virtual Peer-to-Peer Currency (Daemon) SLAVE_PORT= yes ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= does not support big-endian architectures OPTIONS_DEFINE= DEBUG HARDENING TESTS UPNP WALLET ZMQ OPTIONS_DEFAULT= HARDENING UPNP WALLET USERS= bitcoin GROUPS= bitcoin CONFIGURE_ARGS= --with-daemon \ --without-gui \ --without-libs \ --without-qrencode \ --without-utils -PLIST_FILES= bin/bitcoind +PLIST_FILES= bin/bitcoind \ + man/man1/bitcoind.1.gz USE_RC_SUBR= bitcoind post-install: ${INSTALL_DATA} ${WRKSRC}/contrib/debian/examples/bitcoin.conf ${STAGEDIR}${PREFIX}/etc/bitcoin.conf.sample .include "${MASTERDIR}/Makefile" Index: head/net-p2p/bitcoin-utils/Makefile =================================================================== --- head/net-p2p/bitcoin-utils/Makefile (revision 447812) +++ head/net-p2p/bitcoin-utils/Makefile (revision 447813) @@ -1,25 +1,26 @@ # $FreeBSD$ MASTERDIR= ${.CURDIR}/../bitcoin -PORTREVISION= 6 PKGNAMESUFFIX= -utils COMMENT= Virtual Peer-to-Peer Currency (CLI and Utilities) SLAVE_PORT= yes OPTIONS_DEFINE= DEBUG HARDENING TESTS OPTIONS_DEFAULT= HARDENING TESTS ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= does not support big-endian architectures 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"