git: 5f9d389f299a - main - databases/lmdb0: Add port for LMDB 0.9.x legacy ABI

From: Xin LI <delphij_at_FreeBSD.org>
Date: Mon, 06 Jul 2026 15:58:10 UTC
The branch main has been updated by delphij:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5f9d389f299ac8124a5114c2f014984390b6fd1e

commit 5f9d389f299ac8124a5114c2f014984390b6fd1e
Author:     Xin LI <delphij@FreeBSD.org>
AuthorDate: 2026-07-05 16:47:09 +0000
Commit:     Xin LI <delphij@FreeBSD.org>
CommitDate: 2026-07-06 15:57:32 +0000

    databases/lmdb0: Add port for LMDB 0.9.x legacy ABI
    
    LMDB 1.0 introduced an incompatible on-disk format change and subtle
    API breakage: applications that compiled cleanly against 1.0 headers
    could fail silently at run time. Known affected ports include dns/knot3,
    mail/bogofilter, and mail/postfix; the postfix issue has been confirmed
    upstream. Linux distributions such as Arch Linux have observed the same
    breakage. Samba can also be affected in certain configurations.
    
    Because the regression is not detectable in an -exp build run -- the
    postfix failure only manifests at run time, and bogofilter was caught
    only because post-build self-tests happen to exercise this path -- we
    cannot rely on package builds to validate the 1.0 upgrade.
    
    This commit introduces databases/lmdb0 as a holding port for the 0.9.35
    release, pinned to the 0.x branch with PORTSCOUT=limit:^0. and mutually
    conflicting with databases/lmdb, which retains 1.0. The two packages
    cannot be installed simultaneously, but having lmdb0 available means:
    
    * Ports known to require the 0.9 ABI can declare an explicit dependency
      on databases/lmdb0 until they are validated against 1.0.
    * Users with existing databases in the 0.9 format can still access the
      mdb_dump and mdb_load utilities to migrate data before upgrading.
    * The package conflict prevents accidental mixing.
    
    All 50 direct dependents of databases/lmdb are redirected to
    databases/lmdb0 for now with a PORTREVISION bump, effectively restoring
    the tree to the state prior to the LMDB 1.0 update. Once all dependent
    ports are validated against LMDB 1.0, they will be moved back to
    databases/lmdb and databases/lmdb0 will be removed.
    
    PR:             ports/296530
---
 archivers/urbackup-server/Makefile      |  3 +-
 biology/ncbi-blast+/Makefile            |  3 +-
 biology/ncbi-cxx-toolkit/Makefile       |  3 +-
 databases/Makefile                      |  1 +
 databases/ldb25/Makefile                |  4 +-
 databases/ldb28/Makefile                |  4 +-
 databases/ldb29/Makefile                |  4 +-
 databases/lmdb/Makefile                 |  2 +
 databases/lmdb0/Makefile                | 42 +++++++++++++++++
 databases/lmdb0/distinfo                |  3 ++
 databases/lmdb0/files/lmdb.pc.in        | 11 +++++
 databases/lmdb0/files/patch-Makefile    | 80 +++++++++++++++++++++++++++++++++
 databases/lmdb0/pkg-descr               | 11 +++++
 databases/lmdb0/pkg-plist               | 13 ++++++
 databases/p5-LMDB_File/Makefile         |  3 +-
 databases/py-lmdb/Makefile              |  3 +-
 databases/rubygem-lmdb/Makefile         |  3 +-
 databases/tcl-lmdb/Makefile             |  3 +-
 devel/appstream/Makefile                |  3 +-
 devel/ice37/Makefile                    |  3 +-
 devel/tcl-thread/Makefile               |  3 +-
 dns/bind9-devel/Makefile                |  6 +--
 dns/bind920/Makefile                    |  6 +--
 dns/dnsdist/Makefile                    |  3 +-
 dns/dnsjit/Makefile                     |  4 +-
 dns/knot-resolver/Makefile              |  4 +-
 dns/knot-resolver6/Makefile             |  4 +-
 dns/knot3/Makefile                      |  5 ++-
 dns/powerdns/Makefile                   |  3 +-
 lang/php82/Makefile                     |  4 +-
 lang/php83/Makefile                     |  4 +-
 lang/php84/Makefile                     |  4 +-
 lang/php85/Makefile                     |  4 +-
 lang/php86/Makefile                     |  4 +-
 mail/bogofilter/Makefile                |  4 +-
 mail/cyrus-imapd30/Makefile             |  4 +-
 mail/exim/Makefile                      |  4 +-
 mail/libetpan/Makefile                  |  4 +-
 mail/mutt/Makefile                      |  3 +-
 mail/neomutt/Makefile                   |  3 +-
 mail/opendkim-devel/Makefile            |  3 +-
 mail/opendkim/Makefile                  |  4 +-
 mail/postfix-current/Makefile           |  4 +-
 mail/postfix/Makefile                   |  4 +-
 misc/caffe/Makefile                     |  4 +-
 net-im/nheko/Makefile                   |  4 +-
 net-p2p/cardano-node/Makefile           |  4 +-
 net-p2p/ogmios/Makefile                 |  3 +-
 net/389-ds-base/Makefile                |  4 +-
 net/samba416/Makefile                   |  4 +-
 net/samba419/Makefile                   |  4 +-
 net/samba420/Makefile                   |  4 +-
 net/samba422/Makefile                   |  3 +-
 net/samba423/Makefile                   |  3 +-
 ports-mgmt/appstream-generator/Makefile |  4 +-
 security/cyrus-sasl2-saslauthd/Makefile |  4 +-
 security/cyrus-sasl2/Makefile           |  4 +-
 security/heimdal/Makefile               |  4 +-
 security/krb5-122/Makefile              |  4 +-
 security/krb5-devel/Makefile            |  3 +-
 sysutils/cardano-cli/Makefile           |  3 +-
 sysutils/cfengine-devel/Makefile        |  3 +-
 sysutils/cfengine324/Makefile           |  4 +-
 sysutils/cfengine325/Makefile           |  4 +-
 sysutils/cfengine326/Makefile           |  4 +-
 sysutils/cfengine327/Makefile           |  3 +-
 sysutils/kf5-baloo/Makefile             |  4 +-
 sysutils/kf6-baloo/Makefile             |  3 +-
 www/ot-recorder/Makefile                |  5 ++-
 x11/cde-devel/Makefile                  |  4 +-
 x11/cde/Makefile                        |  4 +-
 71 files changed, 293 insertions(+), 105 deletions(-)

