Upgrade to 8.3.5 after repocopy from lang/tclX82. No ports depend

on this yet, but should be switching now. The lang/tclX82 will go
away after the release.

Approved by: portmgr timeout (3 requests remain unanswered)

6 files changed, 319 insertions, 17 deletions

diff --git a/lang/tclX/files/patch-ab b/lang/tclX/files/patch-ab
index 886e9ac2b1a6..08abd86235d2 100644
--- a/lang/tclX/files/patch-ab
+++ b/lang/tclX/files/patch-ab
@@ -28,9 +28,7 @@
  
  tcl.tlib: ${TLIB_SRCS} autoload.tcl
  	-rm -f tcl.tlib tcl.tndx
-@@ -306,7 +307,7 @@
- buildhelp: tcl tcl.tndx
- 	rm -rf ${HELP_DIR} help help.tmp
+@@ -308,5 +308,5 @@
  	mkdir ${HELP_DIR}
 -	${BLDMANHELP} ${TCL_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tclmanpages \
 +	${BLDMANHELP} ${TCLX_TOOLS_SRC_DIR}/tclmanpages \
diff --git a/lang/tclX/files/patch-ac b/lang/tclX/files/patch-ac
index 0867456df65e..2546b1a81dfa 100644
--- a/lang/tclX/files/patch-ac
+++ b/lang/tclX/files/patch-ac
@@ -16,15 +16,13 @@
 +	    ${TK_SHLIB_LD_LIBS} ${TCLX_BUILD_LIB_SPEC}
 +	ln -sf ${TKX_SHLIB_NAME} `echo ${TKX_SHLIB_NAME} | sed 's/\.so.*$$/.so/'`
  
-@@ -199,7 +200,7 @@
- buildhelp:
- 	rm -rf ${HELP_DIR} help help.tmp
- 	mkdir ${HELP_DIR}
+@@ -199,5 +200,5 @@
+ 	mkdir -p ${HELP_DIR}
 -	${BLDMANHELP} ${TK_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tkmanpages \
 +	${BLDMANHELP} ${TCLX_TOOLS_SRC_DIR}/tkmanpages \
  	    ${HELP_DIR} Tk.brf
+ 	${INSTCOPY} ${HELP_DIR} ${INSTALL_ROOT}${TKX_INST_RUNTIME}/help
  
- #------------------------------------------------------------------------------
 @@ -227,9 +228,11 @@
  	    ${INSTCOPY} ${TKX_STLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB}; \
  	    ${RANLIB} ${INSTALL_ROOT}${TKX_INST_LIB}/${TKX_STLIB_NAME}; \
diff --git a/lang/tclX/files/patch-tcllib b/lang/tclX/files/patch-tcllib
new file mode 100644
index 000000000000..f0f84d807313
--- /dev/null
+++ b/lang/tclX/files/patch-tcllib
@@ -0,0 +1,7 @@
+--- runtcl.in	Tue Jul  6 22:47:14 1999
++++ runtcl.in	Fri Feb  7 16:45:41 2003
+@@ -3,3 +3,3 @@
+ 
+-TCL_LIBRARY="@TCL_LIBRARY_DIR@"
++TCL_LIBRARY="@TCL_LIB_DIR@"
+ TCLX_LIBRARY="@TCLX_RUNTIME_DIR@"
diff --git a/lang/tclX/files/patch-tkxshell b/lang/tclX/files/patch-tkxshell
index d9fa531b86f3..fcfdb3d4850d 100644
--- a/lang/tclX/files/patch-tkxshell
+++ b/lang/tclX/files/patch-tkxshell
@@ -5,12 +5,3 @@
  extern void		TkpDisplayWarning _ANSI_ARGS_((char *msg,
  			    char *title));
 +#endif
-@@ -407,7 +407,7 @@
-     Tk_MainLoop();
--    Tcl_DeleteInterp(interp);
- #ifdef TKX_SHELL
-     TclX_ShellExit(interp, 0);
- #else
-+    Tcl_DeleteInterp(interp);
-     Tcl_Exit(0);
- #endif
diff --git a/lang/tclX/files/patch-uidgid b/lang/tclX/files/patch-uidgid
new file mode 100644
index 000000000000..900e7b5b9680
--- /dev/null
+++ b/lang/tclX/files/patch-uidgid
@@ -0,0 +1,111 @@
+--- ../tcl/unix/tclXunixId.c	Thu Dec  2 22:02:08 1999
++++ ../tcl/unix/tclXunixId.c	Fri Jan 10 17:36:50 2003
+@@ -41,3 +41,3 @@
+ UseridToUsernameResult _ANSI_ARGS_((Tcl_Interp *interp,
+-                                    int         userId));
++                                    long        userId));
+ 
+@@ -49,3 +49,3 @@
+ GroupidToGroupnameResult _ANSI_ARGS_((Tcl_Interp *interp,
+-                                      int         groupId));
++                                      long        groupId));
+ 
+@@ -149,13 +149,13 @@
+ static int
+ UseridToUsernameResult (interp, userId)
+     Tcl_Interp *interp;
+-    int         userId;
++    long        userId;
+ {
+-    uid_t          uid = (uid_t) userId;
+-    struct passwd *pw = getpwuid (userId);
++    uid_t          uid = (uid_t)userId;
++    struct passwd *pw;
+     Tcl_Obj       *resultObj = Tcl_GetObjResult (interp);
+-    char          userIdString[16];
+ 
+-    if ((pw == NULL) || ((int) uid != userId)) {
+-	sprintf (userIdString, "%d", uid);
++    if ((long)uid != userId || (pw = getpwuid(uid)) == NULL) {
++	char	userIdString[32];
++	sprintf (userIdString, "%ld", userId);
+ 	Tcl_AppendStringsToObj (resultObj, 
+@@ -188,3 +188,3 @@
+     }
+-    Tcl_SetObjResult (interp, Tcl_NewIntObj (pw->pw_uid));
++    Tcl_SetObjResult (interp, Tcl_NewIntObj ((int)pw->pw_uid));
+     endpwent ();
+@@ -194,14 +194,13 @@
+ static int
+ GroupidToGroupnameResult (interp, groupId)
+     Tcl_Interp *interp;
+-    int         groupId;
++    long        groupId;
+ {
+-    gid_t          gid = (gid_t) groupId;
+-    struct group  *grp = getgrgid (groupId);
++    gid_t gid = (gid_t)groupId;
++    struct group  *grp = getgrgid (gid);
+     Tcl_Obj       *resultObj = Tcl_GetObjResult (interp);
+-    char          groupIdString[16];
+-
+-    sprintf (groupIdString, "%d", gid);
+ 
+-    if ((grp == NULL) || ((int) gid != groupId)) {
++    if ((long)gid != groupId || (grp = getgrgid (gid)) == NULL) {
++	char	groupIdString[32];
++	sprintf (groupIdString, "%ld", groupId);
+ 	Tcl_AppendStringsToObj (resultObj, 
+@@ -232,3 +231,3 @@
+     }
+-    Tcl_SetIntObj (resultObj, grp->gr_gid);
++    Tcl_SetLongObj (resultObj, (long)grp->gr_gid);
+     return TCL_OK;
+@@ -297,6 +296,6 @@
+     if (STREQU (subCommand, "user"))
+-        return UseridToUsernameResult (interp, geteuid ());
++        return UseridToUsernameResult (interp, (long)geteuid ());
+     
+     if (STREQU (subCommand, "userid")) {
+-	Tcl_SetObjResult (interp, Tcl_NewIntObj (geteuid ()));
++	Tcl_SetObjResult (interp, Tcl_NewLongObj ((long)geteuid ()));
+         return TCL_OK;
+@@ -305,6 +304,6 @@
+     if (STREQU (subCommand, "group"))
+-        return GroupidToGroupnameResult (interp, getegid ());
++        return GroupidToGroupnameResult (interp, (long)getegid ());
+     
+     if (STREQU (subCommand, "groupid")) {
+-	Tcl_SetObjResult (interp, Tcl_NewIntObj (getegid ()));
++	Tcl_SetObjResult (interp, Tcl_NewLongObj ((long)getegid ()));
+         return TCL_OK;
+@@ -419,3 +418,3 @@
+         if (symbolic) {
+-	    int    groupId = groups [groupIndex];
++	    gid_t groupId = groups [groupIndex];
+             grp = getgrgid (groupId);
+@@ -437,3 +436,3 @@
+         } else {
+-	    newObj = Tcl_NewIntObj(groups[groupIndex]);
++	    newObj = Tcl_NewLongObj((long)groups[groupIndex]);
+             Tcl_ListObjAppendElement (interp, 
+@@ -514,3 +513,3 @@
+     if (objc == 2) {
+-        return UseridToUsernameResult (interp, getuid ());
++        return UseridToUsernameResult (interp, (long)getuid ());
+     }
+@@ -552,3 +551,3 @@
+     if (objc == 2) {
+-	Tcl_SetObjResult (interp, Tcl_NewIntObj (getuid()));
++	Tcl_SetObjResult (interp, Tcl_NewLongObj ((long)getuid()));
+         return TCL_OK;
+@@ -583,3 +582,3 @@
+     if (objc == 2) {
+-        return GroupidToGroupnameResult (interp, getgid ());
++        return GroupidToGroupnameResult (interp, (long)getgid ());
+     }
+@@ -621,3 +620,3 @@
+     if (objc == 2) {
+-	Tcl_SetIntObj (Tcl_GetObjResult (interp), getgid());
++	Tcl_SetObjResult (interp, Tcl_NewLongObj((long)getgid()));
+         return TCL_OK;
diff --git a/lang/tclX/files/patch-warnings b/lang/tclX/files/patch-warnings
new file mode 100644
index 000000000000..2fe31571e722
--- /dev/null
+++ b/lang/tclX/files/patch-warnings
@@ -0,0 +1,197 @@
+--- ../tcl/generic/tclXbsearch.c	Wed Mar 31 01:37:43 1999
++++ ../tcl/generic/tclXbsearch.c	Fri Jan 10 15:53:14 2003
+@@ -45,3 +45,3 @@ TclProcKeyCompare _ANSI_ARGS_((binSearch
+ static int
+-ReadAndCompare _ANSI_ARGS_((off_t          fileOffset,
++ReadAndCompare _ANSI_ARGS_((int            fileOffset,
+                             binSearchCB_t *searchCBPtr));
+@@ -164,3 +164,3 @@ static int
+ ReadAndCompare (fileOffset, searchCBPtr)
+-    off_t          fileOffset;
++    int            fileOffset;
+     binSearchCB_t *searchCBPtr;
+@@ -254,3 +254,4 @@ BinSearch (searchCBPtr)
+ {
+-    off_t middle, high, low;
++    int   middle;
++    off_t high, low;
+ 
+--- ../tcl/generic/tclXdup.c	Wed Mar 31 01:37:43 1999
++++ ../tcl/generic/tclXdup.c	Fri Jan 10 16:27:00 2003
+@@ -202,5 +202,5 @@
+ {
+     Tcl_Channel newChannel;
+-    int bindFnum, fnum;
++    int fnum;
+     char *srcChannelId, *targetChannelId;
+ 
+@@ -214,24 +214,14 @@
+      * a dup.
+      */
+-    if (objv [1]->typePtr == Tcl_GetObjType ("int")) {
+-        bindFnum = TRUE;
+-    } else {
+-        srcChannelId = Tcl_GetStringFromObj (objv [1], NULL);
+-        if (ISDIGIT (srcChannelId [0])) {
+-            if (Tcl_ConvertToType (interp, objv [1],
+-                                   Tcl_GetObjType ("int")) != TCL_OK)
+-                goto badFnum;
+-            bindFnum = TRUE;
+-        } else {
+-            bindFnum = FALSE;
+-        }
+-    }
+-    if (bindFnum) {
+-        if (objc != 2)
+-            goto bind2ndArg;
+-        if (Tcl_GetIntFromObj (interp, objv [1], &fnum) != TCL_OK)
+-            return TCL_ERROR;
++    if (Tcl_GetIntFromObj(interp, objv [1], &fnum) == TCL_OK) {
++	if (objc != 2) {
++	    TclX_AppendObjResult (interp, "the second argument, "
++		"targetChannelId, is not allowed when binding a "
++		"file number to a Tcl channel", NULL);
++	    return TCL_ERROR;
++	}
+         newChannel = TclXOSBindOpenFile (interp,  fnum);
+     } else {
++        srcChannelId = Tcl_GetStringFromObj (objv [1], NULL);
+         if (objc > 2) {
+             targetChannelId = Tcl_GetStringFromObj (objv [2], NULL);
+@@ -250,18 +240,4 @@
+                       Tcl_GetChannelName (newChannel), -1);
+     return TCL_OK;
+-
+-  badFnum:
+-    Tcl_ResetResult (interp);
+-    TclX_AppendObjResult (interp, "invalid integer file number \"",
+-                          Tcl_GetStringFromObj (objv [1], NULL),
+-                          "\", expected unsigned integer or Tcl file id",
+-                          (char *) NULL);
+-    return TCL_ERROR;
+-
+-  bind2ndArg:
+-    TclX_AppendObjResult (interp, "the second argument, targetChannelId, ",
+-                          "is not allow when binding a file number to ",
+-                          "a Tcl channel", (char *) NULL);
+-    return TCL_ERROR;
+ }
+ 
+--- ../tcl/generic/tclXhandles.c	Wed Mar 31 01:37:44 1999
++++ ../tcl/generic/tclXhandles.c	Fri Jan 10 17:09:53 2003
+@@ -160,3 +160,3 @@
+     int      numNewEntries;
+-    int      newSize;
++    size_t   newSize;
+     
+@@ -170,3 +170,3 @@
+     memcpy (tblHdrPtr->bodyPtr, oldbodyPtr, 
+-            (tblHdrPtr->tableSize * tblHdrPtr->entrySize));
++            (size_t)(tblHdrPtr->tableSize * tblHdrPtr->entrySize));
+     LinkInNewEntries (tblHdrPtr, tblHdrPtr->tableSize, numNewEntries);
+@@ -234,3 +234,3 @@
+     if ((strncmp (tblHdrPtr->handleBase, (char *) handle, 
+-             tblHdrPtr->baseLength) != 0) ||
++             (size_t)tblHdrPtr->baseLength) != 0) ||
+              !TclX_StrToUnsigned (&handle [tblHdrPtr->baseLength], 10, 
+@@ -269,3 +269,3 @@
+     if ((strncmp (tblHdrPtr->handleBase, (char *) handle, 
+-                  tblHdrPtr->baseLength) != 0) ||
++                  (size_t)tblHdrPtr->baseLength) != 0) ||
+         !TclX_StrToUnsigned (&handle [tblHdrPtr->baseLength], 10, 
+@@ -332,3 +332,3 @@
+     tblHdrPtr->bodyPtr =
+-        (ubyte_pt) ckalloc (initEntries * tblHdrPtr->entrySize);
++        (ubyte_pt) ckalloc ((size_t)initEntries * tblHdrPtr->entrySize);
+     LinkInNewEntries (tblHdrPtr, 0, initEntries);
+--- ../tcl/generic/tclXkeylist.c	Wed Mar 31 01:37:45 1999
++++ ../tcl/generic/tclXkeylist.c	Fri Jan 10 17:50:40 2003
+@@ -376,3 +376,4 @@
+     char *keySeparPtr;
+-    int keyLen, findIdx;
++    int   findIdx;
++    size_t keyLen;
+ 
+@@ -605,4 +606,3 @@
+         entryObjv [0] = 
+-            Tcl_NewStringObj (keylIntPtr->entries [idx].key,
+-                              strlen (keylIntPtr->entries [idx].key));
++            Tcl_NewStringObj (keylIntPtr->entries [idx].key, -1);
+         entryObjv [1] = keylIntPtr->entries [idx].valuePtr;
+@@ -613,3 +613,3 @@
+     listStr = Tcl_GetStringFromObj (tmpListObj, &strLen);
+-    keylPtr->bytes = ckbinstrdup (listStr, strLen);
++    keylPtr->bytes = ckbinstrdup (listStr, (size_t)strLen);
+     keylPtr->length = strLen;
+@@ -745,4 +745,4 @@
+         keylIntPtr->entries [findIdx].key =
+-            (char *) ckalloc (keyLen + 1);
+-        strncpy (keylIntPtr->entries [findIdx].key, key, keyLen);
++            (char *) ckalloc ((size_t)(keyLen + 1));
++        strncpy (keylIntPtr->entries [findIdx].key, key, (size_t)keyLen);
+         keylIntPtr->entries [findIdx].key [keyLen] = '\0';
+@@ -784,4 +784,4 @@
+         keylIntPtr->entries [findIdx].key =
+-            (char *) ckalloc (keyLen + 1);
+-        strncpy (keylIntPtr->entries [findIdx].key, key, keyLen);
++            (char *) ckalloc ((size_t)(keyLen + 1));
++        strncpy (keylIntPtr->entries [findIdx].key, key, (size_t)keyLen);
+         keylIntPtr->entries [findIdx].key [keyLen] = '\0';
+--- ../tcl/generic/tclXlib.c	Wed Oct 24 18:57:02 2001
++++ ../tcl/generic/tclXlib.c	Fri Jan 10 18:01:02 2003
+@@ -70,3 +70,3 @@
+                           off_t        offset,
+-                          off_t        length));
++                          int          length));
+ 
+@@ -89,3 +89,3 @@
+                                   off_t      *offsetPtr,
+-                                  unsigned   *lengthPtr));
++                                  int        *lengthPtr));
+ 
+@@ -161,3 +161,3 @@
+     off_t        offset;
+-    off_t        length;
++    int          length;
+ {
+@@ -193,3 +193,4 @@
+ 
+-    if (Tcl_Seek (channel, offset, SEEK_SET) < 0)
++    /* XXX casting to int is wrong below, but that's what Tcl_Seek wants */
++    if (Tcl_Seek (channel, (int)offset, SEEK_SET) < 0)
+         goto posixError;
+@@ -386,3 +387,3 @@
+     off_t       *offsetPtr;
+-    unsigned   *lengthPtr;
++    int         *lengthPtr;
+ {
+@@ -414,3 +415,4 @@
+         goto invalidEntry;
+-    if (TclX_GetUnsignedFromObj (interp, pkgDataObjv [2], lengthPtr) != TCL_OK)
++    if (Tcl_GetIntFromObj (interp, pkgDataObjv [2], lengthPtr) != TCL_OK
++	|| *lengthPtr < 0)
+         goto invalidEntry;
+@@ -886,3 +888,3 @@
+     off_t     offset;
+-    unsigned  length;
++    int       length;
+     int       result;
+--- ../tcl/generic/tclXlist.c	Sat May 19 12:39:44 2001
++++ ../tcl/generic/tclXlist.c	Fri Jan 10 18:04:21 2003
+@@ -469,3 +469,3 @@
+             match = (valueLen == patternLen) &&
+-                (memcmp (valueStr, patternStr, valueLen) == 0);
++                (memcmp (valueStr, patternStr, (size_t) patternLen) == 0);
+             break;
+@@ -544,3 +544,3 @@
+         if ((elementLen == checkLen) &&
+-            (memcmp (elementStr, checkStr, elementLen) == 0))
++            (memcmp (elementStr, checkStr, (size_t)elementLen) == 0))
+             break;
+--- ../tcl/generic/tclXmath.c	Wed Mar 31 01:37:45 1999
++++ ../tcl/generic/tclXmath.c	Fri Jan 10 18:05:54 2003
+@@ -308,3 +308,3 @@ TclX_RandomObjCmd (dummy, interp, objc, 
+     } else {
+-        int seed;
++        unsigned int seed;
+