ports/50791: Update freetype to 2.1.4, fixing fc-cache

[Eric Anholt]

>Number:         50791
>Category:       ports
>Synopsis:       Update freetype to 2.1.4, fixing fc-cache
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 10 12:20:02 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Eric Anholt <anholt at FreeBSD.org>
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD anholt.dyndns.org 5.0-CURRENT FreeBSD 5.0-CURRENT #10: Mon Apr 7 16:56:12 PDT 2003 anholt at anholt.dyndns.org:/usr/obj/usr/src/current/sys/MYKERNEL i386


	
>Description:
	Update freetype to 2.1.4, fixing a memory leak which caused fc-cache -f -v
	to take about 180M with a default installation of XFree86 fonts + webfonts.
	
>How-To-Repeat:
	
>Fix:

--- freetype-2.1.4.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/print/freetype2/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- Makefile	7 Mar 2003 06:09:03 -0000	1.44
+++ Makefile	10 Apr 2003 18:57:44 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	freetype2
-PORTVERSION=	2.1.3
-PORTREVISION=	1
+PORTVERSION=	2.1.4
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/print/freetype2/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo	17 Jan 2003 19:44:11 -0000	1.21
+++ distinfo	10 Apr 2003 18:58:37 -0000
@@ -1 +1 @@
-MD5 (freetype-2.1.3.tar.bz2) = 09775a4111e066f782866d8a57d8481b
+MD5 (freetype-2.1.4.tar.bz2) = 1fc0b188f1fe1216776e5855d2da141f
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/print/freetype2/pkg-plist,v
retrieving revision 1.25
diff -u -r1.25 pkg-plist
--- pkg-plist	17 Jan 2003 19:44:11 -0000	1.25
+++ pkg-plist	10 Apr 2003 19:12:23 -0000
@@ -39,6 +39,7 @@
 include/freetype2/freetype/ftsystem.h
 include/freetype2/freetype/fttrigon.h
 include/freetype2/freetype/fttypes.h
+include/freetype2/freetype/ftwinfnt.h
 include/freetype2/freetype/ftxf86.h
 include/freetype2/freetype/internal/autohint.h
 include/freetype2/freetype/internal/bdftypes.h
Index: files/patch-src_gzip_ftgzip.c
===================================================================
RCS file: files/patch-src_gzip_ftgzip.c
diff -N files/patch-src_gzip_ftgzip.c
--- files/patch-src_gzip_ftgzip.c	18 Jan 2003 22:27:21 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
---- src/gzip/ftgzip.c.orig	Sat Jan 18 13:04:29 2003
-+++ src/gzip/ftgzip.c	Sat Jan 18 13:04:40 2003
-@@ -177,7 +177,7 @@
-     (void)FT_STREAM_SKIP( 6 );
- 
-     /* skip the extra field */
--    if ( head[3] && FT_GZIP_EXTRA_FIELD )
-+    if ( head[3] & FT_GZIP_EXTRA_FIELD )
-     {
-       FT_UInt  len;
- 
-@@ -187,7 +187,7 @@
-     }
- 
-     /* skip original file name */
--    if ( head[3] && FT_GZIP_ORIG_NAME )
-+    if ( head[3] & FT_GZIP_ORIG_NAME )
-       for (;;)
-       {
-         FT_UInt  c;


>Release-Note:
>Audit-Trail:
>Unformatted: