Sync webfonts collection with mscorefonts2.

- Update Arial, Times, Trebuchet and Verdana fonts to y2006 version.
- Include ClearType fonts: Calibri, Cambria, Consolas, Constantia, Corbel.

Add LICENSE information while I'm here.

PR:		213512
Submitted by:	Vladimir Kondratyev

4 files changed, 57 insertions, 18 deletions

diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile
index 42eb7597f5af..f7de18f20755 100644
--- a/x11-fonts/webfonts/Makefile
+++ b/x11-fonts/webfonts/Makefile
@@ -3,20 +3,25 @@
 
 PORTNAME=	webfonts
 PORTVERSION=	0.30
-PORTREVISION=	11
+PORTREVISION=	12
 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 \
-		SF/corefonts/OldFiles/:group2
-DISTFILES=	andale32.exe:group1 arial32.exe:group1 arialb32.exe:group1 \
-		comic32.exe:group1 courie32.exe:group1 georgi32.exe:group1 \
-		impact32.exe:group1 times32.exe:group1 trebuc32.exe:group1 \
-		verdan32.exe:group1 webdin32.exe:group1
+		SF/corefonts/OldFiles/:group2 \
+		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
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	TrueType core fonts for the Web
 
+LICENSE=	EULA
+LICENSE_NAME=	End User License Agreement
+LICENSE_FILE=	${WRKSRC}/licen.txt
+LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
+
 EXTRACT_DEPENDS=cabextract:archivers/cabextract
 
 USES=		fonts
@@ -27,12 +32,15 @@ EXTRACT_CMD=		${LOCALBASE}/bin/cabextract
 EXTRACT_BEFORE_ARGS=	-qLF '*.ttf' -d ${WRKSRC}
 EXTRACT_AFTER_ARGS=
 
-OPTIONS_DEFINE=	EXTRAFONTS
+OPTIONS_DEFINE=	EXTRAFONTS CLEARTYPE
 OPTIONS_SUB=	yes
 
 EXTRAFONTS_DESC=	Fonts licensed under MS Windows license
 EXTRAFONTS_DISTFILES=	IELPKTH.CAB:group2
 
+CLEARTYPE_DESC=	Install ClearType fonts
+CLEARTYPE_DISTFILES=	PowerPointViewer.exe:group3
+
 SUB_FILES=	pkg-message
 
 .include <bsd.port.options.mk>
@@ -40,10 +48,20 @@ SUB_FILES=	pkg-message
 post-extract:
 	${EXTRACT_CMD} -qLF '*.txt' -d ${WRKSRC} ${_DISTDIR}/webdin32.exe
 
+post-extract-CLEARTYPE-on:
+	${EXTRACT_CMD} -qLF '*.cab' -d ${WRKSRC} \
+		${_DISTDIR}/PowerPointViewer.exe
+	${EXTRACT_CMD} -qLF '*.txt' -d ${WRKSRC} \
+		${_DISTDIR}/PowerPointViewer.exe
+	${EXTRACT_CMD} -qLF '*.ttf' -d ${WRKSRC} ${WRKSRC}/ppviewer.cab
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/licen.txt ${STAGEDIR}${DOCSDIR}/LICENSE
 
+post-install-CLEARTYPE-on:
+	${INSTALL_DATA} ${WRKSRC}/eula.txt ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/x11-fonts/webfonts/distinfo b/x11-fonts/webfonts/distinfo
index d78b5cf0f665..9ae3200d54f0 100644
--- a/x11-fonts/webfonts/distinfo
+++ b/x11-fonts/webfonts/distinfo
@@ -1,8 +1,6 @@
-TIMESTAMP = 1468745172
+TIMESTAMP = 1475927079
 SHA256 (webfonts/andale32.exe) = 0524fe42951adc3a7eb870e32f0920313c71f170c859b5f770d82b4ee111e970
 SIZE (webfonts/andale32.exe) = 198384
