Attachment 157149 Details for Bug 200455 – fira-webfont.diff

[patch] fira-webfont.diff

fira-webfont.diff (text/plain), 8.55 KB, created by Horia Racoviceanu on 2015-05-26 05:25:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Horia Racoviceanu

Created: 2015-05-26 05:25:42 UTC

Size: 8.55 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 387365)
>+++ Makefile	(working copy)
>@@ -2,19 +2,17 @@
> # $FreeBSD$
> 
> PORTNAME=	fira
>-PORTVERSION=	3.111
>+PORTVERSION=	4.102
> CATEGORIES=	www
>-MASTER_SITES=	http://www.carrois.com/wordpress/downloads/${PORTNAME}_3_1/ \
>-		SF/horia/${CATEGORIES}/${PORTNAME}${PKGNAMESUFFIX}/ \
>-		SF/horia/${CATEGORIES}/${PORTNAME}${PKGNAMESUFFIX}/:bp
>+MASTER_SITES=	http://www.carrois.com/downloads/%SUBDIR%/:sans,mono \
>+		SF/horia/${CATEGORIES}/${PORTNAME}${PKGNAMESUFFIX}/%SUBDIR%/:sans,mono
>+MASTER_SITE_SUBDIR=	${PORTNAME}_4_1/:sans ${PORTNAME}_mono_3_2/:mono
> PKGNAMESUFFIX=	-webfont
>-DISTNAME=	${PORTNAME:S|f|F|}Fonts${PORTVERSION:S|.||}
>-DISTFILES=	${PORTNAME:S|f|F|}Boilerplate${PORTVERSION:S|.||}${EXTRACT_SUFX}:bp \
>-		${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.*||:S|:bp||}
>+DISTNAME=	${PORTNAME:S|f|F|}
>+DISTFILES=	${DISTNAME}Boilerplate${PORTVERSION:S|.||}${EXTRACT_SUFX}:sans \
>+		${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 Web Font for small screens
>@@ -22,39 +20,56 @@
> LICENSE=	OFL11
> 
> USES=		zip
>+NO_ARCH=	yes
> NO_BUILD=	yes
>+NO_WRKSUBDIR=	yes
> 
> SUB_FILES=	pkg-message
> PLIST_SUB=	WWWDIR_REL="${WWWDIR_REL}"
> 
> DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
>-PORTDOCS=	Version_Report.rtf \
>-		${PORTNAME:S|f|F|}*.pdf
>+PORTDOCS=	*.pdf *.rtf
> 
> EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}${PKGNAMESUFFIX}
> 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}${WWWDIR}
> .for b in index.html fira.css
> 	${INSTALL_DATA} \
>-	${WRKDIR}/${PORTNAME:S|f|F|}Boilerplate${PORTVERSION:S|.||}/${b} \
>+	${WRKDIR}/${DISTNAME}Boilerplate${PORTVERSION:S|.||}/${b} \
> 		${STAGEDIR}${WWWDIR}
> .endfor
>-.for w in eot ttf woff
>+.for w in eot ttf woff woff2
> 	@${MKDIR} ${STAGEDIR}${WWWDIR}/${w}
>-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME:S|f|F|}*${PORTVERSION:S|.||}/WEB/${PORTNAME:S|f|F|}*.${w} \
>+	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}*Fonts*/WEB/${w:tu}/${DISTNAME}*.${w} \
> 		${STAGEDIR}${WWWDIR}/${w}/
> .endfor
>+.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>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 387365)
>+++ distinfo	(working copy)
>@@ -1,10 +1,16 @@
>-SHA256 (FiraBoilerplate3111.zip) = 2cf2adb0dfabdb622e505ac36104560c185b6560afd7ba57560746bbe129dae3
>-SIZE (FiraBoilerplate3111.zip) = 2172
>-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 (FiraBoilerplate4102.zip) = 76ce4e29648c841350595f08bf3601e166d6f277e710806f1fba83406b0e1c48
>+SIZE (FiraBoilerplate4102.zip) = 2408
>+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
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 387365)
>+++ files/pkg-message.in	(working copy)
>@@ -7,7 +7,7 @@
> 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
> 
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 387365)
>+++ pkg-descr	(working copy)
>@@ -4,7 +4,7 @@
> includes a Mono Spaced variant with 3 weights (regular, medium and bold). The
> UFO source files are included in examples.
> 
>-Web Font: EOT, WOFF, TTF, and boilerplate HTML+CSS
>+Web Font: EOT, WOFF, WOFF2, TTF, and boilerplate HTML+CSS
> *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/
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 387365)
>+++ pkg-plist	(working copy)
>@@ -105,7 +105,38 @@
> %%WWWDIR_REL%%/woff/FiraSans-UltraItalic.woff
> %%WWWDIR_REL%%/woff/FiraSans-UltraLight.woff
> %%WWWDIR_REL%%/woff/FiraSans-UltraLightItalic.woff
>-@dirrm %%WWWDIR_REL%%/eot
>-@dirrm %%WWWDIR_REL%%/ttf
>-@dirrm %%WWWDIR_REL%%/woff
>-@dirrm %%WWWDIR_REL%%
>+%%WWWDIR_REL%%/woff2/FiraMono-Bold.woff2
>+%%WWWDIR_REL%%/woff2/FiraMono-Medium.woff2
>+%%WWWDIR_REL%%/woff2/FiraMono-Regular.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-Bold.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-BoldItalic.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-Book.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-BookItalic.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-Eight.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-EightItalic.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-ExtraBold.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-ExtraBoldItalic.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-ExtraLight.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-ExtraLightItalic.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-Four.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-FourItalic.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-Hair.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-HairItalic.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-Heavy.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-HeavyItalic.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-Italic.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-Light.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-LightItalic.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-Medium.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-MediumItalic.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-Regular.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-SemiBold.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-SemiBoldItalic.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-Thin.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-ThinItalic.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-Two.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-TwoItalic.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-Ultra.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-UltraItalic.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-UltraLight.woff2
>+%%WWWDIR_REL%%/woff2/FiraSans-UltraLightItalic.woff2

Actions: View | Diff

Attachments on bug 200455: 157149 | 157157 | 157741 | 157785 | 157786 | 157787 | 157788 | 158262 | 158263 | 158264 | 158265 | 158266