2 files changed, 7 insertions, 2 deletions

diff --git a/japanese/xjman-3/Makefile b/japanese/xjman-3/Makefile
index 0bdeee0e8c71..a7788587b8cf 100644
--- a/japanese/xjman-3/Makefile
+++ b/japanese/xjman-3/Makefile
@@ -27,6 +27,11 @@ post-extract:
 .for i in Makefile Makefile.inc
 	@${CP} ${FILESDIR}/$i ${WRKSRC}
 .endfor
+.for sec in ${MANSECS}
+	(cd ${WRKSRC}/man${sec}; \
+	for f in *.${sec}x; do ${CP} $$f $${f%x}; done; \
+	${PERL} -pi -e 's/^(\.so .*)x$$/$$1/' *.${sec})
+.endfor
 
 post-build:
 	@${RM} -f ${PLIST}
@@ -34,7 +39,7 @@ post-build:
 	if [ -d ${WRKSRC}/man$${sec} ]; then \
 		cd ${WRKSRC}/man$${sec}; \
 		list=`${MAKE} pages-list`; \
-		set `${ECHO} $$list " "|${SED} 's/\.\([0-9]\)x /.\1x \1 /g'`; \
+		set `${ECHO} $$list " "|${SED} 's/\.\([0-9]\) /.\1 \1 /g'`; \
 		while : ; do \
 			case $$# in \
 				0) break;; \
diff --git a/japanese/xjman-3/scripts/configure b/japanese/xjman-3/scripts/configure
index eb66aa645232..8da3fb55d313 100644
--- a/japanese/xjman-3/scripts/configure
+++ b/japanese/xjman-3/scripts/configure
@@ -11,7 +11,7 @@ for $sec (@MANSECS) {
     @manpages = ();
     @mlinks = ();
 
-    for $manpage (<*.${sec}x>) {
+    for $manpage (<*.${sec}>) {
 	open(F, $manpage) || die "cannot open $manpage: $!\n";
 	$_ = <F>;
 	chop;