- Update Mozilla's Open Source Type Family Fira to versions 4.203 (Sans)

  and 3.202 (Code & Mono)
- Remove UFO source files installation option: they are no longer offered
  for download from carrois.com and probably of low interest to end-user
- Update mastersites, WWW references, and port description text

TIMESTAMP (Fira_Sans_4_2.zip) = 1477043341

5 files changed, 91 insertions, 53 deletions

diff --git a/x11-fonts/fira/Makefile b/x11-fonts/fira/Makefile
index ffb4949b4e20..335e4aa553b0 100644
--- a/x11-fonts/fira/Makefile
+++ b/x11-fonts/fira/Makefile
@@ -2,15 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	fira
-PORTVERSION=	4.106
+PORTVERSION=	4.203
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://www.carrois.com/downloads/%SUBDIR%/:sans,mono \
-		SF/horia/${CATEGORIES}/${PORTNAME}/%SUBDIR%/:sans,mono
-MASTER_SITE_SUBDIR=	${PORTNAME}_4_1/:sans ${PORTNAME}_mono_3_2/:mono
-DISTNAME=	${PORTNAME:S|f|F|}
-DISTFILES=	${DISTNAME}Fonts${PORTVERSION:S|.||}${EXTRACT_SUFX}:sans \
-		${DISTNAME}MonoFonts${MONO_VERSION}${EXTRACT_SUFX}:mono
-EXTRACT_ONLY=	${DISTFILES:C|:[^:]+$||:M*.zip}
+MASTER_SITES=	https://carrois.com/downloads/Fira/
+DISTFILES=	Fira_Code_3_2.zip Fira_Mono_3_2.zip Fira_Sans_4_2.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sans-serif and monospaced typeface for small screens
@@ -26,35 +21,18 @@ NO_WRKSUBDIR=	yes
 SUB_FILES=	pkg-message
 
 PORTDOCS=	*.pdf *.rtf
-PORTEXAMPLES=	*
 
