4 files changed, 25 insertions, 73 deletions

diff --git a/misc/ewipe/Makefile b/misc/ewipe/Makefile
index 10ef36b5a5fa..0f4c03927f74 100644
--- a/misc/ewipe/Makefile
+++ b/misc/ewipe/Makefile
@@ -1,31 +1,39 @@
 # New ports collection makefile for:	ewipe
-# Version required:	0.7.0
+# Version required:	1.0.0
 # Date created:		17 October 1997
 # Whom:			itojun@itojun.org
 #
-# $Id: Makefile,v 1.10 1998/02/17 12:58:50 itojun Exp $
+# $Id: Makefile,v 1.11 1998/02/21 22:37:55 fenner Exp $
 #
 
-DISTNAME=	ewipe0.7.0
-PKGNAME?=	ewipe-0.7.0
+DISTNAME=	ewipe-1.0.0
 CATEGORIES=	misc tk42
-MASTER_SITES=	http://al.ei.tuat.ac.jp/~sekisita/ewipe/
+MASTER_SITES=	http://www.jnet-jp.to/~sekisita/ewipe/
 
 MAINTAINER=	itojun@itojun.org
 
-RUN_DEPENDS=	wish4.2:${PORTSDIR}/x11/tk42
+#RUN_DEPENDS=	wish4.2:${PORTSDIR}/x11/tk42
 
-NO_BUILD=	yes
 NO_CONFIGURE=	yes
 
+TCLLIBS=	definefont.tcl edittable.tcl setpointer.tcl viewer.tcl tclIndex
 DOCS=		README Changes dot.ewipe
-SAMPLES=	a1.gif a2.gif a3.gif a4.gif blue1.gif sample.ewp \
-		sample2.ewp sample3.ewp tutorial.ewp
+SAMPLES=	a1.gif a2.gif a3.gif a4.gif blue1.gif sample.ewp test.ewp \
+		tutorial.ewp
+
+KANJI?=		no
+
+do-build:
+.if ${KANJI} != yes
+	for i in edittable.tcl ewipe viewer.tcl; do\
+		ed ${WRKSRC}/$$i < ${SCRIPTDIR}/nokanji.ed;\
+	done
+.endif
 
 do-install:
 	${MKDIR} ${PREFIX}/lib/ewipe
 	${INSTALL_SCRIPT} ${WRKSRC}/ewipe ${PREFIX}/bin
