diff --git a/fonts/iosevka-fonts/Makefile b/fonts/iosevka-fonts/Makefile index 5f8028b62ce..74f34e62a5e 100644 --- a/fonts/iosevka-fonts/Makefile +++ b/fonts/iosevka-fonts/Makefile @@ -1,46 +1,20 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2020/03/06 19:32:35 edd Exp $ +# $OpenBSD: Makefile,v 1.2 2020/08/21 13:53:30 edd Exp $ -COMMENT-main = slender typeface for code (default variant) -COMMENT-term = slender typeface for code (term variant) +# There are many different variants of Iosevka. We only package a subset of +# them, but the layout of the port is designed for more to be added if need be. +# +# Each SUBDIR is one "variant" and because we use the TTC fonts (which allow +# glyphs to be shared, thus saving space) each variant contains all of the +# various "spacing variants". +# +# For details on variants and spacing variants, see: +# https://github.com/be5invis/Iosevka/releases +# +# When adding a new variant, please use a SUBDIR whose name matches the suffix +# on the DISTFILE, e.g. 'SUBDIR += slab' for 'ttc-iosevka-slab-x.y.z.zip'. +# Similarly for the PKGNAME suffix. -V = 2.3.3 -PKGNAME = iosevka-fonts-default-${V} -PKGNAME-main = ${PKGNAME} -PKGNAME-term = iosevka-fonts-term-${V} +SUBDIR = +SUBDIR += default -# The font has many different variants. We are only packaging the 'default' -# 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} - -CATEGORIES = fonts x11 - -HOMEPAGE = https://github.com/be5invis/iosevka - -MAINTAINER = Edd Barrett - -# SIL OFL 1.1 -PERMIT_PACKAGE = Yes - -MASTER_SITES = https://github.com/be5invis/iosevka/releases/download/v${V}/ -EXTRACT_SUFX = .zip - -MULTI_PACKAGES = -main -term - -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}/ttf/*.ttf ${FONTDIR} - -.include +.include diff --git a/fonts/iosevka-fonts/Makefile.inc b/fonts/iosevka-fonts/Makefile.inc new file mode 100644 index 00000000000..d79b115f913 --- /dev/null +++ b/fonts/iosevka-fonts/Makefile.inc @@ -0,0 +1,22 @@ +# $OpenBSD: Makefile.inc,v 1.1 2020/08/21 13:53:30 edd Exp $ + +V = 3.4.1 +CATEGORIES = fonts x11 +HOMEPAGE = https://github.com/be5invis/iosevka +MAINTAINER = Edd Barrett + +# 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 + +# distfiles are zip bombs. +WRKDIST = ${WRKDIR} + +PKG_ARCH = * + +FONTDIR = ${PREFIX}/share/fonts/iosevka diff --git a/fonts/iosevka-fonts/default/Makefile b/fonts/iosevka-fonts/default/Makefile new file mode 100644 index 00000000000..4047c380828 --- /dev/null +++ b/fonts/iosevka-fonts/default/Makefile @@ -0,0 +1,11 @@ +# $OpenBSD: Makefile,v 1.1 2020/08/21 13:53:30 edd Exp $ + +COMMENT = slender typeface for code (default variant) +PKGNAME = iosevka-${V} +DISTFILES = ttc-iosevka-${V}${EXTRACT_SUFX} + +do-install: + ${INSTALL_DATA_DIR} ${FONTDIR} + ${INSTALL_DATA} ${WRKDIST}/*.ttc ${FONTDIR} + +.include diff --git a/fonts/iosevka-fonts/default/distinfo b/fonts/iosevka-fonts/default/distinfo new file mode 100644 index 00000000000..8122866f6fd --- /dev/null +++ b/fonts/iosevka-fonts/default/distinfo @@ -0,0 +1,2 @@ +SHA256 (ttc-iosevka-3.4.1.zip) = OBvAjPn4TZB/BsG+RZ379/4/N+z1WgAqf21a9G3RCd8= +SIZE (ttc-iosevka-3.4.1.zip) = 19746588 diff --git a/fonts/iosevka-fonts/default/pkg/DESCR b/fonts/iosevka-fonts/default/pkg/DESCR new file mode 100644 index 00000000000..31231a601b6 --- /dev/null +++ b/fonts/iosevka-fonts/default/pkg/DESCR @@ -0,0 +1,3 @@ +Coders' typeface, built from code. + +This package is for the default variant. diff --git a/fonts/iosevka-fonts/default/pkg/PLIST b/fonts/iosevka-fonts/default/pkg/PLIST new file mode 100644 index 00000000000..2a17124ba67 --- /dev/null +++ b/fonts/iosevka-fonts/default/pkg/PLIST @@ -0,0 +1,16 @@ +@comment $OpenBSD: PLIST,v 1.1 2020/08/21 13:53:30 edd Exp $ +@conflict iosevka-fonts-default-* +@conflict iosevka-fonts-term-* +@pkgpath fonts/iosevka-fonts,-main +@pkgpath fonts/iosevka-fonts,-term +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 --git a/fonts/iosevka-fonts/distinfo b/fonts/iosevka-fonts/distinfo deleted file mode 100644 index 7c3dffddf36..00000000000 --- a/fonts/iosevka-fonts/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -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 diff --git a/fonts/iosevka-fonts/pkg/DESCR-main b/fonts/iosevka-fonts/pkg/DESCR-main deleted file mode 100644 index a728541ef77..00000000000 --- a/fonts/iosevka-fonts/pkg/DESCR-main +++ /dev/null @@ -1,3 +0,0 @@ -Coders' typeface, built from code. - -This package is for the 'default' variant. diff --git a/fonts/iosevka-fonts/pkg/DESCR-term b/fonts/iosevka-fonts/pkg/DESCR-term deleted file mode 100644 index 3aa72efa8b8..00000000000 --- a/fonts/iosevka-fonts/pkg/DESCR-term +++ /dev/null @@ -1,3 +0,0 @@ -Coders' typeface, built from code. - -This package is for the 'term' variant. diff --git a/fonts/iosevka-fonts/pkg/PLIST-main b/fonts/iosevka-fonts/pkg/PLIST-main deleted file mode 100644 index 5ccdc5248d1..00000000000 --- a/fonts/iosevka-fonts/pkg/PLIST-main +++ /dev/null @@ -1,30 +0,0 @@ -@comment $OpenBSD: PLIST-main,v 1.1.1.1 2020/03/06 19:32:35 edd Exp $ -share/fonts/ -@fontdir share/fonts/iosevka/ -share/fonts/iosevka/iosevka-bold.ttf -share/fonts/iosevka/iosevka-bolditalic.ttf -share/fonts/iosevka/iosevka-boldoblique.ttf -share/fonts/iosevka/iosevka-extrabold.ttf -share/fonts/iosevka/iosevka-extrabolditalic.ttf -share/fonts/iosevka/iosevka-extraboldoblique.ttf -share/fonts/iosevka/iosevka-extralight.ttf -share/fonts/iosevka/iosevka-extralightitalic.ttf -share/fonts/iosevka/iosevka-extralightoblique.ttf -share/fonts/iosevka/iosevka-heavy.ttf -share/fonts/iosevka/iosevka-heavyitalic.ttf -share/fonts/iosevka/iosevka-heavyoblique.ttf -share/fonts/iosevka/iosevka-italic.ttf -share/fonts/iosevka/iosevka-light.ttf -share/fonts/iosevka/iosevka-lightitalic.ttf -share/fonts/iosevka/iosevka-lightoblique.ttf -share/fonts/iosevka/iosevka-medium.ttf -share/fonts/iosevka/iosevka-mediumitalic.ttf -share/fonts/iosevka/iosevka-mediumoblique.ttf -share/fonts/iosevka/iosevka-oblique.ttf -share/fonts/iosevka/iosevka-regular.ttf -share/fonts/iosevka/iosevka-semibold.ttf -share/fonts/iosevka/iosevka-semibolditalic.ttf -share/fonts/iosevka/iosevka-semiboldoblique.ttf -share/fonts/iosevka/iosevka-thin.ttf -share/fonts/iosevka/iosevka-thinitalic.ttf -share/fonts/iosevka/iosevka-thinoblique.ttf diff --git a/fonts/iosevka-fonts/pkg/PLIST-term b/fonts/iosevka-fonts/pkg/PLIST-term deleted file mode 100644 index 7916cad0927..00000000000 --- a/fonts/iosevka-fonts/pkg/PLIST-term +++ /dev/null @@ -1,30 +0,0 @@ -@comment $OpenBSD: PLIST-term,v 1.1.1.1 2020/03/06 19:32:35 edd Exp $ -share/fonts/ -@fontdir share/fonts/iosevka/ -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-extrabold.ttf -share/fonts/iosevka/iosevka-term-extrabolditalic.ttf -share/fonts/iosevka/iosevka-term-extraboldoblique.ttf -share/fonts/iosevka/iosevka-term-extralight.ttf -share/fonts/iosevka/iosevka-term-extralightitalic.ttf -share/fonts/iosevka/iosevka-term-extralightoblique.ttf -share/fonts/iosevka/iosevka-term-heavy.ttf -share/fonts/iosevka/iosevka-term-heavyitalic.ttf -share/fonts/iosevka/iosevka-term-heavyoblique.ttf -share/fonts/iosevka/iosevka-term-italic.ttf -share/fonts/iosevka/iosevka-term-light.ttf -share/fonts/iosevka/iosevka-term-lightitalic.ttf -share/fonts/iosevka/iosevka-term-lightoblique.ttf -share/fonts/iosevka/iosevka-term-medium.ttf -share/fonts/iosevka/iosevka-term-mediumitalic.ttf -share/fonts/iosevka/iosevka-term-mediumoblique.ttf -share/fonts/iosevka/iosevka-term-oblique.ttf -share/fonts/iosevka/iosevka-term-regular.ttf -share/fonts/iosevka/iosevka-term-semibold.ttf -share/fonts/iosevka/iosevka-term-semibolditalic.ttf -share/fonts/iosevka/iosevka-term-semiboldoblique.ttf -share/fonts/iosevka/iosevka-term-thin.ttf -share/fonts/iosevka/iosevka-term-thinitalic.ttf -share/fonts/iosevka/iosevka-term-thinoblique.ttf