Update to tcl8.0.4jp1.3

5 files changed, 24 insertions, 35 deletions

diff --git a/japanese/tcl80/Makefile b/japanese/tcl80/Makefile
index 83912efe30fb..b4712f2a72a6 100644
--- a/japanese/tcl80/Makefile
+++ b/japanese/tcl80/Makefile
@@ -3,16 +3,16 @@
 # Date created:		23 Jan 1998
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
-# $Id: Makefile,v 1.6 1998/09/28 10:23:58 asami Exp $
+# $Id: Makefile,v 1.7 1998/11/14 09:43:16 asami Exp $
 #
 
-DISTNAME=	tcl8.0.3
-PKGNAME=	ja-tcl-8.0.3
+DISTNAME=	tcl8.0.4
+PKGNAME=	ja-tcl-8.0.4
 CATEGORIES=	japanese lang tcl80
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
 
 PATCH_SITES=	ftp://ftp.sra.co.jp/pub/lang/tcl/jp/
-PATCHFILES=	tcl8.0.3jp1.1.patch.gz
+PATCHFILES=	tcl8.0.4jp1.3.patch.gz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -50,7 +50,7 @@ post-install:
 .endif
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if ${PORTOBJFORMAT} == "aout" 
-	${LN} -sf libtcl80jp.so.1.2 ${PREFIX}/lib/libtcl80jp.so
+	${LN} -sf libtcl80jp.so.1.4 ${PREFIX}/lib/libtcl80jp.so
 .endif
 	@${CAT}	${PKGDIR}/MESSAGE
 
diff --git a/japanese/tcl80/distinfo b/japanese/tcl80/distinfo
index 1ccb5416e343..bc15384c7917 100644
--- a/japanese/tcl80/distinfo
+++ b/japanese/tcl80/distinfo
@@ -1,2 +1,2 @@
-MD5 (tcl8.0.3.tar.gz) = 8c2573cf8dc08354820223168516e11a
-MD5 (tcl8.0.3jp1.1.patch.gz) = 0600118ea3e3fb178438e3a286d2b384
+MD5 (tcl8.0.4.tar.gz) = 62e1fcb1c000e12e33909f830670e360
+MD5 (tcl8.0.4jp1.3.patch.gz) = 220a8dcfeefb82766f5ebf38ed93baf9
diff --git a/japanese/tcl80/files/patch-aa b/japanese/tcl80/files/patch-aa
index 42f2168e1a91..cb8a8fa5e2cf 100644
--- a/japanese/tcl80/files/patch-aa
+++ b/japanese/tcl80/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.in.ORIG	Sun Sep 20 20:57:48 1998
-+++ configure.in	Sun Sep 20 21:00:47 1998
-@@ -811,15 +811,21 @@
+--- configure.in.ORIG	Wed Jan 20 15:06:29 1999
++++ configure.in	Wed Jan 20 15:06:43 1999
+@@ -825,15 +825,21 @@
      NetBSD-*|FreeBSD-*|OpenBSD-*)
  	# Not available on all versions:  check for include file.
  	AC_CHECK_HEADER(dlfcn.h, [
@@ -10,7 +10,7 @@
 +	       TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
 +	    else
 +	       SHLIB_LD="ld -Bshareable -x"
-+	       TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.2'
++	       TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.4'
 +	    fi
  	    SHLIB_CFLAGS="-fpic"
 -	    SHLIB_LD="ld -Bshareable -x"
@@ -24,7 +24,7 @@
  	], [
  	    SHLIB_CFLAGS=""
  	    SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -1182,6 +1188,7 @@
+@@ -1196,6 +1202,7 @@
  if test "$TCL_UNSHARED_LIB_SUFFIX" = "" ; then
      TCL_UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
  fi
@@ -32,7 +32,7 @@
  AC_ARG_ENABLE(shared,
      [  --enable-shared         build libtcl as a shared library],
      [tcl_ok=$enableval], [tcl_ok=no])
-@@ -1190,10 +1197,15 @@
+@@ -1204,10 +1211,15 @@
      TCL_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
      TCL_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}"
      eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}"
