G6 LZs6J8hUNGbMP6vtzuYBnID/ocHLB4k+PrNqdiK7mlE7qRHDK4Et9ZsjmTG/LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715109989; a=rsa-sha256; cv=none; b=tkmwxX/vyRx2wiUwt1SP+SC1gTMTPNvuZ5NxUHNPTGo1vCdQThuyira2MubbnztSMt2lRP GVzQ2CibipPQNTAuoW5EPk558/v9Qaq2V9DIgks/qErNEqRw2OrJ8UjF9aQYHlEksvT/w4 9FYS98r6NpjA73q2pNiYxgC4l5YyNYxKC1nMEzGorW6WDBcJHFIghMRax56ME4Y92d0VgI WnjGQxrOFEXk8fT2L2cJWAtDIkjN/iWpNmgJOG+r6/IkEN+/NiG5wUhX835rLZyle6UJfO enYX6/Uxqpbu8Afg6kNyMZ3sM1Tu3ezMg4RkpOyTAYsmVQw04vpV2zGPDyRV9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715109989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3yo2TEsqKEis+6d8anJhyB4zv3wkiLErbWVLD77SJmM=; b=SUjMZ0cFeXQZoMXGV1fw0XizRtL8CgExZJkJg4/bPVr0iSYjHvH9PG2cazaNWdWhzcdYKZ v8kHz9qtj9epd42z0RdyXYhpZvtqb7zNq31e4E/ZGWenyoQAJBAmZavYINYnffWG+kYIUr 8Eor/3vtHxH2V//GJcEXNr4eUoFRE1iDYDkWgIcVwrfuJvTrIP+7mHS9a0vrYsvuODCsPB aT85tNaH54jZy0kBD8Th6r+4Hg2h29UjwSwCCn+EW2MfDcxo9/Gp8UV/pHRO9KTaHy/73k ZO3xxEbSuQryDXVR+GGytioA+H5kEjOX3Hc8LeoTP+KQMDXVlV06RcFl/kSMpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VYpDP0RzQztYf; Tue, 7 May 2024 19:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 447JQSSM087759; Tue, 7 May 2024 19:26:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 447JQS3j087756; Tue, 7 May 2024 19:26:28 GMT (envelope-from git) Date: Tue, 7 May 2024 19:26:28 GMT Message-Id: <202405071926.447JQS3j087756@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: ac8a8a98c1a7 - main - x11-fonts/fira: Simplify port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac8a8a98c1a76070d4be08b292cca599ef1ab3f1 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ac8a8a98c1a76070d4be08b292cca599ef1ab3f1 commit ac8a8a98c1a76070d4be08b292cca599ef1ab3f1 Author: Daniel Engberg AuthorDate: 2024-05-07 18:19:48 +0000 Commit: Daniel Engberg 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 (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 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 } ]