From verm@jolly.drunkmonk.net  Mon Aug 19 03:57:54 2002
Return-Path: <verm@jolly.drunkmonk.net>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CB83A37B400
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Aug 2002 03:57:54 -0700 (PDT)
Received: from jolly.drunkmonk.net (jolly.drunkmonk.net [66.37.140.163])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E91F343E3B
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Aug 2002 03:56:55 -0700 (PDT)
	(envelope-from verm@jolly.drunkmonk.net)
Received: from jolly.drunkmonk.net (verm@localhost [127.0.0.1])
	by jolly.drunkmonk.net (8.12.3/8.12.3) with ESMTP id g7JAuj9H068569
	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Aug 2002 04:56:45 -0600 (MDT)
	(envelope-from verm@jolly.drunkmonk.net)
Received: (from verm@localhost)
	by jolly.drunkmonk.net (8.12.3/8.12.1/Submit) id g7JAtUtP068559;
	Mon, 19 Aug 2002 04:55:30 -0600 (MDT)
Message-Id: <200208191055.g7JAtUtP068559@jolly.drunkmonk.net>
Date: Mon, 19 Aug 2002 04:55:30 -0600 (MDT)
From: Amar Takhar <verm@drunkmonk.net>
Reply-To: Amar Takhar <verm@drunkmonk.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Konstantinos Konstantinidis <kkonstan@daemon.gr>
Subject: fix port: x11-fonts/webfonts
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         41775
>Category:       ports
>Synopsis:       fix port: x11-fonts/webfonts
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    trevor
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 19 04:00:08 PDT 2002
>Closed-Date:    Sat Aug 24 16:21:12 PDT 2002
>Last-Modified:  Sat Aug 24 16:21:12 PDT 2002
>Originator:     Amar Takhar
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
>Environment:

>Description:

microsoft has decided to remove the TTF fonts from their webpage, however 
here is a sourceforge mirror to replace them.  I havn't found a mirror for 
the arial unicode, however 'default' fonts download just fine.  I've cc'd 
the maintainer on this it's a simple fix i don't belive he will mind.

>How-To-Repeat:

>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-fonts/webfonts/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	2002/02/02 07:10:31	1.9
+++ Makefile	2002/08/19 10:51:26
@@ -8,9 +8,9 @@
 PORTNAME=	webfonts
 PORTVERSION=	0.21
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://www.microsoft.com/typography/downloads/ \
-		http://www.eu.microsoft.com/typography/downloads/ \
-		http://www.asia.microsoft.com/typography/downloads/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= corefonts
+
 .if defined(WITH_ARIAL_UNICODE)
 MASTER_SITES+=	http://download.microsoft.com/download/publisher2000/Aruniup/2000/WIN98/EN-US/
 .endif
>Release-Note:
>Audit-Trail:

From: Trevor Johnson <trevor@jpj.net>
To: Amar Takhar <verm@drunkmonk.net>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG,
	Konstantinos Konstantinidis <kkonstan@daemon.gr>
