Index: head/x11-fonts/spleen/Makefile
===================================================================
--- head/x11-fonts/spleen/Makefile	(revision 490695)
+++ head/x11-fonts/spleen/Makefile	(revision 490696)
@@ -1,78 +1,74 @@
 # $FreeBSD$
 
 PORTNAME=	spleen
 DISTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://github.com/fcambus/spleen/releases/download/${DISTVERSION}/
 PKGNAMESUFFIX=	-font
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Monospaced bitmap fonts for Xorg and vt(4)
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_DEFAULT=	VT X11
 OPTIONS_MULTI=		TYPE
 OPTIONS_MULTI_TYPE=	VT X11
 .if !exists(/usr/bin/vtfontcvt)
 OPTIONS_EXCLUDE=	VT
 .endif
 OPTIONS_SUB=		yes
 
 TYPE_DESC=		Font type
 VT_DESC=		Install vt(4) fonts
 X11_DESC=		Install Xorg bitmap fonts
 
-# 32x64 appears to be too large for vtfontcvt in supported FreeBSD
-# releases, cf. PR 205707.  Provide a pregenerated file for now.
-VT_DISTFILES=		spleen-${PORTVERSION}/spleen-32x64.fnt.gz:spleenvt32
-VT_MASTER_SITES=	LOCAL/tobik:spleenvt32
+# vtfontcvt is broken with large fonts, so use Dmitry Wagin's
+# improved version from https://bugs.freebsd.org/205707 that
+# doesn't have this problem.
+VT_BUILD_DEPENDS=	vtfontcvt-ng:x11-fonts/vtfontcvt-ng
 
 X11_BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 X11_USES=		fonts
 X11_USES_OFF=		fonts:none
 
-post-extract-VT-on:
-	${GUNZIP_CMD} -c ${DISTDIR}/spleen-${PORTVERSION}/spleen-32x64.fnt.gz \
-		> ${WRKSRC}/spleen-32x64.fnt
-
 post-patch:
 	@${REINPLACE_CMD} -E 's/^FONT "(.*)"$$/FONT \1/g' ${WRKSRC}/*.bdf
 
 do-build:
 	@${DO_NADA}
 
 do-build-VT-on:
-.for sz in 5x8 8x16 12x24 16x32
-	vtfontcvt ${sz:S/^/-w /:S/x/ -h /} \
-		${WRKSRC}/spleen-${sz}.bdf ${WRKSRC}/spleen-${sz}.fnt
+.for sz in 5x8 8x16 12x24 16x32 32x64
+	vtfontcvt-ng ${WRKSRC}/spleen-${sz}.bdf ${WRKSRC}/spleen-${sz}.fnt
 .endfor
 
 do-build-X11-on:
 .for sz in 5x8 8x16 12x24 16x32 32x64
 	bdftopcf -t -o ${WRKSRC}/spleen-${sz}.pcf ${WRKSRC}/spleen-${sz}.bdf
 .endfor
 	${GZIP_CMD} ${WRKSRC}/*.pcf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-VT-on:
 	${INSTALL_DATA} ${WRKSRC}/*.fnt ${STAGEDIR}${FONTSDIR}
 
 do-install-X11-on:
 	${INSTALL_DATA} ${WRKSRC}/fonts.alias-spleen \
 		${STAGEDIR}${FONTSDIR}/fonts.alias
 	${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
Index: head/x11-fonts/spleen/distinfo
===================================================================
--- head/x11-fonts/spleen/distinfo	(revision 490695)
+++ head/x11-fonts/spleen/distinfo	(revision 490696)
@@ -1,5 +1,3 @@
 TIMESTAMP = 1543783491
 SHA256 (spleen-1.0.3.tar.gz) = f63ef1dd84e27545b0a42389d0bd4e58393aab211a5d2ce936ebaa97be0672cb
 SIZE (spleen-1.0.3.tar.gz) = 45934
-SHA256 (spleen-1.0.3/spleen-32x64.fnt.gz) = 53100baaaee1b68c0c7ac41f1b42fbb77d7d964e8309b9ed3de41b5ff69afbb8
-SIZE (spleen-1.0.3/spleen-32x64.fnt.gz) = 3481