5 files changed, 94 insertions, 65 deletions

diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index 8ec09ffd1a1f..554dff45ff6a 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	tcl
-PORTVERSION=	8.4a3
-PORTREVISION=	1
+PORTVERSION=	8.4a4
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
-DISTNAME=	${PORTNAME}${PORTVERSION}
+DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
 MAINTAINER=	dinoex@FreeBSD.org
 
 NO_LATEST_LINK=	yes
 PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
-WRKSRC=		${WRKDIR}/${DISTNAME}/unix
+WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
@@ -40,14 +39,15 @@ MAN3=	Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \
 	DetachPids.3 DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 DumpActiveMemory.3 \
 	Encoding.3 Eval.3 Environment.3 Exit.3 ExprLong.3 ExprLongObj.3 \
 	FileSystem.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 Macintosh.3 Object.3 \
-	ObjectType.3 OpenFileChnl.3 OpenTcp.3 Panic.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 Signal.3 Sleep.3 \
-	SourceRCFile.3 SplitList.3 SplitPath.3 StaticPkg.3 StrMatch.3 \
-	StringObj.3 SubstObj.3 TCL_MEM_DEBUG.3 Tcl_Main.3 Thread.3 ToUpper.3 \
-	TraceVar.3 Translate.3 UniCharIsAlpha.3 UpVar.3 Utf.3 WrongNumArgs.3
+	GetTime.3 GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 Init.3 \
+	InitStubs.3 IntObj.3 Interp.3 LinkVar.3 ListObj.3 Notifier.3 \
+	Macintosh.3 Object.3 ObjectType.3 OpenFileChnl.3 OpenTcp.3 Panic.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 Signal.3 Sleep.3 SourceRCFile.3 SplitList.3 SplitPath.3 \
+	StdChannels.3 StaticPkg.3 StrMatch.3 StringObj.3 SubstObj.3 \
+	TCL_MEM_DEBUG.3 Tcl_Main.3 Thread.3 ToUpper.3 TraceVar.3 Translate.3 \
+	UniCharIsAlpha.3 UpVar.3 Utf.3 WrongNumArgs.3
 
 MANN=	Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \
 	catch.n cd.n clock.n close.n concat.n continue.n dde.n encoding.n \
@@ -55,13 +55,13 @@ MANN=	Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \
 	fcopy.n file.n fileevent.n filename.n flush.n for.n foreach.n \
 	format.n gets.n glob.n global.n history.n http.n if.n incr.n info.n \
 	interp.n join.n lappend.n library.n lindex.n linsert.n list.n \
-	llength.n load.n lrange.n lreplace.n lsearch.n lsort.n memory.n \
-	msgcat.n namespace.n open.n package.n packagens.n pid.n pkgMkIndex.n \
-	proc.n puts.n pwd.n re_syntax.n read.n regexp.n registry.n regsub.n \
-	rename.n resource.n return.n safe.n scan.n seek.n set.n socket.n \
-	source.n split.n string.n subst.n switch.n tcltest.n tclvars.n tell.n \
-	time.n trace.n unknown.n unset.n update.n uplevel.n upvar.n \
-	variable.n vwait.n while.n
+	llength.n load.n lrange.n lreplace.n lsearch.n lset.n lsort.n \
+	memory.n  msgcat.n namespace.n open.n package.n packagens.n pid.n \
+	pkgMkIndex.n proc.n puts.n pwd.n re_syntax.n read.n regexp.n \
+	registry.n regsub.n rename.n resource.n return.n safe.n scan.n seek.n \
+	set.n socket.n source.n split.n string.n subst.n switch.n tcltest.n \
+	tclvars.n tell.n time.n trace.n unknown.n unset.n update.n uplevel.n \
+	upvar.n variable.n vwait.n while.n
 
 # MLINKS generated via  awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks
 MLINKS=	Access.3 Tcl_Access.3 \
@@ -78,6 +78,11 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	Alloc.3 Tcl_Realloc.3 \
 	Alloc.3 Tcl_AttemptAlloc.3 \
 	Alloc.3 Tcl_AttemptRealloc.3 \
+	Alloc.3 ckalloc.3 \
+	Alloc.3 ckfree.3 \
+	Alloc.3 ckrealloc.3 \
+	Alloc.3 attemptckalloc.3 \
+	Alloc.3 attemptckrealloc.3 \
 	AllowExc.3 Tcl_AllowExceptions.3 \
 	AppInit.3 Tcl_AppInit.3 \
 	AssocData.3 Tcl_GetAssocData.3 \
