Upgrade to 8.3.2.

PR:		ports/25371

10 files changed, 74 insertions, 84 deletions

diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index ba61e10e1b67..c47fc395e2c3 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -6,16 +6,12 @@
 #
 
 PORTNAME=	tcl
-PORTVERSION=	8.3.1
+PORTVERSION=	8.3.2
 CATEGORIES=	lang tcl83
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_3
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-PATCH_SITES=	ftp://ftp.neosoft.com/pub/tcl/sorted/packages-8.0/devel/ \
-		http://www.neosoft.com/tcl/ftparchive/sorted/packages-8.0/devel/
-PATCHFILES=	${PORTNAME}${PORTVERSION}plus.patch.gz
-
 MAINTAINER=	jseger@FreeBSD.org
 
 PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
@@ -37,14 +33,15 @@ MAN3=	Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \
 	ChnlStack.3 CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 \
 	CrtCloseHdlr.3 	CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 \
 	CrtObjCmd.3 CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 DString.3 \
-	DetachPids.3 DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 \
-	Exit.3 ExprLong.3 ExprLongObj.3 FindExec.3 GetCwd.3 GetHostName.3 \
-	GetIndex.3 GetInt.3 GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 \
-	InitStubs.3 IntObj.3 Interp.3 LinkVar.3 ListObj.3 MainLoop.3 Notifier.3\
-	Object.3 ObjectType.3 OpenFileChnl.3 OpenTcp.3 ParseCmd.3 PkgRequire.3 \
-	Preserve.3 PrintDbl.3 RecEvalObj.3 RecordEval.3 RegExp.3 SaveResult.3 \
-	SetErrno.3 SetRecLmt.3 SetResult.3 SetVar.3 Sleep.3 SourceRCFile.3 \
-	SplitList.3 SplitPath.3 StaticPkg.3 StrMatch.3 StringObj.3 Tcl_Main.3 \
+	DetachPids.3 DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 DumpActiveMemory.3 \
+	Encoding.3 Eval.3 Exit.3 ExprLong.3 ExprLongObj.3 FindExec.3 GetCwd.3 \
+	GetHostName.3 GetIndex.3 GetInt.3 GetOpnFl.3 GetStdChan.3 \
+	GetVersion.3 Hash.3 Init.3 InitStubs.3 IntObj.3 Interp.3 LinkVar.3 \
+	ListObj.3 Notifier.3 Object.3 ObjectType.3 OpenFileChnl.3 OpenTcp.3 \
+	ParseCmd.3 PkgRequire.3 Preserve.3 PrintDbl.3 RecEvalObj.3 \
+	RecordEval.3 RegExp.3 SaveResult.3 SetErrno.3 SetRecLmt.3 \
+	SetResult.3 SetVar.3 Sleep.3 SourceRCFile.3 SplitList.3 SplitPath.3 \
+	StaticPkg.3 StrMatch.3 StringObj.3 TCL_MEM_DEBUG.3 Tcl_Main.3 \
 	Thread.3 ToUpper.3 TraceVar.3 Translate.3 UpVar.3 Utf.3 WrongNumArgs.3
 
 MANN=	Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \
@@ -159,6 +156,9 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	DoubleObj.3 Tcl_NewDoubleObj.3 \
 	DoubleObj.3 Tcl_SetDoubleObj.3 \
 	DoubleObj.3 Tcl_GetDoubleFromObj.3 \
+	DumpActiveMemory.3 Tcl_DumpActiveMemory.3 \
+	DumpActiveMemory.3 Tcl_InitMemory.3 \
+	DumpActiveMemory.3 Tcl_ValidateAllMemory.3 \
 	Encoding.3 Tcl_GetEncoding.3 \
 	Encoding.3 Tcl_FreeEncoding.3 \
 	Encoding.3 Tcl_ExternalToUtfDString.3 \
diff --git a/lang/tcl83/distinfo b/lang/tcl83/distinfo
index 2f4f5e952797..1acf7e85a99e 100644
--- a/lang/tcl83/distinfo
+++ b/lang/tcl83/distinfo
@@ -1,2 +1 @@
-MD5 (tcl8.3.1.tar.gz) = 1834811e47421892584830c22e3ff002
-MD5 (tcl8.3.1plus.patch.gz) = 96db8dcb482464deff8ad676fd660dba
+MD5 (tcl8.3.2.tar.gz) = 971d9e22fecc486d3520841aac1ec588
diff --git a/lang/tcl83/files/patch-aa b/lang/tcl83/files/patch-aa
index f7e0dc92f180..c3d335611b6c 100644
--- a/lang/tcl83/files/patch-aa
+++ b/lang/tcl83/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Wed May 10 16:38:48 2000
-+++ Makefile.in	Wed May 10 16:46:00 2000
+--- Makefile.in.orig	Tue Aug  8 12:17:11 2000
++++ Makefile.in	Sat Feb 24 16:17:52 2001
 @@ -53,7 +53,9 @@
  SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TCL_LIBRARY)
  
