6 files changed, 55 insertions, 60 deletions

diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile
index ca32cec9fa77..f6b49dc8e02b 100644
--- a/japanese/tk80/Makefile
+++ b/japanese/tk80/Makefile
@@ -3,16 +3,16 @@
 # Date created:		26 Dec 1997
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
-# $Id: Makefile,v 1.9 1998/11/14 09:43:17 asami Exp $
+# $Id: Makefile,v 1.10 1999/01/20 10:53:01 flathill Exp $
 #
 
-DISTNAME=	tk8.0.4
-PKGNAME=	ja-tk-8.0.4
+DISTNAME=	tk8.0.5
+PKGNAME=	ja-tk-8.0.5
 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.4jp1.3.patch.gz
+PATCHFILES=	tk8.0.5jp1.5.patch.gz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -52,7 +52,7 @@ post-install:
 .endif
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libtk80jp.so.1.4 ${PREFIX}/lib/libtk80jp.so
+	${LN} -sf libtk80jp.so.1.5 ${PREFIX}/lib/libtk80jp.so
 .endif
 	@${CAT}	${PKGDIR}/MESSAGE
 
diff --git a/japanese/tk80/distinfo b/japanese/tk80/distinfo
index 3b3f2b624a94..2a22e8c24147 100644
--- a/japanese/tk80/distinfo
+++ b/japanese/tk80/distinfo
@@ -1,2 +1,2 @@
-MD5 (tk8.0.4.tar.gz) = 8e4c6a20f11cdff76adb5d26423e4ea5
-MD5 (tk8.0.4jp1.3.patch.gz) = adbe811b2ddb4b9e11f478253888eb05
+MD5 (tk8.0.5.tar.gz) = 3ae92b86c01ec99a1872697294839e64
+MD5 (tk8.0.5jp1.5.patch.gz) = 4101df511859a130e294ded81f560300
diff --git a/japanese/tk80/files/patch-aa b/japanese/tk80/files/patch-aa
index 2b82b9b7a053..5a27e8c4910e 100644
--- a/japanese/tk80/files/patch-aa
+++ b/japanese/tk80/files/patch-aa
@@ -1,14 +1,14 @@
---- configure.in.ORIG	Fri Sep 25 13:59:42 1998
-+++ configure.in	Fri Sep 25 14:07:23 1998
+--- configure.in.ORIG	Wed Mar 24 11:32:28 1999
++++ configure.in	Wed Mar 24 11:32:37 1999
 @@ -10,6 +10,7 @@
  TK_MINOR_VERSION=0
- TK_PATCH_LEVEL=".3"
+ TK_PATCH_LEVEL=".5"
  VERSION=${TK_VERSION}
 +TCL_L10N=jp
  
  if test "${prefix}" = "NONE"; then
      prefix=/usr/local
-@@ -51,8 +52,8 @@
+@@ -68,8 +69,8 @@
  if test ! -d $TCL_BIN_DIR; then
      AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR doesn't exist)
  fi
@@ -19,16 +19,16 @@
  fi
  
  #--------------------------------------------------------------------
-@@ -86,6 +87,8 @@
- CFLAGS_DEBUG=$TCL_CFLAGS_DEBUG
+@@ -104,6 +105,8 @@
  CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
+ EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
  
 +TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
 +
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -535,7 +538,11 @@
+@@ -564,7 +567,11 @@
      TK_SHARED_BUILD=1
      TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
      TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
@@ -40,7 +40,7 @@
      RANLIB=":"
  else
      TK_SHARED_BUILD=0
-@@ -576,10 +583,12 @@
+@@ -606,10 +613,12 @@
  AC_SUBST(SHLIB_VERSION)
  AC_SUBST(TCL_BIN_DIR)
  AC_SUBST(TCL_BUILD_LIB_SPEC)
diff --git a/japanese/tk80/files/patch-ab b/japanese/tk80/files/patch-ab
index 2ceb612d219a..ef4b33037f17 100644
--- a/japanese/tk80/files/patch-ab
+++ b/japanese/tk80/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.ORIG	Fri Sep 25 13:59:32 1998
-+++ Makefile.in	Fri Sep 25 14:10:31 1998
+--- Makefile.in.ORIG	Wed Mar 24 11:34:14 1999
++++ Makefile.in	Wed Mar 24 11:34:23 1999
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -48,7 +48,7 @@
  #TK_LIB_FILE = libtk.a
  
  TK_LIB_FLAG = @TK_LIB_FLAG@
-@@ -320,6 +327,10 @@
+@@ -321,6 +328,10 @@
  
  DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
  
