diff --git a/japanese/man/Makefile b/japanese/man/Makefile
index 168a619a464e..0e7b9c773b88 100644
--- a/japanese/man/Makefile
+++ b/japanese/man/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	man
 PORTVERSION=	1.1j
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://daemon.jp.freebsd.org/pub/FreeBSD-jp/man-jp/ \
 		PORTS_JP
 DISTNAME=	jp-${PORTNAME}-${PORTVERSION}
 
 PATCH_SITES=	ftp://daemon.jp.freebsd.org/pub/FreeBSD-jp/man-jp/
 PATCHFILES=	jp-man-1.1j-ex-20020115.patch
 PATCH_DIST_STRIP=-p1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Manual display command for Japanese (EUC)
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	${LOCALBASE}/bin/groff:japanese/groff \
 		jless:japanese/less
 
 BROKEN_mips=	fails to compile: man.c:37:10: fatal error: 'config.h' file not found
 
 MAKE_ENV=	GZCAT=${GZCAT} GZIP_CMD="${GZIP_CMD}"
 USES=		shebangfix
 SHEBANG_FILES=	catman/catman.perl makewhatis/makewhatis.perl
 
 # Fix build with clang11
 CFLAGS+=	-fcommon
 # XXX PIE static libraries currently not supported by base system /usr/share/mk
 MAKE_ARGS+=	WITHOUT_PIE=true
 
 post-patch:
 .for file in	apropos/apropos.sh catman/catman.perl \
 		makewhatis/jmakewhatis.local.man \
 		makewhatis/jmakewhatis.local.man.eng \
 		makewhatis/makewhatis.local.sh \
 		man/locale.c manpath/manpath.config
 	${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/${file}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/japanese/man/files/patch-Makefile.inc b/japanese/man/files/patch-Makefile.inc
index 56732fcea9a4..5ed1591638db 100644
--- a/japanese/man/files/patch-Makefile.inc
+++ b/japanese/man/files/patch-Makefile.inc
@@ -1,13 +1,22 @@
---- Makefile.inc.orig	Mon Apr  8 19:21:24 2002
-+++ Makefile.inc	Mon Apr  8 19:22:12 2002
-@@ -10,8 +10,8 @@
+--- Makefile.inc.orig	2001-01-15 09:41:22 UTC
++++ Makefile.inc
+@@ -3,15 +3,15 @@ BINDIR=			${PREFIX}/bin
+ # pick up a user's own version of some utility and hose ourselves.
+ #
+ BINDIR=			${PREFIX}/bin
+-MANDIR=			${PREFIX}/man/ja/man
+-EMANDIR=		${PREFIX}/man/man
++MANDIR=			${PREFIX}/share/man/ja/man
++EMANDIR=		${PREFIX}/share/man/man
+ libdir=			${PREFIX}/etc
+ libexecdir=		${PREFIX}/libexec
  bindir=			${BINDIR}
  pager=			jless -s
  manpath_config_file=	/etc/manpath.config
 -troff=			${bindir}/groff -S -mandoc
 -nroff=                  ${bindir}/groff -S -Wall -Tnippon -mtty-char -mandoc
 +troff=			${bindir}/groff -S -man -dlang=ja_JP.eucJP
 +nroff=                  ${bindir}/groff -S -Wall -Tnippon -mtty-char -man -dlang=ja_JP.eucJP
  apropos=		${bindir}/japropos
  whatis=			${bindir}/jwhatis
  neqn=                   ${bindir}/geqn -Tascii
diff --git a/japanese/man/pkg-plist b/japanese/man/pkg-plist
index 2a0efc743018..4af60f6a5355 100644
--- a/japanese/man/pkg-plist
+++ b/japanese/man/pkg-plist
@@ -1,24 +1,24 @@
 bin/jmanpath
 @(man,,4555) bin/jman
 @(bin,bin,) bin/japropos
 @(bin,bin,) bin/jwhatis
 @(bin,bin,) bin/jmakewhatis
 @(bin,bin,) bin/jcatman
 @(bin,bin,) libexec/jmakewhatis.local
 @(bin,bin,) libexec/jcatman.local
-man/man1/jman.1.gz
-man/man1/jmanpath.1.gz
-man/man1/japropos.1.gz
-man/man1/jwhatis.1.gz
-man/man1/jmakewhatis.1.gz
-man/man1/jcatman.1.gz
-man/man8/jmakewhatis.local.8.gz
-man/man8/jcatman.local.8.gz
-man/ja/man1/jman.1.gz
-man/ja/man1/jmanpath.1.gz
-man/ja/man1/japropos.1.gz
-man/ja/man1/jwhatis.1.gz
-man/ja/man1/jmakewhatis.1.gz
-man/ja/man1/jcatman.1.gz
-man/ja/man8/jmakewhatis.local.8.gz
-man/ja/man8/jcatman.local.8.gz
+share/man/man1/jman.1.gz
+share/man/man1/jmanpath.1.gz
+share/man/man1/japropos.1.gz
+share/man/man1/jwhatis.1.gz
+share/man/man1/jmakewhatis.1.gz
+share/man/man1/jcatman.1.gz
+share/man/man8/jmakewhatis.local.8.gz
+share/man/man8/jcatman.local.8.gz
+share/man/ja/man1/jman.1.gz
+share/man/ja/man1/jmanpath.1.gz
+share/man/ja/man1/japropos.1.gz
+share/man/ja/man1/jwhatis.1.gz
+share/man/ja/man1/jmakewhatis.1.gz
+share/man/ja/man1/jcatman.1.gz
+share/man/ja/man8/jmakewhatis.local.8.gz
+share/man/ja/man8/jcatman.local.8.gz