From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 16 02:20:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E5DB106567D for ; Sun, 16 Mar 2008 02:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 3B1698FC1F for ; Sun, 16 Mar 2008 02:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m2G2K2Nh097825 for ; Sun, 16 Mar 2008 02:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m2G2K20H097824; Sun, 16 Mar 2008 02:20:02 GMT (envelope-from gnats) Resent-Date: Sun, 16 Mar 2008 02:20:02 GMT Resent-Message-Id: <200803160220.m2G2K20H097824@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Felippe de Meirelles Motta Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B9C9106564A for ; Sun, 16 Mar 2008 02:14:31 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 6A6348FC12 for ; Sun, 16 Mar 2008 02:14:31 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m2G2B7qt024832 for ; Sun, 16 Mar 2008 02:11:07 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m2G2B7P4024831; Sun, 16 Mar 2008 02:11:07 GMT (envelope-from nobody) Message-Id: <200803160211.m2G2B7P4024831@www.freebsd.org> Date: Sun, 16 Mar 2008 02:11:07 GMT From: Felippe de Meirelles Motta To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/121753: [UPDATE] x11-fonts/webfonts X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Mar 2008 02:20:02 -0000 >Number: 121753 >Category: ports >Synopsis: [UPDATE] x11-fonts/webfonts >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Mar 16 02:20:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Felippe de Meirelles Motta >Release: FreeBSD 7.0-STABLE amd64 >Organization: >Environment: System: FreeBSD 7.0-STABLE #5: Tue Mar 11 22:21:58 BRT 2008 lippe@shire.freebsd.org:/usr/obj/usr/src/sys/SHIRE >Description: * bump PORTREVISION * Makefile style * SHA256ify * Move pkg-message to FILESDIR >How-To-Repeat: >Fix: Patch attached with submission follows: Index: x11-fonts/webfonts/Makefile =================================================================== RCS file: /home/pcvs/ports/x11-fonts/webfonts/Makefile,v retrieving revision 1.29 diff -u -r1.29 Makefile --- x11-fonts/webfonts/Makefile 23 May 2007 07:10:46 -0000 1.29 +++ x11-fonts/webfonts/Makefile 15 Mar 2008 03:49:05 -0000 @@ -9,24 +9,15 @@ PORTVERSION= 0.30 PORTREVISION= 2 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_NETBSD:S/%SUBDIR%/ms-ttf/}:group1 \ - ${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/corefonts/}:group1 \ +MASTER_SITES= SF/corefonts:group1 \ ftp://ftp.uni-koeln.de/pc/win32/msoft/:group1 \ - ftp://ftp.vsu.ru/pub/tex/font-packs/mscore/:group1 \ - ftp://ftp.sinn.ru/pub/win95/fonts/: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(WITH_MSWINDOWS_LICENSE) -DISTFILES+= ielpkth.cab:group2 -.endif - DIST_SUBDIR= ${PORTNAME} MAINTAINER= kkonstan@duth.gr @@ -39,7 +30,7 @@ USE_X_PREFIX= yes NO_BUILD= yes -RESTRICTED= "Restrictive license - cannot sell for profit or distribute in modified form" +RESTRICTED= Restrictive license - cannot sell for profit or distribute in modified form EXTRACT_CMD= ${LOCALBASE}/bin/cabextract EXTRACT_BEFORE_ARGS= -qLF '*.ttf' -d ${WRKSRC} @@ -56,13 +47,17 @@ FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" \ TTFONTSDIR="${TTFONTSDIR:S|${X11BASE}/||}" -MSG_FILE= ${PKGDIR}/pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message +SUB_LIST= FONTSDIR="${FONTSDIR}" DOCSDIR="${DOCSDIR}" +SUB_FILES= pkg-message FONTS_FILE= ${WRKDIR}/fonts.dir .include +.if defined(WITH_MSWINDOWS_LICENSE) +DISTFILES+= ielpkth.cab:group2 +.endif + .SILENT: # @@ -75,9 +70,6 @@ # Post-patch # post-patch: - ${SED} -e 's|%%FONTSDIR%%|${FONTSDIR}|g' \ - -e 's|%%DOCSDIR%%|${DOCSDIR}|g' \ - ${MSG_FILE} > ${PKGMESSAGE} .if defined(WITH_MSWINDOWS_LICENSE) ${SORT} ${FILESDIR}/fonts.dir ${FILESDIR}/tahoma.dir > ${FONTS_FILE} .else Index: x11-fonts/webfonts/distinfo =================================================================== RCS file: /home/pcvs/ports/x11-fonts/webfonts/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- x11-fonts/webfonts/distinfo 12 Nov 2005 20:03:07 -0000 1.6 +++ x11-fonts/webfonts/distinfo 15 Mar 2008 03:49:05 -0000 @@ -1,24 +1,33 @@ MD5 (webfonts/andale32.exe) = cbdc2fdd7d2ed0832795e86a8b9ee19a +SHA256 (webfonts/andale32.exe) = 0524fe42951adc3a7eb870e32f0920313c71f170c859b5f770d82b4ee111e970 SIZE (webfonts/andale32.exe) = 198384 -MD5 (webfonts/trebuc32.exe) = 0d7ea16cac6261f8513a061fbfcdb2b5 -SIZE (webfonts/trebuc32.exe) = 357200 -MD5 (webfonts/georgi32.exe) = 4d90016026e2da447593b41a8d8fa8bd -SIZE (webfonts/georgi32.exe) = 392440 -MD5 (webfonts/verdan32.exe) = 12d2a75f8156e10607be1eaa8e8ef120 -SIZE (webfonts/verdan32.exe) = 351992 -MD5 (webfonts/comic32.exe) = 2b30de40bb5e803a0452c7715fc835d1 -SIZE (webfonts/comic32.exe) = 246008 +MD5 (webfonts/arial32.exe) = 9637df0e91703179f0723ec095a36cb5 +SHA256 (webfonts/arial32.exe) = 85297a4d146e9c87ac6f74822734bdee5f4b2a722d7eaa584b7f2cbf76f478f6 +SIZE (webfonts/arial32.exe) = 554208 MD5 (webfonts/arialb32.exe) = c9089ae0c3b3d0d8c4b0a95979bb9ff0 +SHA256 (webfonts/arialb32.exe) = a425f0ffb6a1a5ede5b979ed6177f4f4f4fdef6ae7c302a7b7720ef332fec0a8 SIZE (webfonts/arialb32.exe) = 168176 +MD5 (webfonts/comic32.exe) = 2b30de40bb5e803a0452c7715fc835d1 +SHA256 (webfonts/comic32.exe) = 9c6df3feefde26d4e41d4a4fe5db2a89f9123a772594d7f59afd062625cd204e +SIZE (webfonts/comic32.exe) = 246008 +MD5 (webfonts/courie32.exe) = 4e412c772294403ab62fb2d247d85c60 +SHA256 (webfonts/courie32.exe) = bb511d861655dde879ae552eb86b134d6fae67cb58502e6ff73ec5d9151f3384 +SIZE (webfonts/courie32.exe) = 646368 +MD5 (webfonts/georgi32.exe) = 4d90016026e2da447593b41a8d8fa8bd +SHA256 (webfonts/georgi32.exe) = 2c2c7dcda6606ea5cf08918fb7cd3f3359e9e84338dc690013f20cd42e930301 +SIZE (webfonts/georgi32.exe) = 392440 MD5 (webfonts/impact32.exe) = 7907c7dd6684e9bade91cff82683d9d7 +SHA256 (webfonts/impact32.exe) = 6061ef3b7401d9642f5dfdb5f2b376aa14663f6275e60a51207ad4facf2fccfb SIZE (webfonts/impact32.exe) = 173288 -MD5 (webfonts/arial32.exe) = 9637df0e91703179f0723ec095a36cb5 -SIZE (webfonts/arial32.exe) = 554208 MD5 (webfonts/times32.exe) = ed39c8ef91b9fb80f76f702568291bd5 +SHA256 (webfonts/times32.exe) = db56595ec6ef5d3de5c24994f001f03b2a13e37cee27bc25c58f6f43e8f807ab SIZE (webfonts/times32.exe) = 661728 -MD5 (webfonts/courie32.exe) = 4e412c772294403ab62fb2d247d85c60 -SIZE (webfonts/courie32.exe) = 646368 +MD5 (webfonts/trebuc32.exe) = 0d7ea16cac6261f8513a061fbfcdb2b5 +SHA256 (webfonts/trebuc32.exe) = 5a690d9bb8510be1b8b4fe49f1f2319651fe51bbe54775ddddd8ef0bd07fdac9 +SIZE (webfonts/trebuc32.exe) = 357200 +MD5 (webfonts/verdan32.exe) = 12d2a75f8156e10607be1eaa8e8ef120 +SHA256 (webfonts/verdan32.exe) = c1cb61255e363166794e47664e2f21af8e3a26cb6346eb8d2ae2fa85dd5aad96 +SIZE (webfonts/verdan32.exe) = 351992 MD5 (webfonts/webdin32.exe) = 230a1d13a365b22815f502eb24d9149b +SHA256 (webfonts/webdin32.exe) = 64595b5abc1080fba8610c5c34fab5863408e806aafe84653ca8575bed17d75a SIZE (webfonts/webdin32.exe) = 185072 -MD5 (webfonts/ielpkth.cab) = 358584cddb75ac90472c25f01b308ebe -SIZE (webfonts/ielpkth.cab) = 411248 Index: x11-fonts/webfonts/pkg-message =================================================================== RCS file: x11-fonts/webfonts/pkg-message diff -N x11-fonts/webfonts/pkg-message --- x11-fonts/webfonts/pkg-message 23 May 2007 07:10:46 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -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 %%DOCSDIR%%/LICENSE. If you read and agree -to the EULA, you can start using the fonts by following these instructions: - -Make sure that the freetype module is loaded. If it is not, add the following -line to the "Modules" section of xorg.conf or XF86Config: - - Load "freetype" - -Add the following line to the "Files" section of xorg.conf or XF86Config: - - FontPath "%%FONTSDIR%%/" Index: x11-fonts/webfonts/files/pkg-message.in =================================================================== RCS file: x11-fonts/webfonts/files/pkg-message.in diff -N x11-fonts/webfonts/files/pkg-message.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11-fonts/webfonts/files/pkg-message.in 15 Mar 2008 03:49:05 -0000 @@ -0,0 +1,13 @@ +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 %%DOCSDIR%%/LICENSE. If you read and agree +to the EULA, you can start using the fonts by following these instructions: + +Make sure that the freetype module is loaded. If it is not, add the following +line to the "Modules" section of xorg.conf or XF86Config: + + Load "freetype" + +Add the following line to the "Files" section of xorg.conf or XF86Config: + + FontPath "%%FONTSDIR%%/" >Release-Note: >Audit-Trail: >Unformatted: