Remove tcl from /usr/src, according to prior agreement. BTW, tcl-8.0 *is*

a port so there is nothing to be done on that side now.

Approved by:	jkh
===
To: "Jordan K. Hubbard" <jkh@time.cdrom.com>
cc: Andreas Klemm <andreas@klemm.gtn.com>, current@freebsd.org
Subject: Re: Make this a relese coordinator decision (was Re: ports-current/packages-current discontinued)
From: David Greenman <dg@root.com>
Date: Sun, 03 Aug 1997 20:23:31 -0700

>decision is, I'll respect it.

   Another chance to architect people's principles...I can hardly wait. Seems
quite appropriate for a Sunday - I just need to get one of those collection
plates (and money envelopes) so I can profit, too. :-)
   Tcl stays in /usr/src for now, but it needs to be kept up to date; same
for perl. If Jordan doesn't have "setup" (written in tcl) ready for 3.0,
then tcl will be yanked prior to the 3.0 release (and made into a port).
   As for the ports tree only supporting the last FreeBSD release, this seems
sensible to me. The "ports" have always been a moving target between releases
and the problem is only going to get worse when we expand to supporting other
processor architectures. In any case, Satoshi is and always has been in charge
of the ports tree and whatever he wants to do with it (within reason :-)) is
his decision.
   Does this cover the issue completely? I admit to deleting messages in this
thread with unusual fervor (people have FAR too much time on their hands!).
There's a fair bit of reasoning behind the above, but since everyone is sick
of arguing about this, I'll spare you the analysis.

-DG

David Greenman
Core-team/Principal Architect, The FreeBSD Project

7 files changed, 7 insertions, 417 deletions

diff --git a/Makefile.inc1 b/Makefile.inc1
index ffedf05..0cacaac 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile.inc1,v 1.5 1998/09/03 21:34:31 jb Exp $
+#	$Id: Makefile.inc1,v 1.6 1998/09/05 11:37:14 jb Exp $
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include
@@ -577,10 +577,6 @@ includes:
 	cd ${.CURDIR}/lib/libpcap;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/librpcsvc;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libskey;		${MAKE} beforeinstall
-.if !defined(NOTCL) && exists (${.CURDIR}/contrib/tcl) && \
-	exists(${.CURDIR}/usr.bin/tclsh) && exists (${.CURDIR}/lib/libtcl)
-	cd ${.CURDIR}/lib/libtcl;		${MAKE} installhdrs
-.endif
 	cd ${.CURDIR}/lib/libtermcap;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libcom_err;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libss;		${MAKE} -B hdrs beforeinstall
@@ -643,7 +639,6 @@ lib-tools:
 #
 # libcom_err must be built before libss.
 # libcrypt and libmd must be built before libskey.
-# libm must be built before libtcl.
 # libmytinfo must be built before libdialog and libncurses.
 # libncurses must be built before libdialog.
 # libtermcap must be built before libcurses, libedit and libreadline.
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 0e27f62..842e6b0 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -1,4 +1,4 @@
-#	$Id: BSD.usr.dist,v 1.117 1998/08/10 09:49:37 phk Exp $
+#	$Id: BSD.usr.dist,v 1.118 1998/08/16 10:32:15 jkh Exp $
 #
 
 /set type=dir uname=bin gname=bin mode=0755
@@ -32,10 +32,6 @@
 	..
 	stallion
 	..
-	tcl
-		http1.0
-		..
-	..
     ..
     libexec
         aout
diff --git a/lib/Makefile b/lib/Makefile
index bb7d6a6..7480afd 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.74 1998/08/30 01:45:47 jb Exp $
+#	$Id: Makefile,v 1.75 1998/09/02 15:02:18 bde Exp $
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
@@ -7,7 +7,6 @@
 # csu must be built before all shared libaries for ELF.
 # libcom_err must be built before libss.
 # libcrypt and libmd must be built before libskey.
-# libm must be built before libtcl.
 # libmytinfo must be built before libncurses.
 # libtermcap must be built before libcurses and libedit.
 #
@@ -18,7 +17,7 @@ SUBDIR=	${_csu} libcom_err ${_libcrypt} ${_libm} libmytinfo libtermcap \
 	libcompat libcurses ${_libdisk} libedit libf2c libfetch libftpio \
 	libgnumalloc libipx libkvm libmd libncurses libopie \
 	libpcap libresolv librpcsvc ${_libscsi} libskey libss libstand \
-	${_libtcl} ${_libtelnet} libutil ${_libvgl} libxpg4 liby libz
+	${_libtelnet} libutil ${_libvgl} libxpg4 liby libz
 
 .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT})
 _csu=csu/${MACHINE_ARCH}-${OBJFORMAT}
