diff --git a/x11-fonts/spleen/Makefile b/x11-fonts/spleen/Makefile index b9ddd0a19594..9b746477d8dd 100644 --- a/x11-fonts/spleen/Makefile +++ b/x11-fonts/spleen/Makefile @@ -1,10 +1,12 @@ # $FreeBSD$ PORTNAME= spleen -DISTVERSION= 1.0.2 +DISTVERSION= 1.0.3 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) @@ -27,10 +29,19 @@ 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 + 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 @@ -38,7 +49,6 @@ do-build: @${DO_NADA} do-build-VT-on: -# 32x64 appears to be too large for vtfontcvt: Unsupported wbytes 4! .for sz in 5x8 8x16 12x24 16x32 vtfontcvt ${sz:S/^/-w /:S/x/ -h /} \ ${WRKSRC}/spleen-${sz}.bdf ${WRKSRC}/spleen-${sz}.fnt diff --git a/x11-fonts/spleen/distinfo b/x11-fonts/spleen/distinfo index c21a8dea716d..458233dd4fec 100644 --- a/x11-fonts/spleen/distinfo +++ b/x11-fonts/spleen/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1543240264 -SHA256 (spleen-1.0.2.tar.gz) = 0621ef616e7c01420342158461b9de32aee7ec4b0f23bc661c2338783d50b860 -SIZE (spleen-1.0.2.tar.gz) = 45879 +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 diff --git a/x11-fonts/spleen/pkg-plist b/x11-fonts/spleen/pkg-plist index 8ef4b796337f..b10b291a1475 100644 --- a/x11-fonts/spleen/pkg-plist +++ b/x11-fonts/spleen/pkg-plist @@ -4,6 +4,7 @@ %%X11%%%%FONTSDIR%%/spleen-12x24.pcf.gz %%VT%%%%FONTSDIR%%/spleen-16x32.fnt %%X11%%%%FONTSDIR%%/spleen-16x32.pcf.gz +%%VT%%%%FONTSDIR%%/spleen-32x64.fnt %%X11%%%%FONTSDIR%%/spleen-32x64.pcf.gz %%VT%%%%FONTSDIR%%/spleen-5x8.fnt %%X11%%%%FONTSDIR%%/spleen-5x8.pcf.gz