Subject: Re: ports/41775: fix port: x11-fonts/webfonts
Date: Mon, 19 Aug 2002 08:44:05 -0400 (EDT)

 Amar Takhar wrote:
 
 > microsoft has decided to remove the TTF fonts from their webpage, however
 > here is a sourceforge mirror to replace them.  I havn't found a mirror for
 > the arial unicode, however 'default' fonts download just fine.  I've cc'd
 > the maintainer on this it's a simple fix i don't belive he will mind.
 
 There's not much to see on the Web page any more, so why not remove it
 from the pkg-descr?
 
 Running "strings" on the Arial Unicode distfile produces:
 
   NOTE:  IF YOU DO NOT HAVE A VALID EULA FOR ANY "PRODUCT" (I.E., MICROSOFT
   OFFICE, MICROSOFT PUBLISHER, AND ANY MICROSOFT PRODUCTS THAT INCLUDE
   MICROSOFT PUBLISHER AS A COMPONENT PRODUCT), YOU ARE NOT AUTHORIZED TO
   INSTALL, COPY OR OTHERWISE USE THE COMPONENTS AND YOU HAVE NO RIGHTS UNDER
   THIS SUPPLEMENTAL EULA.
 
 which is much more strict than the license for the other fonts.  It
 doesn't permit downloading from anyone but Microsoft, so it would probably
 be best to remove the Unicode fonts from the port.  Doing so would make it
 possible to remove the RESTRICTED line as well, since the other fonts may
 be redistributed (so long as they are unchanged and not made part of a
 product that is sold).
 
 Here's a patch that would do these things.  I only gave it very cursory
 testing.
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/x11-fonts/webfonts/Makefile,v
 retrieving revision 1.9
 diff -u -r1.9 Makefile
 --- Makefile	2 Feb 2002 07:10:31 -0000	1.9
 +++ Makefile	19 Aug 2002 12:38:03 -0000
 @@ -8,18 +8,11 @@
  PORTNAME=	webfonts
  PORTVERSION=	0.21
  CATEGORIES=	x11-fonts
 -MASTER_SITES=	http://www.microsoft.com/typography/downloads/ \
 -		http://www.eu.microsoft.com/typography/downloads/ \
 -		http://www.asia.microsoft.com/typography/downloads/
 -.if defined(WITH_ARIAL_UNICODE)
 -MASTER_SITES+=	http://download.microsoft.com/download/publisher2000/Aruniup/2000/WIN98/EN-US/
 -.endif
 +MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 +MASTER_SITE_SUBDIR=	corefonts
  DISTFILES=	andale32.exe trebuc32.exe georgi32.exe verdan32.exe \
  		comic32.exe arialb32.exe impact32.exe arial32.exe \
  		times32.exe courie32.exe webdin32.exe
 -.if defined(WITH_ARIAL_UNICODE)
 -DISTFILES+=	Aruniupd.exe
 -.endif
  DIST_SUBDIR=	${PORTNAME}
 
  MAINTAINER=	kkonstan@daemon.gr
 @@ -35,7 +28,6 @@
  RUN_DEPENDS=	xfstt:${PORTSDIR}/x11-servers/Xfstt
  .endif
 
 -RESTRICTED=	"Restrictive license - cannot place on server for distribution"
  NO_CDROM=	"Restrictive license - cannot sell for profit"
  NO_PACKAGE=	"Restrictive license - cannot distribute in modified form"
 
 @@ -45,7 +37,6 @@
 
  PLIST_SUB=	PKG_OLDXF86=${PKG_OLDXF86} \
  		PKG_NSALIAS=${PKG_NSALIAS} \
 -		PKG_UNICODE=${PKG_UNICODE} \
  		FONTNAME="${FONTNAME}" \
  		FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" \
  		TTFONTSDIR="${TTFONTSDIR:S|${X11BASE}/||}"
 @@ -65,12 +56,6 @@
  PKG_NSALIAS=    "@comment "
  .endif
 
 -.if defined(WITH_ARIAL_UNICODE)
 -PKG_UNICODE=
 -.else
 -PKG_UNICODE=    "@comment "
 -.endif
 -
  #
  # Local variables
  #
 @@ -97,12 +82,6 @@
  	${ECHO_MSG}
  	${ECHO_MSG} "If you want font aliases that work around Netscape's tiny font bug (4.x ONLY),"
  	${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_NETSCAPE_ALIASES=yes\""
 -	${ECHO_MSG}
 -.endif
 -.if !defined(WITH_ARIAL_UNICODE)
 -	${ECHO_MSG}
 -	${ECHO_MSG} "If you want \"Arial Unicode MS\", a complete Unicode 2.1 font (13.7MB download),"
 -	${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ARIAL_UNICODE=yes\""
  	${ECHO_MSG}
  .endif
 
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/x11-fonts/webfonts/distinfo,v
 retrieving revision 1.3
 diff -u -r1.3 distinfo
 --- distinfo	20 Jan 2002 22:31:03 -0000	1.3
 +++ distinfo	19 Aug 2002 12:37:15 -0000
 @@ -9,4 +9,3 @@
  MD5 (webfonts/times32.exe) = ed39c8ef91b9fb80f76f702568291bd5
  MD5 (webfonts/courie32.exe) = 4e412c772294403ab62fb2d247d85c60
  MD5 (webfonts/webdin32.exe) = 230a1d13a365b22815f502eb24d9149b
 -MD5 (webfonts/Aruniupd.exe) = 1bef548eb449a0b24ad1c0b8e9d5f2ba
 Index: pkg-descr
 ===================================================================
 RCS file: /home/ncvs/ports/x11-fonts/webfonts/pkg-descr,v
 retrieving revision 1.2
 diff -u -r1.2 pkg-descr
 --- pkg-descr	20 Jan 2002 22:31:03 -0000	1.2
 +++ pkg-descr	19 Aug 2002 12:39:35 -0000
 @@ -2,18 +2,12 @@
  Monotype and Microsoft Typography.  It consists of the following families:
 
        Times New Roman, Courier New, Georgia, Trebuchet MS, Comic Sans MS
 -      Arial, Arial Black, Arial Unicode MS, Verdana, Andale Mono, Impact
 +      Arial, Arial Black, Verdana, Andale Mono, Impact
 
  They contain all 652 glyphs defined in WGL4 and are available in the following
  encodings:
 
        ISO 8859-1, 2, 3, 4, 5, 6, 7, 8, 9, 10 and 15
 -      JIS X 0201-1976 (Arial Unicode MS only)
        KOI8-R and -RU
 -
 -The Arial Unicode MS family contains all the glyphs defined in the Unicode 2.1
 -standard and is optional because of its considerable size - 13.7MB compressed!
 -
 -WWW: http://www.microsoft.com/typography/fontpack/
 
  -- K. Konstantinidis <kkonstan@daemon.gr>
 Index: pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/x11-fonts/webfonts/pkg-plist,v
 retrieving revision 1.2
 diff -u -r1.2 pkg-plist
 --- pkg-plist	20 Jan 2002 22:31:03 -0000	1.2
 +++ pkg-plist	19 Aug 2002 12:38:26 -0000
 @@ -5,7 +5,6 @@
  %%FONTSDIR%%/arialbd.ttf
  %%FONTSDIR%%/arialbi.ttf
  %%FONTSDIR%%/ariali.ttf
 -%%PKG_UNICODE%%%%FONTSDIR%%/arialuni.ttf
  %%FONTSDIR%%/ariblk.ttf
  %%FONTSDIR%%/comic.ttf
  %%FONTSDIR%%/comicbd.ttf
 -- 
 Trevor Johnson
 
 
 
State-Changed-From-To: open->analyzed 
State-Changed-By: trevor 
State-Changed-When: Thu Aug 22 01:32:28 PDT 2002 
State-Changed-Why:  
Here is what I'd like to do: 

- apply the changes in the patch I submitted 
- add to MASTER_SITES the site found by blackend in the audit trail 
for PR 41716, that is, <URL:ftp://ftp.vn.ua/pub/win/freefont/>.  I 
downloaded the distfiles from there and they all had correct MD5 
hashes. 
- probably, add to MASTER_SITES the sites submitted by Christian 
Brueffer in PR 41716, namely 
<URL:ftp://ftp.uni-koeln.de/pc/win32/msoft-95/> and 
<URL:ftp://ftp.ic.tsu.ru/pub/FreeBSD/ports/distfiles/webfonts/> 
- e-mail to the maintainer looks like it will bounce, so I will try 
to contact him at his duth.gr address and suggest that the address 
on the MAINTAINER line be changed 


Responsible-Changed-From-To: freebsd-ports->trevor 
Responsible-Changed-By: trevor 
Responsible-Changed-When: Thu Aug 22 01:32:28 PDT 2002 
Responsible-Changed-Why:  
I'm looking into this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=41775 
State-Changed-From-To: analyzed->closed 
State-Changed-By: trevor 
State-Changed-When: Sat Aug 24 16:17:06 PDT 2002 
State-Changed-Why:  
MASTER_SITES updated, MAINTAINER set to ports@, whitespace fixed, 
Unicode font removed to avoid legal problems, RESTRICTED and WWW 
lines removed, and PORTREVISION bumped for the Unicode removal 

http://www.freebsd.org/cgi/query-pr.cgi?pr=41775 
>Unformatted:
