Upgrade to tcl and tk 8.1.

Move NO_LATEST_LINK from tcl81 and tk81 to tcl80 and tk80.

Submitted by:	YAZAKI Hiroyuki <yazaki@nn.iij4u.or.jp>

32 files changed, 547 insertions, 311 deletions

diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile
index 5a6ad867bb8e..280130f1a3a4 100644
--- a/lang/tcl80/Makefile
+++ b/lang/tcl80/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.18 1999/05/06 20:14:38 cwt Exp $
+# $Id: Makefile,v 1.19 1999/05/25 18:10:35 hoek Exp $
 #
 
 DISTNAME=	tcl8.0.5
@@ -15,6 +15,7 @@ MAINTAINER=	cwt@freebsd.org
 
 Y2K=            http://www.scriptics.com/Y2K.html
 
+NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/tcl8.0.5/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
diff --git a/lang/tcl82/Makefile b/lang/tcl82/Makefile
index df299de4ca3f..3b52c0662c51 100644
--- a/lang/tcl82/Makefile
+++ b/lang/tcl82/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	tcl8.1
-# Version required:	8.1.a2
+# Version required:	8.1
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.17 1999/04/22 00:17:07 scrappy Exp $
+# $Id: Makefile,v 1.18 1999/05/04 20:49:59 fenner Exp $
 #
 
-DISTNAME=	tcl8.1b1
-PKGNAME=	tcl-8.1.b1
+DISTNAME=	tcl8.1
+PKGNAME=	tcl-8.1
 CATEGORIES=	lang tcl81
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
 
@@ -17,7 +17,6 @@ Y2K=            http://www.scriptics.com/Y2K.html
 
 FILE_DEPENDS=	${PORTSDIR}/lang/tcl80
 
-NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
@@ -26,35 +25,38 @@ PKGINSTALL=     ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh
 
 MAN1=	tclsh.1
 
-MAN3=	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 GetIndex.3 GetInt.3 GetOpnFl.3 GetStdChan.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_Main.3 Thread.3 \
-	ToUpper.3 TraceVar.3 Translate.3 UpVar.3 Utf.3 WrongNumArgs.3 
+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 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 encoding.n eof.n \
-	error.n eval.n exec.n exit.n expr.n fblocked.n fconfigure.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 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 
+	catch.n cd.n clock.n close.n concat.n continue.n dde.n encoding.n \
+	eof.n error.n eval.n exec.n exit.n expr.n fblocked.n fconfigure.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 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 
 
 # MLINKS generated via  awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks
-MLINKS=	AddErrInfo.3 Tcl_AddObjErrorInfo.3 \
+MLINKS=	Access.3 Tcl_Access.3 \
+	Access.3 Tcl_Stat.3 \
+	AddErrInfo.3 Tcl_AddObjErrorInfo.3 \
 	AddErrInfo.3 Tcl_AddErrorInfo.3 \
 	AddErrInfo.3 Tcl_SetErrorCode.3 \
 	AddErrInfo.3 Tcl_PosixError.3 \
@@ -180,6 +182,8 @@ MLINKS=	AddErrInfo.3 Tcl_AddObjErrorInfo.3 \
 	ExprLongObj.3 Tcl_ExprObj.3 \
 	FindExec.3 Tcl_FindExecutable.3 \
 	FindExec.3 Tcl_GetNameOfExecutable.3 \
+	GetCwd.3 Tcl_GetCwd.3 \
+	GetCwd.3 Tcl_Chdir.3 \
 	GetIndex.3 Tcl_GetIndexFromObj.3 \
 	GetInt.3 Tcl_GetInt.3 \
 	GetInt.3 Tcl_GetDouble.3 \
@@ -187,6 +191,7 @@ MLINKS=	AddErrInfo.3 Tcl_AddObjErrorInfo.3 \
 	GetOpnFl.3 Tcl_GetOpenFile.3 \
 	GetStdChan.3 Tcl_GetStdChannel.3 \
 	GetStdChan.3 Tcl_SetStdChannel.3 \
+	GetVersion.3 Tcl_GetVersion.3 \
 	Hash.3 Tcl_InitHashTable.3 \
 	Hash.3 Tcl_DeleteHashTable.3 \
 	Hash.3 Tcl_CreateHashEntry.3 \
@@ -361,6 +366,9 @@ MANCOMPRESSED=	yes
 
 .include <bsd.port.pre.mk>
 
+post-extract:   
+	${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \
+	      ${WRKDIR}/${DISTNAME}/doc/Tcl_InitStubs.3
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PKGINSTALL})
diff --git a/lang/tcl82/distinfo b/lang/tcl82/distinfo
index 4b6578f01d73..85a27d9f66cc 100644
--- a/lang/tcl82/distinfo
+++ b/lang/tcl82/distinfo
@@ -1 +1 @@
-MD5 (tcl8.1b1.tar.gz) = 608c36993dfa52f06499f5c2004c7633
+MD5 (tcl8.1.tar.gz) = 78d3e8057950528b840f51fe6a51d205
diff --git a/lang/tcl82/files/patch-aa b/lang/tcl82/files/patch-aa
index 8cbda8008feb..b158373c4290 100644
--- a/lang/tcl82/files/patch-aa
+++ b/lang/tcl82/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Dec 11 18:36:13 1998
-+++ Makefile.in	Sat Jan  2 14:47:02 1999
+--- 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
  
@@ -20,7 +20,7 @@
  
  
  # To disable ANSI-C procedure prototypes reverse the comment characters
-@@ -152,7 +154,7 @@
+@@ -161,7 +163,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
@@ -29,16 +29,16 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -357,15 +359,21 @@
+@@ -391,15 +393,21 @@
  
- SRCS = $(GENERIC_SRCS) $(UNIX_SRCS)
+ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(STUB_SRCS)
  
--all: ${TCL_LIB_FILE} tclsh
-+all: ${TCL_LIB_FILE} libtcl81.a tclsh
+-all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) tclsh
++all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) libtcl81.a tclsh
  
  # The following target is configured by autoconf to generate either
  # a shared library or non-shared library for Tcl.
- ${TCL_LIB_FILE}: ${OBJS}
+ ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
  	rm -f ${TCL_LIB_FILE}
  	@MAKE_LIB@
 +	ln -sf ${TCL_LIB_FILE} libtcl81.so
@@ -49,19 +49,19 @@
 +	ar cr libtcl81.a ${OBJS}	
 +	$(RANLIB) libtcl81.a
 +
- # 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
- # extensions.  used for the Tcl Plugin.  -- dl
-@@ -459,7 +467,7 @@
- # some ranlibs write to current directory, and this might not always be
+ ${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) tclsh
-+install-binaries: $(TCL_LIB_FILE) libtcl81.a tclsh
+ 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 \
-@@ -471,16 +479,22 @@
+@@ -511,8 +519,13 @@
  	    done;
  	@echo "Installing $(TCL_LIB_FILE)"
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
@@ -72,12 +72,21 @@
 +	@$(INSTALL_DATA) libtcl81.a $(LIB_INSTALL_DIR)/libtcl81.a
 +	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl81.a)
 +	@chmod 555 $(LIB_INSTALL_DIR)/libtcl81.a
