svn commit: r533562 - in head/net-p2p: bitcoin bitcoin-daemon bitcoin-utils
Vasil Dimov
vd at FreeBSD.org
Fri May 1 16:56:34 UTC 2020
Author: vd
Date: Fri May 1 16:56:33 2020
New Revision: 533562
URL: https://svnweb.freebsd.org/changeset/ports/533562
Log:
net-p2p/bitcoin*: remove db48 dependency
In r465909 [1], 2 years ago, we added the option to link
net-p2p/bitcoin* against db 5 or 6, still allowing to link against db
4.8 which is long time EOL and has been deprecated and marked for
deletion in 2014 [2].
Now remove the option to link net-p2p/bitcoin* against db48, so the
former does not depend on the latter anymore and db48 can be eventually
removed from the ports tree.
[1]
https://svnweb.freebsd.org/ports?view=revision&revision=465909
https://github.com/freebsd/freebsd-ports/commit/68892c74876772806eaca3a9ecc1308e9459acea
[2]
https://github.com/freebsd/freebsd-ports/commit/b0113421712e3e2543fa9e1e0726502ef475e372#diff-9385162ec22da88a3a66c47891cbde67R19
PR: 245220
Submitted by: vd
Approved by: kbowling (maintainer timeout)
Deleted:
head/net-p2p/bitcoin/pkg-help
Modified:
head/net-p2p/bitcoin-daemon/Makefile
head/net-p2p/bitcoin-utils/Makefile
head/net-p2p/bitcoin/Makefile
Modified: head/net-p2p/bitcoin-daemon/Makefile
==============================================================================
--- head/net-p2p/bitcoin-daemon/Makefile Fri May 1 16:53:39 2020 (r533561)
+++ head/net-p2p/bitcoin-daemon/Makefile Fri May 1 16:56:33 2020 (r533562)
@@ -7,10 +7,8 @@ COMMENT= Virtual Peer-to-Peer Currency (Daemon)
SLAVE_PORT= yes
-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 ZMQ
+OPTIONS_DEFINE= DEBUG HARDENING TESTS UPNP WALLET ZMQ
+OPTIONS_DEFAULT= HARDENING UPNP WALLET ZMQ
USERS= bitcoin
GROUPS= bitcoin
@@ -27,7 +25,7 @@ PLIST_FILES= bin/bitcoind \
USE_RC_SUBR= bitcoind
-PORTREVISION= 1
+PORTREVISION= 2
post-install:
${INSTALL_DATA} ${FILESDIR}/bitcoin.conf ${STAGEDIR}${PREFIX}/etc/bitcoin.conf.sample
Modified: head/net-p2p/bitcoin-utils/Makefile
==============================================================================
--- head/net-p2p/bitcoin-utils/Makefile Fri May 1 16:53:39 2020 (r533561)
+++ head/net-p2p/bitcoin-utils/Makefile Fri May 1 16:56:33 2020 (r533562)
@@ -7,10 +7,7 @@ COMMENT= Virtual Peer-to-Peer Currency (CLI and Utilit
SLAVE_PORT= yes
OPTIONS_DEFINE= DEBUG HARDENING TESTS
-OPTIONS_RADIO=
OPTIONS_DEFAULT= HARDENING TESTS
-
-PKGHELP= ${NONEXISTENT}
CONFIGURE_ARGS= --without-daemon \
--without-gui \
Modified: head/net-p2p/bitcoin/Makefile
==============================================================================
--- head/net-p2p/bitcoin/Makefile Fri May 1 16:53:39 2020 (r533561)
+++ head/net-p2p/bitcoin/Makefile Fri May 1 16:56:33 2020 (r533562)
@@ -3,7 +3,7 @@
PORTNAME= bitcoin
PORTVERSION= 0.19.1
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= net-p2p finance
MASTER_SITES= https://bitcoincore.org/bin/bitcoin-core-${PORTVERSION}/ \
LOCAL/swills:icon
@@ -38,18 +38,14 @@ TESTS_PLIST_FILES= bin/test_bitcoin-qt \
bin/test_bitcoin
.endif
-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 ZMQ
+OPTIONS_DEFINE?= DBUS DEBUG HARDENING QRCODES TESTS UPNP WALLET ZMQ
+OPTIONS_DEFAULT?= DBUS HARDENING QRCODES UPNP WALLET ZMQ
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
@@ -74,6 +70,15 @@ UPNP_LIBS= -L${LOCALBASE}/lib
QRCODES_CONFIGURE_WITH= qrencode
QRCODES_LIB_DEPENDS= libqrencode.so:graphics/libqrencode
+WALLET_CONFIGURE_OFF= --disable-wallet
+WALLET_CONFIGURE_ON= --enable-wallet \
+ --with-incompatible-bdb \
+ BDB_CFLAGS=-I${BDB_INCLUDE_DIR} \
+ BDB_LIBS="-L${BDB_LIB_DIR} \
+ -Wl,-rpath=${BDB_LIB_DIR} \
+ -l${BDB_LIB_CXX_NAME}"
+WALLET_USES= bdb:5+
+
ZMQ_CONFIGURE_ENABLE= zmq
ZMQ_BUILD_DEPENDS= libzmq4>0:net/libzmq4
ZMQ_RUN_DEPENDS= libzmq4>0:net/libzmq4
@@ -93,24 +98,7 @@ 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 <bsd.port.options.mk>
-
-.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 <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MWALLET_BDB48} || ${PORT_OPTIONS:MWALLET_BDBMODERN}
-CPPFLAGS+= -I${BDB_INCLUDE_DIR}
-LIBS+= -L${BDB_LIB_DIR}
-.endif
.if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
More information about the svn-ports-head
mailing list