From 648c1f98c0799232fbebd88fc2a651a63fb16ff1 Mon Sep 17 00:00:00 2001
From: kevlo <kevlo@openbsd.org>
Date: Wed, 24 May 2000 02:04:06 +0000
Subject: [PATCH] Upgrade to version 8.3.1

---
 lang/tcl/8.3/Makefile           |  6 +++---
 lang/tcl/8.3/files/md5          |  6 +++---
 lang/tcl/8.3/patches/patch-aa   | 23 +++++++++++------------
 lang/tcl/8.3/patches/patch-ab   | 18 +++++++++---------
 lang/tcl/8.3/pkg/PLIST          |  6 +++---
 lang/tcl/8.3/pkg/PLIST.noshared |  6 +++---
 6 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/lang/tcl/8.3/Makefile b/lang/tcl/8.3/Makefile
index e05ccc6749f..3e2a4bec28a 100644
--- a/lang/tcl/8.3/Makefile
+++ b/lang/tcl/8.3/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.2 2000/04/01 21:43:05 brad Exp $
+# $OpenBSD: Makefile,v 1.3 2000/05/24 02:04:06 kevlo Exp $
 
-DISTNAME=	tcl8.3.0
-PKGNAME=	tcl-8.3.0
+DISTNAME=	tcl8.3.1
+PKGNAME=	tcl-8.3.1
 CATEGORIES=	lang
 NEED_VERSION=	1.234
 MASTER_SITES=	${MASTER_SITE_TCLTK}
diff --git a/lang/tcl/8.3/files/md5 b/lang/tcl/8.3/files/md5
index b7bf1ab8ca7..15e4326b8d0 100644
--- a/lang/tcl/8.3/files/md5
+++ b/lang/tcl/8.3/files/md5
@@ -1,3 +1,3 @@
-MD5 (tcl8.3.0.tar.gz) = 0fc2ee5c79692fe13316d85939fda62b
-RMD160 (tcl8.3.0.tar.gz) = 6812fb3c1f43d0cc3ec97a7a222607b8037320c7
-SHA1 (tcl8.3.0.tar.gz) = 7730619ada96740e339f7539dbd1e24d3c487caa
+MD5 (tcl8.3.1.tar.gz) = 1834811e47421892584830c22e3ff002
+RMD160 (tcl8.3.1.tar.gz) = 22fb83710f32e660416821de34a2a55e7d30784c
+SHA1 (tcl8.3.1.tar.gz) = 127d41d198dd60e0626e03cd86aeb2c54285768c
diff --git a/lang/tcl/8.3/patches/patch-aa b/lang/tcl/8.3/patches/patch-aa
index 0372ddfb99b..92db2da6b7e 100644
--- a/lang/tcl/8.3/patches/patch-aa
+++ b/lang/tcl/8.3/patches/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu Feb 10 06:09:57 2000
-+++ Makefile.in	Sat Apr  1 16:15:11 2000
-@@ -383,7 +383,7 @@
+--- Makefile.in.orig	Wed May 24 00:50:16 2000
++++ Makefile.in	Wed May 24 01:04:09 2000
+@@ -396,7 +396,7 @@
  
  all: binaries libraries doc
  
@@ -9,7 +9,7 @@
  
  libraries:
  
-@@ -394,12 +394,15 @@
+@@ -407,12 +407,15 @@
  ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
  	rm -f ${TCL_LIB_FILE}
  	@MAKE_LIB@
@@ -27,7 +27,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
-@@ -506,8 +509,10 @@
+@@ -522,8 +525,10 @@
  	    fi
  	@echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
@@ -39,7 +39,7 @@
  	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
  	    echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
-@@ -516,7 +521,8 @@
+@@ -532,7 +537,8 @@
  	@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
  	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
  	@echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/"
@@ -49,18 +49,17 @@
  	@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(TCL_STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
-@@ -524,8 +530,8 @@
+@@ -540,7 +546,8 @@
  	    fi
  
  install-libraries: libraries
--	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
--		$(SCRIPT_INSTALL_DIR); \
+-	@for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
 +	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR) \
-+		$(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
++	    $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
-@@ -547,10 +553,18 @@
+@@ -562,10 +569,18 @@
  	    chmod +x $(SRC_DIR)/install-sh; \
  	    fi
  	@echo "Installing header files";
@@ -81,7 +80,7 @@
  	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
  	    do \
-@@ -612,6 +626,14 @@
+@@ -627,6 +642,14 @@
  	    done;
  	@echo "Cross-linking command (.n) docs";
  	@$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
diff --git a/lang/tcl/8.3/patches/patch-ab b/lang/tcl/8.3/patches/patch-ab
index ab1dfc5ff87..80785d9343f 100644
--- a/lang/tcl/8.3/patches/patch-ab
+++ b/lang/tcl/8.3/patches/patch-ab
@@ -1,6 +1,6 @@
---- configure.orig	Thu Feb 10 19:09:57 2000
-+++ configure	Wed Mar 22 19:52:56 2000
-@@ -4933,7 +4933,14 @@
+--- configure.orig	Wed May 24 01:04:32 2000
++++ configure	Wed May 24 01:12:19 2000
+@@ -5063,7 +5063,14 @@
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
    
@@ -9,14 +9,14 @@
 +		case `machine` in
 +		sparc)
 +		    SHLIB_CFLAGS="-fPIC";;
-+                *)
++		 *)
 +		    SHLIB_CFLAGS="-fpic";;
-+                esac
++	        esac
 +		SHLIB_LD="ld -Bshareable -Bforcearchive -x"
  		SHLIB_CFLAGS="-fPIC"
  		SHLIB_LD="ld -Bshareable -x"
  		SHLIB_LD_LIBS=""
-@@ -4961,7 +4968,7 @@
+@@ -5091,7 +5098,7 @@
  else
    rm -rf conftest*
    echo "$ac_t""no" 1>&6
@@ -25,19 +25,19 @@
  		
  fi
  rm -f conftest*
-@@ -5652,10 +5659,9 @@
+@@ -5787,10 +5794,9 @@
      TCL_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}"
      eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}"
      if test "x$DL_OBJS" = "xtclLoadAout.o"; then
 -	MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
-+       MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}; \${RANLIB} \${TCL_LIB_FILE}"
++	MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}; \${RANLIB} \${TCL_LIB_FILE}"
      else
  	MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
 -	RANLIB=":"
      fi
  else
      case $system in
-@@ -5739,7 +5745,7 @@
+@@ -5874,7 +5880,7 @@
  # Replace DBGX with TCL_DBGX
  eval "STUB_LIB_FILE=\"${STUB_LIB_FILE}\""
  
diff --git a/lang/tcl/8.3/pkg/PLIST b/lang/tcl/8.3/pkg/PLIST
index 352ec969592..b79e575fbf8 100644
--- a/lang/tcl/8.3/pkg/PLIST
+++ b/lang/tcl/8.3/pkg/PLIST
@@ -97,8 +97,8 @@ lib/tcl8.3/encoding/symbol.enc
 lib/tcl8.3/history.tcl
 lib/tcl8.3/http1.0/http.tcl
 lib/tcl8.3/http1.0/pkgIndex.tcl
-lib/tcl8.3/http2.1/http.tcl
-lib/tcl8.3/http2.1/pkgIndex.tcl
+lib/tcl8.3/http2.3/http.tcl
+lib/tcl8.3/http2.3/pkgIndex.tcl
 lib/tcl8.3/init.tcl
 lib/tcl8.3/ldAix
 lib/tcl8.3/ldAout.tcl
@@ -647,7 +647,7 @@ lib/tcl8.3/man/mann/while.n
 @dirrm include/tcl8.3
 @dirrm lib/tcl8.3/encoding
 @dirrm lib/tcl8.3/http1.0
-@dirrm lib/tcl8.3/http2.1
+@dirrm lib/tcl8.3/http2.3
 @dirrm lib/tcl8.3/msgcat1.0
 @dirrm lib/tcl8.3/opt0.4
 @dirrm lib/tcl8.3/tcltest1.0
diff --git a/lang/tcl/8.3/pkg/PLIST.noshared b/lang/tcl/8.3/pkg/PLIST.noshared
index b60c3fd0a05..7134dfa3229 100644
--- a/lang/tcl/8.3/pkg/PLIST.noshared
+++ b/lang/tcl/8.3/pkg/PLIST.noshared
@@ -95,8 +95,8 @@ lib/tcl8.3/encoding/symbol.enc
 lib/tcl8.3/history.tcl
 lib/tcl8.3/http1.0/http.tcl
 lib/tcl8.3/http1.0/pkgIndex.tcl
-lib/tcl8.3/http2.1/http.tcl
-lib/tcl8.3/http2.1/pkgIndex.tcl
+lib/tcl8.3/http2.3/http.tcl
+lib/tcl8.3/http2.3/pkgIndex.tcl
 lib/tcl8.3/init.tcl
 lib/tcl8.3/ldAix
 lib/tcl8.3/ldAout.tcl
@@ -646,7 +646,7 @@ lib/tcl8.3/man/mann/while.n
 @dirrm include/tcl8.3
 @dirrm lib/tcl8.3/encoding
 @dirrm lib/tcl8.3/http1.0
-@dirrm lib/tcl8.3/http2.1
+@dirrm lib/tcl8.3/http2.3
 @dirrm lib/tcl8.3/msgcat1.0
 @dirrm lib/tcl8.3/opt0.4
 @dirrm lib/tcl8.3/tcltest1.0