+ 	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
+ 	    echo "Installing $(TCL_EXP_FILE)"; \
+ 	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
+@@ -521,7 +534,8 @@
  	@echo "Installing tclsh"
  	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
  	@echo "Installing tclConfig.sh"
 -	@$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh
 +	@mkdir -p $(SCRIPT_INSTALL_DIR)
 +	@$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh
+ 	@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
+ 	    echo "Installing $(TCL_STUB_LIB_FILE)"; \
+ 	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
+@@ -529,8 +543,8 @@
+ 	    fi
  
  install-libraries:
 -	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
@@ -87,25 +96,26 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
-@@ -498,8 +512,15 @@
+@@ -548,11 +562,16 @@
  		else true; \
  		fi; \
  	    done;
--	@echo "Installing tcl.h"
--	@$(INSTALL_DATA) $(GENERIC_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h
+-	@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 ; \
-+	    do \
-+	    echo "Installing $$i"; \
+ 	    do \
+ 	    echo "Installing $$i"; \
+-	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
 +	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
-+	    done;
+ 	    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"; \
-@@ -531,30 +552,34 @@
+@@ -584,30 +603,35 @@
  	@cd $(TOP_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
@@ -147,6 +157,7 @@
 +	@echo "**********"
 +	@echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh"
 +	@echo "tcl.h        in $(INCLUDE_INSTALL_DIR)/tcl.h"
++	@echo "tclDecls.h   in $(INCLUDE_INSTALL_DIR)/tclDecls.h"
 +	@echo "There are NOT default place, but good place to avoid"
 +	@echo "conflicting with another version of Tcl/Tks."
  
diff --git a/lang/tcl82/files/patch-ab b/lang/tcl82/files/patch-ab
index 76921d7569df..551b0c24760a 100644
--- a/lang/tcl82/files/patch-ab
+++ b/lang/tcl82/files/patch-ab
@@ -1,6 +1,15 @@
---- configure.orig	Fri Dec 11 18:36:14 1998
-+++ configure	Sat Jan  2 15:04:24 1999
-@@ -4330,14 +4330,19 @@
+--- 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' '___'`
+ echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
+@@ -4413,14 +4413,19 @@
    echo "$ac_t""yes" 1>&6
    
  	    SHLIB_CFLAGS="-fpic"
@@ -13,12 +22,38 @@
  	    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='`echo ${VERSION} | tr -d .`.so.1'
++            TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
 +            SHLIB_LD="ld -shared -x -soname \$@"
 +        else
-+            TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0'
++            TCL_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}\""
diff --git a/lang/tcl82/pkg-plist b/lang/tcl82/pkg-plist
index 82b88b8ae1d0..8eb81b29bd43 100644
--- a/lang/tcl82/pkg-plist
+++ b/lang/tcl82/pkg-plist
@@ -5,15 +5,22 @@ 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
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/tcl8.1/auto.tcl
@@ -49,6 +56,7 @@ 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
@@ -69,6 +77,7 @@ 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
diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index df299de4ca3f..3b52c0662c51 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	tcl8.1
-# Version required:	8.1.a2
+# Version required:	8.1
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.17 1999/04/22 00:17:07 scrappy Exp $
+# $Id: Makefile,v 1.18 1999/05/04 20:49:59 fenner Exp $
 #
 
-DISTNAME=	tcl8.1b1
-PKGNAME=	tcl-8.1.b1
+DISTNAME=	tcl8.1
+PKGNAME=	tcl-8.1
 CATEGORIES=	lang tcl81
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
 
@@ -17,7 +17,6 @@ Y2K=            http://www.scriptics.com/Y2K.html
 
 FILE_DEPENDS=	${PORTSDIR}/lang/tcl80
 
-NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
@@ -26,35 +25,38 @@ PKGINSTALL=     ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh
 
 MAN1=	tclsh.1
 
-MAN3=	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 GetIndex.3 GetInt.3 GetOpnFl.3 GetStdChan.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_Main.3 Thread.3 \
-	ToUpper.3 TraceVar.3 Translate.3 UpVar.3 Utf.3 WrongNumArgs.3 
+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 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 encoding.n eof.n \
-	error.n eval.n exec.n exit.n expr.n fblocked.n fconfigure.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 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 
+	catch.n cd.n clock.n close.n concat.n continue.n dde.n encoding.n \
+	eof.n error.n eval.n exec.n exit.n expr.n fblocked.n fconfigure.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 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 
 
 # MLINKS generated via  awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks
-MLINKS=	AddErrInfo.3 Tcl_AddObjErrorInfo.3 \
+MLINKS=	Access.3 Tcl_Access.3 \
+	Access.3 Tcl_Stat.3 \
+	AddErrInfo.3 Tcl_AddObjErrorInfo.3 \
 	AddErrInfo.3 Tcl_AddErrorInfo.3 \
 	AddErrInfo.3 Tcl_SetErrorCode.3 \
 	AddErrInfo.3 Tcl_PosixError.3 \
@@ -180,6 +182,8 @@ MLINKS=	AddErrInfo.3 Tcl_AddObjErrorInfo.3 \
 	ExprLongObj.3 Tcl_ExprObj.3 \
 	FindExec.3 Tcl_FindExecutable.3 \
 	FindExec.3 Tcl_GetNameOfExecutable.3 \
+	GetCwd.3 Tcl_GetCwd.3 \
+	GetCwd.3 Tcl_Chdir.3 \
 	GetIndex.3 Tcl_GetIndexFromObj.3 \
 	GetInt.3 Tcl_GetInt.3 \
 	GetInt.3 Tcl_GetDouble.3 \
@@ -187,6 +191,7 @@ MLINKS=	AddErrInfo.3 Tcl_AddObjErrorInfo.3 \
 	GetOpnFl.3 Tcl_GetOpenFile.3 \
 	GetStdChan.3 Tcl_GetStdChannel.3 \
 	GetStdChan.3 Tcl_SetStdChannel.3 \
+	GetVersion.3 Tcl_GetVersion.3 \
 	Hash.3 Tcl_InitHashTable.3 \
 	Hash.3 Tcl_DeleteHashTable.3 \
 	Hash.3 Tcl_CreateHashEntry.3 \
@@ -361,6 +366,9 @@ MANCOMPRESSED=	yes
 
 .include <bsd.port.pre.mk>
 
+post-extract:   
+	${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \
+	      ${WRKDIR}/${DISTNAME}/doc/Tcl_InitStubs.3
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PKGINSTALL})
diff --git a/lang/tcl83/distinfo b/lang/tcl83/distinfo
index 4b6578f01d73..85a27d9f66cc 100644
--- a/lang/tcl83/distinfo
+++ b/lang/tcl83/distinfo
@@ -1 +1 @@
-MD5 (tcl8.1b1.tar.gz) = 608c36993dfa52f06499f5c2004c7633
+MD5 (tcl8.1.tar.gz) = 78d3e8057950528b840f51fe6a51d205
diff --git a/lang/tcl83/files/patch-aa b/lang/tcl83/files/patch-aa
index 8cbda8008feb..b158373c4290 100644
--- a/lang/tcl83/files/patch-aa
+++ b/lang/tcl83/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Dec 11 18:36:13 1998
-+++ Makefile.in	Sat Jan  2 14:47:02 1999
+--- 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
  
