From: Stuart Cassoff <exokoide@yahoo.ca>
Subject: Re: lang/jimtcl MULTI_PACKAGES
To: OpenBSD Ports <ports@openbsd.org>
Cc: Stuart Henderson <stu@spacehopper.org>
Date: Fri, 28 Nov 2025 11:08:27 -0500


Back to this, here's a fresh diff.

Update to 0.81.

MULTI_PACKAGES=-main -redis -sdl -sqlite
SEPARATE_BUILD=Yes
MODTCL_VERSION=8.6

Latest devel/openocd wants lang/jimtcl >= 0.81.


Stu



diff -Nurp /usr/ports/lang/jimtcl/Makefile ./Makefile
--- /usr/ports/lang/jimtcl/Makefile	Fri Mar 11 14:29:03 2022
+++ ./Makefile	Wed Nov 26 12:32:53 2025
@@ -1,10 +1,19 @@
-COMMENT =		small footprint implementation of Tcl
+COMMENT-main =		small footprint implementation of Tcl
+COMMENT-redis =		REDIS extension for Jimtcl
+COMMENT-sdl =		SDL extension for Jimtcl
+COMMENT-sqlite =	SQLite extension for Jimtcl
 
+PKGNAME-redis =		${PKGNAME:S|-|-redis-|}
+PKGNAME-sdl =		${PKGNAME:S|-|-sdl-|}
+PKGNAME-sqlite =	${PKGNAME:S|-|-sqlite-|}
+
+MULTI_PACKAGES =	-main -redis -sdl -sqlite
+
 GH_ACCOUNT =		msteveb
 GH_PROJECT =		jimtcl
-GH_TAGNAME =		0.80
+GH_TAGNAME =		0.81
 
-SHARED_LIBS =		jim 3.0
+SHARED_LIBS =		jim 4.0
 CATEGORIES =		lang devel
 HOMEPAGE =		http://jim.tcl.tk/
 MAINTAINER =		Stuart Cassoff <stwo@users.sourceforge.net>
@@ -12,14 +21,26 @@ MAINTAINER =		Stuart Cassoff <stwo@users.sourceforge.n
 # BSD
 PERMIT_PACKAGE =	Yes
 
-WANTLIB =		c crypto execinfo m sqlite3 ssl util z
+WANTLIB-main =		c crypto execinfo m ssl util z
+WANTLIB-redis =		jim hiredis
+WANTLIB-sdl =		jim SDL2 SDL2_gfx-1.0 SDL2_ttf
+WANTLIB-sqlite =	jim sqlite3
 
 MODULES =		lang/tcl
+MODTCL_VERSION =	8.6
 
 BUILD_DEPENDS =		${MODTCL_BUILD_DEPENDS}
 
-LIB_DEPENDS =		databases/sqlite3
+LIB_DEPENDS-redis =	lang/jimtcl,-main \
+			databases/libhiredis
 
+LIB_DEPENDS-sdl =	lang/jimtcl,-main \
+			devel/sdl2-gfx \
+			devel/sdl2-ttf
+
+LIB_DEPENDS-sqlite =	lang/jimtcl,-main \
+			databases/sqlite3
+
 MAKE_FLAGS =		LIBJIM=libjim.so.${LIBjim_VERSION} \
 			SH_CFLAGS=${PICFLAG} \
 			SHOBJ_CFLAGS=${PICFLAG}
@@ -29,6 +50,7 @@ FAKE_FLAGS =		INSTALL_DATA_DIR='${INSTALL_DATA_DIR}' \
 			INSTALL_PROGRAM='${INSTALL_PROGRAM}' \
 			INSTALL_SCRIPT='${INSTALL_SCRIPT}'
 
+SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	simple
 CONFIGURE_SCRIPT =	${MODTCL_BIN} ${WRKSRC}/autosetup/autosetup
 
