On Mon, 1 Jun 2020, at 11:00, Edd Barrett wrote:
> That should be OK, but it'd be better to use a diff out of cvs though.
Of course and it's something that I will need to do some
self-development on. I might flip-flop if I can't get it to work for
me.
> Sorry to be a pain, but can you send a diff which does only the
> update and without any structural changes to the port directories.
>
> As soon as you start moving things around in the ports tree, there are
> implications for `pkg_add -u` (you would at least need some @pkgpath
> markers in PLISTs). We don't want to get involved in that just yet.
Sure, new patch attached. As you are going for a more conservative
upgrade I will also keep ttf as the format for now.
I have a concern that this may cause confusion given -term being renamed
to -fixed. Is there a mechanism to handle this in ports for those doing
a `pkg_add -u`? i.e. those upgrading iosevka-term receive a note about
probably wanting iosevka-fixed.
> I don't know much about ttc fonts. Are they as widely supported as ttf?
> If you want to replace ttf with ttc, at the very least they should work
> with freetype/fontconfig and thus with common applications like xterm,
> gimp, inkscape etc.
I had similar reservations but I've used fc-match(1), fc-list(1),
Firefox, Gimp and OpenOffice and all have worked with ttc.
TTC is similar to TTF with the C standing for collection. It therefore
results in a lot fewer files. Take, for example iosevka-regular.ttc,
here is the fc-list output:
iosevka-regular.ttc: Iosevka,Iosevka Extended Oblique:style=Extended
Oblique,Regular
iosevka-regular.ttc: Iosevka,Iosevka Extended:style=Extended Italic,Italic
iosevka-regular.ttc: Iosevka,Iosevka Extended:style=Extended,Regular
iosevka-regular.ttc: Iosevka,Iosevka Oblique:style=Oblique,Regular
iosevka-regular.ttc: Iosevka:style=Italic
iosevka-regular.ttc: Iosevka:style=Regular
The shared structure also seems to have the nice benefit of large disk
space savings.
Patch follows.
Index: Makefile
===================================================================
RCS file: /cvs/ports/fonts/iosevka-fonts/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 6 Mar 2020 19:32:35 -0000 1.1.1.1
+++ Makefile 1 Jun 2020 12:05:42 -0000
@@ -3,7 +3,7 @@
COMMENT-main = slender typeface for code (default variant)
COMMENT-term = slender typeface for code (term variant)
-V = 2.3.3
+V = 3.0.1
PKGNAME = iosevka-fonts-default-${V}
PKGNAME-main = ${PKGNAME}
PKGNAME-term = iosevka-fonts-term-${V}
@@ -12,8 +12,8 @@ PKGNAME-term = iosevka-fonts-term-${V}
# variant (for general use) and the 'term' variant (designed for monospace
# terminals), but more could be added later if need be. See the releases page
# on Github for a complete list.
-DISTFILES = 01-iosevka-${V}${EXTRACT_SUFX} \
- 02-iosevka-term-${V}${EXTRACT_SUFX}
+DISTFILES = ttf-iosevka-${V}${EXTRACT_SUFX} \
+ ttf-iosevka-term-${V}${EXTRACT_SUFX}
CATEGORIES = fonts x11
Index: distinfo
===================================================================
RCS file: /cvs/ports/fonts/iosevka-fonts/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 6 Mar 2020 19:32:35 -0000 1.1.1.1
+++ distinfo 1 Jun 2020 12:05:42 -0000
@@ -1,4 +1,4 @@
-SHA256 (01-iosevka-2.3.3.zip) = zI3jyld7ih1JR9zN//ggUELkefAiOldN41kn4T9Qb5A=
-SHA256 (02-iosevka-term-2.3.3.zip) =
APzmF0BfzNf79zFtrdP2s8yx4nbykQ6anN4S4/BYtNc=
-SIZE (01-iosevka-2.3.3.zip) = 20624208
-SIZE (02-iosevka-term-2.3.3.zip) = 16093865
+SHA256 (ttf-iosevka-3.0.1.zip) = IkQjAvkPV6F0pru7DHlxvDei5KT2bHy30RRHqrcHL60=
+SHA256 (ttf-iosevka-term-3.0.1.zip) =
u6MwLYU09iOscg5lvGFT8uYbJHLOGvPau5r7RraaEkE=
+SIZE (ttf-iosevka-3.0.1.zip) = 51994994
+SIZE (ttf-iosevka-term-3.0.1.zip) = 51924935
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/fonts/iosevka-fonts/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-main
--- pkg/PLIST-main 6 Mar 2020 19:32:35 -0000 1.1.1.1
+++ pkg/PLIST-main 1 Jun 2020 12:05:42 -0000
@@ -4,6 +4,33 @@ share/fonts/
share/fonts/iosevka/iosevka-bold.ttf
share/fonts/iosevka/iosevka-bolditalic.ttf
share/fonts/iosevka/iosevka-boldoblique.ttf
+share/fonts/iosevka/iosevka-extended.ttf
+share/fonts/iosevka/iosevka-extendedbold.ttf
+share/fonts/iosevka/iosevka-extendedbolditalic.ttf
+share/fonts/iosevka/iosevka-extendedboldoblique.ttf
+share/fonts/iosevka/iosevka-extendedextrabold.ttf
+share/fonts/iosevka/iosevka-extendedextrabolditalic.ttf
+share/fonts/iosevka/iosevka-extendedextraboldoblique.ttf
+share/fonts/iosevka/iosevka-extendedextralight.ttf
+share/fonts/iosevka/iosevka-extendedextralightitalic.ttf
+share/fonts/iosevka/iosevka-extendedextralightoblique.ttf
+share/fonts/iosevka/iosevka-extendedheavy.ttf
+share/fonts/iosevka/iosevka-extendedheavyitalic.ttf
+share/fonts/iosevka/iosevka-extendedheavyoblique.ttf
+share/fonts/iosevka/iosevka-extendeditalic.ttf
+share/fonts/iosevka/iosevka-extendedlight.ttf
+share/fonts/iosevka/iosevka-extendedlightitalic.ttf
+share/fonts/iosevka/iosevka-extendedlightoblique.ttf
+share/fonts/iosevka/iosevka-extendedmedium.ttf
+share/fonts/iosevka/iosevka-extendedmediumitalic.ttf
+share/fonts/iosevka/iosevka-extendedmediumoblique.ttf
+share/fonts/iosevka/iosevka-extendedoblique.ttf
+share/fonts/iosevka/iosevka-extendedsemibold.ttf
+share/fonts/iosevka/iosevka-extendedsemibolditalic.ttf
+share/fonts/iosevka/iosevka-extendedsemiboldoblique.ttf
+share/fonts/iosevka/iosevka-extendedthin.ttf
+share/fonts/iosevka/iosevka-extendedthinitalic.ttf
+share/fonts/iosevka/iosevka-extendedthinoblique.ttf
share/fonts/iosevka/iosevka-extrabold.ttf
share/fonts/iosevka/iosevka-extrabolditalic.ttf
share/fonts/iosevka/iosevka-extraboldoblique.ttf
Index: pkg/PLIST-term
===================================================================
RCS file: /cvs/ports/fonts/iosevka-fonts/pkg/PLIST-term,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-term
--- pkg/PLIST-term 6 Mar 2020 19:32:35 -0000 1.1.1.1
+++ pkg/PLIST-term 1 Jun 2020 12:05:42 -0000
@@ -4,6 +4,33 @@ share/fonts/
share/fonts/iosevka/iosevka-term-bold.ttf
share/fonts/iosevka/iosevka-term-bolditalic.ttf
share/fonts/iosevka/iosevka-term-boldoblique.ttf
+share/fonts/iosevka/iosevka-term-extended.ttf
+share/fonts/iosevka/iosevka-term-extendedbold.ttf
+share/fonts/iosevka/iosevka-term-extendedbolditalic.ttf
+share/fonts/iosevka/iosevka-term-extendedboldoblique.ttf
+share/fonts/iosevka/iosevka-term-extendedextrabold.ttf
+share/fonts/iosevka/iosevka-term-extendedextrabolditalic.ttf
+share/fonts/iosevka/iosevka-term-extendedextraboldoblique.ttf
+share/fonts/iosevka/iosevka-term-extendedextralight.ttf
+share/fonts/iosevka/iosevka-term-extendedextralightitalic.ttf
+share/fonts/iosevka/iosevka-term-extendedextralightoblique.ttf
+share/fonts/iosevka/iosevka-term-extendedheavy.ttf
+share/fonts/iosevka/iosevka-term-extendedheavyitalic.ttf
+share/fonts/iosevka/iosevka-term-extendedheavyoblique.ttf
+share/fonts/iosevka/iosevka-term-extendeditalic.ttf
+share/fonts/iosevka/iosevka-term-extendedlight.ttf
+share/fonts/iosevka/iosevka-term-extendedlightitalic.ttf
+share/fonts/iosevka/iosevka-term-extendedlightoblique.ttf
+share/fonts/iosevka/iosevka-term-extendedmedium.ttf
+share/fonts/iosevka/iosevka-term-extendedmediumitalic.ttf
+share/fonts/iosevka/iosevka-term-extendedmediumoblique.ttf
+share/fonts/iosevka/iosevka-term-extendedoblique.ttf
+share/fonts/iosevka/iosevka-term-extendedsemibold.ttf
+share/fonts/iosevka/iosevka-term-extendedsemibolditalic.ttf
+share/fonts/iosevka/iosevka-term-extendedsemiboldoblique.ttf
+share/fonts/iosevka/iosevka-term-extendedthin.ttf
+share/fonts/iosevka/iosevka-term-extendedthinitalic.ttf
+share/fonts/iosevka/iosevka-term-extendedthinoblique.ttf
share/fonts/iosevka/iosevka-term-extrabold.ttf
share/fonts/iosevka/iosevka-term-extrabolditalic.ttf
share/fonts/iosevka/iosevka-term-extraboldoblique.ttf
