diff --git a/lang/tcl87/Makefile b/lang/tcl87/Makefile
index 28d8f479a7e8..f9948c921007 100644
--- a/lang/tcl87/Makefile
+++ b/lang/tcl87/Makefile
@@ -1,112 +1,115 @@
 PORTNAME=	tcl
 DISTVERSION=	${TCL_VERSION}${TCL_RC}
-PORTREVISION=	2
+PORTREVISION=	3
 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
 WWW=		https://www.tcl.tk/
 
 LICENSE=	TclTk
 LICENSE_NAME=	Tcl/Tk License
 LICENSE_FILE=	${WRKSRC}/../license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+DEPRECATED=	Tcl/Tk 8.7 is not scheduled for release, use 8.6 or 9.0
+EXPIRATION_DATE=2025-02-07
+
 USES=		compiler:c11 cpe localbase pathfix
 
 LIB_DEPENDS=	libtommath.so:math/libtommath
 
 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
 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
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--enable-shared \
 		--enable-man-suffix=.${MAN_SUFFIX} \
 		--includedir=${PREFIX}/include/tcl${TCL_VER} \
 		--enable-symbols \
 		--with-system-libtommath
 LDFLAGS+=	-Wl,-z,muldefs
 
 TCL_VERSION=	8.7a5
 TCL_VER=	8.7
 TCL_RC=
 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/x11-toolkits/tk87/Makefile b/x11-toolkits/tk87/Makefile
index f207b2a48b93..59798daf0371 100644
--- a/x11-toolkits/tk87/Makefile
+++ b/x11-toolkits/tk87/Makefile
@@ -1,81 +1,84 @@
 PORTNAME=	tk
 DISTVERSION=	${TK_VERSION}${TK_RC}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/tcl/Tcl/${TK_VERSION} \
 		TCLTK/tcl8_7
 PKGNAMESUFFIX=	${SHORT_TK_VER}
 DISTNAME=	${PORTNAME}${DISTVERSION}-src
 
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Graphical toolkit for Tcl
 WWW=		https://www.tcl.tk/
 
 LICENSE=	TclTk
 LICENSE_NAME=	Tcl/Tk License
 LICENSE_FILE=	${WRKSRC}/../license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+DEPRECATED=	Tcl/Tk 8.7 is not scheduled for release, use 8.6 or 9.0
+EXPIRATION_DATE=2025-02-07
+
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 BUILD_DEPENDS=	zip:archivers/zip
 
 OPTIONS_DEFINE=	TKMAN DEMOS
 OPTIONS_SUB=	yes
 TKMAN_DESC=	Install Tk function manpages
 DEMOS_DESC=	Install demos
 
 PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}${TK_VERSION}
 WRKSRC=		${PATCH_WRKSRC}/unix
 
 ALL_TARGET=	all
 INSTALL_TARGET=	install-strip install-libraries
 
 USES+=		tcl:${SHORT_TK_VER},tea xorg
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xext xft xrender xscrnsaver
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--enable-xss \
 		--enable-xft \
 		--enable-shared \
 		--enable-threads \
 		--enable-man-suffix=.${MAN_SUFFIX} \
 		--includedir=${PREFIX}/include/tk${TK_VER}
 
 CFLAGS+=	-I${TCL_INCLUDEDIR} \
 		-I${LOCALBASE}/include
 
 TK_VERSION=	8.7a5
 TK_VER=		8.7
 TK_RC=
 SHORT_TK_VER=	${TK_VER:S/.//}
 MAN_SUFFIX=	${PKGBASE}
 
 MAKE_ENV=	SHORT_TK_VER=${SHORT_TK_VER}
 
 PLIST_SUB=	TK_VER=${TK_VER} \
 		PKGNAMESUFFIX=${PKGNAMESUFFIX}
 
 DEMOS_INSTALL_TARGET=	install-demos
 TKMAN_INSTALL_TARGET=	install-doc
 
 post-patch:
 	${REINPLACE_CMD} -e \
 	    's|@TK_BUILD_LIB_SPEC@|@TK_LIB_SPEC@|; \
 	     s|@TK_BUILD_STUB_LIB_SPEC@|@TK_STUB_LIB_SPEC@|; \
 	     s|@TK_BUILD_STUB_LIB_PATH@|@TK_STUB_LIB_PATH@|; \
 	     s|@TK_SRC_DIR@|${PREFIX}/include/tk${TK_VER}|' \
 	     ${WRKSRC}/tkConfig.sh.in
 
 post-install:
 	# Make sure users of USES=tk:87 are able to look up the library
 	${LN} -fs libtk${TK_VER}.so ${STAGEDIR}${PREFIX}/lib/libtk${PKGNAMESUFFIX}.so
 	${LN} -fs libtk${PKGNAMESUFFIX}.so ${STAGEDIR}${PREFIX}/lib/libtk${PKGNAMESUFFIX}.so.1
 
 test:
 	cd ${WRKSRC}; ${MAKE} test
 	${ECHO_CMD} "package require Tk" | tclsh${TK_VER}
 	${ECHO_CMD} "load libtk${SHORT_TK_VER}.so" | tclsh${TK_VER}
 
 .include <bsd.port.mk>