From eeca2d538ca9cd69ebe08ff8fdb2e13048f1c2cd Mon Sep 17 00:00:00 2001
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Fri, 15 May 2026 12:41:08 +0000
Subject: [PATCH] lang/tcl86: fix module path

---
 lang/tcl86/Makefile                     |  1 +
 lang/tcl86/files/patch-unix-Makefile.in | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index d68cf9f3da91..a15f390805c6 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	tcl
 DISTVERSION=	${TCL_VERSION}${TCL_RC}
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	SF/tcl/Tcl/${TCL_VERSION}
 PKGNAMESUFFIX=	${SHORT_TCL_VER}
diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in
index 17183ce026f3..3ba69c5027aa 100644
--- a/lang/tcl86/files/patch-unix-Makefile.in
+++ b/lang/tcl86/files/patch-unix-Makefile.in
@@ -124,6 +124,23 @@
  	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)/"
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
  		$(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@ ; do \
+@@ -885,11 +884,11 @@ install-libraries: libraries
+ 	@for i in $(TOP_DIR)/library/encoding/*.enc; do \
+ 		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/encoding"; \
+ 	done
+-	@if [ -n "$(TCL_MODULE_PATH)" -a -f $(TOP_DIR)/library/tm.tcl ] ; then \
+-	    echo "Customizing tcl module path"; \
+-	    echo "if {![interp issafe]} { ::tcl::tm::roots [list $(TCL_MODULE_PATH)] }" >> \
+-		    "$(SCRIPT_INSTALL_DIR)/tm.tcl"; \
+-	fi
++	@echo "Customizing tcl module path";
++	echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \
++	    "$(SCRIPT_INSTALL_DIR)"/tm.tcl;
++	echo "::tcl::tm::path add {$(TCL_LIBRARY)}" >> \
++	    "$(SCRIPT_INSTALL_DIR)"/tm.tcl;
+ 
+ install-tzdata:
+ 	@for i in tzdata; do \
 @@ -956,7 +955,7 @@ install-headers:
  	done