@@ -102,6 +107,7 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	ChnlStack.3 Tcl_StackChannel.3 \
 	ChnlStack.3 Tcl_UnstackChannel.3 \
 	ChnlStack.3 Tcl_GetStackedChannel.3 \
+	ChnlStack.3 Tcl_GetTopChannel.3 \
 	CmdCmplt.3 Tcl_CommandComplete.3 \
 	Concat.3 Tcl_Concat.3 \
 	CrtChannel.3 Tcl_CreateChannel.3 \
@@ -135,6 +141,7 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	CrtChannel.3 Tcl_IsChannelExisting.3 \
 	CrtChannel.3 Tcl_ClearChannelHandlers.3 \
 	CrtChannel.3 Tcl_GetChannelThread.3 \
+	CrtChannel.3 Tcl_ChannelBuffered.3 \
 	CrtChnlHdlr.3 Tcl_CreateChannelHandler.3 \
 	CrtChnlHdlr.3 Tcl_DeleteChannelHandler.3 \
 	CrtCloseHdlr.3 Tcl_CreateCloseHandler.3 \
@@ -152,7 +159,9 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	CrtObjCmd.3 Tcl_DeleteCommand.3 \
 	CrtObjCmd.3 Tcl_DeleteCommandFromToken.3 \
 	CrtObjCmd.3 Tcl_GetCommandInfo.3 \
+	CrtObjCmd.3 Tcl_GetCommandInfoFromToken.3 \
 	CrtObjCmd.3 Tcl_SetCommandInfo.3 \
+	CrtObjCmd.3 Tcl_SetCommandInfoFromToken.3 \
 	CrtObjCmd.3 Tcl_GetCommandName.3 \
 	CrtSlave.3 Tcl_IsSafe.3 \
 	CrtSlave.3 Tcl_MakeSafe.3 \
@@ -169,6 +178,7 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	CrtTimerHdlr.3 Tcl_CreateTimerHandler.3 \
 	CrtTimerHdlr.3 Tcl_DeleteTimerHandler.3 \
 	CrtTrace.3 Tcl_CreateTrace.3 \
+	CrtTrace.3 Tcl_CreateObjTrace.3 \
 	CrtTrace.3 Tcl_DeleteTrace.3 \
 	DString.3 Tcl_DStringInit.3 \
 	DString.3 Tcl_DStringAppend.3 \
@@ -178,6 +188,7 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	DString.3 Tcl_DStringLength.3 \
 	DString.3 Tcl_DStringValue.3 \
 	DString.3 Tcl_DStringSetLength.3 \
+	DString.3 Tcl_DStringTrunc.3 \
 	DString.3 Tcl_DStringFree.3 \
 	DString.3 Tcl_DStringResult.3 \
 	DString.3 Tcl_DStringGetResult.3 \
@@ -236,6 +247,9 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	FileSystem.3 Tcl_FSRegister.3 \
 	FileSystem.3 Tcl_FSUnregister.3 \
 	FileSystem.3 Tcl_FSData.3 \
+	FileSystem.3 Tcl_FSMountsChanged.3 \
+	FileSystem.3 Tcl_FSGetFileSystemForPath.3 \
+	FileSystem.3 Tcl_FSGetPathType.3 \
 	FileSystem.3 Tcl_FSCopyFile.3 \
 	FileSystem.3 Tcl_FSCopyDirectory.3 \
 	FileSystem.3 Tcl_FSCreateDirectory.3 \
@@ -246,7 +260,7 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	FileSystem.3 Tcl_FSEvalFile.3 \
 	FileSystem.3 Tcl_FSLoadFile.3 \
 	FileSystem.3 Tcl_FSMatchInDirectory.3 \
-	FileSystem.3 Tcl_FSReadlink.3 \
+	FileSystem.3 Tcl_FSLink.3 \
 	FileSystem.3 Tcl_FSLstat.3 \
 	FileSystem.3 Tcl_FSUtime.3 \
 	FileSystem.3 Tcl_FSFileAttrsGet.3 \
@@ -266,9 +280,11 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	FileSystem.3 Tcl_FSConvertToPathType.3 \
 	FileSystem.3 Tcl_FSGetInternalRep.3 \
 	FileSystem.3 Tcl_FSGetTranslatedPath.3 \
