Date: Sat, 22 Oct 2005 16:58:19 GMT From: Rostislav Krasny <rosti.bsd@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/87847: [patch] add Tahoma TTF fonts to x11-fonts/webfonts port Message-ID: <200510221658.j9MGwJ7e084844@www.freebsd.org> Resent-Message-ID: <200510221700.j9MH0aCi072038@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 87847 >Category: ports >Synopsis: [patch] add Tahoma TTF fonts to x11-fonts/webfonts port >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Oct 22 17:00:36 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Rostislav Krasny >Release: 6.0-RC1 >Organization: >Environment: FreeBSD saturn.lan 6.0-RC1 FreeBSD 6.0-RC1 #0: Mon Oct 10 08:53:52 IST 2005 root@saturn.lan:/usr/obj/usr/src/sys/GENERIC i386 >Description: The webfonts port does not install Tahoma TTF fonts because they wasn't included in the Microsoft's "TrueType core fonts for the Web" package. On the other hand a corefonts package (Linux and Sourceforge equivalent of the webfonts) does install Tahoma from Microsoft's site. You can check it on their msttcorefonts-1.3-4.spec by following URL: http://switch.dl.sourceforge.net/sourceforge/corefonts/msttcorefonts-1.3-4.spec I've added Tahoma TTF fonts to the x11-fonts/webfonts port by the same way, i.e. for those who have the license. >How-To-Repeat: >Fix: diff -ru /usr/ports/x11-fonts/webfonts.orig/Makefile /usr/ports/x11-fonts/webfonts/Makefile --- /usr/ports/x11-fonts/webfonts.orig/Makefile Fri Oct 21 12:50:31 2005 +++ /usr/ports/x11-fonts/webfonts/Makefile Sat Oct 22 17:40:30 2005 @@ -6,22 +6,30 @@ # PORTNAME= webfonts -PORTVERSION= 0.21 -PORTREVISION= 3 +PORTVERSION= 0.22 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_NETBSD:S/%SUBDIR%/ms-ttf/} \ - ${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/corefonts/} \ - ftp://ftp.uni-koeln.de/pc/win32/msoft/ \ - ftp://ftp.extra.ouh.nl/studie/alg/hulp/win/fonts/ \ - ftp://ftp.vn.ua/pub/win/freefont/ \ - ftp://ftp.vsu.ru/pub/tex/font-packs/mscore/ \ - ftp://ftp.directnet.ru/pub/fonts-win/ \ - ftp://ftp.sinn.ru/pub/win95/fonts/ \ - ftp://ftp.lexa.ru/pub/mirrors/ftp.vsu.ru/pub/tex/font-packs/mscore/ \ - ftp://ftp.botik.ru/rented/znamensk/distributions/ftp.vsu.ru/pub/tex/font-packs/mscore/ -DISTFILES= andale32.exe trebuc32.exe georgi32.exe verdan32.exe \ - comic32.exe arialb32.exe impact32.exe arial32.exe \ - times32.exe courie32.exe webdin32.exe +MASTER_SITES= ${MASTER_SITE_NETBSD:S/%SUBDIR%/ms-ttf/}:group1 \ + ${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/corefonts/}:group1 \ + ftp://ftp.uni-koeln.de/pc/win32/msoft/:group1 \ + ftp://ftp.extra.ouh.nl/studie/alg/hulp/win/fonts/:group1 \ + ftp://ftp.vn.ua/pub/win/freefont/:group1 \ + ftp://ftp.vsu.ru/pub/tex/font-packs/mscore/:group1 \ + ftp://ftp.directnet.ru/pub/fonts-win/:group1 \ + ftp://ftp.sinn.ru/pub/win95/fonts/:group1 \ + ftp://ftp.lexa.ru/pub/mirrors/ftp.vsu.ru/pub/tex/font-packs/mscore/:group1 \ + ftp://ftp.botik.ru/rented/znamensk/distributions/ftp.vsu.ru/pub/tex/font-packs/mscore/:group1 \ + http://download.microsoft.com/download/ie6sp1/finrel/6_sp1/W98NT42KMeXP/EN-US/:group2 \ + http://www.zeuscat.com/andrew/software/corefonts/:group2 \ + ftp://ftp.isu.edu.tw/pub/MsDownload/ie6sp1/en/: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 + +.if defined(HAVE_MSWINDOWS_LICENSE) +DISTFILES+= ielpkth.cab:group2 +.endif + DIST_SUBDIR= ${PORTNAME} MAINTAINER= kkonstan@duth.gr @@ -36,8 +44,8 @@ NO_PACKAGE= "Restrictive license - cannot distribute in modified form" EXTRACT_CMD= ${LOCALBASE}/bin/cabextract -EXTRACT_BEFORE_ARGS= --lowercase --quiet -EXTRACT_AFTER_ARGS= -d ${WRKSRC} +EXTRACT_BEFORE_ARGS= -qLF '*.ttf' -d ${WRKSRC} +EXTRACT_AFTER_ARGS= # # Local variables @@ -53,6 +61,13 @@ MSG_FILE= ${PKGDIR}/pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message +.if defined(HAVE_MSWINDOWS_LICENSE) +FONTS_LIST= ${FILESDIR}/fonts.dir.with_tahoma +.else +FONTS_LIST= ${FILESDIR}/fonts.dir +.endif +FONTS_FILE= ${WRKDIR}/fonts.dir + .include <bsd.port.pre.mk> .if ${X_WINDOW_SYSTEM:L} == xfree86-3 @@ -72,13 +87,16 @@ # Post-extract # post-extract: - ${RM} -f ${WRKSRC}/*.dll ${WRKSRC}/*.exe ${WRKSRC}/*.inf + ${EXTRACT_CMD} -qLF '*.txt' -d ${WRKSRC} ${_DISTDIR}/webdin32.exe # # Post-patch # post-patch: - ${SED} 's|%%FONTSDIR%%|${FONTSDIR}|g' ${MSG_FILE} > ${PKGMESSAGE} + ${SED} -e 's|%%FONTSDIR%%|${FONTSDIR}|g' \ + -e 's|%%DOCSDIR%%|${DOCSDIR}|g' \ + ${MSG_FILE} > ${PKGMESSAGE} + ${CP} ${FONTS_LIST} ${FONTS_FILE} # # Install @@ -86,8 +104,8 @@ do-install: ${MKDIR} ${FONTSDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSDIR} - ${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSDIR} - ${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSDIR}/fonts.scale + ${INSTALL_DATA} ${FONTS_FILE} ${FONTSDIR} + ${INSTALL_DATA} ${FONTS_FILE} ${FONTSDIR}/fonts.scale ${INSTALL_DATA} ${WRKSRC}/licen.txt ${DOCSDIR}/LICENSE .if ${X_WINDOW_SYSTEM:L} == xfree86-3 ${LN} -fs ${FONTSDIR} ${TTFONTSDIR}/${FONTNAME} diff -ru /usr/ports/x11-fonts/webfonts.orig/distinfo /usr/ports/x11-fonts/webfonts/distinfo --- /usr/ports/x11-fonts/webfonts.orig/distinfo Wed Mar 31 05:12:51 2004 +++ /usr/ports/x11-fonts/webfonts/distinfo Fri Oct 21 14:43:10 2005 @@ -20,3 +20,5 @@ SIZE (webfonts/courie32.exe) = 646368 MD5 (webfonts/webdin32.exe) = 230a1d13a365b22815f502eb24d9149b SIZE (webfonts/webdin32.exe) = 185072 +MD5 (webfonts/ielpkth.cab) = 358584cddb75ac90472c25f01b308ebe +SIZE (webfonts/ielpkth.cab) = 411248 Only in /usr/ports/x11-fonts/webfonts/files: fonts.dir.with_tahoma diff -ru /usr/ports/x11-fonts/webfonts.orig/pkg-message /usr/ports/x11-fonts/webfonts/pkg-message --- /usr/ports/x11-fonts/webfonts.orig/pkg-message Sun Aug 25 04:00:45 2002 +++ /usr/ports/x11-fonts/webfonts/pkg-message Sat Oct 22 16:24:33 2005 @@ -1,7 +1,7 @@ IMPORTANT - READ CAREFULLY: You may not use these fonts if you do not agree to the terms of the Microsoft End-User License Agreement ("EULA"). You will find -the EULA at %%FONTSDIR%%/LICENSE. If you read and agree -to the EULA, you can start using the fonts by following these insructions: +the EULA at %%DOCSDIR%%/LICENSE. If you read and agree +to the EULA, you can start using the fonts by following these instructions: --- XFree86 4.x.x (using the freetype module) diff -ru /usr/ports/x11-fonts/webfonts.orig/pkg-plist /usr/ports/x11-fonts/webfonts/pkg-plist --- /usr/ports/x11-fonts/webfonts.orig/pkg-plist Mon Sep 19 14:43:09 2005 +++ /usr/ports/x11-fonts/webfonts/pkg-plist Fri Oct 21 19:37:48 2005 @@ -11,7 +11,7 @@ %%FONTSDIR%%/courbd.ttf %%FONTSDIR%%/courbi.ttf %%FONTSDIR%%/couri.ttf -%%FCACHE%%@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true +%%FCACHE%%@unexec /bin/rm -f %D/%%FONTSDIR%%/fonts.cache-1 || /usr/bin/true %%FONTSDIR%%/fonts.dir %%FONTSDIR%%/fonts.scale %%FONTSDIR%%/georgia.ttf @@ -19,6 +19,8 @@ %%FONTSDIR%%/georgiai.ttf %%FONTSDIR%%/georgiaz.ttf %%FONTSDIR%%/impact.ttf +@unexec /bin/rm -f %D/%%FONTSDIR%%/tahoma.ttf || /usr/bin/true +@unexec /bin/rm -f %D/%%FONTSDIR%%/tahomabd.ttf || /usr/bin/true %%FONTSDIR%%/times.ttf %%FONTSDIR%%/timesbd.ttf %%FONTSDIR%%/timesbi.ttf There is also a new files/fonts.dir.with_tahoma file that could be made from files/fonts.dir by copying it and then applying following patch: --- /usr/ports/x11-fonts/webfonts/files/fonts.dir Thu Oct 20 18:20:39 2005 +++ /usr/ports/x11-fonts/webfonts/files/fonts.dir.with_tahoma Sat Oct 22 17:06:34 2005 @@ -1,4 +1,4 @@ -839 +913 andalemo.ttf -monotype-andale mono-book-r-monospaced--0-0-0-0-m-0-adobe-standard andalemo.ttf -monotype-andale mono-book-r-monospaced--0-0-0-0-m-0-ansi-1251 andalemo.ttf -monotype-andale mono-book-r-monospaced--0-0-0-0-m-0-ascii-0 @@ -500,6 +500,80 @@ impact.ttf -monotype-impact-bold-r-condensed--0-0-0-0-p-0-microsoft-cp1250 impact.ttf -monotype-impact-bold-r-condensed--0-0-0-0-p-0-microsoft-cp1251 impact.ttf -monotype-impact-bold-r-condensed--0-0-0-0-p-0-microsoft-cp1252 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-adobe-standard +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-ansi-1251 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-ascii-0 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-fcd8859-15 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-iso10646-1 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-iso8859-1 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-iso8859-10 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-iso8859-11 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-iso8859-13 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-iso8859-15 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-iso8859-16 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-iso8859-2 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-iso8859-3 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-iso8859-4 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-iso8859-5 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-iso8859-6 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-iso8859-7 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-iso8859-8 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-iso8859-9 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-koi8-e +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-koi8-r +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-koi8-ru +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-koi8-u +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-koi8-uni +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-microsoft-ansi +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-microsoft-cp1250 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-microsoft-cp1251 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-microsoft-cp1252 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-mulearabic-0 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-mulearabic-1 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-mulearabic-2 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-tcvn-0 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-tis620-0 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-tis620-2 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-tis620.2529-1 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-tis620.2533-0 +tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-tis620.2533-1 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-adobe-standard +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-ansi-1251 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-ascii-0 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-fcd8859-15 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-iso10646-1 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-iso8859-1 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-iso8859-10 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-iso8859-11 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-iso8859-13 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-iso8859-15 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-iso8859-16 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-iso8859-2 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-iso8859-3 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-iso8859-4 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-iso8859-5 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-iso8859-6 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-iso8859-7 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-iso8859-8 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-iso8859-9 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-koi8-e +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-koi8-r +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-koi8-ru +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-koi8-u +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-koi8-uni +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-microsoft-ansi +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-microsoft-cp1250 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-microsoft-cp1251 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-microsoft-cp1252 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-mulearabic-0 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-mulearabic-1 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-mulearabic-2 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-tcvn-0 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-tis620-0 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-tis620-2 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-tis620.2529-1 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-tis620.2533-0 +tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-tis620.2533-1 times.ttf -monotype-times new roman-medium-r-modern--0-0-0-0-p-0-adobe-standard times.ttf -monotype-times new roman-medium-r-modern--0-0-0-0-p-0-ansi-1251 times.ttf -monotype-times new roman-medium-r-modern--0-0-0-0-p-0-ascii-0 Many thanks to Andrey Chernov who helped me make that patch. >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510221658.j9MGwJ7e084844>