base:
  Fix port README substitutions for Ruby and Tk.
  SUBST_VARS+=MODTK_VERSION (soon to be removed from tk.port.mk)
  MODTK_VERSION=8.6

texmf:
  Add missing MODTK_RUN_DEPENDS.
  MODTK_VERSION=8.6


Two Tcl/Tk programs affected:
* epspdftk.tcl in -main: Looks fine with 8.6.
* tlshell.tcl in -buildset:
    Will now run with 8.6 but is looking for tlpkg "tltcl",
    which, if I find and install, wants to run "tlmgr",
    which is not installed on OpenBSD.
    So it most likely works ok with 8.6 but will never
    work anyway due to lack of tlmgr, I guess.
    Maybe don't install it?

Some of the MOD* stuff looks like it could be
refactored into Makefile.inc.


Stu



diff -Nurp /usr/ports/print/texlive/base/Makefile ./base/Makefile
--- /usr/ports/print/texlive/base/Makefile      Wed Oct  1 16:45:03 2025
+++ ./base/Makefile     Wed Dec  3 09:41:45 2025
@@ -67,8 +67,13 @@ LIB_DEPENDS-mktexlsr =
 
 LIB_DEPENDS-synctex =
 
-MODULES =              textproc/intltool perl
+MODULES =              textproc/intltool lang/ruby x11/tk perl
 
+# Ruby and Tk modules only here for README substitution
+MODRUBY_BUILDDEP =     No
+MODRUBY_RUNDEP =       No
+MODTK_VERSION =                8.6
+
 # c++-17 required for some subprojects
 COMPILER =             base-clang ports-gcc
 CXXFLAGS_ports-gcc =   -std=gnu++17
@@ -153,7 +158,7 @@ CONFIGURE_ARGS +=   --mandir=${PREFIX}/man \
 # https://tug.org/pipermail/tldistro/2024q2/000477.html
 CONFIGURE_ARGS +=      --disable-dvisvgm
 
-SUBST_VARS +=          TRUEPREFIX LOCALBASE
+SUBST_VARS +=          TRUEPREFIX LOCALBASE MODTK_VERSION
 
 # just to silence error - never used
 pre-install:
diff -Nurp /usr/ports/print/texlive/texmf/Makefile ./texmf/Makefile
--- /usr/ports/print/texlive/texmf/Makefile     Wed Oct  1 16:45:04 2025
+++ ./texmf/Makefile    Wed Dec  3 09:37:48 2025
@@ -37,6 +37,7 @@ MODRUBY_BUILDDEP =    No
 MODRUBY_RUNDEP =       No
 MODPY_BUILDDEP =       No
 MODPY_RUNDEP =         No
+MODTK_VERSION =                8.6
 
 .include "adj.mk"
 
@@ -44,6 +45,7 @@ RUN_DEPENDS-main +=   texlive_base->=${V}:print/texlive/
                        ${FULLPKGNAME-buildset}:print/texlive/texmf,-buildset
 RUN_DEPENDS-full =     ${FULLPKGNAME-main}:print/texlive/texmf,-main \
                        ${MODPY_RUN_DEPENDS} \
+                       ${MODTK_RUN_DEPENDS} \
                        ${_MODLUA_RUNDEPENDS}
 # While pdfjam needs bash, depend upon bash:
 RUN_DEPENDS-full +=    shells/bash

Reply via email to