+	FileSystem.3 Tcl_FSGetTranslatedStringPath.3 \
 	FileSystem.3 Tcl_FSNewNativePath.3 \
 	FileSystem.3 Tcl_FSGetNativePath.3 \
 	FileSystem.3 Tcl_FSFileSystemInfo.3 \
+	FileSystem.3 Tcl_AllocStatBuf.3 \
 	FindExec.3 Tcl_FindExecutable.3 \
 	FindExec.3 Tcl_GetNameOfExecutable.3 \
 	GetCwd.3 Tcl_GetCwd.3 \
@@ -282,6 +298,7 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	GetOpnFl.3 Tcl_GetOpenFile.3 \
 	GetStdChan.3 Tcl_GetStdChannel.3 \
 	GetStdChan.3 Tcl_SetStdChannel.3 \
+	GetTime.3 Tcl_GetTime.3 \
 	GetVersion.3 Tcl_GetVersion.3 \
 	Hash.3 Tcl_InitHashTable.3 \
 	Hash.3 Tcl_InitCustomHashTable.3 \
@@ -300,10 +317,13 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	InitStubs.3 Tcl_InitStubs.3 \
 	IntObj.3 Tcl_NewIntObj.3 \
 	IntObj.3 Tcl_NewLongObj.3 \
+	IntObj.3 Tcl_NewWideIntObj.3 \
 	IntObj.3 Tcl_SetIntObj.3 \
 	IntObj.3 Tcl_SetLongObj.3 \
+	IntObj.3 Tcl_SetWideIntObj.3 \
 	IntObj.3 Tcl_GetIntFromObj.3 \
 	IntObj.3 Tcl_GetLongFromObj.3 \
+	IntObj.3 Tcl_GetWideIntFromObj.3 \
 	Interp.3 Tcl_Interp.3 \
 	LinkVar.3 Tcl_LinkVar.3 \
 	LinkVar.3 Tcl_UnlinkVar.3 \
@@ -376,7 +396,10 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	OpenFileChnl.3 Tcl_Eof.3 \
 	OpenFileChnl.3 Tcl_InputBlocked.3 \
 	OpenFileChnl.3 Tcl_InputBuffered.3 \
+	OpenFileChnl.3 Tcl_OutputBuffered.3 \
 	OpenFileChnl.3 Tcl_Ungets.3 \
+	OpenFileChnl.3 Tcl_ReadRaw.3 \
+	OpenFileChnl.3 Tcl_WriteRaw.3 \
 	OpenTcp.3 Tcl_OpenTcpClient.3 \
 	OpenTcp.3 Tcl_MakeTcpClientChannel.3 \
 	OpenTcp.3 Tcl_OpenTcpServer.3 \
@@ -393,6 +416,7 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	ParseCmd.3 Tcl_ParseVar.3 \
 	ParseCmd.3 Tcl_FreeParse.3 \
 	ParseCmd.3 Tcl_EvalTokens.3 \
+	ParseCmd.3 Tcl_EvalTokensStandard.3 \
 	PkgRequire.3 Tcl_PkgRequire.3 \
 	PkgRequire.3 Tcl_PkgRequireEx.3 \
 	PkgRequire.3 Tcl_PkgPresent.3 \
@@ -454,6 +478,7 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	SplitPath.3 Tcl_JoinPath.3 \
 	SplitPath.3 Tcl_GetPathType.3 \
 	StaticPkg.3 Tcl_StaticPackage.3 \
+	StdChannels.3 Tcl_StandardChannels.3 \
 	StrMatch.3 Tcl_StringMatch.3 \
 	StrMatch.3 Tcl_StringCaseMatch.3 \
 	StringObj.3 Tcl_NewStringObj.3 \
diff --git a/lang/tcl84/distinfo b/lang/tcl84/distinfo
index f8e0362295b8..dfa623f55ce8 100644
--- a/lang/tcl84/distinfo
+++ b/lang/tcl84/distinfo
@@ -1 +1 @@
-MD5 (tcl8.4a3.tar.gz) = ef95dad3f957a7216e09e5b7213a9d9b
+MD5 (tcl8.4a4-src.tar.gz) = 50e4634c9167d3071e98cf88d6f345d5
diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa
index 399f447379a9..0ff89d9eade2 100644
--- a/lang/tcl84/files/patch-aa
+++ b/lang/tcl84/files/patch-aa
@@ -1,5 +1,5 @@
---- ../unix/Makefile.in.orig	Tue Aug  7 05:06:23 2001
-+++ ../unix/Makefile.in	Sat Nov 10 16:22:33 2001
+--- Makefile.in.orig	Sat Oct 20 02:24:15 2001
++++ Makefile.in	Sat Oct 20 11:21:50 2001
 @@ -53,7 +53,9 @@
  SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TCL_LIBRARY)
  
