diff --git a/devel/tcl-trf/Makefile b/devel/tcl-trf/Makefile
index 7055435b6b56..b281952c8187 100644
--- a/devel/tcl-trf/Makefile
+++ b/devel/tcl-trf/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	Trf
 PORTVERSION=	2.1.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel tcl
 MASTER_SITES=	SF/tcltrf/tcltrf/${PORTVERSION}
 PKGNAMEPREFIX=	tcl-
 DISTNAME=	trf${PORTVERSION}
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Data conversion, digests, compression, error-correction for Tcl
 WWW=		https://wiki.tcl-lang.org/479
 
 LICENSE=	Tcl_Trf_License
 LICENSE_NAME=	Tcl Trf License
 LICENSE_FILE=	${WRKSRC}/doc/license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 TEST_DEPENDS=	${LOCALBASE}/lib/Memchan2.3/libMemchan.so.1:devel/tcl-memchan
 
 USES+=		tcl:tea tar:bzip2 compiler
 USE_LDCONFIG=	${PREFIX}/lib/Trf
 DDIR=		${PREFIX}/lib/tcl${TCL_VER}/Trf
 CFLAGS+=	-Wall -Werror
 
 MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
 
 REINPLACE_ARGS=	-i ""
 CONFIGURE_ARGS+=--enable-static-zlib --enable-static-bzlib \
 		--enable-static-md5
 CONFIGURE_ENV+=	CC=${CC}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/Trf
 	${INSTALL_DATA} ${WRKSRC}/libTrf${PORTVERSION}.so \
 		${WRKSRC}/pkgIndex.tcl ${STAGEDIR}${PREFIX}/lib/Trf/
 	for m in ${WRKSRC}/doc/man/*.n	;	\
 	do	\
 		${INSTALL_MAN} $$m ${STAGEDIR}${MANNPREFIX}/man/mann/ ;\
 	done
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/Trf/libTrf${PORTVERSION}.so
 
 do-test:
 	cd ${WRKSRC} && ${SETENV} TCLLIBPATH="${WRKSRC}" ${TCLSH} \
 		${FILESDIR}/alltests.tcl
 
 PLIST_SUB+=	TCL_DVER=${TCL_VER:C/\.//} VER=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150
 CFLAGS+=	-Wno-deprecated-non-prototype
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/tcl-trf/files/patch-warnings b/devel/tcl-trf/files/patch-warnings
index 7fbe851be8c5..bcda29768372 100644
--- a/devel/tcl-trf/files/patch-warnings
+++ b/devel/tcl-trf/files/patch-warnings
@@ -1,51 +1,60 @@
 --- generic/transformInt.h	Tue Aug 21 01:51:33 2001
 +++ generic/transformInt.h	Tue Apr  6 12:27:33 2004
 @@ -678,4 +678,8 @@
  #define TCL_STORAGE_CLASS DLLIMPORT
  
 +#ifndef CONST84
 +#    define CONST84
 +#endif
 +
  #ifdef __cplusplus
  }
 --- generic/trfStubLib.c	Mon Sep 20 17:07:24 1999
 +++ generic/trfStubLib.c	Tue Apr  6 13:13:38 2004
 @@ -61,5 +61,5 @@
  #endif
  
 -char *
 +CONST char *
  Trf_InitStubs(interp, version, exact)
      Tcl_Interp *interp;
 --- generic/registry.c	2009-06-18 00:54:44.000000000 -0400
 +++ generic/registry.c	2013-09-18 15:16:57.000000000 -0400
 @@ -1405,5 +1405,5 @@
     * [Bug 2788106].
     */
 -  ckfree(trans);
 +  ckfree((void *)trans);
  
    DONE (TrfClose);
 @@ -1835,5 +1835,4 @@
    TrfTransformationInstance* trans = (TrfTransformationInstance*) instanceData;
    int         result;
 -  Tcl_Channel parent;
    int         newLoc;
  
 @@ -1841,6 +1840,4 @@
    PRINT ("(Mode = %d, Offset = %ld)\n", mode, offset); FL;
  
 -  parent = DOWNC (trans);
 -
    /*
     * Several things to look at before deciding what to do.
 @@ -3398,5 +3395,7 @@
       * blowing the stack.
       */
 -
 +#if TCL_MAJOR_VERSION > 8 || TCL_MINOR_VERSION > 4
 +    const
 +#endif
      Tcl_ChannelType*    parentType     = Tcl_GetChannelType  (parent);
      Tcl_DriverSeekProc* parentSeekProc = Tcl_ChannelSeekProc (parentType);
+--- generic/otpcode.c	2009-06-18 00:54:43.000000000 -0400
++++ generic/otpcode.c	2023-02-13 00:25:46.660181000 -0500
+@@ -2757,5 +2757,5 @@
+   int    i;
+   unsigned long p;
+-  char   b[9];
++  char   b[11];
+ 
+   if ((c -> wordCount == 5) && (c -> charCount > 0))