Default to Tcl-8.4 (and bump up PORTREVISION). Fix some 64-bit related issues.

Some others remain -- not all are fixed in the Tcl itself.

3 files changed, 43 insertions, 33 deletions

diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index 12d5540cfc5e..0ccdca431cca 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tclX
 PORTVERSION=	8.3.5
+PORTREVISION=	1
 CATEGORIES=	lang tcl${TCL_DVER} tk${TCL_DVER}
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=tclx
@@ -23,7 +24,7 @@ PKGNAMESUFFIX=	-nox11
 LIB_DEPENDS=	tk${TCL_DVER}.1:${PORTSDIR}/x11-toolkits/tk${TCL_DVER}
 .endif
 
-TCL_VER?=	8.3
+TCL_VER?=	8.4
 TCL_DVER?=	${TCL_VER:S/.//}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
@@ -33,7 +34,8 @@ CONFIGURE_ARGS= --enable-shared \
 		--with-help=Help \
 		--with-tcl="${LOCALBASE}/lib/tcl${TCL_VER}" \
 		--with-tk="${LOCALBASE}/lib/tk${TCL_VER}"
-PLIST_SUB=	TCLX_LONG_VER=${TCL_VER} TCLX_SHORT_VER=${TCL_DVER}
+PLIST_SUB=	TCLX_LONG_VER=${PORTVERSION:R} \
+		TCLX_SHORT_VER=${PORTVERSION:R:S/.//}
 
 .ifdef WITHOUT_X11
 CONFIGURE_ARGS+=--enable-tk=NO
diff --git a/lang/tclX/files/patch-tclXsocket b/lang/tclX/files/patch-tclXsocket
new file mode 100644
index 000000000000..81a07e6bbf5f
--- /dev/null
+++ b/lang/tclX/files/patch-tclXsocket
@@ -0,0 +1,16 @@
+--- ../tcl/generic/tclXsocket.c	Wed Mar 31 01:37:46 1999
++++ ../tcl/generic/tclXsocket.c	Mon Apr  5 17:14:32 2004
+@@ -166,5 +166,5 @@
+     char *command =    Tcl_GetStringFromObj (objv [0], NULL);
+     char *subCommand = Tcl_GetStringFromObj (objv [1], NULL);
+-    char *host       = Tcl_GetStringFromObj (objv [2], NULL);
++    char *host;
+ 
+     if (objc != 3) {
+@@ -173,4 +173,6 @@
+         return NULL;
+     }
++
++    host       = Tcl_GetStringFromObj (objv [2], NULL);
+ 
+     if (TclXOSInetAtoN (NULL, host, &address) == TCL_OK) {
diff --git a/lang/tclX/files/patch-warnings b/lang/tclX/files/patch-warnings
index 2fe31571e722..7b1e90829621 100644
--- a/lang/tclX/files/patch-warnings
+++ b/lang/tclX/files/patch-warnings
@@ -1,15 +1,23 @@
 --- ../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;
++++ ../tcl/generic/tclXbsearch.c	Mon Apr  5 13:30:43 2004
+@@ -123,15 +120,9 @@
+     if (Tcl_GetIntFromObj (searchCBPtr->interp,
+                            Tcl_GetObjResult (searchCBPtr->interp),
+                            &searchCBPtr->cmpResult) != TCL_OK) {
+-        oldResult = Tcl_GetStringFromObj (
+-            Tcl_GetObjResult (searchCBPtr->interp), NULL);
+-        oldResult = ckstrdup (oldResult);
+-
+-        Tcl_ResetResult (searchCBPtr->interp);
+-        TclX_AppendObjResult (searchCBPtr->interp, "invalid integer \"",
+-                              oldResult, "\" returned from compare proc \"",
++        TclX_AppendObjResult (searchCBPtr->interp,
++                              "\" returned from compare proc \"",
+                               searchCBPtr->tclProc, "\"", (char *) NULL);
+-        ckfree (oldResult);
+         return TCL_ERROR;
+     }
+     Tcl_ResetResult (searchCBPtr->interp);
 @@ -254,3 +254,4 @@ BinSearch (searchCBPtr)
  {
 -    off_t middle, high, low;
@@ -139,42 +147,26 @@
          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 @@
++                                  long       *lengthPtr));
  
--    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;
++    long       *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
++    if (Tcl_GetLongFromObj (interp, pkgDataObjv [2], lengthPtr) != TCL_OK
 +	|| *lengthPtr < 0)
          goto invalidEntry;
 @@ -886,3 +888,3 @@
      off_t     offset;
 -    unsigned  length;
-+    int       length;
++    long      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