Upgrade to tcl-8.3.0

4 files changed, 68 insertions, 140 deletions

diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index 9023abae9bbf..60148f1fb597 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	tcl8.3.b1
+# New ports collection makefile for:	tcl8.3
 # Date created:		19 August 1997
 # Whom:			jkh
 #
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	tcl
-PORTVERSION=	8.3.b1
-CATEGORIES=	lang #tcl83
+PORTVERSION=	8.3.0
+CATEGORIES=	lang tcl83
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_3/
-DISTNAME=	tcl8.3b1
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	jseger@FreeBSD.org
 
@@ -32,15 +32,14 @@ MAN3=	Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.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 InitStubs.3 \
-	IntObj.3 Interp.3 LinkVar.3 ListObj.3 Notifier.3 Object.3 ObjectType.3 \
-	OpenFileChnl.3 OpenTcp.3 ParseCmd.3 PkgRequire.3 Preserve.3 \
-	PrintDbl.3 RecEvalObj.3 RecordEval.3 RegExp.3 SaveResult.3 SetErrno.3 \
-	SetRecLmt.3 SetResult.3 SetVar.3 Sleep.3 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
+	Exit.3 ExprLong.3 ExprLongObj.3 FindExec.3 GetCwd.3 GetHostName.3 \
+	GetIndex.3 GetInt.3 GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 \
+	InitStubs.3 IntObj.3 Interp.3 LinkVar.3 ListObj.3 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
 
 MANN=	Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \
 	catch.n cd.n clock.n close.n concat.n continue.n dde.n encoding.n \
@@ -49,11 +48,12 @@ MANN=	Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.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 \
-	re_syntax.n read.n regexp.n registry.n regsub.n rename.n resource.n \
-	return.n safe.n scan.n seek.n set.n socket.n source.n split.n \
-	string.n subst.n switch.n tcltest.n tclvars.n tell.n time.n trace.n \
-	unknown.n unset.n update.n uplevel.n upvar.n variable.n vwait.n while.n
+	namespace.n open.n package.n packagens.n pid.n pkgMkIndex.n proc.n \
+	puts.n pwd.n re_syntax.n read.n regexp.n registry.n regsub.n rename.n \
+	resource.n return.n safe.n scan.n seek.n set.n socket.n source.n \
+	split.n string.n subst.n switch.n tcltest.n tclvars.n tell.n time.n \
+	trace.n unknown.n unset.n update.n uplevel.n upvar.n variable.n \
+	vwait.n while.n
 
 # MLINKS generated via  awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks
 MLINKS=	Access.3 Tcl_Access.3 \
@@ -195,6 +195,7 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	FindExec.3 Tcl_GetNameOfExecutable.3 \
 	GetCwd.3 Tcl_GetCwd.3 \
 	GetCwd.3 Tcl_Chdir.3 \
+	GetHostName.3 Tcl_GetHostName.3 \
 	GetIndex.3 Tcl_GetIndexFromObj.3 \
 	GetInt.3 Tcl_GetInt.3 \
 	GetInt.3 Tcl_GetDouble.3 \
@@ -317,6 +318,8 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	SaveResult.3 Tcl_DiscardResult.3 \
 	SetErrno.3 Tcl_SetErrno.3 \
 	SetErrno.3 Tcl_GetErrno.3 \
+	SetErrno.3 Tcl_ErrnoId.3 \
+	SetErrno.3 Tcl_ErrnoMsg.3 \
 	SetRecLmt.3 Tcl_SetRecursionLimit.3 \
 	SetResult.3 Tcl_SetObjResult.3 \
 	SetResult.3 Tcl_GetObjResult.3 \
@@ -402,9 +405,10 @@ MLINKS=	Access.3 Tcl_Access.3 \
 	Utf.3 Tcl_UtfBackslash.3 \
 	WrongNumArgs.3 Tcl_WrongNumArgs.3 \
 	http.n Http.n \
+	packagens.n pkg::create.n \
 	pkgMkIndex.n pkg_mkIndex.n \
 	safe.n Safe\Base.n \
-	tcltest.n Tcltest.n \
+	tcltest.n Tcltest.n
 
 .include <bsd.port.pre.mk>
 