@@ -59,7 +59,7 @@
  all: wish
  
  # The following target is configured by autoconf to generate either
-@@ -328,6 +339,14 @@
+@@ -329,6 +340,14 @@
  	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
  	$(RANLIB) ${TK_LIB_FILE}
@@ -74,7 +74,7 @@
  
  # Make target which outputs the list of the .o contained in the Tk lib
  # usefull to build a single big shared library containing Tcl/Tk and other
-@@ -377,13 +396,13 @@
+@@ -378,13 +397,13 @@
  	TK_LIBRARY=$(TOP_DIR)/library; export TK_LIBRARY; \
  	./tktest
  
@@ -90,7 +90,7 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -397,13 +416,22 @@
+@@ -398,13 +417,22 @@
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@@ -114,7 +114,7 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -413,8 +441,18 @@
+@@ -414,8 +442,18 @@
  		else true; \
  		fi; \
  	    done;
@@ -135,7 +135,7 @@
  	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -473,10 +511,10 @@
+@@ -474,10 +512,10 @@
  	@cd $(SRC_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
@@ -149,7 +149,7 @@
  	    done;
  	$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
  	@cd $(SRC_DIR)/doc; for i in *.3; \
-@@ -484,19 +522,26 @@
+@@ -485,19 +523,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/files/patch-ac b/japanese/tk80/files/patch-ac
index 91fc56a203d9..2a90aaddd730 100644
--- a/japanese/tk80/files/patch-ac
+++ b/japanese/tk80/files/patch-ac
@@ -1,7 +1,6 @@
-diff -urN tk8.0.ORIG/generic/tkText.c ../generic/tkText.c
---- tk8.0.ORIG/generic/tkText.c	Mon Jan  5 12:35:50 1998
-+++ ../generic/tkText.c	Mon Jan  5 16:03:17 1998
-@@ -946,6 +946,7 @@
+--- ../generic/tkText.c.ORIG	Wed Mar 24 11:36:00 1999
++++ ../generic/tkText.c	Wed Mar 24 11:38:57 1999
+@@ -947,6 +947,7 @@
  	    || (textPtr->selTagPtr->spacing2String != NULL)
  	    || (textPtr->selTagPtr->spacing3String != NULL)
  	    || (textPtr->selTagPtr->tabString != NULL)
@@ -9,7 +8,7 @@ diff -urN tk8.0.ORIG/generic/tkText.c ../generic/tkText.c
  	    || (textPtr->selTagPtr->underlineString != NULL)
  	    || (textPtr->selTagPtr->wrapMode != NULL)) {
  	textPtr->selTagPtr->affectsDisplay = 1;
-@@ -1520,7 +1521,7 @@
+@@ -1521,7 +1522,7 @@
  		    }
  		}
  	    }
@@ -18,7 +17,7 @@ diff -urN tk8.0.ORIG/generic/tkText.c ../generic/tkText.c
  #ifdef TK_KANJI_OK
  		memcpy((VOID *) buffer, (VOID *) (str + offset), (size_t) numBytes);
  		offset = 0;
-@@ -1828,7 +1829,7 @@
+@@ -1829,7 +1830,7 @@
      int argc;			/* Number of arguments. */
      char **argv;		/* Argument strings. */
  {
@@ -27,7 +26,7 @@ diff -urN tk8.0.ORIG/generic/tkText.c ../generic/tkText.c
      size_t length;
      int numLines, startingLine, startingChar, lineNum, firstChar, lastChar;
      int code, matchLength, matchChar, passes, stopLine, searchWholeText;
-@@ -1839,6 +1840,7 @@
+@@ -1840,6 +1841,7 @@
      Tcl_DString line, patDString;
      TkTextSegment *segPtr;
      TkTextLine *linePtr;
@@ -35,7 +34,7 @@ diff -urN tk8.0.ORIG/generic/tkText.c ../generic/tkText.c
      Tcl_RegExp regexp = NULL;		/* Initialization needed only to
  					 * prevent compiler warning. */
  
-@@ -1847,6 +1849,8 @@
+@@ -1848,6 +1850,8 @@
       */
  
      exact = 1;
@@ -44,7 +43,7 @@ diff -urN tk8.0.ORIG/generic/tkText.c ../generic/tkText.c
      backwards = 0;
      noCase = 0;
      varName = NULL;
-@@ -1860,7 +1864,7 @@
+@@ -1861,7 +1865,7 @@
  	    badSwitch:
  	    Tcl_AppendResult(interp, "bad switch \"", arg,
  		    "\": must be -forward, -backward, -exact, -regexp, ",
@@ -53,7 +52,7 @@ diff -urN tk8.0.ORIG/generic/tkText.c ../generic/tkText.c
  	    return TCL_ERROR;
  	}
  	c = arg[1];
-@@ -1881,6 +1885,8 @@
+@@ -1882,6 +1886,8 @@
  	    noCase = 1;
  	} else if ((c == 'r') && (strncmp(argv[i], "-regexp", length) == 0)) {
  	    exact = 0;
@@ -62,7 +61,7 @@ diff -urN tk8.0.ORIG/generic/tkText.c ../generic/tkText.c
  	} else if ((c == '-') && (strncmp(argv[i], "--", length) == 0)) {
  	    i++;
  	    break;
-@@ -1976,13 +1982,14 @@
+@@ -1977,13 +1983,14 @@
  	 */
  
  	linePtr = TkBTreeFindLine(textPtr->tree, lineNum);
@@ -79,7 +78,7 @@ diff -urN tk8.0.ORIG/generic/tkText.c ../generic/tkText.c
  		continue;
  	    }
  #ifdef TK_KANJI_OK