diff --git a/archivers/urbackup-server/Makefile b/archivers/urbackup-server/Makefile
index 5ad339cc1b92..11bd04b1b3f2 100644
--- a/archivers/urbackup-server/Makefile
+++ b/archivers/urbackup-server/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	urbackup-server
 DISTVERSION=	2.5.37
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	https://hndl.urbackup.org/Server/${DISTVERSION}/
 
@@ -12,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/server-license.txt
 
 LIB_DEPENDS=	libcryptopp.so:security/cryptopp \
 		libcurl.so:ftp/curl \
-		liblmdb.so:databases/lmdb \
+		liblmdb.so:databases/lmdb0 \
 		libzstd.so:archivers/zstd
 
 USES=		autoreconf compiler:c++11-lang dos2unix fakeroot fuse libtool \
diff --git a/biology/ncbi-blast+/Makefile b/biology/ncbi-blast+/Makefile
index 028fc5758e2a..ae0046a50c1c 100644
--- a/biology/ncbi-blast+/Makefile
+++ b/biology/ncbi-blast+/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ncbi-blast+
 DISTVERSION=	2.17.0
+PORTREVISION=	1
 CATEGORIES=	biology perl5 python
 MASTER_SITES=	https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/LATEST/ \
 		https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${PORTVERSION}/
@@ -18,7 +19,7 @@ ONLY_FOR_ARCHS_REASON= deflate.c:149:2: error: "Only 64-bit Intel and ARM archit
 
 BUILD_DEPENDS=	grpc>0:devel/grpc
 LIB_DEPENDS=	libdw.so:devel/elfutils \
-		liblmdb.so:databases/lmdb \
+		liblmdb.so:databases/lmdb0 \
 		liblzo2.so:archivers/lzo2 \
 		libnghttp2.so:www/libnghttp2 \
 		libpcre2-8.so:devel/pcre2 \
diff --git a/biology/ncbi-cxx-toolkit/Makefile b/biology/ncbi-cxx-toolkit/Makefile
index 927a54167907..f91a5936a0eb 100644
--- a/biology/ncbi-cxx-toolkit/Makefile
+++ b/biology/ncbi-cxx-toolkit/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	ncbi-cxx-toolkit
 DISTVERSIONPREFIX=	release/
 DISTVERSION=	30.4.0
+PORTREVISION=	1
 CATEGORIES=	biology science devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -16,7 +17,7 @@ ONLY_FOR_ARCHS=	aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	deflate.c:149:2: error: "Only 64-bit Intel and ARM architectures are supported"
 
 LIB_DEPENDS=	libcdd.so:math/cddlib \
-		liblmdb.so:databases/lmdb \
+		liblmdb.so:databases/lmdb0 \
 		libpcre.so:devel/pcre \
 		libunwind.so:devel/libunwind \
 		libzstd.so:archivers/zstd
diff --git a/databases/Makefile b/databases/Makefile
index c4372454de55..1470cca3bb03 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -155,6 +155,7 @@
     SUBDIR += liquibase
     SUBDIR += litestream
     SUBDIR += lmdb
+    SUBDIR += lmdb0
     SUBDIR += lua-lsqlite3
     SUBDIR += lua-pgsql
     SUBDIR += lua-resty-redis
diff --git a/databases/ldb25/Makefile b/databases/ldb25/Makefile
index d0e869183f7c..1e4a15bc514a 100644
--- a/databases/ldb25/Makefile
+++ b/databases/ldb25/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ldb
 PORTVERSION=	2.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	SAMBA
 PKGNAMESUFFIX?=	25