@@ -20,7 +20,7 @@
  
  
  # To disable ANSI-C procedure prototypes reverse the comment characters
-@@ -152,7 +154,7 @@
+@@ -161,7 +163,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
@@ -29,16 +29,16 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -357,15 +359,21 @@
+@@ -391,15 +393,21 @@
  
- SRCS = $(GENERIC_SRCS) $(UNIX_SRCS)
+ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(STUB_SRCS)
  
--all: ${TCL_LIB_FILE} tclsh
-+all: ${TCL_LIB_FILE} libtcl81.a tclsh
+-all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) tclsh
++all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) libtcl81.a tclsh
  
  # The following target is configured by autoconf to generate either
  # a shared library or non-shared library for Tcl.
- ${TCL_LIB_FILE}: ${OBJS}
+ ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
  	rm -f ${TCL_LIB_FILE}
  	@MAKE_LIB@
 +	ln -sf ${TCL_LIB_FILE} libtcl81.so
@@ -49,19 +49,19 @@
 +	ar cr libtcl81.a ${OBJS}	
 +	$(RANLIB) libtcl81.a
 +
- # 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
- # extensions.  used for the Tcl Plugin.  -- dl
-@@ -459,7 +467,7 @@
- # some ranlibs write to current directory, and this might not always be
+ ${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) tclsh
-+install-binaries: $(TCL_LIB_FILE) libtcl81.a tclsh
+ 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 \
-@@ -471,16 +479,22 @@
+@@ -511,8 +519,13 @@
  	    done;
  	@echo "Installing $(TCL_LIB_FILE)"
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
@@ -72,12 +72,21 @@
 +	@$(INSTALL_DATA) libtcl81.a $(LIB_INSTALL_DIR)/libtcl81.a
 +	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl81.a)
 +	@chmod 555 $(LIB_INSTALL_DIR)/libtcl81.a
+ 	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
+ 	    echo "Installing $(TCL_EXP_FILE)"; \
+ 	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
+@@ -521,7 +534,8 @@
  	@echo "Installing tclsh"
  	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
  	@echo "Installing tclConfig.sh"
 -	@$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh
 +	@mkdir -p $(SCRIPT_INSTALL_DIR)
 +	@$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh
+ 	@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
+ 	    echo "Installing $(TCL_STUB_LIB_FILE)"; \
+ 	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
+@@ -529,8 +543,8 @@
+ 	    fi
  
  install-libraries:
 -	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
@@ -87,25 +96,26 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
-@@ -498,8 +512,15 @@
+@@ -548,11 +562,16 @@
  		else true; \
  		fi; \
  	    done;
--	@echo "Installing tcl.h"
--	@$(INSTALL_DATA) $(GENERIC_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h
+-	@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 ; \
-+	    do \
-+	    echo "Installing $$i"; \
+ 	    do \
+ 	    echo "Installing $$i"; \
+-	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
 +	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
-+	    done;
+ 	    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"; \
-@@ -531,30 +552,34 @@
+@@ -584,30 +603,35 @@
  	@cd $(TOP_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
@@ -147,6 +157,7 @@
 +	@echo "**********"
 +	@echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh"
 +	@echo "tcl.h        in $(INCLUDE_INSTALL_DIR)/tcl.h"
++	@echo "tclDecls.h   in $(INCLUDE_INSTALL_DIR)/tclDecls.h"
 +	@echo "There are NOT default place, but good place to avoid"
 +	@echo "conflicting with another version of Tcl/Tks."
  
diff --git a/lang/tcl83/files/patch-ab b/lang/tcl83/files/patch-ab
index 76921d7569df..551b0c24760a 100644
--- a/lang/tcl83/files/patch-ab
+++ b/lang/tcl83/files/patch-ab
@@ -1,6 +1,15 @@
---- configure.orig	Fri Dec 11 18:36:14 1998
-+++ configure	Sat Jan  2 15:04:24 1999
-@@ -4330,14 +4330,19 @@
+--- 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' '___'`
+ echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
+@@ -4413,14 +4413,19 @@
    echo "$ac_t""yes" 1>&6
    
  	    SHLIB_CFLAGS="-fpic"
@@ -13,12 +22,38 @@
  	    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='`echo ${VERSION} | tr -d .`.so.1'
++            TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
 +            SHLIB_LD="ld -shared -x -soname \$@"
 +        else
-+            TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0'
++            TCL_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}\""
diff --git a/lang/tcl83/pkg-plist b/lang/tcl83/pkg-plist
index 82b88b8ae1d0..8eb81b29bd43 100644
--- a/lang/tcl83/pkg-plist
+++ b/lang/tcl83/pkg-plist
@@ -5,15 +5,22 @@ 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
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/tcl8.1/auto.tcl
@@ -49,6 +56,7 @@ 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
@@ -69,6 +77,7 @@ 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
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index df299de4ca3f..3b52c0662c51 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	tcl8.1
-# Version required:	8.1.a2
+# Version required:	8.1
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.17 1999/04/22 00:17:07 scrappy Exp $
+# $Id: Makefile,v 1.18 1999/05/04 20:49:59 fenner Exp $
 #
 
-DISTNAME=	tcl8.1b1
-PKGNAME=	tcl-8.1.b1
+DISTNAME=	tcl8.1
+PKGNAME=	tcl-8.1
 CATEGORIES=	lang tcl81
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
 
@@ -17,7 +17,6 @@ Y2K=            http://www.scriptics.com/Y2K.html
 
 FILE_DEPENDS=	${PORTSDIR}/lang/tcl80
 
-NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
@@ -26,35 +25,38 @@ PKGINSTALL=     ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh
 
 MAN1=	tclsh.1
 
-MAN3=	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 GetIndex.3 GetInt.3 GetOpnFl.3 GetStdChan.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_Main.3 Thread.3 \
-	ToUpper.3 TraceVar.3 Translate.3 UpVar.3 Utf.3 WrongNumArgs.3 
+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 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 encoding.n eof.n \
-	error.n eval.n exec.n exit.n expr.n fblocked.n fconfigure.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 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 
+	catch.n cd.n clock.n close.n concat.n continue.n dde.n encoding.n \
+	eof.n error.n eval.n exec.n exit.n expr.n fblocked.n fconfigure.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 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 
 
 # MLINKS generated via  awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks
-MLINKS=	AddErrInfo.3 Tcl_AddObjErrorInfo.3 \
+MLINKS=	Access.3 Tcl_Access.3 \
+	Access.3 Tcl_Stat.3 \
+	AddErrInfo.3 Tcl_AddObjErrorInfo.3 \
 	AddErrInfo.3 Tcl_AddErrorInfo.3 \
 	AddErrInfo.3 Tcl_SetErrorCode.3 \
 	AddErrInfo.3 Tcl_PosixError.3 \
@@ -180,6 +182,8 @@ MLINKS=	AddErrInfo.3 Tcl_AddObjErrorInfo.3 \
 	ExprLongObj.3 Tcl_ExprObj.3 \
 	FindExec.3 Tcl_FindExecutable.3 \
 	FindExec.3 Tcl_GetNameOfExecutable.3 \
+	GetCwd.3 Tcl_GetCwd.3 \
+	GetCwd.3 Tcl_Chdir.3 \
 	GetIndex.3 Tcl_GetIndexFromObj.3 \
 	GetInt.3 Tcl_GetInt.3 \
 	GetInt.3 Tcl_GetDouble.3 \
@@ -187,6 +191,7 @@ MLINKS=	AddErrInfo.3 Tcl_AddObjErrorInfo.3 \
 	GetOpnFl.3 Tcl_GetOpenFile.3 \
 	GetStdChan.3 Tcl_GetStdChannel.3 \
 	GetStdChan.3 Tcl_SetStdChannel.3 \
+	GetVersion.3 Tcl_GetVersion.3 \
 	Hash.3 Tcl_InitHashTable.3 \
 	Hash.3 Tcl_DeleteHashTable.3 \
 	Hash.3 Tcl_CreateHashEntry.3 \
@@ -361,6 +366,9 @@ MANCOMPRESSED=	yes
 
 .include <bsd.port.pre.mk>
 
+post-extract:   
+	${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \
+	      ${WRKDIR}/${DISTNAME}/doc/Tcl_InitStubs.3
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PKGINSTALL})
diff --git a/lang/tcl84/distinfo b/lang/tcl84/distinfo
index 4b6578f01d73..85a27d9f66cc 100644
--- a/lang/tcl84/distinfo
+++ b/lang/tcl84/distinfo
@@ -1 +1 @@
-MD5 (tcl8.1b1.tar.gz) = 608c36993dfa52f06499f5c2004c7633
+MD5 (tcl8.1.tar.gz) = 78d3e8057950528b840f51fe6a51d205
diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa
index 8cbda8008feb..b158373c4290 100644
--- a/lang/tcl84/files/patch-aa
+++ b/lang/tcl84/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Dec 11 18:36:13 1998
-+++ Makefile.in	Sat Jan  2 14:47:02 1999
+--- 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
  