@@ -20,7 +20,7 @@
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -404,7 +406,8 @@
+@@ -407,7 +409,8 @@
  
  all: binaries libraries doc
  
@@ -30,12 +30,14 @@
  
  libraries:
  
-@@ -415,8 +418,14 @@
+@@ -418,10 +421,16 @@
  ${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}
+ 	if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
+ 		$(RANLIB) ${TCL_LIB_FILE}; \
+ 	fi
  
 +libtcl${SHORT_TCL_VER}.a: ${OBJS}
 +	rm -f libtcl${SHORT_TCL_VER}.a
@@ -45,23 +47,25 @@
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f ${STUB_LIB_FILE}
  	@MAKE_STUB_LIB@
-@@ -542,6 +551,7 @@
+@@ -539,10 +548,16 @@
  	    fi
  	@echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
- 	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
+ 	@$(INSTALL_LIBRARY) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
 +	@ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so
- 	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
- 	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
- 	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
-@@ -549,10 +559,16 @@
- 	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
- 			$(LIB_INSTALL_DIR)/$(TCL_EXP_FILE); \
+ 	@if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
+ 	    (cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)); \
  	    fi
+ 	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
 +	@echo "Installing libtcl${SHORT_TCL_VER}.a"
 +	@$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \
 +		$(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a
 +	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl${SHORT_TCL_VER}.a)
 +	@chmod 555 $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a
+ 	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
+ 	    echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
+ 	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
+@@ -550,8 +565,9 @@
+ 	    fi
  	@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)/"
@@ -71,8 +75,8 @@
 +	@$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh
  	@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(TCL_STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
- 	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
-@@ -560,7 +576,8 @@
+ 	    $(INSTALL_LIBRARY) $(STUB_LIB_FILE) \
+@@ -559,7 +575,8 @@
  	    fi
  
  install-libraries: libraries
@@ -82,7 +86,7 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
-@@ -582,12 +599,18 @@
+@@ -581,11 +598,16 @@
  	    chmod +x $(SRC_DIR)/install-sh; \
  	    fi
  	@echo "Installing header files";
@@ -100,11 +104,9 @@
 +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h
 +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h
  	@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 \
- 	    $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \
-@@ -644,7 +667,6 @@
+@@ -643,7 +665,6 @@
  	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking top-level (.1) docs";
@@ -112,7 +114,7 @@
  	@echo "Installing C API (.3) docs";
  	@cd $(TOP_DIR)/doc; for i in *.3; \
  	    do \
-@@ -654,7 +676,6 @@
+@@ -653,7 +674,6 @@
  	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking C API (.3) docs";
@@ -120,7 +122,7 @@
  	@echo "Installing command (.n) docs";
  	@cd $(TOP_DIR)/doc; for i in *.n; \
  	    do \
-@@ -664,7 +685,14 @@
+@@ -663,7 +683,14 @@
  	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
  	    done;
  	@echo "Cross-linking command (.n) docs";
diff --git a/lang/tcl84/files/patch-configure b/lang/tcl84/files/patch-configure
index 7b77b0141bba..e4a74eea68f5 100644
--- a/lang/tcl84/files/patch-configure
+++ b/lang/tcl84/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Aug  7 05:06:23 2001
-+++ configure	Sun Jan 27 14:54:59 2002
-@@ -4769,7 +4769,7 @@
+--- configure.orig	Wed Mar  6 09:51:35 2002
++++ configure	Thu Mar  7 07:24:23 2002
+@@ -5251,7 +5251,7 @@
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
@@ -9,32 +9,31 @@
      ECHO_VERSION='`echo ${VERSION}`'
      TCL_LIB_VERSIONS_OK=ok
      CFLAGS_DEBUG=-g
-@@ -5300,13 +5300,17 @@
+@@ -5878,22 +5878,23 @@
  	FreeBSD-*)
  	    # FreeBSD 3.* and greater have ELF.
  	    SHLIB_CFLAGS="-fPIC"
 -	    SHLIB_LD="ld -Bshareable -x"
 +	    TCL_SHLIB_LD_EXTRAS="-soname \$@"
 +	    SHLIB_LD="ld -shared -x"