diff --git a/lang/tcl83/distinfo b/lang/tcl83/distinfo
index 1de9b42a35a3..dcc5dd1f02ea 100644
--- a/lang/tcl83/distinfo
+++ b/lang/tcl83/distinfo
@@ -1 +1 @@
-MD5 (tcl8.3b1.tar.gz) = e9066bbbded1f9586a99282560a517af
+MD5 (tcl8.3.0.tar.gz) = 0fc2ee5c79692fe13316d85939fda62b
diff --git a/lang/tcl83/files/patch-aa b/lang/tcl83/files/patch-aa
index 07db0c35ca9e..9a44e63c391f 100644
--- a/lang/tcl83/files/patch-aa
+++ b/lang/tcl83/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Wed Nov  3 21:37:24 1999
-+++ Makefile.in	Sun Nov 21 15:31:00 1999
+--- Makefile.in.orig	Thu Feb 10 06:09:57 2000
++++ Makefile.in	Mon Apr 24 09:58:51 2000
 @@ -48,7 +48,9 @@
  SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
  
@@ -38,11 +38,10 @@
  
  libraries:
  
-@@ -394,8 +396,14 @@
+@@ -394,8 +396,13 @@
  ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
  	rm -f ${TCL_LIB_FILE}
  	@MAKE_LIB@
-+	ln -sf ${TCL_LIB_FILE} libtcl${SHORT_TCL_VER}.so
  	$(RANLIB) ${TCL_LIB_FILE}
  
 +libtcl${SHORT_TCL_VER}.a: ${OBJS}
@@ -53,9 +52,9 @@
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f ${STUB_LIB_FILE}
  	@MAKE_STUB_LIB@
-@@ -504,8 +512,13 @@
- 	@echo "Installing $(TCL_LIB_FILE)"
- 	chmod +x $(SRC_DIR)/install-sh
+@@ -506,8 +514,13 @@
+ 	    fi
+ 	@echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
 +	@ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
@@ -65,19 +64,21 @@
 +	@(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl${SHORT_TCL_VER}.a)
 +	@chmod 555 $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a
  	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
- 	    echo "Installing $(TCL_EXP_FILE)"; \
+ 	    echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
-@@ -514,7 +527,8 @@
- 	@echo "Installing tclsh"
+@@ -515,8 +528,9 @@
+ 	    fi
+ 	@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
  	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
- 	@echo "Installing tclConfig.sh"
+-	@echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/"
 -	@$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh
++	@echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/"
 +	@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)"; \
+ 	    echo "Installing $(TCL_STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
-@@ -522,8 +536,8 @@
+@@ -524,8 +538,8 @@
  	    fi
  
  install-libraries: libraries
@@ -88,58 +89,46 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
-@@ -542,11 +556,20 @@
- 		fi; \
- 	    done;
- 	chmod +x $(SRC_DIR)/install-sh
+@@ -547,10 +561,16 @@
+ 	    chmod +x $(SRC_DIR)/install-sh; \
+ 	    fi
+ 	@echo "Installing header files";
 -	@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"; \
--	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
++	    do \
 +	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
- 	    done;
++	    done;
 +	@for i in $(UNIX_DIR)/*.h ; \
-+	    do \
-+	    echo "Installing $$i"; \
+ 	    do \
+-	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
 +	    $(INSTALL_DATA) $$i $(UNIX_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 library files to $(SCRIPT_INSTALL_DIR)";
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
  	    do \
- 	    echo "Installing $$i"; \
-@@ -579,21 +602,19 @@
- 	@cd $(TOP_DIR)/doc; for i in *.1; \
- 	    do \
- 	    echo "Installing doc/$$i"; \
--	    rm -f $(MAN1_INSTALL_DIR)/$$i; \
-+	    rm -f $(MAN1_INSTALL_DIR)/$$i ; \
- 	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
- 		    $$i > $(MAN1_INSTALL_DIR)/$$i; \
+@@ -591,7 +611,6 @@
  	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
  	    done;
--	$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
+ 	@echo "Cross-linking top-level (.1) docs";
+-	@$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
+ 	@echo "Installing C API (.3) docs";
  	@cd $(TOP_DIR)/doc; for i in *.3; \
  	    do \
- 	    echo "Installing doc/$$i"; \
--	    rm -f $(MAN3_INSTALL_DIR)/$$i; \
-+	    rm -f $(MAN3_INSTALL_DIR)/$$i ; \
- 	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
- 		    $$i > $(MAN3_INSTALL_DIR)/$$i; \
+@@ -601,7 +620,6 @@
  	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
  	    done;
--	$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
+ 	@echo "Cross-linking C API (.3) docs";
+-	@$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
+ 	@echo "Installing command (.n) docs";
  	@cd $(TOP_DIR)/doc; for i in *.n; \
  	    do \
- 	    echo "Installing doc/$$i"; \
-@@ -602,7 +623,14 @@
- 		    $$i > $(MANN_INSTALL_DIR)/$$i; \
+@@ -611,7 +629,14 @@
  	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
  	    done;
--	$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
+ 	@echo "Cross-linking command (.n) docs";
+-	@$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
 +	@echo "**********"
 +	@echo "IMPORTANT:"
 +	@echo "**********"
diff --git a/lang/tcl83/files/patch-ab b/lang/tcl83/files/patch-ab
index 85ee6265de11..3ea44c1a975d 100644
--- a/lang/tcl83/files/patch-ab
+++ b/lang/tcl83/files/patch-ab
@@ -1,15 +1,6 @@
---- configure.orig	Tue Dec 14 22:59:18 1999
-+++ configure	Wed Jan  5 00:56:06 2000
-@@ -4648,7 +4648,7 @@
-     EXTRA_CFLAGS=""
-     TCL_EXPORT_FILE_SUFFIX=""
-     UNSHARED_LIB_SUFFIX=""
--    TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
-+    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
-     ECHO_VERSION='`echo ${VERSION}`'
-     TCL_LIB_VERSIONS_OK=ok
-     CFLAGS_DEBUG=-g
-@@ -4892,7 +4892,7 @@
+--- configure.orig	Thu Feb 10 06:09:57 2000
++++ configure	Mon Apr 24 14:58:01 2000
+@@ -4902,7 +4902,7 @@
  	    LDFLAGS="-Wl,-Bexport"
  	    LD_SEARCH_FLAGS=""
  	    ;;
@@ -18,80 +9,24 @@
  	    # Not available on all versions:  check for include file.
  	    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-@@ -4922,16 +4922,20 @@
- fi
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  
- 		SHLIB_CFLAGS="-fpic"
--		SHLIB_LD="ld -Bshareable -x"
- 		SHLIB_LD_LIBS=""
- 		SHLIB_SUFFIX=".so"
- 		DL_OBJS="tclLoadDl.o"
- 		DL_LIBS=""
- 		LDFLAGS=""
- 		LD_SEARCH_FLAGS=""
--		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
-+	if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then
-+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
-+		SHLIB_LD="ld -shared -x -soname \$@"
-+	else
-+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
-+		SHLIB_LD="ld -Bshareable -x"
-+	fi
- 	    
- else
-   echo "$ac_t""no" 1>&6
-@@ -4954,17 +4958,6 @@
+@@ -4986,19 +4986,9 @@
+ 	    # FreeBSD doesn't handle version numbers with dots.
+ 
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
  	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
 -	FreeBSD-*)
 -	    # FreeBSD 3.* and greater have ELF.
--	    SHLIB_CFLAGS="-fpic"
+-	    SHLIB_CFLAGS="-fPIC"
 -	    SHLIB_LD="ld -Bshareable -x"
 -	    SHLIB_LD_LIBS=""
 -	    SHLIB_SUFFIX=".so"
 -	    DL_OBJS="tclLoadDl.o"
 -	    DL_LIBS=""
--	    LDFLAGS=""
+-	    LDFLAGS="-export-dynamic"
 -	    LD_SEARCH_FLAGS=""
 -	    ;;
  	NEXTSTEP-*)
  	    SHLIB_CFLAGS=""
  	    SHLIB_LD="cc -nostdlib -r"
-@@ -5371,7 +5364,7 @@
- 	SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}'
-     fi
-     if test "$UNSHARED_LIB_SUFFIX" = "" ; then
--	UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
-+	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-     fi
- 
-     
-@@ -5628,11 +5621,7 @@
- # up the Tcl library.
- 
- if test "$SHARED_BUILD" = "0" -o $TCL_NEEDS_EXP_FILE = 0; then
--    if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
--        TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}"
--    else
--        TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
--    fi
-+    TCL_LIB_FLAG="-ltcl${TCL_TRIM_DOTS}\${TCL_DBGX}"
-     TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
-     TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}"
- else
-@@ -5678,11 +5667,7 @@
- 
- TCL_STUB_LIB_FILE=${STUB_LIB_FILE}
- 
--if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
--    TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
--else
--    TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
--fi
-+TCL_STUB_LIB_FLAG="-ltclstub${TCL_TRIM_DOTS}\${TCL_DBGX}"
- 
- TCL_BUILD_STUB_LIB_SPEC="-L`pwd` ${TCL_STUB_LIB_FLAG}"
- TCL_STUB_LIB_SPEC="-L${exec_prefix}/lib ${TCL_STUB_LIB_FLAG}"