Date: Sun, 2 Dec 2018 10:25:06 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486405 - head/x11-fonts/spleen Message-ID: <201812021025.wB2AP6b6018008@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Sun Dec 2 10:25:06 2018 New Revision: 486405 URL: https://svnweb.freebsd.org/changeset/ports/486405 Log: x11-fonts/spleen: Unbreak build when vtfontcvt is missing Submitted by: jbeich (based on) Differential Revision: https://reviews.freebsd.org/D18386 Modified: head/x11-fonts/spleen/Makefile head/x11-fonts/spleen/pkg-plist Modified: head/x11-fonts/spleen/Makefile ============================================================================== --- head/x11-fonts/spleen/Makefile Sun Dec 2 10:19:13 2018 (r486404) +++ head/x11-fonts/spleen/Makefile Sun Dec 2 10:25:06 2018 (r486405) @@ -14,10 +14,19 @@ LICENSE_FILE= ${WRKSRC}/LICENSE NO_ARCH= yes -OPTIONS_DEFINE= DOCS X11 -OPTIONS_DEFAULT= X11 +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 + X11_BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf X11_USES= fonts X11_USES_OFF= fonts:none @@ -26,6 +35,9 @@ post-patch: @${REINPLACE_CMD} -E 's/^FONT "(.*)"$$/FONT \1/g' ${WRKSRC}/*.bdf 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 /} \ @@ -40,11 +52,13 @@ do-build-X11-on: do-install: @${MKDIR} ${STAGEDIR}${FONTSDIR} - ${INSTALL_DATA} ${WRKSRC}/*.fnt ${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 \ Modified: head/x11-fonts/spleen/pkg-plist ============================================================================== --- head/x11-fonts/spleen/pkg-plist Sun Dec 2 10:19:13 2018 (r486404) +++ head/x11-fonts/spleen/pkg-plist Sun Dec 2 10:25:06 2018 (r486405) @@ -1,11 +1,11 @@ %%PORTDOCS%%%%DOCSDIR%%/README.md %%X11%%%%FONTSDIR%%/fonts.alias -%%FONTSDIR%%/spleen-12x24.fnt +%%VT%%%%FONTSDIR%%/spleen-12x24.fnt %%X11%%%%FONTSDIR%%/spleen-12x24.pcf.gz -%%FONTSDIR%%/spleen-16x32.fnt +%%VT%%%%FONTSDIR%%/spleen-16x32.fnt %%X11%%%%FONTSDIR%%/spleen-16x32.pcf.gz %%X11%%%%FONTSDIR%%/spleen-32x64.pcf.gz -%%FONTSDIR%%/spleen-5x8.fnt +%%VT%%%%FONTSDIR%%/spleen-5x8.fnt %%X11%%%%FONTSDIR%%/spleen-5x8.pcf.gz -%%FONTSDIR%%/spleen-8x16.fnt +%%VT%%%%FONTSDIR%%/spleen-8x16.fnt %%X11%%%%FONTSDIR%%/spleen-8x16.pcf.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812021025.wB2AP6b6018008>