diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-01-19 02:06:24 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-01-19 02:06:24 +0000 |
| commit | 58b212206425b5db9a25fbd3c83f4b2bdb439b2e (patch) | |
| tree | b80e74ab45d6e8d40a74a8d9ea0bccfc3c8217f1 /x11-fonts/spleen | |
| parent | 9f4664ae95f5ac526b444f4dd4872e25f94f6c59 (diff) | |
| download | ports-58b212206425b5db9a25fbd3c83f4b2bdb439b2e.tar.gz ports-58b212206425b5db9a25fbd3c83f4b2bdb439b2e.zip | |
x11-fonts/spleen: Use x11-fonts/vtfontcvt-ng
and drop other workarounds for the buggy/incomplete base vtfontcvt(8).
We still check for /usr/bin/vtfontcvt in the port as an easy way
to exclude the VT option on systems where users have opted out of
vt(4) entirely or on DragonFly where it does not make sense to
provide vt(4) fonts.
Notes
Notes:
svn path=/head/; revision=490696
Diffstat (limited to 'x11-fonts/spleen')
| -rw-r--r-- | x11-fonts/spleen/Makefile | 18 | ||||
| -rw-r--r-- | x11-fonts/spleen/distinfo | 2 |
2 files changed, 7 insertions, 13 deletions
diff --git a/x11-fonts/spleen/Makefile b/x11-fonts/spleen/Makefile index 9b746477d8dd..aaeea4a5b5cb 100644 --- a/x11-fonts/spleen/Makefile +++ b/x11-fonts/spleen/Makefile @@ -2,6 +2,7 @@ PORTNAME= spleen DISTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= https://github.com/fcambus/spleen/releases/download/${DISTVERSION}/ PKGNAMESUFFIX= -font @@ -29,19 +30,15 @@ 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 @@ -49,9 +46,8 @@ 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: diff --git a/x11-fonts/spleen/distinfo b/x11-fonts/spleen/distinfo index 458233dd4fec..6385688cee01 100644 --- a/x11-fonts/spleen/distinfo +++ b/x11-fonts/spleen/distinfo @@ -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 |