From owner-svn-ports-all@freebsd.org Sun Dec 2 10:25:07 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F6E61318A46; Sun, 2 Dec 2018 10:25:07 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 40CE18DBD7; Sun, 2 Dec 2018 10:25:07 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1CC342562E; Sun, 2 Dec 2018 10:25:07 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB2AP64v018010; Sun, 2 Dec 2018 10:25:06 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB2AP6b6018008; Sun, 2 Dec 2018 10:25:06 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201812021025.wB2AP6b6018008@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 2 Dec 2018 10:25:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486405 - head/x11-fonts/spleen X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/x11-fonts/spleen X-SVN-Commit-Revision: 486405 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 40CE18DBD7 X-Spamd-Result: default: False [0.52 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.44)[0.442,0]; NEURAL_SPAM_MEDIUM(0.03)[0.029,0]; NEURAL_SPAM_LONG(0.05)[0.050,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Dec 2018 10:25:07 -0000 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