diff --git a/lang/tcl87/Makefile b/lang/tcl87/Makefile
index 9ca76b1f9392..4d9ce8770456 100644
--- a/lang/tcl87/Makefile
+++ b/lang/tcl87/Makefile
@@ -1,111 +1,111 @@
 # Created by: gahr
 
 PORTNAME=	tcl
 DISTVERSION=	${TCL_VERSION}${TCL_RC}
 PORTREVISION=	0
 CATEGORIES=	lang
 MASTER_SITES=	SF/tcl/Tcl/${TCL_VERSION} \
 		TCLTK/tcl8_7
 PKGNAMESUFFIX=	${SHORT_TCL_VER}
 DISTNAME=	${PORTNAME}${DISTVERSION}-src
 
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Tool Command Language
 
 LICENSE=	TclTk
 LICENSE_NAME=	Tcl/Tk License
 LICENSE_FILE=	${WRKSRC}/../license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		compiler:c11 pathfix
 
 OPTIONS_DEFINE=	TCLMAN TZDATA DEBUG
 OPTIONS_DEFAULT=TCLMAN TZDATA
 OPTIONS_DEFINE_amd64=	DTRACE
 OPTIONS_DEFAULT_amd64=	DTRACE
 OPTIONS_DEFINE_powerpc64=	DTRACE
 OPTIONS_DEFINE_powerpc64le=	DTRACE
 OPTIONS_DEFAULT_powerpc64=	DTRACE
 OPTIONS_DEFAULT_powerpc64le=	DTRACE
 OPTIONS_EXCLUDE_powerpc64=	${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}
 OPTIONS_EXCLUDE_powerpc64_11=	DTRACE
 OPTIONS_EXCLUDE_powerpc64_12=	DTRACE
 TCLMAN_DESC=	Install Tcl function manpages
 TZDATA_DESC=	Install Tcl timezone data
 OPTIONS_SUB=	yes
 
 .if !exists(/usr/sbin/dtrace)
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
 PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}${TCL_VERSION}
 WRKSRC=		${PATCH_WRKSRC}/unix
 
 ALL_TARGET=	binaries libraries doc
 TEST_TARGET=	test-tcl
 INSTALL_TARGET+=install-libraries \
 		install-msgs \
 		install-private-headers
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared \
 		--enable-man-suffix=.${MAN_SUFFIX} \
 		--includedir=${PREFIX}/include/tcl${TCL_VER} \
 		--enable-symbols
 
 TCL_VERSION=	8.7a5
 TCL_VER=	8.7
-TCL_RC=		rc1
+TCL_RC=		rc2
 SHORT_TCL_VER=	${TCL_VER:S/.//}
 MAN_SUFFIX=	${PKGBASE}
 
 MAKE_ENV=	SHORT_TCL_VER=${SHORT_TCL_VER} \
 		MAN_SUFFIX=.${MAN_SUFFIX} \
 
 PLIST_SUB=	TCL_VER=${TCL_VER} \
 		PKGNAMESUFFIX=${PKGNAMESUFFIX}
 
 TCLMAN_INSTALL_TARGET=	install-doc
 TZDATA_INSTALL_TARGET=	install-tzdata
 DEBUG_CONFIGURE_ENABLE=	symbols
 DTRACE_CONFIGURE_ENABLE=	dtrace
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
 INSTALL_TARGET+=install
 .else
 INSTALL_TARGET+=install-strip
 .endif
 
 .if ${PORT_OPTIONS:MDTRACE}
 PLIST_SUB+=	DTRACE=""
 .else
 PLIST_SUB+=	DTRACE="@comment "
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e \
 	    's|@TCL_BUILD_LIB_SPEC@|@TCL_LIB_SPEC@|; \
 	     s|@TCL_BUILD_STUB_LIB_SPEC@|@TCL_STUB_LIB_SPEC@|; \
 	     s|@TCL_BUILD_STUB_LIB_PATH@|@TCL_STUB_LIB_PATH@|; \
 	     s|@TCL_SRC_DIR@|${PREFIX}/include/tcl${TCL_VER}|' \
 	     ${PATCH_WRKSRC}/unix/tclConfig.sh.in
 
 post-patch-TCLMAN-off:
 	@${FIND} ${PATCH_WRKSRC}/pkgs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
 	    -e '/^install:/s|install-doc||'
 
 post-configure:
 	${REINPLACE_CMD} \
 		-e 's,-DNO_MEMMOVE=1,,' -e 's,-DNO_STRING_H=1,,' \
 		-e 's,^COMPAT_OBJS.*,,' ${WRKSRC}/Makefile
 post-install:
 	# Make sure users of USES=tcl:87 are able to look up the library
 	${LN} -fs libtcl${TCL_VER}.so ${STAGEDIR}${PREFIX}/lib/libtcl${PKGNAMESUFFIX}.so
 	${LN} -fs libtcl${PKGNAMESUFFIX}.so ${STAGEDIR}${PREFIX}/lib/libtcl${PKGNAMESUFFIX}.so.1
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/tcl${TCL_VER}/doc
 	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${STAGEDIR}${PREFIX}/include/tcl${TCL_VER}/doc/man.macros
 
 .include <bsd.port.mk>
diff --git a/lang/tcl87/distinfo b/lang/tcl87/distinfo
index ec74db35a77a..917f8a1b8ec9 100644
--- a/lang/tcl87/distinfo
+++ b/lang/tcl87/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623305436
-SHA256 (tcl8.7a5rc1-src.tar.gz) = 277d7a14fad46143113533783f047d6046cd3754bd384451a8d216815cb107fa
-SIZE (tcl8.7a5rc1-src.tar.gz) = 6362975
+TIMESTAMP = 1623650905
+SHA256 (tcl8.7a5rc2-src.tar.gz) = 00fc9115d06fbad863b708fca753d8d00e8b85dccb494b7b43a83059a4d4f312
+SIZE (tcl8.7a5rc2-src.tar.gz) = 6362936
diff --git a/lang/tcl87/files/patch-unix-installManPage b/lang/tcl87/files/patch-unix-installManPage
index 220fcd6781f8..5fb0111b43c7 100644
--- a/lang/tcl87/files/patch-unix-installManPage
+++ b/lang/tcl87/files/patch-unix-installManPage
@@ -1,11 +1,11 @@
---- unix/installManPage.orig	2021-06-07 15:40:36.000000000 +0000
-+++ unix/installManPage	2021-06-08 05:59:53.738870000 +0000
-@@ -123,7 +123,7 @@
+--- unix/installManPage.orig	2021-06-07 15:40:36 UTC
++++ unix/installManPage
+@@ -123,7 +123,7 @@ done
  
  First=""
  for Target in $Names; do
 -    Target=$Target.$Section$Suffix
 +    Target=$Target$Suffix.$Section
      rm -f "$Dir/$Target" "$Dir/$Target.*"
      if test -z "$First" ; then
  	First=$Target
diff --git a/lang/tcl87/files/patch-unix_Makefile.in b/lang/tcl87/files/patch-unix_Makefile.in
index bd7c50ba4df8..68fceb6b0160 100644
--- a/lang/tcl87/files/patch-unix_Makefile.in
+++ b/lang/tcl87/files/patch-unix_Makefile.in
@@ -1,84 +1,84 @@
---- unix/Makefile.in.orig	2021-06-08 09:38:20.307442000 +0000
-+++ unix/Makefile.in	2021-06-08 09:54:29.143801000 +0000
-@@ -84,7 +84,7 @@
+--- 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@
-@@ -1003,30 +1003,23 @@
+@@ -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 @@
+@@ -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 @@
+@@ -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 \