View | Details | Raw Unified | Return to bug 245220 | Differences between
and this patch

Collapse All | Expand All

(-)bitcoin/Makefile (-24 / +12 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	bitcoin
4
PORTNAME=	bitcoin
5
PORTVERSION=	0.19.0.1
5
PORTVERSION=	0.19.0.1
6
PORTREVISION?=	2
6
PORTREVISION?=	3
7
CATEGORIES=	net-p2p finance
7
CATEGORIES=	net-p2p finance
8
MASTER_SITES=	https://bitcoincore.org/bin/bitcoin-core-${PORTVERSION}/ \
8
MASTER_SITES=	https://bitcoincore.org/bin/bitcoin-core-${PORTVERSION}/ \
9
		LOCAL/swills:icon
9
		LOCAL/swills:icon
Lines 41-50 Link Here
41
			bin/test_bitcoin
41
			bin/test_bitcoin
42
.endif
42
.endif
43
43
44
OPTIONS_DEFINE?=	DBUS DEBUG HARDENING QRCODES TESTS UPNP ZMQ
44
OPTIONS_DEFINE?=	DBUS DEBUG HARDENING QRCODES TESTS UPNP WALLET ZMQ
45
OPTIONS_RADIO?=		WALLET
45
OPTIONS_DEFAULT?=	DBUS HARDENING QRCODES UPNP WALLET ZMQ
46
OPTIONS_RADIO_WALLET?=	WALLET_BDB48 WALLET_BDBMODERN
47
OPTIONS_DEFAULT?=	DBUS HARDENING QRCODES UPNP WALLET_BDBMODERN ZMQ
48
OPTIONS_SUB=		yes
46
OPTIONS_SUB=		yes
49
47
50
HARDENING_DESC=	Attempt to harden binaries (PIE for ASLR, NX Stack)
48
HARDENING_DESC=	Attempt to harden binaries (PIE for ASLR, NX Stack)
Lines 51-58 Link Here
51
QRCODES_DESC=	Display QR Codes
49
QRCODES_DESC=	Display QR Codes
52
TESTS_DESC=	Build test binary and unit tests
50
TESTS_DESC=	Build test binary and unit tests
53
WALLET_DESC=	Wallet Management Support
51
WALLET_DESC=	Wallet Management Support
54
WALLET_BDB48_DESC=	Wallet using BDB 4.8
55
WALLET_BDBMODERN_DESC=	Wallet using modern BDB 5.x or 6.x
56
ZMQ_DESC=	Block and transaction broadcasting with ZeroMQ
52
ZMQ_DESC=	Block and transaction broadcasting with ZeroMQ
57
53
58
DBUS_CONFIGURE_WITH=	dbus
54
DBUS_CONFIGURE_WITH=	dbus
Lines 77-82 Link Here
77
QRCODES_CONFIGURE_WITH=	qrencode
73
QRCODES_CONFIGURE_WITH=	qrencode
78
QRCODES_LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
74
QRCODES_LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
79
75
76
WALLET_CONFIGURE_OFF=	--disable-wallet
77
WALLET_CONFIGURE_ON=	--enable-wallet \
78
			--with-incompatible-bdb \
79
			BDB_CFLAGS=-I${BDB_INCLUDE_DIR} \
80
			BDB_LIBS="-L${BDB_LIB_DIR} \
81
				-Wl,-rpath=${BDB_LIB_DIR} \
82
				-l${BDB_LIB_CXX_NAME}"
83
WALLET_USES=		bdb:5+
84
80
ZMQ_CONFIGURE_ENABLE=	zmq
85
ZMQ_CONFIGURE_ENABLE=	zmq
81
ZMQ_BUILD_DEPENDS=	libzmq4>0:net/libzmq4
86
ZMQ_BUILD_DEPENDS=	libzmq4>0:net/libzmq4
82
ZMQ_RUN_DEPENDS=	libzmq4>0:net/libzmq4
87
ZMQ_RUN_DEPENDS=	libzmq4>0:net/libzmq4
Lines 96-120 Link Here
96
PLIST_FILES?=	bin/bitcoin-qt man/man1/bitcoin-qt.1.gz \
101
PLIST_FILES?=	bin/bitcoin-qt man/man1/bitcoin-qt.1.gz \
97
		share/applications/bitcoin-qt.desktop share/pixmaps/bitcoin128.png
102
		share/applications/bitcoin-qt.desktop share/pixmaps/bitcoin128.png
98
103
99
.include <bsd.port.options.mk>
100
101
.if ${PORT_OPTIONS:MWALLET_BDB48}
102
CONFIGURE_ARGS+=	--enable-wallet
103
USES+=			bdb:48
104
.elif ${PORT_OPTIONS:MWALLET_BDBMODERN}
105
CONFIGURE_ARGS+=	--enable-wallet --with-incompatible-bdb
106
USES+=			bdb:5+
107
.else
108
CONFIGURE_ARGS+=	--disable-wallet
109
.endif
110
111
.include <bsd.port.pre.mk>
104
.include <bsd.port.pre.mk>
112
105
113
.if ${PORT_OPTIONS:MWALLET_BDB48} || ${PORT_OPTIONS:MWALLET_BDBMODERN}
114
CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
115
LIBS+=		-L${BDB_LIB_DIR}
116
.endif
117
118
.if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
106
.if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
119
107
120
post-install:
108
post-install:
(-)bitcoin/pkg-help (-18 lines)
Lines 1-18 Link Here
1
The wallet is stored in a Berkeley database file (BDB) (usually
2
~/.bitcoin/wallets/wallet.dat).
3
4
Bitcoin Core can use either BDB 4.8, 5.x or 6.x to create and access the
5
wallet file.
6
7
Wallets created using BDB 4.8 are also accessible by BDB 5.x and 6.x.
8
9
Wallets created using BDB 5.x or 6.x are not accessible by BDB 4.8.
10
11
Opening and using a wallet created by 4.8 with a higher major version (5.x
12
or 6.x) does not change its format, so it will still be accessible to 4.8
13
afterwards. But encrypting an unencrypted wallet recreates it, so encrypting
14
a 4.8 wallet with Bitcoin Core linked against BDB 5.x or 6.x will render it
15
unreadable for Bitcoin Core linked against BDB 4.8.
16
17
If you do not plan on copying the wallet file to another machine that uses
18
BDB 4.8 then it is recommended to use the modern versions of BDB 5.x or 6.x.
(-)bitcoin-daemon/Makefile (-5 / +3 lines)
Lines 7-16 Link Here
7
7
8
SLAVE_PORT=	yes
8
SLAVE_PORT=	yes
9
9
10
OPTIONS_DEFINE=		DEBUG HARDENING TESTS UPNP ZMQ
10
OPTIONS_DEFINE=		DEBUG HARDENING TESTS UPNP WALLET ZMQ
11
# WALLET_BDBMODERN is a choice for WALLET, introduced via OPTIONS_RADIO=WALLET
11
OPTIONS_DEFAULT=	HARDENING UPNP WALLET ZMQ
12
# from ${MASTERDIR}/Makefile
13
OPTIONS_DEFAULT=	HARDENING UPNP WALLET_BDBMODERN ZMQ
14
12
15
USERS=		bitcoin
13
USERS=		bitcoin
16
GROUPS=		bitcoin
14
GROUPS=		bitcoin
Lines 27-33 Link Here
27
25
28
USE_RC_SUBR=	bitcoind
26
USE_RC_SUBR=	bitcoind
29
27
30
PORTREVISION=	1
28
PORTREVISION=	2
31
29
32
post-install:
30
post-install:
33
	${INSTALL_DATA} ${FILESDIR}/bitcoin.conf ${STAGEDIR}${PREFIX}/etc/bitcoin.conf.sample
31
	${INSTALL_DATA} ${FILESDIR}/bitcoin.conf ${STAGEDIR}${PREFIX}/etc/bitcoin.conf.sample
(-)bitcoin-utils/Makefile (-3 lines)
Lines 7-17 Link Here
7
SLAVE_PORT=	yes
7
SLAVE_PORT=	yes
8
8
9
OPTIONS_DEFINE=		DEBUG HARDENING TESTS
9
OPTIONS_DEFINE=		DEBUG HARDENING TESTS
10
OPTIONS_RADIO=
11
OPTIONS_DEFAULT=	HARDENING TESTS
10
OPTIONS_DEFAULT=	HARDENING TESTS
12
11
13
PKGHELP=	${NONEXISTENT}
14
15
CONFIGURE_ARGS=	--without-daemon \
12
CONFIGURE_ARGS=	--without-daemon \
16
		--without-gui \
13
		--without-gui \
17
		--without-libs \
14
		--without-libs \

Return to bug 245220