git: 85ba298b7e0c - main - databases/lmdb: allow to install both 0.x and 1.x together
Date: Tue, 20 Oct 2026 09:51:46 UTC
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=85ba298b7e0c5fbf9c5629abb3721cf485553b3e
commit 85ba298b7e0c5fbf9c5629abb3721cf485553b3e
Author: Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2026-10-15 12:21:37 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2026-10-20 09:48:39 +0000
databases/lmdb: allow to install both 0.x and 1.x together
LMDB 1.0 and the legacy 0.9 ABI cannot be mixed, the datanase format are
incompatibles as well.
Rename or relocate everything databases/lmdb0 installs so that it no
longer overlaps with databases/lmdb:
- the utilities are now mdb_copy0, mdb_dump0, mdb_load0 and mdb_stat0
- the header is include/lmdb0/lmdb.h
- the linker name is liblmdb0.so, the shared object keeps its ABI name
liblmdb.so.0 so already linked programs are unaffected
- the pkg-config file is lmdb0.pc
A compatibility prefix holding the previous layout is also installed
under ${PREFIX}/lmdb0/ (include/, lib/ and libdata/pkgconfig/) so that
build systems which expect to find lmdb.h and -llmdb relative to a
single directory only need a path change.
Now all ports should migrate to lmdb 1.X and use the lmdb 0.9 port to ease
in the migration path, lmdb, the lmdb 0.x is supposed to get removed at
some point.
Approved by: mat (portmgr)
Reviewed by: mat
Differential Revision: https://reviews.freebsd.org/D60741
---
archivers/urbackup-server/Makefile | 7 +++++--
biology/ncbi-blast+/Makefile | 7 +++++--
biology/ncbi-cxx-toolkit/Makefile | 6 +++++-
databases/ldb25/Makefile | 3 ++-
databases/ldb28/Makefile | 3 ++-
databases/ldb29/Makefile | 3 ++-
databases/lmdb/Makefile | 3 +--
databases/lmdb0/Makefile | 29 ++++++++++++++++++++++++-----
databases/lmdb0/files/lmdb.pc.in | 6 +++---
databases/lmdb0/files/lmdb0.pc.in | 11 +++++++++++
databases/lmdb0/pkg-plist | 28 ++++++++++++++++------------
databases/p5-LMDB_File/Makefile | 5 +++--
databases/py-lmdb/Makefile | 9 ++++++---
databases/rubygem-lmdb/Makefile | 6 +++++-
databases/tcl-lmdb/Makefile | 7 +++++--
devel/ice37/Makefile | 5 +++--
devel/tcl-thread/Makefile | 7 +++++--
dns/bind9-devel/Makefile | 7 ++++---
dns/bind920/Makefile | 6 +++---
dns/dnsdist/Makefile | 5 +++--
dns/dnsjit/Makefile | 7 +++++--
dns/powerdns/Makefile | 5 +++--
lang/php82/Makefile | 6 +++---
lang/php83/Makefile | 6 +++---
lang/php84/Makefile | 6 +++---
lang/php85/Makefile | 6 +++---
lang/php86/Makefile | 6 +++---
mail/bogofilter/Makefile | 7 +++++--
mail/cyrus-imapd30/Makefile | 7 +++++--
mail/exim/Makefile | 8 ++++----
mail/libetpan/Makefile | 6 +++++-
mail/mutt/Makefile | 6 ++++--
mail/neomutt/Makefile | 7 ++++---
mail/opendkim-devel/Makefile | 7 +++++--
mail/opendkim/Makefile | 7 +++++--
mail/postfix-current/Makefile | 10 ++++++----
mail/postfix/Makefile | 10 ++++++----
misc/caffe/Makefile | 7 +++++--
net-im/nheko/Makefile | 7 +++++--
net-p2p/cardano-db-sync/Makefile | 5 +++--
net-p2p/cardano-node/Makefile | 4 +++-
net-p2p/ogmios/Makefile | 5 +++--
net/389-ds-base/Makefile | 7 +++++--
net/samba416/Makefile | 3 ++-
net/samba419/Makefile | 3 ++-
net/samba420/Makefile | 3 ++-
net/samba422/Makefile | 3 ++-
net/samba423/Makefile | 3 ++-
net/samba424/Makefile | 3 ++-
net/samba425/Makefile | 3 ++-
ports-mgmt/appstream-generator/Makefile | 5 +++--
security/heimdal/Makefile | 6 ++++--
security/krb5-122/Makefile | 6 ++++--
security/krb5-devel/Makefile | 5 ++++-
sysutils/cardano-cli/Makefile | 4 +++-
sysutils/cfengine-devel/Makefile | 5 +++--
sysutils/cfengine327/Makefile | 6 +++---
sysutils/cfengine328/Makefile | 5 +++--
sysutils/kf5-baloo/Makefile | 7 +++++--
sysutils/kf6-baloo/Makefile | 6 +++++-
www/ot-recorder/Makefile | 6 +++++-
x11/cde-devel/Makefile | 6 +++++-
x11/cde/Makefile | 7 +++++--
63 files changed, 275 insertions(+), 135 deletions(-)
diff --git a/archivers/urbackup-server/Makefile b/archivers/urbackup-server/Makefile
index 11bd04b1b3f2..df56d3cd83c5 100644
--- a/archivers/urbackup-server/Makefile
+++ b/archivers/urbackup-server/Makefile
@@ -1,7 +1,10 @@
PORTNAME= urbackup-server
DISTVERSION= 2.5.37
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= archivers
+CPPFLAGS+= -I${LOCALBASE}/lmdb0/include
+LDFLAGS+= -L${LOCALBASE}/lmdb0/lib
+CONFIGURE_ENV+= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
MASTER_SITES= https://hndl.urbackup.org/Server/${DISTVERSION}/
MAINTAINER= ek@purplehat.org
@@ -13,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/server-license.txt
LIB_DEPENDS= libcryptopp.so:security/cryptopp \
libcurl.so:ftp/curl \
- liblmdb.so:databases/lmdb0 \
+ liblmdb0.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 ea44d0d33bad..f3384dd4dd2c 100644
--- a/biology/ncbi-blast+/Makefile
+++ b/biology/ncbi-blast+/Makefile
@@ -1,7 +1,10 @@
PORTNAME= ncbi-blast+
DISTVERSION= 2.17.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= biology perl5 python
+CPPFLAGS+= -I${LOCALBASE}/lmdb0/include
+LDFLAGS+= -L${LOCALBASE}/lmdb0/lib
+CONFIGURE_ENV+= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
MASTER_SITES= https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/LATEST/ \
https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${PORTVERSION}/
DISTNAME= ncbi-blast-${PORTVERSION}+-src
@@ -19,7 +22,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/lmdb0 \
+ liblmdb0.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 79de42c72595..d71be676cc79 100644
--- a/biology/ncbi-cxx-toolkit/Makefile
+++ b/biology/ncbi-cxx-toolkit/Makefile
@@ -2,6 +2,10 @@ PORTNAME= ncbi-cxx-toolkit
DISTVERSIONPREFIX= release/
DISTVERSION= 30.8.0
CATEGORIES= biology science devel
+PORTREVISION= 1
+CPPFLAGS+= -I${LOCALBASE}/lmdb0/include
+LDFLAGS+= -L${LOCALBASE}/lmdb0/lib
+CONFIGURE_ENV+= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
MAINTAINER= yuri@FreeBSD.org
COMMENT= NCBI C++ Toolkit
@@ -16,7 +20,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/lmdb0 \
+ liblmdb0.so:databases/lmdb0 \
libpcre.so:devel/pcre \
libunwind.so:devel/libunwind \
libzstd.so:archivers/zstd
diff --git a/databases/ldb25/Makefile b/databases/ldb25/Makefile
index 160ad9b86ba6..32ddc8d65f60 100644
--- a/databases/ldb25/Makefile
+++ b/databases/ldb25/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ldb
PORTVERSION= 2.5.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases
MASTER_SITES= SAMBA
PKGNAMESUFFIX?= 25
@@ -109,6 +109,7 @@ PLIST_FILES+= ${PKGCONFIGDIR}/pyldb-util${PYTHON_TAG}.pc \
CFLAGS+= -fno-color-diagnostics
.endif
CONFIGURE_ENV+= NOCOLOR=yes
+CONFIGURE_ENV+= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
MAKE_ENV+= NOCOLOR=yes
LDB_MAN1= share/man/man1/ldbadd.1.gz \
diff --git a/databases/ldb28/Makefile b/databases/ldb28/Makefile
index f7850d19ba0e..9a608928f088 100644
--- a/databases/ldb28/Makefile
+++ b/databases/ldb28/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ldb
PORTVERSION= 2.8.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases
MASTER_SITES= SAMBA
PKGNAMESUFFIX?= ${PORTVERSION:C/([[:digit:]]+)[.]([[:digit:]]+).*/\1\2/}
@@ -33,6 +33,7 @@ CONFIGURE_ARGS+= --bundled-libraries=!talloc,!tevent,!tdb,!popt,!cmocka \
--with-privatelibdir=${PREFIX}/lib/ldb \
--without-gettext
CONFIGURE_ENV+= NOCOLOR=yes
+CONFIGURE_ENV+= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
MAKE_ENV+= NOCOLOR=yes
CFLAGS+= ${_CFLAGS_${COMPILER_TYPE}}
DEBUG_FLAGS= -g -ggdb3 -O0
diff --git a/databases/ldb29/Makefile b/databases/ldb29/Makefile
index b304c5ae09fb..d08412ab93d5 100644
--- a/databases/ldb29/Makefile
+++ b/databases/ldb29/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ldb
PORTVERSION= 2.9.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= databases
MASTER_SITES= SAMBA
PKGNAMESUFFIX?= ${PORTVERSION:C/([[:digit:]]+)[.]([[:digit:]]+).*/\1\2/}
@@ -33,6 +33,7 @@ CONFIGURE_ARGS+= --bundled-libraries=!talloc,!tevent,!tdb,!popt,!cmocka \
--with-privatelibdir=${PREFIX}/lib/ldb \
--without-gettext
CONFIGURE_ENV+= NOCOLOR=yes
+CONFIGURE_ENV+= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
MAKE_ENV+= NOCOLOR=yes
CFLAGS+= ${_CFLAGS_${COMPILER_TYPE}}
DEBUG_FLAGS= -g -ggdb3 -O0
diff --git a/databases/lmdb/Makefile b/databases/lmdb/Makefile
index 2d786cd1b068..3bf4705dfc07 100644
--- a/databases/lmdb/Makefile
+++ b/databases/lmdb/Makefile
@@ -1,5 +1,6 @@
PORTNAME= lmdb
PORTVERSION= 1.0.2
+PORTREVISION= 1
DISTVERSIONPREFIX= ${PORTNAME:tu}_
PORTEPOCH= 1
CATEGORIES= databases
@@ -25,8 +26,6 @@ MAKE_ARGS+= INSTALL_DATA="${INSTALL_DATA}" \
INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
prefix="${PREFIX}"
-CONFLICTS_INSTALL= lmdb0 # include/lmdb.h bin/mdb_stat
-
SUB_FILES+= lmdb.pc
SUB_LIST+= PORTVERSION=${PORTVERSION}
diff --git a/databases/lmdb0/Makefile b/databases/lmdb0/Makefile
index c09cbbbf11f1..629717e677c2 100644
--- a/databases/lmdb0/Makefile
+++ b/databases/lmdb0/Makefile
@@ -1,5 +1,6 @@
PORTNAME= lmdb
PORTVERSION= 0.9.36
+PORTREVISION= 1
DISTVERSIONPREFIX= ${PORTNAME:tu}_
PKGNAMESUFFIX= 0
CATEGORIES= databases
@@ -13,8 +14,6 @@ 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
@@ -28,12 +27,32 @@ USE_GITHUB= yes
GH_ACCOUNT= openldap
GH_PROJECT= openldap
-SUB_FILES+= lmdb.pc
+SUB_FILES+= lmdb0.pc 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
+ ${MV} ${STAGEDIR}${PREFIX}/bin/mdb_copy ${STAGEDIR}${PREFIX}/bin/mdb_copy0
+ ${MV} ${STAGEDIR}${PREFIX}/bin/mdb_dump ${STAGEDIR}${PREFIX}/bin/mdb_dump0
+ ${MV} ${STAGEDIR}${PREFIX}/bin/mdb_load ${STAGEDIR}${PREFIX}/bin/mdb_load0
+ ${MV} ${STAGEDIR}${PREFIX}/bin/mdb_stat ${STAGEDIR}${PREFIX}/bin/mdb_stat0
+ ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/mdb_copy.1 ${STAGEDIR}${PREFIX}/share/man/man1/mdb_copy0.1
+ ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/mdb_dump.1 ${STAGEDIR}${PREFIX}/share/man/man1/mdb_dump0.1
+ ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/mdb_load.1 ${STAGEDIR}${PREFIX}/share/man/man1/mdb_load0.1
+ ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/mdb_stat.1 ${STAGEDIR}${PREFIX}/share/man/man1/mdb_stat0.1
+ ${MV} ${STAGEDIR}${PREFIX}/lib/liblmdb.a ${STAGEDIR}${PREFIX}/lib/liblmdb0.a
+ ${LN} -sf liblmdb.so.0 ${STAGEDIR}${PREFIX}/lib/liblmdb0.so
+ @${MKDIR} ${STAGEDIR}${PREFIX}/include/lmdb0
+ ${MV} ${STAGEDIR}${PREFIX}/include/lmdb.h ${STAGEDIR}${PREFIX}/include/lmdb0/lmdb.h
+ ${INSTALL_DATA} ${WRKDIR}/lmdb0.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/lmdb0.pc
+ # Compatibility prefix for build systems that look up lmdb.h and
+ # -llmdb relative to a single directory.
+ @${MKDIR} ${STAGEDIR}${PREFIX}/lmdb0/include
+ @${MKDIR} ${STAGEDIR}${PREFIX}/lmdb0/lib
+ @${MKDIR} ${STAGEDIR}${PREFIX}/lmdb0/libdata/pkgconfig
+ ${LN} -sf ../../include/lmdb0/lmdb.h ${STAGEDIR}${PREFIX}/lmdb0/include/lmdb.h
+ ${LN} -sf ../../lib/liblmdb.so.0 ${STAGEDIR}${PREFIX}/lmdb0/lib/liblmdb.so
+ ${LN} -sf ../../lib/liblmdb0.a ${STAGEDIR}${PREFIX}/lmdb0/lib/liblmdb.a
+ ${INSTALL_DATA} ${WRKDIR}/lmdb.pc ${STAGEDIR}${PREFIX}/lmdb0/libdata/pkgconfig/lmdb.pc
do-test:
${MKDIR} ${WRKSRC}/testdb
diff --git a/databases/lmdb0/files/lmdb.pc.in b/databases/lmdb0/files/lmdb.pc.in
index 2227c9cdb737..9f2576efbde7 100644
--- a/databases/lmdb0/files/lmdb.pc.in
+++ b/databases/lmdb0/files/lmdb.pc.in
@@ -1,10 +1,10 @@
prefix=%%PREFIX%%
exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
+libdir=${prefix}/lmdb0/lib
+includedir=${prefix}/lmdb0/include
Name: lmdb
-Description: Lightning Memory-Mapped Database
+Description: Lightning Memory-Mapped Database (legacy)
URL: https://symas.com/lmdb/
Version: %%PORTVERSION%%
Libs: -L${libdir} -llmdb
diff --git a/databases/lmdb0/files/lmdb0.pc.in b/databases/lmdb0/files/lmdb0.pc.in
new file mode 100644
index 000000000000..09471d81d0ef
--- /dev/null
+++ b/databases/lmdb0/files/lmdb0.pc.in
@@ -0,0 +1,11 @@
+prefix=%%PREFIX%%
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include/lmdb0
+
+Name: lmdb0
+Description: Lightning Memory-Mapped Database (legacy)
+URL: https://symas.com/lmdb/
+Version: %%PORTVERSION%%
+Libs: -L${libdir} -llmdb0
+Cflags: -I${includedir}
diff --git a/databases/lmdb0/pkg-plist b/databases/lmdb0/pkg-plist
index fd7e46b5d58d..b9cf3dfa8ad3 100644
--- a/databases/lmdb0/pkg-plist
+++ b/databases/lmdb0/pkg-plist
@@ -1,13 +1,17 @@
-bin/mdb_copy
-bin/mdb_dump
-bin/mdb_load
-bin/mdb_stat
-include/lmdb.h
-lib/liblmdb.a
-lib/liblmdb.so
+bin/mdb_copy0
+bin/mdb_dump0
+bin/mdb_load0
+bin/mdb_stat0
+include/lmdb0/lmdb.h
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
+lib/liblmdb0.a
+lib/liblmdb0.so
+libdata/pkgconfig/lmdb0.pc
+lmdb0/include/lmdb.h
+lmdb0/lib/liblmdb.a
+lmdb0/lib/liblmdb.so
+lmdb0/libdata/pkgconfig/lmdb.pc
+share/man/man1/mdb_copy0.1.gz
+share/man/man1/mdb_dump0.1.gz
+share/man/man1/mdb_load0.1.gz
+share/man/man1/mdb_stat0.1.gz
diff --git a/databases/p5-LMDB_File/Makefile b/databases/p5-LMDB_File/Makefile
index 8942b0829482..9ebdfeae3fba 100644
--- a/databases/p5-LMDB_File/Makefile
+++ b/databases/p5-LMDB_File/Makefile
@@ -1,6 +1,6 @@
PORTNAME= LMDB_File
PORTVERSION= 0.14
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:SORTIZ
@@ -12,10 +12,11 @@ WWW= https://metacpan.org/dist/LMDB_File
LICENSE= ART20
-LIB_DEPENDS= liblmdb.so:databases/lmdb0
+LIB_DEPENDS= liblmdb0.so:databases/lmdb0
USES= localbase perl5
USE_PERL5= configure
+CONFIGURE_ARGS= INC=-I${LOCALBASE}/lmdb0/include LIBS=-L${LOCALBASE}/lmdb0/lib\ -llmdb
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/LMDB_File/LMDB_File.so
diff --git a/databases/py-lmdb/Makefile b/databases/py-lmdb/Makefile
index 6e42527e9fd7..7f7f083b6733 100644
--- a/databases/py-lmdb/Makefile
+++ b/databases/py-lmdb/Makefile
@@ -1,6 +1,6 @@
PORTNAME= lmdb
PORTVERSION= 2.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -18,14 +18,17 @@ 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/lmdb0
+LIB_DEPENDS= liblmdb0.so:databases/lmdb0
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= localbase python
USE_PYTHON= autoplist pep517
MAKE_ENV= LMDB_FORCE_SYSTEM=1 \
- LMDB_FORCE_CFFI=1
+ LMDB_FORCE_CFFI=1 \
+ CPPFLAGS="-I${LOCALBASE}/lmdb0/include" \
+ LDFLAGS="-L${LOCALBASE}/lmdb0/lib" \
+ PKG_CONFIG_PATH="${LOCALBASE}/lmdb0/libdata/pkgconfig"
post-install:
@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/lmdb/lmdb_cffi*.so
diff --git a/databases/rubygem-lmdb/Makefile b/databases/rubygem-lmdb/Makefile
index 2129be3dbda4..3a8ca05a9602 100644
--- a/databases/rubygem-lmdb/Makefile
+++ b/databases/rubygem-lmdb/Makefile
@@ -1,6 +1,7 @@
PORTNAME= lmdb
PORTVERSION= 0.8.1
CATEGORIES= databases rubygems
+PORTREVISION= 1
MASTER_SITES= RG
MAINTAINER= ruby@FreeBSD.org
@@ -10,8 +11,11 @@ WWW= https://github.com/doriantaylor/rb-lmdb
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/README.md
-LIB_DEPENDS= liblmdb.so:databases/lmdb0
+LIB_DEPENDS= liblmdb0.so:databases/lmdb0
USES= gem
+CONFIGURE_ARGS= --with-lmdb-include=${LOCALBASE}/lmdb0/include --with-lmdb-lib=${LOCALBASE}/lmdb0/lib
+MAKE_ENV+= CPPFLAGS="-I${LOCALBASE}/lmdb0/include" LDFLAGS="-L${LOCALBASE}/lmdb0/lib" \
+ PKG_CONFIG_PATH="${LOCALBASE}/lmdb0/libdata/pkgconfig"
.include <bsd.port.mk>
diff --git a/databases/tcl-lmdb/Makefile b/databases/tcl-lmdb/Makefile
index 8d42d6ae2769..0c7d25b2a221 100644
--- a/databases/tcl-lmdb/Makefile
+++ b/databases/tcl-lmdb/Makefile
@@ -1,7 +1,10 @@
PORTNAME= tcl-lmdb
DISTVERSION= 0.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
+CPPFLAGS+= -I${LOCALBASE}/lmdb0/include
+LDFLAGS+= -L${LOCALBASE}/lmdb0/lib
+CONFIGURE_ENV+= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
MAINTAINER= gahr@FreeBSD.org
COMMENT= Tcl interface to the Lightning Memory-Mapped Database
@@ -9,7 +12,7 @@ WWW= https://github.com/ray2501/tcl-lmdb
LICENSE= BSD2CLAUSE
-LIB_DEPENDS= liblmdb.so:databases/lmdb0
+LIB_DEPENDS= liblmdb0.so:databases/lmdb0
USES= gmake localbase:ldflags tcl:tea
diff --git a/devel/ice37/Makefile b/devel/ice37/Makefile
index c1f539c57c7b..1ae764cb1b72 100644
--- a/devel/ice37/Makefile
+++ b/devel/ice37/Makefile
@@ -1,6 +1,6 @@
PORTNAME= Ice
PORTVERSION= 3.7.11
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= devel
PKGNAMESUFFIX?= 37
@@ -16,7 +16,7 @@ CONFLICTS= Ice py*-Ice php*-Ice
.if ${SLAVE_PORT} == "no"
LIB_DEPENDS= libexpat.so:textproc/expat2 \
- liblmdb.so:databases/lmdb0 \
+ liblmdb0.so:databases/lmdb0 \
libmcpp.so:devel/mcpp
.else
LIB_VRS= ${PORTVERSION:R:S|.||g}
@@ -34,6 +34,7 @@ USE_CXXSTD= c++14
DEBUG_MAKE_ENV= OPTIMIZE=no
TEST_ALL_TARGET_OFF= srcs
MAKE_ARGS+= V=1
+MAKE_ARGS+= LMDB_HOME=${LOCALBASE}/lmdb0
CONFIGS= shared
diff --git a/devel/tcl-thread/Makefile b/devel/tcl-thread/Makefile
index 3a119ed033f5..f51f1181f148 100644
--- a/devel/tcl-thread/Makefile
+++ b/devel/tcl-thread/Makefile
@@ -1,6 +1,6 @@
PORTNAME= thread
PORTVERSION= 3.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= SF/tcl/Tcl/9.0.3
PKGNAMEPREFIX= tcl-
@@ -29,7 +29,10 @@ 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/lmdb0
+LMDB_LIB_DEPENDS= liblmdb0.so:databases/lmdb0
+LMDB_CPPFLAGS= -I${LOCALBASE}/lmdb0/include
+LMDB_LDFLAGS= -L${LOCALBASE}/lmdb0/lib
+LMDB_CONFIGURE_ENV= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
LMDB_CONFIGURE_WITH= lmdb
PORTDOCS= *
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index f5422b6648f6..1f1a7a7f1d31 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -4,13 +4,14 @@ PORTNAME= bind
DISTVERSION= 9.21.26
.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
+CONFIGURE_ENV+= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
MASTER_SITES= ISC/bind9/${DISTVERSION}
.if defined(BIND_TOOLS_SLAVE)
PKGNAMESUFFIX= -tools
@@ -35,7 +36,7 @@ WWW= https://www.isc.org/bind/
LICENSE= MPL20
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-LIB_DEPENDS= liblmdb.so:databases/lmdb0 \
+LIB_DEPENDS= liblmdb0.so:databases/lmdb0 \
libnghttp2.so:www/libnghttp2 \
liburcu.so:sysutils/liburcu \
libuv.so:devel/libuv
diff --git a/dns/bind920/Makefile b/dns/bind920/Makefile
index 3b1ca5b66fb5..4ba352c847be 100644
--- a/dns/bind920/Makefile
+++ b/dns/bind920/Makefile
@@ -7,7 +7,7 @@ DISTVERSION= 9.20.29
PORTREVISION= 0
.else
# dns/bind920 here
-PORTREVISION= 0
+PORTREVISION= 1
.endif
CATEGORIES= dns net
MASTER_SITES= ISC/bind9/${DISTVERSION}
@@ -154,8 +154,8 @@ IDN_CONFIGURE_OFF= --without-libidn2
LARGE_FILE_CONFIGURE_ENABLE= largefile
-LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb0
-LMDB_CONFIGURE_WITH= lmdb=${LOCALBASE}
+LMDB_LIB_DEPENDS= liblmdb0.so:databases/lmdb0
+LMDB_CONFIGURE_WITH= lmdb=${LOCALBASE}/lmdb0
OVERRIDECACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl
diff --git a/dns/dnsdist/Makefile b/dns/dnsdist/Makefile
index e13166cde2a7..89d91e7c3b9c 100644
--- a/dns/dnsdist/Makefile
+++ b/dns/dnsdist/Makefile
@@ -1,7 +1,8 @@
PORTNAME= dnsdist
DISTVERSION= 2.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= dns net
+CONFIGURE_ENV+= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
MASTER_SITES= https://downloads.powerdns.com/releases/
DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}
@@ -88,7 +89,7 @@ GNUTLS_MESON_ENABLED= tls-gnutls
IPCIPHER_IMPLIES= OPENSSL
IPCIPHER_MESON_ENABLED= ipcipher
-LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb0
+LMDB_LIB_DEPENDS= liblmdb0.so:databases/lmdb0
LMDB_MESON_ENABLED= lmdb
LUAJIT_USES= luajit
diff --git a/dns/dnsjit/Makefile b/dns/dnsjit/Makefile
index 25856995b073..07b492ec3dcd 100644
--- a/dns/dnsjit/Makefile
+++ b/dns/dnsjit/Makefile
@@ -1,7 +1,10 @@
PORTNAME= dnsjit
DISTVERSION= 1.4.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= dns net
+CPPFLAGS+= -I${LOCALBASE}/lmdb0/include
+LDFLAGS+= -L${LOCALBASE}/lmdb0/lib
+CONFIGURE_ENV+= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
MASTER_SITES= https://www.dns-oarc.net/files/${PORTNAME}/
MAINTAINER= freebsd@dns.company
@@ -13,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libck.so:devel/concurrencykit \
libgnutls.so:security/gnutls \
- liblmdb.so:databases/lmdb0 \
+ liblmdb0.so:databases/lmdb0 \
liblz4.so:archivers/liblz4 \
libzstd.so:archivers/zstd
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index 81da5f34cda2..02b93773cc8c 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -1,6 +1,6 @@
PORTNAME= powerdns
DISTVERSION= 5.1.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= dns
MASTER_SITES= https://downloads.powerdns.com/releases/
DISTNAME= pdns-${DISTVERSION}
@@ -84,9 +84,10 @@ 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/lmdb0
+ liblmdb0.so:databases/lmdb0
LMDB_MESON_ON= -Dmodule-lmdb=dynamic
LMDB_VARS= MODULES+=lmdb
+LMDB_CONFIGURE_ENV= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
LUABACKEND_MESON_ON= -Dmodule-lua2=dynamic
LUABACKEND_VARS= MODULES+=lua2
diff --git a/lang/php82/Makefile b/lang/php82/Makefile
index e25e0ba15feb..1e6a9c98635c 100644
--- a/lang/php82/Makefile
+++ b/lang/php82/Makefile
@@ -1,6 +1,6 @@
PORTNAME= php82
DISTVERSION= 8.2.34
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
DISTNAME= php-${DISTVERSION}
@@ -236,8 +236,8 @@ 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/lmdb0
-LMDB_CONFIGURE_ARGS= --with-lmdb=${LOCALBASE}
+LMDB_LIB_DEPENDS= liblmdb0.so:databases/lmdb0
+LMDB_CONFIGURE_ARGS= --with-lmdb=${LOCALBASE}/lmdb0
QDBM_LIB_DEPENDS= libqdbm.so:databases/qdbm
QDBM_CONFIGURE_ARGS= --with-qdbm=${LOCALBASE}
TOKYO_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet
diff --git a/lang/php83/Makefile b/lang/php83/Makefile
index 116e2d883e75..03da8810d417 100644
--- a/lang/php83/Makefile
+++ b/lang/php83/Makefile
@@ -1,6 +1,6 @@
PORTNAME= php83
DISTVERSION= 8.3.35
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
DISTNAME= php-${DISTVERSION}
@@ -251,8 +251,8 @@ 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/lmdb0
-LMDB_CONFIGURE_ARGS= --with-lmdb=${LOCALBASE}
+LMDB_LIB_DEPENDS= liblmdb0.so:databases/lmdb0
+LMDB_CONFIGURE_ARGS= --with-lmdb=${LOCALBASE}/lmdb0
QDBM_LIB_DEPENDS= libqdbm.so:databases/qdbm
QDBM_CONFIGURE_ARGS= --with-qdbm=${LOCALBASE}
TOKYO_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet
diff --git a/lang/php84/Makefile b/lang/php84/Makefile
index b9fb3cbb68b5..6f5e2d5ca5b5 100644
--- a/lang/php84/Makefile
+++ b/lang/php84/Makefile
@@ -1,6 +1,6 @@
PORTNAME= php84
DISTVERSION= 8.4.26
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
DISTNAME= php-${DISTVERSION}
@@ -262,8 +262,8 @@ 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/lmdb0
-LMDB_CONFIGURE_ARGS= --with-lmdb=${LOCALBASE}
+LMDB_LIB_DEPENDS= liblmdb0.so:databases/lmdb0
+LMDB_CONFIGURE_ARGS= --with-lmdb=${LOCALBASE}/lmdb0
QDBM_LIB_DEPENDS= libqdbm.so:databases/qdbm
QDBM_CONFIGURE_ARGS= --with-qdbm=${LOCALBASE}
TOKYO_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet
diff --git a/lang/php85/Makefile b/lang/php85/Makefile
index cd049eba018a..8e34bcbae568 100644
--- a/lang/php85/Makefile
+++ b/lang/php85/Makefile
@@ -1,6 +1,6 @@
PORTNAME= php85
DISTVERSION= 8.5.11
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
DISTNAME= php-${DISTVERSION}
@@ -263,8 +263,8 @@ 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/lmdb0
-LMDB_CONFIGURE_ARGS= --with-lmdb=${LOCALBASE}
+LMDB_LIB_DEPENDS= liblmdb0.so:databases/lmdb0
+LMDB_CONFIGURE_ARGS= --with-lmdb=${LOCALBASE}/lmdb0
QDBM_LIB_DEPENDS= libqdbm.so:databases/qdbm
QDBM_CONFIGURE_ARGS= --with-qdbm=${LOCALBASE}
TOKYO_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet
diff --git a/lang/php86/Makefile b/lang/php86/Makefile
index 50277bc26984..ed70ffe91fdd 100644
--- a/lang/php86/Makefile
+++ b/lang/php86/Makefile
@@ -1,6 +1,6 @@
PORTNAME= php86
DISTVERSION= 8.6.0RC3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= lang devel www
#MASTER_SITES= PHP/distributions
MASTER_SITES= https://downloads.php.net/~mbeccati/ \
@@ -265,8 +265,8 @@ 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/lmdb0
-LMDB_CONFIGURE_ARGS= --with-lmdb=${LOCALBASE}
+LMDB_LIB_DEPENDS= liblmdb0.so:databases/lmdb0
+LMDB_CONFIGURE_ARGS= --with-lmdb=${LOCALBASE}/lmdb0
QDBM_LIB_DEPENDS= libqdbm.so:databases/qdbm
QDBM_CONFIGURE_ARGS= --with-qdbm=${LOCALBASE}
TOKYO_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index ccba0f443d8b..4cf4838aa176 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -1,6 +1,6 @@
PORTNAME= bogofilter
DISTVERSION= 1.3.0.rc1
-PORTREVISION?= 4
+PORTREVISION?= 5
CATEGORIES?= mail
MASTER_SITES= SF/bogofilter/bogofilter-current/bogofilter-1.3.0.beta/ \
https://gitlab.com/-/project/12408342/uploads/647db3bd2f28a1f91bdd3bb1945d91fe/
@@ -49,7 +49,10 @@ CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc
.if ${MASTERDIR} == ${.CURDIR}
# we're building the master port
CONFIGURE_ARGS+= --with-database=lmdb
-LIB_DEPENDS+= liblmdb.so.0:databases/lmdb0
+LIB_DEPENDS+= liblmdb0.so:databases/lmdb0
+CPPFLAGS+= -I${LOCALBASE}/lmdb0/include
+LDFLAGS+= -L${LOCALBASE}/lmdb0/lib
+CONFIGURE_ENV+= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
.endif
.if ${PORT_OPTIONS:MUNICODE}
BF_LIBS+= ${ICONV_LIB}
diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile
index 3b7bf9cd1bb5..9d39f59441bd 100644
--- a/mail/cyrus-imapd30/Makefile
+++ b/mail/cyrus-imapd30/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cyrus-imapd
PORTVERSION= 3.0.18
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= mail
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
PKGNAMESUFFIX= 30
@@ -70,8 +70,11 @@ 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/lmdb0
+LMDB_LIB_DEPENDS= liblmdb0.so:databases/lmdb0
LMDB_CONFIGURE_WITH= lmdb
+LMDB_CPPFLAGS= -I${LOCALBASE}/lmdb0/include
+LMDB_LDFLAGS= -L${LOCALBASE}/lmdb0/lib
+LMDB_CONFIGURE_ENV= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
MURDER_DESC= Enable IMAP Murder support
MURDER_CONFIGURE_ENABLE=murder
MURDER_MAKE_ENV= PTHREAD_LIBS="-lpthread"
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 21fd8617c9e3..85905f4e54a9 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/lmdb0
+LMDB_LIB_DEPENDS= liblmdb0.so:databases/lmdb0
MYSQL_USES= mysql
OPENLDAP_USES= ldap
PGSQL_LIB_DEPENDS= libicudata.so:devel/icu
@@ -331,8 +331,8 @@ SEDLIST+= -e 's,XX_DB_LIBS_XX,${DB_LIBS:S/,/\\,/g},' \
-e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES:S/,/\\,/g},'
.if ${PORT_OPTIONS:MLMDB}
-_LMDB_LIBS= -L${LOCALBASE}/lib -llmdb
-_LMDB_INCLUDES= -I${LOCALBASE}/include
+_LMDB_LIBS= -L${LOCALBASE}/lmdb0/lib -llmdb
+_LMDB_INCLUDES= -I${LOCALBASE}/lmdb0/include
SEDLIST+= -e 's,^\# (EXPERIMENTAL_LMDB=),\1,'
.else
_LMDB_LIBS=
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 3abf859cda27..e68a85b027d3 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -1,6 +1,7 @@
PORTNAME= libetpan
PORTVERSION= 1.10.1
CATEGORIES= mail
+PORTREVISION= 1
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Mail framework for C language
@@ -39,7 +40,10 @@ 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/lmdb0
+LMDB_CPPFLAGS= -I${LOCALBASE}/lmdb0/include
+LMDB_LDFLAGS= -L${LOCALBASE}/lmdb0/lib
+LMDB_CONFIGURE_ENV= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
+LMDB_LIB_DEPENDS= liblmdb0.so:databases/lmdb0
OPENSSL_CONFIGURE_WITH= openssl="${OPENSSLBASE}"
OPENSSL_USES= ssl
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index d4d97c636a88..6f64f4065c9b 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,6 +1,7 @@
PORTNAME= mutt
DISTVERSION= 2.4.3
CATEGORIES= mail
+PORTREVISION= 1
MASTER_SITES= http://ftp.mutt.org/pub/mutt/ \
ftp://ftp.mutt.org/pub/mutt/
DIST_SUBDIR= mutt
@@ -123,8 +124,9 @@ 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/lmdb0
-HCACHE_LMDB_CONFIGURE_WITH= lmdb=${LOCALBASE}
+HCACHE_LMDB_LIB_DEPENDS= liblmdb0.so:databases/lmdb0
+HCACHE_LMDB_CONFIGURE_WITH= lmdb=${LOCALBASE}/lmdb0
+HCACHE_LMDB_CONFIGURE_ENV= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
HCACHE_NONE_CONFIGURE_ON= --disable-hcache
HCACHE_NONE_CONFIGURE_OFF= --enable-hcache
HCACHE_QDBM_LIB_DEPENDS= libqdbm.so:databases/qdbm
diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
index 5e9a65a769a1..8f8b9444ca63 100644
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@@ -1,6 +1,6 @@
PORTNAME= neomutt
PORTVERSION= 20260616
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
MAINTAINER= gahr@FreeBSD.org
@@ -59,8 +59,9 @@ GDBM_CONFIGURE_ON= --gdbm
GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm
KYOTOCABINET_CONFIGURE_ON= --kyotocabinet
KYOTOCABINET_LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet
-LMDB_CONFIGURE_ON= --lmdb
-LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb0
+LMDB_CONFIGURE_ON= --with-lmdb=${LOCALBASE}/lmdb0
+LMDB_CONFIGURE_ENV= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
+LMDB_LIB_DEPENDS= liblmdb0.so:databases/lmdb0
QDBM_CONFIGURE_ON= --qdbm
QDBM_LIB_DEPENDS= libqdbm.so:databases/qdbm
TOKYOCABINET_CONFIGURE_ON= --tokyocabinet
diff --git a/mail/opendkim-devel/Makefile b/mail/opendkim-devel/Makefile
index 216756ef06fb..87b0557abafe 100644
--- a/mail/opendkim-devel/Makefile
+++ b/mail/opendkim-devel/Makefile
@@ -1,7 +1,7 @@
PORTNAME= opendkim
DISTVERSIONPREFIX= rel-opendkim-
DISTVERSION= 2.11.0-Beta2-49
-PORTREVISION= 2
+PORTREVISION= 3
DISTVERSIONSUFFIX= -g1c7a9f47c
CATEGORIES= mail security
PKGNAMESUFFIX= -devel
@@ -128,7 +128,10 @@ JANSSON_CONFIGURE_WITH= libjansson
LDAP_CACHING_USES= ldap
LDAP_CACHING_CONFIGURE_ENABLE= ldap_caching
-LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb0
+LMDB_LIB_DEPENDS= liblmdb0.so:databases/lmdb0
+LMDB_CPPFLAGS= -I${LOCALBASE}/lmdb0/include
+LMDB_LDFLAGS= -L${LOCALBASE}/lmdb0/lib
+LMDB_CONFIGURE_ENV= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
LMDB_CONFIGURE_WITH= lmdb
LUA_USES= lua:flavors
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index 8bf7a5091a23..c9a08ea23220 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -1,6 +1,6 @@
PORTNAME= opendkim
PORTVERSION= 2.10.3
-PORTREVISION= 23
+PORTREVISION= 24
CATEGORIES= mail security
MASTER_SITES= SF/${PORTNAME} \
SF/${PORTNAME}/Previous%20Releases \
@@ -69,7 +69,10 @@ LDNS_LIB_DEPENDS= libldns.so:dns/ldns
LMDB_DESC= Use Lightning Memory-Mapped DB key-value store
LMDB_CONFIGURE_WITH= lmdb
-LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb0
+LMDB_CPPFLAGS= -I${LOCALBASE}/lmdb0/include
+LMDB_LDFLAGS= -L${LOCALBASE}/lmdb0/lib
+LMDB_CONFIGURE_ENV= PKG_CONFIG_PATH=${LOCALBASE}/lmdb0/libdata/pkgconfig
+LMDB_LIB_DEPENDS= liblmdb0.so:databases/lmdb0
LUA_DESC= Describe filter policy with lua
LUA_CONFIGURE_WITH= lua
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 669870c4aeb5..50596ce16235 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
*** 670 LINES SKIPPED ***