CVS commit: pkgsrc/devel/openocd

["Manuel Bouyer" <bouyer%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Mon Sep 21 11:37:52 UTC 2026

Modified Files:
        pkgsrc/devel/openocd: distinfo
        pkgsrc/devel/openocd/patches: patch-src_openocd.c
Added Files:
        pkgsrc/devel/openocd/patches: patch-src_helper_command.c

Log Message:
devel/openocd: fix build with jimtcl 0.84


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/openocd/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/openocd/patches/patch-src_helper_command.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/openocd/patches/patch-src_openocd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/openocd/distinfo
diff -u pkgsrc/devel/openocd/distinfo:1.14 pkgsrc/devel/openocd/distinfo:1.15
--- pkgsrc/devel/openocd/distinfo:1.14  Tue Sep 15 07:51:36 2026
+++ pkgsrc/devel/openocd/distinfo       Mon Sep 21 11:37:52 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2026/09/15 07:51:36 wiz Exp $
+$NetBSD: distinfo,v 1.15 2026/09/21 11:37:52 bouyer Exp $
 
 BLAKE2s (openocd-0.12.0.tar.bz2) = ae90ac43aec9e72a8ddc7123c5e42fef35e8971cdca3b936a1d14cef74c4dc5c
 SHA512 (openocd-0.12.0.tar.bz2) = b32a8b9fe81ad23d8a544284f4bc626ca302e498dae95399a2f36756407dd1a63e8e9655ca1084e7cc13cf1b932d8f6a480f470a4c3ad502cd884ec7508738e9
@@ -6,6 +6,7 @@ Size (openocd-0.12.0.tar.bz2) = 6790673 
 SHA1 (patch-Makefile.in) = 4035163eb0563254dc4f1bc4a0abac9fbea633e1
 SHA1 (patch-configure) = 6ac5d618048426dfc11fa4502357b0fb80fb6cbb
 SHA1 (patch-src_flash_nor_fm4.c) = b14914ebe08a7c7d9f12c3999c5e6edeae2569e0
+SHA1 (patch-src_helper_command.c) = f68ae39791cb6893b846ee974e1440930a4e9280
 SHA1 (patch-src_helper_configuration.h) = fa3da409b1fdb162aea2cd635df084503b3923d9
 SHA1 (patch-src_helper_jim-nvp.c) = 0e5c7de9feb48dcd47c3d79bbaf41787bb1e799d
-SHA1 (patch-src_openocd.c) = d2b7ebdca9800c15fc27b23e9e8c28665900fa5b
+SHA1 (patch-src_openocd.c) = fd94e7011c1326c0c00630aa1f74eb1b6e8431fe

Index: pkgsrc/devel/openocd/patches/patch-src_openocd.c
diff -u pkgsrc/devel/openocd/patches/patch-src_openocd.c:1.1 pkgsrc/devel/openocd/patches/patch-src_openocd.c:1.2
--- pkgsrc/devel/openocd/patches/patch-src_openocd.c:1.1        Sun Apr  6 10:07:06 2025
+++ pkgsrc/devel/openocd/patches/patch-src_openocd.c    Mon Sep 21 11:37:52 2026
@@ -1,19 +1,24 @@
-$NetBSD: patch-src_openocd.c,v 1.1 2025/04/06 10:07:06 adam Exp $
+$NetBSD: patch-src_openocd.c,v 1.2 2026/09/21 11:37:52 bouyer Exp $
 
-Fix build with jimtcl 0.83.
+Fix build with jimtcl 0.84.
 
---- src/openocd.c.orig 2025-04-06 05:49:36.109698542 +0000
-+++ src/openocd.c
-@@ -255,9 +255,9 @@ static int jim_expr_command(Jim_Interp *
+--- src/openocd.c.orig 2022-09-18 15:46:16.000000000 +0200
++++ src/openocd.c      2026-09-20 23:39:56.430639363 +0200
+@@ -255,15 +255,8 @@
                Jim_Obj *obj = Jim_ConcatObj(interp, argc - 1, argv + 1);
                Jim_IncrRefCount(obj);
                const char *s = Jim_String(obj);
 -              struct jim_scriptobj *script = Jim_GetIntRepPtr(interp->currentScriptObj);
 -              if (interp->currentScriptObj == interp->emptyObj ||
 -                              strcmp(interp->currentScriptObj->typePtr->name, "script") ||
-+              struct jim_scriptobj *script = Jim_GetIntRepPtr(interp->unused_currentScriptObj);
-+              if (interp->unused_currentScriptObj == interp->emptyObj ||
-+                              strcmp(interp->unused_currentScriptObj->typePtr->name, "script") ||
-                               script->subst_flags ||
-                               script->filename_obj == interp->emptyObj)
-                       LOG_WARNING("DEPRECATED! use 'expr { %s }' not 'expr %s'", s, s);
+-                              script->subst_flags ||
+-                              script->filename_obj == interp->emptyObj)
+-                      LOG_WARNING("DEPRECATED! use 'expr { %s }' not 'expr %s'", s, s);
+-              else
+-                      LOG_WARNING("DEPRECATED! (%s:%d) use 'expr { %s }' not 'expr %s'",
+-                                              Jim_String(script->filename_obj), script->linenr, s, s);
++              LOG_WARNING("DEPRECATED! use 'expr { %s }' not 'expr %s'", s, s);
++
+               int retcode = Jim_EvalExpression(interp, obj);
+               Jim_DecrRefCount(interp, obj);
+               return retcode;

Added files:

Index: pkgsrc/devel/openocd/patches/patch-src_helper_command.c
diff -u /dev/null pkgsrc/devel/openocd/patches/patch-src_helper_command.c:1.1
--- /dev/null   Mon Sep 21 11:37:52 2026
+++ pkgsrc/devel/openocd/patches/patch-src_helper_command.c     Mon Sep 21 11:37:52 2026
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_helper_command.c,v 1.1 2026/09/21 11:37:52 bouyer Exp $
+
+Fix build with jimtcl 0.84.
+
+--- src/helper/command.c.orig  2026-09-20 23:24:01.082032876 +0200
++++ src/helper/command.c       2026-09-20 23:26:01.586476179 +0200
+@@ -48,17 +48,18 @@
+ /* set of functions to wrap jimtcl internal data */
+ static inline bool jimcmd_is_proc(Jim_Cmd *cmd)
+ {
+-      return cmd->isproc;
++      return ((cmd->flags & JIM_CMD_ISPROC) != 0);
++
+ }
+ 
+ bool jimcmd_is_oocd_command(Jim_Cmd *cmd)
+ {
+-      return !cmd->isproc && cmd->u.native.cmdProc == jim_command_dispatch;
++      return !jimcmd_is_proc(cmd) && cmd->u.native.cmdProc == jim_command_dispatch;
+ }
+ 
+ void *jimcmd_privdata(Jim_Cmd *cmd)
+ {
+-      return cmd->isproc ? NULL : cmd->u.native.privData;
++      return jimcmd_is_proc(cmd) ? NULL : cmd->u.native.privData;
+ }
+ 
+ static void tcl_output(void *privData, const char *file, unsigned line,