Hi, On Sat, May 30, 2020 at 2:16 PM Marc Espie <[email protected]> wrote: > On Sat, May 30, 2020 at 01:00:17PM -0600, Anthony J. Bentley wrote: > > Matthieu Herrb writes: > > > This github issue does pretty much explain what's going on: > > > https://github.com/googlefonts/Inconsolata/issues/42 : > > > > I see nothing as extreme as the screenshots in that link in my xterm. > > But the new font is certainly wider than the previous one. > > > > So we should keep the old font, probably. > > > > Should we import the old one as inconsolata-old? > > Or revert + set EPOCH, and import the new one as inconsolata-new? > > The latter would avoid breaking people's setups. > > Later scheme would be less disturbing
Attached is a revert of inconsolata-font and a tarball of the current state of the port as inconsolata-new. I marked them with @conflict for two reasons: inconsolata-new will conflict with the current version of inconsolata-font, and it seems problematic to have different versions of the same font with the same family name installed at the same time. ok? -- Anthony J. Bentley
Index: Makefile
===================================================================
RCS file: /cvs/ports/fonts/inconsolata-font/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 25 May 2020 07:08:52 -0000 1.11
+++ Makefile 4 Jun 2020 07:36:18 -0000
@@ -1,31 +1,29 @@
-# $OpenBSD: Makefile,v 1.11 2020/05/25 07:08:52 bentley Exp $
+# $OpenBSD: Makefile,v 1.10 2020/01/26 11:14:31 jasper Exp $
-COMMENT= monospace font designed for coders
+COMMENT = monospace font designed for coders (old version)
-V = 3.000
-DISTNAME = inconsolata-font-$V
+TYPEFACE= inconsolata
+DISTNAME= Inconsolata
+PKGNAME= ${TYPEFACE}-font-0.1
+EPOCH = 0
CATEGORIES= fonts x11
HOMEPAGE = https://www.levien.com/type/myfonts/inconsolata.html
-DIST_SUBDIR = inconsolata-$V
-MASTER_SITES = https://github.com/googlefonts/Inconsolata/releases/download/v$V/
-DISTFILES = fonts_ttf.zip \
- fonts_otf.zip
+MASTER_SITES= https://distfiles.sigtrap.nl/
+EXTRACT_SUFX= .otf
+EXTRACT_ONLY=
# SIL OFL 1.1
PERMIT_PACKAGE= Yes
+MODULES= font
+FONTTYPES= otf
+
NO_BUILD= Yes
NO_TEST= Yes
-PKG_ARCH = *
-
-WRKDIST = ${WRKDIR}/fonts
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/fonts/inconsolata
- ${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${PREFIX}/share/fonts/inconsolata
- ${INSTALL_DATA} ${WRKSRC}/otf/*.otf ${PREFIX}/share/fonts/inconsolata
+pre-install:
+ cp ${FULLDISTDIR}/${DISTFILES} ${WRKSRC}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/fonts/inconsolata-font/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 25 May 2020 07:08:52 -0000 1.3
+++ distinfo 4 Jun 2020 07:36:18 -0000
@@ -1,4 +1,2 @@
-SHA256 (inconsolata-3.000/fonts_otf.zip) = odMMzRzpKY+48XLfPnP7hx6Z7wp72rp0qVhza9DeW/E=
-SHA256 (inconsolata-3.000/fonts_ttf.zip) = Ym6O4HUB27VEtQqlmsLkueyGuBBnAVilnHo8uvR1VIo=
-SIZE (inconsolata-3.000/fonts_otf.zip) = 2912828
-SIZE (inconsolata-3.000/fonts_ttf.zip) = 4019918
+SHA256 (Inconsolata.otf) = FWHmFsQUobgtbm370Y5XJv1lAokTreGR5fo4tuw3Who=
+SIZE (Inconsolata.otf) = 58464
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/fonts/inconsolata-font/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 19 Jul 2011 09:16:06 -0000 1.1.1.1
+++ pkg/DESCR 4 Jun 2020 07:36:18 -0000
@@ -2,3 +2,6 @@ Inconsolata is a monospace font, designe
like, in print. There are a great many "programmer fonts," designed
primarily for use on the screen, but in most cases do not have the
attention to detail for high resolution rendering.
+
+This version of the font is very old (circa 2009). A newer version
+is available in the 'inconsolata-new' package.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/fonts/inconsolata-font/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 25 May 2020 07:08:52 -0000 1.4
+++ pkg/PLIST 4 Jun 2020 07:36:18 -0000
@@ -1,152 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2020/05/25 07:08:52 bentley Exp $
+@conflict inconsolata-new-*
@pkgpath x11/inconsolata-font
share/fonts/
@fontdir share/fonts/inconsolata/
-share/fonts/inconsolata/Inconsolata-Black.otf
-share/fonts/inconsolata/Inconsolata-Black.ttf
-share/fonts/inconsolata/Inconsolata-Bold.otf
-share/fonts/inconsolata/Inconsolata-Bold.ttf
-share/fonts/inconsolata/Inconsolata-Condensed.otf
-share/fonts/inconsolata/Inconsolata-Condensed.ttf
-share/fonts/inconsolata/Inconsolata-CondensedBlack.otf
-share/fonts/inconsolata/Inconsolata-CondensedBlack.ttf
-share/fonts/inconsolata/Inconsolata-CondensedBold.otf
-share/fonts/inconsolata/Inconsolata-CondensedBold.ttf
-share/fonts/inconsolata/Inconsolata-CondensedExtraBold.otf
-share/fonts/inconsolata/Inconsolata-CondensedExtraBold.ttf
-share/fonts/inconsolata/Inconsolata-CondensedExtraLight.otf
-share/fonts/inconsolata/Inconsolata-CondensedExtraLight.ttf
-share/fonts/inconsolata/Inconsolata-CondensedLight.otf
-share/fonts/inconsolata/Inconsolata-CondensedLight.ttf
-share/fonts/inconsolata/Inconsolata-CondensedMedium.otf
-share/fonts/inconsolata/Inconsolata-CondensedMedium.ttf
-share/fonts/inconsolata/Inconsolata-CondensedSemiBold.otf
-share/fonts/inconsolata/Inconsolata-CondensedSemiBold.ttf
-share/fonts/inconsolata/Inconsolata-Expanded.otf
-share/fonts/inconsolata/Inconsolata-Expanded.ttf
-share/fonts/inconsolata/Inconsolata-ExpandedBlack.otf
-share/fonts/inconsolata/Inconsolata-ExpandedBlack.ttf
-share/fonts/inconsolata/Inconsolata-ExpandedBold.otf
-share/fonts/inconsolata/Inconsolata-ExpandedBold.ttf
-share/fonts/inconsolata/Inconsolata-ExpandedExtraBold.otf
-share/fonts/inconsolata/Inconsolata-ExpandedExtraBold.ttf
-share/fonts/inconsolata/Inconsolata-ExpandedExtraLight.otf
-share/fonts/inconsolata/Inconsolata-ExpandedExtraLight.ttf
-share/fonts/inconsolata/Inconsolata-ExpandedLight.otf
-share/fonts/inconsolata/Inconsolata-ExpandedLight.ttf
-share/fonts/inconsolata/Inconsolata-ExpandedMedium.otf
-share/fonts/inconsolata/Inconsolata-ExpandedMedium.ttf
-share/fonts/inconsolata/Inconsolata-ExpandedSemiBold.otf
-share/fonts/inconsolata/Inconsolata-ExpandedSemiBold.ttf
-share/fonts/inconsolata/Inconsolata-ExtraBold.otf
-share/fonts/inconsolata/Inconsolata-ExtraBold.ttf
-share/fonts/inconsolata/Inconsolata-ExtraCondensed.otf
-share/fonts/inconsolata/Inconsolata-ExtraCondensed.ttf
-share/fonts/inconsolata/Inconsolata-ExtraCondensedBlack.otf
-share/fonts/inconsolata/Inconsolata-ExtraCondensedBlack.ttf
-share/fonts/inconsolata/Inconsolata-ExtraCondensedBold.otf
-share/fonts/inconsolata/Inconsolata-ExtraCondensedBold.ttf
-share/fonts/inconsolata/Inconsolata-ExtraCondensedExtraBold.otf
-share/fonts/inconsolata/Inconsolata-ExtraCondensedExtraBold.ttf
-share/fonts/inconsolata/Inconsolata-ExtraCondensedExtraLight.otf
-share/fonts/inconsolata/Inconsolata-ExtraCondensedExtraLight.ttf
-share/fonts/inconsolata/Inconsolata-ExtraCondensedLight.otf
-share/fonts/inconsolata/Inconsolata-ExtraCondensedLight.ttf
-share/fonts/inconsolata/Inconsolata-ExtraCondensedMedium.otf
-share/fonts/inconsolata/Inconsolata-ExtraCondensedMedium.ttf
-share/fonts/inconsolata/Inconsolata-ExtraCondensedSemiBold.otf
-share/fonts/inconsolata/Inconsolata-ExtraCondensedSemiBold.ttf
-share/fonts/inconsolata/Inconsolata-ExtraExpanded.otf
-share/fonts/inconsolata/Inconsolata-ExtraExpanded.ttf
-share/fonts/inconsolata/Inconsolata-ExtraExpandedBlack.otf
-share/fonts/inconsolata/Inconsolata-ExtraExpandedBlack.ttf
-share/fonts/inconsolata/Inconsolata-ExtraExpandedBold.otf
-share/fonts/inconsolata/Inconsolata-ExtraExpandedBold.ttf
-share/fonts/inconsolata/Inconsolata-ExtraExpandedExtraBold.otf
-share/fonts/inconsolata/Inconsolata-ExtraExpandedExtraBold.ttf
-share/fonts/inconsolata/Inconsolata-ExtraExpandedExtraLight.otf
-share/fonts/inconsolata/Inconsolata-ExtraExpandedExtraLight.ttf
-share/fonts/inconsolata/Inconsolata-ExtraExpandedLight.otf
-share/fonts/inconsolata/Inconsolata-ExtraExpandedLight.ttf
-share/fonts/inconsolata/Inconsolata-ExtraExpandedMedium.otf
-share/fonts/inconsolata/Inconsolata-ExtraExpandedMedium.ttf
-share/fonts/inconsolata/Inconsolata-ExtraExpandedSemiBold.otf
-share/fonts/inconsolata/Inconsolata-ExtraExpandedSemiBold.ttf
-share/fonts/inconsolata/Inconsolata-ExtraLight.otf
-share/fonts/inconsolata/Inconsolata-ExtraLight.ttf
-share/fonts/inconsolata/Inconsolata-Light.otf
-share/fonts/inconsolata/Inconsolata-Light.ttf
-share/fonts/inconsolata/Inconsolata-Medium.otf
-share/fonts/inconsolata/Inconsolata-Medium.ttf
-share/fonts/inconsolata/Inconsolata-Regular.otf
-share/fonts/inconsolata/Inconsolata-Regular.ttf
-share/fonts/inconsolata/Inconsolata-SemiBold.otf
-share/fonts/inconsolata/Inconsolata-SemiBold.ttf
-share/fonts/inconsolata/Inconsolata-SemiCondensed.otf
-share/fonts/inconsolata/Inconsolata-SemiCondensed.ttf
-share/fonts/inconsolata/Inconsolata-SemiCondensedBlack.otf
-share/fonts/inconsolata/Inconsolata-SemiCondensedBlack.ttf
-share/fonts/inconsolata/Inconsolata-SemiCondensedBold.otf
-share/fonts/inconsolata/Inconsolata-SemiCondensedBold.ttf
-share/fonts/inconsolata/Inconsolata-SemiCondensedExtraBold.otf
-share/fonts/inconsolata/Inconsolata-SemiCondensedExtraBold.ttf
-share/fonts/inconsolata/Inconsolata-SemiCondensedExtraLight.otf
-share/fonts/inconsolata/Inconsolata-SemiCondensedExtraLight.ttf
-share/fonts/inconsolata/Inconsolata-SemiCondensedLight.otf
-share/fonts/inconsolata/Inconsolata-SemiCondensedLight.ttf
-share/fonts/inconsolata/Inconsolata-SemiCondensedMedium.otf
-share/fonts/inconsolata/Inconsolata-SemiCondensedMedium.ttf
-share/fonts/inconsolata/Inconsolata-SemiCondensedSemiBold.otf
-share/fonts/inconsolata/Inconsolata-SemiCondensedSemiBold.ttf
-share/fonts/inconsolata/Inconsolata-SemiExpanded.otf
-share/fonts/inconsolata/Inconsolata-SemiExpanded.ttf
-share/fonts/inconsolata/Inconsolata-SemiExpandedBlack.otf
-share/fonts/inconsolata/Inconsolata-SemiExpandedBlack.ttf
-share/fonts/inconsolata/Inconsolata-SemiExpandedBold.otf
-share/fonts/inconsolata/Inconsolata-SemiExpandedBold.ttf
-share/fonts/inconsolata/Inconsolata-SemiExpandedExtraBold.otf
-share/fonts/inconsolata/Inconsolata-SemiExpandedExtraBold.ttf
-share/fonts/inconsolata/Inconsolata-SemiExpandedExtraLight.otf
-share/fonts/inconsolata/Inconsolata-SemiExpandedExtraLight.ttf
-share/fonts/inconsolata/Inconsolata-SemiExpandedLight.otf
-share/fonts/inconsolata/Inconsolata-SemiExpandedLight.ttf
-share/fonts/inconsolata/Inconsolata-SemiExpandedMedium.otf
-share/fonts/inconsolata/Inconsolata-SemiExpandedMedium.ttf
-share/fonts/inconsolata/Inconsolata-SemiExpandedSemiBold.otf
-share/fonts/inconsolata/Inconsolata-SemiExpandedSemiBold.ttf
-share/fonts/inconsolata/Inconsolata-UltraCondensed.otf
-share/fonts/inconsolata/Inconsolata-UltraCondensed.ttf
-share/fonts/inconsolata/Inconsolata-UltraCondensedBlack.otf
-share/fonts/inconsolata/Inconsolata-UltraCondensedBlack.ttf
-share/fonts/inconsolata/Inconsolata-UltraCondensedBold.otf
-share/fonts/inconsolata/Inconsolata-UltraCondensedBold.ttf
-share/fonts/inconsolata/Inconsolata-UltraCondensedExtraBold.otf
-share/fonts/inconsolata/Inconsolata-UltraCondensedExtraBold.ttf
-share/fonts/inconsolata/Inconsolata-UltraCondensedExtraLight.otf
-share/fonts/inconsolata/Inconsolata-UltraCondensedExtraLight.ttf
-share/fonts/inconsolata/Inconsolata-UltraCondensedLight.otf
-share/fonts/inconsolata/Inconsolata-UltraCondensedLight.ttf
-share/fonts/inconsolata/Inconsolata-UltraCondensedMedium.otf
-share/fonts/inconsolata/Inconsolata-UltraCondensedMedium.ttf
-share/fonts/inconsolata/Inconsolata-UltraCondensedSemiBold.otf
-share/fonts/inconsolata/Inconsolata-UltraCondensedSemiBold.ttf
-share/fonts/inconsolata/Inconsolata-UltraExpanded.otf
-share/fonts/inconsolata/Inconsolata-UltraExpanded.ttf
-share/fonts/inconsolata/Inconsolata-UltraExpandedBlack.otf
-share/fonts/inconsolata/Inconsolata-UltraExpandedBlack.ttf
-share/fonts/inconsolata/Inconsolata-UltraExpandedBold.otf
-share/fonts/inconsolata/Inconsolata-UltraExpandedBold.ttf
-share/fonts/inconsolata/Inconsolata-UltraExpandedExtraBold.otf
-share/fonts/inconsolata/Inconsolata-UltraExpandedExtraBold.ttf
-share/fonts/inconsolata/Inconsolata-UltraExpandedExtraLight.otf
-share/fonts/inconsolata/Inconsolata-UltraExpandedExtraLight.ttf
-share/fonts/inconsolata/Inconsolata-UltraExpandedLight.otf
-share/fonts/inconsolata/Inconsolata-UltraExpandedLight.ttf
-share/fonts/inconsolata/Inconsolata-UltraExpandedMedium.otf
-share/fonts/inconsolata/Inconsolata-UltraExpandedMedium.ttf
-share/fonts/inconsolata/Inconsolata-UltraExpandedSemiBold.otf
-share/fonts/inconsolata/Inconsolata-UltraExpandedSemiBold.ttf
-share/fonts/inconsolata/Ligconsolata-Bold.otf
-share/fonts/inconsolata/Ligconsolata-Bold.ttf
-share/fonts/inconsolata/Ligconsolata-Regular.otf
-share/fonts/inconsolata/Ligconsolata-Regular.ttf
+share/fonts/inconsolata/Inconsolata.otf
inconsolata-new.tar.gz
Description: application/gzip
