Update to 1.2.0

PR:		22059
Submitted by:	Ports Fury

5 files changed, 55 insertions, 44 deletions

diff --git a/misc/ewipe/Makefile b/misc/ewipe/Makefile
index c87a64f78e8f..75b44246f697 100644
--- a/misc/ewipe/Makefile
+++ b/misc/ewipe/Makefile
@@ -6,39 +6,50 @@
 #
 
 PORTNAME=	ewipe
-PORTVERSION=	1.1.0
-CATEGORIES+=	misc tk42
-MASTER_SITES=	http://www.jnet-jp.to/~sekisita/ewipe/ \
-		http://freefall.freebsd.org/~itojun/distfiles/
+PORTVERSION=	1.2.0
+CATEGORIES+=	misc tk82
+MASTER_SITES=	http://www.jnet-jp.to/~sekisita/ewipe/
 
-MAINTAINER?=	ports@freebsd.org
+MAINTAINER?=	ports@FreeBSD.org
 
-#RUN_DEPENDS=	wish4.2:${PORTSDIR}/x11-toolkits/tk42
+.if defined(KANJI)
+RUN_DEPENDS=	wish8.0jp:${PORTSDIR}/japanese/tk80
+.else
+RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
+.endif
 
 NO_BUILD=	YES
 TCLLIBS=	definefont.tcl edittable.tcl setpointer.tcl viewer.tcl tclIndex
-DOCS=		README Changes.jp dot.ewipe
-SAMPLES=	a1.gif a2.gif a3.gif a4.gif blue1.gif sample.ewp test.ewp \
-		tutorial.ewp
+PORTDOCS=	Changes.jp README README.jp dot.ewipe
+EXAMPLES=	a1.gif a2.gif a3.gif a4.gif blue1.gif sample.ewp test.ewp \
+		tutorial.ewp tutorial-e.ewp
+
+.if defined(KANJI)
+WISH=		${LOCALBASE}/bin/wish8.0jp
+.else
+WISH=		${LOCALBASE}/bin/wish8.2
+.endif
 
-KANJI?=		no
+post-patch:
+	@${PERL} -pi \
+		-e "s|%%PREFIX%%|${PREFIX}|g;" \
+		-e "s|%%WISH%%|${WISH}|g;" ${WRKSRC}/ewipe
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/ewipe
+	@${MKDIR} ${PREFIX}/share/ewipe
 	${INSTALL_SCRIPT} ${WRKSRC}/ewipe ${PREFIX}/bin
-	for i in ${TCLLIBS}; do\
-		${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/lib/ewipe;\
-	done
+.for file in ${TCLLIBS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/ewipe
+.endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ewipe
-	${MKDIR} ${PREFIX}/share/doc/ewipe/sample
-	for i in ${DOCS}; do\
-		${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/ewipe;\
-	done
-	for i in ${SAMPLES}; do\
-		${INSTALL_DATA} ${WRKSRC}/sample/$$i \
-			${PREFIX}/share/doc/ewipe/sample;\
-	done
+	@${MKDIR} ${PREFIX}/share/doc/ewipe
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/ewipe
+.endfor
+	@${MKDIR} ${PREFIX}/share/examples/ewipe
+.for file in ${EXAMPLES}
+	${INSTALL_DATA} ${WRKSRC}/sample/${file} ${PREFIX}/share/examples/ewipe
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/misc/ewipe/distinfo b/misc/ewipe/distinfo
index d32ccb2bf82c..dca0bb5058d3 100644
--- a/misc/ewipe/distinfo
+++ b/misc/ewipe/distinfo
@@ -1 +1 @@
-MD5 (ewipe-1.1.0.tar.gz) = 1e6e709334f35e9655a7d962c1bb471f
+MD5 (ewipe-1.2.0.tar.gz) = c7c1b6ed1c09f0543b7e445c21864bdc
diff --git a/misc/ewipe/files/patch-aa b/misc/ewipe/files/patch-aa
index 53168efc66cb..656d27a7da60 100644
--- a/misc/ewipe/files/patch-aa
+++ b/misc/ewipe/files/patch-aa
@@ -4,7 +4,7 @@
  #!/bin/sh
  # the next line restarts using wish \
 -exec wish "$0" "--" "$@"
-+exec wish4.2 "$0" "--" "$@"
++exec %%WISH%% "$0" "--" "$@"
  
  #                                                 #
  #     EWIPE : Extended WIPE (Editor for WIPE)     #
@@ -14,7 +14,7 @@
  
 -set PATH .
 +#set PATH .
-+set PATH /usr/local/lib/ewipe
++set PATH %%PREFIX%%/share/ewipe
  
  ###################################################
  
diff --git a/misc/ewipe/pkg-descr b/misc/ewipe/pkg-descr
index 549ae801d85b..00cd687efe95 100644
--- a/misc/ewipe/pkg-descr
+++ b/misc/ewipe/pkg-descr
@@ -2,9 +2,7 @@ EWIPE by sekisita@al.ei.tuat.ac.jp
 
 EWIPE is a tcl/tk based presentation tool, which includes both authoring
 tool and viewer.
-More information can be found at:
-	http://al.ei.tuat.ac.jp/~sekisita/ewipe/ (in Japanese)
 
 The menu can be Japanese or English, so don't worry.
 
-WWW: http://al.ei.tuat.ac.jp/~sekisita/ewipe/ (in Japanese)
+WWW: http://www.jnet-jp.to/~sekisita/ewipe/index-e.html
diff --git a/misc/ewipe/pkg-plist b/misc/ewipe/pkg-plist
index fce0da36a8f4..6e7a4f99c934 100644
--- a/misc/ewipe/pkg-plist
+++ b/misc/ewipe/pkg-plist
@@ -1,20 +1,22 @@
 bin/ewipe
-lib/ewipe/definefont.tcl
-lib/ewipe/edittable.tcl
-lib/ewipe/setpointer.tcl
-lib/ewipe/viewer.tcl
-lib/ewipe/tclIndex
 share/doc/ewipe/Changes.jp
 share/doc/ewipe/README
+share/doc/ewipe/README.jp
 share/doc/ewipe/dot.ewipe
-share/doc/ewipe/sample/a1.gif
-share/doc/ewipe/sample/a2.gif
-share/doc/ewipe/sample/a3.gif
-share/doc/ewipe/sample/a4.gif
-share/doc/ewipe/sample/blue1.gif
-share/doc/ewipe/sample/sample.ewp
-share/doc/ewipe/sample/test.ewp
-share/doc/ewipe/sample/tutorial.ewp
-@dirrm lib/ewipe
-@dirrm share/doc/ewipe/sample
+share/ewipe/definefont.tcl
+share/ewipe/edittable.tcl
+share/ewipe/setpointer.tcl
+share/ewipe/tclIndex
+share/ewipe/viewer.tcl
+share/examples/ewipe/a1.gif
+share/examples/ewipe/a2.gif
+share/examples/ewipe/a3.gif
+share/examples/ewipe/a4.gif
+share/examples/ewipe/blue1.gif
+share/examples/ewipe/sample.ewp
+share/examples/ewipe/test.ewp
+share/examples/ewipe/tutorial.ewp
+share/examples/ewipe/tutorial-e.ewp
+@dirrm share/examples/ewipe
+@dirrm share/ewipe
 @dirrm share/doc/ewipe