@@ -15,7 +15,7 @@ IGNORE_NONTHREAD_PYTHON=	needs port lang/python${PYTHON_SUFFIX} to be \
 				build with THREADS support
 
 LDB_DEPENDS=	talloc>=2.2.0:devel/talloc tevent>=0.10.0:devel/tevent \
-		tdb>=1.4.0:databases/tdb lmdb>=0.9.23:databases/lmdb \
+		tdb>=1.4.0:databases/tdb lmdb>=0.9.23:databases/lmdb0 \
 		popt>=0:devel/popt
 BUILD_DEPENDS=	${LDB_DEPENDS} \
 		${PY_SETUPTOOLS} \
diff --git a/databases/ldb28/Makefile b/databases/ldb28/Makefile
index a5aeddcbe98f..74b440157469 100644
--- a/databases/ldb28/Makefile
+++ b/databases/ldb28/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ldb
 PORTVERSION=	2.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	SAMBA
 PKGNAMESUFFIX?=	${PORTVERSION:C/([[:digit:]]+)[.]([[:digit:]]+).*/\1\2/}
@@ -78,7 +78,7 @@ PYTHON3_PLIST_FILES=	${PKGCONFIGDIR}/pyldb-util${PYTHON_TAG}.pc \
 _CFLAGS_clang=	-fno-color-diagnostics
 
 _LDB_DEPENDS=	talloc>=2.2.0:devel/talloc tevent>=0.10.0:devel/tevent \
-		tdb>=1.4.0:databases/tdb lmdb>=0.9.23:databases/lmdb \
+		tdb>=1.4.0:databases/tdb lmdb>=0.9.23:databases/lmdb0 \
 		popt>=0:devel/popt
 _LDB_BINS=	bin/ldbedit bin/ldbmodify bin/ldbadd bin/ldbdel bin/ldbsearch \
 		bin/ldbrename
diff --git a/databases/ldb29/Makefile b/databases/ldb29/Makefile
index 285101a52a4e..5dbfbb368362 100644
--- a/databases/ldb29/Makefile
+++ b/databases/ldb29/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ldb
 PORTVERSION=	2.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	SAMBA
 PKGNAMESUFFIX?=	${PORTVERSION:C/([[:digit:]]+)[.]([[:digit:]]+).*/\1\2/}
@@ -78,7 +78,7 @@ PYTHON3_PLIST_FILES=	${PKGCONFIGDIR}/pyldb-util${PYTHON_TAG}.pc \
 _CFLAGS_clang=	-fno-color-diagnostics
 
 _LDB_DEPENDS=	talloc242>=2.4.2:devel/talloc242 tevent016>=0.16.0:devel/tevent016 \
-		tdb1410>=1.4.10:databases/tdb1410 lmdb>=0.9.23:databases/lmdb \
+		tdb1410>=1.4.10:databases/tdb1410 lmdb>=0.9.23:databases/lmdb0 \
 		popt>=0:devel/popt
 _LDB_BINS=	bin/ldbedit bin/ldbmodify bin/ldbadd bin/ldbdel bin/ldbsearch \
 		bin/ldbrename
diff --git a/databases/lmdb/Makefile b/databases/lmdb/Makefile
index 7f660b24d5e4..96f3cec62160 100644
--- a/databases/lmdb/Makefile
+++ b/databases/lmdb/Makefile
@@ -13,6 +13,8 @@ LICENSE_NAME=	OpenLDAP Public License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+CONFLICTS_INSTALL=	lmdb0 # include/lmdb.h bin/mdb_stat
+
 WRKSRC_SUBDIR=		libraries/liblmdb
 MAKE_ARGS+=	CC="${CC}"
 MAKE_ARGS+=	prefix="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}"
