5 files changed, 306 insertions, 265 deletions

diff --git a/lang/tcl82/Makefile b/lang/tcl82/Makefile
index 9c8bf656b4ab..ee4d27fbc1d5 100644
--- a/lang/tcl82/Makefile
+++ b/lang/tcl82/Makefile
@@ -1,15 +1,15 @@
-# New ports collection makefile for:	tcl8.1.1
-# Version required:	8.1.1
+# New ports collection makefile for:	tcl8.2.0
+# Version required:	8.2.0
 # Date created:		19 August 1997
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcl8.1.1
-PKGNAME=	tcl-8.1.1
-CATEGORIES=	lang tcl81
-MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
+DISTNAME=	tcl8.2.0
+PKGNAME=	tcl-8.2.0
+CATEGORIES=	lang tcl82
+MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_2/
 
 MAINTAINER=	jseger@FreeBSD.org
 
@@ -23,22 +23,25 @@ CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 PKGINSTALL=     ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh
 
+PLIST_SUB=	TCL_VER=8.2 SHORT_TCL_VER=82
+
 MAN1=	tclsh.1
 
 MAN3=	Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \
 	Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.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 GetIndex.3 GetInt.3 \
-	GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.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 SplitList.3 SplitPath.3 StaticPkg.3 StrMatch.3 \
-	StringObj.3 Tcl_InitStubs.3 Tcl_Main.3 TclInitStubs.3 Thread.3 \
-	ToUpper.3 TraceVar.3 Translate.3 UpVar.3 Utf.3 WrongNumArgs.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 GetIndex.3 \
+	GetInt.3 GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.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 SplitList.3 SplitPath.3 \
+	StaticPkg.3 StrMatch.3 StringObj.3 Tcl_InitStubs.3 Tcl_Main.3 \
+	TclInitStubs.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 \
 	catch.n cd.n clock.n close.n concat.n continue.n dde.n encoding.n \
@@ -48,10 +51,10 @@ MANN=	Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.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 msgcat.n \
 	namespace.n open.n package.n pid.n pkgMkIndex.n proc.n puts.n pwd.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 tclvars.n tell.n time.n trace.n unknown.n unset.n update.n \
-	uplevel.n upvar.n variable.n vwait.n while.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 \
@@ -362,11 +365,9 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	pkgMkIndex.n pkg_mkIndex.n \
 	safe.n Safe\Base.n
 
-MANCOMPRESSED=	yes
-
 .include <bsd.port.pre.mk>
 
-post-extract:   
+post-extract:
 	${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \
 	      ${WRKDIR}/${DISTNAME}/doc/Tcl_InitStubs.3
 post-install:
diff --git a/lang/tcl82/distinfo b/lang/tcl82/distinfo
index 8dad15681844..6550a1b09da9 100644
--- a/lang/tcl82/distinfo
+++ b/lang/tcl82/distinfo
@@ -1 +1 @@
-MD5 (tcl8.1.1.tar.gz) = fd85414ffca58be880a40f1e699653b2
+MD5 (tcl8.2.0.tar.gz) = acaa5113663ed3fc10b8ae5baf9e904d
diff --git a/lang/tcl82/files/patch-aa b/lang/tcl82/files/patch-aa
index b158373c4290..05f24146fb78 100644
--- a/lang/tcl82/files/patch-aa
+++ b/lang/tcl82/files/patch-aa
@@ -1,26 +1,35 @@
---- Makefile.in.orig	Fri Apr 30 08:23:33 1999
-+++ Makefile.in	Tue May 11 01:48:45 1999
-@@ -55,7 +55,9 @@
- BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
+--- Makefile.in.orig	Fri Aug 13 18:02:47 1999
++++ Makefile.in	Sun Sep  5 10:44:32 1999
+@@ -48,7 +48,9 @@
+ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
  
  # Directory in which to install the include file tcl.h:
--INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
-+INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION)
-+GENERIC_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION)/generic
-+UNIX_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION)/unix
+-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION)
++GENERIC_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PREFIX)/include/tcl$(VERSION)/generic
++UNIX_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PREFIX)/include/tcl$(VERSION)/unix
  
  # Top-level directory in which to install manual entries:
- MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
-@@ -86,7 +88,7 @@
+ MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
+@@ -65,7 +67,7 @@
+ MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann
+ 
+ # Directory in which to install the include file tcl.h:
+-INCLUDE_INSTALL_DIR = @includedir@
++#INCLUDE_INSTALL_DIR = @includedir@
+ 
+ # Package search path.
+ TCL_PACKAGE_PATH	= @TCL_PACKAGE_PATH@
+@@ -85,7 +87,7 @@
  #CFLAGS = 		$(CFLAGS_DEBUG)
  #CFLAGS = 		$(CFLAGS_OPTIMIZE)
  #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
 -CFLAGS = 		@CFLAGS@
 +CFLAGS? = 		@CFLAGS@
  
- 
  # To disable ANSI-C procedure prototypes reverse the comment characters
-@@ -161,7 +163,7 @@
+ # on the following lines:
+@@ -159,7 +161,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
@@ -29,53 +38,45 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -391,15 +393,21 @@
+@@ -386,7 +388,7 @@
+ 
+ all: binaries libraries doc
  
- SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(STUB_SRCS)
+-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) libtcl82.a tclsh
  
--all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) tclsh
-+all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) libtcl81.a tclsh
+ libraries:
  
- # The following target is configured by autoconf to generate either
- # a shared library or non-shared library for Tcl.
+@@ -397,8 +399,14 @@
  ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
  	rm -f ${TCL_LIB_FILE}
  	@MAKE_LIB@
-+	ln -sf ${TCL_LIB_FILE} libtcl81.so
++	ln -sf ${TCL_LIB_FILE} libtcl82.so
  	$(RANLIB) ${TCL_LIB_FILE}
  
-+libtcl81.a: ${OBJS}
-+	rm -f libtcl81.a
-+	ar cr libtcl81.a ${OBJS}	
-+	$(RANLIB) libtcl81.a
++libtcl82.a: ${OBJS}
++	rm -f libtcl82.a
++	ar cr libtcl82.a ${OBJS}
++	$(RANLIB) libtcl82.a
 +
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f ${STUB_LIB_FILE}
  	@MAKE_STUB_LIB@
-@@ -499,7 +507,7 @@
- # possible (e.g. if installing as root).
- 
- install-binaries: $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \
--		tclsh
-+		libtcl81.a tclsh
- 	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
- 	    do \
- 	    if [ ! -d $$i ] ; then \
-@@ -511,8 +519,13 @@
- 	    done;
+@@ -504,8 +512,13 @@
  	@echo "Installing $(TCL_LIB_FILE)"
+ 	chmod +x $(SRC_DIR)/install-sh
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
-+	@ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl81.so
++	@ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl82.so
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
-+	@echo "Installing libtcl81.a"
-+	@$(INSTALL_DATA) libtcl81.a $(LIB_INSTALL_DIR)/libtcl81.a
-+	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl81.a)
-+	@chmod 555 $(LIB_INSTALL_DIR)/libtcl81.a
++	@echo "Installing libtcl82.a"
++	@$(INSTALL_DATA) libtcl82.a $(LIB_INSTALL_DIR)/libtcl82.a
++	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl82.a)
++	@chmod 555 $(LIB_INSTALL_DIR)/libtcl82.a
  	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
  	    echo "Installing $(TCL_EXP_FILE)"; \
  	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
-@@ -521,7 +534,8 @@
+@@ -514,7 +527,8 @@
  	@echo "Installing tclsh"
  	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
  	@echo "Installing tclConfig.sh"
@@ -85,7 +86,7 @@
  	@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(TCL_STUB_LIB_FILE)"; \
  	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
-@@ -529,8 +543,8 @@
+@@ -522,8 +536,8 @@
  	    fi
  
  install-libraries:
@@ -96,10 +97,10 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
-@@ -548,11 +562,16 @@
- 		else true; \
+@@ -542,11 +556,20 @@
  		fi; \
  	    done;
