4 files changed, 70 insertions, 9 deletions

diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile
index 771bab46da97..6363edb183b0 100644
--- a/japanese/tk80/Makefile
+++ b/japanese/tk80/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 Dec 1997
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
-# $Id: Makefile,v 1.12 1999/04/06 01:15:03 taoka Exp $
+# $Id: Makefile,v 1.13 1999/04/06 02:37:41 taoka Exp $
 #
 
 DISTNAME=	tk8.0.5
@@ -12,7 +12,7 @@ CATEGORIES=	japanese x11-toolkits tk80
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
 
 PATCH_SITES=	ftp://ftp.sra.co.jp/pub/lang/tcl/jp/
-PATCHFILES=	tk8.0.5jp1.5.patch.gz
+PATCHFILES=	tk8.0.5jp1.5fix1.patch.gz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
diff --git a/japanese/tk80/distinfo b/japanese/tk80/distinfo
index 2a22e8c24147..1be65ae99fca 100644
--- a/japanese/tk80/distinfo
+++ b/japanese/tk80/distinfo
@@ -1,2 +1,2 @@
 MD5 (tk8.0.5.tar.gz) = 3ae92b86c01ec99a1872697294839e64
-MD5 (tk8.0.5jp1.5.patch.gz) = 4101df511859a130e294ded81f560300
+MD5 (tk8.0.5jp1.5fix1.patch.gz) = aeab50ee752df9359e48eb0deb7855ca
diff --git a/japanese/tk80/files/patch-ab b/japanese/tk80/files/patch-ab
index ef4b33037f17..91ea25858a7b 100644
--- a/japanese/tk80/files/patch-ab
+++ b/japanese/tk80/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.ORIG	Wed Mar 24 11:34:14 1999
-+++ Makefile.in	Wed Mar 24 11:34:23 1999
+--- Makefile.in.ORIG	Fri May  7 06:28:28 1999
++++ Makefile.in	Fri May  7 06:32:11 1999
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -78,8 +78,8 @@
  	TK_LIBRARY=$(TOP_DIR)/library; export TK_LIBRARY; \
  	./tktest
  
--install: install-binaries install-libraries install-demos install-man
-+install: install-binaries install-libraries install-demos
+-install: install-binaries install-libraries install-demos install-demosjp install-man
++install: install-binaries install-libraries install-demos install-demosjp
  
  # Note: before running ranlib below, must cd to target directory because
  # some ranlibs write to current directory, and this might not always be
@@ -135,7 +135,15 @@
  	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -474,10 +512,10 @@
+@@ -485,6 +523,7 @@
+ 	    chmod 755 $(SCRIPT_INSTALL_DIR)/demos.jp/$$i; \
+ 	    done;
+ 	(cd $(SCRIPT_INSTALL_DIR)/demos.jp; \
++	    rm -f *.orig; \
+ 	    rm -rf images; \
+ 	    ln -s $(SCRIPT_INSTALL_DIR)/demos/images .)
+ 
+@@ -501,10 +540,10 @@
  	@cd $(SRC_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
@@ -149,7 +157,7 @@
  	    done;
  	$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
  	@cd $(SRC_DIR)/doc; for i in *.3; \
-@@ -485,19 +523,26 @@
+@@ -512,19 +551,26 @@
  	    echo "Installing doc/$$i"; \
  	    rm -f $(MAN3_INSTALL_DIR)/$$i; \
  	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
diff --git a/japanese/tk80/pkg-plist b/japanese/tk80/pkg-plist
index 24e206b2660b..45be233817ac 100644
--- a/japanese/tk80/pkg-plist
+++ b/japanese/tk80/pkg-plist
@@ -115,6 +115,58 @@ lib/tk8.0jp/demos/images/noletter.bmp
 lib/tk8.0jp/demos/images/pattern.bmp
 lib/tk8.0jp/demos/images/tcllogo.gif
 lib/tk8.0jp/demos/images/teapot.ppm
+lib/tk8.0jp/demos.jp/README
+lib/tk8.0jp/demos.jp/README.JP
+lib/tk8.0jp/demos.jp/arrow.tcl
+lib/tk8.0jp/demos.jp/bind.tcl
+lib/tk8.0jp/demos.jp/bitmap.tcl
+lib/tk8.0jp/demos.jp/browse
+lib/tk8.0jp/demos.jp/button.tcl
+lib/tk8.0jp/demos.jp/cfont.tcl
+lib/tk8.0jp/demos.jp/check.tcl
+lib/tk8.0jp/demos.jp/clrpick.tcl
+lib/tk8.0jp/demos.jp/colors.tcl
+lib/tk8.0jp/demos.jp/cscroll.tcl
+lib/tk8.0jp/demos.jp/ctext.tcl
+lib/tk8.0jp/demos.jp/dialog1.tcl
+lib/tk8.0jp/demos.jp/dialog2.tcl
+lib/tk8.0jp/demos.jp/entry1.tcl
+lib/tk8.0jp/demos.jp/entry2.tcl
+lib/tk8.0jp/demos.jp/filebox.tcl
+lib/tk8.0jp/demos.jp/floor.tcl
+lib/tk8.0jp/demos.jp/form.tcl
+lib/tk8.0jp/demos.jp/hello
+lib/tk8.0jp/demos.jp/hscale.tcl
+lib/tk8.0jp/demos.jp/icon.tcl
+lib/tk8.0jp/demos.jp/image1.tcl
+lib/tk8.0jp/demos.jp/image2.tcl
+lib/tk8.0jp/demos.jp/items.tcl
+lib/tk8.0jp/demos.jp/ixset
+lib/tk8.0jp/demos.jp/label.tcl
+lib/tk8.0jp/demos.jp/license.terms
+lib/tk8.0jp/demos.jp/menu.tcl
+lib/tk8.0jp/demos.jp/menubu.tcl
+lib/tk8.0jp/demos.jp/msgbox.tcl
+lib/tk8.0jp/demos.jp/plot.tcl
+lib/tk8.0jp/demos.jp/puzzle.tcl
+lib/tk8.0jp/demos.jp/radio.tcl
+lib/tk8.0jp/demos.jp/rmt
+lib/tk8.0jp/demos.jp/rolodex
+lib/tk8.0jp/demos.jp/ruler.tcl
+lib/tk8.0jp/demos.jp/sayings.tcl
+lib/tk8.0jp/demos.jp/search.tcl
+lib/tk8.0jp/demos.jp/square
+lib/tk8.0jp/demos.jp/states.tcl
+lib/tk8.0jp/demos.jp/style.tcl
+lib/tk8.0jp/demos.jp/tclIndex
+lib/tk8.0jp/demos.jp/tcolor
+lib/tk8.0jp/demos.jp/text.tcl
+lib/tk8.0jp/demos.jp/timer
+lib/tk8.0jp/demos.jp/twind.tcl
+lib/tk8.0jp/demos.jp/vscale.tcl
+lib/tk8.0jp/demos.jp/widget
+@exec /bin/ln -sf %B/../demos/images %B/images
+@unexec /bin/rm -f %B/images
 lib/tk8.0jp/images/README
 lib/tk8.0jp/images/logo100.gif
 lib/tk8.0jp/images/logo64.gif
@@ -136,6 +188,7 @@ share/doc/tk8.0jp/README.FreeBSD.JP
 @dirrm include/tk8.0jp
 @dirrm lib/tk8.0jp/demos/images
 @dirrm lib/tk8.0jp/demos
+@dirrm lib/tk8.0jp/demos.jp
 @dirrm lib/tk8.0jp/images
 @dirrm lib/tk8.0jp
 @dirrm share/doc/tk8.0jp