diff --git a/databases/lmdb0/Makefile b/databases/lmdb0/Makefile
new file mode 100644
index 000000000000..d5c2df770f9c
--- /dev/null
+++ b/databases/lmdb0/Makefile
@@ -0,0 +1,42 @@
+PORTNAME=	lmdb
+PORTVERSION=	0.9.35
+DISTVERSIONPREFIX=	${PORTNAME:tu}_
+PKGNAMESUFFIX=	0
+CATEGORIES=	databases
+
+MAINTAINER=	delphij@FreeBSD.org
+COMMENT=	OpenLDAP Lightning Memory-Mapped Database (legacy)
+WWW=		https://symas.com/lmdb/
+
+LICENSE=	OPENLDAP
+LICENSE_NAME=	OpenLDAP Public License
+LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
+CONFLICTS_INSTALL=	lmdb # include/lmdb.h bin/mdb_stat
+
+PORTSCOUT=	limit:^0\.
+
+WRKSRC_SUBDIR=		libraries/liblmdb
+MAKE_ARGS+=	CC="${CC}"
+MAKE_ARGS+=	prefix="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+MAKE_ARGS+=	INSTALL_LIB="${INSTALL_LIB}" INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}"
+
+USE_LDCONFIG=	yes
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	openldap
+GH_PROJECT=	openldap
+
+SUB_FILES+=	lmdb.pc
+SUB_LIST+=	PORTVERSION=${PORTVERSION}
+
+post-install:
+	${LN} -sf liblmdb.so.0 ${STAGEDIR}${PREFIX}/lib/liblmdb.so
+	${INSTALL_DATA} ${WRKDIR}/lmdb.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
+
+do-test:
+	${MKDIR} ${WRKSRC}/testdb
+	cd ${WRKSRC} && ./mtest*
+
+.include <bsd.port.mk>
diff --git a/databases/lmdb0/distinfo b/databases/lmdb0/distinfo
new file mode 100644
index 000000000000..7ee2306c3883
--- /dev/null
+++ b/databases/lmdb0/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1770161944
+SHA256 (openldap-openldap-LMDB_0.9.35_GH0.tar.gz) = 0d090c6a7c85a4f31a2ab0d734554c21097f24752393a190b0e51996b08f48c4
+SIZE (openldap-openldap-LMDB_0.9.35_GH0.tar.gz) = 149788
diff --git a/databases/lmdb0/files/lmdb.pc.in b/databases/lmdb0/files/lmdb.pc.in
new file mode 100644
index 000000000000..2227c9cdb737
--- /dev/null
+++ b/databases/lmdb0/files/lmdb.pc.in
@@ -0,0 +1,11 @@
+prefix=%%PREFIX%%
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: lmdb
+Description: Lightning Memory-Mapped Database
+URL: https://symas.com/lmdb/
+Version: %%PORTVERSION%%
+Libs: -L${libdir} -llmdb
+Cflags: -I${includedir}
diff --git a/databases/lmdb0/files/patch-Makefile b/databases/lmdb0/files/patch-Makefile
new file mode 100644
index 000000000000..28211b028dd2
--- /dev/null
+++ b/databases/lmdb0/files/patch-Makefile
@@ -0,0 +1,80 @@
+--- Makefile.orig	2024-01-29 18:20:26 UTC
++++ Makefile
+@@ -23,22 +23,24 @@ OPT = -O2 -g
+ W	= -W -Wall -Wno-unused-parameter -Wbad-function-cast -Wuninitialized
+ THREADS = -pthread
+ OPT = -O2 -g
+-CFLAGS	= $(THREADS) $(OPT) $(W) $(XCFLAGS)
++CFLAGS	+= $(THREADS) $(W)
+ LDLIBS	=
+ SOLIBS	=
+-SOEXT	= .so
+-prefix	= /usr/local
++SOEXT	= .so.0
++prefix	?= /usr/local
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+ libdir = $(exec_prefix)/lib
+ includedir = $(prefix)/include
+ datarootdir = $(prefix)/share
+-mandir = $(datarootdir)/man
++mandir = $(prefix)/share/man
+ 
+ ########################################################################
+ 
+ IHDRS	= lmdb.h
+-ILIBS	= liblmdb.a liblmdb$(SOEXT)
++LIBS	= liblmdb.a
++SHLIBS	= liblmdb$(SOEXT)
++ILIBS	= $(LIBS) $(SHLIBS)
+ IPROGS	= mdb_stat mdb_copy mdb_dump mdb_load
+ IDOCS	= mdb_stat.1 mdb_copy.1 mdb_dump.1 mdb_load.1
+ PROGS	= $(IPROGS) mtest mtest2 mtest3 mtest4 mtest5
+@@ -49,10 +51,11 @@ install: $(ILIBS) $(IPROGS) $(IHDRS)
+ 	mkdir -p $(DESTDIR)$(libdir)
+ 	mkdir -p $(DESTDIR)$(includedir)
+ 	mkdir -p $(DESTDIR)$(mandir)/man1
+-	for f in $(IPROGS); do cp $$f $(DESTDIR)$(bindir); done
+-	for f in $(ILIBS); do cp $$f $(DESTDIR)$(libdir); done
+-	for f in $(IHDRS); do cp $$f $(DESTDIR)$(includedir); done
+-	for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done
++	for f in $(IPROGS); do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir); done
++	for f in $(LIBS); do $(INSTALL_DATA) $$f $(DESTDIR)$(libdir); done
++	for f in $(SHLIBS); do $(INSTALL_LIB) $$f $(DESTDIR)$(libdir); done
++	for f in $(IHDRS); do $(INSTALL_DATA) $$f $(DESTDIR)$(includedir); done
++	for f in $(IDOCS); do $(INSTALL_MAN) $$f $(DESTDIR)$(mandir)/man1; done
+ 
+ clean:
+ 	rm -rf $(PROGS) *.[ao] *.[ls]o *~ testdb
+@@ -66,19 +69,30 @@ liblmdb$(SOEXT):	mdb.lo midl.lo
+ 
+ liblmdb$(SOEXT):	mdb.lo midl.lo
+ #	$(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS)
+-	$(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS)
++	$(CC) $(LDFLAGS) -pthread -shared -Wl,-soname,$@ -o $@ mdb.lo midl.lo $(SOLIBS)
+ 
+ mdb_stat: mdb_stat.o liblmdb.a
++	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+ mdb_copy: mdb_copy.o liblmdb.a
++	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+ mdb_dump: mdb_dump.o liblmdb.a
++	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+ mdb_load: mdb_load.o liblmdb.a
++	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+ mtest:    mtest.o    liblmdb.a
++	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+ mtest2:	mtest2.o liblmdb.a
++	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+ mtest3:	mtest3.o liblmdb.a
++	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+ mtest4:	mtest4.o liblmdb.a
++	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+ mtest5:	mtest5.o liblmdb.a
++	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+ mtest6:	mtest6.o liblmdb.a
++	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+ mplay:	mplay.o liblmdb.a
++	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+ 
+ mdb.o: mdb.c lmdb.h midl.h
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) -c mdb.c
diff --git a/databases/lmdb0/pkg-descr b/databases/lmdb0/pkg-descr
new file mode 100644
index 000000000000..f48b2b6a0257
--- /dev/null
+++ b/databases/lmdb0/pkg-descr
@@ -0,0 +1,11 @@
+LMDB is an ultra-fast, ultra-compact key-value data
+store developed by Symas for the OpenLDAP Project.
+
+It uses memory-mapped files, so it has the read
+performance of a pure in-memory database while still
+offering the persistence of standard disk-based
+databases, and is only limited to the size of the
+virtual address space, (it is not limited to the
+size of physical RAM). LMDB was originally called
+MDB, but was renamed to avoid confusion with other
+software associated with the name MDB.
diff --git a/databases/lmdb0/pkg-plist b/databases/lmdb0/pkg-plist
new file mode 100644
index 000000000000..fd7e46b5d58d
--- /dev/null
+++ b/databases/lmdb0/pkg-plist
@@ -0,0 +1,13 @@
+bin/mdb_copy
+bin/mdb_dump
+bin/mdb_load
+bin/mdb_stat
+include/lmdb.h
+lib/liblmdb.a
+lib/liblmdb.so
+lib/liblmdb.so.0
+libdata/pkgconfig/lmdb.pc
+share/man/man1/mdb_copy.1.gz
+share/man/man1/mdb_dump.1.gz
+share/man/man1/mdb_load.1.gz
+share/man/man1/mdb_stat.1.gz
diff --git a/databases/p5-LMDB_File/Makefile b/databases/p5-LMDB_File/Makefile
index bda22186c406..8942b0829482 100644
--- a/databases/p5-LMDB_File/Makefile
+++ b/databases/p5-LMDB_File/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	LMDB_File
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SORTIZ
@@ -11,7 +12,7 @@ WWW=		https://metacpan.org/dist/LMDB_File
 
 LICENSE=	ART20
 
-LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LIB_DEPENDS=	liblmdb.so:databases/lmdb0
 
 USES=		localbase perl5
 USE_PERL5=	configure
diff --git a/databases/py-lmdb/Makefile b/databases/py-lmdb/Makefile
index e5753e981734..6e42527e9fd7 100644
--- a/databases/py-lmdb/Makefile
+++ b/databases/py-lmdb/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	lmdb
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +18,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0.8:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}patch-ng>0:devel/py-patch-ng@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
-LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LIB_DEPENDS=	liblmdb.so:databases/lmdb0
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		localbase python
diff --git a/databases/rubygem-lmdb/Makefile b/databases/rubygem-lmdb/Makefile
index b59846c097dd..8772a0f357b5 100644
--- a/databases/rubygem-lmdb/Makefile
+++ b/databases/rubygem-lmdb/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	lmdb
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
@@ -10,7 +11,7 @@ WWW=		https://github.com/doriantaylor/rb-lmdb
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/README.md
 
-LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LIB_DEPENDS=	liblmdb.so:databases/lmdb0
 
 USES=		gem
 
diff --git a/databases/tcl-lmdb/Makefile b/databases/tcl-lmdb/Makefile
index 50ee25c5205d..8d42d6ae2769 100644
--- a/databases/tcl-lmdb/Makefile
+++ b/databases/tcl-lmdb/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	tcl-lmdb
 DISTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	gahr@FreeBSD.org
@@ -8,7 +9,7 @@ WWW=		https://github.com/ray2501/tcl-lmdb
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LIB_DEPENDS=	liblmdb.so:databases/lmdb0
 
 USES=		gmake localbase:ldflags tcl:tea
 
diff --git a/devel/appstream/Makefile b/devel/appstream/Makefile
index 8253ebfb404e..7fbb166a5b4d 100644
--- a/devel/appstream/Makefile
+++ b/devel/appstream/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME?=	AppStream
 DISTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://www.freedesktop.org/software/${PORTNAME:tl}/releases/
 
@@ -17,7 +18,7 @@ BUILD_DEPENDS=	bash-completion>0:shells/bash-completion \
 		docbook-xsl>=0:textproc/docbook-xsl \
 		gperf>0:devel/gperf \
 		itstool:textproc/itstool \
-		lmdb>0:databases/lmdb
+		lmdb>0:databases/lmdb0
 LIB_DEPENDS?=	libcurl.so:ftp/curl \
 		libstemmer.so:textproc/snowballstemmer \
 		libxmlb.so:textproc/libxmlb \