+ 	chmod +x $(SRC_DIR)/install-sh
 -	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h ; \
 +	@echo "Installing libraries, tcl.h and other headers"
 +	@for i in $(GENERIC_DIR)/*.h ; \
@@ -108,48 +109,44 @@
 -	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
 +	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
  	    done;
++	@for i in $(UNIX_DIR)/*.h ; \
++	    do \
++	    echo "Installing $$i"; \
++	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
++	    done;
 +	@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 $(TOP_DIR)unix/tclUnixPort.h"
-+	@$(INSTALL_DATA) $(TOP_DIR)/unix/tclUnixPort.h $(UNIX_INCLUDE_INSTALL_DIR)
++
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -584,30 +603,35 @@
+@@ -579,21 +602,19 @@
  	@cd $(TOP_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
 -	    rm -f $(MAN1_INSTALL_DIR)/$$i; \
-+	    rm -f $(MAN1_INSTALL_DIR)/$$i $(MAN1_INSTALL_DIR)/$$i.gz ; \
++	    rm -f $(MAN1_INSTALL_DIR)/$$i ; \
  	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
--		    $$i > $(MAN1_INSTALL_DIR)/$$i; \
--	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
-+		    $$i | gzip -c > $(MAN1_INSTALL_DIR)/$$i.gz; \
-+	    chmod 444 $(MAN1_INSTALL_DIR)/$$i.gz; \
+ 		    $$i > $(MAN1_INSTALL_DIR)/$$i; \
+ 	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
  	    done;
 -	$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
  	@cd $(TOP_DIR)/doc; for i in *.3; \
  	    do \
  	    echo "Installing doc/$$i"; \
 -	    rm -f $(MAN3_INSTALL_DIR)/$$i; \
-+	    rm -f $(MAN3_INSTALL_DIR)/$$i $(MAN3_INSTALL_DIR)/$$i.gz ; \
++	    rm -f $(MAN3_INSTALL_DIR)/$$i ; \
  	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
--		    $$i > $(MAN3_INSTALL_DIR)/$$i; \
--	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
-+		    $$i | gzip -c > $(MAN3_INSTALL_DIR)/$$i.gz; \
-+	    chmod 444 $(MAN3_INSTALL_DIR)/$$i.gz; \
+ 		    $$i > $(MAN3_INSTALL_DIR)/$$i; \
+ 	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
  	    done;
 -	$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
  	@cd $(TOP_DIR)/doc; for i in *.n; \
  	    do \
  	    echo "Installing doc/$$i"; \
--	    rm -f $(MANN_INSTALL_DIR)/$$i; \
-+	    rm -f $(MANN_INSTALL_DIR)/$$i $(MANN_INSTALL_DIR)/$$i.gz; \
- 	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
--		    $$i > $(MANN_INSTALL_DIR)/$$i; \
--	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
-+		    $$i | gzip -c > $(MANN_INSTALL_DIR)/$$i.gz; \
-+	    chmod 444 $(MANN_INSTALL_DIR)/$$i.gz; \
+@@ -602,7 +623,14 @@
+ 		    $$i > $(MANN_INSTALL_DIR)/$$i; \
+ 	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
  	    done;
 -	$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
 +	@echo "**********"
diff --git a/lang/tcl82/files/patch-ab b/lang/tcl82/files/patch-ab
index 551b0c24760a..d3d9bb55b69f 100644
--- a/lang/tcl82/files/patch-ab
+++ b/lang/tcl82/files/patch-ab
@@ -1,59 +1,98 @@
---- configure.orig	Fri Apr 30 08:23:33 1999
-+++ configure	Tue May 11 01:25:32 1999
-@@ -4384,7 +4384,7 @@
- 	LD_FLAGS="-Wl,-Bexport"
- 	LD_SEARCH_FLAGS=""
- 	;;
--    NetBSD-*|FreeBSD-12.*|OpenBSD-*)
-+    NetBSD-*|FreeBSD-*|OpenBSD-*)
- 	# Not available on all versions:  check for include file.
- 	ac_safe=`echo "dlfcn.h" | tr './\055' '___'`
+--- configure.orig	Fri Aug 13 18:02:47 1999
++++ configure	Sat Sep  4 13:15:50 1999
+@@ -4648,7 +4648,7 @@
+     EXTRA_CFLAGS=""
+     TCL_EXPORT_FILE_SUFFIX=""
+     UNSHARED_LIB_SUFFIX=""
+-    TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
++    TCL_TRIM_DOTS=82
+     ECHO_VERSION='`echo ${VERSION}`'
+     TCL_LIB_VERSIONS_OK=ok
+     CFLAGS_DEBUG=-g
+@@ -4892,7 +4892,7 @@
+ 	    LDFLAGS="-Wl,-Bexport"
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+-	NetBSD-*|FreeBSD-[12].*|OpenBSD-*)
++	NetBSD-*|FreeBSD-*|OpenBSD-*)
+ 	    # 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
-@@ -4413,14 +4413,19 @@
+@@ -4922,16 +4922,21 @@
+ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
-   
- 	    SHLIB_CFLAGS="-fpic"
--	    SHLIB_LD="ld -Bshareable -x"
- 	    SHLIB_LD_LIBS=""
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS=""
- 	    LD_FLAGS=""
- 	    LD_SEARCH_FLAGS=""
--	    TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
-+        if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf"; then
-+            TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
-+            SHLIB_LD="ld -shared -x -soname \$@"
-+        else
-+            TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
-+            SHLIB_LD="ld -Bshareable -x"
-+        fi
- 	
+-  
+ 		SHLIB_CFLAGS="-fpic"
+-		SHLIB_LD="ld -Bshareable -x"
+ 		SHLIB_LD_LIBS=""
+ 		SHLIB_SUFFIX=".so"
+ 		DL_OBJS="tclLoadDl.o"
+ 		DL_LIBS=""
+ 		LDFLAGS=""
+ 		LD_SEARCH_FLAGS=""
+-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
++	if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then
++		echo "SHARED_LIB_SUFFIX JSEGER"
++		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
++		SHLIB_LD="ld -shared -x -soname \$@"
++	else
++		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
++		SHLIB_LD="ld -Bshareable -x"
++	fi
+ 	    
  else
    echo "$ac_t""no" 1>&6
-@@ -4443,17 +4448,6 @@
- 	TCL_UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
- 	TCL_LIB_VERSIONS_OK=nodots
-         ;;
--    FreeBSD-*)
--        # FreeBSD 3.* and greater have ELF.
--        SHLIB_CFLAGS="-fpic"
--        SHLIB_LD="ld -Bshareable -x"
--        SHLIB_LD_LIBS=""
--        SHLIB_SUFFIX=".so"
--        DL_OBJS="tclLoadDl.o"
--        DL_LIBS=""
--        LD_FLAGS=""
--        LD_SEARCH_FLAGS=""
--	;;
-     NEXTSTEP-*)
- 	SHLIB_CFLAGS=""
- 	SHLIB_LD="cc -nostdlib -r"
-@@ -5100,6 +5094,7 @@
- #       stub support.
- #--------------------------------------------------------------------
- # Replace ${VERSION} with contents of ${TCL_VERSION}
-+${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0
- eval "STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}"
- # Replace DBGX with TCL_DBGX
- eval "STUB_LIB_FILE=\"${STUB_LIB_FILE}\""
+@@ -4954,17 +4959,6 @@
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+-	FreeBSD-*)
+-	    # FreeBSD 3.* and greater have ELF.
+-	    SHLIB_CFLAGS="-fpic"
+-	    SHLIB_LD="ld -Bshareable -x"
+-	    SHLIB_LD_LIBS=""
+-	    SHLIB_SUFFIX=".so"
+-	    DL_OBJS="tclLoadDl.o"
+-	    DL_LIBS=""
+-	    LDFLAGS=""
+-	    LD_SEARCH_FLAGS=""
+-	    ;;
+ 	NEXTSTEP-*)
+ 	    SHLIB_CFLAGS=""
+ 	    SHLIB_LD="cc -nostdlib -r"
+@@ -5371,7 +5365,7 @@
+ 	SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}'
+     fi
+     if test "$UNSHARED_LIB_SUFFIX" = "" ; then
+-	UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
++	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+     fi
+ 
+     
+@@ -5628,11 +5622,7 @@
+ # up the Tcl library.
+ 
+ if test "$SHARED_BUILD" = "0" -o $TCL_NEEDS_EXP_FILE = 0; then
+-    if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+-        TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}"
+-    else
+-        TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
+-    fi
++    TCL_LIB_FLAG="-ltcl${TCL_TRIM_DOTS}\${TCL_DBGX}"
+     TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
+     TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}"
+ else
+@@ -5678,11 +5668,7 @@
+ 
+ TCL_STUB_LIB_FILE=${STUB_LIB_FILE}
+ 
+-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+-    TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
+-else
+-    TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
+-fi
++TCL_STUB_LIB_FLAG="-ltclstub${TCL_TRIM_DOTS}\${TCL_DBGX}"
+ 
+ TCL_BUILD_STUB_LIB_SPEC="-L`pwd` ${TCL_STUB_LIB_FLAG}"
+ TCL_STUB_LIB_SPEC="-L${exec_prefix}/lib ${TCL_STUB_LIB_FLAG}"
diff --git a/lang/tcl82/pkg-plist b/lang/tcl82/pkg-plist
index 8eb81b29bd43..4280ebbf81a5 100644
--- a/lang/tcl82/pkg-plist
+++ b/lang/tcl82/pkg-plist
@@ -1,123 +1,127 @@
-bin/tclsh8.1
-include/tcl8.1/generic/regcustom.h
-include/tcl8.1/generic/regerrs.h
-include/tcl8.1/generic/regex.h
-include/tcl8.1/generic/regguts.h
-include/tcl8.1/generic/tcl.h
-include/tcl8.1/generic/tclCompile.h
-include/tcl8.1/generic/tclDecls.h
-include/tcl8.1/generic/tclInitScript.h
-include/tcl8.1/generic/tclInt.h
-include/tcl8.1/generic/tclIntDecls.h
-include/tcl8.1/generic/tclIntPlatDecls.h
-include/tcl8.1/generic/tclMath.h
-include/tcl8.1/generic/tclPlatDecls.h
-include/tcl8.1/generic/tclPort.h
-include/tcl8.1/generic/tclRegexp.h
-include/tcl8.1/tcl.h
-include/tcl8.1/tclDecls.h
-include/tcl8.1/unix/tclUnixPort.h
-lib/libtcl81.a
-lib/libtcl81.so
-lib/libtcl81.so.1
-lib/libtclstub81.a
+bin/tclsh%%TCL_VER%%
+include/tcl%%TCL_VER%%/generic/regcustom.h
+include/tcl%%TCL_VER%%/generic/regerrs.h
+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/tclDecls.h
+include/tcl%%TCL_VER%%/generic/tclInitScript.h
+include/tcl%%TCL_VER%%/generic/tclInt.h
+include/tcl%%TCL_VER%%/generic/tclIntDecls.h
+include/tcl%%TCL_VER%%/generic/tclIntPlatDecls.h
+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%%/tcl.h
+include/tcl%%TCL_VER%%/tclDecls.h
+include/tcl%%TCL_VER%%/unix/tclUnixPort.h
+include/tcl%%TCL_VER%%/unix/tclUnixThrd.h
+lib/libtcl%%SHORT_TCL_VER%%.a
+lib/libtcl%%SHORT_TCL_VER%%.so
+lib/libtcl%%SHORT_TCL_VER%%.so.1
+lib/libtclstub%%SHORT_TCL_VER%%.a
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-lib/tcl8.1/auto.tcl
-lib/tcl8.1/encoding/ascii.enc
-lib/tcl8.1/encoding/big5.enc
-lib/tcl8.1/encoding/cp1250.enc
-lib/tcl8.1/encoding/cp1251.enc
-lib/tcl8.1/encoding/cp1252.enc
-lib/tcl8.1/encoding/cp1253.enc
-lib/tcl8.1/encoding/cp1254.enc
-lib/tcl8.1/encoding/cp1255.enc
-lib/tcl8.1/encoding/cp1256.enc
-lib/tcl8.1/encoding/cp1257.enc
-lib/tcl8.1/encoding/cp1258.enc
-lib/tcl8.1/encoding/cp437.enc
-lib/tcl8.1/encoding/cp737.enc
-lib/tcl8.1/encoding/cp775.enc
-lib/tcl8.1/encoding/cp850.enc
-lib/tcl8.1/encoding/cp852.enc
-lib/tcl8.1/encoding/cp855.enc
-lib/tcl8.1/encoding/cp857.enc
-lib/tcl8.1/encoding/cp860.enc
-lib/tcl8.1/encoding/cp861.enc
-lib/tcl8.1/encoding/cp862.enc
-lib/tcl8.1/encoding/cp863.enc
-lib/tcl8.1/encoding/cp864.enc
-lib/tcl8.1/encoding/cp865.enc
-lib/tcl8.1/encoding/cp866.enc
-lib/tcl8.1/encoding/cp869.enc
-lib/tcl8.1/encoding/cp874.enc
-lib/tcl8.1/encoding/cp932.enc
-lib/tcl8.1/encoding/cp936.enc
-lib/tcl8.1/encoding/cp949.enc
-lib/tcl8.1/encoding/cp950.enc
-lib/tcl8.1/encoding/dingbats.enc
-lib/tcl8.1/encoding/euc-cn.enc
-lib/tcl8.1/encoding/euc-jp.enc
-lib/tcl8.1/encoding/euc-kr.enc
-lib/tcl8.1/encoding/gb12345.enc
-lib/tcl8.1/encoding/gb1988.enc
-lib/tcl8.1/encoding/gb2312.enc
-lib/tcl8.1/encoding/iso2022-jp.enc
-lib/tcl8.1/encoding/iso2022-kr.enc
-lib/tcl8.1/encoding/iso2022.enc
-lib/tcl8.1/encoding/iso8859-1.enc
-lib/tcl8.1/encoding/iso8859-2.enc
-lib/tcl8.1/encoding/iso8859-3.enc
-lib/tcl8.1/encoding/iso8859-4.enc
-lib/tcl8.1/encoding/iso8859-5.enc
-lib/tcl8.1/encoding/iso8859-6.enc
-lib/tcl8.1/encoding/iso8859-7.enc
-lib/tcl8.1/encoding/iso8859-8.enc
-lib/tcl8.1/encoding/iso8859-9.enc
-lib/tcl8.1/encoding/jis0201.enc
-lib/tcl8.1/encoding/jis0208.enc
-lib/tcl8.1/encoding/jis0212.enc
-lib/tcl8.1/encoding/koi8-r.enc
-lib/tcl8.1/encoding/ksc5601.enc
-lib/tcl8.1/encoding/macCentEuro.enc
-lib/tcl8.1/encoding/macCroatian.enc
-lib/tcl8.1/encoding/macCyrillic.enc
-lib/tcl8.1/encoding/macDingbats.enc
-lib/tcl8.1/encoding/macGreek.enc
-lib/tcl8.1/encoding/macIceland.enc
-lib/tcl8.1/encoding/macJapan.enc
-lib/tcl8.1/encoding/macRoman.enc
-lib/tcl8.1/encoding/macRomania.enc
-lib/tcl8.1/encoding/macThai.enc
-lib/tcl8.1/encoding/macTurkish.enc
-lib/tcl8.1/encoding/macUkraine.enc
-lib/tcl8.1/encoding/shiftjis.enc
-lib/tcl8.1/encoding/symbol.enc
-lib/tcl8.1/history.tcl
-lib/tcl8.1/http1.0/http.tcl
-lib/tcl8.1/http1.0/pkgIndex.tcl
-lib/tcl8.1/http2.0/http.tcl
-lib/tcl8.1/http2.0/pkgIndex.tcl
-lib/tcl8.1/init.tcl
-lib/tcl8.1/ldAix
-lib/tcl8.1/ldAout.tcl
-lib/tcl8.1/msgcat1.0/msgcat.tcl
-lib/tcl8.1/msgcat1.0/pkgIndex.tcl
-lib/tcl8.1/opt0.4/optparse.tcl
-lib/tcl8.1/opt0.4/pkgIndex.tcl
-lib/tcl8.1/package.tcl
-lib/tcl8.1/parray.tcl
-lib/tcl8.1/safe.tcl
-lib/tcl8.1/tclAppInit.c
-lib/tcl8.1/tclConfig.sh
-lib/tcl8.1/tclIndex
-lib/tcl8.1/word.tcl
-@dirrm lib/tcl8.1/opt0.4
-@dirrm lib/tcl8.1/msgcat1.0
-@dirrm lib/tcl8.1/http2.0
-@dirrm lib/tcl8.1/http1.0
-@dirrm lib/tcl8.1/encoding
-@dirrm lib/tcl8.1
-@dirrm include/tcl8.1/unix
-@dirrm include/tcl8.1/generic
-@dirrm include/tcl8.1
+lib/tcl%%TCL_VER%%/auto.tcl
+lib/tcl%%TCL_VER%%/encoding/ascii.enc
+lib/tcl%%TCL_VER%%/encoding/big5.enc
+lib/tcl%%TCL_VER%%/encoding/cp1250.enc
+lib/tcl%%TCL_VER%%/encoding/cp1251.enc
+lib/tcl%%TCL_VER%%/encoding/cp1252.enc
+lib/tcl%%TCL_VER%%/encoding/cp1253.enc
+lib/tcl%%TCL_VER%%/encoding/cp1254.enc
+lib/tcl%%TCL_VER%%/encoding/cp1255.enc
+lib/tcl%%TCL_VER%%/encoding/cp1256.enc
+lib/tcl%%TCL_VER%%/encoding/cp1257.enc
+lib/tcl%%TCL_VER%%/encoding/cp1258.enc
+lib/tcl%%TCL_VER%%/encoding/cp437.enc
+lib/tcl%%TCL_VER%%/encoding/cp737.enc
+lib/tcl%%TCL_VER%%/encoding/cp775.enc
+lib/tcl%%TCL_VER%%/encoding/cp850.enc
+lib/tcl%%TCL_VER%%/encoding/cp852.enc
+lib/tcl%%TCL_VER%%/encoding/cp855.enc
+lib/tcl%%TCL_VER%%/encoding/cp857.enc
+lib/tcl%%TCL_VER%%/encoding/cp860.enc
+lib/tcl%%TCL_VER%%/encoding/cp861.enc
+lib/tcl%%TCL_VER%%/encoding/cp862.enc
+lib/tcl%%TCL_VER%%/encoding/cp863.enc
+lib/tcl%%TCL_VER%%/encoding/cp864.enc
+lib/tcl%%TCL_VER%%/encoding/cp865.enc
+lib/tcl%%TCL_VER%%/encoding/cp866.enc
+lib/tcl%%TCL_VER%%/encoding/cp869.enc
+lib/tcl%%TCL_VER%%/encoding/cp874.enc
+lib/tcl%%TCL_VER%%/encoding/cp932.enc
+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/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/iso2022-jp.enc
+lib/tcl%%TCL_VER%%/encoding/iso2022-kr.enc
+lib/tcl%%TCL_VER%%/encoding/iso2022.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-1.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-2.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-3.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-4.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-5.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-6.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-7.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-8.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-9.enc
+lib/tcl%%TCL_VER%%/encoding/jis0201.enc
+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/macCentEuro.enc
+lib/tcl%%TCL_VER%%/encoding/macCroatian.enc
+lib/tcl%%TCL_VER%%/encoding/macCyrillic.enc
+lib/tcl%%TCL_VER%%/encoding/macDingbats.enc
+lib/tcl%%TCL_VER%%/encoding/macGreek.enc
+lib/tcl%%TCL_VER%%/encoding/macIceland.enc
+lib/tcl%%TCL_VER%%/encoding/macJapan.enc
+lib/tcl%%TCL_VER%%/encoding/macRoman.enc
+lib/tcl%%TCL_VER%%/encoding/macRomania.enc
+lib/tcl%%TCL_VER%%/encoding/macThai.enc
+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%%/history.tcl
+lib/tcl%%TCL_VER%%/http1.0/http.tcl
+lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl
+lib/tcl%%TCL_VER%%/http2.1/http.tcl
+lib/tcl%%TCL_VER%%/http2.1/pkgIndex.tcl
+lib/tcl%%TCL_VER%%/init.tcl
+lib/tcl%%TCL_VER%%/ldAix
+lib/tcl%%TCL_VER%%/ldAout.tcl
+lib/tcl%%TCL_VER%%/msgcat1.0/msgcat.tcl
+lib/tcl%%TCL_VER%%/msgcat1.0/pkgIndex.tcl
+lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl
+lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl
+lib/tcl%%TCL_VER%%/package.tcl
+lib/tcl%%TCL_VER%%/parray.tcl
+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/pkgIndex.tcl
+lib/tcl%%TCL_VER%%/tcltest1.0/tcltest.tcl
+lib/tcl%%TCL_VER%%/word.tcl
+@dirrm lib/tcl%%TCL_VER%%/tcltest1.0
+@dirrm lib/tcl%%TCL_VER%%/opt0.4
+@dirrm lib/tcl%%TCL_VER%%/msgcat1.0
+@dirrm lib/tcl%%TCL_VER%%/http2.1
+@dirrm lib/tcl%%TCL_VER%%/http1.0
+@dirrm lib/tcl%%TCL_VER%%/encoding
+@dirrm lib/tcl%%TCL_VER%%
+@dirrm include/tcl%%TCL_VER%%/unix
+@dirrm include/tcl%%TCL_VER%%/generic
+@dirrm include/tcl%%TCL_VER%%