git: 5e3a051d03e4 - main - x11-fonts/monaspace: Improve port

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Wed, 09 Sep 2026 20:26:38 UTC
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5e3a051d03e438f4811a0b0dfd4647b8134522a9

commit 5e3a051d03e438f4811a0b0dfd4647b8134522a9
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2026-09-09 20:24:25 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2026-09-09 20:26:30 +0000

    x11-fonts/monaspace: Improve port
    
    Simplify do-install and rely on common mechanisms to follow other
    ports in tree
    
    PR:             297718
    Reviewed by:    lwhsu (maintainer)
---
 x11-fonts/monaspace/Makefile  |  24 ++---
 x11-fonts/monaspace/pkg-plist | 215 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 224 insertions(+), 15 deletions(-)

diff --git a/x11-fonts/monaspace/Makefile b/x11-fonts/monaspace/Makefile
index 7444cea3a7c3..86fc328106a5 100644
--- a/x11-fonts/monaspace/Makefile
+++ b/x11-fonts/monaspace/Makefile
@@ -1,7 +1,8 @@
 PORTNAME=	monaspace
 DISTVERSION=	1.400
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
-MASTER_SITES=	https://github.com/githubnext/monaspace/releases/download/v${DISTVERSION}/
+MASTER_SITES=	https://github.com/githubnext/${PORTNAME}/releases/download/v${DISTVERSION}/
 DISTFILES=	${PORTNAME}-static-v${DISTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-variable-v${DISTVERSION}${EXTRACT_SUFX}
 
@@ -11,25 +12,18 @@ WWW=		https://monaspace.githubnext.com
 
 LICENSE=	OFL11
 
-USES=		fonts zip
+USES=		fonts
 
+EXTRACT_SUFX=	.zip
+EXTRACT_AFTER_ARGS=	--strip-components 2 \
+			--no-same-owner --no-same-permissions
+
+NO_WRKSUBDIR=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-
-	@cd ${WRKSRC}/"Static Fonts" && ${FIND} . -name '*.otf' | while read f; do \
-		${INSTALL_DATA} "$$f" ${STAGEDIR}${FONTSDIR}; \
-	done
-
-	@cd ${WRKSRC}/"Variable Fonts" && ${FIND} . -name '*.ttf' | while read f; do \
-		${INSTALL_DATA} "$$f" \
-			${STAGEDIR}${FONTSDIR}/`${BASENAME} "$$f" | ${TR} -d ' '`; \
-	done
-
-	${LS} ${STAGEDIR}${FONTSDIR}/*.otf ${STAGEDIR}${FONTSDIR}/*.ttf | \
-		${SED} -e's,^${STAGEDIR},,' >> ${TMPPLIST}
+	${INSTALL_DATA} ${WRKSRC}/* ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/monaspace/pkg-plist b/x11-fonts/monaspace/pkg-plist
new file mode 100644
index 000000000000..38fc1dacf65c
--- /dev/null
+++ b/x11-fonts/monaspace/pkg-plist
@@ -0,0 +1,215 @@
+%%FONTSDIR%%/Monaspace Argon Var.ttf
+%%FONTSDIR%%/Monaspace Krypton Var.ttf
+%%FONTSDIR%%/Monaspace Neon Var.ttf
+%%FONTSDIR%%/Monaspace Radon Var.ttf
+%%FONTSDIR%%/Monaspace Xenon Var.ttf
+%%FONTSDIR%%/MonaspaceArgon-Bold.otf
+%%FONTSDIR%%/MonaspaceArgon-BoldItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-ExtraBold.otf
+%%FONTSDIR%%/MonaspaceArgon-ExtraBoldItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-ExtraLight.otf
+%%FONTSDIR%%/MonaspaceArgon-ExtraLightItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-Italic.otf
+%%FONTSDIR%%/MonaspaceArgon-Light.otf
+%%FONTSDIR%%/MonaspaceArgon-LightItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-Medium.otf
+%%FONTSDIR%%/MonaspaceArgon-MediumItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-Regular.otf
+%%FONTSDIR%%/MonaspaceArgon-SemiBold.otf
+%%FONTSDIR%%/MonaspaceArgon-SemiBoldItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-SemiWideBold.otf
+%%FONTSDIR%%/MonaspaceArgon-SemiWideBoldItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-SemiWideExtraBold.otf
+%%FONTSDIR%%/MonaspaceArgon-SemiWideExtraBoldItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-SemiWideExtraLight.otf
+%%FONTSDIR%%/MonaspaceArgon-SemiWideExtraLightItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-SemiWideItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-SemiWideLight.otf
+%%FONTSDIR%%/MonaspaceArgon-SemiWideLightItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-SemiWideMedium.otf
+%%FONTSDIR%%/MonaspaceArgon-SemiWideMediumItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-SemiWideRegular.otf
+%%FONTSDIR%%/MonaspaceArgon-SemiWideSemiBold.otf
+%%FONTSDIR%%/MonaspaceArgon-SemiWideSemiBoldItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-WideBold.otf
+%%FONTSDIR%%/MonaspaceArgon-WideBoldItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-WideExtraBold.otf
+%%FONTSDIR%%/MonaspaceArgon-WideExtraBoldItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-WideExtraLight.otf
+%%FONTSDIR%%/MonaspaceArgon-WideExtraLightItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-WideItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-WideLight.otf
+%%FONTSDIR%%/MonaspaceArgon-WideLightItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-WideMedium.otf
+%%FONTSDIR%%/MonaspaceArgon-WideMediumItalic.otf
+%%FONTSDIR%%/MonaspaceArgon-WideRegular.otf
+%%FONTSDIR%%/MonaspaceArgon-WideSemiBold.otf
+%%FONTSDIR%%/MonaspaceArgon-WideSemiBoldItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-Bold.otf
+%%FONTSDIR%%/MonaspaceKrypton-BoldItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-ExtraBold.otf
+%%FONTSDIR%%/MonaspaceKrypton-ExtraBoldItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-ExtraLight.otf
+%%FONTSDIR%%/MonaspaceKrypton-ExtraLightItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-Italic.otf
+%%FONTSDIR%%/MonaspaceKrypton-Light.otf
+%%FONTSDIR%%/MonaspaceKrypton-LightItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-Medium.otf
+%%FONTSDIR%%/MonaspaceKrypton-MediumItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-Regular.otf
+%%FONTSDIR%%/MonaspaceKrypton-SemiBold.otf
+%%FONTSDIR%%/MonaspaceKrypton-SemiBoldItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-SemiWideBold.otf
+%%FONTSDIR%%/MonaspaceKrypton-SemiWideBoldItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-SemiWideExtraBold.otf
+%%FONTSDIR%%/MonaspaceKrypton-SemiWideExtraBoldItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-SemiWideExtraLight.otf
+%%FONTSDIR%%/MonaspaceKrypton-SemiWideExtraLightItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-SemiWideItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-SemiWideLight.otf
+%%FONTSDIR%%/MonaspaceKrypton-SemiWideLightItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-SemiWideMedium.otf
+%%FONTSDIR%%/MonaspaceKrypton-SemiWideMediumItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-SemiWideRegular.otf
+%%FONTSDIR%%/MonaspaceKrypton-SemiWideSemiBold.otf
+%%FONTSDIR%%/MonaspaceKrypton-SemiWideSemiBoldItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-WideBold.otf
+%%FONTSDIR%%/MonaspaceKrypton-WideBoldItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-WideExtraBold.otf
+%%FONTSDIR%%/MonaspaceKrypton-WideExtraBoldItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-WideExtraLight.otf
+%%FONTSDIR%%/MonaspaceKrypton-WideExtraLightItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-WideItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-WideLight.otf
+%%FONTSDIR%%/MonaspaceKrypton-WideLightItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-WideMedium.otf
+%%FONTSDIR%%/MonaspaceKrypton-WideMediumItalic.otf
+%%FONTSDIR%%/MonaspaceKrypton-WideRegular.otf
+%%FONTSDIR%%/MonaspaceKrypton-WideSemiBold.otf
+%%FONTSDIR%%/MonaspaceKrypton-WideSemiBoldItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-Bold.otf
+%%FONTSDIR%%/MonaspaceNeon-BoldItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-ExtraBold.otf
+%%FONTSDIR%%/MonaspaceNeon-ExtraBoldItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-ExtraLight.otf
+%%FONTSDIR%%/MonaspaceNeon-ExtraLightItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-Italic.otf
+%%FONTSDIR%%/MonaspaceNeon-Light.otf
+%%FONTSDIR%%/MonaspaceNeon-LightItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-Medium.otf
+%%FONTSDIR%%/MonaspaceNeon-MediumItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-Regular.otf
+%%FONTSDIR%%/MonaspaceNeon-SemiBold.otf
+%%FONTSDIR%%/MonaspaceNeon-SemiBoldItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-SemiWideBold.otf
+%%FONTSDIR%%/MonaspaceNeon-SemiWideBoldItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-SemiWideExtraBold.otf
+%%FONTSDIR%%/MonaspaceNeon-SemiWideExtraBoldItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-SemiWideExtraLight.otf
+%%FONTSDIR%%/MonaspaceNeon-SemiWideExtraLightItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-SemiWideItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-SemiWideLight.otf
+%%FONTSDIR%%/MonaspaceNeon-SemiWideLightItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-SemiWideMedium.otf
+%%FONTSDIR%%/MonaspaceNeon-SemiWideMediumItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-SemiWideRegular.otf
+%%FONTSDIR%%/MonaspaceNeon-SemiWideSemiBold.otf
+%%FONTSDIR%%/MonaspaceNeon-SemiWideSemiBoldItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-WideBold.otf
+%%FONTSDIR%%/MonaspaceNeon-WideBoldItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-WideExtraBold.otf
+%%FONTSDIR%%/MonaspaceNeon-WideExtraBoldItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-WideExtraLight.otf
+%%FONTSDIR%%/MonaspaceNeon-WideExtraLightItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-WideItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-WideLight.otf
+%%FONTSDIR%%/MonaspaceNeon-WideLightItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-WideMedium.otf
+%%FONTSDIR%%/MonaspaceNeon-WideMediumItalic.otf
+%%FONTSDIR%%/MonaspaceNeon-WideRegular.otf
+%%FONTSDIR%%/MonaspaceNeon-WideSemiBold.otf
+%%FONTSDIR%%/MonaspaceNeon-WideSemiBoldItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-Bold.otf
+%%FONTSDIR%%/MonaspaceRadon-BoldItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-ExtraBold.otf
+%%FONTSDIR%%/MonaspaceRadon-ExtraBoldItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-ExtraLight.otf
+%%FONTSDIR%%/MonaspaceRadon-ExtraLightItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-Italic.otf
+%%FONTSDIR%%/MonaspaceRadon-Light.otf
+%%FONTSDIR%%/MonaspaceRadon-LightItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-Medium.otf
+%%FONTSDIR%%/MonaspaceRadon-MediumItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-Regular.otf
+%%FONTSDIR%%/MonaspaceRadon-SemiBold.otf
+%%FONTSDIR%%/MonaspaceRadon-SemiBoldItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-SemiWideBold.otf
+%%FONTSDIR%%/MonaspaceRadon-SemiWideBoldItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-SemiWideExtraBold.otf
+%%FONTSDIR%%/MonaspaceRadon-SemiWideExtraBoldItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-SemiWideExtraLight.otf
+%%FONTSDIR%%/MonaspaceRadon-SemiWideExtraLightItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-SemiWideItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-SemiWideLight.otf
+%%FONTSDIR%%/MonaspaceRadon-SemiWideLightItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-SemiWideMedium.otf
+%%FONTSDIR%%/MonaspaceRadon-SemiWideMediumItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-SemiWideRegular.otf
+%%FONTSDIR%%/MonaspaceRadon-SemiWideSemiBold.otf
+%%FONTSDIR%%/MonaspaceRadon-SemiWideSemiBoldItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-WideBold.otf
+%%FONTSDIR%%/MonaspaceRadon-WideBoldItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-WideExtraBold.otf
+%%FONTSDIR%%/MonaspaceRadon-WideExtraBoldItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-WideExtraLight.otf
+%%FONTSDIR%%/MonaspaceRadon-WideExtraLightItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-WideItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-WideLight.otf
+%%FONTSDIR%%/MonaspaceRadon-WideLightItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-WideMedium.otf
+%%FONTSDIR%%/MonaspaceRadon-WideMediumItalic.otf
+%%FONTSDIR%%/MonaspaceRadon-WideRegular.otf
+%%FONTSDIR%%/MonaspaceRadon-WideSemiBold.otf
+%%FONTSDIR%%/MonaspaceRadon-WideSemiBoldItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-Bold.otf
+%%FONTSDIR%%/MonaspaceXenon-BoldItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-ExtraBold.otf
+%%FONTSDIR%%/MonaspaceXenon-ExtraBoldItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-ExtraLight.otf
+%%FONTSDIR%%/MonaspaceXenon-ExtraLightItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-Italic.otf
+%%FONTSDIR%%/MonaspaceXenon-Light.otf
+%%FONTSDIR%%/MonaspaceXenon-LightItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-Medium.otf
+%%FONTSDIR%%/MonaspaceXenon-MediumItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-Regular.otf
+%%FONTSDIR%%/MonaspaceXenon-SemiBold.otf
+%%FONTSDIR%%/MonaspaceXenon-SemiBoldItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-SemiWideBold.otf
+%%FONTSDIR%%/MonaspaceXenon-SemiWideBoldItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-SemiWideExtraBold.otf
+%%FONTSDIR%%/MonaspaceXenon-SemiWideExtraBoldItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-SemiWideExtraLight.otf
+%%FONTSDIR%%/MonaspaceXenon-SemiWideExtraLightItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-SemiWideItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-SemiWideLight.otf
+%%FONTSDIR%%/MonaspaceXenon-SemiWideLightItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-SemiWideMedium.otf
+%%FONTSDIR%%/MonaspaceXenon-SemiWideMediumItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-SemiWideRegular.otf
+%%FONTSDIR%%/MonaspaceXenon-SemiWideSemiBold.otf
+%%FONTSDIR%%/MonaspaceXenon-SemiWideSemiBoldItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-WideBold.otf
+%%FONTSDIR%%/MonaspaceXenon-WideBoldItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-WideExtraBold.otf
+%%FONTSDIR%%/MonaspaceXenon-WideExtraBoldItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-WideExtraLight.otf
+%%FONTSDIR%%/MonaspaceXenon-WideExtraLightItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-WideItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-WideLight.otf
+%%FONTSDIR%%/MonaspaceXenon-WideLightItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-WideMedium.otf
+%%FONTSDIR%%/MonaspaceXenon-WideMediumItalic.otf
+%%FONTSDIR%%/MonaspaceXenon-WideRegular.otf
+%%FONTSDIR%%/MonaspaceXenon-WideSemiBold.otf
+%%FONTSDIR%%/MonaspaceXenon-WideSemiBoldItalic.otf