@@ -37,7 +59,8 @@ CONFIGURE_ARGS +=	--enable-shared \
 			--disable-docs \
 			--docdir='$${prefix}/share/doc/jim' \
 			--full \
-			--with-mod=sqlite3,zlib \
+			--compat \
+			--with-mod=redis,sdl,sqlite3 \
 			CCACHE=none
 
 CONFIGURE_ENV +=	WRAPPER=${WRKSRC}/configure \
diff -Nurp /usr/ports/lang/jimtcl/distinfo ./distinfo
--- /usr/ports/lang/jimtcl/distinfo	Fri Nov 12 07:02:01 2021
+++ ./distinfo	Thu Jan  9 11:25:55 2025
@@ -1,2 +1,2 @@
-SHA256 (jimtcl-0.80.tar.gz) = nnmpYN6SVVLutN9REh8OoBfjRAlWgRexrEYfTDBxKJ4=
-SIZE (jimtcl-0.80.tar.gz) = 3130592
+SHA256 (jimtcl-0.81.tar.gz) = q36zaAug0W9KnrHgW3/Lt9I0OOJRhUYsVc0DKhlUqYU=
+SIZE (jimtcl-0.81.tar.gz) = 3977705
diff -Nurp /usr/ports/lang/jimtcl/patches/patch-Makefile_in ./patches/patch-Makefile_in
--- /usr/ports/lang/jimtcl/patches/patch-Makefile_in	Fri Mar 11 14:29:03 2022
+++ ./patches/patch-Makefile_in	Wed Nov 26 12:03:55 2025
@@ -11,7 +11,7 @@ Index: Makefile.in
  @endif
  SHOBJ_CFLAGS ?= @SHOBJ_CFLAGS@
  @if JIM_STATICLIB
-@@ -78,6 +77,7 @@ JIMSH := jimsh@EXEEXT@
+@@ -79,6 +78,7 @@ JIMSH := jimsh@EXEEXT@
  INSTALL_DATA_DIR ?= mkdir -p
  INSTALL_DATA ?= cp
  INSTALL_PROGRAM ?= cp
@@ -19,7 +19,7 @@ Index: Makefile.in
  @endif
  
  all: $(JIMSH) @C_EXT_SHOBJS@
-@@ -99,20 +99,25 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
+@@ -100,24 +100,30 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
  	$(Q)$(JIMSH_CC) @SH_LINKRPATH_FLAGS@ @SH_LINKFLAGS@ $(LDFLAGS) -o $@ jimsh.o initjimsh.o $(LIBJIM) $(LDLIBS) $(LIBS)
  
  @if JIM_INSTALL
@@ -41,11 +41,17 @@ Index: Makefile.in
  
 +install-exas:
 +	$(INSTALL_DATA_DIR) $(DESTDIR)@datadir@/examples/jim{,/api,/ext}
