diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index 050168385c25..d1dd5a7b4744 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -1,51 +1,55 @@
 PORTNAME=	yaz
 DISTVERSION=	5.31.1
 PORTREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	https://ftp.indexdata.dk/pub/yaz/
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Z39.50/SR client and API library
 WWW=		https://www.indexdata.com/resources/software/yaz/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libgnutls.so:security/gnutls
 
-USES=		gnome iconv libtool ncurses pathfix localbase:ldflags \
-		pkgconfig readline shebangfix tcl
+USES=		autoreconf gnome iconv libtool ncurses pathfix \
+		localbase:ldflags pkgconfig readline shebangfix tcl
 SHEBANG_FILES=	src/yaz-asncomp
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 USE_GNOME=	libxml2 libxslt
 USE_LDCONFIG=	yes
+
 MAKE_JOBS_UNSAFE=	yes
 
-CONFIGURE_ARGS=	--enable-shared --with-iconv=${ICONV_PREFIX} \
-		--with-xml2 --with-xslt --with-icu --enable-tcpd
+GNU_CONFIGURE=	yes
+
 LIBS+=		-lexecinfo
 
 PORTDOCS=	*
 
+CONFIGURE_ARGS=	--enable-shared \
+		--enable-tcpd \
+		--with-iconv=${ICONV_PREFIX} \
+		--with-icu \
+		--with-xml2 \
+		--with-xslt
+
 OPTIONS_DEFINE=	DOCS MEMCACHED REDIS
 
 MEMCACHED_DESC=		Memcached distributed cache system support
+
 MEMCACHED_CONFIGURE_WITH=	memcached
 MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 
 REDIS_CONFIGURE_WITH=	redis
 REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
 
-post-patch:
-	@${REINPLACE_CMD} 's|tclsh |tclsh${TCL_VER} |' ${WRKSRC}/configure
-
 post-configure:
 	@${REINPLACE_CMD} -e 's,[$$]{datarootdir}/man,${PREFIX}/share/man,' \
 		${WRKSRC}/doc/Makefile
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*
 
 .include <bsd.port.mk>
diff --git a/net/yaz/files/patch-configure.ac b/net/yaz/files/patch-configure.ac
new file mode 100644
index 000000000000..78a2182f1375
--- /dev/null
+++ b/net/yaz/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2025-01-04 19:57:47 UTC
++++ configure.ac
+@@ -18,7 +18,7 @@ test -z "$YACC" && AC_MSG_WARN([GNU Bison not found])
+ AC_CHECK_PROGS([YACC], 'bison -y')
+ test -z "$YACC" -a ! -f src/cql.c && AC_MSG_ERROR([GNU Bison not found])
+ test -z "$YACC" && AC_MSG_WARN([GNU Bison not found])
+-AC_CHECK_PROGS([TCLSH], [tclsh tclsh8.5 tclsh8.4 tclsh8.3 tclsh8.2], [tclsh])
++AC_CHECK_PROGS([TCLSH], [tclsh tclsh9.0 tclsh8.7 tclsh8.6 tclsh8.5 tclsh8.4 tclsh8.3 tclsh8.2], [tclsh])
+ AC_PROG_INSTALL
+ AM_PROG_LIBTOOL
+ AM_PROG_CC_C_O
diff --git a/net/yaz/files/patch-m4_ac__check__icu.m4 b/net/yaz/files/patch-m4_ac__check__icu.m4
new file mode 100644
index 000000000000..4c1776ba3dfd
--- /dev/null
+++ b/net/yaz/files/patch-m4_ac__check__icu.m4
@@ -0,0 +1,11 @@
+--- m4/ac_check_icu.m4.orig	2021-12-02 14:20:48 UTC
++++ m4/ac_check_icu.m4
+@@ -26,7 +26,7 @@ AC_DEFUN([AC_CHECK_ICU],
+ 			  ICU_VERSION=`$pkgconfigpath --modversion icu-i18n`
+ 			  ICU_CPPFLAGS=""
+ 			  ICU_CFLAGS=`$pkgconfigpath --cflags icu-i18n`
+-			  ICU_LIBS=`$pkgconfigpath --libs icu-i18n`
++			  ICU_LIBS=`$pkgconfigpath --libs icu-i18n icu-uc`
+ 		      else
+ 			  AC_MSG_RESULT([not found])
+ 		      fi