diff --git a/devel/ice37/Makefile b/devel/ice37/Makefile
index 2936c28126b4..c1f539c57c7b 100644
--- a/devel/ice37/Makefile
+++ b/devel/ice37/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=		Ice
 PORTVERSION=		3.7.11
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=		devel
 PKGNAMESUFFIX?=		37
@@ -15,7 +16,7 @@ CONFLICTS=		Ice py*-Ice php*-Ice
 
 .if ${SLAVE_PORT} == "no"
 LIB_DEPENDS=		libexpat.so:textproc/expat2 \
-			liblmdb.so:databases/lmdb \
+			liblmdb.so:databases/lmdb0 \
 			libmcpp.so:devel/mcpp
 .else
 LIB_VRS=		${PORTVERSION:R:S|.||g}
diff --git a/devel/tcl-thread/Makefile b/devel/tcl-thread/Makefile
index 12e6613e4561..3a119ed033f5 100644
--- a/devel/tcl-thread/Makefile
+++ b/devel/tcl-thread/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	thread
 PORTVERSION=	3.0.4
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/tcl/Tcl/9.0.3
 PKGNAMEPREFIX=	tcl-
@@ -28,7 +29,7 @@ GDBM_DESC=	Persistent shared variables using GDBM
 LMDB_DESC=	Persistent shared variables using LMDB
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_WITH=	gdbm
-LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb0
 LMDB_CONFIGURE_WITH=	lmdb
 
 PORTDOCS=	*
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index f8caa9bbe1ca..6a6aa8f1cb42 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -4,11 +4,11 @@ PORTNAME=	bind
 DISTVERSION=	9.21.23
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
-PORTREVISION=	0
+PORTREVISION=	1
 .else
 # XXX: correct version
 # dns/bind9xx here
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${DISTVERSION}
@@ -38,7 +38,7 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LIB_DEPENDS=	libnghttp2.so:www/libnghttp2 \
 		liburcu.so:sysutils/liburcu \
 		libuv.so:devel/libuv \
-		liblmdb.so:databases/lmdb
+		liblmdb.so:databases/lmdb0
 
 .if !defined(BIND_TOOLS_SLAVE)
 RUN_DEPENDS=	bind-tools>0:dns/bind-tools
diff --git a/dns/bind920/Makefile b/dns/bind920/Makefile
index 72e90c3d82f2..21a4abf62f94 100644
--- a/dns/bind920/Makefile
+++ b/dns/bind920/Makefile
@@ -4,10 +4,10 @@ PORTNAME=	bind
 DISTVERSION=	9.20.24
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
-PORTREVISION=	0
+PORTREVISION=	1
 .else
 # dns/bind920 here
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${DISTVERSION}
@@ -154,7 +154,7 @@ IDN_CONFIGURE_OFF=	--without-libidn2
 
 LARGE_FILE_CONFIGURE_ENABLE=	largefile
 
-LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb0
 LMDB_CONFIGURE_WITH=	lmdb=${LOCALBASE}
 
 OVERRIDECACHE_EXTRA_PATCHES=	${FILESDIR}/extrapatch-bind-min-override-ttl
diff --git a/dns/dnsdist/Makefile b/dns/dnsdist/Makefile
index cbd61ee00b56..064d3509a52f 100644
--- a/dns/dnsdist/Makefile
+++ b/dns/dnsdist/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	dnsdist
 DISTVERSION=	2.0.7
+PORTREVISION=	1
 CATEGORIES=	dns net
 MASTER_SITES=	https://downloads.powerdns.com/releases/
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
@@ -87,7 +88,7 @@ GNUTLS_MESON_ENABLED=	tls-gnutls
 IPCIPHER_IMPLIES=	OPENSSL
 IPCIPHER_MESON_ENABLED=	ipcipher
 
-LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb0
 LMDB_MESON_ENABLED=	lmdb
 
 LUAJIT_USES=		luajit
diff --git a/dns/dnsjit/Makefile b/dns/dnsjit/Makefile
index 34891e6d14dd..25856995b073 100644
--- a/dns/dnsjit/Makefile
+++ b/dns/dnsjit/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dnsjit
 DISTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns net
 MASTER_SITES=	https://www.dns-oarc.net/files/${PORTNAME}/
 
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libck.so:devel/concurrencykit \
 		libgnutls.so:security/gnutls \
-		liblmdb.so:databases/lmdb \
+		liblmdb.so:databases/lmdb0 \
 		liblz4.so:archivers/liblz4 \
 		libzstd.so:archivers/zstd
 
diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile
index 25836d49973a..3166791ed2dd 100644
--- a/dns/knot-resolver/Makefile
+++ b/dns/knot-resolver/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	knot-resolver
 DISTVERSION=	5.7.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	dns
 MASTER_SITES=	https://knot-resolver.nic.cz/release/ \
 		https://dns.company/downloads/knot-resolver/
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	bash:shells/bash \
 LIB_DEPENDS=	libdnssec.so:dns/knot3 \
 		libgnutls.so:security/gnutls \
 		libknot.so:dns/knot3 \
