On 9/13/23 04:51, Anthony J. Bentley wrote:
> Hi,
>
> These variables seem redundant. FONT_DISTDIR/FONT_DISTSUBDIR are
> specific to the font module and aren't widely used (only three ports
> use each variable); they're functionally equivalent to WRKDIST/WRKSRC.
>
> There's a port-modules(5) manpage diff, but I won't bother sending it
> since it just replaces a single instance of FONT_DISTDIR with WRKSRC.
>
> Everything under fonts/ still survives make package.
>
> ok?
Presumably there are no packages which are ever going to install fonts
in addition to other things like a program or a library? Or something
that would need to build a font using python or a script? Cuz this
removes the ability to do builds and install fonts in the same Makefile.
I'm not saying that having the ability to do a build and also install
fonts is ever going to be needed (doesn't seem like it is needed in the
current ports tree anyway) but would be good to know if that's an
intended and acceptable consequence.
> Index: infrastructure/mk/font.port.mk
> ===================================================================
> RCS file: /cvs/ports/infrastructure/mk/font.port.mk,v
> retrieving revision 1.5
> diff -u -p -r1.5 font.port.mk
> --- infrastructure/mk/font.port.mk 9 May 2023 13:32:04 -0000 1.5
> +++ infrastructure/mk/font.port.mk 13 Sep 2023 08:18:43 -0000
> @@ -17,16 +17,14 @@ FONTDIR ?= ${PREFIX}/share/fonts/${TYPEF
>
> FONTTYPES ?=
>
> -FONT_DISTDIR ?= ${WRKSRC}
> -
> MODFONT_do-install = ${INSTALL_DATA_DIR} ${FONTDIR};
>
> # if FONTTYPES 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}
> ${FONT_DISTDIR}/${FONT_DISTSUBDIR}/*.$$t ${FONTDIR} && break; done
> +MODFONT_do-install += for t in otf ttf; do ${INSTALL_DATA} ${WRKSRC}/*.$$t
> ${FONTDIR} && break; done
> .else
> -MODFONT_do-install += for t in ${FONTTYPES}; do ${INSTALL_DATA}
> ${FONT_DISTDIR}/${FONT_DISTSUBDIR}/*.$$t ${FONTDIR}; done
> +MODFONT_do-install += for t in ${FONTTYPES}; do ${INSTALL_DATA}
> ${WRKSRC}/*.$$t ${FONTDIR}; done
> .endif
>
> . if !target(do-install)
> Index: fonts/arabeyes-ttf/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/arabeyes-ttf/Makefile,v
> retrieving revision 1.11
> diff -u -p -r1.11 Makefile
> --- fonts/arabeyes-ttf/Makefile 11 Mar 2022 19:00:17 -0000 1.11
> +++ fonts/arabeyes-ttf/Makefile 13 Sep 2023 08:18:44 -0000
> @@ -19,7 +19,7 @@ MODULES = font
> NO_BUILD= Yes
> NO_TEST= Yes
>
> -FONT_DISTSUBDIR= fonts
> +WRKSRC= ${WRKDIST}/fonts
> WRKDIST= ${WRKDIR}/ttf-arabeyes-$V
>
> .include <bsd.port.mk>
> Index: fonts/atkinson-hyperlegible/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/atkinson-hyperlegible/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- fonts/atkinson-hyperlegible/Makefile 7 May 2023 06:39:28 -0000
> 1.2
> +++ fonts/atkinson-hyperlegible/Makefile 13 Sep 2023 08:18:44 -0000
> @@ -26,7 +26,7 @@ NO_BUILD = Yes
> NO_TEST = Yes
> SUBST_VARS += VPDF
>
> -FONT_DISTDIR = ${WRKDIR}/${TYPEFACE}-Font-Print-and-Web-${V}/Print\
> Fonts/
> +WRKSRC = ${WRKDIR}/${TYPEFACE}-Font-Print-and-Web-${V}/Print\ Fonts
> DOCDIR = ${PREFIX}/share/doc/hyperlegible
>
> post-install:
> Index: fonts/clearsans/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/clearsans/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- fonts/clearsans/Makefile 11 Mar 2022 19:00:17 -0000 1.4
> +++ fonts/clearsans/Makefile 13 Sep 2023 08:18:44 -0000
> @@ -18,7 +18,7 @@ NO_BUILD = Yes
> NO_TEST = Yes
>
> WRKDIST = ${WRKDIR}
> -FONT_DISTDIR = ${WRKDIST}/TTF
> +WRKSRC = ${WRKDIST}/TTF
> DOCDIR = ${PREFIX}/share/doc/clearsans
>
> post-install:
> Index: fonts/hermit-font/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/hermit-font/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- fonts/hermit-font/Makefile 11 Mar 2022 19:00:20 -0000 1.12
> +++ fonts/hermit-font/Makefile 13 Sep 2023 08:18:44 -0000
> @@ -20,6 +20,6 @@ NO_BUILD= Yes
> NO_TEST= Yes
>
> FONTTYPES= otf
> -FONT_DISTDIR= ${WRKDIR}
> +WRKDIST= ${WRKDIR}
>
> .include <bsd.port.mk>
> Index: fonts/jetbrains-mono/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/jetbrains-mono/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- fonts/jetbrains-mono/Makefile 15 Mar 2023 09:09:12 -0000 1.5
> +++ fonts/jetbrains-mono/Makefile 13 Sep 2023 08:18:44 -0000
> @@ -15,7 +15,7 @@ MASTER_SITES = https://download.jetbrain
>
> TYPEFACE = JetBrainsMono
>
> -FONT_DISTSUBDIR = fonts/ttf
> +WRKSRC = ${WRKDIST}/fonts/ttf
> MODULES = font
> WRKDIST = ${WRKDIR}
>
> Index: fonts/victor-mono/Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/victor-mono/Makefile,v
> retrieving revision 1.1.1.2
> diff -u -p -r1.1.1.2 Makefile
> --- fonts/victor-mono/Makefile 19 May 2023 15:22:36 -0000 1.1.1.2
> +++ fonts/victor-mono/Makefile 13 Sep 2023 08:18:45 -0000
> @@ -12,7 +12,7 @@ DISTFILES= victor-mono-${V}{VictorMonoAl
> PERMIT_PACKAGE= Yes
>
> MODULES= font
> -FONT_DISTSUBDIR= OTF
> +WRKSRC= ${WRKDIST}/OTF
>
> NO_BUILD= Yes
> NO_TEST= Yes
>