-	for i in edittable.tcl setpointer.tcl viewer.tcl tclIndex; do\
+	for i in ${TCLLIBS}; do\
 		${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/lib/ewipe;\
 	done
 .if !defined(NOPORTDOCS)
diff --git a/misc/ewipe/distinfo b/misc/ewipe/distinfo
index a42db8a9fda3..b234f5d5acad 100644
--- a/misc/ewipe/distinfo
+++ b/misc/ewipe/distinfo
@@ -1 +1 @@
-MD5 (ewipe0.7.0.tar.gz) = a7a238c07d5ad00b87880193f4e51b8b
+MD5 (ewipe-1.0.0.tar.gz) = a0606a1ad7b1c0b34d9606415443c0af
diff --git a/misc/ewipe/files/patch-aa b/misc/ewipe/files/patch-aa
index 095eaaffc376..53168efc66cb 100644
--- a/misc/ewipe/files/patch-aa
+++ b/misc/ewipe/files/patch-aa
@@ -1,5 +1,5 @@
---- ewipe.orig	Fri Feb 13 10:57:57 1998
-+++ ewipe	Wed Mar  4 15:04:20 1998
+--- ewipe.orig	Sun Apr 12 10:59:29 1998
++++ ewipe	Sun Apr 12 10:59:57 1998
 @@ -1,6 +1,6 @@
  #!/bin/sh
  # the next line restarts using wish \
@@ -8,69 +8,13 @@
  
  #                                                 #
  #     EWIPE : Extended WIPE (Editor for WIPE)     #
-@@ -20,7 +20,7 @@
+@@ -20,7 +20,8 @@
  #     set PATH /usr/local/lib/ewipe               #
  #                                                 #
  
 -set PATH .
++#set PATH .
 +set PATH /usr/local/lib/ewipe
  
  ###################################################
  
-@@ -1935,24 +1935,43 @@
- 	    set str1 [string trim $str1 { }]
- 	    set n [string length $str1]
- 	    set l [expr $n / ($width + 1) + 1]
--	    label .c.lb1($lnum) -width 10 -text $str0 \
--		    -anchor w -bg RoyalBlue4 -fg white \
--		    -font $ewfont(a) -kanjifont $ewfont(k)
--	    label .c.lb2($lnum) -relief raised -width $width -heigh $l \
--		    -wraplength $wlen -text $str1 -justify left -anchor w \
--		    -bg RoyalBlue4 -fg $color \
--		    -font $ewfont(a) -kanjifont $ewfont(k)
-+	    if {$Option(lang) == "jpn"} {
-+		label .c.lb1($lnum) -width 10 -text $str0 \
-+			-anchor w -bg RoyalBlue4 -fg white \
-+			-font $ewfont(a) -kanjifont $ewfont(k)
-+		label .c.lb2($lnum) -relief raised -width $width -heigh $l \
-+			-wraplength $wlen -text $str1 -justify left -anchor w \
-+			-bg RoyalBlue4 -fg $color \
-+			-font $ewfont(a) -kanjifont $ewfont(k)
-+	    } else {
-+		label .c.lb1($lnum) -width 10 -text $str0 \
-+			-anchor w -bg RoyalBlue4 -fg white \
-+			-font $ewfont(a)
-+		label .c.lb2($lnum) -relief raised -width $width -heigh $l \
-+			-wraplength $wlen -text $str1 -justify left -anchor w \
-+			-bg RoyalBlue4 -fg $color \
-+			-font $ewfont(a)
-+	    }
- 	    .c create window 10 $scrY($lnum) -window .c.lb1($lnum) -anchor nw
- 	    .c create window 100 $scrY($lnum) -window .c.lb2($lnum) -anchor nw
- 	    set dy [expr 30 + ($l-1) * 15]
- 	} else {
- 	    set str [string range $line 0 [expr $width - 1]]
--	    label .c.lb1($lnum) -width 10 -text "   " \
--		    -anchor w  -bg RoyalBlue4 -fg white \
--		    -font $ewfont(a) -kanjifont $ewfont(k) 
--	    label .c.lb2($lnum) -relief raised -width $width -height 1 \
--		    -text $str -anchor nw -justify left -bg RoyalBlue4 \
--		    -fg white -font $ewfont(a) -kanjifont $ewfont(k)
-+	    if {$Option(lang) == "jpn"} {
-+		label .c.lb1($lnum) -width 10 -text "   " \
-+			-anchor w  -bg RoyalBlue4 -fg white \
-+			-font $ewfont(a) -kanjifont $ewfont(k) 
-+		label .c.lb2($lnum) -relief raised -width $width -height 1 \
-+			-text $str -anchor nw -justify left -bg RoyalBlue4 \
-+			-fg white -font $ewfont(a) -kanjifont $ewfont(k)
-+	    } else {
-+		label .c.lb1($lnum) -width 10 -text "   " \
-+			-anchor w  -bg RoyalBlue4 -fg white \
-+			-font $ewfont(a)
-+		label .c.lb2($lnum) -relief raised -width $width -height 1 \
-+			-text $str -anchor nw -justify left -bg RoyalBlue4 \
-+			-fg white -font $ewfont(a)
-+	    }
- 	    .c create window 10 $scrY($lnum) -window .c.lb1($lnum) -anchor nw
- 	    .c create window 100 $scrY($lnum) -window .c.lb2($lnum) -anchor nw
- 	    set dy 30
diff --git a/misc/ewipe/pkg-plist b/misc/ewipe/pkg-plist
index b5ea4a8c1446..d62131705fd6 100644
--- a/misc/ewipe/pkg-plist
+++ b/misc/ewipe/pkg-plist
@@ -1,4 +1,5 @@
 bin/ewipe
+lib/ewipe/definefont.tcl
 lib/ewipe/edittable.tcl
 lib/ewipe/setpointer.tcl
 lib/ewipe/viewer.tcl
@@ -12,8 +13,7 @@ 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/sample2.ewp
-share/doc/ewipe/sample/sample3.ewp
+share/doc/ewipe/sample/test.ewp
 share/doc/ewipe/sample/tutorial.ewp
 @dirrm lib/ewipe
 @dirrm share/doc/ewipe/sample