On 2024/04/14 11:41, Anthony J. Bentley wrote:
> The font module has very unorthodox use of variables.
Doesn't it just.
OK
> - Other modules are namespaced, but this one looks for weirdly named
> variables like FONTDIR, FONTTYPES, and TYPEFACE.
> - Even worse, the font module sets PKGNAME from the extremely generic
> variables V and VERSION. As far as I know, no other module makes use
> of widely used generically named variables like this. It's incredibly
> confusing if you aren't familiar with this behavior.
> - Technically, a typical font port represents a font *family*, not a
> font *face*.
>
> So, this diff makes the following straightforward changes:
>
> - replace all TYPEFACE with MODFONT_FAMILY
> - replace all FONTTYPES with MODFONT_TYPES
> - replace V/VERSION with MODFONT_VERSION (only if the module uses it,
> i.e., if TYPEFACE is set)
> - replace FONTDIR with MODFONT_DIR (only if the module's FONTDIR or the
> module's do-install is used)
>
> Refetching all distfiles under fonts/ succeeds; rerunning 'make package'
> under fonts/ succeeds.
>
> ok?
>
>
> Index: infrastructure/mk/font.port.mk
> ===================================================================
> RCS file: /cvs/ports/infrastructure/mk/font.port.mk,v
> diff -u -p -r1.6 font.port.mk
> --- infrastructure/mk/font.port.mk 14 Sep 2023 03:51:43 -0000 1.6
> +++ infrastructure/mk/font.port.mk 14 Apr 2024 17:30:15 -0000
> @@ -6,25 +6,23 @@ PKG_ARCH ?= *
>
> EXTRACT_SUFX ?= .zip
>
> -.if defined(TYPEFACE)
> -. if defined(V)
> -PKGNAME ?= ${TYPEFACE}-$V
> -. elif defined(VERSION)
> -PKGNAME ?= ${TYPEFACE}-${VERSION}
> +.if defined(MODFONT_FAMILY)
> +. if defined(MODFONT_VERSION)
> +PKGNAME ?= ${MODFONT_FAMILY}-${MODFONT_VERSION}
> . endif
>
> -FONTDIR ?= ${PREFIX}/share/fonts/${TYPEFACE}
> +MODFONT_DIR ?= ${PREFIX}/share/fonts/${MODFONT_FAMILY}
>
> -FONTTYPES ?=
> +MODFONT_TYPES ?=
>
> -MODFONT_do-install = ${INSTALL_DATA_DIR} ${FONTDIR};
> +MODFONT_do-install = ${INSTALL_DATA_DIR} ${MODFONT_DIR};
>
> -# if FONTTYPES is not set, install .otf files if present (and break,
> +# if MODFONT_TYPES is not set, install .otf files if present (and break,
> # to skip ttf) otherwise fallback to ttf.
> -.if empty(FONTTYPES)
> -MODFONT_do-install += for t in otf ttf; do ${INSTALL_DATA} ${WRKSRC}/*.$$t
> ${FONTDIR} && break; done
> +.if empty(MODFONT_TYPES)
> +MODFONT_do-install += for t in otf ttf; do ${INSTALL_DATA} ${WRKSRC}/*.$$t
> ${MODFONT_DIR} && break; done
> .else
> -MODFONT_do-install += for t in ${FONTTYPES}; do ${INSTALL_DATA}
> ${WRKSRC}/*.$$t ${FONTDIR}; done
> +MODFONT_do-install += for t in ${MODFONT_TYPES}; do ${INSTALL_DATA}
> ${WRKSRC}/*.$$t ${MODFONT_DIR}; done
> .endif
>
> . if !target(do-install)
> Index: fonts/abyssinica/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/abyssinica/Makefile,v
> diff -u -p -r1.13 Makefile
> --- fonts/abyssinica/Makefile 21 Sep 2023 15:28:01 -0000 1.13
> +++ fonts/abyssinica/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,8 +1,8 @@
> COMMENT = Ethiopic Unicode script
>
> -TYPEFACE = abyssinica
> -V = 2.100
> -DISTNAME = AbyssinicaSIL-$V
> +MODFONT_FAMILY = abyssinica
> +MODFONT_VERSION = 2.100
> +DISTNAME = AbyssinicaSIL-${MODFONT_VERSION}
> CATEGORIES = fonts
>
> HOMEPAGE = https://software.sil.org/abyssinica/
> Index: fonts/andika/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/andika/Makefile,v
> diff -u -p -r1.11 Makefile
> --- fonts/andika/Makefile 21 Sep 2023 15:28:01 -0000 1.11
> +++ fonts/andika/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,7 +1,7 @@
> -TYPEFACE = andika
> -V = 6.101
> +MODFONT_FAMILY = andika
> +MODFONT_VERSION = 6.101
> COMMENT = clear sans serif, Unicode-compliant font
> -DISTNAME = Andika-$V
> +DISTNAME = Andika-${MODFONT_VERSION}
> CATEGORIES = fonts
>
> HOMEPAGE = https://software.sil.org/andika/
> Index: fonts/arabeyes-ttf/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/arabeyes-ttf/Makefile,v
> diff -u -p -r1.13 Makefile
> --- fonts/arabeyes-ttf/Makefile 21 Sep 2023 15:28:01 -0000 1.13
> +++ fonts/arabeyes-ttf/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,9 +1,9 @@
> COMMENT= Arabeyes TrueType Arabic fonts
>
> -TYPEFACE = arabeyes
> -V= 2.0
> -DISTNAME= ttf-arabeyes_$V.orig
> -PKGNAME= ${TYPEFACE}-ttf-$V
> +MODFONT_FAMILY =arabeyes
> +MODFONT_VERSION=2.0
> +DISTNAME= ttf-arabeyes_${MODFONT_VERSION}.orig
> +PKGNAME= ${MODFONT_FAMILY}-ttf-${MODFONT_VERSION}
> REVISION= 3
> CATEGORIES= fonts x11
>
> @@ -20,6 +20,6 @@ NO_BUILD= Yes
> NO_TEST= Yes
>
> WRKSRC= ${WRKDIST}/fonts
> -WRKDIST= ${WRKDIR}/ttf-arabeyes-$V
> +WRKDIST= ${WRKDIR}/ttf-arabeyes-${MODFONT_VERSION}
>
> .include <bsd.port.mk>
> Index: fonts/aref-ruqaa/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/aref-ruqaa/Makefile,v
> diff -u -p -r1.3 Makefile
> --- fonts/aref-ruqaa/Makefile 21 Sep 2023 15:28:02 -0000 1.3
> +++ fonts/aref-ruqaa/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,10 +1,10 @@
> COMMENT = Arabic typeface capturing classical Ruqaa calligraphic style
>
> -TYPEFACE = aref-ruqaa
> -V = 1.005
> +MODFONT_FAMILY = aref-ruqaa
> +MODFONT_VERSION = 1.005
>
> -DISTFILES = ArefRuqaa-${V}.zip
> -SITES =
> https://github.com/aliftype/aref-ruqaa/releases/download/v${V}/
> +DISTFILES = ArefRuqaa-${MODFONT_VERSION}.zip
> +SITES =
> https://github.com/aliftype/aref-ruqaa/releases/download/v${MODFONT_VERSION}/
>
> MAINTAINER = George Rosamond <[email protected]>
>
> @@ -16,6 +16,6 @@ MODULES = font
> NO_BUILD = Yes
> NO_TEST = Yes
>
> -WRKSRC = ${WRKDIST}/ArefRuqaa-${V}/ttf
> +WRKSRC = ${WRKDIST}/ArefRuqaa-${MODFONT_VERSION}/ttf
>
> .include <bsd.port.mk>
> Index: fonts/atkinson-hyperlegible/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/atkinson-hyperlegible/Makefile,v
> diff -u -p -r1.4 Makefile
> --- fonts/atkinson-hyperlegible/Makefile 15 Sep 2023 07:08:40 -0000
> 1.4
> +++ fonts/atkinson-hyperlegible/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,8 +1,8 @@
> COMMENT = greater legibility and readability for low vision readers
>
> -TYPEFACE = atkinson-hyperlegible
> +MODFONT_FAMILY = atkinson-hyperlegible
> VDIST = 2020-0514
> -V = ${VDIST:S/-/./}
> +MODFONT_VERSION = ${VDIST:S/-/./}
> REVISION = 1
> DISTNAME = Atkinson-Hyperlegible-Font-Print-and-Web-${VDIST}
> CATEGORIES = fonts
> @@ -13,7 +13,7 @@ HOMEPAGE = https://brailleinstitute.org/
> PERMIT_PACKAGE = Yes
>
> MODULES = font
> -FONTTYPES = otf
> +MODFONT_TYPES = otf
>
> SITES =
> https://brailleinstitute.org/wp-content/uploads/atkinson-hyperlegible-font/
> SITES.doc = https://brailleinstitute.org/wp-content/uploads/2020/11/
> @@ -25,7 +25,7 @@ NO_BUILD = Yes
> NO_TEST = Yes
>
> WRKSRC = ${WRKDIST}/Print\ Fonts
> -DOCDIR = ${PREFIX}/share/doc/${TYPEFACE}
> +DOCDIR = ${PREFIX}/share/doc/${MODFONT_FAMILY}
>
> post-install:
> ${INSTALL_DATA_DIR} ${DOCDIR}
> Index: fonts/blockzone/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/blockzone/Makefile,v
> diff -u -p -r1.16 Makefile
> --- fonts/blockzone/Makefile 21 Sep 2023 15:28:02 -0000 1.16
> +++ fonts/blockzone/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,9 +1,9 @@
> COMMENT = pixel-perfect recreation of the original IBM VGA font
>
> -TYPEFACE = BlockZone
> +MODFONT_FAMILY = BlockZone
>
> -V = 1.004
> -DISTNAME = BlockZone-$V
> +MODFONT_VERSION = 1.004
> +DISTNAME = BlockZone-${MODFONT_VERSION}
> REVISION = 4
>
> CATEGORIES = fonts
> @@ -13,7 +13,7 @@ HOMEPAGE = https://github.com/ansilove/b
> # SIL OFL 1.1
> PERMIT_PACKAGE = Yes
>
> -SITES =
> https://github.com/ansilove/BlockZone/releases/download/$V/
> +SITES =
> https://github.com/ansilove/BlockZone/releases/download/${MODFONT_VERSION}/
>
> MODULES = font
>
> Index: fonts/charis/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/charis/Makefile,v
> diff -u -p -r1.10 Makefile
> --- fonts/charis/Makefile 21 Sep 2023 15:28:02 -0000 1.10
> +++ fonts/charis/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,8 +1,8 @@
> COMMENT = readable Unicode font for laser printers
>
> -TYPEFACE = charis
> -V = 6.101
> -DISTNAME = CharisSIL-$V
> +MODFONT_FAMILY = charis
> +MODFONT_VERSION = 6.101
> +DISTNAME = CharisSIL-${MODFONT_VERSION}
> CATEGORIES = fonts
>
> HOMEPAGE = https://software.sil.org/charis/
> Index: fonts/clearsans/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/clearsans/Makefile,v
> diff -u -p -r1.6 Makefile
> --- fonts/clearsans/Makefile 21 Sep 2023 15:28:02 -0000 1.6
> +++ fonts/clearsans/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,5 +1,6 @@
> -TYPEFACE = clearsans
> COMMENT = versatile font for on-screen legibility
> +
> +MODFONT_FAMILY = clearsans
> DISTNAME = clearsans-1.00
> CATEGORIES = fonts
>
> Index: fonts/comic-neue/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/comic-neue/Makefile,v
> diff -u -p -r1.14 Makefile
> --- fonts/comic-neue/Makefile 21 Sep 2023 15:28:02 -0000 1.14
> +++ fonts/comic-neue/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,8 +1,8 @@
> COMMENT = replacement for Comic Sans font
>
> -TYPEFACE = comic-neue
> -VERSION = 2.51
> -DISTNAME = ${TYPEFACE}-${VERSION}
> +MODFONT_FAMILY = comic-neue
> +MODFONT_VERSION = 2.51
> +DISTNAME = ${MODFONT_FAMILY}-${MODFONT_VERSION}
>
> CATEGORIES = fonts
>
> Index: fonts/doulos/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/doulos/Makefile,v
> diff -u -p -r1.11 Makefile
> --- fonts/doulos/Makefile 21 Sep 2023 15:28:03 -0000 1.11
> +++ fonts/doulos/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,7 +1,8 @@
> -TYPEFACE = doulos
> -V = 6.101
> COMMENT = Unicode-based font for Roman and Cyrillic
> -DISTNAME = DoulosSIL-$V
> +
> +MODFONT_FAMILY = doulos
> +MODFONT_VERSION = 6.101
> +DISTNAME = DoulosSIL-${MODFONT_VERSION}
> CATEGORIES = fonts
>
> HOMEPAGE = https://software.sil.org/doulos/
> Index: fonts/ecoliercourt-fonts/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/ecoliercourt-fonts/Makefile,v
> diff -u -p -r1.10 Makefile
> --- fonts/ecoliercourt-fonts/Makefile 21 Sep 2023 15:28:03 -0000 1.10
> +++ fonts/ecoliercourt-fonts/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,7 +1,7 @@
> COMMENT= dip pen style TTF fonts
>
> -TYPEFACE= ecoliercourt
> -DISTNAME= ${TYPEFACE}-fonts-0.1
> +MODFONT_FAMILY= ecoliercourt
> +DISTNAME= ${MODFONT_FAMILY}-fonts-0.1
> DISTFILES= ecl_cour.ttf ec_cour.ttf
>
> REVISION= 2
> Index: fonts/farsi-bfonts-ttf/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/farsi-bfonts-ttf/Makefile,v
> diff -u -p -r1.10 Makefile
> --- fonts/farsi-bfonts-ttf/Makefile 21 Sep 2023 15:28:03 -0000 1.10
> +++ fonts/farsi-bfonts-ttf/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,8 +1,8 @@
> COMMENT= farsi bornaray fonts
>
> -TYPEFACE= farsi-bfonts
> +MODFONT_FAMILY= farsi-bfonts
> DISTNAME= bfonts
> -PKGNAME= ${TYPEFACE}-ttf-2.0
> +PKGNAME= ${MODFONT_FAMILY}-ttf-2.0
> REVISION= 2
>
> DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
> Index: fonts/farsifonts-ttf/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/farsifonts-ttf/Makefile,v
> diff -u -p -r1.10 Makefile
> --- fonts/farsifonts-ttf/Makefile 21 Sep 2023 15:28:03 -0000 1.10
> +++ fonts/farsifonts-ttf/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,9 +1,9 @@
> COMMENT= ISIRI 6219 conforming Farsi fonts
>
> -TYPEFACE= farsifonts
> -V= 0.4
> -DISTNAME= farsi_fonts_$V
> -PKGNAME= ${TYPEFACE}-ttf-$V
> +MODFONT_FAMILY= farsifonts
> +MODFONT_VERSION=0.4
> +DISTNAME= farsi_fonts_${MODFONT_VERSION}
> +PKGNAME= ${MODFONT_FAMILY}-ttf-${MODFONT_VERSION}
> REVISION = 3
> CATEGORIES= fonts x11
>
> @@ -20,6 +20,6 @@ MODULES= font
> NO_BUILD= Yes
> NO_TEST= Yes
>
> -WRKDIST= ${WRKDIR}/farsifonts-$V
> +WRKDIST= ${WRKDIR}/farsifonts-${MODFONT_VERSION}
>
> .include <bsd.port.mk>
> Index: fonts/font-awesome/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/font-awesome/Makefile,v
> diff -u -p -r1.39 Makefile
> --- fonts/font-awesome/Makefile 30 Dec 2023 08:25:25 -0000 1.39
> +++ fonts/font-awesome/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -17,7 +17,7 @@ EXTRACT_SUFX = .zip
> PERMIT_PACKAGE= Yes
>
> MODULES = font
> -FONTTYPES = otf
> +MODFONT_TYPES = otf
>
> NO_BUILD = Yes
> NO_TEST = Yes
> Index: fonts/gentium/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/gentium/Makefile,v
> diff -u -p -r1.11 Makefile
> --- fonts/gentium/Makefile 21 Sep 2023 15:28:04 -0000 1.11
> +++ fonts/gentium/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,7 +1,8 @@
> -TYPEFACE = gentium
> -V = 6.101
> COMMENT = readable font for Latin, Cyrillic, and Greek
> -DISTNAME = GentiumPlus-$V
> +
> +MODFONT_FAMILY = gentium
> +MODFONT_VERSION = 6.101
> +DISTNAME = GentiumPlus-${MODFONT_VERSION}
> CATEGORIES = fonts
>
> HOMEPAGE = https://software.sil.org/gentium/
> Index: fonts/hermit-font/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/hermit-font/Makefile,v
> diff -u -p -r1.14 Makefile
> --- fonts/hermit-font/Makefile 21 Sep 2023 15:28:04 -0000 1.14
> +++ fonts/hermit-font/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,10 +1,10 @@
> COMMENT= clear, readable monospaced font
>
> -TYPEFACE= hermit
> -VERSION= 2.0
> +MODFONT_FAMILY= hermit
> +MODFONT_VERSION=2.0
> REVISION= 0
> -DISTNAME= otf-hermit-${VERSION}
> -PKGNAME= hermit-font-${VERSION}
> +DISTNAME= otf-hermit-${MODFONT_VERSION}
> +PKGNAME= hermit-font-${MODFONT_VERSION}
> CATEGORIES= fonts x11
>
> # SIL OFL 1.1
> @@ -19,7 +19,7 @@ MODULES= font
> NO_BUILD= Yes
> NO_TEST= Yes
>
> -FONTTYPES= otf
> +MODFONT_TYPES= otf
> WRKDIST= ${WRKDIR}
>
> .include <bsd.port.mk>
> Index: fonts/inconsolata-font/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/inconsolata-font/Makefile,v
> diff -u -p -r1.14 Makefile
> --- fonts/inconsolata-font/Makefile 21 Sep 2023 15:28:05 -0000 1.14
> +++ fonts/inconsolata-font/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,8 +1,8 @@
> COMMENT = monospace font designed for coders (old version)
>
> -TYPEFACE= inconsolata
> +MODFONT_FAMILY= inconsolata
> DISTNAME= Inconsolata
> -PKGNAME= ${TYPEFACE}-font-0.1
> +PKGNAME= ${MODFONT_FAMILY}-font-0.1
> EPOCH = 0
> CATEGORIES= fonts x11
>
> @@ -16,7 +16,7 @@ EXTRACT_ONLY=
> PERMIT_PACKAGE= Yes
>
> MODULES= font
> -FONTTYPES= otf
> +MODFONT_TYPES= otf
>
> NO_BUILD= Yes
> NO_TEST= Yes
> Index: fonts/jaldi/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/jaldi/Makefile,v
> diff -u -p -r1.4 Makefile
> --- fonts/jaldi/Makefile 21 Sep 2023 15:28:06 -0000 1.4
> +++ fonts/jaldi/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,10 +1,10 @@
> COMMENT = libre Devanagari typeface family
>
> -TYPEFACE = jaldi
> -V = 1.007
> +MODFONT_FAMILY = jaldi
> +MODFONT_VERSION = 1.007
> REVISION = 0
>
> -DISTFILES = ${V}.zip
> +DISTFILES = ${MODFONT_VERSION}.zip
> SITES = https://github.com/Omnibus-Type/Jaldi/archive/refs/tags/
>
> MAINTAINER = George Rosamond <[email protected]>
> @@ -17,6 +17,6 @@ MODULES = font
> NO_BUILD = Yes
> NO_TEST = Yes
>
> -WRKSRC = ${WRKDIST}/Jaldi-${V}/Fonts
> +WRKSRC = ${WRKDIST}/Jaldi-${MODFONT_VERSION}/Fonts
>
> .include <bsd.port.mk>
> Index: fonts/jetbrains-mono/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/jetbrains-mono/Makefile,v
> diff -u -p -r1.7 Makefile
> --- fonts/jetbrains-mono/Makefile 21 Sep 2023 15:28:06 -0000 1.7
> +++ fonts/jetbrains-mono/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,8 +1,8 @@
> COMMENT = monotype font for developers
>
> -V = 2.304
> -DISTNAME = ${TYPEFACE}-$V
> -PKGNAME = jetbrains-mono-$V
> +MODFONT_VERSION = 2.304
> +DISTNAME = ${MODFONT_FAMILY}-${MODFONT_VERSION}
> +PKGNAME = jetbrains-mono-${MODFONT_VERSION}
>
> CATEGORIES = fonts x11
>
> @@ -13,7 +13,7 @@ PERMIT_PACKAGE = Yes
>
> SITES = https://download.jetbrains.com/fonts/
>
> -TYPEFACE = JetBrainsMono
> +MODFONT_FAMILY = JetBrainsMono
>
> WRKSRC = ${WRKDIST}/fonts/ttf
> MODULES = font
> Index: fonts/junicode/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/junicode/Makefile,v
> diff -u -p -r1.9 Makefile
> --- fonts/junicode/Makefile 23 Jan 2023 09:47:12 -0000 1.9
> +++ fonts/junicode/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,11 +1,11 @@
> COMMENT = advanced Unicode font for medievalists
>
> -TYPEFACE = junicode
> -V = 1.003
> +MODFONT_FAMILY = junicode
> +MODFONT_VERSION = 1.003
>
> GH_ACCOUNT = psb1558
> GH_PROJECT = Junicode-font
> -GH_TAGNAME = v${V}
> +GH_TAGNAME = v${MODFONT_VERSION}
>
> MAINTAINER = George Rosamond <[email protected]>
>
> Index: fonts/mononoki/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/mononoki/Makefile,v
> diff -u -p -r1.3 Makefile
> --- fonts/mononoki/Makefile 21 Sep 2023 15:28:09 -0000 1.3
> +++ fonts/mononoki/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,10 +1,10 @@
> COMMENT = font for programming and code review
>
> -TYPEFACE = mononoki
> -V = 1.3
> +MODFONT_FAMILY = mononoki
> +MODFONT_VERSION = 1.3
>
> -DISTFILES = mononoki-${V}{mononoki}.zip
> -SITES =
> https://github.com/madmalik/mononoki/releases/download/${V}/
> +DISTFILES = mononoki-${MODFONT_VERSION}{mononoki}.zip
> +SITES =
> https://github.com/madmalik/mononoki/releases/download/${MODFONT_VERSION}/
>
> HOMEPAGE = https://madmalik.github.io/mononoki/
>
> Index: fonts/nerd-fonts/Makefile.inc
> ===================================================================
> RCS file: /cvs/ports/fonts/nerd-fonts/Makefile.inc,v
> diff -u -p -r1.5 Makefile.inc
> --- fonts/nerd-fonts/Makefile.inc 21 Sep 2023 15:28:10 -0000 1.5
> +++ fonts/nerd-fonts/Makefile.inc 14 Apr 2024 17:30:15 -0000
> @@ -21,6 +21,6 @@ MODULES = font
> NO_BUILD = Yes
> NO_TEST = Yes
>
> -TYPEFACE = ${NF_FONT:L}
> -FONTDIR = ${PREFIX}/share/fonts/${NF_PROJECT}/${NF_FONT:L}
> +MODFONT_FAMILY = ${NF_FONT:L}
> +MODFONT_DIR = ${PREFIX}/share/fonts/${NF_PROJECT}/${NF_FONT:L}
> DOCDIR = ${PREFIX}/share/doc/${NF_PROJECT}/${NF_FONT:L}
> Index: fonts/nerd-fonts/codenewroman/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/nerd-fonts/codenewroman/Makefile,v
> diff -u -p -r1.1.1.1 Makefile
> --- fonts/nerd-fonts/codenewroman/Makefile 31 Dec 2022 10:02:54 -0000
> 1.1.1.1
> +++ fonts/nerd-fonts/codenewroman/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,5 +1,5 @@
> NF_FONT = CodeNewRoman
> -FONTTYPES = otf
> +MODFONT_TYPES = otf
>
> post-install:
> ${INSTALL_DATA_DIR} ${DOCDIR}
> Index: fonts/recursive/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/recursive/Makefile,v
> diff -u -p -r1.1.1.1 Makefile
> --- fonts/recursive/Makefile 12 Sep 2023 05:34:43 -0000 1.1.1.1
> +++ fonts/recursive/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,8 +1,8 @@
> COMMENT = variable type family built for better code and UI
>
> -TYPEFACE = recursive
> -V = 1.085
> -DISTNAME = ArrowType-Recursive-$V
> +MODFONT_FAMILY = recursive
> +MODFONT_VERSION = 1.085
> +DISTNAME = ArrowType-Recursive-${MODFONT_VERSION}
>
> CATEGORIES = fonts
>
> @@ -11,7 +11,7 @@ HOMEPAGE = https://github.com/arrowtype/
> # SIL OFL 1.1
> PERMIT_PACKAGE = Yes
>
> -SITES =
> https://github.com/arrowtype/recursive/releases/download/v$V/
> +SITES =
> https://github.com/arrowtype/recursive/releases/download/v${MODFONT_VERSION}/
>
> MODULES = font
>
> @@ -19,12 +19,12 @@ NO_BUILD = Yes
> NO_TEST = Yes
>
> do-install:
> - ${INSTALL_DATA_DIR} ${FONTDIR}
> + ${INSTALL_DATA_DIR} ${MODFONT_DIR}
> ${INSTALL_DATA} \
> ${WRKSRC}/Recursive_Desktop/separate_statics/OTF/*.otf \
> ${WRKSRC}/Recursive_Code/RecMonoCasual/*.ttf \
> ${WRKSRC}/Recursive_Code/RecMonoDuotone/*.ttf \
> ${WRKSRC}/Recursive_Code/RecMonoLinear/*.ttf \
> - ${WRKSRC}/Recursive_Code/RecMonoSemicasual/*.ttf ${FONTDIR}
> + ${WRKSRC}/Recursive_Code/RecMonoSemicasual/*.ttf ${MODFONT_DIR}
>
> .include <bsd.port.mk>
> Index: fonts/spranq-ecofont-ttf/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/spranq-ecofont-ttf/Makefile,v
> diff -u -p -r1.14 Makefile
> --- fonts/spranq-ecofont-ttf/Makefile 21 Sep 2023 15:28:11 -0000 1.14
> +++ fonts/spranq-ecofont-ttf/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,10 +1,10 @@
> COMMENT= ink-saving font based on Vera Sans
>
> -TYPEFACE = ecofont
> +MODFONT_FAMILY = ecofont
> # Make sure we're well below upstreams initial versioned release
> -V= 0.001
> -DISTNAME= spranq_eco_sans_regular-$V
> -PKGNAME= spranq-ecofont-ttf-$V
> +MODFONT_VERSION = 0.001
> +DISTNAME= spranq_eco_sans_regular-${MODFONT_VERSION}
> +PKGNAME= spranq-ecofont-ttf-${MODFONT_VERSION}
> REVISION= 2
> CATEGORIES= fonts x11
>
> Index: fonts/sunscreen/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/sunscreen/Makefile,v
> diff -u -p -r1.5 Makefile
> --- fonts/sunscreen/Makefile 21 Sep 2023 15:28:11 -0000 1.5
> +++ fonts/sunscreen/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,7 +1,7 @@
> -TYPEFACE = sunscreen
> -V = 1.0
> +MODFONT_FAMILY = sunscreen
> +MODFONT_VERSION = 1.0
> COMMENT = disco-inspired display face
> -DISTNAME = sunscreen-$V
> +DISTNAME = sunscreen-${MODFONT_VERSION}
> CATEGORIES = fonts
>
> EXTRACT_SUFX = .zip
> @@ -14,7 +14,7 @@ PERMIT_PACKAGE = Yes
> SITES = http://www.simon-cozens.org/downloads/
>
> MODULES = font
> -FONTTYPES = otf
> +MODFONT_TYPES = otf
>
> NO_BUILD = Yes
> NO_TEST = Yes
> Index: fonts/vazirmatn/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/vazirmatn/Makefile,v
> diff -u -p -r1.4 Makefile
> --- fonts/vazirmatn/Makefile 21 Sep 2023 15:28:12 -0000 1.4
> +++ fonts/vazirmatn/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -1,10 +1,10 @@
> COMMENT = simple Persian/Arabic font for web pages and applications
>
> -TYPEFACE = vazirmatn
> -V = 33.003
> +MODFONT_FAMILY = vazirmatn
> +MODFONT_VERSION = 33.003
>
> -DISTFILES = vazirmatn-v${V}.zip
> -SITES =
> https://github.com/rastikerdar/vazirmatn/releases/download/v${V}/
> +DISTFILES = vazirmatn-v${MODFONT_VERSION}.zip
> +SITES =
> https://github.com/rastikerdar/vazirmatn/releases/download/v${MODFONT_VERSION}/
>
> MAINTAINER = George Rosamond <[email protected]>
>
> Index: fonts/victor-mono/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/victor-mono/Makefile,v
> diff -u -p -r1.3 Makefile
> --- fonts/victor-mono/Makefile 21 Sep 2023 15:28:12 -0000 1.3
> +++ fonts/victor-mono/Makefile 14 Apr 2024 17:30:15 -0000
> @@ -2,11 +2,11 @@ COMMENT= slender monospaced font with a
> HOMEPAGE= https://rubjo.github.io/victor-mono/
> MAINTAINER= Ashlen <[email protected]>
>
> -TYPEFACE= victor-mono
> -V= 1.5.5
> +MODFONT_FAMILY= victor-mono
> +MODFONT_VERSION= 1.5.5
>
> -SITES= https://github.com/rubjo/victor-mono/raw/v${V}/public/
> -DISTFILES= victor-mono-${V}{VictorMonoAll}${EXTRACT_SUFX}
> +SITES=
> https://github.com/rubjo/victor-mono/raw/v${MODFONT_VERSION}/public/
> +DISTFILES= victor-mono-${MODFONT_VERSION}{VictorMonoAll}${EXTRACT_SUFX}
>
> # SIL OFL 1.1
> PERMIT_PACKAGE= Yes
> Index: fonts/zh-wqy-bitmapfont/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/zh-wqy-bitmapfont/Makefile,v
> diff -u -p -r1.12 Makefile
> --- fonts/zh-wqy-bitmapfont/Makefile 7 Nov 2023 14:19:28 -0000 1.12
> +++ fonts/zh-wqy-bitmapfont/Makefile 14 Apr 2024 17:30:16 -0000
> @@ -1,10 +1,10 @@
> COMMENT= Wen Quan Yi bitmap song CJK fonts
>
> -TYPEFACE= wqy-bitmapfont
> -V= 0.9.9-0
> -DISTNAME= ${TYPEFACE}-pcf-$V
> +MODFONT_FAMILY= wqy-bitmapfont
> +MODFONT_VERSION= 0.9.9-0
> +DISTNAME= ${MODFONT_FAMILY}-pcf-${MODFONT_VERSION}
> REVISION= 3
> -PKGNAME= zh-wqy-bitmapfont-${V:S/-/./}
> +PKGNAME= zh-wqy-bitmapfont-${MODFONT_VERSION:S/-/./}
>
> CATEGORIES= x11 chinese
>
> Index: fonts/zh-wqy-zenhei-ttf/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/zh-wqy-zenhei-ttf/Makefile,v
> diff -u -p -r1.11 Makefile
> --- fonts/zh-wqy-zenhei-ttf/Makefile 21 Sep 2023 15:28:13 -0000 1.11
> +++ fonts/zh-wqy-zenhei-ttf/Makefile 14 Apr 2024 17:30:16 -0000
> @@ -1,9 +1,9 @@
> COMMENT= Wen Quan Yi Zen Hei outline font
>
> -TYPEFACE= wqy-zenhei
> -V = 0.9.45
> -DISTNAME= ${TYPEFACE}-${V}
> -PKGNAME = zh-wqy-zenhei-ttf-$V
> +MODFONT_FAMILY = wqy-zenhei
> +MODFONT_VERSION = 0.9.45
> +DISTNAME = ${MODFONT_FAMILY}-${MODFONT_VERSION}
> +PKGNAME = zh-wqy-zenhei-ttf-${MODFONT_VERSION}
>
> CATEGORIES= x11 chinese
>
> @@ -17,11 +17,11 @@ MODULES = font
> SITES= ${SITE_SOURCEFORGE:=wqy/}
> EXTRACT_SUFX= .tar.gz
>
> -FONTTYPES = ttc
> +MODFONT_TYPES = ttc
>
> WRKDIST= ${WRKDIR}/wqy-zenhei
> NO_BUILD= Yes
> NO_TEST= Yes
> -FONTDIR= ${PREFIX}/share/fonts/wqy
> +MODFONT_DIR= ${PREFIX}/share/fonts/wqy
>
> .include <bsd.port.mk>
>
