svn commit: r465636 - in head/net-p2p: bitcoin bitcoin-daemon bitcoin-utils

[Antoine Brodin]

Author: antoine
Date: Mon Mar 26 20:58:14 2018
New Revision: 465636
URL: https://svnweb.freebsd.org/changeset/ports/465636

Log:
  Revert r465619 and r465623,  the use of PORT_OPTIONS and option helpers is
  incorrect
  
  With hat:	portmgr

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	Mon Mar 26 20:53:07 2018	(r465635)
+++ head/net-p2p/bitcoin-daemon/Makefile	Mon Mar 26 20:58:14 2018	(r465636)
@@ -11,9 +11,7 @@ NOT_FOR_ARCHS=		powerpc powerpc64 sparc64
 NOT_FOR_ARCHS_REASON=	does not support big-endian architectures
 
 OPTIONS_DEFINE=		DEBUG HARDENING TESTS UPNP WALLET ZMQ
-# BDBMODERN is a choice for BDBVER, introduced via OPTIONS_SINGLE=BDBVER
-# from ${MASTERDIR}/Makefile
-OPTIONS_DEFAULT=	BDBMODERN HARDENING UPNP WALLET
+OPTIONS_DEFAULT=	HARDENING UPNP WALLET
 
 USERS=		bitcoin
 GROUPS=		bitcoin

Modified: head/net-p2p/bitcoin-utils/Makefile
==============================================================================
--- head/net-p2p/bitcoin-utils/Makefile	Mon Mar 26 20:53:07 2018	(r465635)
+++ head/net-p2p/bitcoin-utils/Makefile	Mon Mar 26 20:58:14 2018	(r465636)
@@ -10,9 +10,7 @@ NOT_FOR_ARCHS=		powerpc powerpc64 sparc64
 NOT_FOR_ARCHS_REASON=	does not support big-endian architectures
 
 OPTIONS_DEFINE=		DEBUG HARDENING TESTS
-# BDBMODERN is a choice for BDBVER, introduced via OPTIONS_SINGLE=BDBVER
-# from ${MASTERDIR}/Makefile
-OPTIONS_DEFAULT=	BDBMODERN HARDENING TESTS
+OPTIONS_DEFAULT=	HARDENING TESTS
 
 CONFIGURE_ARGS=	--without-daemon \
 		--without-gui \

Modified: head/net-p2p/bitcoin/Makefile
==============================================================================
--- head/net-p2p/bitcoin/Makefile	Mon Mar 26 20:53:07 2018	(r465635)
+++ head/net-p2p/bitcoin/Makefile	Mon Mar 26 20:58:14 2018	(r465636)
@@ -4,7 +4,7 @@
 PORTNAME=	bitcoin
 PORTVERSION=	0.16.0
 DISTVERSIONPREFIX=	v
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	kbowling at FreeBSD.org
@@ -37,14 +37,9 @@ TESTS_PLIST_FILES=	bin/test_bitcoin-qt \
 .endif
 
 OPTIONS_DEFINE?=	DBUS DEBUG HARDENING QRCODES TESTS UPNP WALLET ZMQ
-OPTIONS_SINGLE=		BDBVER
-OPTIONS_SINGLE_BDBVER=	BDB48 BDBMODERN
-OPTIONS_DEFAULT?=	BDBMODERN DBUS HARDENING QRCODES UPNP WALLET
+OPTIONS_DEFAULT?=	DBUS HARDENING QRCODES UPNP WALLET
 OPTIONS_SUB=		yes
 
-BDBVER_DESC=	Berkeley DB version to use for wallet
-BDB48_DESC=	Use BDB 4.8 (compatible with 5.x and 6.x)
-BDBMODERN_DESC=	Use BDB 5.x or 6.x (not compatible with 4.8)
 HARDENING_DESC=	Attempt to harden binaries (PIE for ASLR, NX Stack)
 QRCODES_DESC=	Display QR Codes
 TESTS_DESC=	Build test binary and unit tests
@@ -76,6 +71,7 @@ QRCODES_LIB_DEPENDS=	libqrencode.so:graphics/libqrenco
 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
@@ -97,13 +93,6 @@ PLIST_FILES?=	bin/bitcoin-qt man/man1/bitcoin-qt.1.gz 
 		share/applications/bitcoin-qt.desktop share/pixmaps/bitcoin128.png
 
 .include <bsd.port.pre.mk>
-
-.if empty(PORT_OPTIONS:MBDB48)
-WALLET_CONFIGURE_ON=		--with-incompatible-bdb
-WALLET_USES=			bdb:5+
-.else
-WALLET_USES=			bdb:48
-.endif
 
 .if ${OSVERSION} < 1100000
 CONFIGURE_ARGS+=--disable-asm