diff --git a/x11-toolkits/tk87/Makefile b/x11-toolkits/tk87/Makefile
index 11d1b6d711f5..835e91ee8fa8 100644
--- a/x11-toolkits/tk87/Makefile
+++ b/x11-toolkits/tk87/Makefile
@@ -1,11 +1,11 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 
 PORTNAME=	tk
-DISTVERSION=	8.7a3
+DISTVERSION=	${TK_VERSION}${TK_RC}
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF/tcl/Tcl/${DISTVERSION} \
+MASTER_SITES=	SF/tcl/Tcl/${TK_VERSION} \
 		TCLTK/tcl8_7
-PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
+PKGNAMESUFFIX=	${SHORT_TK_VER}
 DISTNAME=	${PORTNAME}${DISTVERSION}-src
 
 MAINTAINER=	tcltk@FreeBSD.org
@@ -24,10 +24,11 @@ OPTIONS_SUB=	yes
 TKMAN_DESC=	Install Tk function manpages
 DEMOS_DESC=	Install demos
 
-WRKSRC=		${WRKDIR}/${PORTNAME}${DISTVERSION}/unix
+PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}${TK_VERSION}
+WRKSRC=		${PATCH_WRKSRC}/unix
 
 ALL_TARGET=	all
-INSTALL_TARGET=	install-strip
+INSTALL_TARGET=	install-strip install-libraries
 
 USES+=		tcl:${SHORT_TK_VER},tea xorg
 USE_LDCONFIG=	yes
@@ -42,7 +43,9 @@ CONFIGURE_ARGS=	--enable-xss \
 CFLAGS+=	-I${TCL_INCLUDEDIR} \
 		-I${LOCALBASE}/include
 
-TK_VER=		${PORTVERSION:R}
+TK_VERSION=	8.7a5
+TK_VER=		8.7
+TK_RC=		rc2
 SHORT_TK_VER=	${TK_VER:S/.//}
 MAN_SUFFIX=	${PKGBASE}
 
diff --git a/x11-toolkits/tk87/distinfo b/x11-toolkits/tk87/distinfo
index 8584aca418a3..e77f64f98067 100644
--- a/x11-toolkits/tk87/distinfo
+++ b/x11-toolkits/tk87/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581079682
-SHA256 (tk8.7a3-src.tar.gz) = 2580ea3d9bc46e175cca01de97868d64806bc754af2f06943261416fcdadf07c
-SIZE (tk8.7a3-src.tar.gz) = 4617709
+TIMESTAMP = 1623651402
+SHA256 (tk8.7a5rc2-src.tar.gz) = 192134dbfeb37cb0a5c489b99b2f12f8b5c8133d6b377961b66de527045aa961
+SIZE (tk8.7a5rc2-src.tar.gz) = 4670106
diff --git a/x11-toolkits/tk87/files/patch-unix-Makefile.in b/x11-toolkits/tk87/files/patch-unix-Makefile.in
index 09318e7520e6..5854765bdf6f 100644
--- a/x11-toolkits/tk87/files/patch-unix-Makefile.in
+++ b/x11-toolkits/tk87/files/patch-unix-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2017-09-03 10:29:26 UTC
-+++ Makefile.in
-@@ -92,7 +94,7 @@ HTML_DIR		= @HTML_DIR@
+--- 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:
@@ -8,8 +8,8 @@
 +CONFIG_INSTALL_DIR	= $(SCRIPT_INSTALL_DIR)
  
  # Directory in which to install the demo files:
- DEMO_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_LIBRARY)/demos
-@@ -699,8 +708,7 @@ INSTALL_DOC_TARGETS = install-doc
+ DEMO_INSTALL_DIR	= $(INSTALL_ROOT)@DEMO_DIR@
+@@ -772,8 +772,7 @@ INSTALL_DOC_TARGETS = install-doc
  INSTALL_DEV_TARGETS = install-headers
  INSTALL_DEMO_TARGETS = install-demos
  INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
@@ -19,16 +19,16 @@
  
  install: $(INSTALL_TARGETS)
  
