Index: net-p2p/litecoin-daemon/Makefile
===================================================================
--- net-p2p/litecoin-daemon/Makefile
+++ net-p2p/litecoin-daemon/Makefile
@@ -6,8 +6,6 @@
 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
 
 USES+=		cpe
Index: net-p2p/litecoin-utils/Makefile
===================================================================
--- net-p2p/litecoin-utils/Makefile
+++ net-p2p/litecoin-utils/Makefile
@@ -4,9 +4,8 @@
 COMMENT=	Virtual Peer-to-Peer Currency (CLI and Utilities)
 SLAVE_PORT=	yes
 
-OPTIONS_DEFINE=		WALLET_BDBMODERN DEBUG HARDENING TESTS ZMQ
+OPTIONS_DEFINE=		DEBUG HARDENING TESTS ZMQ
 OPTIONS_RADIO=
-OPTIONS_DEFAULT=	WALLET_BDBMODERN HARDENING TESTS ZMQ
 
 PKGHELP=	${NONEXISTENT}
 
@@ -19,6 +18,8 @@
 		--disable-wallet
 
 PLIST_FILES=	bin/litecoin-cli bin/litecoin-tx \
-		man/man1/litecoin-cli.1.gz man/man1/litecoin-tx.1.gz
+		man/man1/litecoin-cli.1.gz man/man1/litecoin-tx.1.gz \
+		bin/litecoin-wallet \
+		man/man1/litecoin-wallet.1.gz
 
 .include "${MASTERDIR}/Makefile"
Index: net-p2p/litecoin/Makefile
===================================================================
--- net-p2p/litecoin/Makefile
+++ net-p2p/litecoin/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	litecoin
-PORTVERSION=	0.21.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	0
+DISTVERSION=	0.21.2
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	hsw@bitmark.com
@@ -13,7 +12,7 @@
 		libfmt.so:devel/libfmt \
 		libevent.so:devel/libevent
 
-USES=		autoreconf compiler:c++11-lib cpe gmake libtool pkgconfig qt:5 shebangfix ssl
+USES=		autoreconf compiler:c++11-lib cpe gmake libtool localbase pkgconfig qt:5 shebangfix ssl
 
 USE_GITHUB=	yes
 GNU_CONFIGURE=	yes
@@ -40,7 +39,7 @@
 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_BDBMODERN_DESC=	Wallet using modern BDB 5.x or 6.x
+WALLET_BDBMODERN_DESC=	Wallet using modern BDB 18.x
 ZMQ_DESC=	Block and transaction broadcasting with ZeroMQ
 
 DBUS_CONFIGURE_WITH=	dbus
@@ -59,16 +58,12 @@
 
 UPNP_CONFIGURE_WITH=	miniupnpc
 UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
-UPNP_CPPFLAGS=		-I${LOCALBASE}/include
-UPNP_LIBS=		-L${LOCALBASE}/lib
 
 QRCODES_CONFIGURE_WITH=	qrencode
 QRCODES_LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
 
 ZMQ_CONFIGURE_ENABLE=	zmq
 ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
-ZMQ_CPPFLAGS=		-I${LOCALBASE}/include
-ZMQ_LIBS=		-L${LOCALBASE}/lib
 
 GH_ACCOUNT=	litecoin-project
 
@@ -89,7 +84,7 @@
 
 .if ${PORT_OPTIONS:MWALLET_BDBMODERN}
 CONFIGURE_ARGS+=	--enable-wallet --with-incompatible-bdb
-USES+=			bdb:5+
+USES+=			bdb:18
 .else
 CONFIGURE_ARGS+=	--disable-wallet
 .endif
Index: net-p2p/litecoin/files/patch-src_libmw_deps_ghc_include_ghc_filesystem.hpp
===================================================================
--- net-p2p/litecoin/files/patch-src_libmw_deps_ghc_include_ghc_filesystem.hpp
+++ net-p2p/litecoin/files/patch-src_libmw_deps_ghc_include_ghc_filesystem.hpp
@@ -1,20 +1,15 @@
 --- src/libmw/deps/ghc/include/ghc/filesystem.hpp.orig	2022-05-14 10:57:56.053289000 +0000
 +++ src/libmw/deps/ghc/include/ghc/filesystem.hpp	2022-05-14 10:58:38.778321000 +0000
-@@ -50,6 +50,8 @@
+@@ -50,6 +50,12 @@
  
  #if defined(__APPLE__) && defined(__MACH__)
  #define GHC_OS_MACOS
 +#elif defined(__FreeBSD__)
-+#define GHC_OS_FREEBSD
++// use FreeBSD int strerror_r() instead of GNU char *strerror_r()
++#define _POSIX_C_SOURCE 200112L
++#if defined(__clang__) && defined(_GNU_SOURCE)
++#undef _GNU_SOURCE
++#endif
  #elif defined(__linux__)
  #define GHC_OS_LINUX
  #elif defined(_WIN64)
-@@ -1419,7 +1422,7 @@
-     std::string msg = toUtf8(std::wstring((LPWSTR)msgBuf));
-     LocalFree(msgBuf);
-     return msg;
--#elif defined(GHC_OS_MACOS) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)) || (defined(GHC_OS_ANDROID) && __ANDROID_API__ < 23)
-+#elif defined(GHC_OS_MACOS) || defined(GHC_OS_FREEBSD) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)) || (defined(GHC_OS_ANDROID) && __ANDROID_API__ < 23)
-     char buffer[512];
-     int rc = strerror_r(code ? code : errno, buffer, sizeof(buffer));
-     return rc == 0 ? (const char*)buffer : "Error in strerror_r!";