I just noticed that the distfiles for these fonts isn't versioned, which
is creating problems for the bulk build systems.

Here's a simple patch that'll create ugly versioned filenames.  (I
wasn't able to easily trick it into FONT-VER-SUFFIX order.)

OK?


Index: fonts/nerd-fonts/Makefile.inc
===================================================================
RCS file: /cvs/openbsd/ports/fonts/nerd-fonts/Makefile.inc,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile.inc
--- fonts/nerd-fonts/Makefile.inc       28 Aug 2023 17:33:12 -0000      1.3
+++ fonts/nerd-fonts/Makefile.inc       29 Aug 2023 06:04:57 -0000
@@ -13,7 +13,7 @@ HOMEPAGE =    https://www.nerdfonts.com/
 PERMIT_PACKAGE =       Yes
 
 MASTER_SITES =         
https://github.com/ryanoasis/${NF_PROJECT}/releases/download/v${VERSION}/
-DISTFILES =            ${NF_FONT}${EXTRACT_SUFX}
+DISTFILES =            ${VERSION}-{}${NF_FONT}${EXTRACT_SUFX}
 EXTRACT_SUFX =         .zip
 
 MODULES =              font
Index: fonts/nerd-fonts/codenewroman/distinfo
===================================================================
RCS file: /cvs/openbsd/ports/fonts/nerd-fonts/codenewroman/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- fonts/nerd-fonts/codenewroman/distinfo      28 Aug 2023 17:33:13 -0000      
1.2
+++ fonts/nerd-fonts/codenewroman/distinfo      29 Aug 2023 05:58:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (nerd-fonts/CodeNewRoman.zip) = 
pdyRgIfHdnIIYOyPv4e6akOXXJEBOsCXE2bwAySIhlE=
-SIZE (nerd-fonts/CodeNewRoman.zip) = 24027055
+SHA256 (nerd-fonts/3.0.2-CodeNewRoman.zip) = 
pdyRgIfHdnIIYOyPv4e6akOXXJEBOsCXE2bwAySIhlE=
+SIZE (nerd-fonts/3.0.2-CodeNewRoman.zip) = 24027055
Index: fonts/nerd-fonts/dejavusansmono/distinfo
===================================================================
RCS file: /cvs/openbsd/ports/fonts/nerd-fonts/dejavusansmono/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- fonts/nerd-fonts/dejavusansmono/distinfo    28 Aug 2023 17:33:13 -0000      
1.2
+++ fonts/nerd-fonts/dejavusansmono/distinfo    29 Aug 2023 05:58:46 -0000
@@ -1,2 +1,2 @@
-SHA256 (nerd-fonts/DejaVuSansMono.zip) = 
6ptXDurNCmjqUtaaVplnjo96ryhQK37ZREk3h62+uPA=
-SIZE (nerd-fonts/DejaVuSansMono.zip) = 14320668
+SHA256 (nerd-fonts/3.0.2-DejaVuSansMono.zip) = 
6ptXDurNCmjqUtaaVplnjo96ryhQK37ZREk3h62+uPA=
+SIZE (nerd-fonts/3.0.2-DejaVuSansMono.zip) = 14320668
Index: fonts/nerd-fonts/fantasquesansmono/distinfo
===================================================================
RCS file: /cvs/openbsd/ports/fonts/nerd-fonts/fantasquesansmono/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- fonts/nerd-fonts/fantasquesansmono/distinfo 28 Aug 2023 17:33:13 -0000      
1.2
+++ fonts/nerd-fonts/fantasquesansmono/distinfo 29 Aug 2023 05:58:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (nerd-fonts/FantasqueSansMono.zip) = 
qqKnbfgFvupkfpkF5EZOctESGT5h/cflLH2gLSgONsE=
-SIZE (nerd-fonts/FantasqueSansMono.zip) = 13177355
+SHA256 (nerd-fonts/3.0.2-FantasqueSansMono.zip) = 
qqKnbfgFvupkfpkF5EZOctESGT5h/cflLH2gLSgONsE=
+SIZE (nerd-fonts/3.0.2-FantasqueSansMono.zip) = 13177355
Index: fonts/nerd-fonts/noto/distinfo
===================================================================
RCS file: /cvs/openbsd/ports/fonts/nerd-fonts/noto/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- fonts/nerd-fonts/noto/distinfo      28 Aug 2023 17:33:13 -0000      1.2
+++ fonts/nerd-fonts/noto/distinfo      29 Aug 2023 05:59:32 -0000
@@ -1,2 +1,2 @@
-SHA256 (nerd-fonts/Noto.zip) = B1kn4XJck+/ZuiMEmdmCkVWfRTVrC1ax5UXsPtqUam8=
-SIZE (nerd-fonts/Noto.zip) = 481271009
+SHA256 (nerd-fonts/3.0.2-Noto.zip) = 
B1kn4XJck+/ZuiMEmdmCkVWfRTVrC1ax5UXsPtqUam8=
+SIZE (nerd-fonts/3.0.2-Noto.zip) = 481271009
Index: fonts/nerd-fonts/profont/distinfo
===================================================================
RCS file: /cvs/openbsd/ports/fonts/nerd-fonts/profont/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- fonts/nerd-fonts/profont/distinfo   28 Aug 2023 17:33:13 -0000      1.2
+++ fonts/nerd-fonts/profont/distinfo   29 Aug 2023 05:59:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (nerd-fonts/ProFont.zip) = PaM55I5tFS4p94udx6CLCgM4OXvNTwE35n/orQ5hjZw=
-SIZE (nerd-fonts/ProFont.zip) = 6075996
+SHA256 (nerd-fonts/3.0.2-ProFont.zip) = 
PaM55I5tFS4p94udx6CLCgM4OXvNTwE35n/orQ5hjZw=
+SIZE (nerd-fonts/3.0.2-ProFont.zip) = 6075996
Index: fonts/nerd-fonts/terminus/distinfo
===================================================================
RCS file: /cvs/openbsd/ports/fonts/nerd-fonts/terminus/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- fonts/nerd-fonts/terminus/distinfo  28 Aug 2023 17:33:13 -0000      1.2
+++ fonts/nerd-fonts/terminus/distinfo  29 Aug 2023 05:59:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (nerd-fonts/Terminus.zip) = XZj6YdouxQECG2Idz8nYeoHuX0sjO+W2MFMstNdtN/I=
-SIZE (nerd-fonts/Terminus.zip) = 13126176
+SHA256 (nerd-fonts/3.0.2-Terminus.zip) = 
XZj6YdouxQECG2Idz8nYeoHuX0sjO+W2MFMstNdtN/I=
+SIZE (nerd-fonts/3.0.2-Terminus.zip) = 13126176
Index: fonts/nerd-fonts/ubuntu/distinfo
===================================================================
RCS file: /cvs/openbsd/ports/fonts/nerd-fonts/ubuntu/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- fonts/nerd-fonts/ubuntu/distinfo    28 Aug 2023 17:33:13 -0000      1.2
+++ fonts/nerd-fonts/ubuntu/distinfo    29 Aug 2023 05:59:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (nerd-fonts/Ubuntu.zip) = yxsTT/1nxIShLZY6qofdDD2CNM5ih3xJcWdnq+8Nklw=
-SIZE (nerd-fonts/Ubuntu.zip) = 20036870
+SHA256 (nerd-fonts/3.0.2-Ubuntu.zip) = 
yxsTT/1nxIShLZY6qofdDD2CNM5ih3xJcWdnq+8Nklw=
+SIZE (nerd-fonts/3.0.2-Ubuntu.zip) = 20036870
Index: fonts/nerd-fonts/ubuntu-mono/distinfo
===================================================================
RCS file: /cvs/openbsd/ports/fonts/nerd-fonts/ubuntu-mono/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- fonts/nerd-fonts/ubuntu-mono/distinfo       28 Aug 2023 17:33:13 -0000      
1.2
+++ fonts/nerd-fonts/ubuntu-mono/distinfo       29 Aug 2023 05:59:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (nerd-fonts/UbuntuMono.zip) = 
KWbfW2nM82QhA8UEEpfPHGSLICMtVgGSSZeKdr4BioE=
-SIZE (nerd-fonts/UbuntuMono.zip) = 12801832
+SHA256 (nerd-fonts/3.0.2-UbuntuMono.zip) = 
KWbfW2nM82QhA8UEEpfPHGSLICMtVgGSSZeKdr4BioE=
+SIZE (nerd-fonts/3.0.2-UbuntuMono.zip) = 12801832




On 2023 Jun 06 (Tue) at 00:38:25 +0200 (+0200), Joel Carnat wrote:
:Hi,
:
:Nerd-Fonts have got a bunch of updates.
:Looking at the release note, the big things are :
:1. (...) fixes some long standing issues that are due to the naming of the
:fonts.
:2. The old Material Design Icon codepoints are finally dropped.
:
:portcheck says:
:# /usr/ports/infrastructure/bin/portcheck
:1 line(s) longer than 80 chars in Makefile.inc
:extra file: codenewroman/pkg/PLIST.orig
:extra file: dejavusansmono/pkg/PLIST.orig
:extra file: fantasquesansmono/pkg/PLIST.orig
:extra file: noto/pkg/PLIST.orig
:extra file: profont/pkg/PLIST.orig
:extra file: terminus/pkg/PLIST.orig
:extra file: ubuntu/pkg/PLIST.orig
:extra file: ubuntu-mono/pkg/PLIST.orig
:fonts/nerd-fonts
:
:I'm only using CodeNewRoman.
:I tested it with tmux and vim on xterm and alacritty.
:I also tested it with mousepad.
:I didn't notice any drawbacks.
:
:The diff is attached.
:
:Take care,
:Joel C.

Reply via email to