From owner-svn-ports-head@freebsd.org Thu Jul 16 06:36:56 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E0FEA9A3FAE; Thu, 16 Jul 2015 06:36:56 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CD234125C; Thu, 16 Jul 2015 06:36:56 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6G6auoA027433; Thu, 16 Jul 2015 06:36:56 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6G6atdA027428; Thu, 16 Jul 2015 06:36:55 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201507160636.t6G6atdA027428@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Thu, 16 Jul 2015 06:36:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392277 - in head/www/fira-webfont: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jul 2015 06:36:57 -0000 Author: riggs Date: Thu Jul 16 06:36:54 2015 New Revision: 392277 URL: https://svnweb.freebsd.org/changeset/ports/392277 Log: Update to upstream version 4.102 PR: 200455 Submitted by: horia@racoviceanu.com (maintainer) Modified: head/www/fira-webfont/Makefile head/www/fira-webfont/distinfo head/www/fira-webfont/files/pkg-message.in head/www/fira-webfont/pkg-descr head/www/fira-webfont/pkg-plist Modified: head/www/fira-webfont/Makefile ============================================================================== --- head/www/fira-webfont/Makefile Thu Jul 16 06:33:44 2015 (r392276) +++ head/www/fira-webfont/Makefile Thu Jul 16 06:36:54 2015 (r392277) @@ -2,59 +2,75 @@ # $FreeBSD$ PORTNAME= fira -PORTVERSION= 3.111 +PORTVERSION= 4.104 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,bp +MASTER_SITE_SUBDIR= ${PORTNAME}_4_1/:sans,bp ${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}:bp \ + ${DISTNAME}Fonts${PORTVERSION:S|.||}${EXTRACT_SUFX}:sans \ + ${DISTNAME}MonoFonts${MONO_VERSION}${EXTRACT_SUFX}:mono +EXTRACT_ONLY= ${DISTFILES:C|:[^:]+$||:M*.zip} MAINTAINER= horia@racoviceanu.com COMMENT= Sans-serif and monospaced Web Font for small screens LICENSE= OFL11 +LICENSE_FILE= ${WRKSRC}/${DISTNAME}Fonts${PORTVERSION:S|.||}/License.txt 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= * +MONO_VERSION= 3204 + 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 + +.include + do-install: @${MKDIR} ${STAGEDIR}${WWWDIR} -.for b in index.html fira.css +.for b in index.html ${PORTNAME:S|$|.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}/${DISTFILES:C|:[^:]+$||:M*.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 Modified: head/www/fira-webfont/distinfo ============================================================================== --- head/www/fira-webfont/distinfo Thu Jul 16 06:33:44 2015 (r392276) +++ head/www/fira-webfont/distinfo Thu Jul 16 06:36:54 2015 (r392277) @@ -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 (FiraBoilerplate4104.zip) = 015981db296f4079bcb0a66381a53163ff30a49127556cf200f879c2474dca23 +SIZE (FiraBoilerplate4104.zip) = 2240 +SHA256 (FiraFonts4104.zip) = 4d4cd7163add883793e20047c9bf021273d01946fe5151e4e197f4c6450714c5 +SIZE (FiraFonts4104.zip) = 27428940 +SHA256 (FiraMonoFonts3204.zip) = 4a986f97f3ea9baee0f419042327a71941e2e9ef94783b01e6739718d6e1da5e +SIZE (FiraMonoFonts3204.zip) = 1235937 +SHA256 (Fira_4_1_Version_Report.rtf) = 2b83420236277d2b2c6f0808304222bbb4e78c4eddaec89937570bf2f250a461 +SIZE (Fira_4_1_Version_Report.rtf) = 16229 +SHA256 (FiraPDF4104.zip) = dca2b4f2145e6b8a5e85cdae6942f3d051ee29eb82e44d58fff9672a2ffba5d5 +SIZE (FiraPDF4104.zip) = 39206693 +SHA256 (FiraMonoPDF3204.zip) = 1ab555cf6d4d3825691c23f819feceac779351e0d79e43a468b2ebbdd313d0fb +SIZE (FiraMonoPDF3204.zip) = 2333862 +SHA256 (FiraUFO_beta4104.zip) = 34a9e0800b46514b5465f384e138cecc4aaf3dbb83c5ccbf3cc4bcbce7903a76 +SIZE (FiraUFO_beta4104.zip) = 14447522 +SHA256 (FiraMonoUFO_beta3204.zip) = 58a7e4cc74716090cbf22ffb45c0fece37e50dee8b76dfe880994f798b3b8740 +SIZE (FiraMonoUFO_beta3204.zip) = 1799679 Modified: head/www/fira-webfont/files/pkg-message.in ============================================================================== --- head/www/fira-webfont/files/pkg-message.in Thu Jul 16 06:33:44 2015 (r392276) +++ head/www/fira-webfont/files/pkg-message.in Thu Jul 16 06:36:54 2015 (r392277) @@ -7,7 +7,7 @@ Get started right away with the provided 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 Modified: head/www/fira-webfont/pkg-descr ============================================================================== --- head/www/fira-webfont/pkg-descr Thu Jul 16 06:33:44 2015 (r392276) +++ head/www/fira-webfont/pkg-descr Thu Jul 16 06:36:54 2015 (r392277) @@ -4,7 +4,7 @@ Sans Serif with 16 weights all accompani 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/ Modified: head/www/fira-webfont/pkg-plist ============================================================================== --- head/www/fira-webfont/pkg-plist Thu Jul 16 06:33:44 2015 (r392276) +++ head/www/fira-webfont/pkg-plist Thu Jul 16 06:36:54 2015 (r392277) @@ -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