diff --git a/databases/lmdb/Makefile b/databases/lmdb/Makefile
index 2c5053ec0a90..cd4525d9f28f 100644
--- a/databases/lmdb/Makefile
+++ b/databases/lmdb/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	lmdb
 PORTVERSION=	0.9.31
+PORTREVISION=	1
 DISTVERSIONPREFIX=	${PORTNAME:tu}_
 PORTEPOCH=	1
 CATEGORIES=	databases
 
 MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	OpenLDAP Lightning Memory-Mapped Database
 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
 
 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/lmdb/files/patch-Makefile b/databases/lmdb/files/patch-Makefile
index b7600527676e..f3ee1c5b41f8 100644
--- a/databases/lmdb/files/patch-Makefile
+++ b/databases/lmdb/files/patch-Makefile
@@ -1,78 +1,78 @@
 --- Makefile.orig	2021-03-16 16:41:19 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)/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,18 +69,28 @@ 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}
  
  mdb.o: mdb.c lmdb.h midl.h
  	$(CC) $(CFLAGS) $(CPPFLAGS) -c mdb.c
diff --git a/databases/lmdb/pkg-plist b/databases/lmdb/pkg-plist
index 449038cdcbd6..fd7e46b5d58d 100644
--- a/databases/lmdb/pkg-plist
+++ b/databases/lmdb/pkg-plist
@@ -1,13 +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
-man/man1/mdb_copy.1.gz
-man/man1/mdb_dump.1.gz
-man/man1/mdb_load.1.gz
-man/man1/mdb_stat.1.gz
+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