From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Oct 27 19:40:36 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A146516A41F for ; Thu, 27 Oct 2005 19:40:36 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EB0443D7F for ; Thu, 27 Oct 2005 19:40:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j9RJeMxI071649 for ; Thu, 27 Oct 2005 19:40:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j9RJeLN3071648; Thu, 27 Oct 2005 19:40:21 GMT (envelope-from gnats) Date: Thu, 27 Oct 2005 19:40:21 GMT Message-Id: <200510271940.j9RJeLN3071648@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Rostislav Krasny Cc: Subject: Re: ports/87847: [patch] add Tahoma TTF fonts to x11-fonts/webfonts port X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Rostislav Krasny List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2005 19:40:36 -0000 The following reply was made to PR ports/87847; it has been noted by GNATS. From: Rostislav Krasny To: bug-followup@FreeBSD.org Cc: Konstantinos Konstantinidis Subject: Re: ports/87847: [patch] add Tahoma TTF fonts to x11-fonts/webfonts port Date: Thu, 27 Oct 2005 21:34:18 +0200 This is a multi-part message in MIME format. --Multipart=_Thu__27_Oct_2005_21_34_18_+0200_uUkI3MMOoYRqle+f Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit This is a new and better version of the patch. Changes to the previous patch are: 1. tahoma.ttf and tahomabd.ttf, if they installed, are listing by 'pkg_info -L webfonts-0.22'. 2. instead of having two versions of fonts.dir I build one from files/fonts.dir and optionally from files/tahoma.dir. It saves a disk space and future port editing time. 3. pkg-descr is changed according to the maintainer suggestion. Konstantinos, please review this version of the patch for your approval. The patch and tahoma.dir files are attached to this email. P.S. Thanks to Andrey Chernov and Jeremy Messenger who helped me make this patch better and better. --Multipart=_Thu__27_Oct_2005_21_34_18_+0200_uUkI3MMOoYRqle+f Content-Type: text/plain; name="webfonts.patch" Content-Disposition: attachment; filename="webfonts.patch" Content-Transfer-Encoding: quoted-printable diff -ru /usr/ports/x11-fonts/webfonts.orig/Makefile /usr/ports/x11-fonts/w= ebfonts/Makefile --- /usr/ports/x11-fonts/webfonts.orig/Makefile Fri Oct 21 12:50:31 2005 +++ /usr/ports/x11-fonts/webfonts/Makefile Wed Oct 26 18:58:27 2005 @@ -6,22 +6,30 @@ # =20 PORTNAME=3D webfonts -PORTVERSION=3D 0.21 -PORTREVISION=3D 3 +PORTVERSION=3D 0.22 CATEGORIES=3D x11-fonts -MASTER_SITES=3D ${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=3D andale32.exe trebuc32.exe georgi32.exe verdan32.exe \ - comic32.exe arialb32.exe impact32.exe arial32.exe \ - times32.exe courie32.exe webdin32.exe +MASTER_SITES=3D ${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/:group= 1 \ + 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/E= N-US/:group2 \ + http://www.zeuscat.com/andrew/software/corefonts/:group2 \ + ftp://ftp.isu.edu.tw/pub/MsDownload/ie6sp1/en/:group2 +DISTFILES=3D 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+=3D ielpkth.cab:group2 +.endif + DIST_SUBDIR=3D ${PORTNAME} =20 MAINTAINER=3D kkonstan@duth.gr @@ -36,8 +44,8 @@ NO_PACKAGE=3D "Restrictive license - cannot distribute in modified form" =20 EXTRACT_CMD=3D ${LOCALBASE}/bin/cabextract -EXTRACT_BEFORE_ARGS=3D --lowercase --quiet -EXTRACT_AFTER_ARGS=3D -d ${WRKSRC} +EXTRACT_BEFORE_ARGS=3D -qLF '*.ttf' -d ${WRKSRC} +EXTRACT_AFTER_ARGS=3D =20 # # Local variables @@ -53,6 +61,8 @@ MSG_FILE=3D ${PKGDIR}/pkg-message PKGMESSAGE=3D ${WRKDIR}/pkg-message =20 +FONTS_FILE=3D ${WRKDIR}/fonts.dir + .include =20 .if ${X_WINDOW_SYSTEM:L} =3D=3D xfree86-3 @@ -72,13 +82,32 @@ # Post-extract # post-extract: - ${RM} -f ${WRKSRC}/*.dll ${WRKSRC}/*.exe ${WRKSRC}/*.inf + ${EXTRACT_CMD} -qLF '*.txt' -d ${WRKSRC} ${_DISTDIR}/webdin32.exe =20 # # 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} +.if defined(HAVE_MSWINDOWS_LICENSE) + ${SORT} ${FILESDIR}/fonts.dir ${FILESDIR}/tahoma.dir > ${FONTS_FILE} +.else + ${CP} ${FILESDIR}/fonts.dir ${FONTS_FILE} +.endif + ${PRINTF} "1i\n%u\n.\nwq\n" `wc -l < ${FONTS_FILE}` | \ + ed -s ${FONTS_FILE} + +# +# Pre-install +# +pre-install: +.if exists(${.CURDIR}/work/${DISTNAME}/tahoma.ttf) +PLIST_SUB+=3D EXTRAFONTS=3D"" +.else +PLIST_SUB+=3D EXTRAFONTS=3D"@comment " +.endif =20 # # Install @@ -86,8 +115,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} =3D=3D xfree86-3 ${LN} -fs ${FONTSDIR} ${TTFONTSDIR}/${FONTNAME} diff -ru /usr/ports/x11-fonts/webfonts.orig/distinfo /usr/ports/x11-fonts/w= ebfonts/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) =3D 646368 MD5 (webfonts/webdin32.exe) =3D 230a1d13a365b22815f502eb24d9149b SIZE (webfonts/webdin32.exe) =3D 185072 +MD5 (webfonts/ielpkth.cab) =3D 358584cddb75ac90472c25f01b308ebe +SIZE (webfonts/ielpkth.cab) =3D 411248 diff -ru /usr/ports/x11-fonts/webfonts.orig/files/fonts.dir /usr/ports/x11-= fonts/webfonts/files/fonts.dir --- /usr/ports/x11-fonts/webfonts.orig/files/fonts.dir Thu Oct 20 18:20:39 = 2005 +++ /usr/ports/x11-fonts/webfonts/files/fonts.dir Wed Oct 26 18:04:16 2005 @@ -1,4 +1,3 @@ -839 andalemo.ttf -monotype-andale mono-book-r-monospaced--0-0-0-0-m-0-adobe-st= andard 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 Only in /usr/ports/x11-fonts/webfonts/files: tahoma.dir diff -ru /usr/ports/x11-fonts/webfonts.orig/pkg-descr /usr/ports/x11-fonts/= webfonts/pkg-descr --- /usr/ports/x11-fonts/webfonts.orig/pkg-descr Mon Aug 26 13:12:21 2002 +++ /usr/ports/x11-fonts/webfonts/pkg-descr Wed Oct 26 19:17:12 2005 @@ -10,4 +10,6 @@ ISO 8859-1, 2, 3, 4, 5, 6, 7, 8, 9, 10 and 15 KOI8-R and -RU =20 +Tahoma can also be installed as an option, but a Windows License is requir= ed. + -- Konstantinos Konstantinidis diff -ru /usr/ports/x11-fonts/webfonts.orig/pkg-message /usr/ports/x11-font= s/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 agre= e 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: =20 --- XFree86 4.x.x (using the freetype module) =20 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 Mon Oct 24 02:42:43 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 || /us= r/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 +%%EXTRAFONTS%%%%FONTSDIR%%/tahoma.ttf +%%EXTRAFONTS%%%%FONTSDIR%%/tahomabd.ttf %%FONTSDIR%%/times.ttf %%FONTSDIR%%/timesbd.ttf %%FONTSDIR%%/timesbi.ttf --Multipart=_Thu__27_Oct_2005_21_34_18_+0200_uUkI3MMOoYRqle+f Content-Type: text/plain; name="tahoma.dir" Content-Disposition: attachment; filename="tahoma.dir" Content-Transfer-Encoding: quoted-printable 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-cp1= 250 tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-microsoft-cp1= 251 tahoma.ttf -microsoft-tahoma-medium-r-even width--0-0-0-0-p-0-microsoft-cp1= 252 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-cp1= 250 tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-microsoft-cp1= 251 tahomabd.ttf -microsoft-tahoma-bold-r-even width--0-0-0-0-p-0-microsoft-cp1= 252 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= =20 --Multipart=_Thu__27_Oct_2005_21_34_18_+0200_uUkI3MMOoYRqle+f--