Date: Tue, 7 May 2024 19:26:28 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ac8a8a98c1a7 - main - x11-fonts/fira: Simplify port Message-ID: <202405071926.447JQS3j087756@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ac8a8a98c1a76070d4be08b292cca599ef1ab3f1 commit ac8a8a98c1a76070d4be08b292cca599ef1ab3f1 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2024-05-07 18:19:48 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2024-05-07 19:26:02 +0000 x11-fonts/fira: Simplify port * Just extract what we really need which makes it cleaner and reduces I/O. * Drop DOCS option * Remove reference of www/fira-webfont (pointed out by maintainer) PR: 278793 Reviewed by: Trenton Schulz <trueos@norwegianrockcat.com> (maintainer) --- x11-fonts/fira/Makefile | 30 ++++++++++++++---------------- x11-fonts/fira/files/pkg-message.in | 1 - 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/x11-fonts/fira/Makefile b/x11-fonts/fira/Makefile index b61e79a4d8dc..22aab45cf36b 100644 --- a/x11-fonts/fira/Makefile +++ b/x11-fonts/fira/Makefile @@ -1,6 +1,6 @@ PORTNAME= fira -PORTVERSION= 4.301 -PORTREVISION= 1 +DISTVERSION= 4.301 +PORTREVISION= 2 CATEGORIES= x11-fonts MAINTAINER= trueos@norwegianrockcat.com @@ -9,30 +9,28 @@ WWW= https://bboxtype.com/typefaces/FiraSans/ LICENSE= OFL11 -USES= fonts xorg -USE_XORG= x11 +USES= fonts + +EXTRACT_AFTER_ARGS= --include ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/Fira_Code_3_2/Fonts/FiraCode_OTF_32/*.otf \ + --include ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/Fira_Mono_3_2/Fonts/FiraMono_OTF_32/*.otf \ + --include ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/Fira_Sans_4_3/Fonts/Fira_Sans_OTF_4301 \ + --strip-components 4 \ + --no-same-owner --no-same-permissions + USE_GITHUB= yes GH_ACCOUNT= bBoxType GH_PROJECT= FiraSans GH_TAGNAME= f54eeb3 + NO_ARCH= yes NO_BUILD= yes +NO_WRKSUBDIR= yes SUB_FILES= pkg-message -PORTDOCS= *.pdf *.rtf - -OPTIONS_DEFINE= DOCS - do-install: @${MKDIR} ${STAGEDIR}${FONTSDIR} - ${FIND} ${WRKSRC}/Fira* -type f -name \*.otf | while read f; do \ - ${INSTALL_DATA} $$f ${STAGEDIR}${FONTSDIR} ; done - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/Fira*/PDF/*.pdf ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/Fira_Sans_4_3/Fira_4_3_Change_Log.rtf \ - ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.otf ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/*/*/*.otf ${STAGEDIR}${FONTSDIR} .include <bsd.port.mk> diff --git a/x11-fonts/fira/files/pkg-message.in b/x11-fonts/fira/files/pkg-message.in index d84b4a24f1a3..8a84c5917ac9 100644 --- a/x11-fonts/fira/files/pkg-message.in +++ b/x11-fonts/fira/files/pkg-message.in @@ -17,7 +17,6 @@ or https://www.fontfont.com/staticcontent/downloads/FF_OT_User_Guide.pdf http://en.wikipedia.org/wiki/List_of_typographic_features -For Web Font please use www/fira-webfont port. EOM } ]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405071926.447JQS3j087756>