Updated fira to 4.202.

Adds FiraSansCondensed and FiraMono-Medium.

3 files changed, 47 insertions, 21 deletions

diff --git a/fonts/fira/Makefile b/fonts/fira/Makefile
index 5372e298a32..31846bc4400 100644
--- a/fonts/fira/Makefile
+++ b/fonts/fira/Makefile
@@ -1,21 +1,18 @@
-# $NetBSD: Makefile,v 1.2 2014/06/01 16:35:33 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/09/30 14:29:00 wiz Exp $
 
-DISTNAME=	fira-${VERSION}
-VERSION=	3105
-PKGNAME=	${DISTNAME:C/3/3./}
-PKGREVISION=	1
+DISTNAME=	fira-4.202
 CATEGORIES=	fonts
-MASTER_SITES=	http://dev.carrois.com/wordpress/wp-content/uploads/downloads/fira_${VERSION}/
-EXTRACT_SUFX=	.zip
-DISTFILES=	FiraSans${VERSION}.zip FiraMono${VERSION}.zip
+MASTER_SITES=	${MASTER_SITE_GITHUB:=mozilla/}
+GITHUB_PROJECT=	Fira
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://dev.carrois.com/fira-3-1/
+HOMEPAGE=	https://mozilla.github.io/Fira/
 COMMENT=	Mozilla's font for Firefox OS
 LICENSE=	ofl-v1.1
 
 USE_LANGUAGES=	# none
-WRKSRC=		${WRKDIR}
+
+WRKSRC=		${WRKDIR}/${DISTNAME:S/f/F/}
 
 FONTS_DIRS.otf+=	share/fonts/X11/OTF
 INSTALLATION_DIRS+=	${FONTS_DIRS.otf}
@@ -23,6 +20,6 @@ INSTALLATION_DIRS+=	${FONTS_DIRS.otf}
 do-build:
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/Fira*/OTF/*.otf ${DESTDIR}${PREFIX}/${FONTS_DIRS.otf}
+	${INSTALL_DATA} ${WRKSRC}/otf/*.otf ${DESTDIR}${PREFIX}/${FONTS_DIRS.otf}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/fira/PLIST b/fonts/fira/PLIST
index 47d1fb6bedc..3e8711df1ec 100644
--- a/fonts/fira/PLIST
+++ b/fonts/fira/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:33 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/09/30 14:29:00 wiz Exp $
 share/fonts/X11/OTF/FiraMono-Bold.otf
+share/fonts/X11/OTF/FiraMono-Medium.otf
 share/fonts/X11/OTF/FiraMono-Regular.otf
 share/fonts/X11/OTF/FiraSans-Bold.otf
 share/fonts/X11/OTF/FiraSans-BoldItalic.otf
@@ -33,3 +34,35 @@ share/fonts/X11/OTF/FiraSans-Ultra.otf
 share/fonts/X11/OTF/FiraSans-UltraItalic.otf
 share/fonts/X11/OTF/FiraSans-UltraLight.otf
 share/fonts/X11/OTF/FiraSans-UltraLightItalic.otf
+share/fonts/X11/OTF/FiraSansCondensed-Bold.otf
+share/fonts/X11/OTF/FiraSansCondensed-BoldItalic.otf
+share/fonts/X11/OTF/FiraSansCondensed-Book.otf
+share/fonts/X11/OTF/FiraSansCondensed-BookItalic.otf
+share/fonts/X11/OTF/FiraSansCondensed-Eight.otf
+share/fonts/X11/OTF/FiraSansCondensed-EightItalic.otf
+share/fonts/X11/OTF/FiraSansCondensed-ExtraBold.otf
+share/fonts/X11/OTF/FiraSansCondensed-ExtraLight.otf
+share/fonts/X11/OTF/FiraSansCondensed-ExtraLightItalic.otf
+share/fonts/X11/OTF/FiraSansCondensed-ExtraboldItalic.otf
+share/fonts/X11/OTF/FiraSansCondensed-Four.otf
+share/fonts/X11/OTF/FiraSansCondensed-FourItalic.otf
+share/fonts/X11/OTF/FiraSansCondensed-Hair.otf
+share/fonts/X11/OTF/FiraSansCondensed-HairItalic.otf
+share/fonts/X11/OTF/FiraSansCondensed-Heavy.otf
+share/fonts/X11/OTF/FiraSansCondensed-HeavyItalic.otf
+share/fonts/X11/OTF/FiraSansCondensed-Italic.otf
+share/fonts/X11/OTF/FiraSansCondensed-Light.otf
+share/fonts/X11/OTF/FiraSansCondensed-LightItalic.otf
+share/fonts/X11/OTF/FiraSansCondensed-Medium.otf
+share/fonts/X11/OTF/FiraSansCondensed-MediumItalic.otf
+share/fonts/X11/OTF/FiraSansCondensed-Regular.otf
+share/fonts/X11/OTF/FiraSansCondensed-SemiBold.otf
+share/fonts/X11/OTF/FiraSansCondensed-SemiboldItalic.otf
+share/fonts/X11/OTF/FiraSansCondensed-Thin.otf
+share/fonts/X11/OTF/FiraSansCondensed-ThinItalic.otf
+share/fonts/X11/OTF/FiraSansCondensed-Two.otf
+share/fonts/X11/OTF/FiraSansCondensed-TwoItalic.otf
+share/fonts/X11/OTF/FiraSansCondensed-Ultra.otf
+share/fonts/X11/OTF/FiraSansCondensed-UltraItalic.otf
+share/fonts/X11/OTF/FiraSansCondensed-UltraLight.otf
+share/fonts/X11/OTF/FiraSansCondensed-UltraLightItalic.otf
diff --git a/fonts/fira/distinfo b/fonts/fira/distinfo
index fdd5623f368..dab096fefe0 100644
--- a/fonts/fira/distinfo
+++ b/fonts/fira/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 20:44:30 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/09/30 14:29:00 wiz Exp $
 
-SHA1 (FiraMono3105.zip) = 421de6032fc78bfc8d539cc003d781a917aea11a
-RMD160 (FiraMono3105.zip) = 707ff6f0218a65116418c6974df81e9e80453dac
-SHA512 (FiraMono3105.zip) = 3ff57f63f2a1da5091caffbf413a1dfcd93eb1bb5c6a43b57558a685e8f634733b835aef661a9f655a62753d005d18d0dbb73615b56568b8f051ba94d2287738
-Size (FiraMono3105.zip) = 248960 bytes
-SHA1 (FiraSans3105.zip) = 8bb1685c59a8b9ad8b77482ddb00622ef4914510
-RMD160 (FiraSans3105.zip) = ca3200fa65c7f35e5ee6eb4e1159492ee53dc6f2
-SHA512 (FiraSans3105.zip) = 2babd01613a5680441ada52ed40353c5b38ede858b51fa90c80311a481f46c4ab0e622b8b3cdccdee7bcd1a40a5e7204c65b7995aa210bea7a77bec37a7aca7f
-Size (FiraSans3105.zip) = 3494079 bytes
+SHA1 (fira-4.202.tar.gz) = f2dda180b58f669c7b2f6c5df207871c40bcb278
+RMD160 (fira-4.202.tar.gz) = b9e0eba012bf29e450fe01ee60f255ab00eb01c3
+SHA512 (fira-4.202.tar.gz) = fec770fa038f2aa0654f9382f95aa1266a2655970f4c7755b237af9d1c09f47ce719f8daf3afc39812fc69448b9481ee0e2a1414f1d007ad70b4254c92950ebb
+Size (fira-4.202.tar.gz) = 94581261 bytes