-		liblmdb.so:databases/lmdb \
+		liblmdb.so:databases/lmdb0 \
 		libnghttp2.so:www/libnghttp2 \
 		libuv.so:devel/libuv \
 		libzscanner.so:dns/knot3
diff --git a/dns/knot-resolver6/Makefile b/dns/knot-resolver6/Makefile
index 648e681935a1..9a3dca310c54 100644
--- a/dns/knot-resolver6/Makefile
+++ b/dns/knot-resolver6/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	knot-resolver
 DISTVERSION=	6.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns
 MASTER_SITES=	https://knot-resolver.nic.cz/release/ \
 		https://dns.company/downloads/knot-resolver/
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	bash:shells/bash \
 LIB_DEPENDS=	libdnssec.so:dns/knot3 \
 		libgnutls.so:security/gnutls \
 		libknot.so:dns/knot3 \
-		liblmdb.so:databases/lmdb \
+		liblmdb.so:databases/lmdb0 \
 		libnghttp2.so:www/libnghttp2 \
 		libuv.so:devel/libuv \
 		libzscanner.so:dns/knot3
diff --git a/dns/knot3/Makefile b/dns/knot3/Makefile
index 18f98ea34ad3..b8df4efa5871 100644
--- a/dns/knot3/Makefile
+++ b/dns/knot3/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	knot
 DISTVERSION=	${KNOT_VERSION}
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
 		https://dns.company/downloads/knot-dns/
@@ -13,9 +14,9 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gsed:textproc/gsed \
-		lmdb>=0.9.15:databases/lmdb
+		lmdb>=0.9.15:databases/lmdb0
 LIB_DEPENDS=	libgnutls.so:security/gnutls \
-		liblmdb.so:databases/lmdb
+		liblmdb.so:databases/lmdb0
 
 USES=		compiler:c11 libtool localbase pkgconfig tar:xz
 USE_LDCONFIG=	yes
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index 323e1ecb7086..68b081e0496e 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	powerdns
 DISTVERSION=	5.1.3
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	https://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${DISTVERSION}
@@ -83,7 +84,7 @@ IXFRDIST_LIB_DEPENDS=	libyaml-cpp.so:devel/yaml-cpp
 IXFRDIST_MESON_TRUE=	tools-ixfrdist
 
 LMDB_LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
-			liblmdb.so:databases/lmdb
+			liblmdb.so:databases/lmdb0
 LMDB_MESON_ON=		-Dmodule-lmdb=dynamic
 LMDB_VARS=		MODULES+=lmdb
 
diff --git a/lang/php82/Makefile b/lang/php82/Makefile
index 83e478126490..bd4ab301c31a 100644
--- a/lang/php82/Makefile
+++ b/lang/php82/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	php82
 DISTVERSION=	8.2.32
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${DISTVERSION}
@@ -236,7 +236,7 @@ FLATFILE_CONFIGURE_ON=	--disable-flatfile
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_ARGS=	--with-gdbm=${LOCALBASE}
 INIFILE_CONFIGURE_OFF=	--disable-inifile
-LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb0
 LMDB_CONFIGURE_ARGS=	--with-lmdb=${LOCALBASE}
 QDBM_LIB_DEPENDS=	libqdbm.so:databases/qdbm
 QDBM_CONFIGURE_ARGS=	--with-qdbm=${LOCALBASE}
diff --git a/lang/php83/Makefile b/lang/php83/Makefile
index 93c6237482c1..2e2ae81699c4 100644
--- a/lang/php83/Makefile
+++ b/lang/php83/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	php83
 DISTVERSION=	8.3.32
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${DISTVERSION}
@@ -251,7 +251,7 @@ FLATFILE_CONFIGURE_ON=	--disable-flatfile
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_ARGS=	--with-gdbm=${LOCALBASE}
 INIFILE_CONFIGURE_OFF=	--disable-inifile
-LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb0
 LMDB_CONFIGURE_ARGS=	--with-lmdb=${LOCALBASE}
 QDBM_LIB_DEPENDS=	libqdbm.so:databases/qdbm
 QDBM_CONFIGURE_ARGS=	--with-qdbm=${LOCALBASE}
diff --git a/lang/php84/Makefile b/lang/php84/Makefile
index acceb81c8643..8823a89de000 100644
--- a/lang/php84/Makefile
+++ b/lang/php84/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	php84
 DISTVERSION=	8.4.23
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${DISTVERSION}
@@ -262,7 +262,7 @@ FLATFILE_CONFIGURE_ON=	--disable-flatfile
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_ARGS=	--with-gdbm=${LOCALBASE}
 INIFILE_CONFIGURE_OFF=	--disable-inifile
-LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb0
 LMDB_CONFIGURE_ARGS=	--with-lmdb=${LOCALBASE}
 QDBM_LIB_DEPENDS=	libqdbm.so:databases/qdbm
 QDBM_CONFIGURE_ARGS=	--with-qdbm=${LOCALBASE}
