From: Stuart Cassoff <exokoide@yahoo.ca>
Subject: emulators/openmsx: Allow building with any MODTCL_VERSION.
To: OpenBSD Ports <ports@openbsd.org>
Date: Sun, 8 Feb 2026 10:39:21 -0500

Text of the PR:

If Tcl 8.5 and 8.6 are installed, and the 8.6 config script location is 
specified using the TCL_CONFIG env var, then other dirs will still be 
searched and 8.5 will be chosen, rendering the env var useless in this 
case.

This change causes the search to be skipped if the env var is set, 
allowing the user to select the one specific Tcl version of their choice. 

I don't know what is the intention here, but this make sense/works better 
for me.


All this work for a "return",

Stu



diff -Nurp /usr/ports//emulators/openmsx/Makefile ./Makefile
--- /usr/ports//emulators/openmsx/Makefile	Sun Feb  8 01:34:46 2026
+++ ./Makefile	Sun Feb  8 09:55:18 2026
@@ -20,7 +20,9 @@ WANTLIB += GL GLEW SDL2 SDL2_ttf c freetype m ogg png
 WANTLIB += pthread ${COMPILER_LIBCXX} theoradec vorbis z
 
 SITES =		https://github.com/openMSX/openMSX/releases/download/RELEASE_${V:S/./_/g}/
-CONFIGURE_STYLE =	simple
+
+CONFIGURE_STYLE =simple
+CONFIGURE_ENV =	TCL_CONFIG=${MODTCL_LIBDIR}
 
 MAKE_ENV +=	INSTALL_BASE=${PREFIX}/share/openmsx \
 		INSTALL_BINARY_DIR=${PREFIX}/bin \
diff -Nurp /usr/ports//emulators/openmsx/patches/patch-build_libraries_py ./patches/patch-build_libraries_py
--- /usr/ports//emulators/openmsx/patches/patch-build_libraries_py	Wed Dec 31 19:00:00 1969
+++ ./patches/patch-build_libraries_py	Sun Feb  8 10:21:04 2026
@@ -0,0 +1,16 @@
+Use only the provided config location instead of seaching and selecting
+the config of the lowest version of Tcl that can be found.
+https://github.com/openMSX/openMSX/pull/2084
+
+
+Index: build/libraries.py
+--- build/libraries.py.orig
++++ build/libraries.py
+@@ -357,6 +357,7 @@ class TCL(Library):
+ 			tclpath = environ.get('TCL_CONFIG')
+ 			if tclpath is not None:
+ 				yield tclpath
++				return
+ 
+ 			if distroRoot is None or cls.isSystemLibrary(platform):
+ 				if msysActive():