-MONO_VERSION=	3206
-
-OPTIONS_DEFINE=	DOCS EXAMPLES
-EXAMPLES_DESC=	UFO source files
-
-DOCS_DISTFILES=	${DISTNAME}_4_1_Version_Report.rtf:sans \
-		${DISTNAME}PDF${PORTVERSION:S|.||}${EXTRACT_SUFX}:sans \
-		${DISTNAME}MonoPDF${MONO_VERSION}${EXTRACT_SUFX}:mono
-EXAMPLES_DISTFILES=	${DISTNAME}UFO_beta${PORTVERSION:S|.||}${EXTRACT_SUFX}:sans \
-			${DISTNAME}MonoUFO_beta${MONO_VERSION}${EXTRACT_SUFX}:mono
+OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}*Fonts*/OTF/*.otf \
-		${STAGEDIR}${FONTSDIR}
+	${FIND} ${WRKSRC}/Fira* -type f -name \*.otf | while read f; do \
+		${INSTALL_DATA} $$f ${STAGEDIR}${FONTSDIR} ; done
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${CP} ${DISTDIR}/${DISTFILES:C|:[^:]+$||:M*.rtf} ${WRKSRC}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|:M*.rtf} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/${DISTNAME}*PDF*/|:M*.pdf} \
+	${INSTALL_DATA} ${WRKSRC}/Fira*/PDF/*.pdf ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/Fira_Sans_4_2/Fira_4_2_Version_Log.rtf \
 		${STAGEDIR}${DOCSDIR}
 
-do-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-.for e in ${EXAMPLES_DISTFILES:R:C|:[^:]+$||}
-	(cd ${WRKSRC}/${e} && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
-.endfor
-
 .include <bsd.port.mk>
diff --git a/x11-fonts/fira/distinfo b/x11-fonts/fira/distinfo
index 7d7cd5de37f7..b731d8359828 100644
--- a/x11-fonts/fira/distinfo
+++ b/x11-fonts/fira/distinfo
@@ -1,14 +1,7 @@
-SHA256 (FiraFonts4106.zip) = 2d22f72ada8df0dc7110021d0c7be4eeb07ddd4ea7eca0a8a626ada54ee37d88
-SIZE (FiraFonts4106.zip) = 27489396
-SHA256 (FiraMonoFonts3206.zip) = f14249f857d802d29844b9ebff764990665072cccef3748dce06b7c21be8c5fc
-SIZE (FiraMonoFonts3206.zip) = 1212223
-SHA256 (Fira_4_1_Version_Report.rtf) = 7da26c853d61dd2423090a2f94276ab89a3e51922bc43707921457ba8c7d74df
-SIZE (Fira_4_1_Version_Report.rtf) = 17027
-SHA256 (FiraPDF4106.zip) = 3d535988b25515049112770a79685e7474198586f419b6223e005e7c590970b2
-SIZE (FiraPDF4106.zip) = 39315604
-SHA256 (FiraMonoPDF3206.zip) = 8c72389428a7a05c957fc13de061473f42997c7cebfe1c43b734a23536477fef
-SIZE (FiraMonoPDF3206.zip) = 2333887
-SHA256 (FiraUFO_beta4106.zip) = b803b24f725dbeda0f4fcb3a8abfc207842f93027785083663deac6a70106485
-SIZE (FiraUFO_beta4106.zip) = 14589316
-SHA256 (FiraMonoUFO_beta3206.zip) = 166dcd27afdc4fd54a084dc75742fdb325d1a1e6e914aeb1ecf0402a035ee692
-SIZE (FiraMonoUFO_beta3206.zip) = 1808741
+TIMESTAMP = 1477043341
+SHA256 (Fira_Code_3_2.zip) = e47568e160259a2b3d449e20fc9ac16207f28958c88d53896d59a1f232bb1d9a
+SIZE (Fira_Code_3_2.zip) = 1570417
+SHA256 (Fira_Mono_3_2.zip) = 77b83feda1f1c5b8e8da07498aff6fa0f9d2d16bbfa2095dd7e7696c887c6128
+SIZE (Fira_Mono_3_2.zip) = 3543940
+SHA256 (Fira_Sans_4_2.zip) = e0b60ccaabf20481b145bd81286056d13ab705385b181ee80d3287e607b5b8a7
+SIZE (Fira_Sans_4_2.zip) = 101286240
diff --git a/x11-fonts/fira/files/pkg-message.in b/x11-fonts/fira/files/pkg-message.in
index cd65cb8eeecd..71f4cc085a44 100644
--- a/x11-fonts/fira/files/pkg-message.in
+++ b/x11-fonts/fira/files/pkg-message.in
@@ -5,7 +5,7 @@ Fira has been installed.
 Fira has advanced Open Type typographic layout features and language support.
 Please refer to the Technical Documentation installed by this port or online at
 
-    http://www.carrois.com/fira-4-1/
+    https://carrois.com/projects/Fira/
 
 For details about OpenType Layout Features see the OpenType Layout tag registry
 
diff --git a/x11-fonts/fira/pkg-descr b/x11-fonts/fira/pkg-descr
index d42e45e6f7c5..6c34f1952aed 100644
--- a/x11-fonts/fira/pkg-descr
+++ b/x11-fonts/fira/pkg-descr
@@ -1,10 +1,14 @@
-The Fira font family was designed to cover the legibility needs for a large
-range of handsets varying in screen quality and rendering. It comes in a
-Sans Serif with 16 weights all accompanied by italic styles. The package also
-includes a Mono Spaced variant with 3 weights (regular, medium and bold). The
-UFO source files are included in examples.
+Originally designed as a typeface for the Mozilla OS, Fira Sans has
+developed towards a standalone Open Source project.  Over the last years,
+Fira covered more and more languages and provided further weights and
+styles.
 
-Available formats: Open Type
-*supports advanced Open Type typographic layout features and languages
+In version 4.2 the Fira Sans Family comprises 16 weights in 2 styles Roman
+and Italic.  And Fira grew even more.  We added a Condensed, Condensed
+Roman, plus a Compressed and Compressed Italic.  All fonts of Fira Sans
+contain more than 2600 glyphs each.
 
-WWW: http://www.carrois.com/fira-4-1/
+Fira Mono is still in progress.  Though, it covers almost 1500 glyphs and
+comes in three weights.
+
+WWW: https://carrois.com/projects/Fira/
diff --git a/x11-fonts/fira/pkg-plist b/x11-fonts/fira/pkg-plist
index a4c18418f835..86b90ec7cac5 100644
--- a/x11-fonts/fira/pkg-plist
+++ b/x11-fonts/fira/pkg-plist
@@ -1,3 +1,6 @@
+%%FONTSDIR%%/FiraCode-Bold.otf
+%%FONTSDIR%%/FiraCode-Medium.otf
+%%FONTSDIR%%/FiraCode-Regular.otf
 %%FONTSDIR%%/FiraMono-Bold.otf
 %%FONTSDIR%%/FiraMono-Medium.otf
 %%FONTSDIR%%/FiraMono-Regular.otf
@@ -33,3 +36,63 @@
 %%FONTSDIR%%/FiraSans-UltraItalic.otf
 %%FONTSDIR%%/FiraSans-UltraLight.otf
 %%FONTSDIR%%/FiraSans-UltraLightItalic.otf
+%%FONTSDIR%%/FiraSansCompressed-Bold.otf
+%%FONTSDIR%%/FiraSansCompressed-BoldItalic.otf
+%%FONTSDIR%%/FiraSansCompressed-Book.otf
+%%FONTSDIR%%/FiraSansCompressed-BookItalic.otf
+%%FONTSDIR%%/FiraSansCompressed-Eight.otf
+%%FONTSDIR%%/FiraSansCompressed-EightItalic.otf
+%%FONTSDIR%%/FiraSansCompressed-ExtraBold.otf
+%%FONTSDIR%%/FiraSansCompressed-ExtraBoldItalic.otf
+%%FONTSDIR%%/FiraSansCompressed-ExtraLight.otf
+%%FONTSDIR%%/FiraSansCompressed-ExtraLightItalic.otf
+%%FONTSDIR%%/FiraSansCompressed-Four.otf
+%%FONTSDIR%%/FiraSansCompressed-FourItalic.otf
+%%FONTSDIR%%/FiraSansCompressed-Hair.otf
+%%FONTSDIR%%/FiraSansCompressed-HairItalic.otf
+%%FONTSDIR%%/FiraSansCompressed-Heavy.otf
+%%FONTSDIR%%/FiraSansCompressed-HeavyItalic.otf
+%%FONTSDIR%%/FiraSansCompressed-Italic.otf
+%%FONTSDIR%%/FiraSansCompressed-Light.otf
+%%FONTSDIR%%/FiraSansCompressed-LightItalic.otf
+%%FONTSDIR%%/FiraSansCompressed-Medium.otf
+%%FONTSDIR%%/FiraSansCompressed-MediumItalic.otf
+%%FONTSDIR%%/FiraSansCompressed-Regular.otf
+%%FONTSDIR%%/FiraSansCompressed-SemiBold.otf
+%%FONTSDIR%%/FiraSansCompressed-SemiBoldItalic.otf
+%%FONTSDIR%%/FiraSansCompressed-Thin.otf
+%%FONTSDIR%%/FiraSansCompressed-ThinItalic.otf
+%%FONTSDIR%%/FiraSansCompressed-Two.otf
+%%FONTSDIR%%/FiraSansCompressed-TwoItalic.otf
+%%FONTSDIR%%/FiraSansCompressed-UltraLight.otf
+%%FONTSDIR%%/FiraSansCompressed-UltraLightItalic.otf
+%%FONTSDIR%%/FiraSansCondensed-Bold.otf
+%%FONTSDIR%%/FiraSansCondensed-BoldItalic.otf
+%%FONTSDIR%%/FiraSansCondensed-Book.otf
+%%FONTSDIR%%/FiraSansCondensed-BookItalic.otf
+%%FONTSDIR%%/FiraSansCondensed-Eight.otf
+%%FONTSDIR%%/FiraSansCondensed-EightItalic.otf
+%%FONTSDIR%%/FiraSansCondensed-ExtraBold.otf
+%%FONTSDIR%%/FiraSansCondensed-ExtraBoldItalic.otf
+%%FONTSDIR%%/FiraSansCondensed-ExtraLight.otf
+%%FONTSDIR%%/FiraSansCondensed-ExtraLightItalic.otf
+%%FONTSDIR%%/FiraSansCondensed-Four.otf
+%%FONTSDIR%%/FiraSansCondensed-FourItalic.otf
+%%FONTSDIR%%/FiraSansCondensed-Hair.otf
+%%FONTSDIR%%/FiraSansCondensed-HairItalic.otf
+%%FONTSDIR%%/FiraSansCondensed-Heavy.otf
+%%FONTSDIR%%/FiraSansCondensed-HeavyItalic.otf
+%%FONTSDIR%%/FiraSansCondensed-Italic.otf
+%%FONTSDIR%%/FiraSansCondensed-Light.otf
+%%FONTSDIR%%/FiraSansCondensed-LightItalic.otf
+%%FONTSDIR%%/FiraSansCondensed-Medium.otf
+%%FONTSDIR%%/FiraSansCondensed-MediumItalic.otf
+%%FONTSDIR%%/FiraSansCondensed-Regular.otf
+%%FONTSDIR%%/FiraSansCondensed-SemiBold.otf
+%%FONTSDIR%%/FiraSansCondensed-SemiBoldItalic.otf
+%%FONTSDIR%%/FiraSansCondensed-Thin.otf
+%%FONTSDIR%%/FiraSansCondensed-ThinItalic.otf
+%%FONTSDIR%%/FiraSansCondensed-Two.otf
+%%FONTSDIR%%/FiraSansCondensed-TwoItalic.otf
+%%FONTSDIR%%/FiraSansCondensed-UltraLight.otf
+%%FONTSDIR%%/FiraSansCondensed-UltraLightItalic.otf