On Mon, May 30, 2022 at 05:48:33AM -0600, Anthony J. Bentley wrote: > Juan Picca writes: > > 1. Define the variable `FONT_DOCDIR ?= ${PREFIX}/share/doc/${TYPEFACE}` > > (suggested name; DOCDIR is better?) in the font module. > > 2. If the variable `FONT_DOCFILES` (also a suggested name; or maybe > > DOCFILES?) is defined, add to the `do-install` the installation of the > > files under the `doc` directory: > > I've had the exact same idea. In fact, I would also like to introduce a > FONT_FILES variable that can be set to a list of font files to install > (including wildcards). The do-install would be closer to the typical > do-install targets in font ports, and would obviate FONTTYPES completely. What about the attached patch?
A second patch as an example of use in some fonts was added.
>From f0cb6badd9795383b3532c2253b36f5bba8bbf40 Mon Sep 17 00:00:00 2001 From: Juan Picca <juan.pi...@jumapico.uy> Date: Wed, 1 Jun 2022 22:47:47 -0300 Subject: [PATCH 1/2] Update font.port.mk * Define FONT_DOCDIR directory for the typeface. * Accepts DOC_FILES, a list of files to copy to the FONT_DOCDIR directory. * Accepts FONT_FILES, a list of files to copy to the fonts directory used as an alternative to FONTTYPES. --- infrastructure/mk/font.port.mk | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/infrastructure/mk/font.port.mk b/infrastructure/mk/font.port.mk index 95d4be75f33..e597460c8b0 100644 --- a/infrastructure/mk/font.port.mk +++ b/infrastructure/mk/font.port.mk @@ -14,16 +14,28 @@ PKGNAME ?= ${TYPEFACE}-${VERSION} . endif FONTDIR ?= ${PREFIX}/share/fonts/${TYPEFACE} +FONT_DOCDIR ?= ${PREFIX}/share/doc/${TYPEFACE} FONTTYPES ?= ttf FONT_DISTDIR ?= ${WRKSRC} -MODFONT_do-install = ${INSTALL_DATA_DIR} ${FONTDIR}; \ +MODFONT_do-install_FONTTYPES = ${INSTALL_DATA_DIR} ${FONTDIR}; \ for t in ${FONTTYPES}; do ${INSTALL_DATA} ${FONT_DISTDIR}/${FONT_DISTSUBDIR}/*.$$t ${FONTDIR}; done +MODFONT_do-install_FONTFILES = ${INSTALL_DATA_DIR} ${FONTDIR}; \ + for f in ${FONT_FILES}; do ${INSTALL_DATA} ${FONT_DISTDIR}/$$f ${FONTDIR}; done +MODFONT_do-install_DOCFILES = ${INSTALL_DATA_DIR} ${FONT_DOCDIR}; \ + for d in ${DOC_FILES}; do ${INSTALL_DATA} ${FONT_DISTDIR}/$$d ${FONT_DOCDIR}; done . if !target(do-install) do-install: - ${MODFONT_do-install} +. if defined(FONT_FILES) + ${MODFONT_do-install_FONTFILES} +. else + ${MODFONT_do-install_FONTTYPES} +. endif +. if defined(DOC_FILES) + ${MODFONT_do-install_DOCFILES} +. endif . endif .endif -- 2.36.1
>From 5fb58b87aabba903e9058ea4d7608613defeeb8b Mon Sep 17 00:00:00 2001 From: Juan Picca <juan.pi...@jumapico.uy> Date: Sat, 4 Jun 2022 00:43:55 -0300 Subject: [PATCH 2/2] Examples of use in some fonts --- fonts/alkalami/Makefile | 12 +++--------- fonts/amigafonts/Makefile | 18 ++++++++---------- fonts/anonymous-pro/Makefile | 18 +++++++++--------- fonts/apl-fonts/Makefile | 15 +++++++-------- fonts/artwiz-aleczapka/Makefile | 23 ++++++++++++----------- fonts/cascadia-code/Makefile | 11 ++++------- fonts/crimson/Makefile | 14 +++++++------- fonts/dina-fonts/Makefile | 16 ++++++++-------- fonts/dina-fonts/pkg/PLIST | 4 ++-- fonts/gohufont/Makefile | 15 +++++++++------ fonts/ibm-plex/Makefile | 23 +++++++++++++++-------- fonts/juliamono/Makefile | 15 ++++++++------- 12 files changed, 92 insertions(+), 92 deletions(-) diff --git a/fonts/alkalami/Makefile b/fonts/alkalami/Makefile index 5cf8f5ff5b9..ef66c04657f 100644 --- a/fonts/alkalami/Makefile +++ b/fonts/alkalami/Makefile @@ -1,8 +1,7 @@ COMMENT = Unicode font for African Arabic script +TYPEFACE = alkalami V = 1.300 DISTNAME = Alkalami-${V} -PKGNAME = alkalami-${V} -CATEGORIES = fonts HOMEPAGE = https://software.sil.org/alkalami/ MAINTAINER = George Rosamond <geo...@nycbug.org> @@ -18,12 +17,7 @@ MODULES = font NO_BUILD = Yes NO_TEST = Yes -FONTDIR = ${PREFIX}/share/fonts/alkalami -DOCDIR = ${PREFIX}/share/doc/alkalami - -do-install: - ${INSTALL_DATA_DIR} ${FONTDIR} ${DOCDIR} - ${INSTALL_DATA} ${WRKDIST}/*.ttf ${FONTDIR} - ${INSTALL_DATA} ${WRKDIST}/{FONTLOG.txt,README.txt} ${DOCDIR} +FONT_FILES = *.ttf +DOC_FILES = FONTLOG.txt README.txt .include <bsd.port.mk> diff --git a/fonts/amigafonts/Makefile b/fonts/amigafonts/Makefile index 441a99be09c..31e0d0fa62e 100644 --- a/fonts/amigafonts/Makefile +++ b/fonts/amigafonts/Makefile @@ -1,32 +1,30 @@ COMMENT = faithfully remade Amiga fonts +TYPEFACE = amigafonts +V = 1.02 GH_ACCOUNT = rewtnull GH_PROJECT = amigafonts -GH_TAGNAME = 1.02 +GH_TAGNAME = ${V} REVISION = 1 - -CATEGORIES = fonts +EXTRACT_SUFX = .tar.gz HOMEPAGE = https://www.trueschool.se/html/fonts.html # GPL-FE PERMIT_PACKAGE = Yes +MODULES = font + NO_BUILD = Yes NO_TEST = Yes PKG_ARCH = * -FONTDIR = ${PREFIX}/share/fonts/amigafonts -DOCDIR = ${PREFIX}/share/doc/amigafonts +FONT_FILES = ttf/*.ttf +DOC_FILES = README do-patch: cd ${WRKDIST}/ttf && for i in `ls *.ttf`; do \ mv $$i `echo $$i | sed -e 's/_v1.0//;s/_/-/'`; done -do-install: - ${INSTALL_DATA_DIR} ${FONTDIR} ${DOCDIR} - ${INSTALL_DATA} ${WRKDIST}/ttf/*.ttf ${FONTDIR} - ${INSTALL_DATA} ${WRKDIST}/README ${DOCDIR} - .include <bsd.port.mk> diff --git a/fonts/anonymous-pro/Makefile b/fonts/anonymous-pro/Makefile index 042c260634b..dcfeb5f6b22 100644 --- a/fonts/anonymous-pro/Makefile +++ b/fonts/anonymous-pro/Makefile @@ -1,11 +1,11 @@ COMMENT = fixed width sans font designed especially for coders +TYPEFACE = anonymous-pro +V = 1.002 PKG_ARCH = * -VERSION = 1.002 -PKGNAME = anonymous-pro-${VERSION} -DISTNAME = AnonymousPro-${VERSION} +DISTNAME = AnonymousPro-${V} REVISION = 4 EXTRACT_SUFX = .zip -CATEGORIES = fonts x11 +CATEGORIES = x11 MASTER_SITES = https://www.marksimonson.com/assets/content/fonts/ HOMEPAGE = https://www.marksimonson.com/fonts/view/anonymous-pro @@ -13,16 +13,16 @@ HOMEPAGE = https://www.marksimonson.com/fonts/view/anonymous-pro # SIL OFL 1.1 PERMIT_PACKAGE = Yes +MODULES = font + NO_BUILD = Yes NO_TEST = Yes -FONTSDIR = ${PREFIX}/share/fonts/anonymous-pro WRKDIST = ${WRKDIR}/${DISTNAME}.001 do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/anonymous-pro - ${INSTALL_DATA_DIR} ${FONTSDIR} - cd ${WRKDIST} ; /bin/pax -rw '-s/ //g' *.ttf ${FONTSDIR} - ${INSTALL_DATA} ${WRKDIST}/*.txt ${PREFIX}/share/doc/anonymous-pro + ${INSTALL_DATA_DIR} ${FONTDIR} ${FONT_DOCDIR} + cd ${WRKDIST} ; /bin/pax -rw '-s/ //g' *.ttf ${FONTDIR} + ${INSTALL_DATA} ${WRKDIST}/*.txt ${FONT_DOCDIR} .include <bsd.port.mk> diff --git a/fonts/apl-fonts/Makefile b/fonts/apl-fonts/Makefile index d6e2ac8a668..73fae0701d0 100644 --- a/fonts/apl-fonts/Makefile +++ b/fonts/apl-fonts/Makefile @@ -1,10 +1,9 @@ +TYPEFACE = apl-fonts V = 1.0 COMMENT = Adrian Smith's standard APL fonts -PKGNAME = apl-fonts-${V} DISTFILES = apl385-${V}{apl385}${EXTRACT_SUFX} \ apl333-${V}{apl333}${EXTRACT_SUFX} -EXTRACT_SUFX = .zip -CATEGORIES = fonts x11 +CATEGORIES = x11 REVISION = 0 HOMEPAGE = https://www.apl385.com/fonts/ @@ -14,15 +13,15 @@ PERMIT_PACKAGE = Yes MASTER_SITES = https://www.apl385.com/fonts/ +MODULES = font + NO_BUILD = Yes NO_TEST = Yes PKG_ARCH = * -FONTSDIR = ${PREFIX}/share/fonts/apl +FONT_FILES = Apl333.ttf Apl385.ttf -do-install: - ${INSTALL_DATA_DIR} ${FONTSDIR} - ${INSTALL_DATA} ${WRKSRC}/Apl385.ttf ${FONTSDIR} - ${INSTALL_DATA} ${WRKSRC}/APL333.ttf ${FONTSDIR}/Apl333.ttf +do-patch: + mv ${WRKSRC}/APL333.ttf ${WRKSRC}/Apl333.ttf .include <bsd.port.mk> diff --git a/fonts/artwiz-aleczapka/Makefile b/fonts/artwiz-aleczapka/Makefile index 6caa7b12536..a8548635f9d 100755 --- a/fonts/artwiz-aleczapka/Makefile +++ b/fonts/artwiz-aleczapka/Makefile @@ -2,11 +2,10 @@ COMMENT-main= improved artwiz fonts COMMENT-de= improved artwiz fonts (german pack) COMMENT-se= improved artwiz fonts (swedish pack) +TYPEFACE= artwiz-aleczapka V= 1.3 -NAME= artwiz-aleczapka -DISTNAME= ${NAME}-en-${V} -PKGNAME = ${NAME}-${V} -CATEGORIES= fonts x11 +DISTNAME= ${TYPEFACE}-en-${V} +CATEGORIES= x11 USE_X11 = Yes REVISION-main= 7 @@ -21,6 +20,8 @@ PERMIT_PACKAGE= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=artwizaleczapka/} EXTRACT_SUFX= .tar.bz2 +MODULES= font + NO_BUILD= Yes NO_TEST= Yes PKG_ARCH= * @@ -28,8 +29,8 @@ PKG_ARCH= * INST_DIR= ${PREFIX}/share/fonts/artwiz-aleczapka DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - ${NAME}-de-${V}${EXTRACT_SUFX} \ - ${NAME}-se-${V}${EXTRACT_SUFX} + ${TYPEFACE}-de-${V}${EXTRACT_SUFX} \ + ${TYPEFACE}-se-${V}${EXTRACT_SUFX} MULTI_PACKAGES= -main -de -se @@ -41,10 +42,10 @@ do-install: egrep '\.pcf' ${WRKSRC}/fonts.dir | \ grep '\-artwiz-' | \ sed 's/\.pcf//g' > ${WRKSRC}/fonts.alias - ${INSTALL_DATA_DIR} ${INST_DIR} - ${INSTALL_DATA} ${WRKDIR}/${NAME}-en-${V}/*.pcf ${INST_DIR} - ${INSTALL_DATA} ${WRKDIR}/${NAME}-de-${V}/*.de.pcf ${INST_DIR} - ${INSTALL_DATA} ${WRKDIR}/${NAME}-se-${V}/*.se.pcf ${INST_DIR} - ${INSTALL_DATA} ${WRKBUILD}/fonts.alias ${INST_DIR}/fonts.alias-artwiz + ${INSTALL_DATA_DIR} ${FONTDIR} + ${INSTALL_DATA} ${WRKDIR}/${TYPEFACE}-en-${V}/*.pcf ${FONTDIR} + ${INSTALL_DATA} ${WRKDIR}/${TYPEFACE}-de-${V}/*.de.pcf ${FONTDIR} + ${INSTALL_DATA} ${WRKDIR}/${TYPEFACE}-se-${V}/*.se.pcf ${FONTDIR} + ${INSTALL_DATA} ${WRKBUILD}/fonts.alias ${FONTDIR}/fonts.alias-artwiz .include <bsd.port.mk> diff --git a/fonts/cascadia-code/Makefile b/fonts/cascadia-code/Makefile index 209ae8291db..0e79711c2db 100644 --- a/fonts/cascadia-code/Makefile +++ b/fonts/cascadia-code/Makefile @@ -1,15 +1,15 @@ +TYPEFACE = cascadia V = 2111.01 COMMENT = Microsoft programming/terminal font DISTNAME = CascadiaCode-${V} PKGNAME = cascadia-code-${V} -EXTRACT_SUFX = .zip -CATEGORIES = fonts x11 +CATEGORIES = x11 # SIL OFL 1.1 PERMIT_PACKAGE = Yes MASTER_SITES = https://github.com/microsoft/cascadia-code/releases/download/v${V}/ -WRKDIST = ${WRKDIR} +FONT_DISTDIR = ${WRKDIR} MODULES = font @@ -18,9 +18,6 @@ PKG_ARCH = * NO_BUILD = Yes NO_TEST = Yes -do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/fonts/cascadia - ${INSTALL_DATA} ${WRKDIR}/ttf/*.ttf ${PREFIX}/share/fonts/cascadia - ${INSTALL_DATA} ${WRKDIR}/otf/static/*.otf ${PREFIX}/share/fonts/cascadia +FONT_FILES = ttf/*.ttf otf/static/*.otf .include <bsd.port.mk> diff --git a/fonts/crimson/Makefile b/fonts/crimson/Makefile index 9c359c9fb2b..5f25fbafa52 100644 --- a/fonts/crimson/Makefile +++ b/fonts/crimson/Makefile @@ -1,24 +1,24 @@ COMMENT= oldstyle book font +TYPEFACE= crimson +V= 2014.10 GH_ACCOUNT= skosch GH_PROJECT= Crimson GH_TAGNAME= fonts-october2014 -PKGNAME= crimson-2014.10 - -CATEGORIES= fonts +EXTRACT_SUFX = .tar.gz # SIL OFL 1.1 PERMIT_PACKAGE= Yes +MODULES= font + PKG_ARCH= * NO_BUILD= Yes NO_TEST= Yes -FONTSDIR= ${PREFIX}/share/fonts/crimson - do-install: - ${INSTALL_DATA_DIR} ${FONTSDIR} + ${INSTALL_DATA_DIR} ${FONTDIR} cd "${WRKSRC}/Desktop Fonts/OTF"; \ - ${INSTALL_DATA} *.otf ${FONTSDIR} + ${INSTALL_DATA} *.otf ${FONTDIR} .include <bsd.port.mk> diff --git a/fonts/dina-fonts/Makefile b/fonts/dina-fonts/Makefile index 601ceed283f..388177c4c34 100644 --- a/fonts/dina-fonts/Makefile +++ b/fonts/dina-fonts/Makefile @@ -2,8 +2,10 @@ PKG_ARCH = * COMMENT = monospace bitmap font, primarily aimed at programmers -DISTNAME = dina-fonts-2.92 -CATEGORIES = fonts +TYPEFACE = dina +V = 2.92 +DISTNAME = ${TYPEFACE}-fonts-${V} +PKGNAME = ${TYPEFACE}-fonts-${V} REVISION = 5 HOMEPAGE = https://www.dcmembers.com/jibsen/download/61/ @@ -11,14 +13,13 @@ HOMEPAGE = https://www.dcmembers.com/jibsen/download/61/ # MIT PERMIT_PACKAGE = Yes -EXTRACT_SUFX = .zip MASTER_SITES = https://sizeofvoid.org/pub/OpenBSD/distfiles/ +MODULES = font + NO_TEST = Yes USE_X11 = Yes -FONTDIR= ${PREFIX}/share/fonts/dina - WRKSRC = ${WRKDIR}/BDF do-build: @@ -48,8 +49,7 @@ do-install: ${INSTALL_DATA_DIR} ${FONTDIR} ${INSTALL_DATA} ${WRKSRC}/*{.otb,.pcf.gz} ${FONTDIR} ${INSTALL_DATA} ${WRKSRC}/fonts.alias ${FONTDIR}/fonts.alias-dina - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dina-fonts - ${INSTALL_DATA} ${WRKDIR}/LICENSE ${PREFIX}/share/doc/dina-fonts - + ${INSTALL_DATA_DIR} ${FONT_DOCDIR} + ${INSTALL_DATA} ${WRKDIR}/LICENSE ${FONT_DOCDIR} .include <bsd.port.mk> diff --git a/fonts/dina-fonts/pkg/PLIST b/fonts/dina-fonts/pkg/PLIST index 1441c784a4a..8277023c087 100644 --- a/fonts/dina-fonts/pkg/PLIST +++ b/fonts/dina-fonts/pkg/PLIST @@ -1,5 +1,5 @@ -share/doc/dina-fonts/ -share/doc/dina-fonts/LICENSE +share/doc/dina/ +share/doc/dina/LICENSE share/fonts/ @fontdir share/fonts/dina/ share/fonts/dina/DinaBold10.otb diff --git a/fonts/gohufont/Makefile b/fonts/gohufont/Makefile index fb4879d53ab..782c041fd22 100644 --- a/fonts/gohufont/Makefile +++ b/fonts/gohufont/Makefile @@ -1,18 +1,22 @@ COMMENT = monospace bitmap font for programming and terminal use PKG_ARCH = * -DISTNAME = gohufont-2.1 -CATEGORIES = fonts x11 +TYPEFACE = gohufont +V = 2.1 +DISTNAME = ${TYPEFACE}-${V} +CATEGORIES = x11 REVISION = 2 HOMEPAGE = https://font.gohu.org/ MASTER_SITES = https://font.gohu.org/ +EXTRACT_SUFX = .tar.gz # WTFPLv2 PERMIT_PACKAGE = Yes +MODULES = font + NO_BUILD = Yes NO_TEST = Yes -FONTDIR = ${PREFIX}/share/fonts/gohufont USE_X11 = Yes do-install: @@ -23,8 +27,7 @@ do-install: ${INSTALL_DATA_DIR} ${FONTDIR} ${INSTALL_DATA} ${WRKDIST}/*.pcf.gz ${FONTDIR} ${INSTALL_DATA} ${WRKBUILD}/fonts.alias ${FONTDIR}/fonts.alias-gohufont - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gohufont - ${INSTALL_DATA} ${WRKDIST}/{COPYING-LICENSE,README.md} \ - ${PREFIX}/share/doc/gohufont + ${INSTALL_DATA_DIR} ${FONT_DOCDIR} + ${INSTALL_DATA} ${WRKDIST}/{COPYING-LICENSE,README.md} ${FONT_DOCDIR} .include <bsd.port.mk> diff --git a/fonts/ibm-plex/Makefile b/fonts/ibm-plex/Makefile index e2d1acc5094..2b367804dc7 100644 --- a/fonts/ibm-plex/Makefile +++ b/fonts/ibm-plex/Makefile @@ -1,8 +1,8 @@ COMMENT = IBM's corporate type family -CATEGORIES = fonts +TYPEFACE = ibm-plex V = 6.0.0 -PKGNAME = ibm-plex-$V +# PKGNAME = ibm-plex-$V # SIL OFL 1.1 PERMIT_PACKAGE = Yes @@ -21,19 +21,26 @@ MODULES = font NO_BUILD = Yes NO_TEST = Yes -FONTDIR = ${PREFIX}/share/fonts/ibm-plex -DOCDIR = ${PREFIX}/share/doc/ibm-plex +#FONTDIR = ${PREFIX}/share/fonts/ibm-plex +#DOCDIR = ${PREFIX}/share/doc/ibm-plex -do-install: +# currently JP fonts only have hinted/unhinted directory, +# this package use hinted font following Noto fonts. +FONT_FILES = OpenType/*/*.otf \ + TrueType/*/*.ttf \ + OpenType/IBM-Plex-Sans-JP/hinted/*.otf \ + TrueType/IBM-Plex-Sans-JP/hinted/*.ttf +DOC_FILES = OpenType/IBM-Plex-Sans/license.txt + + +do-install-no: ${INSTALL_DATA_DIR} ${FONTDIR} ${INSTALL_DATA} ${WRKDIST}/OpenType/*/*.otf ${FONTDIR} ${INSTALL_DATA} ${WRKDIST}/TrueType/*/*.ttf ${FONTDIR} - # currently JP fonts only have hinted/unhinted directory, - # this package use hinted font following Noto fonts. ${INSTALL_DATA} ${WRKDIST}/OpenType/IBM-Plex-Sans-JP/hinted/*.otf ${FONTDIR} ${INSTALL_DATA} ${WRKDIST}/TrueType/IBM-Plex-Sans-JP/hinted/*.ttf ${FONTDIR} -post-install: +post-install-no: ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA} ${WRKDIST}/OpenType/IBM-Plex-Sans/license.txt ${DOCDIR} diff --git a/fonts/juliamono/Makefile b/fonts/juliamono/Makefile index 7e18a820339..db7789e7c12 100644 --- a/fonts/juliamono/Makefile +++ b/fonts/juliamono/Makefile @@ -1,10 +1,8 @@ COMMENT = typeface carefully crafted & designed for computer screens +TYPEFACE = juliamono V = 0.044 DISTNAME = JuliaMono -PKGNAME = juliamono-$V - -CATEGORIES = fonts HOMEPAGE = https://juliamono.netlify.app/ @@ -13,19 +11,22 @@ MAINTAINER = Laurence Tratt <lau...@tratt.net> # SIL OFL 1.1 PERMIT_PACKAGE = Yes +EXTRACT_SUFX = .tar.gz MASTER_SITES = https://github.com/cormullion/juliamono/releases/download/v${V}/ DISTFILES = ${DISTNAME}-${V}{${DISTNAME}}${EXTRACT_SUFX} +MODULES = font + NO_BUILD = Yes NO_TEST = Yes WRKDIST = ${WRKDIR} do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/fonts/juliamono + ${INSTALL_DATA_DIR} ${FONTDIR} ls ${WRKSRC}/*.ttf | grep -v Latin | \ - xargs -I{} ${INSTALL_DATA} {} ${PREFIX}/share/fonts/juliamono - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/juliamono - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/juliamono + xargs -I{} ${INSTALL_DATA} {} ${FONTDIR} + ${INSTALL_DATA_DIR} ${FONT_DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/LICENSE ${FONT_DOCDIR} .include <bsd.port.mk> -- 2.36.1