-+	$(INSTALL_SCRIPT) build-jim-ext         $(DESTDIR)@datadir@/examples/jim
-+	$(INSTALL_DATA) @srcdir@/examples/*     $(DESTDIR)@datadir@/examples/jim
-+	$(INSTALL_DATA) @srcdir@/examples.api/{README,Makefile,*.c,*.tcl} $(DESTDIR)@datadir@/examples/jim/api
++	$(INSTALL_SCRIPT) build-jim-ext                             $(DESTDIR)@datadir@/examples/jim
++	$(INSTALL_DATA) @srcdir@/examples/*                         $(DESTDIR)@datadir@/examples/jim
 +	$(INSTALL_DATA) @srcdir@/examples.ext/{README,Makefile,*.c} $(DESTDIR)@datadir@/examples/jim/ext
++	$(INSTALL_DATA) @srcdir@/examples.api/{README,*.c,*.tcl}    $(DESTDIR)@datadir@/examples/jim/api
++	$(INSTALL_DATA) examples.api/Makefile                       $(DESTDIR)@datadir@/examples/jim/api
 +
  install-exec: all
  	$(INSTALL_DATA_DIR) $(DESTDIR)@bindir@
  	$(INSTALL_PROGRAM) $(JIMSH) $(DESTDIR)@bindir@
+-	$(INSTALL_PROGRAM) @srcdir@/jimdb $(DESTDIR)@bindir@
++	$(INSTALL_SCRIPT) @srcdir@/jimdb $(DESTDIR)@bindir@
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)@bindir@/$(JIMSH)
diff -Nurp /usr/ports/lang/jimtcl/patches/patch-examples_api_Makefile_in ./patches/patch-examples_api_Makefile_in
--- /usr/ports/lang/jimtcl/patches/patch-examples_api_Makefile_in	Fri Mar 11 14:29:03 2022
+++ ./patches/patch-examples_api_Makefile_in	Fri Dec  6 10:43:39 2024
@@ -1,11 +1,10 @@
 Index: examples.api/Makefile.in
 --- examples.api/Makefile.in.orig
 +++ examples.api/Makefile.in
-@@ -1,6 +1,6 @@
+@@ -1,5 +1,5 @@
  CFLAGS+= -Wall -g
 -CFLAGS+= -I..
 +CFLAGS+= -I${LOCALBASE}/include/jim
  LDFLAGS += @LDFLAGS@
  LDLIBS += -L.. -ljim @LDLIBS@
  
- EXAMPLES=		\
diff -Nurp /usr/ports/lang/jimtcl/pkg/DESCR ./pkg/DESCR
--- /usr/ports/lang/jimtcl/pkg/DESCR	Fri Sep 16 16:07:35 2011
+++ ./pkg/DESCR	Wed Dec 31 19:00:00 1969
@@ -1,9 +0,0 @@
-Jim is a small footprint implementation of the Tcl programming language
-written from scratch. Currently Jim Tcl is very feature complete with an
-extensive test suite. There are some Tcl commands and features which are
-not implemented (and likely never will be), including namespaces, traces
-and Tk. However Jim Tcl offers a number of both Tcl8.5 and Tcl8.6
-features ({*}, dict, lassign, tailcall and optional UTF-8 support) and
-some unique features. These unique features include [lambda] with
-garbage collection, a general GC/references system, arrays as syntax
-sugar for [dict]tionaries, object-based I/O and more.
diff -Nurp /usr/ports/lang/jimtcl/pkg/DESCR-main ./pkg/DESCR-main
--- /usr/ports/lang/jimtcl/pkg/DESCR-main	Wed Dec 31 19:00:00 1969
+++ ./pkg/DESCR-main	Fri Sep 16 16:07:35 2011
@@ -0,0 +1,9 @@
+Jim is a small footprint implementation of the Tcl programming language
+written from scratch. Currently Jim Tcl is very feature complete with an
+extensive test suite. There are some Tcl commands and features which are
+not implemented (and likely never will be), including namespaces, traces
+and Tk. However Jim Tcl offers a number of both Tcl8.5 and Tcl8.6
+features ({*}, dict, lassign, tailcall and optional UTF-8 support) and
+some unique features. These unique features include [lambda] with
+garbage collection, a general GC/references system, arrays as syntax
+sugar for [dict]tionaries, object-based I/O and more.
diff -Nurp /usr/ports/lang/jimtcl/pkg/DESCR-redis ./pkg/DESCR-redis
--- /usr/ports/lang/jimtcl/pkg/DESCR-redis	Wed Dec 31 19:00:00 1969
+++ ./pkg/DESCR-redis	Wed Jan  8 04:21:53 2025
@@ -0,0 +1 @@
+REDIS extension for Jimtcl.
diff -Nurp /usr/ports/lang/jimtcl/pkg/DESCR-sdl ./pkg/DESCR-sdl
--- /usr/ports/lang/jimtcl/pkg/DESCR-sdl	Wed Dec 31 19:00:00 1969
+++ ./pkg/DESCR-sdl	Wed Jan  8 04:21:57 2025
@@ -0,0 +1 @@
+SDL extension for Jimtcl.
diff -Nurp /usr/ports/lang/jimtcl/pkg/DESCR-sqlite ./pkg/DESCR-sqlite
--- /usr/ports/lang/jimtcl/pkg/DESCR-sqlite	Wed Dec 31 19:00:00 1969
+++ ./pkg/DESCR-sqlite	Wed Jan  8 04:22:00 2025
@@ -0,0 +1 @@
+SQLite extension for Jimtcl.
diff -Nurp /usr/ports/lang/jimtcl/pkg/PLIST ./pkg/PLIST
--- /usr/ports/lang/jimtcl/pkg/PLIST	Fri Mar 11 14:29:04 2022
+++ ./pkg/PLIST	Wed Dec 31 19:00:00 1969
@@ -1,64 +0,0 @@
-@bin bin/jimsh
-include/jim/
-include/jim/jim-config.h
-include/jim/jim-eventloop.h
-include/jim/jim-signal.h
-include/jim/jim-subcmd.h
-include/jim/jim-win32compat.h
-include/jim/jim.h
-lib/jim/
-@so lib/jim/sqlite3.so
-lib/jim/tcltest.tcl
-@so lib/jim/zlib.so
-@lib lib/libjim.so.${LIBjim_VERSION}
-lib/pkgconfig/jimtcl.pc
-share/doc/jim/
-share/doc/jim/LICENSE
-share/doc/jim/README
-share/doc/jim/README.extensions
-share/doc/jim/README.namespaces
-share/doc/jim/README.oo
-share/doc/jim/README.sqlite
-share/doc/jim/README.utf-8
-share/doc/jim/Tcl.html
-share/examples/jim/
-share/examples/jim/api/
-share/examples/jim/api/Makefile
-share/examples/jim/api/README
-share/examples/jim/api/jim_command.c
-share/examples/jim/api/jim_hello.c
-share/examples/jim/api/jim_list.c
-share/examples/jim/api/jim_obj.c
-share/examples/jim/api/jim_return.c
-share/examples/jim/api/print.tcl
-share/examples/jim/build-jim-ext
-share/examples/jim/certificate.pem
-share/examples/jim/client-server.tcl
-share/examples/jim/dns.tcl
-share/examples/jim/dnstest.tcl
-share/examples/jim/ext/
-share/examples/jim/ext/Makefile
-share/examples/jim/ext/README
-share/examples/jim/ext/helloworld.c
-share/examples/jim/jtclsh.tcl
-share/examples/jim/metakit.tcl
-share/examples/jim/ootest.tcl
-share/examples/jim/parray.tcl
-share/examples/jim/pipe.tcl
-share/examples/jim/popen.tcl
-share/examples/jim/sqlite3test.tcl
-share/examples/jim/ssl.client
-share/examples/jim/ssl.server
-share/examples/jim/tcp.client
-share/examples/jim/tcp.server
-share/examples/jim/timedread.tcl
-share/examples/jim/tip.tcl
-share/examples/jim/udp.client
-share/examples/jim/udp.server
-share/examples/jim/udp2.client
-share/examples/jim/udp6.client
-share/examples/jim/udp6.server
-share/examples/jim/unix.client
-share/examples/jim/unix.dgram.client
-share/examples/jim/unix.dgram.server
-share/examples/jim/unix.server
diff -Nurp /usr/ports/lang/jimtcl/pkg/PLIST-main ./pkg/PLIST-main
--- /usr/ports/lang/jimtcl/pkg/PLIST-main	Wed Dec 31 19:00:00 1969
+++ ./pkg/PLIST-main	Wed Jan  8 04:44:47 2025
@@ -0,0 +1,74 @@
+bin/jimdb
+@bin bin/jimsh
+include/jim/
+include/jim/jim-config.h
+include/jim/jim-eventloop.h
+include/jim/jim-signal.h
+include/jim/jim-subcmd.h
+include/jim/jim-win32compat.h
+include/jim/jim.h
+lib/jim/
+lib/jim/tcltest.tcl
+@lib lib/libjim.so.${LIBjim_VERSION}
+lib/pkgconfig/jimtcl.pc
+share/doc/jim/
+share/doc/jim/LICENSE
+share/doc/jim/README
+share/doc/jim/README.extensions
+share/doc/jim/README.namespaces
+share/doc/jim/README.oo
+share/doc/jim/README.sqlite
+share/doc/jim/README.utf-8
+share/doc/jim/Tcl.html
+share/examples/jim/
+share/examples/jim/COPYING.FreeSans.ttf
+share/examples/jim/FreeSans.ttf
+share/examples/jim/api/
+share/examples/jim/api/Makefile
+share/examples/jim/api/README
+share/examples/jim/api/jim_command.c
+share/examples/jim/api/jim_hello.c
+share/examples/jim/api/jim_list.c
+share/examples/jim/api/jim_obj.c
+share/examples/jim/api/jim_return.c
+share/examples/jim/api/print.tcl
+share/examples/jim/build-jim-ext
+share/examples/jim/certificate.pem
+share/examples/jim/client-server.tcl
+share/examples/jim/dbgtest.tcl
+share/examples/jim/dns.tcl
+share/examples/jim/dnstest.tcl
+share/examples/jim/ext/
+share/examples/jim/ext/Makefile
+share/examples/jim/ext/README
+share/examples/jim/ext/helloworld.c
+share/examples/jim/jcov
+share/examples/jim/jtclsh.tcl
+share/examples/jim/jtime
+share/examples/jim/jtrace
+share/examples/jim/metakit.tcl
+share/examples/jim/ootest.tcl
+share/examples/jim/parray.tcl
+share/examples/jim/pipe.tcl
+share/examples/jim/popen.tcl
+share/examples/jim/redis-pubsub.tcl
+share/examples/jim/redis.tcl
+share/examples/jim/sdlcircles.tcl
+share/examples/jim/sdlevents.tcl
+share/examples/jim/sdltest.tcl
+share/examples/jim/sqlite3test.tcl
+share/examples/jim/ssl.client
+share/examples/jim/ssl.server
+share/examples/jim/tcp.client
+share/examples/jim/tcp.server
+share/examples/jim/timedread.tcl
+share/examples/jim/tip.tcl
+share/examples/jim/udp.client
+share/examples/jim/udp.server
+share/examples/jim/udp2.client
+share/examples/jim/udp6.client
+share/examples/jim/udp6.server
+share/examples/jim/unix.client
+share/examples/jim/unix.dgram.client
+share/examples/jim/unix.dgram.server
+share/examples/jim/unix.server
diff -Nurp /usr/ports/lang/jimtcl/pkg/PLIST-redis ./pkg/PLIST-redis
--- /usr/ports/lang/jimtcl/pkg/PLIST-redis	Wed Dec 31 19:00:00 1969
+++ ./pkg/PLIST-redis	Wed Jan  8 04:21:48 2025
@@ -0,0 +1 @@
+@so lib/jim/redis.so
diff -Nurp /usr/ports/lang/jimtcl/pkg/PLIST-sdl ./pkg/PLIST-sdl
--- /usr/ports/lang/jimtcl/pkg/PLIST-sdl	Wed Dec 31 19:00:00 1969
+++ ./pkg/PLIST-sdl	Wed Jan  8 04:21:39 2025
@@ -0,0 +1 @@
+@so lib/jim/sdl.so
diff -Nurp /usr/ports/lang/jimtcl/pkg/PLIST-sqlite ./pkg/PLIST-sqlite
--- /usr/ports/lang/jimtcl/pkg/PLIST-sqlite	Wed Dec 31 19:00:00 1969
+++ ./pkg/PLIST-sqlite	Wed Jan  8 04:21:44 2025
@@ -0,0 +1 @@
+@so lib/jim/sqlite3.so