@@ -20,7 +20,7 @@
  
  
  # To disable ANSI-C procedure prototypes reverse the comment characters
-@@ -152,7 +154,7 @@
+@@ -161,7 +163,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
@@ -29,16 +29,16 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -357,15 +359,21 @@
+@@ -391,15 +393,21 @@
  
- SRCS = $(GENERIC_SRCS) $(UNIX_SRCS)
+ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(STUB_SRCS)
  
--all: ${TCL_LIB_FILE} tclsh
-+all: ${TCL_LIB_FILE} libtcl81.a tclsh
+-all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) tclsh
++all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) libtcl81.a tclsh
  
  # The following target is configured by autoconf to generate either
  # a shared library or non-shared library for Tcl.
- ${TCL_LIB_FILE}: ${OBJS}
+ ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
  	rm -f ${TCL_LIB_FILE}
  	@MAKE_LIB@
 +	ln -sf ${TCL_LIB_FILE} libtcl81.so
@@ -49,19 +49,19 @@
 +	ar cr libtcl81.a ${OBJS}	
 +	$(RANLIB) libtcl81.a
 +
- # 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
- # extensions.  used for the Tcl Plugin.  -- dl
-@@ -459,7 +467,7 @@
- # some ranlibs write to current directory, and this might not always be
+ ${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) tclsh
-+install-binaries: $(TCL_LIB_FILE) libtcl81.a tclsh
+ 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 \
-@@ -471,16 +479,22 @@
+@@ -511,8 +519,13 @@
  	    done;
  	@echo "Installing $(TCL_LIB_FILE)"
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
@@ -72,12 +72,21 @@
 +	@$(INSTALL_DATA) libtcl81.a $(LIB_INSTALL_DIR)/libtcl81.a
 +	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl81.a)
 +	@chmod 555 $(LIB_INSTALL_DIR)/libtcl81.a
+ 	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
+ 	    echo "Installing $(TCL_EXP_FILE)"; \
+ 	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
+@@ -521,7 +534,8 @@
  	@echo "Installing tclsh"
  	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
  	@echo "Installing tclConfig.sh"
 -	@$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh
 +	@mkdir -p $(SCRIPT_INSTALL_DIR)
 +	@$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh
+ 	@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
+ 	    echo "Installing $(TCL_STUB_LIB_FILE)"; \
+ 	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
+@@ -529,8 +543,8 @@
+ 	    fi
  
  install-libraries:
 -	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
@@ -87,25 +96,26 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
-@@ -498,8 +512,15 @@
+@@ -548,11 +562,16 @@
  		else true; \
  		fi; \
  	    done;
