Update to 4.102

PR:		200453
Submitted by:	Horia Racoviceanu (maintainer)

4 files changed, 49 insertions, 30 deletions

diff --git a/x11-fonts/fira/Makefile b/x11-fonts/fira/Makefile
index 5f5f4806e7f..3eb7e31a1ea 100644
--- a/x11-fonts/fira/Makefile
+++ b/x11-fonts/fira/Makefile
@@ -2,17 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	fira
-PORTVERSION=	3.111
-PORTREVISION=	1
+PORTVERSION=	4.102
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://www.carrois.com/wordpress/downloads/${PORTNAME}_3_1/ \
-		SF/horia/${CATEGORIES}/${PORTNAME}/
-DISTNAME=	${PORTNAME:S|f|F|}Fonts${PORTVERSION:S|.||}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${PORTNAME:S|f|F|}PDF${PORTVERSION:S|.||}${EXTRACT_SUFX} \
-		${PORTNAME:S|f|F|}UFO_beta${PORTVERSION:S|.||}${EXTRACT_SUFX} \
-		Version_Report.rtf
-EXTRACT_ONLY=	${DISTFILES:C|Version.*||}
+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${MINOR_VERSION}${EXTRACT_SUFX}:mono
+EXTRACT_ONLY=	${DISTFILES:C|:[^:]+$||:M*${EXTRACT_SUFX}}
 
 MAINTAINER=	horia@racoviceanu.com
 COMMENT=	Sans-serif and monospaced typeface for small screens
@@ -21,29 +19,44 @@ LICENSE=	OFL11
 
 USES=		fonts zip
 USE_XORG=	x11
-NO_BUILD=	yes
 NO_ARCH=	yes
+NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
 SUB_FILES=	pkg-message
 
-PORTDOCS=	Version_Report.rtf \
-		${PORTNAME:S|f|F|}*.pdf
-
+PORTDOCS=	*.pdf *.rtf
 PORTEXAMPLES=	*
 
+MINOR_VERSION=	3202
+
 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${MINOR_VERSION}${EXTRACT_SUFX}:mono
+EXAMPLES_DISTFILES=	${DISTNAME}UFO_beta${PORTVERSION:S|.||}${EXTRACT_SUFX}:sans \
+			${DISTNAME}MonoUFO_beta${MINOR_VERSION}${EXTRACT_SUFX}:mono
+
+.include <bsd.port.options.mk>
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME:S|f|F|}*${PORTVERSION:S|.||}/OTF/${PORTNAME:S|f|F|}*.otf \
+	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}*Fonts*/OTF/*.otf \
 		${STAGEDIR}${FONTSDIR}
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${CP} ${DISTDIR}/Version_Report.rtf ${WRKSRC}/
-	${CP} ${WRKDIR}/${PORTNAME:S|f|F|}PDF${PORTVERSION:S|.||}/${PORTNAME:S|f|F|}*.pdf ${WRKSRC}/
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${CP} ${DISTDIR}/${DISTNAME}_4_1_Version_Report.rtf ${WRKSRC}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|:M*.rtf} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/${DISTNAME}*PDF*/|:M*.pdf} \
+		${STAGEDIR}${DOCSDIR}
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	(cd ${WRKDIR}/${PORTNAME:S|f|F|}UFO_beta${PORTVERSION:S|.||} && \
-		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
+. for e in ${EXAMPLES_DISTFILES:R:C|:[^:]+$||}
+	(cd ${WRKDIR}/${e} && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
+. endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/fira/distinfo b/x11-fonts/fira/distinfo
index 83117cdfc1e..615db7fd27b 100644
--- a/x11-fonts/fira/distinfo
+++ b/x11-fonts/fira/distinfo
@@ -1,8 +1,14 @@
-SHA256 (FiraFonts3111.zip) = 3ced3df236b0b0eec1b390885c53ac02f3e3f830e9449414230717334a0b2457
-SIZE (FiraFonts3111.zip) = 11902303
-SHA256 (FiraPDF3111.zip) = c742d06a41194cbf196838d702db650a2873e5a46c0dd7548c936b635d85c1be
-SIZE (FiraPDF3111.zip) = 20229008
-SHA256 (FiraUFO_beta3111.zip) = 8405618a11ac0601345156fc7a60d42fb80c1f9dad349c387bca59957f2dcf44
-SIZE (FiraUFO_beta3111.zip) = 7083232
-SHA256 (Version_Report.rtf) = fed531be5dfee0cb54bd4133e02f7a93d95edbfb6999ff4a0ee41c8b67479c5e
-SIZE (Version_Report.rtf) = 5743
+SHA256 (FiraFonts4102.zip) = a5032bc17eb8526b7076211503a83750672dd0f3e18d098cb5cc07ea99098427
+SIZE (FiraFonts4102.zip) = 26976070
+SHA256 (FiraMonoFonts3202.zip) = c15c85431d764966a0adb31689542f4d18209620bac2051bbc8c437d5dce619a
+SIZE (FiraMonoFonts3202.zip) = 1205814
+SHA256 (Fira_4_1_Version_Report.rtf) = 7136fabd95355853243944e4434edcee9c11394877b1d92966e8f7477a3be8df
+SIZE (Fira_4_1_Version_Report.rtf) = 15605
+SHA256 (FiraPDF4102.zip) = 8b6a844d539b27a7dc0271422d82aaf72350e731b61218a04242f9a569ada7a9
+SIZE (FiraPDF4102.zip) = 39193171
+SHA256 (FiraMonoPDF3202.zip) = 115ad4e42ff8c71c82ead46702db7c82a31afe08d71507d25a82bbc407161b7a
+SIZE (FiraMonoPDF3202.zip) = 2333958
+SHA256 (FiraUFO_beta4102.zip) = dfb83d98ae1aec189b84a3189ec9f8726bb88720ce78679ac185e2f9349056fc
+SIZE (FiraUFO_beta4102.zip) = 9655731
+SHA256 (FiraMonoUFO_beta3202.zip) = cab1344024fa1577427d9e1ef23dd7c0d21d43f0b57b224b2a74232284d72c2e
+SIZE (FiraMonoUFO_beta3202.zip) = 1331393
diff --git a/x11-fonts/fira/files/pkg-message.in b/x11-fonts/fira/files/pkg-message.in
index 6d36cb36fcb..c9fd7b7750c 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-3-1/
+    http://www.carrois.com/fira-4-1/
  
 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 7b89e0cb3e8..d42e45e6f7c 100644
--- a/x11-fonts/fira/pkg-descr
+++ b/x11-fonts/fira/pkg-descr
@@ -7,4 +7,4 @@ UFO source files are included in examples.
 Available formats: Open Type
 *supports advanced Open Type typographic layout features and languages
 
-WWW: http://www.carrois.com/fira-3-1/
+WWW: http://www.carrois.com/fira-4-1/