Hi Edd,
On Sun, 31 May 2020, at 09:39, Edd Barrett wrote:
> I'm indifferent as to whether we use subdirs or multi-packages, but I'd
> appreciate the update commit being separate from adding more families.
>
> Perhaps we can do the update to 3.0.1 first?
Sure.
> (FWIW: I use only the term variant of this font -- that's the one I
> expected most users to want too)
FYI v2's term became v3's fixed. v3's term is more like v2's TermLig
I got frustrated with CVS and just produced the patch by diff-ing two
directories. Hope that's okay.
This version includes slab for the purposes of just showing how subdir
can work in this context. You can easily remove SUBDIR += slab from
Makefile and the slab directory so that just the default family is in
the update.
Another change was to use the ttc files instead of ttf. That results in
a much smaller footprint overall. Let me know if this is unacceptable.
It looks like adding new families will be pretty clean with this
approach.
diff -uNpr ports_cvs/fonts/iosevka/Makefile ports_cvs_mytree/fonts/iosevka/Makefile
--- ports_cvs/fonts/iosevka/Makefile Thu Jan 1 01:00:00 1970
+++ ports_cvs_mytree/fonts/iosevka/Makefile Mon Jun 1 09:46:49 2020
@@ -0,0 +1,7 @@
+# $OpenBSD$
+
+SUBDIR =
+SUBDIR += main
+SUBDIR += slab
+
+.include <bsd.port.subdir.mk>
diff -uNpr ports_cvs/fonts/iosevka/Makefile.inc ports_cvs_mytree/fonts/iosevka/Makefile.inc
--- ports_cvs/fonts/iosevka/Makefile.inc Thu Jan 1 01:00:00 1970
+++ ports_cvs_mytree/fonts/iosevka/Makefile.inc Mon Jun 1 09:46:49 2020
@@ -0,0 +1,33 @@
+# $OpenBSD$
+
+V ?= 3.0.1
+DISTNAME ?= iosevka${IOSEVKA_FAMILY}-${V}
+REVISION ?= 0
+
+DISTFILES ?= ttc-${DISTNAME}${EXTRACT_SUFX}
+
+CATEGORIES ?= fonts
+
+HOMEPAGE ?= https://typeof.net/Iosevka/
+
+MAINTAINER ?= Edd Barrett <edd@openbsd.org>
+
+# SIL OFL 1.1
+PERMIT_PACKAGE ?= Yes
+
+MASTER_SITES ?= https://github.com/be5invis/iosevka/releases/download/v${V}/
+EXTRACT_SUFX ?= .zip
+
+NO_BUILD ?= Yes
+NO_TEST ?= Yes
+
+# distfile is a zip bomb.
+WRKDIST = ${WRKDIR}
+
+PKG_ARCH ?= *
+
+FONTDIR ?= ${PREFIX}/share/fonts/iosevka
+
+do-install:
+ ${INSTALL_DATA_DIR} ${FONTDIR}
+ ${INSTALL_DATA} ${WRKDIST}/*.ttc ${FONTDIR}
diff -uNpr ports_cvs/fonts/iosevka/main/Makefile ports_cvs_mytree/fonts/iosevka/main/Makefile
--- ports_cvs/fonts/iosevka/main/Makefile Thu Jan 1 01:00:00 1970
+++ ports_cvs_mytree/fonts/iosevka/main/Makefile Mon Jun 1 09:46:49 2020
@@ -0,0 +1,5 @@
+# $OpenBSD$
+
+COMMENT = slender typeface for code (default family)
+
+.include <bsd.port.mk>
diff -uNpr ports_cvs/fonts/iosevka/main/distinfo ports_cvs_mytree/fonts/iosevka/main/distinfo
--- ports_cvs/fonts/iosevka/main/distinfo Thu Jan 1 01:00:00 1970
+++ ports_cvs_mytree/fonts/iosevka/main/distinfo Mon Jun 1 09:46:49 2020
@@ -0,0 +1,2 @@
+SHA256 (ttc-iosevka-3.0.1.zip) = XmYZjHH15Lass4P6ryUK8iUUZTQhY7LY7iyxVJldhE8=
+SIZE (ttc-iosevka-3.0.1.zip) = 14481971
diff -uNpr ports_cvs/fonts/iosevka/main/pkg/DESCR ports_cvs_mytree/fonts/iosevka/main/pkg/DESCR
--- ports_cvs/fonts/iosevka/main/pkg/DESCR Thu Jan 1 01:00:00 1970
+++ ports_cvs_mytree/fonts/iosevka/main/pkg/DESCR Mon Jun 1 09:46:49 2020
@@ -0,0 +1,17 @@
+Coders' typeface, built from code.
+
+The default family which comes with two further variants: terminal and fixed.
+
+ - Iosevka comes with ligatures. Various symbols, like arrows and geometric,
+ are wide (2-column).
+
+ - Iosevka Term is a narrower variant focusing on terminal uses. Arrows and
+ geometric symbols will be narrow to follow typical terminal usages.
+
+ - Iosevka Fixed is an exact monospace font without ligatures and wide
+ glyphs. Since some environments cannot interpret Iosevka or Iosevka Term
+ as monospace, and have difficulties with ligatures included, you can use
+ Iosevka Fixed as an alternative.
+
+Included are weights 1-9 with italic, oblique and extended styles as well as
+various stylistic sets that can be enabled by toggling font features.
diff -uNpr ports_cvs/fonts/iosevka/main/pkg/PLIST ports_cvs_mytree/fonts/iosevka/main/pkg/PLIST
--- ports_cvs/fonts/iosevka/main/pkg/PLIST Thu Jan 1 01:00:00 1970
+++ ports_cvs_mytree/fonts/iosevka/main/pkg/PLIST Mon Jun 1 09:46:49 2020
@@ -0,0 +1,12 @@
+@comment $OpenBSD$
+share/fonts/
+@fontdir share/fonts/iosevka/
+share/fonts/iosevka/iosevka-bold.ttc
+share/fonts/iosevka/iosevka-extrabold.ttc
+share/fonts/iosevka/iosevka-extralight.ttc
+share/fonts/iosevka/iosevka-heavy.ttc
+share/fonts/iosevka/iosevka-light.ttc
+share/fonts/iosevka/iosevka-medium.ttc
+share/fonts/iosevka/iosevka-regular.ttc
+share/fonts/iosevka/iosevka-semibold.ttc
+share/fonts/iosevka/iosevka-thin.ttc
diff -uNpr ports_cvs/fonts/iosevka/slab/Makefile ports_cvs_mytree/fonts/iosevka/slab/Makefile
--- ports_cvs/fonts/iosevka/slab/Makefile Thu Jan 1 01:00:00 1970
+++ ports_cvs_mytree/fonts/iosevka/slab/Makefile Mon Jun 1 09:46:49 2020
@@ -0,0 +1,6 @@
+# $OpenBSD$
+
+COMMENT = slender typeface for code (slab family)
+IOSEVKA_FAMILY = -slab
+
+.include <bsd.port.mk>
diff -uNpr ports_cvs/fonts/iosevka/slab/distinfo ports_cvs_mytree/fonts/iosevka/slab/distinfo
--- ports_cvs/fonts/iosevka/slab/distinfo Thu Jan 1 01:00:00 1970
+++ ports_cvs_mytree/fonts/iosevka/slab/distinfo Mon Jun 1 09:46:49 2020
@@ -0,0 +1,2 @@
+SHA256 (ttc-iosevka-slab-3.0.1.zip) = Jf3/CJeuxLhV7oTfz3vL04yuia7Bd5wyMfReV4JWWYE=
+SIZE (ttc-iosevka-slab-3.0.1.zip) = 15475268
diff -uNpr ports_cvs/fonts/iosevka/slab/pkg/DESCR ports_cvs_mytree/fonts/iosevka/slab/pkg/DESCR
--- ports_cvs/fonts/iosevka/slab/pkg/DESCR Thu Jan 1 01:00:00 1970
+++ ports_cvs_mytree/fonts/iosevka/slab/pkg/DESCR Mon Jun 1 09:46:49 2020
@@ -0,0 +1,17 @@
+Coders' typeface, built from code.
+
+The slab family which comes with two further variants: terminal and fixed.
+
+ - Iosevka Slab comes with ligatures. Various symbols, like arrows and
+ geometric, are wide (2-column).
+
+ - Iosevka Slab Term is a narrower variant focusing on terminal uses. Arrows
+ and geometric symbols will be narrow to follow typical terminal usages.
+
+ - Iosevka Slab Fixed is an exact monospace font without ligatures and wide
+ glyphs. Since some environments cannot interpret Iosevka or Iosevka Term
+ as monospace, and have difficulties with ligatures included, you can use
+ Iosevka Fixed as an alternative.
+
+Included are weights 1-9 with italic, oblique and extended styles as well as
+various stylistic sets that can be enabled by toggling font features.
diff -uNpr ports_cvs/fonts/iosevka/slab/pkg/PLIST ports_cvs_mytree/fonts/iosevka/slab/pkg/PLIST
--- ports_cvs/fonts/iosevka/slab/pkg/PLIST Thu Jan 1 01:00:00 1970
+++ ports_cvs_mytree/fonts/iosevka/slab/pkg/PLIST Mon Jun 1 09:46:49 2020
@@ -0,0 +1,12 @@
+@comment $OpenBSD$
+share/fonts/
+@fontdir share/fonts/iosevka/
+share/fonts/iosevka/iosevka-slab-bold.ttc
+share/fonts/iosevka/iosevka-slab-extrabold.ttc
+share/fonts/iosevka/iosevka-slab-extralight.ttc
+share/fonts/iosevka/iosevka-slab-heavy.ttc
+share/fonts/iosevka/iosevka-slab-light.ttc
+share/fonts/iosevka/iosevka-slab-medium.ttc
+share/fonts/iosevka/iosevka-slab-regular.ttc
+share/fonts/iosevka/iosevka-slab-semibold.ttc
+share/fonts/iosevka/iosevka-slab-thin.ttc
No comments:
Post a Comment