diff --git a/databases/tokyocabinet/Makefile b/databases/tokyocabinet/Makefile
index 85793c863190..954d73615755 100644
--- a/databases/tokyocabinet/Makefile
+++ b/databases/tokyocabinet/Makefile
@@ -1,79 +1,81 @@
 PORTNAME=	tokyocabinet
 PORTVERSION=	1.4.48
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	LOCAL/kuriyama \
 		https://dbmx.net/${PORTNAME}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modern implementation of DBM
 WWW=		https://dbmx.net/tokyocabinet/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USES=		pathfix gmake
 USE_LDCONFIG=	yes
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DEBUG DEVEL FASTEST LZMA LZO PTHREAD PROFILE SHARED SWAB UYIELD DOCS
 OPTIONS_DEFAULT=	PTHREAD SHARED
 OPTIONS_SUB=	yes
 
 DEVEL_DESC=	Development build
 FASTEST_DESC=	Fastest run
 LZMA_DESC=	LZMA codec
 LZO_DESC=	LZO codec
 PTHREAD_DESC=	Enable POSIX thread support
 PROFILE_DESC=	Profiling build
 SHARED_DESC=	Shared build
 SWAB_DESC=	Swapping byte-orders build
 UYIELD_DESC=	Detecting race conditions
 
 DEBUG_CONFIGURE_ENABLE=		debug
 DEBUG_PREVENTS=			LZMA
 
 DEVEL_CONFIGURE_ENABLE=		devel
 
 FASTEST_CONFIGURE_ENABLE=	fastest
 
 # to not confuse with system liblzma
 LZMA_CONFIGURE_ENABLE=		exlzma
 LZMA_LIB_DEPENDS=		liblzma.so.1:archivers/lzmalib
 LZMA_PREVENTS=			DEBUG
 
 LZO_CONFIGURE_ENABLE=		exlzo
 LZO_LIB_DEPENDS=		liblzo2.so:archivers/lzo2
 
 PTHREAD_CONFIGURE_ENABLE=	pthread
 
 PROFILE_CONFIGURE_ENABLE=	profile
 PROFILE_PREVENTS=		SHARED
 
 SHARED_CONFIGURE_ENABLE=	shared
 SHARED_PREVENTS=		PROFILE
 
 SWAB_CONFIGURE_ENABLE=		swab
 
 UYIELD_CONFIGURE_ENABLE=	uyield
 
 SHLIB_VER=	9.11.0
 SHLIB_VER_MAJ=	9
 
 PLIST_SUB+=	SHLIB_VER=${SHLIB_VER} SHLIB_VER_MAJ=${SHLIB_VER_MAJ}
 
 post-patch:
 	${REINPLACE_CMD} -e 's|@datarootdir@|@datarootdir@/doc|' \
 		${WRKSRC}/Makefile.in
 
 post-patch-FASTEST-on:
 	${REINPLACE_CMD} -e 's|-fforce-addr||' ${WRKSRC}/configure
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/libexec/tcawmgr.cgi
 
 post-install-SHARED-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
 .include <bsd.port.mk>
diff --git a/databases/tokyocabinet/pkg-plist b/databases/tokyocabinet/pkg-plist
index 5a5870b37444..f29e6a8ad9a2 100644
--- a/databases/tokyocabinet/pkg-plist
+++ b/databases/tokyocabinet/pkg-plist
@@ -1,61 +1,61 @@
 bin/tcamgr
 bin/tcamttest
 bin/tcatest
 bin/tcbmgr
 bin/tcbmttest
 bin/tcbtest
 bin/tcfmgr
 bin/tcfmttest
 bin/tcftest
 bin/tchmgr
 bin/tchmttest
 bin/tchtest
 bin/tctmgr
 bin/tctmttest
 bin/tcttest
 bin/tcucodec
 bin/tcumttest
 bin/tcutest
 include/tcadb.h
 include/tcbdb.h
 include/tcfdb.h
 include/tchdb.h
 include/tcutil.h
 include/tctdb.h
 lib/libtokyocabinet.a
 %%SHARED%%lib/libtokyocabinet.so
 %%SHARED%%lib/libtokyocabinet.so.%%SHLIB_VER_MAJ%%
 %%SHARED%%lib/libtokyocabinet.so.%%SHLIB_VER%%
 libdata/pkgconfig/tokyocabinet.pc
 libexec/tcawmgr.cgi
-man/man1/tcamgr.1.gz
-man/man1/tcamttest.1.gz
-man/man1/tcatest.1.gz
-man/man1/tcbmgr.1.gz
-man/man1/tcbmttest.1.gz
-man/man1/tcbtest.1.gz
-man/man1/tcfmgr.1.gz
-man/man1/tcfmttest.1.gz
-man/man1/tcftest.1.gz
-man/man1/tchmgr.1.gz
-man/man1/tchmttest.1.gz
-man/man1/tchtest.1.gz
-man/man1/tctmgr.1.gz
-man/man1/tctmttest.1.gz
-man/man1/tcttest.1.gz
-man/man1/tcucodec.1.gz
-man/man1/tcumttest.1.gz
-man/man1/tcutest.1.gz
-man/man3/tcadb.3.gz
-man/man3/tcbdb.3.gz
-man/man3/tcfdb.3.gz
-man/man3/tchdb.3.gz
-man/man3/tclist.3.gz
-man/man3/tcmap.3.gz
-man/man3/tcmdb.3.gz
-man/man3/tcmpool.3.gz
-man/man3/tctdb.3.gz
-man/man3/tctree.3.gz
-man/man3/tcutil.3.gz
-man/man3/tcxstr.3.gz
-man/man3/tokyocabinet.3.gz
+share/man/man1/tcamgr.1.gz
+share/man/man1/tcamttest.1.gz
+share/man/man1/tcatest.1.gz
+share/man/man1/tcbmgr.1.gz
+share/man/man1/tcbmttest.1.gz
+share/man/man1/tcbtest.1.gz
+share/man/man1/tcfmgr.1.gz
+share/man/man1/tcfmttest.1.gz
+share/man/man1/tcftest.1.gz
+share/man/man1/tchmgr.1.gz
+share/man/man1/tchmttest.1.gz
+share/man/man1/tchtest.1.gz
+share/man/man1/tctmgr.1.gz
+share/man/man1/tctmttest.1.gz
+share/man/man1/tcttest.1.gz
+share/man/man1/tcucodec.1.gz
+share/man/man1/tcumttest.1.gz
+share/man/man1/tcutest.1.gz
+share/man/man3/tcadb.3.gz
+share/man/man3/tcbdb.3.gz
+share/man/man3/tcfdb.3.gz
+share/man/man3/tchdb.3.gz
+share/man/man3/tclist.3.gz
+share/man/man3/tcmap.3.gz
+share/man/man3/tcmdb.3.gz
+share/man/man3/tcmpool.3.gz
+share/man/man3/tctdb.3.gz
+share/man/man3/tctree.3.gz
+share/man/man3/tcutil.3.gz
+share/man/man3/tcxstr.3.gz
+share/man/man3/tokyocabinet.3.gz