diff --git a/lang/php85/Makefile b/lang/php85/Makefile
index a2a5506fdd46..354439450861 100644
--- a/lang/php85/Makefile
+++ b/lang/php85/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	php85
 DISTVERSION=	8.5.8
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${DISTVERSION}
@@ -263,7 +263,7 @@ FLATFILE_CONFIGURE_ON=	--disable-flatfile
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_ARGS=	--with-gdbm=${LOCALBASE}
 INIFILE_CONFIGURE_OFF=	--disable-inifile
-LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb0
 LMDB_CONFIGURE_ARGS=	--with-lmdb=${LOCALBASE}
 QDBM_LIB_DEPENDS=	libqdbm.so:databases/qdbm
 QDBM_CONFIGURE_ARGS=	--with-qdbm=${LOCALBASE}
diff --git a/lang/php86/Makefile b/lang/php86/Makefile
index 90f295b1861e..f13ff1fbf7ad 100644
--- a/lang/php86/Makefile
+++ b/lang/php86/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	php86
 DISTVERSION=	8.6.0alpha1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 #MASTER_SITES=	PHP/distributions
 MASTER_SITES=	https://downloads.php.net/~mbeccati/
@@ -264,7 +264,7 @@ FLATFILE_CONFIGURE_ON=	--disable-flatfile
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_ARGS=	--with-gdbm=${LOCALBASE}
 INIFILE_CONFIGURE_OFF=	--disable-inifile
-LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb0
 LMDB_CONFIGURE_ARGS=	--with-lmdb=${LOCALBASE}
 QDBM_LIB_DEPENDS=	libqdbm.so:databases/qdbm
 QDBM_CONFIGURE_ARGS=	--with-qdbm=${LOCALBASE}
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 972a136ae9af..f1ee4fe65d70 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bogofilter
 DISTVERSION=	1.3.0.rc1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	mail
 MASTER_SITES=	SF/bogofilter/bogofilter-current/bogofilter-1.3.0.beta/ \
 		https://gitlab.com/-/project/12408342/uploads/647db3bd2f28a1f91bdd3bb1945d91fe/
@@ -43,7 +43,7 @@ BF_LIBS?=		# empty, can be passed in by slave ports
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
 .if !defined(MASTERDIR) || ${MASTERDIR} == ${.CURDIR}
 CONFIGURE_ARGS+=	--with-database=lmdb
-LIB_DEPENDS=   liblmdb.so:databases/lmdb
+LIB_DEPENDS=   liblmdb.so:databases/lmdb0
 .endif
 .if ${PORT_OPTIONS:MUNICODE}
 BF_LIBS+=		${ICONV_LIB}
diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile
index a029b06bf3e6..3b7bf9cd1bb5 100644
--- a/mail/cyrus-imapd30/Makefile
+++ b/mail/cyrus-imapd30/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.0.18
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
 PKGNAMESUFFIX=	30
@@ -70,7 +70,7 @@ LDAP_DESC=		Enable LDAP support (experimental)
 LDAP_USES=		ldap
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
 LMDB_DESC=		Use LMDB backend
-LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb0
 LMDB_CONFIGURE_WITH=	lmdb
 MURDER_DESC=		Enable IMAP Murder support
 MURDER_CONFIGURE_ENABLE=murder
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 9737ed0d6153..dd223f60135e 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	exim
 PORTVERSION?=	${EXIM_VERSION}
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	mail
 MASTER_SITES=	EXIM:exim
 MASTER_SITE_SUBDIR=	/exim4/:exim \
@@ -53,7 +53,7 @@ EXIMON_USE=	xorg=x11,xaw,xext,xmu,xt
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 ICONV_USES=	iconv:lib,build
 INTERNATIONAL_LIB_DEPENDS=	libidn.so:dns/libidn libidn2.so:dns/libidn2
-LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb0
 MYSQL_USES=	mysql
 OPENLDAP_USES=	ldap
 PGSQL_LIB_DEPENDS=	libicudata.so:devel/icu
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 4e03d8c803cc..fffd2e8d0f3b 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libetpan
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -40,7 +40,7 @@ GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 			libgpg-error.so:security/libgpg-error
 IPV6_CONFIGURE_ENABLE=	ipv6
 LMDB_CONFIGURE_ENABLE=	lmdb
-LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb0
 OPENSSL_CONFIGURE_WITH=	openssl="${OPENSSLBASE}"
 OPENSSL_USES=		ssl
 
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index a21116edbebe..6e43f6d42056 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mutt
 DISTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		https://bitbucket.org/mutt/mutt/downloads/
@@ -123,7 +124,7 @@ HCACHE_GDBM_LIB_DEPENDS=		libgdbm.so:databases/gdbm
 HCACHE_GDBM_CONFIGURE_WITH=		gdbm=${LOCALBASE}
 HCACHE_KYOTOCABINET_LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet
 HCACHE_KYOTOCABINET_CONFIGURE_WITH=	kyotocabinet=${LOCALBASE}
-HCACHE_LMDB_LIB_DEPENDS=		liblmdb.so:databases/lmdb
+HCACHE_LMDB_LIB_DEPENDS=		liblmdb.so:databases/lmdb0
*** 669 LINES SKIPPED ***