-@@ -2210,7 +2217,7 @@
+@@ -2211,7 +2218,7 @@
      int argc;			/* Number of arguments. */
      char **argv;		/* Argument strings. */
  {
@@ -88,7 +87,7 @@ diff -urN tk8.0.ORIG/generic/tkText.c ../generic/tkText.c
      size_t length;
      int numLines, startingLine, startingChar, lineNum, firstChar, lastChar;
      int code, matchLength, matchChar, passes, stopLine, searchWholeText;
-@@ -2230,6 +2237,7 @@
+@@ -2231,6 +2238,7 @@
  #endif /* TK_KANJI_OK */
      TkTextSegment *segPtr;
      TkTextLine *linePtr;
@@ -96,7 +95,7 @@ diff -urN tk8.0.ORIG/generic/tkText.c ../generic/tkText.c
  #ifndef TK_KANJI_OK
      Tcl_RegExp regexp = NULL;		/* Initialization needed only to
  					 * prevent compiler warning. */
-@@ -2240,6 +2248,8 @@
+@@ -2241,6 +2249,8 @@
       */
  
      exact = 1;
@@ -105,7 +104,7 @@ diff -urN tk8.0.ORIG/generic/tkText.c ../generic/tkText.c
      backwards = 0;
      noCase = 0;
      varName = NULL;
-@@ -2253,7 +2263,7 @@
+@@ -2254,7 +2264,7 @@
  	    badSwitch:
  	    Tcl_AppendResult(interp, "bad switch \"", arg,
  		    "\": must be -forward, -backward, -exact, -regexp, ",
@@ -114,16 +113,16 @@ diff -urN tk8.0.ORIG/generic/tkText.c ../generic/tkText.c
  	    return TCL_ERROR;
  	}
  	c = arg[1];
-@@ -2278,6 +2288,8 @@
- 	    noCase = 1;
- 	} else if ((c == 'r') && (strncmp(argv[i], "-regexp", length) == 0)) {
+@@ -2279,6 +2289,8 @@
+ 	    return TCL_ERROR;
+ #endif /* TK_KANJI_OK */
  	    exact = 0;
 +	} else if ((c == 'e') && (strncmp(argv[i], "-elide", length) == 0)) {
 +	    searchElide = 1;
  	} else if ((c == '-') && (strncmp(argv[i], "--", length) == 0)) {
  	    i++;
  	    break;
-@@ -2405,9 +2417,10 @@
+@@ -2406,9 +2418,10 @@
  	 */
  
  	linePtr = TkBTreeFindLine(textPtr->tree, lineNum);
@@ -136,9 +135,8 @@ diff -urN tk8.0.ORIG/generic/tkText.c ../generic/tkText.c
  		continue;
  	    }
  #ifdef TK_KANJI_OK
-diff -urN tk8.0.ORIG/generic/tkText.h ../generic/tkText.h
---- tk8.0.ORIG/generic/tkText.h	Mon Jan  5 12:35:52 1998
-+++ ../generic/tkText.h	Mon Jan  5 14:10:20 1998
+--- ../generic/tkText.h.ORIG	Wed Mar 24 11:36:25 1999
++++ ../generic/tkText.h	Wed Mar 24 11:38:58 1999
 @@ -378,6 +378,10 @@
  				 * Must be tkTextCharUid, tkTextNoneUid,
  				 * tkTextWordUid, or NULL to use wrapMode
@@ -159,9 +157,8 @@ diff -urN tk8.0.ORIG/generic/tkText.h ../generic/tkText.h
  			    TkTextIndex *indexPtr));
  extern int		TkTextMarkCmd _ANSI_ARGS_((TkText *textPtr,
  			    Tcl_Interp *interp, int argc, char **argv));