- 	    SHLIB_LD_LIBS=""
+ 	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
 -	    LDFLAGS="-export-dynamic"
 +	    LDFLAGS=""
  	    LD_SEARCH_FLAGS=""
-+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${DBGX}.so.1'
-+	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	NEXTSTEP-*)
- 	    SHLIB_CFLAGS=""
-@@ -5985,7 +5989,7 @@
-     if test "x$DL_OBJS" = "xtclLoadAout.o"; then
- 	MAKE_LIB="\${STLIB_LD} \$@ \${OBJS}"
-     else
--	MAKE_LIB="\${SHLIB_LD} -o \$@ \${OBJS} ${SHLIB_LD_LIBS}"
-+	MAKE_LIB="\${SHLIB_LD} \${TCL_SHLIB_LD_EXTRAS} -o \$@ \${OBJS} ${SHLIB_LD_LIBS}"
- 	RANLIB=":"
-     fi
- else
+ 	    if test "${TCL_THREADS}" = "1" ; then
+ 		EXTRA_CFLAGS="-pthread"
+ 	    	LDFLAGS="$LDFLAGS -pthread"
+ 	    fi
+ 	    case $system in
+-	    FreeBSD-3.*)
++	    FreeBSD-*)
+ 	    	# FreeBSD-3 doesn't handle version numbers with dots.
+ 	    	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+-	    	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++	        SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${DBGX}.so.1'
+ 	    	TCL_LIB_VERSIONS_OK=nodots
+ 		;;
+ 	    esac
diff --git a/lang/tcl84/pkg-plist b/lang/tcl84/pkg-plist
index 99e38b240b6c..ab482af838d6 100644
--- a/lang/tcl84/pkg-plist
+++ b/lang/tcl84/pkg-plist
@@ -56,6 +56,7 @@ 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
@@ -78,6 +79,7 @@ lib/tcl%%TCL_VER%%/encoding/iso8859-10.enc
 lib/tcl%%TCL_VER%%/encoding/iso8859-13.enc
 lib/tcl%%TCL_VER%%/encoding/iso8859-14.enc
 lib/tcl%%TCL_VER%%/encoding/iso8859-15.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-16.enc
 lib/tcl%%TCL_VER%%/encoding/jis0201.enc
 lib/tcl%%TCL_VER%%/encoding/jis0208.enc
 lib/tcl%%TCL_VER%%/encoding/jis0212.enc
@@ -98,11 +100,12 @@ lib/tcl%%TCL_VER%%/encoding/macTurkish.enc
 lib/tcl%%TCL_VER%%/encoding/macUkraine.enc
 lib/tcl%%TCL_VER%%/encoding/shiftjis.enc
 lib/tcl%%TCL_VER%%/encoding/symbol.enc
+lib/tcl%%TCL_VER%%/encoding/tis-620.enc
 lib/tcl%%TCL_VER%%/history.tcl
 lib/tcl%%TCL_VER%%/http1.0/http.tcl
 lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl
-lib/tcl%%TCL_VER%%/http2.3/http.tcl
-lib/tcl%%TCL_VER%%/http2.3/pkgIndex.tcl
+lib/tcl%%TCL_VER%%/http2.4/http.tcl
+lib/tcl%%TCL_VER%%/http2.4/pkgIndex.tcl
 lib/tcl%%TCL_VER%%/init.tcl
 lib/tcl%%TCL_VER%%/ldAix
 lib/tcl%%TCL_VER%%/ldAout.tcl
@@ -122,7 +125,7 @@ lib/tcl%%TCL_VER%%/word.tcl
 @dirrm lib/tcl%%TCL_VER%%/tcltest2.0
 @dirrm lib/tcl%%TCL_VER%%/opt0.4
 @dirrm lib/tcl%%TCL_VER%%/msgcat1.2
-@dirrm lib/tcl%%TCL_VER%%/http2.3
+@dirrm lib/tcl%%TCL_VER%%/http2.4
 @dirrm lib/tcl%%TCL_VER%%/http1.0
 @dirrm lib/tcl%%TCL_VER%%/encoding
 @dirrm lib/tcl%%TCL_VER%%