Update "freetype2" package to version 2.2.1. Changes since version 2.1.10

include:
- security fixes for SA20100
- version 2.2 no longer exposes its internals
- various improvements in font handling

4 files changed, 9 insertions, 61 deletions

diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index 12e861d7fdd..a6315cbef1c 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2006/02/25 00:35:41 reed Exp $
+# $NetBSD: Makefile,v 1.52 2006/05/29 22:05:21 tron Exp $
 
-DISTNAME=	freetype-2.1.10
-PKGNAME=	freetype2-2.1.10
-PKGREVISION=	2
+DISTNAME=	freetype-2.2.1
+PKGNAME=	${DISTNAME:S/-/2-/}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freetype/} \
 		ftp://ftp.freetype.org/freetype/freetype2/ \
diff --git a/graphics/freetype2/PLIST b/graphics/freetype2/PLIST
index 363b3d4af4e..960f2a17533 100644
--- a/graphics/freetype2/PLIST
+++ b/graphics/freetype2/PLIST
@@ -1,12 +1,5 @@
-@comment $NetBSD: PLIST,v 1.12 2006/02/16 18:09:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/05/29 22:05:21 tron Exp $
 bin/freetype-config
-include/freetype2/freetype/cache/ftccache.h
-include/freetype2/freetype/cache/ftccmap.h
-include/freetype2/freetype/cache/ftcglyph.h
-include/freetype2/freetype/cache/ftcimage.h
-include/freetype2/freetype/cache/ftcmanag.h
-include/freetype2/freetype/cache/ftcmru.h
-include/freetype2/freetype/cache/ftcsbits.h
 include/freetype2/freetype/config/ftconfig.h
 include/freetype2/freetype/config/ftheader.h
 include/freetype2/freetype/config/ftmodule.h
@@ -21,6 +14,7 @@ include/freetype2/freetype/ftchapters.h
 include/freetype2/freetype/fterrdef.h
 include/freetype2/freetype/fterrors.h
 include/freetype2/freetype/ftglyph.h
+include/freetype2/freetype/ftgxval.h
 include/freetype2/freetype/ftgzip.h
 include/freetype2/freetype/ftimage.h
 include/freetype2/freetype/ftincrem.h
@@ -38,44 +32,11 @@ include/freetype2/freetype/ftsizes.h
 include/freetype2/freetype/ftsnames.h
 include/freetype2/freetype/ftstroke.h
 include/freetype2/freetype/ftsynth.h
-include/freetype2/freetype/ftsysio.h
-include/freetype2/freetype/ftsysmem.h
 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/ftcalc.h
-include/freetype2/freetype/internal/ftdebug.h
-include/freetype2/freetype/internal/ftdriver.h
-include/freetype2/freetype/internal/ftgloadr.h
-include/freetype2/freetype/internal/ftmemory.h
-include/freetype2/freetype/internal/ftobjs.h
-include/freetype2/freetype/internal/ftrfork.h
-include/freetype2/freetype/internal/ftserv.h
-include/freetype2/freetype/internal/ftstream.h
-include/freetype2/freetype/internal/fttrace.h
-include/freetype2/freetype/internal/ftvalid.h
-include/freetype2/freetype/internal/internal.h
-include/freetype2/freetype/internal/pcftypes.h
-include/freetype2/freetype/internal/psaux.h
-include/freetype2/freetype/internal/pshints.h
-include/freetype2/freetype/internal/sfnt.h
-include/freetype2/freetype/internal/svbdf.h
-include/freetype2/freetype/internal/svgldict.h
-include/freetype2/freetype/internal/svmm.h
-include/freetype2/freetype/internal/svotval.h
-include/freetype2/freetype/internal/svpfr.h
-include/freetype2/freetype/internal/svpostnm.h
-include/freetype2/freetype/internal/svpscmap.h
-include/freetype2/freetype/internal/svpsinfo.h
-include/freetype2/freetype/internal/svsfnt.h
-include/freetype2/freetype/internal/svttcmap.h
-include/freetype2/freetype/internal/svwinfnt.h
-include/freetype2/freetype/internal/svxf86nm.h
-include/freetype2/freetype/internal/t1types.h
-include/freetype2/freetype/internal/tttypes.h
 include/freetype2/freetype/t1tables.h
 include/freetype2/freetype/ttnameid.h
 include/freetype2/freetype/tttables.h
@@ -85,8 +46,6 @@ include/ft2build.h
 lib/libfreetype.la
 lib/pkgconfig/freetype2.pc
 share/aclocal/freetype2.m4
-@dirrm include/freetype2/freetype/internal
 @dirrm include/freetype2/freetype/config
-@dirrm include/freetype2/freetype/cache
 @dirrm include/freetype2/freetype
 @dirrm include/freetype2
diff --git a/graphics/freetype2/distinfo b/graphics/freetype2/distinfo
index 7868bfcdc5c..6dc5785b5fe 100644
--- a/graphics/freetype2/distinfo
+++ b/graphics/freetype2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2006/02/25 00:35:41 reed Exp $
+$NetBSD: distinfo,v 1.17 2006/05/29 22:05:21 tron Exp $
 
-SHA1 (freetype-2.1.10.tar.bz2) = f9e5c52e466c3e41483d5d6d44b4f3135a9c4b16
-RMD160 (freetype-2.1.10.tar.bz2) = 3d31d548632f14784283c97ece64c7425efc3975
-Size (freetype-2.1.10.tar.bz2) = 1037107 bytes
+SHA1 (freetype-2.2.1.tar.bz2) = 4aa7d5ce2198fad586cf09ef7c9d3a6277320167
+RMD160 (freetype-2.2.1.tar.bz2) = 1c7eb4a43501c8fd5e89d0399e184847351ee160
+Size (freetype-2.2.1.tar.bz2) = 1212258 bytes
 SHA1 (patch-aa) = 0f05ebbb7c1264dd58f01916560278cd4c3dce08
diff --git a/graphics/freetype2/patches/patch-aa b/graphics/freetype2/patches/patch-aa
deleted file mode 100644
index c43c71c3dd1..00000000000
--- a/graphics/freetype2/patches/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/02/25 00:35:41 reed Exp $
-
---- builds/unix/freetype2.in.orig	2006-02-24 15:57:06.000000000 -0800
-+++ builds/unix/freetype2.in	2006-02-24 15:56:38.000000000 -0800
-@@ -8,4 +8,4 @@
- Version: @ft_version@
- Requires:
- Libs: -L${libdir} -lfreetype @LIBZ@
--Cflags: -I${includedir}/freetype2
-+Cflags: -I${includedir}/freetype2 -I${includedir}