<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/891f7e8e8dd2443edc106b5360e23b32b9d6bd48">https://github.com/macports/macports-base/commit/891f7e8e8dd2443edc106b5360e23b32b9d6bd48</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 891f7e8e8dd2443edc106b5360e23b32b9d6bd48
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Tue Nov 14 16:04:39 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> tclx: revert patches before update
</span>---
vendor/tclx-8.4.4/configure | 8 ++++----
vendor/tclx-8.4.4/configure.in | 4 ++--
vendor/tclx-8.4.4/generic/tclExtdInt.h | 2 +-
vendor/tclx-8.4.4/generic/tclXdup.c | 2 +-
vendor/tclx-8.4.4/generic/tclXfcntl.c | 4 ++--
vendor/tclx-8.4.4/generic/tclXhandles.c | 2 +-
vendor/tclx-8.4.4/generic/tclXprofile.c | 8 ++++----
vendor/tclx-8.4.4/generic/tclXsignal.c | 6 +++---
vendor/tclx-8.4.4/generic/tclXstring.c | 2 +-
vendor/tclx-8.4.4/generic/tclXutil.c | 10 +++++-----
vendor/tclx-8.4.4/tclconfig/tcl.m4 | 5 ++---
11 files changed, 26 insertions(+), 27 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx-8.4.4/configure b/vendor/tclx-8.4.4/configure
</span><span style='display:block; white-space:pre;color:#808080;'>index 8c17d5683..824b4bcdf 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx-8.4.4/configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx-8.4.4/configure
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9069,7 +9069,7 @@ main ()
</span> {
extern long timezone;
timezone += 1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit (0);
</span> ;
return 0;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9105,7 +9105,7 @@ main ()
</span> {
extern time_t timezone;
timezone += 1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit (0);
</span> ;
return 0;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9190,7 +9190,7 @@ main() {
</span> struct tms cpu;
times(&cpu);
sleep(2);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return ((times(&cpu) > 0) ? 0 : 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit ((times(&cpu) > 0) ? 0 : 1);
</span> }
_ACEOF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9516,7 +9516,7 @@ int
</span> main ()
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (catclose ((nl_catd) 0) == 0) return (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (catclose ((nl_catd) 0) == 0) exit (0);
</span> ;
return 0;
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx-8.4.4/configure.in b/vendor/tclx-8.4.4/configure.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 315fdb1df..20ee02148 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx-8.4.4/configure.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx-8.4.4/configure.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -199,7 +199,7 @@ main() {
</span> struct tms cpu;
times(&cpu);
sleep(2);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return ((times(&cpu) > 0) ? 0 : 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit ((times(&cpu) > 0) ? 0 : 1);
</span> }
], [AC_MSG_RESULT(elapsed real time)],
[AC_MSG_RESULT(a status)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -269,7 +269,7 @@ main() {
</span> AC_CHECK_FUNC(catgets,
[AC_MSG_CHECKING([catclose return value])
AC_TRY_COMPILE([#include <nl_types.h>], [
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (catclose ((nl_catd) 0) == 0) return (0);],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (catclose ((nl_catd) 0) == 0) exit (0);],
</span> AC_MSG_RESULT(ok), [
AC_MSG_RESULT([broken catclose return type])
AC_DEFINE(BAD_CATCLOSE)])],
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx-8.4.4/generic/tclExtdInt.h b/vendor/tclx-8.4.4/generic/tclExtdInt.h
</span><span style='display:block; white-space:pre;color:#808080;'>index dcd1e8b85..e92a6596e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx-8.4.4/generic/tclExtdInt.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx-8.4.4/generic/tclExtdInt.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@
</span> */
#ifdef TCLX_DEBUG
# define TclX_Assert(expr) ((expr) ? (void)0 : \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Panic("TclX assertion failure: %s:%d \"%s\"\n",\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panic("TclX assertion failure: %s:%d \"%s\"\n",\
</span> __FILE__, __LINE__, "expr"))
#else
# define TclX_Assert(expr)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx-8.4.4/generic/tclXdup.c b/vendor/tclx-8.4.4/generic/tclXdup.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 87ae811d0..7e83fdaa4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx-8.4.4/generic/tclXdup.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx-8.4.4/generic/tclXdup.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +75,7 @@ DupChannelOptions (Tcl_Interp *interp,
</span> goto errorExit;
}
if ((optArgc % 2) != 0) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Panic("channel didn't return keyword/value pairs");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panic("channel didn't return keyword/value pairs");
</span> }
for (idx = 0; idx < optArgc; idx += 2) {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx-8.4.4/generic/tclXfcntl.c b/vendor/tclx-8.4.4/generic/tclXfcntl.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 0da14307c..070caa313 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx-8.4.4/generic/tclXfcntl.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx-8.4.4/generic/tclXfcntl.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,7 +204,7 @@ GetFcntlAttr (Tcl_Interp *interp, Tcl_Channel channel, int mode, int attrib)
</span> return TCL_ERROR;
break;
default:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Panic ("bug in fcntl get attrib");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panic ("bug in fcntl get attrib");
</span> value = 0; /* suppress compiler warning for initialized value */
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -260,7 +260,7 @@ SetFcntlAttrObj (Tcl_Interp *interp,
</span> case ATTR_KEEPALIVE:
return TclXOSsetsockopt (interp, channel, SO_KEEPALIVE, value);
default:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Panic ("buf in fcntl set attrib");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panic ("buf in fcntl set attrib");
</span> }
return TCL_ERROR; /* Should never be reached */
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx-8.4.4/generic/tclXhandles.c b/vendor/tclx-8.4.4/generic/tclXhandles.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 0de292c03..97c09ff90 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx-8.4.4/generic/tclXhandles.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx-8.4.4/generic/tclXhandles.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -539,7 +539,7 @@ TclX_HandleFree (void_pt headerPtr, void_pt entryPtr)
</span>
entryHdrPtr = HEADER_AREA (entryPtr);
if (entryHdrPtr->freeLink != ALLOCATED_IDX)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Panic ("Tcl_HandleFree: entry not allocated %x\n", entryHdrPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panic ("Tcl_HandleFree: entry not allocated %x\n", entryHdrPtr);
</span>
entryHdrPtr->freeLink = tblHdrPtr->freeHeadIdx;
tblHdrPtr->freeHeadIdx =
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx-8.4.4/generic/tclXprofile.c b/vendor/tclx-8.4.4/generic/tclXprofile.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 9cf66e066..9143a6645 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx-8.4.4/generic/tclXprofile.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx-8.4.4/generic/tclXprofile.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -228,7 +228,7 @@ PushEntry (profInfo_t *infoPtr,
</span> * Only global level can be NULL.
*/
if (scanPtr == NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Panic (PROF_PANIC, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panic (PROF_PANIC, 1);
</span> }
entryPtr->prevScopePtr = scanPtr;
infoPtr->scopeChainPtr = entryPtr;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -434,7 +434,7 @@ ProfCommandEvalSetup (profInfo_t *infoPtr, int *isProcPtr)
</span> UpdateTOSTimes (infoPtr);
do {
if (infoPtr->stackPtr->evalLevel != UNKNOWN_LEVEL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Panic (PROF_PANIC, 2); /* Not an initial entry */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panic (PROF_PANIC, 2); /* Not an initial entry */
</span> PopEntry (infoPtr);
} while (infoPtr->stackPtr->procLevel > procLevel);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -569,7 +569,7 @@ ProfTraceRoutine (ClientData clientData,
</span> Tcl_CmdInfo cmdInfo;
if (cmd == NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Panic (PROF_PANIC, 4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panic (PROF_PANIC, 4);
</span>
//TIP #571: We don' want to profile the tailcall itself. As it can only be called in a procedure/lambda context
if ( ! strcmp((*objv)->bytes, "tailcall") ) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -701,7 +701,7 @@ TurnOnProfiling (profInfo_t *infoPtr, int commandMode, int evalMode)
</span> * Only global level can be NULL.
*/
if (scanPtr == NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Panic (PROF_PANIC, 6);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panic (PROF_PANIC, 6);
</span> }
infoPtr->scopeChainPtr = scanPtr;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx-8.4.4/generic/tclXsignal.c b/vendor/tclx-8.4.4/generic/tclXsignal.c
</span><span style='display:block; white-space:pre;color:#808080;'>index e163e605f..385601ae2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx-8.4.4/generic/tclXsignal.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx-8.4.4/generic/tclXsignal.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -631,11 +631,11 @@ SignalTrap (int signalNum)
</span> #ifdef SIGCHLD
if (signalNum != SIGCHLD) {
if (SetSignalState (signalNum, SignalTrap, FALSE) == TCL_ERROR)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Panic ("SignalTrap bug");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panic ("SignalTrap bug");
</span> }
#else
if (SetSignalState (signalNum, SignalTrap, FALSE) == TCL_ERROR)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Panic ("SignalTrap bug");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panic ("SignalTrap bug");
</span> #endif /* SIGCHLD */
#endif /* NO_SIGACTION */
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1540,7 +1540,7 @@ SignalCmdCleanUp (ClientData clientData, Tcl_Interp *interp)
</span> break;
}
if (idx == numInterps)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Panic ("signal interp lost");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panic ("signal interp lost");
</span>
interpTable [idx] = interpTable [--numInterps];
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx-8.4.4/generic/tclXstring.c b/vendor/tclx-8.4.4/generic/tclXstring.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 76ab80a8f..2c4216936 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx-8.4.4/generic/tclXstring.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx-8.4.4/generic/tclXstring.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -666,7 +666,7 @@ TclX_CtypeObjCmd (ClientData clientData,
</span> #define IS_8BIT_UNICHAR(c) (c <= 255)
if (TCL_UTF_MAX > sizeof(number)) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Panic("TclX_CtypeObjCmd: UTF character longer than a int");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panic("TclX_CtypeObjCmd: UTF character longer than a int");
</span> }
/*FIX: Split into multiple procs */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx-8.4.4/generic/tclXutil.c b/vendor/tclx-8.4.4/generic/tclXutil.c
</span><span style='display:block; white-space:pre;color:#808080;'>index e1fe3ed50..90cc9d1ae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx-8.4.4/generic/tclXutil.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx-8.4.4/generic/tclXutil.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -476,7 +476,7 @@ ParseTranslationOption (char *strValue)
</span> } else if (STREQU (strValue, "platform")) {
return TCLX_TRANSLATE_PLATFORM;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Panic ("ParseTranslationOption bug");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panic ("ParseTranslationOption bug");
</span> return TCL_ERROR; /* Not reached */
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -507,7 +507,7 @@ FormatTranslationOption (int value)
</span> case TCLX_TRANSLATE_PLATFORM:
return "platform";
default:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Panic ("FormatTranslationOption bug");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panic ("FormatTranslationOption bug");
</span> }
return NULL; /* Not reached */
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -620,7 +620,7 @@ TclX_GetChannelOption (Tcl_Interp *interp,
</span> return TCL_OK;
fatalError:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Panic ("TclX_GetChannelOption bug"); /* FIX: return error. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panic ("TclX_GetChannelOption bug"); /* FIX: return error. */
</span> return 0; /* Not reached */
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -715,7 +715,7 @@ TclX_SetChannelOption (Tcl_Interp *interp,
</span> return Tcl_SetChannelOption (interp, channel, strOption, strValue);
fatalError:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Panic ("TclX_SetChannelOption bug");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panic ("TclX_SetChannelOption bug");
</span> return TCL_ERROR; /* Not reached */
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -926,7 +926,7 @@ TclX_RestoreResultErrorInfo (Tcl_Interp *interp, Tcl_Obj *saveObjPtr)
</span> /*
* This should never happen
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_Panic ("invalid TclX result save object");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ panic ("invalid TclX result save object");
</span> }
Tcl_SetVar2Ex(interp, ERRORCODE, NULL, saveObjv[2], TCL_GLOBAL_ONLY);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclx-8.4.4/tclconfig/tcl.m4 b/vendor/tclx-8.4.4/tclconfig/tcl.m4
</span><span style='display:block; white-space:pre;color:#808080;'>index f610f9529..16e4896d0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclx-8.4.4/tclconfig/tcl.m4
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclx-8.4.4/tclconfig/tcl.m4
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2528,7 +2528,7 @@ AC_DEFUN([TEA_TIME_HANDLER], [
</span> AC_TRY_COMPILE([#include <time.h>],
[extern long timezone;
timezone += 1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return (0);],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit (0);],
</span> tcl_cv_timezone_long=yes, tcl_cv_timezone_long=no)])
if test $tcl_cv_timezone_long = yes ; then
AC_DEFINE(HAVE_TIMEZONE_VAR, 1, [Should we use the global timezone variable?])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2540,7 +2540,7 @@ AC_DEFUN([TEA_TIME_HANDLER], [
</span> AC_TRY_COMPILE([#include <time.h>],
[extern time_t timezone;
timezone += 1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return (0);],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit (0);],
</span> tcl_cv_timezone_time=yes, tcl_cv_timezone_time=no)])
if test $tcl_cv_timezone_time = yes ; then
AC_DEFINE(HAVE_TIMEZONE_VAR, 1, [Should we use the global timezone variable?])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2572,7 +2572,6 @@ AC_DEFUN([TEA_BUGGY_STRTOD], [
</span> if test "$tcl_strtod" = 1; then
AC_CACHE_CHECK([for Solaris2.4/Tru64 strtod bugs], tcl_cv_strtod_buggy,[
AC_TRY_RUN([
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span> extern double strtod();
int main() {
char *infString="Inf", *nanString="NaN", *spaceString=" ";
</pre><pre style='margin:0'>
</pre>