-SHA256 (webfonts/arial32.exe) = 85297a4d146e9c87ac6f74822734bdee5f4b2a722d7eaa584b7f2cbf76f478f6
-SIZE (webfonts/arial32.exe) = 554208
 SHA256 (webfonts/arialb32.exe) = a425f0ffb6a1a5ede5b979ed6177f4f4f4fdef6ae7c302a7b7720ef332fec0a8
 SIZE (webfonts/arialb32.exe) = 168176
 SHA256 (webfonts/comic32.exe) = 9c6df3feefde26d4e41d4a4fe5db2a89f9123a772594d7f59afd062625cd204e
@@ -13,13 +11,11 @@ SHA256 (webfonts/georgi32.exe) = 2c2c7dcda6606ea5cf08918fb7cd3f3359e9e84338dc690
 SIZE (webfonts/georgi32.exe) = 392440
 SHA256 (webfonts/impact32.exe) = 6061ef3b7401d9642f5dfdb5f2b376aa14663f6275e60a51207ad4facf2fccfb
 SIZE (webfonts/impact32.exe) = 173288
-SHA256 (webfonts/times32.exe) = db56595ec6ef5d3de5c24994f001f03b2a13e37cee27bc25c58f6f43e8f807ab
-SIZE (webfonts/times32.exe) = 661728
-SHA256 (webfonts/trebuc32.exe) = 5a690d9bb8510be1b8b4fe49f1f2319651fe51bbe54775ddddd8ef0bd07fdac9
-SIZE (webfonts/trebuc32.exe) = 357200
-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
+SIZE (webfonts/EUupdate.EXE) = 1675184
+SHA256 (webfonts/PowerPointViewer.exe) = c4e753548d3092ffd7dd3849105e0a26d9b5a1afe46e6e667fe7c6887893701f
+SIZE (webfonts/PowerPointViewer.exe) = 27024112
 SHA256 (webfonts/IELPKTH.CAB) = c1be3fb8f0042570be76ec6daa03a99142c88367c1bc810240b85827c715961a
 SIZE (webfonts/IELPKTH.CAB) = 411248
diff --git a/x11-fonts/webfonts/pkg-descr b/x11-fonts/webfonts/pkg-descr
index c63f602ea7db..db60bf72bcf4 100644
--- a/x11-fonts/webfonts/pkg-descr
+++ b/x11-fonts/webfonts/pkg-descr
@@ -1,8 +1,9 @@
 This is a collection of high quality and free to use TrueType fonts created by
 Monotype and Microsoft Typography.  It consists of the following families:
 
-      Times New Roman, Courier New, Georgia, Trebuchet MS, Comic Sans MS
-      Arial, Arial Black, Verdana, Andale Mono, Impact
+      Times New Roman, Courier New, Georgia, Trebuchet MS, Comic
+      Sans MS Arial, Arial Black, Verdana, Andale Mono, Impact,
+      Calibri, Cambria, Consolas, Constantia, Corbel
 
 They contain all 652 glyphs defined in WGL4 and are available in the following
 encodings:
diff --git a/x11-fonts/webfonts/pkg-plist b/x11-fonts/webfonts/pkg-plist
index c545d6c7d576..266817153f11 100644
--- a/x11-fonts/webfonts/pkg-plist
+++ b/x11-fonts/webfonts/pkg-plist
@@ -1,12 +1,36 @@
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%CLEARTYPE%%%%PORTDOCS%%%%DOCSDIR%%/eula.txt
 %%FONTSDIR%%/andalemo.ttf
 %%FONTSDIR%%/arial.ttf
 %%FONTSDIR%%/arialbd.ttf
 %%FONTSDIR%%/arialbi.ttf
 %%FONTSDIR%%/ariali.ttf
 %%FONTSDIR%%/ariblk.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/calibri.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/calibrib.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/calibrii.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/calibriz.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/cambriab.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/cambriai.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/cambriaz.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/candara.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/candarab.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/candarai.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/candaraz.ttf
 %%FONTSDIR%%/comic.ttf
 %%FONTSDIR%%/comicbd.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/consola.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/consolab.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/consolai.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/consolaz.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/constan.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/constanb.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/constani.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/constanz.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/corbel.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/corbelb.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/corbeli.ttf
+%%CLEARTYPE%%%%FONTSDIR%%/corbelz.ttf
 %%FONTSDIR%%/cour.ttf
 %%FONTSDIR%%/courbd.ttf
 %%FONTSDIR%%/courbi.ttf