Index: head/net-p2p/bitcoin/Makefile =================================================================== --- head/net-p2p/bitcoin/Makefile (revision 465908) +++ head/net-p2p/bitcoin/Makefile (revision 465909) @@ -1,119 +1,135 @@ # Created by: Shaun Amott # $FreeBSD$ PORTNAME= bitcoin PORTVERSION= 0.16.0 DISTVERSIONPREFIX= v -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net-p2p finance MAINTAINER= kbowling@FreeBSD.org 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++11-lib gmake libtool pkgconfig shebangfix ssl USE_GITHUB= yes GNU_CONFIGURE= yes SLAVE_PORT?= no .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no" USES+= desktop-file-utils 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= 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_DEFINE?= DBUS DEBUG HARDENING QRCODES TESTS UPNP ZMQ +OPTIONS_RADIO?= WALLET +OPTIONS_RADIO_WALLET?= WALLET_BDB48 WALLET_BDBMODERN +OPTIONS_DEFAULT?= DBUS HARDENING QRCODES UPNP WALLET_BDBMODERN 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 +WALLET_BDB48_DESC= Wallet using BDB 4.8 +WALLET_BDBMODERN_DESC= Wallet using modern BDB 5.x or 6.x ZMQ_DESC= Block and transaction broadcasting with ZeroMQ 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=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 man/man1/bitcoin-qt.1.gz \ share/applications/bitcoin-qt.desktop share/pixmaps/bitcoin128.png +.include + +.if ${PORT_OPTIONS:MWALLET_BDB48} +CONFIGURE_ARGS+= --enable-wallet +USES+= bdb:48 +.elif ${PORT_OPTIONS:MWALLET_BDBMODERN} +CONFIGURE_ARGS+= --enable-wallet --with-incompatible-bdb +USES+= bdb:5+ +.else +CONFIGURE_ARGS+= --disable-wallet +.endif + .include + +.if ${PORT_OPTIONS:MWALLET_BDB48} || ${PORT_OPTIONS:MWALLET_BDBMODERN} +CPPFLAGS+= -I${BDB_INCLUDE_DIR} +LIBS+= -L${BDB_LIB_DIR} +.endif .if ${OSVERSION} < 1100000 CONFIGURE_ARGS+=--disable-asm .endif .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/pkg-help =================================================================== --- head/net-p2p/bitcoin/pkg-help (nonexistent) +++ head/net-p2p/bitcoin/pkg-help (revision 465909) @@ -0,0 +1,18 @@ +The wallet is stored in a Berkeley database file (BDB) (usually +~/.bitcoin/wallets/wallet.dat). + +Bitcoin Core can use either BDB 4.8, 5.x or 6.x to create and access the +wallet file. + +Wallets created using BDB 4.8 are also accessible by BDB 5.x and 6.x. + +Wallets created using BDB 5.x or 6.x are not accessible by BDB 4.8. + +Opening and using a wallet created by 4.8 with a higher major version (5.x +or 6.x) does not change its format, so it will still be accessible to 4.8 +afterwards. But encrypting an unencrypted wallet recreates it, so encrypting +a 4.8 wallet with Bitcoin Core linked against BDB 5.x or 6.x will render it +unreadable for Bitcoin Core linked against BDB 4.8. + +If you do not plan on copying the wallet file to another machine that uses +BDB 4.8 then it is recommended to use the modern versions of BDB 5.x or 6.x. Property changes on: head/net-p2p/bitcoin/pkg-help ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-p2p/bitcoin-daemon/Makefile =================================================================== --- head/net-p2p/bitcoin-daemon/Makefile (revision 465908) +++ head/net-p2p/bitcoin-daemon/Makefile (revision 465909) @@ -1,34 +1,36 @@ # $FreeBSD$ MASTERDIR= ${.CURDIR}/../bitcoin PKGNAMESUFFIX= -daemon COMMENT= Virtual Peer-to-Peer Currency (Daemon) SLAVE_PORT= yes NOT_FOR_ARCHS= powerpc powerpc64 sparc64 NOT_FOR_ARCHS_REASON= does not support big-endian architectures -OPTIONS_DEFINE= DEBUG HARDENING TESTS UPNP WALLET ZMQ -OPTIONS_DEFAULT= HARDENING UPNP WALLET +OPTIONS_DEFINE= DEBUG HARDENING TESTS UPNP ZMQ +# WALLET_BDBMODERN is a choice for WALLET, introduced via OPTIONS_RADIO=WALLET +# from ${MASTERDIR}/Makefile +OPTIONS_DEFAULT= HARDENING UPNP WALLET_BDBMODERN USERS= bitcoin GROUPS= bitcoin CONFIGURE_ARGS= --with-daemon \ --without-gui \ --without-libs \ --without-qrencode \ --without-utils PLIST_FILES= bin/bitcoind \ man/man1/bitcoind.1.gz \ %%ETCDIR%%.conf.sample 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 465908) +++ head/net-p2p/bitcoin-utils/Makefile (revision 465909) @@ -1,26 +1,29 @@ # $FreeBSD$ MASTERDIR= ${.CURDIR}/../bitcoin PKGNAMESUFFIX= -utils COMMENT= Virtual Peer-to-Peer Currency (CLI and Utilities) SLAVE_PORT= yes NOT_FOR_ARCHS= powerpc powerpc64 sparc64 NOT_FOR_ARCHS_REASON= does not support big-endian architectures OPTIONS_DEFINE= DEBUG HARDENING TESTS +OPTIONS_RADIO= OPTIONS_DEFAULT= HARDENING TESTS + +PKGHELP= ${NONEXISTENT} CONFIGURE_ARGS= --without-daemon \ --without-gui \ --without-libs \ --without-qrencode \ --without-miniupnpc \ --with-utils \ --disable-wallet PLIST_FILES= bin/bitcoin-cli bin/bitcoin-tx \ man/man1/bitcoin-cli.1.gz man/man1/bitcoin-tx.1.gz .include "${MASTERDIR}/Makefile"