From owner-svn-ports-all@freebsd.org Mon Mar 26 18:28:13 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BD739F5E625; Mon, 26 Mar 2018 18:28:13 +0000 (UTC) (envelope-from vd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 743B16BB25; Mon, 26 Mar 2018 18:28:13 +0000 (UTC) (envelope-from vd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F0D3108DB; Mon, 26 Mar 2018 18:28:13 +0000 (UTC) (envelope-from vd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2QISDnc054763; Mon, 26 Mar 2018 18:28:13 GMT (envelope-from vd@FreeBSD.org) Received: (from vd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2QISDlq054761; Mon, 26 Mar 2018 18:28:13 GMT (envelope-from vd@FreeBSD.org) Message-Id: <201803261828.w2QISDlq054761@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vd set sender to vd@FreeBSD.org using -f From: Vasil Dimov Date: Mon, 26 Mar 2018 18:28:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465623 - in head/net-p2p: bitcoin-daemon bitcoin-utils X-SVN-Group: ports-head X-SVN-Commit-Author: vd X-SVN-Commit-Paths: in head/net-p2p: bitcoin-daemon bitcoin-utils X-SVN-Commit-Revision: 465623 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Mar 2018 18:28:13 -0000 Author: vd Date: Mon Mar 26 18:28:12 2018 New Revision: 465623 URL: https://svnweb.freebsd.org/changeset/ports/465623 Log: Set default BDB version in bitcoin slave ports In c465619 a new single-choice option was introduced in net-p2p/bitcoin where exactly one variant must be chosen (BDB version). But the bitcoin slave ports net-p2p/bitcoin-daemon and net-p2p/bitcoin-utils set OPTIONS_DEFAULT=... (with missing BDB version) and the master port uses OPTIONS_DEFAULT?=...somebdbversion... so the choice of the master port is not inherited by the slaves. Fix this by explicitly setting the BDB version in both slave ports. Reported by: Dan Langille Modified: head/net-p2p/bitcoin-daemon/Makefile head/net-p2p/bitcoin-utils/Makefile Modified: head/net-p2p/bitcoin-daemon/Makefile ============================================================================== --- head/net-p2p/bitcoin-daemon/Makefile Mon Mar 26 18:14:44 2018 (r465622) +++ head/net-p2p/bitcoin-daemon/Makefile Mon Mar 26 18:28:12 2018 (r465623) @@ -11,7 +11,9 @@ 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 +# BDBMODERN is a choice for BDBVER, introduced via OPTIONS_SINGLE=BDBVER +# from ${MASTERDIR}/Makefile +OPTIONS_DEFAULT= BDBMODERN HARDENING UPNP WALLET USERS= bitcoin GROUPS= bitcoin Modified: head/net-p2p/bitcoin-utils/Makefile ============================================================================== --- head/net-p2p/bitcoin-utils/Makefile Mon Mar 26 18:14:44 2018 (r465622) +++ head/net-p2p/bitcoin-utils/Makefile Mon Mar 26 18:28:12 2018 (r465623) @@ -10,7 +10,9 @@ NOT_FOR_ARCHS= powerpc powerpc64 sparc64 NOT_FOR_ARCHS_REASON= does not support big-endian architectures OPTIONS_DEFINE= DEBUG HARDENING TESTS -OPTIONS_DEFAULT= HARDENING TESTS +# BDBMODERN is a choice for BDBVER, introduced via OPTIONS_SINGLE=BDBVER +# from ${MASTERDIR}/Makefile +OPTIONS_DEFAULT= BDBMODERN HARDENING TESTS CONFIGURE_ARGS= --without-daemon \ --without-gui \