Attachment 145175 Details for Bug 192287 – Update to 8.4.1

[patch] Update to 8.4.1

tclX-8.4.1.diff (text/plain), 15.27 KB, created by Pietro Cerutti on 2014-07-31 07:09:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pietro Cerutti

Created: 2014-07-31 07:09:58 UTC

Size: 15.27 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 363483)
>+++ Makefile	(working copy)
>@@ -2,10 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	tclX
>-PORTVERSION=	8.4
>-PORTREVISION=	3
>+PORTVERSION=	8.4.1
> CATEGORIES=	lang tcl devel
>-MASTER_SITES=	SF/${PORTNAME:tl}/TclX/${PORTVERSION}.0
>+MASTER_SITES=	SF/${PORTNAME:tl}/TclX/${PORTVERSION}
> DISTNAME=	tclx${PORTVERSION}
> 
> MAINTAINER=	mi@aldan.algebra.com
>@@ -16,17 +15,16 @@
> LICENSE_FILE=	${WRKSRC}/license.terms
> LICENSE_PERMS=	auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
> 
>+WRKSRC=		${WRKDIR}/${PORTNAME:tl}${PORTVERSION:R}
> 
> USES=		tcl tar:bzip2
>-USE_LDCONFIG=	${PREFIX}/lib/tclx${PORTVERSION}
>-GNU_CONFIGURE=	yes
>-CPPFLAGS+=	-I${TCL_INCLUDEDIR}/unix\
>-		-I${TCL_INCLUDEDIR}/generic
>+USE_LDCONFIG=	${PREFIX}/lib/tclx${PORTVERSION:R}
>+USE_AUTOTOOLS=	autoconf
> CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
> 		--enable-shared \
> 		--with-help=Help \
> 		--with-tcl="${TCL_LIBDIR}"
>-PLIST_SUB=	TCLX_VER=${PORTVERSION}
>+PLIST_SUB=	TCLX_VER=${PORTVERSION:R}
> ALL_TARGET=	binaries libraries
> INSTALL_TARGET=	install-binaries install-libraries
> 
>@@ -34,15 +32,9 @@
> 
> .if ${TCL_VER} > 8.4
> EXTRA_PATCHES+=	${FILESDIR}/tcl85-test-patch
>-PLIST_SUB+=	BELOW_85='@comment '
>-.else
>-PLIST_SUB+=	BELOW_85=''
> .endif
> 
> post-configure:
>-	${REINPLACE_CMD} -e	\
>-	    's,^TCLSH_PROG.*,TCLSH_PROG=${TCLSH},' \
>-	    -e 's,TCL_LIBRARY=.*,\\,' ${WRKSRC}/Makefile
> 	# Disabling the failing help.test
> 	${MV} ${WRKSRC}/tests/help.test ${WRKSRC}/tests/help.test.dis
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 363483)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (tclx8.4.tar.bz2) = 257591f9dffc21cf3ed541a9ef81a3ff5dd739dff5cebb70c4cec7010e2def66
>-SIZE (tclx8.4.tar.bz2) = 313595
>+SHA256 (tclx8.4.1.tar.bz2) = a9b41f606ec6c1268b9c78512e6e1cb533bd9ae3e786e650d111fc16ffe758ec
>+SIZE (tclx8.4.1.tar.bz2) = 330073
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 363483)
>+++ files/patch-configure	(working copy)
>@@ -1,18 +0,0 @@
>---- configure.orig	Sat Oct  8 01:17:50 2005
>-+++ configure	Sun Mar 25 15:34:58 2007
>-@@ -6917,7 +6917,7 @@
>-         fi
>-     else
>-         # tclConfig.sh is in $INSTALL/lib directory
>--        REAL_TCL_BIN_DIR=`cd ${TCL_BIN_DIR}/../bin/;pwd`
>-+        REAL_TCL_BIN_DIR=`cd ${TCL_BIN_DIR}/../../bin/;pwd`
>-         if test "$TEA_PLATFORM" = "windows"; then
>-             TCLSH_PROG=${REAL_TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}
>-         else
>-@@ -7000,5 +7000,5 @@
>- 
>- 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
>--		system=MP-RAS-`awk '{print }' /etc/.relid'`
>-+		system=MP-RAS-`awk '{print }' /etc/.relid`
>- 	    fi
>- 	    if test "`uname -s`" = "AIX" ; then
>Index: files/patch-errorLine
>===================================================================
>--- files/patch-errorLine	(revision 363483)
>+++ files/patch-errorLine	(working copy)
>@@ -1,73 +0,0 @@
>-Index: generic/tclExtdInt.h
>-===================================================================
>-RCS file: /cvsroot/tclx/tclx/generic/tclExtdInt.h,v
>-retrieving revision 1.7
>-retrieving revision 1.8
>-diff -U2 -r1.7 -r1.8
>---- generic/tclExtdInt.h	12 Jul 2005 19:03:15 -0000	1.7
>-+++ generic/tclExtdInt.h	15 Dec 2008 20:00:27 -0000	1.8
>-@@ -13,5 +13,5 @@
>-  * implied warranty.
>-  *-----------------------------------------------------------------------------
>-- * $Id: tclExtdInt.h,v 1.7 2005/07/12 19:03:15 hobbs Exp $
>-+ * $Id: tclExtdInt.h,v 1.8 2008/12/15 20:00:27 andreas_kupries Exp $
>-  *-----------------------------------------------------------------------------
>-  */
>-@@ -186,4 +186,13 @@
>- 
>- /*
>-+ * Handle hiding of errorLine in 8.6
>-+ */
>-+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6)
>-+#define ERRORLINE(interp) ((interp)->errorLine)
>-+#else
>-+#define ERRORLINE(interp) (Tcl_GetErrorLine(interp))
>-+#endif
>-+
>-+/*
>-  * Callback type for walking directories.
>-  */
>-Index: generic/tclXgeneral.c
>-===================================================================
>-RCS file: /cvsroot/tclx/tclx/generic/tclXgeneral.c,v
>-retrieving revision 1.3
>-retrieving revision 1.4
>-diff -U2 -r1.3 -r1.4
>---- generic/tclXgeneral.c	4 Apr 2002 06:09:05 -0000	1.3
>-+++ generic/tclXgeneral.c	15 Dec 2008 20:00:27 -0000	1.4
>-@@ -13,5 +13,5 @@
>-  * implied warranty.
>-  *-----------------------------------------------------------------------------
>-- * $Id: tclXgeneral.c,v 1.3 2002/04/04 06:09:05 hobbs Exp $
>-+ * $Id: tclXgeneral.c,v 1.4 2008/12/15 20:00:27 andreas_kupries Exp $
>-  *-----------------------------------------------------------------------------
>-  */
>-@@ -406,5 +406,5 @@
>- 		
>- 		sprintf (buf, "\n    (\"loop\" body line %d)", 
>--			interp->errorLine);
>-+			ERRORLINE(interp));
>- 		Tcl_AddErrorInfo (interp, buf);
>- 	    }
>-Index: generic/tclXlib.c
>-===================================================================
>-RCS file: /cvsroot/tclx/tclx/generic/tclXlib.c,v
>-retrieving revision 1.4
>-retrieving revision 1.5
>-diff -U2 -r1.4 -r1.5
>---- generic/tclXlib.c	24 Mar 2005 05:04:38 -0000	1.4
>-+++ generic/tclXlib.c	15 Dec 2008 20:00:27 -0000	1.5
>-@@ -13,5 +13,5 @@
>-  * implied warranty.
>-  *-----------------------------------------------------------------------------
>-- * $Id: tclXlib.c,v 1.4 2005/03/24 05:04:38 hobbs Exp $
>-+ * $Id: tclXlib.c,v 1.5 2008/12/15 20:00:27 andreas_kupries Exp $
>-  *-----------------------------------------------------------------------------
>-  */
>-@@ -240,5 +240,5 @@
>-     buf = ckalloc (strlen (fileName) + 64);
>-     sprintf (buf, "\n    (file \"%s\" line %d)", fileName,
>--             interp->errorLine);
>-+             ERRORLINE(interp));
>-     Tcl_AddErrorInfo (interp, buf);
>-     ckfree (buf);
>Index: files/patch-generic_tclXchmod.c
>===================================================================
>--- files/patch-generic_tclXchmod.c	(revision 0)
>+++ files/patch-generic_tclXchmod.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- generic/tclXchmod.c.orig	2014-07-30 17:45:54.000000000 +0200
>++++ generic/tclXchmod.c	2014-07-30 17:48:09.000000000 +0200
>+@@ -353,6 +353,7 @@
>+ 	modeInfo.absMode = modeBits;
>+         modeInfo.symMode = NULL;
>+     } else {
>++        modeInfo.absMode = 0; // not used, but keeps compilers happy
>+         modeInfo.symMode = modeString;
>+     }
>+ 
>
>Property changes on: files/patch-generic_tclXchmod.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: files/patch-generic_tclXdup.c
>===================================================================
>--- files/patch-generic_tclXdup.c	(revision 0)
>+++ files/patch-generic_tclXdup.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- generic/tclXdup.c.orig	2014-07-30 16:44:06.000000000 +0200
>++++ generic/tclXdup.c	2014-07-30 16:45:30.000000000 +0200
>+@@ -128,7 +128,7 @@
>+     char       *targetChannelId;
>+ {
>+     Tcl_Channel srcChannel, newChannel = NULL;
>+-    Tcl_ChannelType *channelType;
>++    const Tcl_ChannelType *channelType;
>+     int mode;
>+ 
>+     srcChannel = Tcl_GetChannel (interp, srcChannelId, &mode);
>
>Property changes on: files/patch-generic_tclXdup.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-generic_tclXfcntl.c
>===================================================================
>--- files/patch-generic_tclXfcntl.c	(revision 0)
>+++ files/patch-generic_tclXfcntl.c	(working copy)
>@@ -0,0 +1,12 @@
>+--- generic/tclXfcntl.c.orig	2014-07-30 16:45:58.000000000 +0200
>++++ generic/tclXfcntl.c	2014-07-30 16:46:21.000000000 +0200
>+@@ -162,7 +162,8 @@
>+     int          mode;
>+     int          attrib;
>+ {
>+-    int value, optValue;
>++    int value = 0;
>++    int optValue;
>+ 
>+     switch (attrib) {
>+       case ATTR_RDONLY:
>
>Property changes on: files/patch-generic_tclXfcntl.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: files/patch-generic_tclXhandles.c
>===================================================================
>--- files/patch-generic_tclXhandles.c	(revision 0)
>+++ files/patch-generic_tclXhandles.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- generic/tclXhandles.c.orig	2014-07-30 17:35:38.000000000 +0200
>++++ generic/tclXhandles.c	2014-07-30 17:35:43.000000000 +0200
>+@@ -567,7 +567,7 @@
>+ 
>+     entryHdrPtr = HEADER_AREA (entryPtr);
>+     if (entryHdrPtr->freeLink != ALLOCATED_IDX)
>+-        panic ("Tcl_HandleFree: entry not allocated %x\n", entryHdrPtr);
>++        panic ("Tcl_HandleFree: entry not allocated %p\n", entryHdrPtr);
>+ 
>+     entryHdrPtr->freeLink = tblHdrPtr->freeHeadIdx;
>+     tblHdrPtr->freeHeadIdx =
>
>Property changes on: files/patch-generic_tclXhandles.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: files/patch-generic_tclXutil.c
>===================================================================
>--- files/patch-generic_tclXutil.c	(revision 0)
>+++ files/patch-generic_tclXutil.c	(working copy)
>@@ -0,0 +1,20 @@
>+--- generic/tclXutil.c.orig	2014-07-30 16:56:00.000000000 +0200
>++++ generic/tclXutil.c	2014-07-30 16:56:50.000000000 +0200
>+@@ -870,7 +870,7 @@
>+ TclX_IsNullObj (objPtr)
>+     Tcl_Obj *objPtr;
>+ {
>+-    static Tcl_ObjType *listType = NULL, *stringType = NULL;
>++    const static Tcl_ObjType *listType = NULL, *stringType = NULL;
>+     int length;
>+     
>+     /*
>+@@ -956,7 +956,7 @@
>+ {
>+     Tcl_Obj **saveObjv;
>+     int saveObjc;
>+-    long flags;
>++    long flags = 0;
>+ 
>+     if ((Tcl_ListObjGetElements (NULL, saveObjPtr, &saveObjc,
>+                                  &saveObjv) != TCL_OK) ||
>
>Property changes on: files/patch-generic_tclXutil.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-profile
>===================================================================
>--- files/patch-profile	(revision 363483)
>+++ files/patch-profile	(working copy)
>@@ -1,103 +0,0 @@
>-This first patch fixes a seg-fault at `make test' time -- profile.test crashes
>-without this change.
>-
>-Submitted to maintainers:
>-
>-https://sourceforge.net/tracker/index.php?func=detail&aid=1925400&group_id=13247&atid=113247
>-
>-and committed upstream.
>-
>-The second changes TclXOSElapsedTime to better handles clock_t being too
>-narrow (32-bit on FreeBSD).
>-
>-Getting it committed upstream...
>-
>-	-mi
>-
>---- generic/tclXprofile.c	2004-11-22 19:12:54.000000000 -0500
>-+++ generic/tclXprofile.c	2009-07-31 02:44:11.000000000 -0400
>-@@ -674,5 +674,5 @@
>-     CallFrame  *framePtr;
>- {
>--    if (framePtr == NULL)
>-+    if (framePtr == NULL || framePtr->objv == NULL)
>-         return;
>-     InitializeProcStack (infoPtr, framePtr->callerPtr);
>---- unix/tclXunixOS.c	2005-07-12 15:03:15.000000000 -0400
>-+++ unix/tclXunixOS.c	2009-11-27 02:00:57.000000000 -0500
>-@@ -550,4 +550,10 @@
>-  *   o realTime - Elapsed real time, in milliseconds is returned here.
>-  *   o cpuTime - Elapsed CPU time, in milliseconds is returned here.
>-+ *
>-+ * XXX In some cases, clock_t may not be wide enough, such as when it is
>-+ * XXX a signed 32-bit value, its maximum is 2^31 or 2147483648. There
>-+ * XXX are more milliseconds in 25 days: 25*1000*60*60*24 = 2160000000.
>-+ * XXX If a profile-session is to last longer than that, the API needs
>-+ * XXX to use 64-bit values. -mi Nov 27, 2009
>-  *-----------------------------------------------------------------------------
>-  */
>-@@ -557,4 +563,5 @@
>-     clock_t *cpuTime;
>- {
>-+    struct tms cpuTimes;
>- /*
>-  * If times returns elapsed real time, this is easy.  If it returns a status,
>-@@ -562,25 +569,34 @@
>-  */
>- #ifndef TIMES_RETS_STATUS
>--    struct tms cpuTimes;
>-+    static clock_t startTime;
>-+    clock_t currentTime;
>- 
>--    *realTime = TclXOSTicksToMS (times (&cpuTimes));
>--    *cpuTime = TclXOSTicksToMS (cpuTimes.tms_utime + cpuTimes.tms_stime);
>-+    /*
>-+     * If this is the first call, get base time.
>-+     */
>-+    currentTime = times (&cpuTimes);
>-+    if (startTime == 0) {
>-+	startTime = currentTime;
>-+        *realTime = 0;
>-+    } else
>-+	*realTime = TclXOSTicksToMS (currentTime - startTime);
>- #else
>-     static struct timeval startTime = {0, 0};
>-     struct timeval currentTime;
>--    struct tms cpuTimes;
>- 
>-     /*
>-      * If this is the first call, get base time.
>-      */
>--    if ((startTime.tv_sec == 0) && (startTime.tv_usec == 0))
>-+    if ((startTime.tv_sec == 0) && (startTime.tv_usec == 0)) {
>-         gettimeofday (&startTime, NULL);
>--    
>--    gettimeofday (&currentTime, NULL);
>--    currentTime.tv_sec  = currentTime.tv_sec  - startTime.tv_sec;
>--    currentTime.tv_usec = currentTime.tv_usec - startTime.tv_usec;
>--    *realTime = (currentTime.tv_sec  * 1000) + (currentTime.tv_usec / 1000);
>-+	*realTime = 0;
>-+    } else {
>-+	gettimeofday (&currentTime, NULL);
>-+	currentTime.tv_sec  = currentTime.tv_sec  - startTime.tv_sec;
>-+	currentTime.tv_usec = currentTime.tv_usec - startTime.tv_usec;
>-+	*realTime = (currentTime.tv_sec  * 1000) + (currentTime.tv_usec / 1000);
>-+    }
>-     times (&cpuTimes);
>--    *cpuTime = TclXOSTicksToMS (cpuTimes.tms_utime + cpuTimes.tms_stime);
>- #endif
>-+    *cpuTime = TclXOSTicksToMS (cpuTimes.tms_utime + cpuTimes.tms_stime);
>- }
>---- unix/tclXunixPort.h	2005-10-07 19:30:28.000000000 -0400
>-+++ unix/tclXunixPort.h	2009-11-27 02:31:15.000000000 -0500
>-@@ -66,4 +66,10 @@
>-  * Make sure CLK_TCK is defined.
>-  */
>-+#ifdef __FreeBSD__
>-+#	if defined(CLK_TCK) && CLK_TCK == 128
>-+#		undef CLK_TCK
>-+#		define CLK_TCK	sysconf(_SC_CLK_TCK)
>-+#	endif
>-+#endif
>- #ifndef CLK_TCK
>- #    ifdef HZ
>Index: files/patch-unix_tclXunixDup.c
>===================================================================
>--- files/patch-unix_tclXunixDup.c	(revision 0)
>+++ files/patch-unix_tclXunixDup.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- unix/tclXunixDup.c.orig	2014-07-30 16:57:13.000000000 +0200
>++++ unix/tclXunixDup.c	2014-07-30 17:00:42.000000000 +0200
>+@@ -84,7 +84,7 @@
>+     char       *targetChannelId;
>+ {
>+     ClientData handle;
>+-    Tcl_ChannelType *channelType;
>++    const Tcl_ChannelType *channelType;
>+     Tcl_Channel newChannel = NULL;
>+     int srcFileNum, newFileNum = -1;
>+ 
>
>Property changes on: files/patch-unix_tclXunixDup.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 192287: 145175