@@ -45,11 +44,6 @@ _libscsi=	libscsi
 _libvgl=	libvgl
 .endif
 
-.if !defined(NOTCL) && exists (${.CURDIR}/../contrib/tcl) && \
-    exists(${.CURDIR}/../usr.bin/tclsh) && exists (${.CURDIR}/libtcl)
-_libtcl=	libtcl
-.endif
-
 .if defined(WANT_CSRG_LIBM)
 _libm=		libm
 .else
diff --git a/lib/libtcl/Makefile b/lib/libtcl/Makefile
deleted file mode 100644
index 91fd46b..0000000
--- a/lib/libtcl/Makefile
+++ /dev/null
@@ -1,367 +0,0 @@
-# $Id$
-#
-# This file is generated automatically, do not edit it here!
-#
-# Please change src/tools/tools/tcl_bmake/mkMakefile.sh instead
-#
-# Generated by src/tools/tools/tcl_bmake/mkMakefile.sh version:
-# Id: mkMakefile.sh,v 1.29 1998/03/23 13:15:41 bde Exp 
-#
-
-TCLDIST=${.CURDIR}/../../contrib/tcl
-
-.PATH: ${TCLDIST}/generic
-.PATH: ${TCLDIST}/unix
-.PATH: ${TCLDIST}/doc
-
-CFLAGS+=  -I${TCLDIST}/generic
-CFLAGS+=  -I${TCLDIST}/unix
-
-TCL_LIBRARY=	/usr/libdata/tcl
-SHLIB_MAJOR=	80
-SHLIB_MINOR=	4
-
-LIB=    tcl
-
-CFLAGS+= -DHAVE_GETCWD=1 -DNO_VALUES_H=1 -DHAVE_UNISTD_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DNEED_MATHERR=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1 -DTCL_SHLIB_EXT=\".so\"
-CFLAGS+=	-DTCL_LIBRARY=\"${TCL_LIBRARY}\"
-CFLAGS+=	-DTCL_PACKAGE_PATH=\"/usr/libdata/tcl\"
-
-LDADD+= -lm
-DPADD+= ${LIBM}
-
-SRCS=	panic.c regexp.c tclAsync.c tclBasic.c tclBinary.c tclCkalloc.c \
-	tclClock.c tclCmdAH.c tclCmdIL.c tclCmdMZ.c tclCompExpr.c \
-	tclCompile.c tclDate.c tclEnv.c tclEvent.c tclExecute.c \
-	tclFCmd.c tclFileName.c tclGet.c tclHash.c tclHistory.c \
-	tclIndexObj.c tclInterp.c tclIO.c tclIOCmd.c tclIOSock.c \
-	tclIOUtil.c tclLink.c tclListObj.c tclLoad.c tclMain.c \
-	tclNamesp.c tclNotify.c tclObj.c tclParse.c tclPipe.c tclPkg.c \
-	tclPosixStr.c tclPreserve.c tclProc.c tclStringObj.c tclTimer.c \
-	tclUtil.c tclVar.c tclMtherr.c tclUnixChan.c tclUnixEvent.c \
-	tclUnixFCmd.c tclUnixFile.c tclUnixPipe.c tclUnixSock.c \
-	tclUnixTime.c tclUnixInit.c tclUnixNotfy.c tclLoadDl.c
-
-beforeinstall: installhdrs
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${TCLDIST}/library/tclIndex ${DESTDIR}${TCL_LIBRARY} 
-	( cd ${TCLDIST}/library && \
-	for e in . http1.0 ; do \
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-		$$e/*.tcl ${DESTDIR}${TCL_LIBRARY}/$$e ; \
-	done )
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${TCLDIST}/doc/man.macros ${DESTDIR}/usr/share/tmac/tcl.macros
-
-installhdrs:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${TCLDIST}/generic/tcl.h ${DESTDIR}/usr/include/tcl
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${TCLDIST}/unix/tclAppInit.c ${DESTDIR}${TCL_LIBRARY}
-
-MANFILTER=sed "/\.so *man.macros/s;.*;.so /usr/share/tmac/tcl.macros;"
-
-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 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 \
-	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
-
-MAN3+=	Tcl_AddObjErrorInfo.3 Tcl_Alloc.3 Tcl_AllowExceptions.3 \
-	Tcl_AppInit.3 Tcl_GetAssocData.3 Tcl_AsyncCreate.3 \
-	Tcl_BackgroundError.3 Tcl_Backslash.3 Tcl_NewBooleanObj.3 \
-	Tcl_CallWhenDeleted.3 Tcl_CommandComplete.3 Tcl_Concat.3 \
-	Tcl_CreateChannel.3 Tcl_CreateChannelHandler.3 \
-	Tcl_CreateCloseHandler.3 Tcl_CreateCommand.3 \
-	Tcl_CreateFileHandler.3 Tcl_CreateInterp.3 Tcl_CreateMathFunc.3 \
-	Tcl_CreateModalTimeout.3 Tcl_CreateObjCommand.3 Tcl_IsSafe.3 \
-	Tcl_CreateTimerHandler.3 Tcl_CreateTrace.3 Tcl_DStringInit.3 \
-	Tcl_DetachPids.3 Tcl_DoOneEvent.3 Tcl_DoWhenIdle.3 \
-	Tcl_NewDoubleObj.3 Tcl_Eval.3 Tcl_EvalObj.3 Tcl_Exit.3 \
-	Tcl_ExprLong.3 Tcl_ExprLongObj.3 Tcl_FindExecutable.3 \
-	Tcl_GetFile.3 Tcl_GetIndexFromObj.3 Tcl_GetInt.3 \
-	Tcl_GetOpenFile.3 Tcl_GetStdChannel.3 Tcl_InitHashTable.3 \
-	Tcl_NewIntObj.3 Tcl_Interp.3 Tcl_LinkVar.3 \
-	Tcl_ListObjAppendList.3 Tcl_CreateEventSource.3 Tcl_ObjSetVar2.3 \
-	Tcl_NewObj.3 Tcl_RegisterObjType.3 Tcl_OpenFileChannel.3 \
-	Tcl_OpenTcpClient.3 Tcl_PkgRequire.3 Tcl_Preserve.3 \
-	Tcl_PrintDouble.3 Tcl_RecordAndEvalObj.3 Tcl_RecordAndEval.3 \
-	Tcl_RegExpMatch.3 Tcl_SetErrno.3 Tcl_SetRecursionLimit.3 \
-	Tcl_SetObjResult.3 Tcl_SetVar.3 Tcl_Sleep.3 Tcl_SplitList.3 \
-	Tcl_SplitPath.3 Tcl_StaticPackage.3 Tcl_StringMatch.3 \
-	Tcl_NewStringObj.3 Tcl_Main.3 Tcl_TraceVar.3 \
-	Tcl_TranslateFileName.3 Tcl_UpVar.3 Tcl_WrongNumArgs.3
-
-MLINKS+= Tcl_AddObjErrorInfo.3 Tcl_AddErrorInfo.3 
-MLINKS+= Tcl_AddObjErrorInfo.3 Tcl_SetErrorCode.3 
-MLINKS+= Tcl_AddObjErrorInfo.3 Tcl_PosixError.3 
-MLINKS+= Tcl_Alloc.3 Tcl_Free.3 
-MLINKS+= Tcl_Alloc.3 Tcl_Realloc.3 
-MLINKS+= Tcl_GetAssocData.3 Tcl_SetAssocData.3 
-MLINKS+= Tcl_GetAssocData.3 Tcl_DeleteAssocData.3 
-MLINKS+= Tcl_AsyncCreate.3 Tcl_AsyncMark.3 
-MLINKS+= Tcl_AsyncCreate.3 Tcl_AsyncInvoke.3 
-MLINKS+= Tcl_AsyncCreate.3 Tcl_AsyncDelete.3 
-MLINKS+= Tcl_NewBooleanObj.3 Tcl_SetBooleanObj.3 
-MLINKS+= Tcl_NewBooleanObj.3 Tcl_GetBooleanFromObj.3 
-MLINKS+= Tcl_CallWhenDeleted.3 Tcl_DontCallWhenDeleted.3 
-MLINKS+= Tcl_CreateChannel.3 Tcl_GetChannelInstanceData.3 
-MLINKS+= Tcl_CreateChannel.3 Tcl_GetChannelType.3 
-MLINKS+= Tcl_CreateChannel.3 Tcl_GetChannelName.3 
-MLINKS+= Tcl_CreateChannel.3 Tcl_GetChannelHandle.3 
-MLINKS+= Tcl_CreateChannel.3 Tcl_GetChannelMode.3 
-MLINKS+= Tcl_CreateChannel.3 Tcl_GetChannelBufferSize.3 
-MLINKS+= Tcl_CreateChannel.3 Tcl_SetDefaultTranslation.3 
-MLINKS+= Tcl_CreateChannel.3 Tcl_SetChannelBufferSize.3 
-MLINKS+= Tcl_CreateChannel.3 Tcl_NotifyChannel.3 
-MLINKS+= Tcl_CreateChannel.3 Tcl_BadChannelOption.3 
-MLINKS+= Tcl_CreateChannelHandler.3 Tcl_DeleteChannelHandler.3 
-MLINKS+= Tcl_CreateCloseHandler.3 Tcl_DeleteCloseHandler.3 
-MLINKS+= Tcl_CreateFileHandler.3 Tcl_DeleteFileHandler.3 
-MLINKS+= Tcl_CreateInterp.3 Tcl_DeleteInterp.3 
-MLINKS+= Tcl_CreateInterp.3 Tcl_InterpDeleted.3 
-MLINKS+= Tcl_CreateModalTimeout.3 Tcl_DeleteModalTimeout.3 
-MLINKS+= Tcl_CreateObjCommand.3 Tcl_DeleteCommand.3 
-MLINKS+= Tcl_CreateObjCommand.3 Tcl_DeleteCommandFromToken.3 
-MLINKS+= Tcl_CreateObjCommand.3 Tcl_GetCommandInfo.3 
-MLINKS+= Tcl_CreateObjCommand.3 Tcl_SetCommandInfo.3 
-MLINKS+= Tcl_CreateObjCommand.3 Tcl_GetCommandName.3 
-MLINKS+= Tcl_IsSafe.3 Tcl_MakeSafe.3 
-MLINKS+= Tcl_IsSafe.3 Tcl_CreateSlave.3 
-MLINKS+= Tcl_IsSafe.3 Tcl_GetSlave.3 
-MLINKS+= Tcl_IsSafe.3 Tcl_GetMaster.3 
-MLINKS+= Tcl_IsSafe.3 Tcl_GetInterpPath.3 
-MLINKS+= Tcl_IsSafe.3 Tcl_CreateAlias.3 
-MLINKS+= Tcl_IsSafe.3 Tcl_CreateAliasObj.3 
-MLINKS+= Tcl_IsSafe.3 Tcl_GetAlias.3 
-MLINKS+= Tcl_IsSafe.3 Tcl_GetAliasObj.3 
-MLINKS+= Tcl_IsSafe.3 Tcl_ExposeCommand.3 
-MLINKS+= Tcl_IsSafe.3 Tcl_HideCommand.3 
-MLINKS+= Tcl_CreateTimerHandler.3 Tcl_DeleteTimerHandler.3 
-MLINKS+= Tcl_CreateTrace.3 Tcl_DeleteTrace.3 
-MLINKS+= Tcl_DStringInit.3 Tcl_DStringAppend.3 
-MLINKS+= Tcl_DStringInit.3 Tcl_DStringAppendElement.3 
-MLINKS+= Tcl_DStringInit.3 Tcl_DStringStartSublist.3 
-MLINKS+= Tcl_DStringInit.3 Tcl_DStringEndSublist.3 
-MLINKS+= Tcl_DStringInit.3 Tcl_DStringLength.3 
-MLINKS+= Tcl_DStringInit.3 Tcl_DStringValue.3 
-MLINKS+= Tcl_DStringInit.3 Tcl_DStringSetLength.3 
-MLINKS+= Tcl_DStringInit.3 Tcl_DStringFree.3 
-MLINKS+= Tcl_DStringInit.3 Tcl_DStringResult.3 
-MLINKS+= Tcl_DStringInit.3 Tcl_DStringGetResult.3 
-MLINKS+= Tcl_DetachPids.3 Tcl_ReapDetachedProcs.3 
-MLINKS+= Tcl_DoWhenIdle.3 Tcl_CancelIdleCall.3 
-MLINKS+= Tcl_NewDoubleObj.3 Tcl_SetDoubleObj.3 
-MLINKS+= Tcl_NewDoubleObj.3 Tcl_GetDoubleFromObj.3 
-MLINKS+= Tcl_Eval.3 Tcl_VarEval.3 
-MLINKS+= Tcl_Eval.3 Tcl_EvalFile.3 
-MLINKS+= Tcl_Eval.3 Tcl_GlobalEval.3 
-MLINKS+= Tcl_EvalObj.3 Tcl_GlobalEvalObj.3 
-MLINKS+= Tcl_Exit.3 Tcl_Finalize.3 
-MLINKS+= Tcl_Exit.3 Tcl_CreateExitHandler.3 
-MLINKS+= Tcl_Exit.3 Tcl_DeleteExitHandler.3 
-MLINKS+= Tcl_ExprLong.3 Tcl_ExprDouble.3 
-MLINKS+= Tcl_ExprLong.3 Tcl_ExprBoolean.3 
-MLINKS+= Tcl_ExprLong.3 Tcl_ExprString.3 
-MLINKS+= Tcl_ExprLongObj.3 Tcl_ExprDoubleObj.3 
-MLINKS+= Tcl_ExprLongObj.3 Tcl_ExprBooleanObj.3 
-MLINKS+= Tcl_ExprLongObj.3 Tcl_ExprObj.3 
-MLINKS+= Tcl_GetFile.3 Tcl_FreeFile.3 
-MLINKS+= Tcl_GetFile.3 Tcl_GetFileInfo.3 
-MLINKS+= Tcl_GetInt.3 Tcl_GetDouble.3 
-MLINKS+= Tcl_GetInt.3 Tcl_GetBoolean.3 
-MLINKS+= Tcl_GetStdChannel.3 Tcl_SetStdChannel.3 
-MLINKS+= Tcl_InitHashTable.3 Tcl_DeleteHashTable.3 
-MLINKS+= Tcl_InitHashTable.3 Tcl_CreateHashEntry.3 
-MLINKS+= Tcl_InitHashTable.3 Tcl_DeleteHashEntry.3 
-MLINKS+= Tcl_InitHashTable.3 Tcl_FindHashEntry.3 
-MLINKS+= Tcl_InitHashTable.3 Tcl_GetHashValue.3 
-MLINKS+= Tcl_InitHashTable.3 Tcl_SetHashValue.3 
-MLINKS+= Tcl_InitHashTable.3 Tcl_GetHashKey.3 
-MLINKS+= Tcl_InitHashTable.3 Tcl_FirstHashEntry.3 
-MLINKS+= Tcl_InitHashTable.3 Tcl_NextHashEntry.3 
-MLINKS+= Tcl_InitHashTable.3 Tcl_HashStats.3 
-MLINKS+= Tcl_NewIntObj.3 Tcl_NewLongObj.3 
-MLINKS+= Tcl_NewIntObj.3 Tcl_SetIntObj.3 
-MLINKS+= Tcl_NewIntObj.3 Tcl_SetLongObj.3 
-MLINKS+= Tcl_NewIntObj.3 Tcl_GetIntFromObj.3 
-MLINKS+= Tcl_NewIntObj.3 Tcl_GetLongFromObj.3 
-MLINKS+= Tcl_LinkVar.3 Tcl_UnlinkVar.3 
-MLINKS+= Tcl_LinkVar.3 Tcl_UpdateLinkedVar.3 
-MLINKS+= Tcl_ListObjAppendList.3 Tcl_ListObjAppendElement.3 
-MLINKS+= Tcl_ListObjAppendList.3 Tcl_NewListObj.3 
-MLINKS+= Tcl_ListObjAppendList.3 Tcl_SetListObj.3 
-MLINKS+= Tcl_ListObjAppendList.3 Tcl_ListObjGetElements.3 
-MLINKS+= Tcl_ListObjAppendList.3 Tcl_ListObjLength.3 
-MLINKS+= Tcl_ListObjAppendList.3 Tcl_ListObjIndex.3 
-MLINKS+= Tcl_ListObjAppendList.3 Tcl_ListObjReplace.3 
-MLINKS+= Tcl_CreateEventSource.3 Tcl_DeleteEventSource.3 
-MLINKS+= Tcl_CreateEventSource.3 Tcl_SetMaxBlockTime.3 
-MLINKS+= Tcl_CreateEventSource.3 Tcl_QueueEvent.3 
-MLINKS+= Tcl_CreateEventSource.3 Tcl_DeleteEvents.3 
-MLINKS+= Tcl_CreateEventSource.3 Tcl_WaitForEvent.3 
-MLINKS+= Tcl_CreateEventSource.3 Tcl_SetTimer.3 
-MLINKS+= Tcl_CreateEventSource.3 Tcl_ServiceAll.3 
-MLINKS+= Tcl_CreateEventSource.3 Tcl_ServiceEvent.3 
-MLINKS+= Tcl_CreateEventSource.3 Tcl_GetServiceMode.3 
-MLINKS+= Tcl_CreateEventSource.3 Tcl_SetServiceMode.3 
-MLINKS+= Tcl_ObjSetVar2.3 Tcl_ObjGetVar2.3 
-MLINKS+= Tcl_NewObj.3 Tcl_DuplicateObj.3 
-MLINKS+= Tcl_NewObj.3 Tcl_IncrRefCount.3 
-MLINKS+= Tcl_NewObj.3 Tcl_DecrRefCount.3 
-MLINKS+= Tcl_NewObj.3 Tcl_IsShared.3 
-MLINKS+= Tcl_RegisterObjType.3 Tcl_GetObjType.3 
-MLINKS+= Tcl_RegisterObjType.3 Tcl_AppendAllObjTypes.3 
-MLINKS+= Tcl_RegisterObjType.3 Tcl_ConvertToType.3 
-MLINKS+= Tcl_OpenFileChannel.3 Tcl_OpenCommandChannel.3 
-MLINKS+= Tcl_OpenFileChannel.3 Tcl_MakeFileChannel.3 
-MLINKS+= Tcl_OpenFileChannel.3 Tcl_GetChannel.3 
-MLINKS+= Tcl_OpenFileChannel.3 Tcl_RegisterChannel.3 
-MLINKS+= Tcl_OpenFileChannel.3 Tcl_UnregisterChannel.3 
-MLINKS+= Tcl_OpenFileChannel.3 Tcl_Close.3 
-MLINKS+= Tcl_OpenFileChannel.3 Tcl_Read.3 
-MLINKS+= Tcl_OpenFileChannel.3 Tcl_Gets.3 
-MLINKS+= Tcl_OpenFileChannel.3 Tcl_Write.3 
-MLINKS+= Tcl_OpenFileChannel.3 Tcl_Flush.3 
-MLINKS+= Tcl_OpenFileChannel.3 Tcl_Seek.3 
-MLINKS+= Tcl_OpenFileChannel.3 Tcl_Tell.3 
-MLINKS+= Tcl_OpenFileChannel.3 Tcl_Eof.3 
-MLINKS+= Tcl_OpenFileChannel.3 Tcl_InputBlocked.3 
-MLINKS+= Tcl_OpenFileChannel.3 Tcl_InputBuffered.3 
-MLINKS+= Tcl_OpenFileChannel.3 Tcl_GetChannelOption.3 
-MLINKS+= Tcl_OpenFileChannel.3 Tcl_SetChannelOption.3 
-MLINKS+= Tcl_OpenTcpClient.3 Tcl_MakeTcpClientChannel.3 
-MLINKS+= Tcl_OpenTcpClient.3 Tcl_OpenTcpServer.3 
-MLINKS+= Tcl_PkgRequire.3 Tcl_PkgProvide.3 
-MLINKS+= Tcl_Preserve.3 Tcl_Release.3 
-MLINKS+= Tcl_Preserve.3 Tcl_EventuallyFree.3 
-MLINKS+= Tcl_RegExpMatch.3 Tcl_RegExpCompile.3 
-MLINKS+= Tcl_RegExpMatch.3 Tcl_RegExpExec.3 
-MLINKS+= Tcl_RegExpMatch.3 Tcl_RegExpRange.3 
-MLINKS+= Tcl_SetErrno.3 Tcl_GetErrno.3 
-MLINKS+= Tcl_SetObjResult.3 Tcl_GetObjResult.3 
-MLINKS+= Tcl_SetObjResult.3 Tcl_SetResult.3 
-MLINKS+= Tcl_SetObjResult.3 Tcl_GetStringResult.3 
-MLINKS+= Tcl_SetObjResult.3 Tcl_AppendResult.3 
-MLINKS+= Tcl_SetObjResult.3 Tcl_AppendElement.3 
-MLINKS+= Tcl_SetObjResult.3 Tcl_ResetResult.3 
-MLINKS+= Tcl_SetVar.3 Tcl_SetVar2.3 
-MLINKS+= Tcl_SetVar.3 Tcl_GetVar.3 
-MLINKS+= Tcl_SetVar.3 Tcl_GetVar2.3 
-MLINKS+= Tcl_SetVar.3 Tcl_UnsetVar.3 
-MLINKS+= Tcl_SetVar.3 Tcl_UnsetVar2.3 
-MLINKS+= Tcl_SplitList.3 Tcl_Merge.3 
-MLINKS+= Tcl_SplitList.3 Tcl_ScanElement.3 
-MLINKS+= Tcl_SplitList.3 Tcl_ConvertElement.3 
-MLINKS+= Tcl_SplitPath.3 Tcl_JoinPath.3 
-MLINKS+= Tcl_SplitPath.3 Tcl_GetPathType.3 
-MLINKS+= Tcl_NewStringObj.3 Tcl_SetStringObj.3 
-MLINKS+= Tcl_NewStringObj.3 Tcl_GetStringFromObj.3 
-MLINKS+= Tcl_NewStringObj.3 Tcl_AppendToObj.3 
-MLINKS+= Tcl_NewStringObj.3 Tcl_AppendStringsToObj.3 
-MLINKS+= Tcl_NewStringObj.3 Tcl_SetObjLength.3 
-MLINKS+= Tcl_NewStringObj.3 TclConcatObj.3 
-MLINKS+= Tcl_TraceVar.3 Tcl_TraceVar2.3 
-MLINKS+= Tcl_TraceVar.3 Tcl_UntraceVar.3 
-MLINKS+= Tcl_TraceVar.3 Tcl_UntraceVar2.3 
-MLINKS+= Tcl_TraceVar.3 Tcl_VarTraceInfo.3 
-MLINKS+= Tcl_TraceVar.3 Tcl_VarTraceInfo2.3 
-MLINKS+= Tcl_UpVar.3 Tcl_UpVar2.3 
-
-# Ugly, I know, but what else can I do?!?
-TCLMAN+= Tcl_AddObjErrorInfo.3 AddErrInfo.3
-TCLMAN+= Tcl_Alloc.3 Alloc.3
-TCLMAN+= Tcl_AllowExceptions.3 AllowExc.3
-TCLMAN+= Tcl_AppInit.3 AppInit.3
-TCLMAN+= Tcl_GetAssocData.3 AssocData.3
-TCLMAN+= Tcl_AsyncCreate.3 Async.3
-TCLMAN+= Tcl_BackgroundError.3 BackgdErr.3
-TCLMAN+= Tcl_Backslash.3 Backslash.3
-TCLMAN+= Tcl_NewBooleanObj.3 BoolObj.3
-TCLMAN+= Tcl_CallWhenDeleted.3 CallDel.3
-TCLMAN+= Tcl_CommandComplete.3 CmdCmplt.3
-TCLMAN+= Tcl_Concat.3 Concat.3
-TCLMAN+= Tcl_CreateChannel.3 CrtChannel.3
-TCLMAN+= Tcl_CreateChannelHandler.3 CrtChnlHdlr.3
-TCLMAN+= Tcl_CreateCloseHandler.3 CrtCloseHdlr.3
-TCLMAN+= Tcl_CreateCommand.3 CrtCommand.3
-TCLMAN+= Tcl_CreateFileHandler.3 CrtFileHdlr.3
-TCLMAN+= Tcl_CreateInterp.3 CrtInterp.3
-TCLMAN+= Tcl_CreateMathFunc.3 CrtMathFnc.3
-TCLMAN+= Tcl_CreateModalTimeout.3 CrtModalTmt.3
-TCLMAN+= Tcl_CreateObjCommand.3 CrtObjCmd.3
-TCLMAN+= Tcl_IsSafe.3 CrtSlave.3
-TCLMAN+= Tcl_CreateTimerHandler.3 CrtTimerHdlr.3
-TCLMAN+= Tcl_CreateTrace.3 CrtTrace.3
-TCLMAN+= Tcl_DStringInit.3 DString.3
-TCLMAN+= Tcl_DetachPids.3 DetachPids.3
-TCLMAN+= Tcl_DoOneEvent.3 DoOneEvent.3
-TCLMAN+= Tcl_DoWhenIdle.3 DoWhenIdle.3
-TCLMAN+= Tcl_NewDoubleObj.3 DoubleObj.3
-TCLMAN+= Tcl_Eval.3 Eval.3
-TCLMAN+= Tcl_EvalObj.3 EvalObj.3
-TCLMAN+= Tcl_Exit.3 Exit.3
-TCLMAN+= Tcl_ExprLong.3 ExprLong.3
-TCLMAN+= Tcl_ExprLongObj.3 ExprLongObj.3
-TCLMAN+= Tcl_FindExecutable.3 FindExec.3
-TCLMAN+= Tcl_GetFile.3 GetFile.3
-TCLMAN+= Tcl_GetIndexFromObj.3 GetIndex.3
-TCLMAN+= Tcl_GetInt.3 GetInt.3
-TCLMAN+= Tcl_GetOpenFile.3 GetOpnFl.3
-TCLMAN+= Tcl_GetStdChannel.3 GetStdChan.3
-TCLMAN+= Tcl_InitHashTable.3 Hash.3
-TCLMAN+= Tcl_NewIntObj.3 IntObj.3
-TCLMAN+= Tcl_Interp.3 Interp.3
-TCLMAN+= Tcl_LinkVar.3 LinkVar.3
-TCLMAN+= Tcl_ListObjAppendList.3 ListObj.3
-TCLMAN+= Tcl_CreateEventSource.3 Notifier.3
-TCLMAN+= Tcl_ObjSetVar2.3 ObjSetVar.3
-TCLMAN+= Tcl_NewObj.3 Object.3
-TCLMAN+= Tcl_RegisterObjType.3 ObjectType.3
-TCLMAN+= Tcl_OpenFileChannel.3 OpenFileChnl.3
-TCLMAN+= Tcl_OpenTcpClient.3 OpenTcp.3
-TCLMAN+= Tcl_PkgRequire.3 PkgRequire.3
-TCLMAN+= Tcl_Preserve.3 Preserve.3
-TCLMAN+= Tcl_PrintDouble.3 PrintDbl.3
-TCLMAN+= Tcl_RecordAndEvalObj.3 RecEvalObj.3
-TCLMAN+= Tcl_RecordAndEval.3 RecordEval.3
-TCLMAN+= Tcl_RegExpMatch.3 RegExp.3
-TCLMAN+= Tcl_SetErrno.3 SetErrno.3
-TCLMAN+= Tcl_SetRecursionLimit.3 SetRecLmt.3
-TCLMAN+= Tcl_SetObjResult.3 SetResult.3
-TCLMAN+= Tcl_SetVar.3 SetVar.3
-TCLMAN+= Tcl_Sleep.3 Sleep.3
-TCLMAN+= Tcl_SplitList.3 SplitList.3
-TCLMAN+= Tcl_SplitPath.3 SplitPath.3
-TCLMAN+= Tcl_StaticPackage.3 StaticPkg.3
-TCLMAN+= Tcl_StringMatch.3 StrMatch.3
-TCLMAN+= Tcl_NewStringObj.3 StringObj.3
-TCLMAN+= Tcl_Main.3 Tcl_Main.3
-TCLMAN+= Tcl_TraceVar.3 TraceVar.3
-TCLMAN+= Tcl_TranslateFileName.3 Translate.3
-TCLMAN+= Tcl_UpVar.3 UpVar.3
-TCLMAN+= Tcl_WrongNumArgs.3 WrongNumArgs.3
-
-_tcltmp=
-_tclprev=
-.for _tclpage in ${TCLMAN}
-.if !empty(_tclprev)
-_tcltmp:= ${_tcltmp} ${_tclprev}	# assign with expansion
-${_tclprev}: ${TCLDIST}/doc/${_tclpage}
-	cp -f ${.ALLSRC} ${.TARGET}
-_tclprev=
-.else
-_tclprev=${_tclpage}
-.endif
-.endfor
-CLEANFILES+= ${_tcltmp}
-
-.include <bsd.lib.mk>
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index f37435d..0a96be8 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/7/94
-#	$Id: Makefile,v 1.108 1998/08/30 02:48:12 jb Exp $
+#	$Id: Makefile,v 1.109 1998/08/30 20:28:50 gpalmer Exp $
 
 # XXX MISSING:		deroff diction graph learn plot
 #			spell spline struct xsend
@@ -221,9 +221,4 @@ SUBDIR+=doscmd
 .endif
 .endif
 
-.if !defined(NOTCL) && exists (${.CURDIR}/../contrib/tcl) && \
-	exists(${.CURDIR}/tclsh) && exists (${.CURDIR}/../lib/libtcl)
-SUBDIR+=tclsh
-.endif
-
 .include <bsd.subdir.mk>
diff --git a/usr.bin/tclsh/Makefile b/usr.bin/tclsh/Makefile
deleted file mode 100644
index c847be75..0000000
--- a/usr.bin/tclsh/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: Makefile,v 1.5 1997/08/18 11:39:19 peter Exp $
-
-PROG=   tclsh
-SRCS=   tclAppInit.c
-
-BINDIR= /usr/bin
-
-.PATH: ${DESTDIR}/usr/libdata/tcl
-
-MAN1=   tclsh.1
-
-CLEANFILES=     ${MAN1}
-
-tclsh.1:        ${.CURDIR}/../../contrib/tcl/doc/tclsh.1
-	sed '/\.so *man.macros/s;.*;.so /usr/share/tmac/tcl.macros;' < ${.ALLSRC} > ${.TARGET}
-
-CFLAGS+= -I${DESTDIR}/usr/include/tcl
-LDADD+= -ltcl -lm
-DPADD+= ${LIBTCL} ${LIBM}
-
-.include <bsd.prog.mk>
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index f40fb04..13cbb22 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.21 1997/09/22 23:14:37 wosch Exp $
+# $Id: Makefile,v 1.22 1998/06/09 04:07:20 imp Exp $
 #
 # This has most of the glue needed to compile tknvi and the perl hooks,
 # but not all.
@@ -14,9 +14,7 @@ APISTUFF=	ex_notcl.c ex_noperl.c
 
 .else
 
-.if !defined(NOTCL)
-#TCLINTERP=	yes	#we have it in the base tree, little cost to vi
-.endif
+#TCLINTERP=	yes	#we don't have it in the base tree
 #TKNVI=		yes	#not ready, needs X11, tk, doesn't quite work yet
 #PERLINTERP=	yes	#needs the perl5 v5.003 port