openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rework font install target to accept filenames instead of file extensions.

Browse Source 
This means instead of setting MODFONT_TYPES to an extension like "otf",
font ports now specify filenames to install (wildcards allowed) like
MODFONT_FONTFILES=*.otf.

ok sthen@
This commit is contained in:
bentley
2024-07-11 12:54:41 +00:00
parent 66f0025ed5
commit 69b3b985f0
20 changed files with 60 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fonts/alkalami/Makefile
+1 -1
View File
@@ -19,7 +19,7 @@ MODULES = font
NO_BUILD = Yes
NO_TEST = Yes
MODFONT_TYPES = ttf
MODFONT_FONTFILES = *.ttf
MODFONT_DOCFILES = FONTLOG.txt README.txt
.include <bsd.port.mk>
fonts/atkinson-hyperlegible/Makefile
+1 -1
View File
@@ -13,7 +13,7 @@ HOMEPAGE = https://brailleinstitute.org/freefont
PERMIT_PACKAGE = Yes
MODULES = font
MODFONT_TYPES = otf
MODFONT_FONTFILES = *.otf
SITES = https://brailleinstitute.org/wp-content/uploads/atkinson-hyperlegible-font/
SITES.doc = https://brailleinstitute.org/wp-content/uploads/2020/11/
fonts/blockzone/Makefile
+1 -5
View File
@@ -20,10 +20,6 @@ MODULES = font
NO_BUILD = Yes
NO_TEST = Yes
DOCDIR = ${PREFIX}/share/doc/blockzone
post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCDIR}
MODFONT_DOCFILES = LICENSE
.include <bsd.port.mk>
fonts/cascadia-code/Makefile
+4 -4
View File
@@ -5,6 +5,8 @@ PKGNAME = cascadia-code-${V}
EXTRACT_SUFX = .zip
CATEGORIES = fonts x11
MODFONT_FAMILY = cascadia-code
# SIL OFL 1.1
PERMIT_PACKAGE = Yes
@@ -16,9 +18,7 @@ MODULES = font
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
MODFONT_FONTDIR = ${PREFIX}/share/fonts/cascadia
MODFONT_FONTFILES = ttf/*.ttf otf/static/*.otf
.include <bsd.port.mk>
fonts/ecoliercourt-fonts/Makefile
+2 -2
View File
@@ -21,7 +21,7 @@ EXTRACT_ONLY=
NO_BUILD= Yes
NO_TEST= Yes
pre-install:
cp ${FULLDISTDIR}/*.ttf ${WRKSRC}
WRKDIST = ${FULLDISTDIR}
MODFONT_FONTFILES = *.ttf
.include <bsd.port.mk>
fonts/font-awesome/Makefile
+4 -9
View File
@@ -4,6 +4,8 @@ V = 6.5.2
PKGNAME = font-awesome-${V}
DISTNAME = fontawesome-free-${V}-desktop
MODFONT_FAMILY = font-awesome
CATEGORIES= fonts
HOMEPAGE = https://fontawesome.com
@@ -17,18 +19,11 @@ EXTRACT_SUFX = .zip
PERMIT_PACKAGE= Yes
MODULES = font
MODFONT_TYPES = otf
NO_BUILD = Yes
NO_TEST = Yes
FONTS_DIR= ${PREFIX}/share/fonts/font-awesome
DOCDIR = ${PREFIX}/share/doc/font-awesome
do-install:
${INSTALL_DATA_DIR} ${FONTS_DIR}
${INSTALL_DATA} ${WRKSRC}/otfs/*.otf ${FONTS_DIR}
${INSTALL_DATA_DIR} ${DOCDIR}
${INSTALL_DATA} ${WRKDIST}/*.txt ${DOCDIR}
MODFONT_FONTFILES = otfs/*.otf
MODFONT_DOCFILES = *.txt
.include <bsd.port.mk>
fonts/hermit-font/Makefile
+1 -1
View File
@@ -19,7 +19,7 @@ MODULES= font
NO_BUILD= Yes
NO_TEST= Yes
MODFONT_TYPES= otf
MODFONT_FONTFILES= *.otf
WRKDIST= ${WRKDIR}
.include <bsd.port.mk>
fonts/ibm-plex/Makefile
+7 -11
View File
@@ -23,17 +23,13 @@ MODULES = font
NO_BUILD = Yes
NO_TEST = Yes
# currently JP fonts only have hinted/unhinted directory,
# this package use hinted font following Noto fonts.
MODFONT_FONTFILES = OpenType/*/*.otf \
TrueType/*/*.ttf \
OpenType/IBM-Plex-Sans-JP/hinted/*.otf \
TrueType/IBM-Plex-Sans-JP/hinted/*.ttf
MODFONT_DOCFILES = OpenType/IBM-Plex-Sans/license.txt
FONTDIR = ${PREFIX}/share/fonts/ibm-plex
do-install:
${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}
${INSTALL_DATA_DIR} ${MODFONT_DOCDIR}
${INSTALL_DATA} ${WRKDIST}/OpenType/IBM-Plex-Sans/license.txt ${MODFONT_DOCDIR}
.include <bsd.port.mk>
fonts/inconsolata-font/Makefile
+3 -3
View File
@@ -16,12 +16,12 @@ EXTRACT_ONLY=
PERMIT_PACKAGE= Yes
MODULES= font
MODFONT_TYPES= otf
MODFONT_FONTFILES= *.otf
NO_BUILD= Yes
NO_TEST= Yes
pre-install:
cp ${FULLDISTDIR}/${DISTFILES} ${WRKSRC}
WRKDIST = ${FULLDISTDIR}
MODFONT_FONTFILES = ${DISTFILES}
.include <bsd.port.mk>
fonts/intel-one-mono/Makefile
+5 -9
View File
@@ -1,8 +1,8 @@
COMMENT = expressive monospaced font family
CATEGORIES = fonts
V = 1.3.0
PKGNAME = intel-one-mono-$V
MODFONT_VERSION = 1.3.0
MODFONT_FAMILY = intel-one-mono
# SIL OFL 1.1
PERMIT_PACKAGE = Yes
@@ -12,7 +12,7 @@ SITES = https://github.com/intel/intel-one-mono/releases/download/V$V/
DISTFILES = otf.zip \
ttf.zip
DIST_SUBDIR = intel-one-mono-$V
DIST_SUBDIR = intel-one-mono-${MODFONT_VERSION}
HOMEPAGE = https://github.com/intel/intel-one-mono
@@ -21,11 +21,7 @@ MODULES = font
NO_BUILD = Yes
NO_TEST = Yes
FONTDIR = ${PREFIX}/share/fonts/intel-one-mono
do-install:
${INSTALL_DATA_DIR} ${FONTDIR}
${INSTALL_DATA} ${WRKDIST}/otf/*.otf ${FONTDIR}
${INSTALL_DATA} ${WRKDIST}/ttf/*.ttf ${FONTDIR}
MODFONT_FONTFILES = otf/*.otf \
ttf/*.ttf
.include <bsd.port.mk>
fonts/mada/Makefile
+3 -7
View File
@@ -3,7 +3,7 @@ COMMENT = modernist Arabic typeface
V = 1.3
DISTNAME = mada-${V}
CATEGORIES = fonts
MODFONT_FAMILY = mada
MAINTAINER = George Rosamond <george@nycbug.org>
@@ -17,13 +17,9 @@ MODULES = font
NO_BUILD = Yes
NO_TEST = Yes
FONTDIR = ${PREFIX}/share/fonts/mada
DOCDIR = ${PREFIX}/share/doc/mada
WRKDIST = ${WRKDIR}/Mada-${V}
do-install:
${INSTALL_DATA_DIR} ${FONTDIR} ${DOCDIR}
${INSTALL_DATA} ${WRKDIST}/*.otf ${FONTDIR}
${INSTALL_DATA} ${WRKDIST}/README.txt ${DOCDIR}
MODFONT_FONTFILES = *.otf
MODFONT_DOCFILES = README.txt
.include <bsd.port.mk>
fonts/migmix/Makefile
+3 -4
View File
@@ -2,6 +2,7 @@ COMMENT = mixture of M+ and IPA Gothic fonts, focused on kanji
V = 20200307
PKGNAME = migmix-$V
MODFONT_FAMILY = migmix
CATEGORIES = fonts
@@ -21,11 +22,9 @@ DISTFILES = migmix-1m-$V.zip \
MODULES = font
MODFONT_FONTFILES = */*.ttf
NO_BUILD = Yes
NO_TEST = Yes
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/fonts/migmix
${INSTALL_DATA} ${WRKDIR}/*/*.ttf ${PREFIX}/share/fonts/migmix
.include <bsd.port.mk>
fonts/migu/Makefile
+2 -3
View File
@@ -2,6 +2,7 @@ COMMENT = mixture of M+ and IPA Gothic fonts, focused on kanji
V = 20200307
PKGNAME = migu-$V
MODFONT_FAMILY = migu
CATEGORIES = fonts
@@ -24,8 +25,6 @@ MODULES = font
NO_BUILD = Yes
NO_TEST = Yes
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/fonts/migu
${INSTALL_DATA} ${WRKDIR}/*/*.ttf ${PREFIX}/share/fonts/migu
MODFONT_FONTFILES = */*.ttf
.include <bsd.port.mk>
fonts/nerd-fonts/Makefile.inc
+1 -1
View File
@@ -22,5 +22,5 @@ NO_BUILD = Yes
NO_TEST = Yes
MODFONT_FAMILY = ${NF_FONT:L}
MODFONT_DIR = ${PREFIX}/share/fonts/${NF_PROJECT}/${NF_FONT:L}
MODFONT_FONTDIR = ${PREFIX}/share/fonts/${NF_PROJECT}/${NF_FONT:L}
DOCDIR = ${PREFIX}/share/doc/${NF_PROJECT}/${NF_FONT:L}
fonts/nerd-fonts/codenewroman/Makefile
+1 -1
View File
@@ -1,5 +1,5 @@
NF_FONT = CodeNewRoman
MODFONT_TYPES = otf
MODFONT_FONTFILES = *.otf
post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
fonts/recursive/Makefile
+6 -8
View File
@@ -18,13 +18,11 @@ MODULES = font
NO_BUILD = Yes
NO_TEST = Yes
do-install:
${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 ${MODFONT_DIR}
MODFONT_FONTFILES = Recursive_Desktop/separate_statics/OTF/*.otf \
Recursive_Desktop/separate_statics/OTF/*.otf \
Recursive_Code/RecMonoCasual/*.ttf \
Recursive_Code/RecMonoDuotone/*.ttf \
Recursive_Code/RecMonoLinear/*.ttf \
Recursive_Code/RecMonoSemicasual/*.ttf
.include <bsd.port.mk>
fonts/sunscreen/Makefile
+1 -1
View File
@@ -14,7 +14,7 @@ PERMIT_PACKAGE = Yes
SITES = http://www.simon-cozens.org/downloads/
MODULES = font
MODFONT_TYPES = otf
MODFONT_FONTFILES = *.otf
NO_BUILD = Yes
NO_TEST = Yes
fonts/vollkorn/Makefile
+4 -9
View File
@@ -4,6 +4,7 @@ V = 4.105
DISTNAME = vollkorn-${V:S/./-/}
PKGNAME = vollkorn-$V
MODFONT_FAMILY = vollkorn
# SIL OFL 1.1
PERMIT_PACKAGE = Yes
@@ -22,14 +23,8 @@ NO_TEST = Yes
WRKDIST = ${WRKDIR}
FONTDIR = ${PREFIX}/share/fonts/vollkorn
DOCDIR = ${PREFIX}/share/doc/vollkorn
do-install:
${INSTALL_DATA_DIR} ${FONTDIR}
${INSTALL_DATA} ${WRKSRC}/TTF/*.ttf ${FONTDIR}
${INSTALL_DATA} ${WRKSRC}/PS-OTF/*.otf ${FONTDIR}
${INSTALL_DATA_DIR} ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/OFL.txt ${DOCDIR}
MODFONT_FONTFILES = TTF/*.ttf \
PS-OTF/*.otf
MODFONT_DOCFILES = OFL.txt
.include <bsd.port.mk>
fonts/zh-wqy-zenhei-ttf/Makefile
+2 -2
View File
@@ -17,11 +17,11 @@ MODULES = font
SITES= ${SITE_SOURCEFORGE:=wqy/}
EXTRACT_SUFX= .tar.gz
MODFONT_TYPES = ttc
MODFONT_FONTFILES = *.ttc
WRKDIST= ${WRKDIR}/wqy-zenhei
NO_BUILD= Yes
NO_TEST= Yes
MODFONT_DIR= ${PREFIX}/share/fonts/wqy
MODFONT_FONTDIR= ${PREFIX}/share/fonts/wqy
.include <bsd.port.mk>
infrastructure/mk/font.port.mk
+8 -8
View File
@@ -1,4 +1,4 @@
# $OpenBSD: font.port.mk,v 1.8 2024/07/09 13:03:39 bentley Exp $
# $OpenBSD: font.port.mk,v 1.9 2024/07/11 12:54:41 bentley Exp $
CATEGORIES += fonts
@@ -11,20 +11,20 @@ EXTRACT_SUFX ?= .zip
PKGNAME ?= ${MODFONT_FAMILY}-${MODFONT_VERSION}
. endif
MODFONT_DIR ?= ${PREFIX}/share/fonts/${MODFONT_FAMILY}
MODFONT_FONTDIR ?= ${PREFIX}/share/fonts/${MODFONT_FAMILY}
MODFONT_DOCDIR ?= ${PREFIX}/share/doc/${MODFONT_FAMILY}
MODFONT_TYPES ?=
MODFONT_FONTFILES ?=
MODFONT_DOCFILES ?=
MODFONT_do-install = ${INSTALL_DATA_DIR} ${MODFONT_DIR};
MODFONT_do-install = ${INSTALL_DATA_DIR} ${MODFONT_FONTDIR};
# if MODFONT_TYPES is not set, install .otf files if present (and break,
# if MODFONT_FONTFILES is not set, install .otf files if present (and break,
# to skip ttf) otherwise fallback to ttf.
.if empty(MODFONT_TYPES)
MODFONT_do-install += for t in otf ttf; do ${INSTALL_DATA} ${WRKSRC}/*.$$t ${MODFONT_DIR} && break; done
.if empty(MODFONT_FONTFILES)
MODFONT_do-install += for t in otf ttf; do ${INSTALL_DATA} ${WRKSRC}/*.$$t ${MODFONT_FONTDIR} && break; done
.else
MODFONT_do-install += for t in ${MODFONT_TYPES}; do ${INSTALL_DATA} ${WRKSRC}/*.$$t ${MODFONT_DIR}; done
MODFONT_do-install += for t in ${MODFONT_FONTFILES}; do ${INSTALL_DATA} ${WRKSRC}/$$t ${MODFONT_FONTDIR}; done
.endif
.if !empty(MODFONT_DOCFILES)