Update to 1.3.

PR:		ports/20439
Submitted by:	Daichi T.GOTO <daichi@ongs.net> (MAINTAINER)

Support ${NOPORTDOCS}.
Use ${INSTALL_*} macros instead of ${CP}.
Make ${PREFIX}-clean.

4 files changed, 40 insertions, 31 deletions

diff --git a/japanese/tkhonyaku/Makefile b/japanese/tkhonyaku/Makefile
index 8514490b9861..7701e812151f 100644
--- a/japanese/tkhonyaku/Makefile
+++ b/japanese/tkhonyaku/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tkhonyaku
-PORTVERSION=	1.0
+PORTVERSION=	1.3
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.yk.rim.or.jp/~kawagisi/
 
@@ -16,23 +16,21 @@ RUN_DEPENDS=	${LOCALBASE}/bin/wish8.0jp:${PORTSDIR}/japanese/tk80
 
 NO_BUILD=	yes
 
-PLIST_SUB=	DISTNAME="${DISTNAME}"
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-pre-patch:
-	${MKDIR} ${WRKSRC}
-	@${MV} ${WRKSRC}/../colors.gif ${WRKSRC}
-	@${MV} ${WRKSRC}/../tkhonyaku ${WRKSRC}
-	@${MV} ${WRKSRC}/../tkhonyaku-readme ${WRKSRC}
-	@${MV} ${WRKSRC}/../tkhonyaku.gif ${WRKSRC}
-	@${MV} ${WRKSRC}/../tkhonyaku.xpm ${WRKSRC}
+post-patch:
+	${PERL} -i -pe '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} ${PREFIX}/share/doc/tkhonyaku
-	${MKDIR} ${PREFIX}/tkhonyaku
-	@${CP} ${WRKSRC}/tkhonyaku-readme ${PREFIX}/share/doc/tkhonyaku/
-	@${CP} ${WRKSRC}/colors.gif ${PREFIX}/tkhonyaku
-	@${CP} ${WRKSRC}/tkhonyaku.gif ${PREFIX}/tkhonyaku/
-	@${CP} ${WRKSRC}/tkhonyaku.xpm ${PREFIX}/tkhonyaku/
-	@${CP} ${WRKSRC}/tkhonyaku ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/tkhonyaku-readme ${PREFIX}/share/doc/tkhonyaku/
+.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/tkhonyaku/distinfo b/japanese/tkhonyaku/distinfo
index 7f9ab5fdf40d..2389870adacb 100644
--- a/japanese/tkhonyaku/distinfo
+++ b/japanese/tkhonyaku/distinfo
@@ -1 +1 @@
-MD5 (tkhonyaku-1.0.tar.gz) = 929a3544de64739820b066fe40d142ec
+MD5 (tkhonyaku-1.3.tar.gz) = 524fdf27979a6c8624f4a5a908dba116
diff --git a/japanese/tkhonyaku/files/patch-aa b/japanese/tkhonyaku/files/patch-aa
index 8fef964eef06..3b95a0d5806d 100644
--- a/japanese/tkhonyaku/files/patch-aa
+++ b/japanese/tkhonyaku/files/patch-aa
@@ -1,19 +1,30 @@
---- tkhonyaku.orig	Mon Jul 10 05:56:43 2000
-+++ tkhonyaku	Mon Jul 10 05:56:47 2000
+--- tkhonyaku.orig	Wed Jul 26 21:26:12 2000
++++ tkhonyaku	Thu Jul 27 22:54:14 2000
 @@ -1,6 +1,6 @@
  #!/bin/sh
  # the next line restart using wish \
 -exec wish "$0" "$@"
 +exec wish8.0jp "$0" "$@"
  
- #===========================================================================
- # 『Tk翻訳』version 1.0
-@@ -87,7 +87,7 @@
+ #=============================================================================
+ # 『Tk翻訳』version 1.3 for Unix/Windows/Macintosh
+@@ -27,7 +27,7 @@
+   global  disp_debug
+   global  tcl_platform env username server port
+   global  txtin_bg txtin_fg txtout_bg txtout_fg
+-  global  style ximstyle win_dir ejmode jemode my_osk my_omk
++  global  style ximstyle win_dir ejmode jemode mode my_osk my_omk
+ 
+   set disp_debug no         ;# デバッグ用ウィンドウを表示しない
+   switch $tcl_platform(platform) {
+@@ -95,8 +95,8 @@
        set respdir   ~/.tkhonyaku/           ;# レスポンスファイルのディレクトリ
-       set logdir    ~/.tkhonyaku/              ;# エラーログのディレクトリ
+       set logdir    ~/.tkhonyaku/           ;# エラーログのディレクトリ
        set conf_file ~/.tkhonyaku/tkhonyaku.conf ;# 設定ファイルのフルパス
--      set helpdir   /usr/doc/tkhonyaku-1.0     ;# ヘルプファイルのディレクトリ
-+      set helpdir   /usr/local/share/doc/tkhonyaku     ;# ヘルプファイルのディレクトリ
-       set gifdir    /usr/local/tkhonyaku       ;# GIF ファイルのディレクトリ
-     }
-     windows {
+-      set helpdir   /usr/doc/tkhonyaku-1.3  ;# ヘルプファイルのディレクトリ
+-      set gifdir    /usr/local/tkhonyaku    ;# GIF ファイルのディレクトリ
++      set helpdir   /usr/local/share/doc/tkhonyaku  ;# ヘルプファイルのディレクトリ
++      set gifdir    /usr/local/share/tkhonyaku    ;# GIF ファイルのディレクトリ
+       if { ! [file exists $helpdir] } {
+           if { [file type $argv0] == "link" } {
+               set helpdir [file dirname [file readlink $argv0] ]
diff --git a/japanese/tkhonyaku/pkg-plist b/japanese/tkhonyaku/pkg-plist
index ed369363e37a..19660a8e50c5 100644
--- a/japanese/tkhonyaku/pkg-plist
+++ b/japanese/tkhonyaku/pkg-plist
@@ -1,7 +1,7 @@
 share/doc/tkhonyaku/tkhonyaku-readme
-tkhonyaku/colors.gif
-tkhonyaku/tkhonyaku.gif
-tkhonyaku/tkhonyaku.xpm
+share/tkhonyaku/tkhonyaku.gif
+share/tkhonyaku/tkhonyaku.xpm
+share/tkhonyaku/colors.gif
 bin/tkhonyaku
 @dirrm share/doc/tkhonyaku
-@dirrm tkhonyaku
+@dirrm share/tkhonyaku