From dd2f8f2d009430bf22047f7c37b46facf5aa16a3 Mon Sep 17 00:00:00 2001
From: Daichi GOTO <daichi@FreeBSD.org>
Date: Sat, 14 Jun 2014 03:59:11 +0000
Subject: [PATCH] Stagefy

---
 japanese/tkhonyaku/Makefile  | 17 ++++++-----------
 japanese/tkhonyaku/pkg-plist |  8 ++------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/japanese/tkhonyaku/Makefile b/japanese/tkhonyaku/Makefile
index 0b22114bf5a6..27fad38b5ef1 100644
--- a/japanese/tkhonyaku/Makefile
+++ b/japanese/tkhonyaku/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tkhonyaku
 PORTVERSION=	1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.yk.rim.or.jp/~kawagisi/
 
@@ -18,20 +18,15 @@ NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -i '' -e 's|/usr/local/tkhonyaku|${PREFIX}/tkhonyaku|g' \
 		${WRKSRC}/tkhonyaku ${WRKSRC}/tkhonyaku-readme
 
 do-install:
-	${MKDIR} ${PREFIX}/share/tkhonyaku
-	${INSTALL_DATA} ${WRKSRC}/tkhonyaku.gif ${PREFIX}/share/tkhonyaku/
-	${INSTALL_DATA} ${WRKSRC}/tkhonyaku.xpm ${PREFIX}/share/tkhonyaku/
-	${INSTALL_DATA} ${WRKSRC}/colors.gif ${PREFIX}/share/tkhonyaku/
-	${INSTALL_SCRIPT} ${WRKSRC}/tkhonyaku ${PREFIX}/bin/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/tkhonyaku-readme ${DOCSDIR}
-.endif
+	${INSTALL_DATA} ${WRKSRC}/tkhonyaku.gif ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/tkhonyaku.xpm ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/colors.gif ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/tkhonyaku ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/tkhonyaku-readme ${STAGEDIR}${PORTDOCS}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/tkhonyaku/pkg-plist b/japanese/tkhonyaku/pkg-plist
index b469924cd14e..4d951e8554a7 100644
--- a/japanese/tkhonyaku/pkg-plist
+++ b/japanese/tkhonyaku/pkg-plist
@@ -1,7 +1,3 @@
-%%PORTDOCS%%%%DOCSDIR%%/tkhonyaku-readme
-share/tkhonyaku/tkhonyaku.gif
-share/tkhonyaku/tkhonyaku.xpm
-share/tkhonyaku/colors.gif
 bin/tkhonyaku
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/tkhonyaku
+%%PORTDOCS%%%%DOCSDIR%%
+%%DATADIR%%