--	@echo "Installing tcl.h"
--	@$(INSTALL_DATA) $(GENERIC_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h
+-	@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 ; \
-+	    do \
-+	    echo "Installing $$i"; \
+ 	    do \
+ 	    echo "Installing $$i"; \
+-	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
 +	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
-+	    done;
+ 	    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"; \
-@@ -531,30 +552,34 @@
+@@ -584,30 +603,35 @@
  	@cd $(TOP_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
@@ -147,6 +157,7 @@
 +	@echo "**********"
 +	@echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh"
 +	@echo "tcl.h        in $(INCLUDE_INSTALL_DIR)/tcl.h"
++	@echo "tclDecls.h   in $(INCLUDE_INSTALL_DIR)/tclDecls.h"
 +	@echo "There are NOT default place, but good place to avoid"
 +	@echo "conflicting with another version of Tcl/Tks."
  
diff --git a/lang/tcl84/files/patch-ab b/lang/tcl84/files/patch-ab
index 76921d7569df..551b0c24760a 100644
--- a/lang/tcl84/files/patch-ab
+++ b/lang/tcl84/files/patch-ab
@@ -1,6 +1,15 @@
---- configure.orig	Fri Dec 11 18:36:14 1998
-+++ configure	Sat Jan  2 15:04:24 1999
-@@ -4330,14 +4330,19 @@
+--- 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' '___'`
+ echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
+@@ -4413,14 +4413,19 @@
    echo "$ac_t""yes" 1>&6
    
  	    SHLIB_CFLAGS="-fpic"
@@ -13,12 +22,38 @@
  	    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='`echo ${VERSION} | tr -d .`.so.1'
++            TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
 +            SHLIB_LD="ld -shared -x -soname \$@"
 +        else
-+            TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0'
++            TCL_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}\""
diff --git a/lang/tcl84/pkg-plist b/lang/tcl84/pkg-plist
index 82b88b8ae1d0..8eb81b29bd43 100644
--- a/lang/tcl84/pkg-plist
+++ b/lang/tcl84/pkg-plist
@@ -5,15 +5,22 @@ 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
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/tcl8.1/auto.tcl
@@ -49,6 +56,7 @@ 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
@@ -69,6 +77,7 @@ 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
diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile
index d29b9f6e9516..11c16957f47b 100644
--- a/x11-toolkits/tk80/Makefile
+++ b/x11-toolkits/tk80/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.18 1999/04/30 16:11:48 cwt Exp $
+# $Id: Makefile,v 1.19 1999/05/04 19:33:48 fenner Exp $
 #
 
 DISTNAME=	tk8.0.5
@@ -15,6 +15,7 @@ MAINTAINER=	cwt@Freebsd.ORG
 
 LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80
 
+NO_LATEST_LINK=	yes
 USE_XLIB=	yes
 WRKSRC=		${WRKDIR}/tk8.0.5/unix
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index b42fbd864757..872bcf1aa13a 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	tk8.1
-# Version required:	8.1a2
+# Version required:	8.1
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.23 1999/05/04 20:50:08 fenner Exp $
+# $Id: Makefile,v 1.24 1999/05/04 21:03:55 fenner Exp $
 #
 
-DISTNAME=	tk8.1b1
-PKGNAME=	tk-8.1.b1
+DISTNAME=	tk8.1
+PKGNAME=	tk-8.1
 CATEGORIES=	x11-toolkits tk81
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
 
@@ -17,7 +17,6 @@ LIB_DEPENDS=	tcl81.1:${PORTSDIR}/lang/tcl81
 FILE_DEPENDS=	${PORTSDIR}/x11-toolkits/tk80
 
 USE_XLIB=	yes
-NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
@@ -38,9 +37,9 @@ MAN3=	3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \
 	MapWindow.3 MeasureChar.3 MoveToplev.3 Name.3 NameOfImg.3 OwnSelect.3 \
 	ParseArgv.3 QWinEvent.3 Restack.3 RestrictEv.3 SetAppName.3 \
 	SetClass.3 SetGrid.3 SetOptions.3 SetVisual.3 StrictMotif.3 \
-	TextLayout.3 Tk_Init.3 Tk_Main.3 WindowId.3
+	TextLayout.3 Tk_Init.3 Tk_InitStubs.3 Tk_Main.3 WindowId.3
 MANN=	bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
-	chooseColor.n clipboard.n dde.n destroy.n dialog.n entry.n event.n \
+	chooseColor.n clipboard.n destroy.n dialog.n entry.n event.n \
 	focus.n focusNext.n font.n frame.n getOpenFile.n grab.n grid.n \
 	image.n label.n listbox.n loadTk.n lower.n menu.n menubar.n \
 	menubutton.n message.n messageBox.n option.n optionMenu.n options.n \
@@ -293,6 +292,9 @@ MANCOMPRESSED=	yes
 
 .include <bsd.port.pre.mk>
 
+post-extract:   
+	${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \
+	      ${WRKDIR}/${DISTNAME}/doc/Tk_InitStubs.3
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PKGINSTALL})
diff --git a/x11-toolkits/tk82/distinfo b/x11-toolkits/tk82/distinfo
index c57202986b5e..6a4643902080 100644
--- a/x11-toolkits/tk82/distinfo
+++ b/x11-toolkits/tk82/distinfo
@@ -1 +1 @@
-MD5 (tk8.1b1.tar.gz) = 13164e3d3c5918315988615523f43e56
+MD5 (tk8.1.tar.gz) = 4447b2e0ad596c139df928aabe83e551
diff --git a/x11-toolkits/tk82/files/patch-aa b/x11-toolkits/tk82/files/patch-aa
index f858d13c6249..66ed07aecf62 100644
--- a/x11-toolkits/tk82/files/patch-aa
+++ b/x11-toolkits/tk82/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Fri Dec 11 17:38:40 1998
-+++ configure	Sun Jan 24 16:12:10 1999
-@@ -854,14 +854,14 @@
+--- configure.orig	Fri Apr 30 08:27:45 1999
++++ configure	Mon May 10 00:20:26 1999
+@@ -956,14 +956,14 @@
    withval="$with_tcl"
    TCL_BIN_DIR=$withval
  else
@@ -18,7 +18,7 @@
  fi
  
  #--------------------------------------------------------------------
-@@ -902,6 +902,8 @@
+@@ -1004,6 +1004,8 @@
  CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
  EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
  
@@ -27,18 +27,18 @@
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -2302,7 +2304,7 @@
+@@ -2450,7 +2452,7 @@
  if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
      TK_SHARED_BUILD=1
      TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
 -    TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
 +    TK_LIB_FILE=${TK_LIB_FILE}
-     MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
+     MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_BUILD_STUB_LIB_SPEC} \${LIBS}"
      RANLIB=":"
- else
-@@ -2513,6 +2515,7 @@
- s%@SHLIB_VERSION@%$SHLIB_VERSION%g
+ 
+@@ -2729,6 +2731,7 @@
  s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
+ s%@TCL_BUILD_STUB_LIB_SPEC@%$TCL_BUILD_STUB_LIB_SPEC%g
  s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
 +s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
  s%@TCL_DBGX@%$TCL_DBGX%g
diff --git a/x11-toolkits/tk82/files/patch-ab b/x11-toolkits/tk82/files/patch-ab
index 51b05794bf3a..d907e5809b46 100644
--- a/x11-toolkits/tk82/files/patch-ab
+++ b/x11-toolkits/tk82/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Dec 11 17:38:40 1998
-+++ Makefile.in	Sun Jan 24 16:16:06 1999
+--- Makefile.in.orig	Fri Apr 30 08:27:45 1999
++++ Makefile.in	Mon May 10 01:18:32 1999
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -20,16 +20,7 @@
  
  # A "-I" switch that can be used when compiling to make all of the
  # X11 include files accessible (the configure script will try to
-@@ -113,7 +115,7 @@
- 
- # Libraries to use when linking.  This definition is determined by the
- # configure script.
--LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
-+LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
- 
- # To turn off the security checks that disallow incoming sends when
- # the X server appears to be insecure, reverse the comments on the
-@@ -155,7 +157,7 @@
+@@ -152,7 +154,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
@@ -38,7 +29,16 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -320,8 +322,14 @@
+@@ -188,7 +190,7 @@
+ # Libraries to use when linking.  This definition is determined by the
+ # configure script.
+ LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
+-WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
++WISH_LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
+ 
+ # The symbol below provides support for dynamic loading and shared
+ # libraries.  See configure.in for a description of what it means.
+@@ -348,8 +350,14 @@
  ${TK_LIB_FILE}: ${OBJS}
  	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
@@ -50,19 +50,20 @@
 +	ar cr libtk81.a ${OBJS}
 +	$(RANLIB) libtk81.a
 +
- # Make target which outputs the list of the .o contained in the Tk lib
- # usefull to build a single big shared library containing Tcl/Tk and other
- # extensions.  used for the Tcl Plugin.  -- dl
-@@ -376,7 +384,7 @@
+ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+ 	rm -f ${STUB_LIB_FILE}
+ 	@MAKE_STUB_LIB@
+@@ -410,7 +418,8 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
--install-binaries: $(TK_LIB_FILE) wish
-+install-binaries: $(TK_LIB_FILE) libtk81.a wish
+-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
++install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) \
++		libtk81.a wish
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -388,15 +396,22 @@
+@@ -422,12 +431,18 @@
  	    done;
  	@echo "Installing $(TK_LIB_FILE)"
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@@ -79,6 +80,10 @@
 -	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
 +	@mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION)
 +	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh
+ 	@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
+ 	    echo "Installing $(TK_EXP_FILE)"; \
+ 	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
+@@ -441,6 +456,7 @@
  
  install-libraries:
  	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
@@ -86,12 +91,11 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -406,8 +421,18 @@
+@@ -450,11 +466,19 @@
  		else true; \
  		fi; \
  	    done;