@@ -20,17 +20,20 @@
  
  # To disable ANSI-C procedure prototypes reverse the comment characters
  # on the following lines:
-@@ -394,7 +396,7 @@
+@@ -397,7 +399,7 @@
  
  all: binaries libraries doc
  
--binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh Tcltest${SHLIB_SUFFIX}
-+binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) libtcl${SHORT_TCL_VER}.a tclsh Tcltest${SHLIB_SUFFIX}
+-binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
++binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) libtcl${SHORT_TCL_VER}.a tclsh
  
  libraries:
  
-@@ -407,6 +409,11 @@
+@@ -408,8 +410,14 @@
+ ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
+ 	rm -f ${TCL_LIB_FILE}
  	@MAKE_LIB@
++	@ln -sf $(TCL_LIB_FILE) ./libtcl${SHORT_TCL_VER}.so
  	$(RANLIB) ${TCL_LIB_FILE}
  
 +libtcl${SHORT_TCL_VER}.a: ${OBJS}
@@ -41,14 +44,11 @@
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f ${STUB_LIB_FILE}
  	@MAKE_STUB_LIB@
-@@ -520,11 +527,16 @@
+@@ -523,8 +531,13 @@
  	    fi
  	@echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
 +	@ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so
- 	@echo "Installing Tcltest${SHLIB_SUFFIX} to $(SCRIPT_INSTALL_DIR)/tcltest1.0"
- 	@$(INSTALL_DATA) Tcltest${SHLIB_SUFFIX} \
- 		$(SCRIPT_INSTALL_DIR)/tcltest1.0/Tcltest${SHLIB_SUFFIX}
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
 +	@echo "Installing libtcl${SHORT_TCL_VER}.a"
@@ -58,7 +58,7 @@
  	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
  	    echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
-@@ -532,8 +544,9 @@
+@@ -532,8 +545,9 @@
  	    fi
  	@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
  	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
@@ -70,7 +70,7 @@
  	@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(TCL_STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
-@@ -541,7 +554,8 @@
+@@ -541,7 +555,8 @@
  	    fi
  
  install-libraries: libraries
@@ -80,7 +80,7 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
-@@ -563,10 +577,16 @@
+@@ -563,10 +578,16 @@
  	    chmod +x $(SRC_DIR)/install-sh; \
  	    fi
  	@echo "Installing header files";
@@ -99,7 +99,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 \
-@@ -607,7 +627,6 @@
+@@ -607,7 +628,6 @@
  	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking top-level (.1) docs";
@@ -107,7 +107,7 @@
  	@echo "Installing C API (.3) docs";
  	@cd $(TOP_DIR)/doc; for i in *.3; \
  	    do \
-@@ -617,7 +636,6 @@
+@@ -617,7 +637,6 @@
  	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking C API (.3) docs";
@@ -115,7 +115,7 @@
  	@echo "Installing command (.n) docs";
  	@cd $(TOP_DIR)/doc; for i in *.n; \
  	    do \
-@@ -627,7 +645,14 @@
+@@ -627,7 +646,14 @@
  	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking command (.n) docs";
diff --git a/lang/tcl83/files/patch-ab b/lang/tcl83/files/patch-ab
index 3a52b40a9af3..1899ae9dfbc2 100644
--- a/lang/tcl83/files/patch-ab
+++ b/lang/tcl83/files/patch-ab
@@ -1,6 +1,6 @@
---- configure.orig	Mon May  1 10:07:11 2000
-+++ configure	Mon May  1 10:08:59 2000
-@@ -4902,7 +4902,7 @@
+--- configure.orig	Tue Aug  8 15:17:11 2000
++++ configure	Tue Dec  5 11:37:50 2000
+@@ -5032,7 +5032,7 @@
  	    LDFLAGS="-Wl,-Bexport"
  	    LD_SEARCH_FLAGS=""
  	    ;;
@@ -9,11 +9,11 @@
  	    # Not available on all versions:  check for include file.
  	    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-@@ -4986,18 +4986,8 @@
+@@ -5116,18 +5116,8 @@
  	    # FreeBSD doesn't handle version numbers with dots.
  
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
  	    TCL_LIB_VERSIONS_OK=nodots
 -	    ;;
 -	FreeBSD-*)
