diff --git a/x11-fonts/uw-ttyp0/Makefile b/x11-fonts/uw-ttyp0/Makefile
index 054c153bcfb5..66b0a74bec09 100644
--- a/x11-fonts/uw-ttyp0/Makefile
+++ b/x11-fonts/uw-ttyp0/Makefile
@@ -1,29 +1,32 @@
 PORTNAME=	uw-ttyp0
-PORTVERSION=	1.3
-PORTREVISION=	2
+DISTVERSION=	2.1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nxjoseph@protonmail.com
 COMMENT=	Monospaced bitmap fonts for X11
 WWW=		https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/
 
 LICENSE=		MIT TTYP0
 LICENSE_COMB=		multi
 LICENSE_NAME_TTYP0=	ttyp0 License
 LICENSE_FILE_TTYP0=	${WRKSRC}/LICENSE
 LICENSE_PERMS_TTYP0=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
+BUILD_DEPENDS=	bdfresize:x11-fonts/bdfresize \
+		bdftopcf:x11-fonts/bdftopcf \
+		fonttosfnt:x11-fonts/fonttosfnt
 
-HAS_CONFIGURE=	yes
-NO_ARCH=	yes
 USES=		fonts gmake perl5
 USE_PERL5=	build
 
+HAS_CONFIGURE=	yes
+
 # Passing --prefix and --pcfdir to the configure script does not work: it is a
 # homebrewed script that relies on features only present in expr(1) from GNU
 # coreutils.
-MAKE_ARGS=	PREFIX=${LOCALBASE} PCFDIR=${FONTSDIR}
+MAKE_ARGS=	PREFIX=${PREFIX} PCFDIR=${FONTSDIR} GEN_CONS_FREEBSD_VT=1
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/uw-ttyp0/distinfo b/x11-fonts/uw-ttyp0/distinfo
index 3b61912af43b..e8a2af8fa76d 100644
--- a/x11-fonts/uw-ttyp0/distinfo
+++ b/x11-fonts/uw-ttyp0/distinfo
@@ -1,2 +1,3 @@
-SHA256 (uw-ttyp0-1.3.tar.gz) = 288acf08ad678331ad4f3f2568e7b91f9c82a3929ad83b2e2059a3cdd728e0ee
-SIZE (uw-ttyp0-1.3.tar.gz) = 702217
+TIMESTAMP = 1770051633
+SHA256 (uw-ttyp0-2.1.tar.gz) = 99506dd8794e1a5d5cd5811e6c1e55eeef989f8c3501fdb9265bda972aba1630
+SIZE (uw-ttyp0-2.1.tar.gz) = 2658507
diff --git a/x11-fonts/uw-ttyp0/files/patch-TARGETS__CONS__FREEBSD__VT.dat b/x11-fonts/uw-ttyp0/files/patch-TARGETS__CONS__FREEBSD__VT.dat
new file mode 100644
index 000000000000..4c441c54d480
--- /dev/null
+++ b/x11-fonts/uw-ttyp0/files/patch-TARGETS__CONS__FREEBSD__VT.dat
@@ -0,0 +1,10 @@
+--- TARGETS_CONS_FREEBSD_VT.dat.orig	2025-09-14 12:43:51 UTC
++++ TARGETS_CONS_FREEBSD_VT.dat
+@@ -19,6 +19,6 @@
+ # The default is the entire list of sizes up to size 40. If you want
+ # more or less, change the following line accordingly:
+
+-SIZES_CONS_FREEBSD_VT = 11 12 13 14 15 16 17 18 22 30 40
++SIZES_CONS_FREEBSD_VT = 11 12 13 14 15 16 17 18 22 30 40 60 80
+
+ # **********************************************************************
diff --git a/x11-fonts/uw-ttyp0/pkg-plist b/x11-fonts/uw-ttyp0/pkg-plist
index fd355d37e331..9af65b64033d 100644
--- a/x11-fonts/uw-ttyp0/pkg-plist
+++ b/x11-fonts/uw-ttyp0/pkg-plist
@@ -1,156 +1,73 @@
-share/fonts/uw-ttyp0/fonts.dir
-share/fonts/uw-ttyp0/fonts.scale
-share/fonts/uw-ttyp0/t0-11-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-11-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-11-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-11-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-11-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-11-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-11-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-11b-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-11b-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-11b-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-11b-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-11b-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-11b-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-11b-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-12-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-12-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-12-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-12-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-12-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-12-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-12-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-12b-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-12b-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-12b-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-12b-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-12b-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-12b-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-12b-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-13-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-13-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-13-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-13-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-13-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-13-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-13-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-13b-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-13b-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-13b-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-13b-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-13b-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-13b-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-13b-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-14-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-14-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-14-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-14-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-14-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-14-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-14-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-14b-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-14b-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-14b-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-14b-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-14b-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-14b-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-14b-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-15-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-15-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-15-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-15-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-15-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-15-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-15-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-15b-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-15b-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-15b-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-15b-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-15b-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-15b-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-15b-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-15i-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-15i-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-15i-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-15i-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-15i-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-15i-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-15i-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-16-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-16-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-16-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-16-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-16-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-16-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-16-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-16b-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-16b-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-16b-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-16b-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-16b-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-16b-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-16b-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-16i-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-16i-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-16i-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-16i-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-16i-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-16i-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-16i-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-17-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-17-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-17-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-17-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-17-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-17-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-17-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-17b-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-17b-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-17b-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-17b-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-17b-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-17b-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-17b-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-17i-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-17i-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-17i-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-17i-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-17i-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-17i-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-17i-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-18-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-18-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-18-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-18-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-18-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-18-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-18-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-18b-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-18b-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-18b-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-18b-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-18b-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-18b-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-18b-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-18i-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-18i-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-18i-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-18i-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-18i-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-18i-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-18i-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-22-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-22-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-22-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-22-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-22-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-22-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-22-uni.pcf.gz
-share/fonts/uw-ttyp0/t0-22b-i01.pcf.gz
-share/fonts/uw-ttyp0/t0-22b-i02.pcf.gz
-share/fonts/uw-ttyp0/t0-22b-i07.pcf.gz
-share/fonts/uw-ttyp0/t0-22b-i09.pcf.gz
-share/fonts/uw-ttyp0/t0-22b-i15.pcf.gz
-share/fonts/uw-ttyp0/t0-22b-m51.pcf.gz
-share/fonts/uw-ttyp0/t0-22b-uni.pcf.gz
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-11-Bold.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-11-Regular.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-12-Bold.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-12-Regular.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-13-Bold.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-13-Regular.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-14-Bold.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-14-Regular.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-15-Bold.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-15-Italic.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-15-Regular.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-16-Bold.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-16-Italic.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-16-Regular.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-17-Bold.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-17-Italic.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-17-Regular.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-18-Bold.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-18-Italic.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-18-Regular.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-22-Bold.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-22-Regular.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-30-Bold.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-30-Italic.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-30-Regular.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-40-Bold.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-40-Italic.otb
+share/fonts/OTB/uw-ttyp0/UW-Ttyp0-40-Regular.otb
+share/fonts/OTB/uw-ttyp0/fonts.dir
+share/fonts/OTB/uw-ttyp0/fonts.scale
+%%FONTSDIR%%/fonts.dir
+%%FONTSDIR%%/fonts.scale
+%%FONTSDIR%%/t0-11-uni.pcf.gz
+%%FONTSDIR%%/t0-11b-uni.pcf.gz
+%%FONTSDIR%%/t0-12-uni.pcf.gz
+%%FONTSDIR%%/t0-12b-uni.pcf.gz
+%%FONTSDIR%%/t0-13-uni.pcf.gz
+%%FONTSDIR%%/t0-13b-uni.pcf.gz
+%%FONTSDIR%%/t0-14-uni.pcf.gz
+%%FONTSDIR%%/t0-14b-uni.pcf.gz
+%%FONTSDIR%%/t0-15-uni.pcf.gz
+%%FONTSDIR%%/t0-15b-uni.pcf.gz
+%%FONTSDIR%%/t0-15i-uni.pcf.gz
+%%FONTSDIR%%/t0-16-uni.pcf.gz
+%%FONTSDIR%%/t0-16b-uni.pcf.gz
+%%FONTSDIR%%/t0-16i-uni.pcf.gz
+%%FONTSDIR%%/t0-17-uni.pcf.gz
+%%FONTSDIR%%/t0-17b-uni.pcf.gz
+%%FONTSDIR%%/t0-17i-uni.pcf.gz
+%%FONTSDIR%%/t0-18-uni.pcf.gz
+%%FONTSDIR%%/t0-18b-uni.pcf.gz
+%%FONTSDIR%%/t0-18i-uni.pcf.gz
+%%FONTSDIR%%/t0-22-uni.pcf.gz
+%%FONTSDIR%%/t0-22b-uni.pcf.gz
+%%FONTSDIR%%/t0-30-uni.pcf.gz
+%%FONTSDIR%%/t0-30b-uni.pcf.gz
+%%FONTSDIR%%/t0-30i-uni.pcf.gz
+%%FONTSDIR%%/t0-40-uni.pcf.gz
+%%FONTSDIR%%/t0-40b-uni.pcf.gz
+%%FONTSDIR%%/t0-40i-uni.pcf.gz
+share/vt/fonts/ttyp0-11.fnt
+share/vt/fonts/ttyp0-12.fnt
+share/vt/fonts/ttyp0-13.fnt
+share/vt/fonts/ttyp0-14.fnt
+share/vt/fonts/ttyp0-15.fnt
+share/vt/fonts/ttyp0-16.fnt
+share/vt/fonts/ttyp0-17.fnt
+share/vt/fonts/ttyp0-18.fnt
+share/vt/fonts/ttyp0-22.fnt
+share/vt/fonts/ttyp0-30.fnt
+share/vt/fonts/ttyp0-40.fnt
+share/vt/fonts/ttyp0-60.fnt
+share/vt/fonts/ttyp0-80.fnt