-diff -urN tk8.0.ORIG/generic/tkTextBTree.c ../generic/tkTextBTree.c
---- tk8.0.ORIG/generic/tkTextBTree.c	Mon Jan  5 12:35:50 1998
-+++ ../generic/tkTextBTree.c	Mon Jan  5 14:10:20 1998
+--- ../generic/tkTextBTree.c.ORIG	Wed Mar 24 11:36:47 1999
++++ ../generic/tkTextBTree.c	Wed Mar 24 11:38:58 1999
 @@ -2447,6 +2447,132 @@
      }
      return tagInfo.tagPtrs;
@@ -295,9 +292,8 @@ diff -urN tk8.0.ORIG/generic/tkTextBTree.c ../generic/tkTextBTree.c
  
  /*
   *----------------------------------------------------------------------
-diff -urN tk8.0.ORIG/generic/tkTextDisp.c ../generic/tkTextDisp.c
---- tk8.0.ORIG/generic/tkTextDisp.c	Mon Jan  5 12:35:50 1998
-+++ ../generic/tkTextDisp.c	Mon Jan  5 14:10:21 1998
+--- ../generic/tkTextDisp.c.ORIG	Wed Mar 24 11:37:14 1999
++++ ../generic/tkTextDisp.c	Wed Mar 24 11:38:59 1999
 @@ -59,6 +59,7 @@
  				 * be NULL). */
      int underline;		/* Non-zero means draw underline underneath
@@ -714,7 +710,7 @@ diff -urN tk8.0.ORIG/generic/tkTextDisp.c ../generic/tkTextDisp.c
  /*
   *--------------------------------------------------------------
   *
-@@ -4457,7 +4602,7 @@
+@@ -4480,7 +4625,7 @@
       * Draw the text, underline, and overstrike for this chunk.
       */
  
@@ -723,9 +719,8 @@ diff -urN tk8.0.ORIG/generic/tkTextDisp.c ../generic/tkTextDisp.c
  	int numChars = ciPtr->numChars - offsetChars;
  #ifdef TK_KANJI_OK
  	wchar *string = ciPtr->chars + offsetChars;
-diff -urN tk8.0.ORIG/generic/tkTextTag.c ../generic/tkTextTag.c
---- tk8.0.ORIG/generic/tkTextTag.c	Mon Jan  5 12:35:51 1998
-+++ ../generic/tkTextTag.c	Mon Jan  5 14:10:21 1998
+--- ../generic/tkTextTag.c.ORIG	Wed Mar 24 11:37:36 1999
++++ ../generic/tkTextTag.c	Wed Mar 24 11:38:59 1999
 @@ -63,6 +63,9 @@
      {TK_CONFIG_STRING, "-underline", (char *) NULL, (char *) NULL,
  	(char *) NULL, Tk_Offset(TkTextTag, underlineString),
@@ -776,10 +771,9 @@ diff -urN tk8.0.ORIG/generic/tkTextTag.c ../generic/tkTextTag.c
      }
      ckfree((char *) tagPtr);
  }
-diff -urN tk8.0.ORIG/tests/text.test ../tests/text.test
---- tk8.0.ORIG/tests/text.test	Mon Jan  5 12:35:27 1998
-+++ ../tests/text.test	Mon Jan  5 15:06:05 1998
-@@ -866,7 +866,7 @@
+--- ../tests/text.test.ORIG	Wed Mar 24 11:37:58 1999
++++ ../tests/text.test	Wed Mar 24 11:38:59 1999
+@@ -862,7 +862,7 @@
  .t insert end "xxyz xyz x. the\nfoo -forward bar xxxxx BaR foo\nxyz xxyzx"
  test text-20.1 {TextSearchCmd procedure, argument parsing} {
      list [catch {.t search -} msg] $msg
diff --git a/japanese/tk80/pkg-plist b/japanese/tk80/pkg-plist
index 0a10a5c2dd8d..24e206b2660b 100644
--- a/japanese/tk80/pkg-plist
+++ b/japanese/tk80/pkg-plist
@@ -36,6 +36,7 @@ lib/tk8.0jp/dialog.tcl
 lib/tk8.0jp/entry.tcl
 lib/tk8.0jp/focus.tcl
 lib/tk8.0jp/kinput.tcl
+lib/tk8.0jp/kinsoku.tcl
 lib/tk8.0jp/listbox.tcl
 lib/tk8.0jp/menu.tcl
 lib/tk8.0jp/msgbox.tcl