Date: Tue, 2 Jun 2020 14:47:12 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537558 - in head/net-p2p: litecoin zetacoin Message-ID: <202006021447.052ElCp6027854@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Tue Jun 2 14:47:12 2020 New Revision: 537558 URL: https://svnweb.freebsd.org/changeset/ports/537558 Log: net-p2p/litecoin: net-p2p/zetacoin: Remove default-disabled WALLET_BDB48 radio OPTION. Modified: head/net-p2p/litecoin/Makefile head/net-p2p/zetacoin/Makefile Modified: head/net-p2p/litecoin/Makefile ============================================================================== --- head/net-p2p/litecoin/Makefile Tue Jun 2 14:46:43 2020 (r537557) +++ head/net-p2p/litecoin/Makefile Tue Jun 2 14:47:12 2020 (r537558) @@ -34,9 +34,7 @@ TESTS_PLIST_FILES= bin/test_litecoin-qt \ bin/test_litecoin .endif -OPTIONS_DEFINE?= DBUS DEBUG HARDENING QRCODES TESTS UPNP ZMQ -OPTIONS_RADIO?= WALLET -OPTIONS_RADIO_WALLET?= WALLET_BDB48 WALLET_BDBMODERN +OPTIONS_DEFINE?= DBUS DEBUG HARDENING QRCODES TESTS UPNP WALLET_BDBMODERN ZMQ OPTIONS_DEFAULT?= DBUS HARDENING QRCODES UPNP WALLET_BDBMODERN ZMQ OPTIONS_SUB= yes @@ -44,7 +42,6 @@ HARDENING_DESC= Attempt to harden binaries (PIE for AS 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 @@ -91,10 +88,7 @@ PLIST_FILES?= bin/litecoin-qt man/man1/litecoin-qt.1.g .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MWALLET_BDB48} -CONFIGURE_ARGS+= --enable-wallet -USES+= bdb:48 -.elif ${PORT_OPTIONS:MWALLET_BDBMODERN} +.if ${PORT_OPTIONS:MWALLET_BDBMODERN} CONFIGURE_ARGS+= --enable-wallet --with-incompatible-bdb USES+= bdb:5+ .else @@ -103,7 +97,7 @@ CONFIGURE_ARGS+= --disable-wallet .include <bsd.port.pre.mk> -.if ${PORT_OPTIONS:MWALLET_BDB48} || ${PORT_OPTIONS:MWALLET_BDBMODERN} +.if ${PORT_OPTIONS:MWALLET_BDBMODERN} CPPFLAGS+= -I${BDB_INCLUDE_DIR} LIBS+= -L${BDB_LIB_DIR} .endif Modified: head/net-p2p/zetacoin/Makefile ============================================================================== --- head/net-p2p/zetacoin/Makefile Tue Jun 2 14:46:43 2020 (r537557) +++ head/net-p2p/zetacoin/Makefile Tue Jun 2 14:47:12 2020 (r537558) @@ -37,9 +37,7 @@ TESTS_PLIST_FILES= bin/test_${PORTNAME}-qt \ bin/test_${PORTNAME} .endif -OPTIONS_DEFINE?= DBUS DEBUG HARDENING QRCODES TESTS UPNP ZMQ -OPTIONS_RADIO?= WALLET -OPTIONS_RADIO_WALLET?= WALLET_BDB48 WALLET_BDBMODERN +OPTIONS_DEFINE?= DBUS DEBUG HARDENING QRCODES TESTS UPNP WALLET_BDBMODERN ZMQ OPTIONS_DEFAULT?= DBUS HARDENING QRCODES UPNP WALLET_BDBMODERN ZMQ OPTIONS_SUB= yes @@ -47,7 +45,6 @@ HARDENING_DESC= Attempt to harden binaries (PIE for AS 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 @@ -93,10 +90,7 @@ PLIST_FILES?= bin/${PORTNAME}-qt share/applications/${ .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MWALLET_BDB48} -CONFIGURE_ARGS+= --enable-wallet -USES+= bdb:48 -.elif ${PORT_OPTIONS:MWALLET_BDBMODERN} +.if ${PORT_OPTIONS:MWALLET_BDBMODERN} CONFIGURE_ARGS+= --enable-wallet --with-incompatible-bdb USES+= bdb:5+ .else @@ -105,7 +99,7 @@ CONFIGURE_ARGS+= --disable-wallet .include <bsd.port.pre.mk> -.if ${PORT_OPTIONS:MWALLET_BDB48} || ${PORT_OPTIONS:MWALLET_BDBMODERN} +.if ${PORT_OPTIONS:MWALLET_BDBMODERN} CPPFLAGS+= -I${BDB_INCLUDE_DIR} LIBS+= -L${BDB_LIB_DIR} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006021447.052ElCp6027854>