--	@echo "Installing tk.h"
--	@$(INSTALL_DATA) $(GENERIC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
+-	@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \
 +	@echo "Installing headers"
 +	@for i in $(GENERIC_DIR)/*.h ; \
 +	    do \
@@ -99,15 +103,17 @@
 +	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
 +	    done;
 +	@for i in $(UNIX_DIR)/*.h ; \
-+	    do \
-+	    echo "Installing $$i"; \
+ 	    do \
+ 	    echo "Installing $$i"; \
+-	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
 +	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
-+	    done;
+ 	    done;
 +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
++	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkDecls.h $(INCLUDE_INSTALL_DIR)/tkDecls.h
  	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -466,30 +491,27 @@
+@@ -513,30 +537,27 @@
  	@cd $(SRC_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
diff --git a/x11-toolkits/tk82/pkg-plist b/x11-toolkits/tk82/pkg-plist
index 18dc742aa134..d66214bbe293 100644
--- a/x11-toolkits/tk82/pkg-plist
+++ b/x11-toolkits/tk82/pkg-plist
@@ -6,24 +6,31 @@ include/tk8.1/generic/tk3d.h
 include/tk8.1/generic/tkButton.h
 include/tk8.1/generic/tkCanvas.h
 include/tk8.1/generic/tkColor.h
+include/tk8.1/generic/tkDecls.h
 include/tk8.1/generic/tkFileFilter.h
 include/tk8.1/generic/tkFont.h
 include/tk8.1/generic/tkInitScript.h
 include/tk8.1/generic/tkInt.h
+include/tk8.1/generic/tkIntDecls.h
+include/tk8.1/generic/tkIntPlatDecls.h
+include/tk8.1/generic/tkIntXlibDecls.h
 include/tk8.1/generic/tkMenu.h
 include/tk8.1/generic/tkMenubutton.h
+include/tk8.1/generic/tkPlatDecls.h
 include/tk8.1/generic/tkPort.h
 include/tk8.1/generic/tkScale.h
 include/tk8.1/generic/tkScrollbar.h
 include/tk8.1/generic/tkSelect.h
 include/tk8.1/generic/tkText.h
 include/tk8.1/tk.h
+include/tk8.1/tkDecls.h
 include/tk8.1/unix/tkUnixDefault.h
 include/tk8.1/unix/tkUnixInt.h
 include/tk8.1/unix/tkUnixPort.h
 lib/libtk81.a
 lib/libtk81.so
 lib/libtk81.so.1
+lib/libtkstub81.a
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/tk8.1/bgerror.tcl
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index b42fbd864757..872bcf1aa13a 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	tk8.1
-# Version required:	8.1a2
+# Version required:	8.1
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.23 1999/05/04 20:50:08 fenner Exp $
+# $Id: Makefile,v 1.24 1999/05/04 21:03:55 fenner Exp $
 #
 
-DISTNAME=	tk8.1b1
-PKGNAME=	tk-8.1.b1
+DISTNAME=	tk8.1
+PKGNAME=	tk-8.1
 CATEGORIES=	x11-toolkits tk81
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
 
@@ -17,7 +17,6 @@ LIB_DEPENDS=	tcl81.1:${PORTSDIR}/lang/tcl81
 FILE_DEPENDS=	${PORTSDIR}/x11-toolkits/tk80
 
 USE_XLIB=	yes
-NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
@@ -38,9 +37,9 @@ MAN3=	3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \
 	MapWindow.3 MeasureChar.3 MoveToplev.3 Name.3 NameOfImg.3 OwnSelect.3 \
 	ParseArgv.3 QWinEvent.3 Restack.3 RestrictEv.3 SetAppName.3 \
 	SetClass.3 SetGrid.3 SetOptions.3 SetVisual.3 StrictMotif.3 \
-	TextLayout.3 Tk_Init.3 Tk_Main.3 WindowId.3
+	TextLayout.3 Tk_Init.3 Tk_InitStubs.3 Tk_Main.3 WindowId.3
 MANN=	bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
-	chooseColor.n clipboard.n dde.n destroy.n dialog.n entry.n event.n \
+	chooseColor.n clipboard.n destroy.n dialog.n entry.n event.n \
 	focus.n focusNext.n font.n frame.n getOpenFile.n grab.n grid.n \
 	image.n label.n listbox.n loadTk.n lower.n menu.n menubar.n \
 	menubutton.n message.n messageBox.n option.n optionMenu.n options.n \
@@ -293,6 +292,9 @@ MANCOMPRESSED=	yes
 
 .include <bsd.port.pre.mk>
 
+post-extract:   
+	${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \
+	      ${WRKDIR}/${DISTNAME}/doc/Tk_InitStubs.3
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PKGINSTALL})
diff --git a/x11-toolkits/tk83/distinfo b/x11-toolkits/tk83/distinfo
index c57202986b5e..6a4643902080 100644
--- a/x11-toolkits/tk83/distinfo
+++ b/x11-toolkits/tk83/distinfo
@@ -1 +1 @@
-MD5 (tk8.1b1.tar.gz) = 13164e3d3c5918315988615523f43e56
+MD5 (tk8.1.tar.gz) = 4447b2e0ad596c139df928aabe83e551
diff --git a/x11-toolkits/tk83/files/patch-aa b/x11-toolkits/tk83/files/patch-aa
index f858d13c6249..66ed07aecf62 100644
--- a/x11-toolkits/tk83/files/patch-aa
+++ b/x11-toolkits/tk83/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Fri Dec 11 17:38:40 1998
-+++ configure	Sun Jan 24 16:12:10 1999
-@@ -854,14 +854,14 @@
+--- configure.orig	Fri Apr 30 08:27:45 1999
++++ configure	Mon May 10 00:20:26 1999
+@@ -956,14 +956,14 @@
    withval="$with_tcl"
    TCL_BIN_DIR=$withval
  else
@@ -18,7 +18,7 @@
  fi
  
  #--------------------------------------------------------------------
-@@ -902,6 +902,8 @@
+@@ -1004,6 +1004,8 @@
  CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
  EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
  
@@ -27,18 +27,18 @@
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -2302,7 +2304,7 @@
+@@ -2450,7 +2452,7 @@
  if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
      TK_SHARED_BUILD=1
      TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
 -    TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
 +    TK_LIB_FILE=${TK_LIB_FILE}
-     MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
+     MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_BUILD_STUB_LIB_SPEC} \${LIBS}"
      RANLIB=":"
- else
-@@ -2513,6 +2515,7 @@
- s%@SHLIB_VERSION@%$SHLIB_VERSION%g
+ 
+@@ -2729,6 +2731,7 @@
  s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
+ s%@TCL_BUILD_STUB_LIB_SPEC@%$TCL_BUILD_STUB_LIB_SPEC%g
  s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
 +s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
  s%@TCL_DBGX@%$TCL_DBGX%g
diff --git a/x11-toolkits/tk83/files/patch-ab b/x11-toolkits/tk83/files/patch-ab
index 51b05794bf3a..d907e5809b46 100644
--- a/x11-toolkits/tk83/files/patch-ab
+++ b/x11-toolkits/tk83/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Dec 11 17:38:40 1998
-+++ Makefile.in	Sun Jan 24 16:16:06 1999
+--- Makefile.in.orig	Fri Apr 30 08:27:45 1999
++++ Makefile.in	Mon May 10 01:18:32 1999
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -20,16 +20,7 @@
  
  # A "-I" switch that can be used when compiling to make all of the
  # X11 include files accessible (the configure script will try to
-@@ -113,7 +115,7 @@
- 
- # Libraries to use when linking.  This definition is determined by the
- # configure script.
--LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
-+LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
- 
- # To turn off the security checks that disallow incoming sends when
- # the X server appears to be insecure, reverse the comments on the
-@@ -155,7 +157,7 @@
+@@ -152,7 +154,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
@@ -38,7 +29,16 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -320,8 +322,14 @@
+@@ -188,7 +190,7 @@
+ # Libraries to use when linking.  This definition is determined by the
+ # configure script.
+ LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
+-WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
++WISH_LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
+ 
+ # The symbol below provides support for dynamic loading and shared
+ # libraries.  See configure.in for a description of what it means.
+@@ -348,8 +350,14 @@
  ${TK_LIB_FILE}: ${OBJS}
  	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
@@ -50,19 +50,20 @@
 +	ar cr libtk81.a ${OBJS}
 +	$(RANLIB) libtk81.a
 +
- # Make target which outputs the list of the .o contained in the Tk lib
- # usefull to build a single big shared library containing Tcl/Tk and other
- # extensions.  used for the Tcl Plugin.  -- dl
-@@ -376,7 +384,7 @@
+ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+ 	rm -f ${STUB_LIB_FILE}
+ 	@MAKE_STUB_LIB@
+@@ -410,7 +418,8 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
--install-binaries: $(TK_LIB_FILE) wish
-+install-binaries: $(TK_LIB_FILE) libtk81.a wish
+-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
++install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) \
++		libtk81.a wish
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -388,15 +396,22 @@
+@@ -422,12 +431,18 @@
  	    done;
  	@echo "Installing $(TK_LIB_FILE)"
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@@ -79,6 +80,10 @@
 -	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
 +	@mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION)
 +	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh
+ 	@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
+ 	    echo "Installing $(TK_EXP_FILE)"; \
+ 	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
+@@ -441,6 +456,7 @@
  
  install-libraries:
  	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
@@ -86,12 +91,11 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -406,8 +421,18 @@
+@@ -450,11 +466,19 @@
  		else true; \
  		fi; \
  	    done;
--	@echo "Installing tk.h"
--	@$(INSTALL_DATA) $(GENERIC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
+-	@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \
 +	@echo "Installing headers"
 +	@for i in $(GENERIC_DIR)/*.h ; \
 +	    do \
@@ -99,15 +103,17 @@
 +	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
 +	    done;
 +	@for i in $(UNIX_DIR)/*.h ; \
-+	    do \
-+	    echo "Installing $$i"; \
+ 	    do \
+ 	    echo "Installing $$i"; \
+-	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
 +	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
-+	    done;
+ 	    done;
 +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
++	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkDecls.h $(INCLUDE_INSTALL_DIR)/tkDecls.h
  	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -466,30 +491,27 @@
+@@ -513,30 +537,27 @@
  	@cd $(SRC_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
diff --git a/x11-toolkits/tk83/pkg-plist b/x11-toolkits/tk83/pkg-plist
index 18dc742aa134..d66214bbe293 100644
--- a/x11-toolkits/tk83/pkg-plist
+++ b/x11-toolkits/tk83/pkg-plist
@@ -6,24 +6,31 @@ include/tk8.1/generic/tk3d.h
 include/tk8.1/generic/tkButton.h
 include/tk8.1/generic/tkCanvas.h
 include/tk8.1/generic/tkColor.h
+include/tk8.1/generic/tkDecls.h
 include/tk8.1/generic/tkFileFilter.h
 include/tk8.1/generic/tkFont.h
 include/tk8.1/generic/tkInitScript.h
 include/tk8.1/generic/tkInt.h
+include/tk8.1/generic/tkIntDecls.h
+include/tk8.1/generic/tkIntPlatDecls.h
+include/tk8.1/generic/tkIntXlibDecls.h
 include/tk8.1/generic/tkMenu.h
 include/tk8.1/generic/tkMenubutton.h
+include/tk8.1/generic/tkPlatDecls.h
 include/tk8.1/generic/tkPort.h
 include/tk8.1/generic/tkScale.h
 include/tk8.1/generic/tkScrollbar.h
 include/tk8.1/generic/tkSelect.h
 include/tk8.1/generic/tkText.h
 include/tk8.1/tk.h
+include/tk8.1/tkDecls.h
 include/tk8.1/unix/tkUnixDefault.h
 include/tk8.1/unix/tkUnixInt.h
 include/tk8.1/unix/tkUnixPort.h
 lib/libtk81.a
 lib/libtk81.so
 lib/libtk81.so.1
+lib/libtkstub81.a
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/tk8.1/bgerror.tcl
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index b42fbd864757..872bcf1aa13a 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	tk8.1
-# Version required:	8.1a2
+# Version required:	8.1
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.23 1999/05/04 20:50:08 fenner Exp $
+# $Id: Makefile,v 1.24 1999/05/04 21:03:55 fenner Exp $
 #
 
-DISTNAME=	tk8.1b1
-PKGNAME=	tk-8.1.b1
+DISTNAME=	tk8.1
+PKGNAME=	tk-8.1
 CATEGORIES=	x11-toolkits tk81
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
 
@@ -17,7 +17,6 @@ LIB_DEPENDS=	tcl81.1:${PORTSDIR}/lang/tcl81
 FILE_DEPENDS=	${PORTSDIR}/x11-toolkits/tk80
 
 USE_XLIB=	yes
-NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
@@ -38,9 +37,9 @@ MAN3=	3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \
 	MapWindow.3 MeasureChar.3 MoveToplev.3 Name.3 NameOfImg.3 OwnSelect.3 \
 	ParseArgv.3 QWinEvent.3 Restack.3 RestrictEv.3 SetAppName.3 \
 	SetClass.3 SetGrid.3 SetOptions.3 SetVisual.3 StrictMotif.3 \
-	TextLayout.3 Tk_Init.3 Tk_Main.3 WindowId.3
+	TextLayout.3 Tk_Init.3 Tk_InitStubs.3 Tk_Main.3 WindowId.3
 MANN=	bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
-	chooseColor.n clipboard.n dde.n destroy.n dialog.n entry.n event.n \
+	chooseColor.n clipboard.n destroy.n dialog.n entry.n event.n \
 	focus.n focusNext.n font.n frame.n getOpenFile.n grab.n grid.n \
 	image.n label.n listbox.n loadTk.n lower.n menu.n menubar.n \
 	menubutton.n message.n messageBox.n option.n optionMenu.n options.n \
@@ -293,6 +292,9 @@ MANCOMPRESSED=	yes
 
 .include <bsd.port.pre.mk>
 
+post-extract:   
+	${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \
+	      ${WRKDIR}/${DISTNAME}/doc/Tk_InitStubs.3
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PKGINSTALL})
diff --git a/x11-toolkits/tk84/distinfo b/x11-toolkits/tk84/distinfo
index c57202986b5e..6a4643902080 100644
--- a/x11-toolkits/tk84/distinfo
+++ b/x11-toolkits/tk84/distinfo
@@ -1 +1 @@
-MD5 (tk8.1b1.tar.gz) = 13164e3d3c5918315988615523f43e56
+MD5 (tk8.1.tar.gz) = 4447b2e0ad596c139df928aabe83e551
diff --git a/x11-toolkits/tk84/files/patch-aa b/x11-toolkits/tk84/files/patch-aa
index f858d13c6249..66ed07aecf62 100644
--- a/x11-toolkits/tk84/files/patch-aa
+++ b/x11-toolkits/tk84/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Fri Dec 11 17:38:40 1998
-+++ configure	Sun Jan 24 16:12:10 1999
-@@ -854,14 +854,14 @@
+--- configure.orig	Fri Apr 30 08:27:45 1999
++++ configure	Mon May 10 00:20:26 1999
+@@ -956,14 +956,14 @@
    withval="$with_tcl"
    TCL_BIN_DIR=$withval
  else
@@ -18,7 +18,7 @@
  fi
  
  #--------------------------------------------------------------------
-@@ -902,6 +902,8 @@
+@@ -1004,6 +1004,8 @@
  CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
  EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
  
@@ -27,18 +27,18 @@
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -2302,7 +2304,7 @@
+@@ -2450,7 +2452,7 @@
  if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
      TK_SHARED_BUILD=1
      TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
 -    TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
 +    TK_LIB_FILE=${TK_LIB_FILE}
-     MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
+     MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_BUILD_STUB_LIB_SPEC} \${LIBS}"
      RANLIB=":"
- else
-@@ -2513,6 +2515,7 @@
- s%@SHLIB_VERSION@%$SHLIB_VERSION%g
+ 
+@@ -2729,6 +2731,7 @@
  s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
+ s%@TCL_BUILD_STUB_LIB_SPEC@%$TCL_BUILD_STUB_LIB_SPEC%g
  s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
 +s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
  s%@TCL_DBGX@%$TCL_DBGX%g
diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab
index 51b05794bf3a..d907e5809b46 100644
--- a/x11-toolkits/tk84/files/patch-ab
+++ b/x11-toolkits/tk84/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Dec 11 17:38:40 1998
-+++ Makefile.in	Sun Jan 24 16:16:06 1999
+--- Makefile.in.orig	Fri Apr 30 08:27:45 1999
++++ Makefile.in	Mon May 10 01:18:32 1999
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -20,16 +20,7 @@
  
  # A "-I" switch that can be used when compiling to make all of the
  # X11 include files accessible (the configure script will try to
-@@ -113,7 +115,7 @@
- 
- # Libraries to use when linking.  This definition is determined by the
- # configure script.
--LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
-+LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
- 
- # To turn off the security checks that disallow incoming sends when
- # the X server appears to be insecure, reverse the comments on the
-@@ -155,7 +157,7 @@
+@@ -152,7 +154,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
@@ -38,7 +29,16 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -320,8 +322,14 @@
+@@ -188,7 +190,7 @@
+ # Libraries to use when linking.  This definition is determined by the
+ # configure script.
+ LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
+-WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
++WISH_LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
+ 
+ # The symbol below provides support for dynamic loading and shared
+ # libraries.  See configure.in for a description of what it means.
+@@ -348,8 +350,14 @@
  ${TK_LIB_FILE}: ${OBJS}
  	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
@@ -50,19 +50,20 @@
 +	ar cr libtk81.a ${OBJS}
 +	$(RANLIB) libtk81.a
 +
- # Make target which outputs the list of the .o contained in the Tk lib
- # usefull to build a single big shared library containing Tcl/Tk and other
- # extensions.  used for the Tcl Plugin.  -- dl
-@@ -376,7 +384,7 @@
+ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+ 	rm -f ${STUB_LIB_FILE}
+ 	@MAKE_STUB_LIB@
+@@ -410,7 +418,8 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
--install-binaries: $(TK_LIB_FILE) wish
-+install-binaries: $(TK_LIB_FILE) libtk81.a wish
+-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
++install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) \
++		libtk81.a wish
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -388,15 +396,22 @@
+@@ -422,12 +431,18 @@
  	    done;
  	@echo "Installing $(TK_LIB_FILE)"
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@@ -79,6 +80,10 @@
 -	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
 +	@mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION)
 +	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh
+ 	@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
+ 	    echo "Installing $(TK_EXP_FILE)"; \
+ 	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
+@@ -441,6 +456,7 @@
  
  install-libraries:
  	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
@@ -86,12 +91,11 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -406,8 +421,18 @@
+@@ -450,11 +466,19 @@
  		else true; \
  		fi; \
  	    done;
--	@echo "Installing tk.h"
--	@$(INSTALL_DATA) $(GENERIC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
+-	@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \
 +	@echo "Installing headers"
 +	@for i in $(GENERIC_DIR)/*.h ; \
 +	    do \
@@ -99,15 +103,17 @@
 +	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
 +	    done;
 +	@for i in $(UNIX_DIR)/*.h ; \
-+	    do \
-+	    echo "Installing $$i"; \
+ 	    do \
+ 	    echo "Installing $$i"; \
+-	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
 +	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
-+	    done;
+ 	    done;
 +	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
++	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkDecls.h $(INCLUDE_INSTALL_DIR)/tkDecls.h
  	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -466,30 +491,27 @@
+@@ -513,30 +537,27 @@
  	@cd $(SRC_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
diff --git a/x11-toolkits/tk84/pkg-plist b/x11-toolkits/tk84/pkg-plist
index 18dc742aa134..d66214bbe293 100644
--- a/x11-toolkits/tk84/pkg-plist
+++ b/x11-toolkits/tk84/pkg-plist
@@ -6,24 +6,31 @@ include/tk8.1/generic/tk3d.h
 include/tk8.1/generic/tkButton.h
 include/tk8.1/generic/tkCanvas.h
 include/tk8.1/generic/tkColor.h
+include/tk8.1/generic/tkDecls.h
 include/tk8.1/generic/tkFileFilter.h
 include/tk8.1/generic/tkFont.h
 include/tk8.1/generic/tkInitScript.h
 include/tk8.1/generic/tkInt.h
+include/tk8.1/generic/tkIntDecls.h
+include/tk8.1/generic/tkIntPlatDecls.h
+include/tk8.1/generic/tkIntXlibDecls.h
 include/tk8.1/generic/tkMenu.h
 include/tk8.1/generic/tkMenubutton.h
+include/tk8.1/generic/tkPlatDecls.h
 include/tk8.1/generic/tkPort.h
 include/tk8.1/generic/tkScale.h
 include/tk8.1/generic/tkScrollbar.h
 include/tk8.1/generic/tkSelect.h
 include/tk8.1/generic/tkText.h
 include/tk8.1/tk.h
+include/tk8.1/tkDecls.h
 include/tk8.1/unix/tkUnixDefault.h
 include/tk8.1/unix/tkUnixInt.h
 include/tk8.1/unix/tkUnixPort.h
 lib/libtk81.a
 lib/libtk81.so
 lib/libtk81.so.1
+lib/libtkstub81.a
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/tk8.1/bgerror.tcl