@@ -49,7 +49,7 @@
  	RANLIB=":"
      fi
  else
-@@ -1234,6 +1246,7 @@
+@@ -1248,6 +1260,7 @@
  # Trick to replace DBGX with TCL_DBGX
  DBGX='${TCL_DBGX}'
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
@@ -57,7 +57,7 @@
  
  VERSION='${VERSION}'
  eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
-@@ -1272,6 +1285,7 @@
+@@ -1287,6 +1300,7 @@
  AC_SUBST(TCL_BUILD_LIB_SPEC)
  AC_SUBST(TCL_LD_SEARCH_FLAGS)
  AC_SUBST(TCL_LIB_FILE)
@@ -65,8 +65,8 @@
  AC_SUBST(TCL_LIB_FLAG)
  AC_SUBST(TCL_LIB_SPEC)
  AC_SUBST(TCL_LIB_VERSIONS_OK)
---- Makefile.in.ORIG	Sun Sep 20 20:57:54 1998
-+++ Makefile.in	Sun Sep 20 21:01:40 1998
+--- Makefile.in.ORIG	Wed Jan 20 15:06:34 1999
++++ Makefile.in	Wed Jan 20 15:06:43 1999
 @@ -55,11 +55,16 @@
  BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
  
@@ -102,7 +102,7 @@
  #TCL_LIB_FILE = libtcl.a
  
  TCL_LIB_FLAG = @TCL_LIB_FLAG@
-@@ -334,7 +340,11 @@
+@@ -336,7 +342,11 @@
  
  SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(KANJI_SRCS)
  
@@ -115,7 +115,7 @@
  
  # The following target is configured by autoconf to generate either
  # a shared library or non-shared library for Tcl.
-@@ -342,6 +352,14 @@
+@@ -344,6 +354,14 @@
  	rm -f ${TCL_LIB_FILE}
  	@MAKE_LIB@
  	$(RANLIB) ${TCL_LIB_FILE}
@@ -130,7 +130,7 @@
  
  # Make target which outputs the list of the .o contained in the Tcl lib
  # usefull to build a single big shared library containing Tcl and other
-@@ -430,13 +448,13 @@
+@@ -432,13 +450,13 @@
  	cd dltest; if test -f configure; then ./configure; else \
  	    $(DLTEST_DIR)/configure; fi
  
@@ -146,7 +146,7 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -449,19 +467,27 @@
+@@ -451,19 +469,27 @@
  	@echo "Installing $(TCL_LIB_FILE)"
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
@@ -178,7 +178,7 @@
  		chmod 755 $$i; \
  		else true; \
  		fi; \
-@@ -475,8 +501,15 @@
+@@ -477,8 +503,15 @@
  		else true; \
  		fi; \
  	    done;
@@ -196,7 +196,7 @@
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -504,30 +537,37 @@
+@@ -506,30 +539,37 @@
  	@cd $(TOP_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
diff --git a/japanese/tcl80/files/patch-ab b/japanese/tcl80/files/patch-ab
deleted file mode 100644
index daa6ccbeb382..000000000000
--- a/japanese/tcl80/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../generic/tclListObj.c.ORIG	Tue Dec 30 15:54:34 1997
-+++ ../generic/tclListObj.c	Tue Dec 30 15:55:18 1997
-@@ -260,6 +260,8 @@
- 	
- 	objPtr->internalRep.otherValuePtr = (VOID *) listRepPtr;
- 	objPtr->typePtr = &tclListType;
-+    } else {
-+      objPtr->bytes = tclEmptyStringRep;
-     }
- }
- 
diff --git a/japanese/tcl80/pkg-plist b/japanese/tcl80/pkg-plist
index 2e8321fdca37..215bc6225f2f 100644
--- a/japanese/tcl80/pkg-plist
+++ b/japanese/tcl80/pkg-plist
@@ -1,6 +1,6 @@
 bin/tclsh8.0jp
 lib/libtcl80jp.a
-lib/libtcl80jp.so.1.2
+lib/libtcl80jp.so.1.4
 lib/libtcl80jp.so
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R