Update to 2.1.10. Note: the CJK patches will need some work before they

can be used with this version.

4 files changed, 13 insertions, 31 deletions

diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index af7479b6361d..610148a42b06 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freetype2
-PORTVERSION=	2.1.9
+PORTVERSION=	2.1.10
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
@@ -35,12 +35,12 @@ CONFIGURE_WRKSRC=	${WRKSRC}/builds/unix
 CFLAGS+=	-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
 .endif
 
-.if defined(WITH_CJK)
-PATCH_SITES+=	ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \
-		http://bsdchat.com/dist/firefly-cjk-patchset/
-PATCHFILES+=	cjk-freetype-2.1.9-20050315.patch.gz
-PATCH_DIST_STRIP+=	-p1
-.endif
+#.if defined(WITH_CJK)
+#PATCH_SITES+=	ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \
+#		http://bsdchat.com/dist/firefly-cjk-patchset/
+#PATCHFILES+=	cjk-freetype-2.1.9-20050315.patch.gz
+#PATCH_DIST_STRIP+=	-p1
+#.endif
 
 pre-everything::
 .if !defined(WITHOUT_TTF_BYTECODE_ENABLED)
diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo
index 7621735ba3f2..4470a5e4460e 100644
--- a/print/freetype2/distinfo
+++ b/print/freetype2/distinfo
@@ -1,4 +1,4 @@
-MD5 (freetype-2.1.9.tar.bz2) = ec1b903e4be5f073caa72458ea58c29c
-SIZE (freetype-2.1.9.tar.bz2) = 992394
+MD5 (freetype-2.1.10.tar.bz2) = a4012e7d1f6400df44a16743b11b8423
+SIZE (freetype-2.1.10.tar.bz2) = 1037107
 MD5 (cjk-freetype-2.1.9-20050315.patch.gz) = 6939b67cb81e1ffe9b9758cce20f3bc7
 SIZE (cjk-freetype-2.1.9-20050315.patch.gz) = 17437
diff --git a/print/freetype2/files/patch-src::truetype::ttgload.c b/print/freetype2/files/patch-src::truetype::ttgload.c
deleted file mode 100644
index 3d15d3b8fd9b..000000000000
--- a/print/freetype2/files/patch-src::truetype::ttgload.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: src/truetype/ttgload.c
-===================================================================
-RCS file: /cvsroot/freetype/freetype2/src/truetype/ttgload.c,v
-retrieving revision 1.131
-retrieving revision 1.132
-diff -u -r1.131 -r1.132
---- src/truetype/ttgload.c	13 Oct 2004 05:15:44 -0000	1.131
-+++ src/truetype/ttgload.c	19 Nov 2004 10:35:52 -0000	1.132
-@@ -797,12 +797,10 @@
-     if ( IS_HINTED( load->load_flags ) )
-     {
-       FT_Pos  x = zone->org[n_points-4].x;
--      FT_Pos  y = zone->org[n_points-2].y;
- 
- 
-       x = FT_PIX_ROUND( x ) - x;
--      y = FT_PIX_ROUND( y ) - y;
--      translate_array( n_points, zone->org, x, y );
-+      translate_array( n_points, zone->org, x, 0 );
- 
-       org_to_cur( n_points, zone );
- 
diff --git a/print/freetype2/pkg-plist b/print/freetype2/pkg-plist
index 788737ad6821..536f471cadb0 100644
--- a/print/freetype2/pkg-plist
+++ b/print/freetype2/pkg-plist
@@ -12,6 +12,7 @@ include/freetype2/freetype/config/ftmodule.h
 include/freetype2/freetype/config/ftoption.h
 include/freetype2/freetype/config/ftstdlib.h
 include/freetype2/freetype/freetype.h
+include/freetype2/freetype/ftbitmap.h
 include/freetype2/freetype/ftbbox.h
 include/freetype2/freetype/ftbdf.h
 include/freetype2/freetype/ftcache.h
@@ -28,6 +29,7 @@ include/freetype2/freetype/ftmac.h
 include/freetype2/freetype/ftmm.h
 include/freetype2/freetype/ftmodapi.h
 include/freetype2/freetype/ftmoderr.h
+include/freetype2/freetype/ftotval.h
 include/freetype2/freetype/ftoutln.h
 include/freetype2/freetype/ftpfr.h
 include/freetype2/freetype/ftrender.h
@@ -53,6 +55,7 @@ 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
@@ -61,6 +64,7 @@ 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