4 files changed, 40 insertions, 32 deletions
diff --git a/japanese/nethack32/Makefile b/japanese/nethack32/Makefile
index a90399ae9967..6641007da1d6 100644
--- a/japanese/nethack32/Makefile
+++ b/japanese/nethack32/Makefile
@@ -25,6 +25,12 @@ RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 
 NO_LATEST_LINK=	yes
 
+DOCSDIR=	${PREFIX}/share/doc/ja/nethack
+EXAMPLESDIR=	${PREFIX}/share/examples/ja/nethack
+.if !defined(NOPORTDOCS)
+SUB_FILES=	pkg-message
+.endif
+
 .include <bsd.port.pre.mk>
 
 USE_XORG=	xaw xpm
@@ -40,24 +46,26 @@ pre-install:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/win/X11/nh_icon.xpm ${PREFIX}/lib/jnethackdir
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/win/X11/nethack.rc ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/win/X11/JNetHack.ad  ${EXAMPLESDIR}
+.for i in ibm nh10
+	@${INSTALL_DATA} ${WRKSRC}/win/X11/$i.bdf  ${EXAMPLESDIR}
+	@${LOCALBASE}/bin/bdftopcf  ${EXAMPLESDIR}/$i.bdf \
+		>  ${EXAMPLESDIR}/$i.pcf
+	@${RM}  ${EXAMPLESDIR}/$i.bdf
+	${GZIP_CMD}  ${EXAMPLESDIR}/$i.pcf
+.endfor
+.endif
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ja/nethack
-	${INSTALL_MAN} ${WRKSRC}/doc/jGuidebook.txt ${PREFIX}/share/doc/ja/nethack
-	${INSTALL_MAN} ${FILESDIR}/README ${PREFIX}/share/doc/ja/nethack
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/jGuidebook.txt ${DOCSDIR}
+	${INSTALL_MAN} ${FILESDIR}/README ${DOCSDIR}
 .for i in README.j ChangeLog.j INSTALL.j
-	${INSTALL_MAN} ${WRKSRC}/$i ${PREFIX}/share/doc/ja/nethack
+	${INSTALL_MAN} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
+	@${CAT} ${PKGMESSAGE}
 .endif
-	${MKDIR} ${PREFIX}/share/examples/ja/nethack
-	${INSTALL_DATA} ${WRKSRC}/win/X11/nethack.rc ${PREFIX}/share/examples/ja/nethack
-	${INSTALL_DATA} ${WRKSRC}/win/X11/JNetHack.ad ${PREFIX}/share/examples/ja/nethack
-.for i in ibm nh10
-	${INSTALL_DATA} ${WRKSRC}/win/X11/$i.bdf ${PREFIX}/share/examples/ja/nethack
-	${LOCALBASE}/bin/bdftopcf ${PREFIX}/share/examples/ja/nethack/$i.bdf \
-		> ${PREFIX}/share/examples/ja/nethack/$i.pcf
-	${RM} ${PREFIX}/share/examples/ja/nethack/$i.bdf
-	${GZIP_CMD} ${PREFIX}/share/examples/ja/nethack/$i.pcf
-.endfor
-	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/japanese/nethack32/files/pkg-message.in b/japanese/nethack32/files/pkg-message.in
new file mode 100644
index 000000000000..fd78fc810361
--- /dev/null
+++ b/japanese/nethack32/files/pkg-message.in
@@ -0,0 +1,6 @@
+--------
+If you want to play jnethack on X, see
+	%%DOCSDIR%%/README
+
+See also %%DOCSDIR%%/jGuideBook.txt
+--------
diff --git a/japanese/nethack32/pkg-message b/japanese/nethack32/pkg-message
deleted file mode 100644
index 0f98a4799d29..000000000000
--- a/japanese/nethack32/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
---------
-If you want to play jnethack on X, see
-	/usr/local/share/doc/ja/nethack/README
-
-See also /usr/local/share/doc/ja/nethack/jGuideBook.txt
---------
diff --git a/japanese/nethack32/pkg-plist b/japanese/nethack32/pkg-plist
index e35e2b65b0c6..bc8b30437264 100644
--- a/japanese/nethack32/pkg-plist
+++ b/japanese/nethack32/pkg-plist
@@ -127,15 +127,15 @@ lib/jnethackdir/logfile
 lib/jnethackdir/perm
 lib/jnethackdir/record
 @dirrm lib/jnethackdir
-share/doc/ja/nethack/ChangeLog.j
-share/doc/ja/nethack/INSTALL.j
-share/doc/ja/nethack/README
-share/doc/ja/nethack/README.j
-share/doc/ja/nethack/jGuidebook.txt
-share/examples/ja/nethack/JNetHack.ad
-share/examples/ja/nethack/ibm.pcf.gz
-share/examples/ja/nethack/nethack.rc
-share/examples/ja/nethack/nh10.pcf.gz
-@dirrm share/examples/ja/nethack
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.j
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.j
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.j
+%%PORTDOCS%%%%DOCSDIR%%/jGuidebook.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/JNetHack.ad
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ibm.pcf.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nethack.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nh10.pcf.gz
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrmtry share/examples/ja
-@dirrm share/doc/ja/nethack
+%%PORTDOCS%%@dirrm %%DOCSDIR%%