mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

x11-fonts/spleen: Use x11-fonts/vtfontcvt-ng

Browse Source 
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.
This commit is contained in:
Tobias Kortkamp 2019-01-19 02:06:24 +00:00
parent 9f4664ae95
commit 58b2122064
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=490696
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
x11-fonts/spleen/Makefile
View File

@ -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:

2
x11-fonts/spleen/distinfo
View File

@ -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