diff --git a/lang/tcl85/files/patch-Makefile.in b/lang/tcl85/files/patch-Makefile.in
index a12d76e18109..aed41d3016ed 100644
--- a/lang/tcl85/files/patch-Makefile.in
+++ b/lang/tcl85/files/patch-Makefile.in
@@ -1,176 +1,185 @@
 --- Makefile.in.orig	2016-02-08 20:44:53 UTC
 +++ Makefile.in
 @@ -54,6 +54,8 @@ SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TCL_LIBRARY)
  
  # Directory in which to install the include file tcl.h:
  INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
 +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
 +UNIX_INCLUDE_INSTALL_DIR= $(INCLUDE_INSTALL_DIR)/unix
  
  # Path to the private tcl header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
+@@ -149,7 +151,7 @@ SHELL			= @MAKEFILE_SHELL@
+ # distribution, which is slower but guaranteed to work.
+ 
+ INSTALL_STRIP_PROGRAM   = -s
+-INSTALL_STRIP_LIBRARY   = -S -x
++INSTALL_STRIP_LIBRARY   = -S --strip-unneeded
+ 
+ INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
+ INSTALL_PROGRAM		= ${INSTALL}
 @@ -546,7 +548,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(
  
  all: binaries libraries doc
  
 -binaries: ${LIB_FILE} ${TCL_EXE}
 +binaries: ${LIB_FILE} ${TCL_EXE} libtcl${SHORT_TCL_VER}.a
  
  libraries:
  
 @@ -557,7 +559,16 @@ doc:
  ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS}
  	rm -f $@
  	@MAKE_LIB@
 +	@ln -sf ${LIB_FILE} ./libtcl${SHORT_TCL_VER}.so
 +	if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
 +		$(RANLIB) ${LIB_FILE}; \
 +	fi;
  
 +libtcl${SHORT_TCL_VER}.a: ${OBJS}
 +	rm -f libtcl${SHORT_TCL_VER}.a
 +	ar cr libtcl${SHORT_TCL_VER}.a ${OBJS}
 +	$(RANLIB) libtcl${SHORT_TCL_VER}.a
 +
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	@if test "x${LIB_FILE}" = "xlibtcl${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
  	    (cd ${TOP_DIR}/win; ${MAKE} winextensions); \
 @@ -701,7 +712,7 @@ gentommath_h:
  dltest.marker: ${STUB_LIB_FILE}
  	cd dltest ; $(MAKE)
  
 -INSTALL_TARGETS = install-binaries install-libraries install-doc @EXTRA_INSTALL@
 +INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@
  
  install: $(INSTALL_TARGETS)
  
 @@ -727,21 +738,29 @@ install-binaries: binaries
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
  	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
 +	@ln -sf $(LIB_FILE) "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.so
 +	@echo "Installing libtcl${SHORT_TCL_VER}.a"
 +	@$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \
 +		"$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
 +	@(cd "$(DLL_INSTALL_DIR)"; $(RANLIB) libtcl${SHORT_TCL_VER}.a)
 +	@chmod 555 "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
  	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@"
  	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@"
 -	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
 -	@$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)/tclConfig.sh"
 +	@echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/"
 +	@mkdir -p "$(SCRIPT_INSTALL_DIR)"
 +	@$(INSTALL_DATA) tclConfig.sh "$(SCRIPT_INSTALL_DIR)"/tclConfig.sh
  	@if test "$(STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    @INSTALL_STUB_LIB@ ; \
  	fi
  	@EXTRA_INSTALL_BINARIES@
 -	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
 -	@mkdir -p $(LIB_INSTALL_DIR)/pkgconfig
 -	@$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl.pc
 +	@echo "Installing pkg-config file to $(DESTDIR)$(prefix)/libdata/pkgconfig/"
 +	@mkdir -p $(DESTDIR)$(prefix)/libdata/pkgconfig
 +	@$(INSTALL_DATA) tcl.pc $(DESTDIR)$(prefix)/libdata/pkgconfig/tcl85.pc
  
  install-libraries: libraries $(INSTALL_TZDATA) install-msgs
 -	@for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \
 +	@for i in "$(GENERIC_INCLUDE_INSTALL_DIR)" \
 +		"$(UNIX_INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \
  	    do \
  	    if [ ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
 @@ -749,7 +768,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install
  		else true; \
  		fi; \
  	    done;
 -	@for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5; \
 +	@for i in encoding; \
  	    do \
  	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
  		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
 @@ -758,50 +777,64 @@ install-libraries: libraries $(INSTALL_TZDATA) install
  		fi; \
  	    done;
  	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
 -	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
 -		$(GENERIC_DIR)/tclPlatDecls.h \
 -		$(GENERIC_DIR)/tclTomMath.h \
 -		$(GENERIC_DIR)/tclTomMathDecls.h ; \
 +	@for i in $(GENERIC_DIR)/*.h ; \
  	    do \
 -	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
 +	    $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \
  	    done;
 +	@for i in $(UNIX_DIR)/*.h ; \
 +	    do \
 +	    $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \
 +	    done;
 +	@ln -sf generic/tcl.h "$(INCLUDE_INSTALL_DIR)"/tcl.h
 +	@ln -sf generic/tclDecls.h "$(INCLUDE_INSTALL_DIR)"/tclDecls.h
 +	@ln -sf generic/tclPlatDecls.h "$(INCLUDE_INSTALL_DIR)"/tclPlatDecls.h
 +	@ln -sf generic/tclTomMath.h "$(INCLUDE_INSTALL_DIR)"/tclTomMath.h
 +	@ln -sf generic/tclTomMathDecls.h "$(INCLUDE_INSTALL_DIR)"/tclTomMathDecls.h
  	@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 \
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
  	    done;
 +	@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
 +	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
 +		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \
 +	done;
 +	@echo "Customizing tcl module path";
 +	@echo "::tcl::tm::path add {$(TCL_LIBRARY)}" >> \
 + 	    "$(SCRIPT_INSTALL_DIR)"/tm.tcl;
 +
 +install-tm:
 +	@for i in opt0.4 http1.0; \
 +	    do \
 +	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
 +		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
 +		$(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/$$i; \
 +		else true; \
 +		fi; \
 +	    done;
  	@echo "Installing package http1.0 files to $(SCRIPT_INSTALL_DIR)/http1.0/";
  	@for i in $(TOP_DIR)/library/http1.0/*.tcl ; \
  	    do \
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
  	    done;
  	@echo "Installing package http 2.7.13 as a Tcl Module";
 -	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.13.tm;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.7.13.tm;
  	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
  	@for i in $(TOP_DIR)/library/opt/*.tcl ; \
  	    do \
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \
  	    done;
  	@echo "Installing package msgcat 1.5.2 as a Tcl Module";
 -	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.2.tm;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat-1.5.2.tm;
  	@echo "Installing package tcltest 2.3.8 as a Tcl Module";
 -	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.8.tm;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.3.8.tm;
  
  	@echo "Installing package platform 1.0.14 as a Tcl Module";
 -	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.14.tm;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform-1.0.14.tm;
  	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
 -	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
 -
 -	@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
 -	@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 {$(TCL_MODULE_PATH)} }" >> \
 -	        "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
 -	fi
 +	@$(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/platform;
 +	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/platform/shell-1.1.4.tm;
  
  install-tzdata:
  	@for i in tzdata; \
diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in
index 8317abb8db62..129c0afce1be 100644
--- a/lang/tcl86/files/patch-unix-Makefile.in
+++ b/lang/tcl86/files/patch-unix-Makefile.in
@@ -1,200 +1,209 @@
 --- unix/Makefile.in.orig	2022-10-28 18:34:26 UTC
 +++ unix/Makefile.in
 @@ -58,6 +58,8 @@ MODULE_INSTALL_DIR	= $(SCRIPT_INSTALL_DIR)/../tcl8
  
  # Directory in which to install the include file tcl.h:
  INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
 +GENERIC_INCLUDE_INSTALL_DIR	= $(INCLUDE_INSTALL_DIR)/generic
 +UNIX_INCLUDE_INSTALL_DIR	= $(INCLUDE_INSTALL_DIR)/unix
  
  # Path to the private tcl header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
 @@ -84,10 +86,10 @@ HTML_DIR		= @HTML_DIR@
  HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML_DIR)
  
  # Directory in which to install the configuration file tclConfig.sh
 -CONFIG_INSTALL_DIR	= $(INSTALL_ROOT)$(libdir)
 +CONFIG_INSTALL_DIR	= $(SCRIPT_INSTALL_DIR)
  
  # Directory in which to install bundled packages:
 -PACKAGE_DIR		= @PACKAGE_DIR@
 +PACKAGE_DIR		= $(SCRIPT_INSTALL_DIR)
  
  # Package search path.
  TCL_PACKAGE_PATH	= @TCL_PACKAGE_PATH@
+@@ -151,7 +153,7 @@ SHELL			= @MAKEFILE_SHELL@
+ # distribution, which is slower but guaranteed to work.
+ 
+ INSTALL_STRIP_PROGRAM	= -s
+-INSTALL_STRIP_LIBRARY	= -S -x
++INSTALL_STRIP_LIBRARY	= -S --strip-unneeded
+ 
+ INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
+ INSTALL_PROGRAM		= ${INSTALL}
 @@ -713,9 +715,9 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \
  # Start of rules
  #--------------------------------------------------------------------------
  
 -all: binaries libraries doc packages
 +all: binaries libraries doc
  
 -binaries: ${LIB_FILE} ${TCL_EXE}
 +binaries: ${LIB_FILE} ${TCL_EXE} libtcl${SHORT_TCL_VER}.a
  
  libraries:
  
 @@ -726,7 +728,13 @@ doc:
  ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS}
  	rm -f $@
  	@MAKE_LIB@
 +	@ln -sf ${LIB_FILE} ./libtcl${SHORT_TCL_VER}.so
  
 +libtcl${SHORT_TCL_VER}.a: ${OBJS}
 +	rm -f libtcl${SHORT_TCL_VER}.a
 +	ar cr libtcl${SHORT_TCL_VER}.a ${OBJS}
 +	${RANLIB} libtcl${SHORT_TCL_VER}.a
 +
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	@if test "x${LIB_FILE}" = "xlibtcl${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
  	    (cd ${TOP_DIR}/win; ${MAKE} winextensions); \
 @@ -875,13 +883,13 @@ trace-test: ${TCLTEST_EXE}
  # Installation rules
  #--------------------------------------------------------------------------
  
 -INSTALL_BASE_TARGETS = install-binaries install-libraries install-msgs $(INSTALL_TZDATA)
 +INSTALL_BASE_TARGETS = install-binaries install-msgs $(INSTALL_TZDATA)
  INSTALL_DOC_TARGETS = install-doc
  INSTALL_PACKAGE_TARGETS = install-packages
  INSTALL_DEV_TARGETS = install-headers
  INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
 -INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \
 -		  $(INSTALL_PACKAGE_TARGETS) $(INSTALL_EXTRA_TARGETS)
 +INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DEV_TARGETS) \
 +		  $(INSTALL_EXTRA_TARGETS)
  
  install: $(INSTALL_TARGETS)
  
 @@ -901,6 +909,11 @@ install-binaries: binaries
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
  	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
 +	@ln -sf $(LIB_FILE) "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.so
 +	@echo "Installing libtcl${SHORT_TCL_VER}.a to $(DLL_INSTALL_DIR)"
 +	@$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
 +	@(cd "$(DLL_INSTALL_DIR)" && ${RANLIB} libtcl${SHORT_TCL_VER}.a)
 +	@chmod 555 "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
  	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
  	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
  	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
 @@ -913,33 +926,19 @@ install-binaries: binaries
  	    @INSTALL_STUB_LIB@ ; \
  	fi
  	@EXTRA_INSTALL_BINARIES@
 -	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
 -	@$(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/pkgconfig"
 -	@$(INSTALL_DATA) tcl.pc "$(LIB_INSTALL_DIR)/pkgconfig/tcl.pc"
 +	@echo "Installing pkg-config file to $(prefix)/libdata/pkgconfig/"
 +	@$(INSTALL_DATA_DIR) "$(INSTALL_ROOT)$(prefix)/libdata/pkgconfig"
 +	@$(INSTALL_DATA) tcl.pc "$(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/tcl86.pc"
  
  install-libraries: libraries
 -	@for i in "$(SCRIPT_INSTALL_DIR)" "$(MODULE_INSTALL_DIR)"; \
 +	@for i in opt0.4 http1.0 platform encoding; \
  	    do \
 -	    if [ ! -d "$$i" ] ; then \
 -		echo "Making directory $$i"; \
 -		$(INSTALL_DATA_DIR) "$$i"; \
 -	    fi; \
 -	    done;
 -	@for i in opt0.4 http1.0 encoding; \
 -	    do \
  	    if [ ! -d "$(SCRIPT_INSTALL_DIR)/$$i" ] ; then \
  		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
  		$(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)/$$i"; \
  		else true; \
  		fi; \
  	    done;
 -	@for i in 8.4 8.4/platform 8.5 8.6; \
 -	    do \
 -	    if [ ! -d "$(MODULE_INSTALL_DIR)/$$i" ] ; then \
 -		echo "Making directory $(MODULE_INSTALL_DIR)/$$i"; \
 -		$(INSTALL_DATA_DIR) "$(MODULE_INSTALL_DIR)/$$i"; \
 -	    fi; \
 -	    done;
  	@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 \
 @@ -952,32 +951,32 @@ install-libraries: libraries
  	    done
  	@echo "Installing package http 2.9.8 as a Tcl Module";
  	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl \
 -		"$(MODULE_INSTALL_DIR)/8.6/http-2.9.8.tm"
 +		"$(SCRIPT_INSTALL_DIR)/http-2.9.8.tm"
  	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"
  	@for i in $(TOP_DIR)/library/opt/*.tcl; do \
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
  	done
  	@echo "Installing package msgcat 1.6.1 as a Tcl Module"
  	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl \
 -		"$(MODULE_INSTALL_DIR)/8.5/msgcat-1.6.1.tm"
 +		"$(SCRIPT_INSTALL_DIR)/msgcat-1.6.1.tm"
  	@echo "Installing package tcltest 2.5.5 as a Tcl Module"
  	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl \
 -		"$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.5.tm"
 +		"$(SCRIPT_INSTALL_DIR)/tcltest-2.5.5.tm"
  	@echo "Installing package platform 1.0.19 as a Tcl Module"
  	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl \
 -		"$(MODULE_INSTALL_DIR)/8.4/platform-1.0.19.tm"
 +		"$(SCRIPT_INSTALL_DIR)/platform-1.0.19.tm"
  	@echo "Installing package platform::shell 1.1.4 as a Tcl Module"
  	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl \
 -		"$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm"
 +		"$(SCRIPT_INSTALL_DIR)/platform/shell-1.1.4.tm"
  	@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"
  	@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 {$(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 \
 @@ -1044,7 +1043,7 @@ install-doc: doc
  	done
  
  install-headers:
 -	@for i in "$(INCLUDE_INSTALL_DIR)"; do \
 +	@for i in "$(INCLUDE_INSTALL_DIR)" "$(GENERIC_INCLUDE_INSTALL_DIR)"; do \
  	    if [ ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
  		$(INSTALL_DATA_DIR) "$$i"; \
 @@ -1059,23 +1058,22 @@ install-headers:
  	    do \
  	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
  	done
 +	@for i in $(GENERIC_DIR)/*.h; do \
 +	    $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"/; \
 +	    done;
  
  # Optional target to install private headers
  install-private-headers:
 -	@for i in "$(PRIVATE_INCLUDE_INSTALL_DIR)"; do \
 +	@for i in "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; do \
  	    if [ ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
  		$(INSTALL_DATA_DIR) "$$i"; \
  	    fi; \
  	done
 -	@echo "Installing private header files to $(PRIVATE_INCLUDE_INSTALL_DIR)/";
 -	@for i in $(GENERIC_DIR)/tclInt.h $(GENERIC_DIR)/tclIntDecls.h \
 -		$(GENERIC_DIR)/tclIntPlatDecls.h $(GENERIC_DIR)/tclPort.h \
 -		$(GENERIC_DIR)/tclOOInt.h $(GENERIC_DIR)/tclOOIntDecls.h \
 -		$(UNIX_DIR)/tclUnixPort.h; \
 +	@for i in $(UNIX_DIR)/tclUnixPort.h $(UNIX_DIR)/tclUnixThrd.h @DTRACE_HDR@; \
  	    do \
 -	    $(INSTALL_DATA) $$i "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \
 -	done
 +	    $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \
 +	    done;
  	@if test -f tclConfig.h; then\
  	    $(INSTALL_DATA) tclConfig.h "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \
  	fi
diff --git a/lang/tcl87/files/patch-unix_Makefile.in b/lang/tcl87/files/patch-unix_Makefile.in
index 68fceb6b0160..2bc20856232a 100644
--- a/lang/tcl87/files/patch-unix_Makefile.in
+++ b/lang/tcl87/files/patch-unix_Makefile.in
@@ -1,84 +1,93 @@
 --- unix/Makefile.in.orig	2021-06-13 17:37:34 UTC
 +++ unix/Makefile.in
 @@ -84,7 +84,7 @@ HTML_DIR		= @HTML_DIR@
  HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML_DIR)
  
  # Directory in which to install the configuration file tclConfig.sh
 -CONFIG_INSTALL_DIR	= $(INSTALL_ROOT)$(libdir)
 +CONFIG_INSTALL_DIR	= $(INSTALL_ROOT)$(TCL_LIBRARY)
  
  # Directory in which to install bundled packages:
  PACKAGE_DIR		= @PACKAGE_DIR@
+@@ -151,7 +151,7 @@ SHELL			= @MAKEFILE_SHELL@
+ # distribution, which is slower but guaranteed to work.
+ 
+ INSTALL_STRIP_PROGRAM	= -s
+-INSTALL_STRIP_LIBRARY	= -S -x
++INSTALL_STRIP_LIBRARY	= -S --strip-unneeded
+ 
+ INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
+ INSTALL_PROGRAM		= ${INSTALL}
 @@ -1003,30 +1003,23 @@ install-binaries: binaries
  	@EXTRA_INSTALL_BINARIES@
  	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
  	@$(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/pkgconfig"
 -	@$(INSTALL_DATA) tcl.pc "$(LIB_INSTALL_DIR)/pkgconfig/tcl.pc"
 +	@$(INSTALL_DATA) tcl.pc "$(LIB_INSTALL_DIR)/pkgconfig/tcl${SHORT_TCL_VER}.pc"
  
  install-libraries: libraries
 -	@for i in "$(SCRIPT_INSTALL_DIR)" "$(MODULE_INSTALL_DIR)"; \
 +	@for i in "$(SCRIPT_INSTALL_DIR)"; \
  	    do \
  	    if [ ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
  		$(INSTALL_DATA_DIR) "$$i"; \
  	    fi; \
  	done
 -	@for i in opt0.4 cookiejar0.2 encoding; do \
 +	@for i in opt0.4 cookiejar0.2 encoding platform; do \
  	    if [ ! -d "$(SCRIPT_INSTALL_DIR)/$$i" ] ; then \
  		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
  		$(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)/$$i"; \
  		else true; \
  		fi; \
  	    done;
 -	@for i in 8.4 8.4/platform 8.5 8.6 8.7; \
 -	    do \
 -	    if [ ! -d "$(MODULE_INSTALL_DIR)/$$i" ] ; then \
 -		echo "Making directory $(MODULE_INSTALL_DIR)/$$i"; \
 -		$(INSTALL_DATA_DIR) "$(MODULE_INSTALL_DIR)/$$i"; \
 -	    fi; \
 -	done
  	@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 \
 @@ -1041,23 +1034,23 @@ install-libraries: libraries
  	done
  	@echo "Installing package http 2.10a1 as a Tcl Module"
  	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl \
 -		"$(MODULE_INSTALL_DIR)/8.6/http-2.10a1.tm"
 +		"$(SCRIPT_INSTALL_DIR)/http-2.10a1.tm"
  	@echo "Installing package opt 0.4.7"
  	@for i in $(TOP_DIR)/library/opt/*.tcl; do \
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
  	done
  	@echo "Installing package msgcat 1.7.1 as a Tcl Module"
  	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl \
 -		"$(MODULE_INSTALL_DIR)/8.7/msgcat-1.7.1.tm"
 +		"$(SCRIPT_INSTALL_DIR)/msgcat-1.7.1.tm"
  	@echo "Installing package tcltest 2.5.4 as a Tcl Module"
  	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl \
 -		"$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.4.tm"
 +		"$(SCRIPT_INSTALL_DIR)/tcltest-2.5.4.tm"
  	@echo "Installing package platform 1.0.17 as a Tcl Module"
  	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl \
 -		"$(MODULE_INSTALL_DIR)/8.4/platform-1.0.17.tm"
 +		"$(SCRIPT_INSTALL_DIR)/platform-1.0.17.tm"
  	@echo "Installing package platform::shell 1.1.4 as a Tcl Module"
  	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl \
 -		"$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm"
 +		"$(SCRIPT_INSTALL_DIR)/platform/shell-1.1.4.tm"
  	@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"
  	@for i in $(TOP_DIR)/library/encoding/*.enc; do \
  		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/encoding"; \
 @@ -1067,6 +1060,9 @@ install-libraries: libraries
  	    echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \
  	        "$(SCRIPT_INSTALL_DIR)/tm.tcl"; \
  	fi
 +	echo "::tcl::tm::path add {$(TCL_LIBRARY)}" >> \
 +	    "$(SCRIPT_INSTALL_DIR)"/tm.tcl;
 +
  
  install-tzdata:
  	@for i in tzdata; do \
diff --git a/x11-toolkits/tk85/files/patch-unix-Makefile.in b/x11-toolkits/tk85/files/patch-unix-Makefile.in
index 90938d9ad226..8b7cd64f3393 100644
--- a/x11-toolkits/tk85/files/patch-unix-Makefile.in
+++ b/x11-toolkits/tk85/files/patch-unix-Makefile.in
@@ -1,153 +1,157 @@
 --- Makefile.in.orig	2014-08-22 16:06:02.000000000 +0200
 +++ Makefile.in	2014-08-27 09:46:38.000000000 +0200
 @@ -63,6 +63,8 @@
  
  # Directory in which to install the include file tk.h:
  INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
 +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
 +UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
  
  # Path to the private tk header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
 @@ -99,11 +101,11 @@
  # The directory containing the Tcl sources and headers appropriate
  # for this version of Tk ("srcdir" will be replaced or has already
  # been replaced by the configure script):
 -TCL_GENERIC_DIR		= @TCL_SRC_DIR@/generic
 +TCL_GENERIC_DIR		= /usr/local/include/tcl@TCL_VERSION@/generic 
  
  # The directory containing the platform specific Tcl sources and headers
  # appropriate for this version of Tk:
 -TCL_PLATFORM_DIR	= @TCL_SRC_DIR@/unix
 +TCL_PLATFORM_DIR	= /usr/local/include/tcl@TCL_VERSION@/unix
  
  # The directory containing the Tcl library archive file appropriate
  # for this version of Tk:
 @@ -113,7 +115,7 @@
  TCL_LIB_FLAG		= @TCL_LIB_FLAG@
  
  # Flag, 1: we're building a shared lib, 0 we're not
 -TK_SHARED_BUILD		= @TK_SHARED_BUILD@
 +TK_SHARED_BUILD		= #######@TK_SHARED_BUILD@
  
  # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk
  TK_PKG_DIR		= @TK_PKG_DIR@
-@@ -220,8 +222,8 @@
- INSTALL_STRIP_LIBRARY   = -S -x
+@@ -217,11 +219,11 @@ TKTEST_EXE		= tktest${EXE_SUFFIX}
+ # with the distribution, which is slower but guaranteed to work.
+ 
+ INSTALL_STRIP_PROGRAM   = -s
+-INSTALL_STRIP_LIBRARY   = -S -x
++INSTALL_STRIP_LIBRARY   = -S --strip-unneeded
  
  INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
 -INSTALL_PROGRAM		= ${INSTALL}
 -INSTALL_LIBRARY		= ${INSTALL}
 +INSTALL_PROGRAM		= ${INSTALL} -s
 +INSTALL_LIBRARY		= ${INSTALL} -s
  INSTALL_DATA		= ${INSTALL} -m 644
  INSTALL_DATA_DIR	= ${INSTALL} -d -m 755
  
 @@ -273,7 +275,7 @@
  STLIB_LD		= @STLIB_LD@
  SHLIB_LD		= @SHLIB_LD@
  SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
 -TK_SHLIB_LD_EXTRAS	= @TK_SHLIB_LD_EXTRAS@
 +TK_SHLIB_LD_EXTRAS	= @TCL_SHLIB_LD_EXTRAS@
  
  # Additional search flags needed to find the various shared libraries
  # at run-time.  The first symbol is for use when creating a binary
 @@ -545,6 +547,8 @@
  
  DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
  
 +INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntDecls.h tkIntXlibDecls.h
 +
  SHELL_ENV = \
  	@LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \
  	export @LD_LIBRARY_PATH_VAR@; \
 @@ -567,6 +571,12 @@
  ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_FILE@ ${OBJS}
  	rm -f $@
  	@MAKE_LIB@
 +	ln -sf @TK_LIB_FILE@ libtk${SHORT_TK_VER}.so
 +
 +libtk${SHORT_TK_VER}.a: ${OBJS}
 +	rm -f libtk${SHORT_TK_VER}.a
 +	ar cr libtk${SHORT_TK_VER}.a ${OBJS}
 +	$(RANLIB) libtk${SHORT_TK_VER}.a
  
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	@if test "x${LIB_FILE}" = "xlibtk${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
 @@ -671,8 +681,7 @@
  INSTALL_DEV_TARGETS = install-headers
  INSTALL_DEMO_TARGETS = install-demos
  INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
 -INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \
 -		$(INSTALL_DEMO_TARGETS) $(INSTALL_EXTRA_TARGETS)
 +INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DEV_TARGETS) $(INSTALL_EXTRA_TARGETS)
  
  install: $(INSTALL_TARGETS)
  
 @@ -685,7 +694,7 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
 -install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}
 +install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE} libtk${SHORT_TK_VER}.a
  	@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
  	    "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
  	    do \
 @@ -716,6 +725,10 @@
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
  	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
 +	@ln -sf $(TK_LIB_FILE) $(DLL_INSTALL_DIR)/libtk${SHORT_TK_VER}.so
 +	@echo "Installing libtk${SHORT_TK_VER}.a"
 +	@$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(DLL_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
 +	@chmod 555 $(DLL_INSTALL_DIR)/libtk${SHORT_TK_VER}.a
  	@if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
  	    $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\
  	    chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\
 @@ -724,16 +737,17 @@
  	fi
  	@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
  	@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
 -	@echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
 -	@$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh"
 +	@echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/tk$(VERSION)"
 +	@mkdir -p "${CONFIG_INSTALL_DIR}"/tk$(VERSION)
 +	@$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)"/tk$(VERSION)/tkConfig.sh
  	@if test "$(STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    @INSTALL_STUB_LIB@ ; \
  	fi
  	@EXTRA_INSTALL_BINARIES@
 -	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
 -	@$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig
 -	@$(INSTALL_DATA) tk.pc $(LIB_INSTALL_DIR)/pkgconfig/tk.pc
 +	@echo "Installing pkg-config file to $(DESTDIR)$(prefix)/libdata/pkgconfig/"
 +	@$(INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/libdata/pkgconfig
 +	@$(INSTALL_DATA) tk.pc $(DESTDIR)$(prefix)/libdata//pkgconfig/tk85.pc
  
  install-libraries: libraries
  	@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
 @@ -831,7 +845,7 @@
  install-headers:
  	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
  	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
 -	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}"; \
 +	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \
  	    do \
  	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
 @@ -840,9 +854,12 @@
  		fi; \
  	    done;
  	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
 -	@for i in $(PUBLIC_HDRS); \
 +	${BSD_INSTALL_DATA} $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/
 +	${BSD_INSTALL_DATA} $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/
 +	@for i in $(INSTALL_HDRS); \
  	    do \
 -	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
 +	    j=`basename $$i`; \
 +	    ln -sf generic/$$j "$(INCLUDE_INSTALL_DIR)"/$$j ; \
  	    done;
  	@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
  	    do \
diff --git a/x11-toolkits/tk86/files/patch-Makefile.in b/x11-toolkits/tk86/files/patch-Makefile.in
index 3f7926d5dfa2..c531e2577899 100644
--- a/x11-toolkits/tk86/files/patch-Makefile.in
+++ b/x11-toolkits/tk86/files/patch-Makefile.in
@@ -1,111 +1,120 @@
 --- Makefile.in.orig	2020-12-31 01:55:50 UTC
 +++ Makefile.in
 @@ -65,6 +65,8 @@ SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_LIBRARY)
  
  # Directory in which to install the include file tk.h:
  INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
 +GENERIC_INCLUDE_INSTALL_DIR=	$(INCLUDE_INSTALL_DIR)/generic
 +UNIX_INCLUDE_INSTALL_DIR=	$(INCLUDE_INSTALL_DIR)/unix
  
  # Path to the private tk header dir:
  PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
 @@ -93,7 +95,7 @@ HTML_DIR		= @HTML_DIR@
  HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML_DIR)
  
  # Directory in which to install the configuration file tkConfig.sh:
 -CONFIG_INSTALL_DIR	= $(INSTALL_ROOT)$(libdir)
 +CONFIG_INSTALL_DIR	= $(SCRIPT_INSTALL_DIR)
  
  # Directory in which to install the demo files:
  DEMO_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_LIBRARY)/demos
+@@ -220,7 +222,7 @@ TKTEST_EXE		= tktest${EXE_SUFFIX}
+ # with the distribution, which is slower but guaranteed to work.
+ 
+ INSTALL_STRIP_PROGRAM   = -s
+-INSTALL_STRIP_LIBRARY   = -S -x
++INSTALL_STRIP_LIBRARY   = -S --strip-unneeded
+ 
+ INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
+ INSTALL_PROGRAM		= ${INSTALL}
 @@ -561,6 +563,8 @@ TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_DIR)/ttkDecls.h
  PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
  	$(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS)
  
 +INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntXlibDecls.h
 +
  # The private headers we want installed for install-private-headers
  PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \
  	$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
 @@ -590,7 +594,13 @@ doc: $(TOP_DIR)/doc/man.macros
  ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_FILE@ ${OBJS}
  	rm -f $@
  	@MAKE_LIB@
 +	@ln -sf ${LIB_FILE} ./libtk${SHORT_TK_VER}.so
  
 +libtk${SHORT_TK_VER}.a: ${OBJS}
 +	rm -f libtk${SHORT_TK_VER}.a
 +	ar rc libtk${SHORT_TK_VER}.a ${OBJS}
 +	$(RANLIB) libtk${SHORT_TK_VER}.a
 +
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	@if test "x${LIB_FILE}" = "xlibtk${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
  	    (cd ${TOP_DIR}/win; ${MAKE} tk${MAJOR_VERSION}${MINOR_VERSION}.dll); \
 @@ -705,8 +715,7 @@ INSTALL_DOC_TARGETS = install-doc
  INSTALL_DEV_TARGETS = install-headers
  INSTALL_DEMO_TARGETS = install-demos
  INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
 -INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \
 -		$(INSTALL_DEMO_TARGETS) $(INSTALL_EXTRA_TARGETS)
 +INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DEV_TARGETS) $(INSTALL_EXTRA_TARGETS)
  
  install: $(INSTALL_TARGETS)
  
 @@ -715,7 +724,7 @@ install-strip:
  		INSTALL_PROGRAM="$(INSTALL_PROGRAM) ${INSTALL_STRIP_PROGRAM}" \
  		INSTALL_LIBRARY="$(INSTALL_LIBRARY) ${INSTALL_STRIP_LIBRARY}"
  
 -install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}
 +install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) libtk${SHORT_TK_VER}.a ${WISH_EXE}
  	@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
  	    "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
  	    do \
 @@ -746,6 +755,10 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
  	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
 +	@ln -sf $(TK_LIB_FILE) "@DLL_INSTALL_DIR@"/libtk${SHORT_TK_VER}.so
 +	@echo "Installing libtk${SHORT_TK_VER}.a"
 +	@$(INSTALL_DATA) libtk${SHORT_TK_VER}.a "@DLL_INSTALL_DIR@"/libtk${SHORT_TK_VER}.a
 +	@chmod 555 "@DLL_INSTALL_DIR@"/libtk${SHORT_TK_VER}.a
  	@if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
  	    $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\
  	    chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\
 @@ -761,9 +774,9 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $
  	    @INSTALL_STUB_LIB@ ; \
  	fi
  	@EXTRA_INSTALL_BINARIES@
 -	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
 -	@$(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/pkgconfig"
 -	@$(INSTALL_DATA) tk.pc "$(LIB_INSTALL_DIR)/pkgconfig/tk.pc"
 +	@echo "Installing pkg-config file to $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/"
 +	@$(INSTALL_DATA_DIR) $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig
 +	@$(INSTALL_DATA) tk.pc $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/tk86.pc
  
  install-libraries: libraries
  	@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
 @@ -861,7 +874,8 @@ install-doc:
  install-headers:
  	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
  	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
 -	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}"; \
 +	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \
 +		"$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \
  	    do \
  	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
 @@ -870,9 +884,12 @@ install-headers:
  		fi; \
  	    done;
  	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
 -	@for i in $(PUBLIC_HDRS); \
 +	@${BSD_INSTALL_DATA} $(GENERIC_DIR)/*.h "$(GENERIC_INCLUDE_INSTALL_DIR)"/
 +	@${BSD_INSTALL_DATA} $(UNIX_DIR)/*.h "$(UNIX_INCLUDE_INSTALL_DIR)"/
 +	@for i in $(INSTALL_HDRS); \
  	    do \
 -	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
 +	    j=`basename $$i` ; \
 +	    ln -sf generic/$$j "$(INCLUDE_INSTALL_DIR)"/$$j ; \
  	    done;
  	@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
  	    do \
diff --git a/x11-toolkits/tk87/files/patch-unix-Makefile.in b/x11-toolkits/tk87/files/patch-unix-Makefile.in
index 5854765bdf6f..7387cf7c5ca5 100644
--- a/x11-toolkits/tk87/files/patch-unix-Makefile.in
+++ b/x11-toolkits/tk87/files/patch-unix-Makefile.in
@@ -1,34 +1,43 @@
 --- unix/Makefile.in.orig	2021-06-07 16:21:14 UTC
 +++ unix/Makefile.in
 @@ -93,7 +93,7 @@ HTML_DIR		= @HTML_DIR@
  HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML_DIR)
  
  # Directory in which to install the configuration file tkConfig.sh:
 -CONFIG_INSTALL_DIR	= $(INSTALL_ROOT)$(libdir)
 +CONFIG_INSTALL_DIR	= $(SCRIPT_INSTALL_DIR)
  
  # Directory in which to install the demo files:
  DEMO_INSTALL_DIR	= $(INSTALL_ROOT)@DEMO_DIR@
+@@ -220,7 +220,7 @@ TKTEST_EXE		= tktest${EXE_SUFFIX}
+ # with the distribution, which is slower but guaranteed to work.
+ 
+ INSTALL_STRIP_PROGRAM   = -s
+-INSTALL_STRIP_LIBRARY   = -S -x
++INSTALL_STRIP_LIBRARY   = -S --strip-unneeded
+ 
+ INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
+ INSTALL_PROGRAM		= ${INSTALL}
 @@ -772,8 +772,7 @@ INSTALL_DOC_TARGETS = install-doc
  INSTALL_DEV_TARGETS = install-headers
  INSTALL_DEMO_TARGETS = install-demos
  INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
 -INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \
 -		$(INSTALL_DEMO_TARGETS) $(INSTALL_EXTRA_TARGETS)
 +INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DEV_TARGETS) $(INSTALL_EXTRA_TARGETS)
  
  install: $(INSTALL_TARGETS)
  
 @@ -841,9 +840,9 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) $
  	    @INSTALL_STUB_LIB@ ; \
  	fi
  	@EXTRA_INSTALL_BINARIES@
 -	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
 -	@$(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/pkgconfig"
 -	@$(INSTALL_DATA) tk.pc "$(LIB_INSTALL_DIR)/pkgconfig/tk.pc"
 +	@echo "Installing pkg-config file to $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/"
 +	@$(INSTALL_DATA_DIR) "$(INSTALL_ROOT)$(prefix)/libdata/pkgconfig"
 +	@$(INSTALL_DATA) tk.pc "$(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/tk.pc"
  
  install-libraries: libraries
  	@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \