From d4058294f65f4ae3c934aa2b117514a0a0273585 Mon Sep 17 00:00:00 2001
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Wed, 19 Oct 2016 09:04:41 +0000
Subject: Provide a NEWVERDANA option (off by default) to install the y2006
 version of Verdana.

Some glyphs of Verdana Bold y2006 are not rendered correctly by
freetype in anti-aliased mode.

PR:		213512
Submitted by:	Vladimir Kondratyev
---
 x11-fonts/webfonts/Makefile             | 16 ++++++++++++----
 x11-fonts/webfonts/distinfo             |  4 +++-
 x11-fonts/webfonts/files/pkg-message.in |  4 ++++
 3 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'x11-fonts')

diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile
index f7de18f20755..f442098952ad 100644
--- a/x11-fonts/webfonts/Makefile
+++ b/x11-fonts/webfonts/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	webfonts
 PORTVERSION=	0.30
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF/corefonts/the%20fonts/final:group1 \
 		ftp://ftp.botik.ru/rented/znamensk/distributions/ftp.vsu.ru/pub/tex/font-packs/mscore/:group1 \
@@ -11,7 +11,7 @@ MASTER_SITES=	SF/corefonts/the%20fonts/final:group1 \
 		SF/mscorefonts2/cabs:group3
 DISTFILES=	andale32.exe:group1 arialb32.exe:group1 comic32.exe:group1 \
 		courie32.exe:group1 georgi32.exe:group1 impact32.exe:group1 \
-		webdin32.exe:group1 EUupdate.EXE:group3
+		verdan32.exe:group1 webdin32.exe:group1 EUupdate.EXE:group3
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	olgeni@FreeBSD.org
@@ -29,10 +29,10 @@ NO_BUILD=	yes
 RESTRICTED=	Restrictive license - cannot sell for profit or distribute in modified form
 
 EXTRACT_CMD=		${LOCALBASE}/bin/cabextract
-EXTRACT_BEFORE_ARGS=	-qLF '*.ttf' -d ${WRKSRC}
+EXTRACT_BEFORE_ARGS=	-qLF '[a-uw-z]*.ttf' -d ${WRKSRC}
 EXTRACT_AFTER_ARGS=
 
-OPTIONS_DEFINE=	EXTRAFONTS CLEARTYPE
+OPTIONS_DEFINE=	EXTRAFONTS CLEARTYPE NEWVERDANA
 OPTIONS_SUB=	yes
 
 EXTRAFONTS_DESC=	Fonts licensed under MS Windows license
@@ -41,6 +41,8 @@ EXTRAFONTS_DISTFILES=	IELPKTH.CAB:group2
 CLEARTYPE_DESC=	Install ClearType fonts
 CLEARTYPE_DISTFILES=	PowerPointViewer.exe:group3
 
+NEWVERDANA_DESC=	Install y2006 version of Verdana (broken bold N, W)
+
 SUB_FILES=	pkg-message
 
 .include <bsd.port.options.mk>
@@ -55,6 +57,12 @@ post-extract-CLEARTYPE-on:
 		${_DISTDIR}/PowerPointViewer.exe
 	${EXTRACT_CMD} -qLF '*.ttf' -d ${WRKSRC} ${WRKSRC}/ppviewer.cab
 
+post-extract-NEWVERDANA-off:
+	${EXTRACT_CMD} -qLF '*.ttf' -d ${WRKSRC} ${_DISTDIR}/verdan32.exe
+
+post-extract-NEWVERDANA-on:
+	${EXTRACT_CMD} -qLF 'v*.ttf' -d ${WRKSRC} ${_DISTDIR}/EUupdate.EXE
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
diff --git a/x11-fonts/webfonts/distinfo b/x11-fonts/webfonts/distinfo
index 9ae3200d54f0..fadb1c93f399 100644
--- a/x11-fonts/webfonts/distinfo
+++ b/x11-fonts/webfonts/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1475927079
+TIMESTAMP = 1476861189
 SHA256 (webfonts/andale32.exe) = 0524fe42951adc3a7eb870e32f0920313c71f170c859b5f770d82b4ee111e970
 SIZE (webfonts/andale32.exe) = 198384
 SHA256 (webfonts/arialb32.exe) = a425f0ffb6a1a5ede5b979ed6177f4f4f4fdef6ae7c302a7b7720ef332fec0a8
@@ -11,6 +11,8 @@ SHA256 (webfonts/georgi32.exe) = 2c2c7dcda6606ea5cf08918fb7cd3f3359e9e84338dc690
 SIZE (webfonts/georgi32.exe) = 392440
 SHA256 (webfonts/impact32.exe) = 6061ef3b7401d9642f5dfdb5f2b376aa14663f6275e60a51207ad4facf2fccfb
 SIZE (webfonts/impact32.exe) = 173288
+SHA256 (webfonts/verdan32.exe) = c1cb61255e363166794e47664e2f21af8e3a26cb6346eb8d2ae2fa85dd5aad96
+SIZE (webfonts/verdan32.exe) = 351992
 SHA256 (webfonts/webdin32.exe) = 64595b5abc1080fba8610c5c34fab5863408e806aafe84653ca8575bed17d75a
 SIZE (webfonts/webdin32.exe) = 185072
 SHA256 (webfonts/EUupdate.EXE) = 464dd2cd5f09f489f9ac86ea7790b7b8548fc4e46d9f889b68d2cdce47e09ea8
diff --git a/x11-fonts/webfonts/files/pkg-message.in b/x11-fonts/webfonts/files/pkg-message.in
index b6b58147a0a1..505a0c8eab39 100644
--- a/x11-fonts/webfonts/files/pkg-message.in
+++ b/x11-fonts/webfonts/files/pkg-message.in
@@ -11,3 +11,7 @@ line to the "Modules" section of xorg.conf or XF86Config:
 Add the following line to the "Files" section of xorg.conf or XF86Config:
 
 	FontPath "%%FONTSDIR%%/"
+
+NOTE: Due to known freetype bug some glyphs (N, W) of y2006 Verdana Bold
+      font are not rendered correctly in anti-aliased mode within the range
+      9-16 ppem
-- 
cgit v1.2.3