-@@ -755,9 +766,9 @@ install-binaries: $(TK_STUB_LIB_FILE) $(
+@@ -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
+-	@$(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_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" \
diff --git a/x11-toolkits/tk87/files/patch-unix-installManPage b/x11-toolkits/tk87/files/patch-unix-installManPage
index 5026f930ee57..682d25f11d4d 100644
--- a/x11-toolkits/tk87/files/patch-unix-installManPage
+++ b/x11-toolkits/tk87/files/patch-unix-installManPage
@@ -1,11 +1,11 @@
---- installManPage.orig	2017-09-03 10:29:26 UTC
-+++ installManPage
-@@ -100,7 +100,7 @@ SrcDir=`dirname $ManPage`
+--- unix/installManPage.orig	2021-06-07 16:21:14 UTC
++++ unix/installManPage
+@@ -108,7 +108,7 @@ done
  
  First=""
  for Target in $Names; do
 -    Target=$Target.$Section$Suffix
 +    Target=$Target$Suffix.$Section
-     rm -f $Dir/$Target $Dir/$Target.*
+     rm -f "$Dir/$Target" "$Dir/$Target.*"
      if test -z "$First" ; then
  	First=$Target
diff --git a/x11-toolkits/tk87/pkg-plist b/x11-toolkits/tk87/pkg-plist
index e724c77ae41a..053260431dec 100644
--- a/x11-toolkits/tk87/pkg-plist
+++ b/x11-toolkits/tk87/pkg-plist
@@ -79,6 +79,7 @@ lib/tk%%TK_VER%%/console.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/spin.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/states.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/style.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/systray.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/tclIndex
 %%DEMOS%%lib/tk%%TK_VER%%/demos/tcolor
 %%DEMOS%%lib/tk%%TK_VER%%/demos/text.tcl
@@ -145,6 +146,7 @@ lib/tk%%TK_VER%%/safetk.tcl
 lib/tk%%TK_VER%%/scale.tcl
 lib/tk%%TK_VER%%/scrlbar.tcl
 lib/tk%%TK_VER%%/spinbox.tcl
+lib/tk%%TK_VER%%/systray.tcl
 lib/tk%%TK_VER%%/tclIndex
 lib/tk%%TK_VER%%/tearoff.tcl
 lib/tk%%TK_VER%%/text.tcl
@@ -192,6 +194,7 @@ lib/tk%%TK_VER%%/xmfbox.tcl
 %%TKMAN%%man/man3/Tk_AllocColorFromObj.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_AllocCursorFromObj.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_AllocFontFromObj.tk%%PKGNAMESUFFIX%%.3.gz
+%%TKMAN%%man/man3/Tk_AlwaysShowSelection.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_AttachHWND.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_Attributes.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_BindEvent.tk%%PKGNAMESUFFIX%%.3.gz
@@ -209,8 +212,8 @@ lib/tk%%TK_VER%%/xmfbox.tcl
 %%TKMAN%%man/man3/Tk_CanvasTextInfo.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_CanvasTkwin.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_CanvasWindowCoords.tk%%PKGNAMESUFFIX%%.3.gz
-%%TKMAN%%man/man3/Tk_Changes.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_ChangeWindowAttributes.tk%%PKGNAMESUFFIX%%.3.gz
+%%TKMAN%%man/man3/Tk_Changes.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_CharBbox.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_Class.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_ClearSelection.tk%%PKGNAMESUFFIX%%.3.gz
@@ -262,6 +265,7 @@ lib/tk%%TK_VER%%/xmfbox.tcl
 %%TKMAN%%man/man3/Tk_Fill3DPolygon.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_Fill3DRectangle.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_FindPhoto.tk%%PKGNAMESUFFIX%%.3.gz
+%%TKMAN%%man/man3/Tk_FontGetDescription.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_FontId.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_Free3DBorder.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_Free3DBorderFromObj.tk%%PKGNAMESUFFIX%%.3.gz
@@ -292,6 +296,7 @@ lib/tk%%TK_VER%%/xmfbox.tcl
 %%TKMAN%%man/man3/Tk_GetBinding.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_GetBitmap.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_GetBitmapFromObj.tk%%PKGNAMESUFFIX%%.3.gz
+%%TKMAN%%man/man3/Tk_GetButtonMask.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_GetCapStyle.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_GetColor.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_GetColorByValue.tk%%PKGNAMESUFFIX%%.3.gz
@@ -301,6 +306,7 @@ lib/tk%%TK_VER%%/xmfbox.tcl
 %%TKMAN%%man/man3/Tk_GetCursorFromData.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_GetCursorFromObj.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_GetDash.tk%%PKGNAMESUFFIX%%.3.gz
+%%TKMAN%%man/man3/Tk_GetDoublePixelsFromObj.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_GetFont.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_GetFontFromObj.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_GetFontMetrics.tk%%PKGNAMESUFFIX%%.3.gz
@@ -308,7 +314,7 @@ lib/tk%%TK_VER%%/xmfbox.tcl
 %%TKMAN%%man/man3/Tk_GetHINSTANCE.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_GetHWND.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_GetImage.tk%%PKGNAMESUFFIX%%.3.gz
-%%TKMAN%%man/man3/Tk_GetImageMasterData.tk%%PKGNAMESUFFIX%%.3.gz
+%%TKMAN%%man/man3/Tk_GetImageModelData.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_GetItemTypes.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_GetJoinStyle.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_GetJustify.tk%%PKGNAMESUFFIX%%.3.gz
@@ -330,12 +336,12 @@ lib/tk%%TK_VER%%/xmfbox.tcl
 %%TKMAN%%man/man3/Tk_GetSelection.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_GetUid.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_GetUserInactiveTime.tk%%PKGNAMESUFFIX%%.3.gz
-%%TKMAN%%man/man3/Tk_GetVisual.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_GetVRootGeometry.tk%%PKGNAMESUFFIX%%.3.gz
+%%TKMAN%%man/man3/Tk_GetVisual.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_Grab.tk%%PKGNAMESUFFIX%%.3.gz
+%%TKMAN%%man/man3/Tk_HWNDToWindow.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_HandleEvent.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_Height.tk%%PKGNAMESUFFIX%%.3.gz
-%%TKMAN%%man/man3/Tk_HWNDToWindow.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_IdToWindow.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_ImageChanged.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_Init.tk%%PKGNAMESUFFIX%%.3.gz
@@ -343,11 +349,11 @@ lib/tk%%TK_VER%%/xmfbox.tcl
 %%TKMAN%%man/man3/Tk_InitImageArgs.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_InitOptions.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_InitStubs.tk%%PKGNAMESUFFIX%%.3.gz
+%%TKMAN%%man/man3/Tk_InternAtom.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_InternalBorderBottom.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_InternalBorderLeft.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_InternalBorderRight.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_InternalBorderTop.tk%%PKGNAMESUFFIX%%.3.gz
-%%TKMAN%%man/man3/Tk_InternAtom.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_Interp.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_IntersectTextLayout.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_IsContainer.tk%%PKGNAMESUFFIX%%.3.gz
@@ -356,8 +362,8 @@ lib/tk%%TK_VER%%/xmfbox.tcl
 %%TKMAN%%man/man3/Tk_IsTopLevel.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_Main.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_MainLoop.tk%%PKGNAMESUFFIX%%.3.gz
-%%TKMAN%%man/man3/Tk_MaintainGeometry.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_MainWindow.tk%%PKGNAMESUFFIX%%.3.gz
+%%TKMAN%%man/man3/Tk_MaintainGeometry.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_MakeWindowExist.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_ManageGeometry.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_MapWindow.tk%%PKGNAMESUFFIX%%.3.gz
@@ -380,6 +386,7 @@ lib/tk%%TK_VER%%/xmfbox.tcl
 %%TKMAN%%man/man3/Tk_NameOfJustify.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_NameOfRelief.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_NameToWindow.tk%%PKGNAMESUFFIX%%.3.gz
+%%TKMAN%%man/man3/Tk_NewWindowObj.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_OwnSelection.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_Parent.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_ParseArgv.tk%%PKGNAMESUFFIX%%.3.gz
@@ -406,6 +413,7 @@ lib/tk%%TK_VER%%/xmfbox.tcl
 %%TKMAN%%man/man3/Tk_SafeInit.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_Screen.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_ScreenNumber.tk%%PKGNAMESUFFIX%%.3.gz
+%%TKMAN%%man/man3/Tk_SendVirtualEvent.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_SetAppName.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_SetBackgroundFromBorder.tk%%PKGNAMESUFFIX%%.3.gz
 %%TKMAN%%man/man3/Tk_SetCaretPos.tk%%PKGNAMESUFFIX%%.3.gz
@@ -492,8 +500,8 @@ lib/tk%%TK_VER%%/xmfbox.tcl
 %%TKMAN%%man/mann/message.tk%%PKGNAMESUFFIX%%.n.gz
 %%TKMAN%%man/mann/option.tk%%PKGNAMESUFFIX%%.n.gz
 %%TKMAN%%man/mann/options.tk%%PKGNAMESUFFIX%%.n.gz
-%%TKMAN%%man/mann/pack_old.tk%%PKGNAMESUFFIX%%.n.gz
 %%TKMAN%%man/mann/pack.tk%%PKGNAMESUFFIX%%.n.gz
+%%TKMAN%%man/mann/pack_old.tk%%PKGNAMESUFFIX%%.n.gz
 %%TKMAN%%man/mann/panedwindow.tk%%PKGNAMESUFFIX%%.n.gz
 %%TKMAN%%man/mann/photo.tk%%PKGNAMESUFFIX%%.n.gz
 %%TKMAN%%man/mann/place.tk%%PKGNAMESUFFIX%%.n.gz
@@ -505,7 +513,10 @@ lib/tk%%TK_VER%%/xmfbox.tcl
 %%TKMAN%%man/mann/selection.tk%%PKGNAMESUFFIX%%.n.gz
 %%TKMAN%%man/mann/send.tk%%PKGNAMESUFFIX%%.n.gz
 %%TKMAN%%man/mann/spinbox.tk%%PKGNAMESUFFIX%%.n.gz
+%%TKMAN%%man/mann/sysnotify.tk%%PKGNAMESUFFIX%%.n.gz
+%%TKMAN%%man/mann/systray.tk%%PKGNAMESUFFIX%%.n.gz
 %%TKMAN%%man/mann/text.tk%%PKGNAMESUFFIX%%.n.gz
+%%TKMAN%%man/mann/tk.tk%%PKGNAMESUFFIX%%.n.gz
 %%TKMAN%%man/mann/tk_bindForTraversal.tk%%PKGNAMESUFFIX%%.n.gz
 %%TKMAN%%man/mann/tk_bisque.tk%%PKGNAMESUFFIX%%.n.gz
 %%TKMAN%%man/mann/tk_chooseColor.tk%%PKGNAMESUFFIX%%.n.gz
@@ -530,7 +541,6 @@ lib/tk%%TK_VER%%/xmfbox.tcl
 %%TKMAN%%man/mann/tk_textCut.tk%%PKGNAMESUFFIX%%.n.gz
 %%TKMAN%%man/mann/tk_textPaste.tk%%PKGNAMESUFFIX%%.n.gz
 %%TKMAN%%man/mann/tk_version.tk%%PKGNAMESUFFIX%%.n.gz
-%%TKMAN%%man/mann/tk.tk%%PKGNAMESUFFIX%%.n.gz
 %%TKMAN%%man/mann/tkerror.tk%%PKGNAMESUFFIX%%.n.gz
 %%TKMAN%%man/mann/tkwait.tk%%PKGNAMESUFFIX%%.n.gz
 %%TKMAN%%man/mann/toplevel.tk%%PKGNAMESUFFIX%%.n.gz