2 files changed, 112 insertions, 33 deletions

diff --git a/japanese/mh/Makefile b/japanese/mh/Makefile
index 05b18e5a8010..d80aac8b3b4c 100644
--- a/japanese/mh/Makefile
+++ b/japanese/mh/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL} \
 MASTER_SITE_SUBDIR=	motoyuki
 DISTNAME=	${PORTNAME}-${VERSION}-JP-${JP_VERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	CQG00620@nifty.ne.jp
 COMMENT=	Rand MH mail handling system + Japanese patches
 
 BUILD_DEPENDS=	jless:${PORTSDIR}/japanese/less
@@ -25,38 +25,25 @@ CONFIGURE_ARGS=	--enable-batchmode \
 MAKE_JOBS_UNSAFE=	yes
 CFLAGS+=	-Wno-return-type
 
-MAN1=	ali.1 anno.1 bbc.1 burst.1 comp.1 dist.1 folder.1 forw.1 inc.1 mark.1 \
-	mh-chart.1 mh.1 mhl.1 mhmail.1 mhn.1 mhook.1 mhparam.1 mhpath.1 \
-	msgchk.1 msh.1 next.1 packf.1 pgped.1 pick.1 prev.1 prompter.1 rcvstore.1 \
-	refile.1 repl.1 rmf.1 rmm.1 scan.1 send.1 show.1 slocal.1 sortm.1 \
-	vmh.1 whatnow.1 whom.1
-MAN5=	mh-alias.5 mh-format.5 mh-mail.5 mh-profile.5 mh-sequence.5 mh-tailor.5
-MAN8=	ap.8 conflict.8 dp.8 fmtdump.8 install-mh.8 post.8
-MANLANG=	"" ja
-MANCOMPRESSED=	yes
 USE_LDCONFIG=	yes
 
-DOCDIR=		${PREFIX}/share/doc/${PKGBASE}
-READMES=	00.READ.ME.1ST CHANGES.JP COMMANDS.JP FAQ.JP FEATURES.JP \
+PORTDOCS=	00.READ.ME.1ST CHANGES.JP COMMANDS.JP FAQ.JP FEATURES.JP \
 		INSTALL.JP OPTIONS.JP READ-ME.JP TODO.JP
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 
 CONFLICTS=	nmh-[0-9]*
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e "s/-O /${CFLAGS} /g" ${WRKSRC}/configure
 
-.if !defined(NOPORTDOCS)
-pre-install:
-	${MKDIR} ${PREFIX}/share/doc/ja-mh
-.endif
-
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
-	${MKDIR} ${DOCDIR}
-	(cd ${WRKSRC}/doc-JP; ${INSTALL_DATA} ${READMES} ${DOCDIR})
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc-JP && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/mh/pkg-plist b/japanese/mh/pkg-plist
index 3276a6fcd4ef..b9aa6b63dc15 100644
--- a/japanese/mh/pkg-plist
+++ b/japanese/mh/pkg-plist
@@ -71,13 +71,105 @@ lib/mh/viamail
 lib/libmh.so
 lib/libmh.so.3
 @dirrm lib/mh
-%%PORTDOCS%%share/doc/ja-mh/00.READ.ME.1ST
-%%PORTDOCS%%share/doc/ja-mh/CHANGES.JP
-%%PORTDOCS%%share/doc/ja-mh/COMMANDS.JP
-%%PORTDOCS%%share/doc/ja-mh/FAQ.JP
-%%PORTDOCS%%share/doc/ja-mh/FEATURES.JP
-%%PORTDOCS%%share/doc/ja-mh/INSTALL.JP
-%%PORTDOCS%%share/doc/ja-mh/OPTIONS.JP
-%%PORTDOCS%%share/doc/ja-mh/READ-ME.JP
-%%PORTDOCS%%share/doc/ja-mh/TODO.JP
-%%PORTDOCS%%@dirrm share/doc/ja-mh
+man/ja/man1/ali.1.gz
+man/ja/man1/anno.1.gz
+man/ja/man1/bbc.1.gz
+man/ja/man1/burst.1.gz
+man/ja/man1/comp.1.gz
+man/ja/man1/dist.1.gz
+man/ja/man1/folder.1.gz
+man/ja/man1/forw.1.gz
+man/ja/man1/inc.1.gz
+man/ja/man1/mark.1.gz
+man/ja/man1/mh-chart.1.gz
+man/ja/man1/mh.1.gz
+man/ja/man1/mhl.1.gz
+man/ja/man1/mhmail.1.gz
+man/ja/man1/mhn.1.gz
+man/ja/man1/mhook.1.gz
+man/ja/man1/mhparam.1.gz
+man/ja/man1/mhpath.1.gz
+man/ja/man1/msgchk.1.gz
+man/ja/man1/msh.1.gz
+man/ja/man1/next.1.gz
+man/ja/man1/packf.1.gz
+man/ja/man1/pgped.1.gz
+man/ja/man1/pick.1.gz
+man/ja/man1/prev.1.gz
+man/ja/man1/prompter.1.gz
+man/ja/man1/rcvstore.1.gz
+man/ja/man1/refile.1.gz
+man/ja/man1/repl.1.gz
+man/ja/man1/rmf.1.gz
+man/ja/man1/rmm.1.gz
+man/ja/man1/scan.1.gz
+man/ja/man1/send.1.gz
+man/ja/man1/show.1.gz
+man/ja/man1/slocal.1.gz
+man/ja/man1/sortm.1.gz
+man/ja/man1/vmh.1.gz
+man/ja/man1/whatnow.1.gz
+man/ja/man1/whom.1.gz
+man/ja/man5/mh-alias.5.gz
+man/ja/man5/mh-format.5.gz
+man/ja/man5/mh-mail.5.gz
+man/ja/man5/mh-profile.5.gz
+man/ja/man5/mh-sequence.5.gz
+man/ja/man5/mh-tailor.5.gz
+man/ja/man8/ap.8.gz
+man/ja/man8/conflict.8.gz
+man/ja/man8/dp.8.gz
+man/ja/man8/fmtdump.8.gz
+man/ja/man8/install-mh.8.gz
+man/ja/man8/post.8.gz
+man/man1/ali.1.gz
+man/man1/anno.1.gz
+man/man1/bbc.1.gz
+man/man1/burst.1.gz
+man/man1/comp.1.gz
+man/man1/dist.1.gz
+man/man1/folder.1.gz
+man/man1/forw.1.gz
+man/man1/inc.1.gz
+man/man1/mark.1.gz
+man/man1/mh-chart.1.gz
+man/man1/mh.1.gz
+man/man1/mhl.1.gz
+man/man1/mhmail.1.gz
+man/man1/mhn.1.gz
+man/man1/mhook.1.gz
+man/man1/mhparam.1.gz
+man/man1/mhpath.1.gz
+man/man1/msgchk.1.gz
+man/man1/msh.1.gz
+man/man1/next.1.gz
+man/man1/packf.1.gz
+man/man1/pgped.1.gz
+man/man1/pick.1.gz
+man/man1/prev.1.gz
+man/man1/prompter.1.gz
+man/man1/rcvstore.1.gz
+man/man1/refile.1.gz
+man/man1/repl.1.gz
+man/man1/rmf.1.gz
+man/man1/rmm.1.gz
+man/man1/scan.1.gz
+man/man1/send.1.gz
+man/man1/show.1.gz
+man/man1/slocal.1.gz
+man/man1/sortm.1.gz
+man/man1/vmh.1.gz
+man/man1/whatnow.1.gz
+man/man1/whom.1.gz
+man/man5/mh-alias.5.gz
+man/man5/mh-format.5.gz
+man/man5/mh-mail.5.gz
+man/man5/mh-profile.5.gz
+man/man5/mh-sequence.5.gz
+man/man5/mh-tailor.5.gz
+man/man8/ap.8.gz
+man/man8/conflict.8.gz
+man/man8/dp.8.gz
+man/man8/fmtdump.8.gz
+man/man8/install-mh.8.gz
+man/man8/post.8.gz