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.
You beat me to it by two seconds. Here is my diff which removes another unused patch. With this diff, you need to cvs rm: files/patch-src_gzip_ftgzip.c files/patch-src_gzip_infcodes.c Joe diff -ruN freetype2.orig/Makefile freetype2/Makefile --- freetype2.orig/Makefile Thu Apr 10 15:35:03 2003 +++ freetype2/Makefile Thu Apr 10 15:24:19 2003 @@ -2,12 +2,11 @@ # Date created: January 24, 1998 # Whom: jseger@FreeBSD.org # -# $FreeBSD: ports/print/freetype2/Makefile,v 1.44 2003/03/07 06:09:03 ade Exp $ +# $FreeBSD$ # 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%/ \ @@ -28,7 +27,7 @@ USE_LIBTOOL= yes LIBTOOLFILES= builds/unix/configure CONFIGURE_ARGS= --disable-nls -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-unknown-freebsd${OSREL} CONFIGURE_WRKSRC= ${WRKSRC}/builds/unix post-configure: diff -ruN freetype2.orig/distinfo freetype2/distinfo --- freetype2.orig/distinfo Thu Apr 10 15:35:03 2003 +++ freetype2/distinfo Thu Apr 10 15:24:42 2003 @@ -1 +1 @@ -MD5 (freetype-2.1.3.tar.bz2) = 09775a4111e066f782866d8a57d8481b +MD5 (freetype-2.1.4.tar.bz2) = 1fc0b188f1fe1216776e5855d2da141f diff -ruN freetype2.orig/files/patch-src_gzip_ftgzip.c freetype2/files/patch-src_gzip_ftgzip.c --- freetype2.orig/files/patch-src_gzip_ftgzip.c Thu Apr 10 15:35:03 2003 +++ freetype2/files/patch-src_gzip_ftgzip.c Wed Dec 31 19:00:00 1969 @@ -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; diff -ruN freetype2.orig/files/patch-src_gzip_infcodes.c freetype2/files/patch-src_gzip_infcodes.c --- freetype2.orig/files/patch-src_gzip_infcodes.c Thu Apr 10 15:35:03 2003 +++ freetype2/files/patch-src_gzip_infcodes.c Wed Dec 31 19:00:00 1969 @@ -1,13 +0,0 @@ ---- src/gzip/infcodes.c.orig Sat Jan 18 15:44:46 2003 -+++ src/gzip/infcodes.c Sat Jan 18 15:46:10 2003 -@@ -196,8 +196,8 @@ - c->mode = COPY; - case COPY: /* o: copying bytes in window, waiting for space */ - f = q - c->sub.copy.dist; -- while (f < s->window) /* modulo window size-"while" instead */ -- f += s->end - s->window; /* of "if" handles invalid distances */ -+ if ((uInt)(q - s->window) < c->sub.copy.dist) -+ f = s->end - (c->sub.copy.dist - (uInt)(q - s->window)); - while (c->len) - { - NEEDOUT diff -ruN freetype2.orig/pkg-plist freetype2/pkg-plist --- freetype2.orig/pkg-plist Thu Apr 10 15:35:03 2003 +++ freetype2/pkg-plist Sat Feb 22 19:04:35 2003 @@ -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 -- PGP Key : http://www.marcuscom.com/pgp.asc
Responsible Changed From-To: freebsd-ports-bugs->sobomax Over to maintainer.
State Changed From-To: open->closed Committed per Maxim's approval. Thanks!