@@ -22,7 +22,7 @@
 -	    SHLIB_LD="ld -Bshareable -x"
 -	    SHLIB_LD_LIBS=""
 -	    SHLIB_SUFFIX=".so"
--	    DL_OBJS=""
+-	    DL_OBJS="tclLoadDl.o"
 -	    DL_LIBS=""
 -	    LDFLAGS="-export-dynamic"
 -	    LD_SEARCH_FLAGS=""
diff --git a/lang/tcl83/pkg-plist b/lang/tcl83/pkg-plist
index e39333fe84e6..eef7e02c70e3 100644
--- a/lang/tcl83/pkg-plist
+++ b/lang/tcl83/pkg-plist
@@ -5,7 +5,6 @@ include/tcl%%TCL_VER%%/generic/regex.h
 include/tcl%%TCL_VER%%/generic/regguts.h
 include/tcl%%TCL_VER%%/generic/tcl.h
 include/tcl%%TCL_VER%%/generic/tclCompile.h
-include/tcl%%TCL_VER%%/generic/tclCompileDecls.h
 include/tcl%%TCL_VER%%/generic/tclDecls.h
 include/tcl%%TCL_VER%%/generic/tclInitScript.h
 include/tcl%%TCL_VER%%/generic/tclInt.h
@@ -15,6 +14,7 @@ include/tcl%%TCL_VER%%/generic/tclMath.h
 include/tcl%%TCL_VER%%/generic/tclPlatDecls.h
 include/tcl%%TCL_VER%%/generic/tclPort.h
 include/tcl%%TCL_VER%%/generic/tclRegexp.h
+include/tcl%%TCL_VER%%/generic/tclIO.h
 include/tcl%%TCL_VER%%/tcl.h
 include/tcl%%TCL_VER%%/tclDecls.h
 include/tcl%%TCL_VER%%/unix/tclUnixPort.h
@@ -56,14 +56,12 @@ lib/tcl%%TCL_VER%%/encoding/cp936.enc
 lib/tcl%%TCL_VER%%/encoding/cp949.enc
 lib/tcl%%TCL_VER%%/encoding/cp950.enc
 lib/tcl%%TCL_VER%%/encoding/dingbats.enc
-lib/tcl%%TCL_VER%%/encoding/ebcdic.enc
 lib/tcl%%TCL_VER%%/encoding/euc-cn.enc
 lib/tcl%%TCL_VER%%/encoding/euc-jp.enc
 lib/tcl%%TCL_VER%%/encoding/euc-kr.enc
 lib/tcl%%TCL_VER%%/encoding/gb12345.enc
 lib/tcl%%TCL_VER%%/encoding/gb1988.enc
 lib/tcl%%TCL_VER%%/encoding/gb2312.enc
-lib/tcl%%TCL_VER%%/encoding/ibm1047.enc
 lib/tcl%%TCL_VER%%/encoding/iso2022-jp.enc
 lib/tcl%%TCL_VER%%/encoding/iso2022-kr.enc
 lib/tcl%%TCL_VER%%/encoding/iso2022.enc
@@ -81,7 +79,6 @@ lib/tcl%%TCL_VER%%/encoding/jis0208.enc
 lib/tcl%%TCL_VER%%/encoding/jis0212.enc
 lib/tcl%%TCL_VER%%/encoding/koi8-r.enc
 lib/tcl%%TCL_VER%%/encoding/ksc5601.enc
-lib/tcl%%TCL_VER%%/encoding/latin.enc
 lib/tcl%%TCL_VER%%/encoding/macCentEuro.enc
 lib/tcl%%TCL_VER%%/encoding/macCroatian.enc
 lib/tcl%%TCL_VER%%/encoding/macCyrillic.enc
@@ -114,7 +111,6 @@ lib/tcl%%TCL_VER%%/safe.tcl
 lib/tcl%%TCL_VER%%/tclAppInit.c
 lib/tcl%%TCL_VER%%/tclConfig.sh
 lib/tcl%%TCL_VER%%/tclIndex
-lib/tcl%%TCL_VER%%/tcltest1.0/Tcltest.so
 lib/tcl%%TCL_VER%%/tcltest1.0/pkgIndex.tcl
 lib/tcl%%TCL_VER%%/tcltest1.0/tcltest.tcl
 lib/tcl%%TCL_VER%%/word.tcl
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index ba61e10e1b67..c47fc395e2c3 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -6,16 +6,12 @@
 #
 
 PORTNAME=	tcl
-PORTVERSION=	8.3.1
+PORTVERSION=	8.3.2
 CATEGORIES=	lang tcl83
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_3
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-PATCH_SITES=	ftp://ftp.neosoft.com/pub/tcl/sorted/packages-8.0/devel/ \
-		http://www.neosoft.com/tcl/ftparchive/sorted/packages-8.0/devel/
-PATCHFILES=	${PORTNAME}${PORTVERSION}plus.patch.gz
-
 MAINTAINER=	jseger@FreeBSD.org
 
 PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
@@ -37,14 +33,15 @@ MAN3=	Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \
 	ChnlStack.3 CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 \
 	CrtCloseHdlr.3 	CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 \
 	CrtObjCmd.3 CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 DString.3 \
-	DetachPids.3 DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 \
-	Exit.3 ExprLong.3 ExprLongObj.3 FindExec.3 GetCwd.3 GetHostName.3 \
-	GetIndex.3 GetInt.3 GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 \
-	InitStubs.3 IntObj.3 Interp.3 LinkVar.3 ListObj.3 MainLoop.3 Notifier.3\
-	Object.3 ObjectType.3 OpenFileChnl.3 OpenTcp.3 ParseCmd.3 PkgRequire.3 \
-	Preserve.3 PrintDbl.3 RecEvalObj.3 RecordEval.3 RegExp.3 SaveResult.3 \
-	SetErrno.3 SetRecLmt.3 SetResult.3 SetVar.3 Sleep.3 SourceRCFile.3 \
-	SplitList.3 SplitPath.3 StaticPkg.3 StrMatch.3 StringObj.3 Tcl_Main.3 \
+	DetachPids.3 DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 DumpActiveMemory.3 \
+	Encoding.3 Eval.3 Exit.3 ExprLong.3 ExprLongObj.3 FindExec.3 GetCwd.3 \
+	GetHostName.3 GetIndex.3 GetInt.3 GetOpnFl.3 GetStdChan.3 \
+	GetVersion.3 Hash.3 Init.3 InitStubs.3 IntObj.3 Interp.3 LinkVar.3 \
+	ListObj.3 Notifier.3 Object.3 ObjectType.3 OpenFileChnl.3 OpenTcp.3 \
+	ParseCmd.3 PkgRequire.3 Preserve.3 PrintDbl.3 RecEvalObj.3 \
+	RecordEval.3 RegExp.3 SaveResult.3 SetErrno.3 SetRecLmt.3 \
+	SetResult.3 SetVar.3 Sleep.3 SourceRCFile.3 SplitList.3 SplitPath.3 \
+	StaticPkg.3 StrMatch.3 StringObj.3 TCL_MEM_DEBUG.3 Tcl_Main.3 \
 	Thread.3 ToUpper.3 TraceVar.3 Translate.3 UpVar.3 Utf.3 WrongNumArgs.3
 
 MANN=	Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \
@@ -159,6 +156,9 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	DoubleObj.3 Tcl_NewDoubleObj.3 \
 	DoubleObj.3 Tcl_SetDoubleObj.3 \
 	DoubleObj.3 Tcl_GetDoubleFromObj.3 \
+	DumpActiveMemory.3 Tcl_DumpActiveMemory.3 \
+	DumpActiveMemory.3 Tcl_InitMemory.3 \
+	DumpActiveMemory.3 Tcl_ValidateAllMemory.3 \
 	Encoding.3 Tcl_GetEncoding.3 \
 	Encoding.3 Tcl_FreeEncoding.3 \
 	Encoding.3 Tcl_ExternalToUtfDString.3 \
diff --git a/lang/tcl84/distinfo b/lang/tcl84/distinfo
index 2f4f5e952797..1acf7e85a99e 100644
--- a/lang/tcl84/distinfo
+++ b/lang/tcl84/distinfo
@@ -1,2 +1 @@
-MD5 (tcl8.3.1.tar.gz) = 1834811e47421892584830c22e3ff002
-MD5 (tcl8.3.1plus.patch.gz) = 96db8dcb482464deff8ad676fd660dba
+MD5 (tcl8.3.2.tar.gz) = 971d9e22fecc486d3520841aac1ec588
diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa
index f7e0dc92f180..c3d335611b6c 100644
--- a/lang/tcl84/files/patch-aa
+++ b/lang/tcl84/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Wed May 10 16:38:48 2000
-+++ Makefile.in	Wed May 10 16:46:00 2000
+--- Makefile.in.orig	Tue Aug  8 12:17:11 2000
++++ Makefile.in	Sat Feb 24 16:17:52 2001
 @@ -53,7 +53,9 @@
  SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TCL_LIBRARY)
  
@@ -20,17 +20,20 @@
  
  # To disable ANSI-C procedure prototypes reverse the comment characters
  # on the following lines:
-@@ -394,7 +396,7 @@
+@@ -397,7 +399,7 @@
  
  all: binaries libraries doc
  
--binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh Tcltest${SHLIB_SUFFIX}
-+binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) libtcl${SHORT_TCL_VER}.a tclsh Tcltest${SHLIB_SUFFIX}
+-binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
++binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) libtcl${SHORT_TCL_VER}.a tclsh
  
  libraries:
  
-@@ -407,6 +409,11 @@
+@@ -408,8 +410,14 @@
+ ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
+ 	rm -f ${TCL_LIB_FILE}
  	@MAKE_LIB@
++	@ln -sf $(TCL_LIB_FILE) ./libtcl${SHORT_TCL_VER}.so
  	$(RANLIB) ${TCL_LIB_FILE}
  
 +libtcl${SHORT_TCL_VER}.a: ${OBJS}
@@ -41,14 +44,11 @@
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f ${STUB_LIB_FILE}
  	@MAKE_STUB_LIB@
-@@ -520,11 +527,16 @@
+@@ -523,8 +531,13 @@
  	    fi
  	@echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
 +	@ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so
- 	@echo "Installing Tcltest${SHLIB_SUFFIX} to $(SCRIPT_INSTALL_DIR)/tcltest1.0"
- 	@$(INSTALL_DATA) Tcltest${SHLIB_SUFFIX} \
- 		$(SCRIPT_INSTALL_DIR)/tcltest1.0/Tcltest${SHLIB_SUFFIX}
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
 +	@echo "Installing libtcl${SHORT_TCL_VER}.a"
@@ -58,7 +58,7 @@
  	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
  	    echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
-@@ -532,8 +544,9 @@
+@@ -532,8 +545,9 @@
  	    fi
  	@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
  	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
@@ -70,7 +70,7 @@
  	@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(TCL_STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
-@@ -541,7 +554,8 @@
+@@ -541,7 +555,8 @@
  	    fi
  
  install-libraries: libraries
@@ -80,7 +80,7 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
-@@ -563,10 +577,16 @@
+@@ -563,10 +578,16 @@
  	    chmod +x $(SRC_DIR)/install-sh; \
  	    fi
  	@echo "Installing header files";
@@ -99,7 +99,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 \
-@@ -607,7 +627,6 @@
+@@ -607,7 +628,6 @@
  	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking top-level (.1) docs";
@@ -107,7 +107,7 @@
  	@echo "Installing C API (.3) docs";
  	@cd $(TOP_DIR)/doc; for i in *.3; \
  	    do \
-@@ -617,7 +636,6 @@
+@@ -617,7 +637,6 @@
  	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking C API (.3) docs";
@@ -115,7 +115,7 @@
  	@echo "Installing command (.n) docs";
  	@cd $(TOP_DIR)/doc; for i in *.n; \
  	    do \
-@@ -627,7 +645,14 @@
+@@ -627,7 +646,14 @@
  	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking command (.n) docs";
diff --git a/lang/tcl84/files/patch-ab b/lang/tcl84/files/patch-ab
index 3a52b40a9af3..1899ae9dfbc2 100644
--- a/lang/tcl84/files/patch-ab
+++ b/lang/tcl84/files/patch-ab
@@ -1,6 +1,6 @@
---- configure.orig	Mon May  1 10:07:11 2000
-+++ configure	Mon May  1 10:08:59 2000
-@@ -4902,7 +4902,7 @@
+--- configure.orig	Tue Aug  8 15:17:11 2000
++++ configure	Tue Dec  5 11:37:50 2000
+@@ -5032,7 +5032,7 @@
  	    LDFLAGS="-Wl,-Bexport"
  	    LD_SEARCH_FLAGS=""
  	    ;;
@@ -9,11 +9,11 @@
  	    # Not available on all versions:  check for include file.
  	    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-@@ -4986,18 +4986,8 @@
+@@ -5116,18 +5116,8 @@
  	    # FreeBSD doesn't handle version numbers with dots.
  
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
  	    TCL_LIB_VERSIONS_OK=nodots
 -	    ;;
 -	FreeBSD-*)
@@ -22,7 +22,7 @@
 -	    SHLIB_LD="ld -Bshareable -x"
 -	    SHLIB_LD_LIBS=""
 -	    SHLIB_SUFFIX=".so"
--	    DL_OBJS=""
+-	    DL_OBJS="tclLoadDl.o"
 -	    DL_LIBS=""
 -	    LDFLAGS="-export-dynamic"
 -	    LD_SEARCH_FLAGS=""
diff --git a/lang/tcl84/pkg-plist b/lang/tcl84/pkg-plist
index e39333fe84e6..eef7e02c70e3 100644
--- a/lang/tcl84/pkg-plist
+++ b/lang/tcl84/pkg-plist
@@ -5,7 +5,6 @@ include/tcl%%TCL_VER%%/generic/regex.h
 include/tcl%%TCL_VER%%/generic/regguts.h
 include/tcl%%TCL_VER%%/generic/tcl.h
 include/tcl%%TCL_VER%%/generic/tclCompile.h
-include/tcl%%TCL_VER%%/generic/tclCompileDecls.h
 include/tcl%%TCL_VER%%/generic/tclDecls.h
 include/tcl%%TCL_VER%%/generic/tclInitScript.h
 include/tcl%%TCL_VER%%/generic/tclInt.h
@@ -15,6 +14,7 @@ include/tcl%%TCL_VER%%/generic/tclMath.h
 include/tcl%%TCL_VER%%/generic/tclPlatDecls.h
 include/tcl%%TCL_VER%%/generic/tclPort.h
 include/tcl%%TCL_VER%%/generic/tclRegexp.h
+include/tcl%%TCL_VER%%/generic/tclIO.h
 include/tcl%%TCL_VER%%/tcl.h
 include/tcl%%TCL_VER%%/tclDecls.h
 include/tcl%%TCL_VER%%/unix/tclUnixPort.h
@@ -56,14 +56,12 @@ lib/tcl%%TCL_VER%%/encoding/cp936.enc
 lib/tcl%%TCL_VER%%/encoding/cp949.enc
 lib/tcl%%TCL_VER%%/encoding/cp950.enc
 lib/tcl%%TCL_VER%%/encoding/dingbats.enc
-lib/tcl%%TCL_VER%%/encoding/ebcdic.enc
 lib/tcl%%TCL_VER%%/encoding/euc-cn.enc
 lib/tcl%%TCL_VER%%/encoding/euc-jp.enc
 lib/tcl%%TCL_VER%%/encoding/euc-kr.enc
 lib/tcl%%TCL_VER%%/encoding/gb12345.enc
 lib/tcl%%TCL_VER%%/encoding/gb1988.enc
 lib/tcl%%TCL_VER%%/encoding/gb2312.enc
-lib/tcl%%TCL_VER%%/encoding/ibm1047.enc
 lib/tcl%%TCL_VER%%/encoding/iso2022-jp.enc
 lib/tcl%%TCL_VER%%/encoding/iso2022-kr.enc
 lib/tcl%%TCL_VER%%/encoding/iso2022.enc
@@ -81,7 +79,6 @@ lib/tcl%%TCL_VER%%/encoding/jis0208.enc
 lib/tcl%%TCL_VER%%/encoding/jis0212.enc
 lib/tcl%%TCL_VER%%/encoding/koi8-r.enc
 lib/tcl%%TCL_VER%%/encoding/ksc5601.enc
-lib/tcl%%TCL_VER%%/encoding/latin.enc
 lib/tcl%%TCL_VER%%/encoding/macCentEuro.enc
 lib/tcl%%TCL_VER%%/encoding/macCroatian.enc
 lib/tcl%%TCL_VER%%/encoding/macCyrillic.enc
@@ -114,7 +111,6 @@ lib/tcl%%TCL_VER%%/safe.tcl
 lib/tcl%%TCL_VER%%/tclAppInit.c
 lib/tcl%%TCL_VER%%/tclConfig.sh
 lib/tcl%%TCL_VER%%/tclIndex
-lib/tcl%%TCL_VER%%/tcltest1.0/Tcltest.so
 lib/tcl%%TCL_VER%%/tcltest1.0/pkgIndex.tcl
 lib/tcl%%TCL_VER%%/tcltest1.0/tcltest.tcl
 lib/tcl%%TCL_VER%%/word.tcl