Index: print/freetype2/Makefile
===================================================================
--- print/freetype2/Makefile	(revision 308602)
+++ print/freetype2/Makefile	(working copy)
@@ -1,21 +1,13 @@
-# New ports collection makefile for:	freetype
-# Date created:		January 24, 1998
-# Whom:			jseger@FreeBSD.org
-#
+# Created by: jseger@FreeBSD.org
 # $FreeBSD$
 #   $MCom: ports/print/freetype2/Makefile,v 1.28 2011/10/25 18:31:21 kwm Exp $
-#
 
 PORTNAME=	freetype2
-PORTVERSION=	2.4.9
-PORTREVISION=	1
+PORTVERSION=	2.4.10
 CATEGORIES=	print
 MASTER_SITES=	SF/freetype/${PORTNAME}/${PORTVERSION} \
-		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \
-		http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/ \
-		http://ftp.sunet.se/pub/text-processing/freetype/freetype2/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/freetype/&,} \
-		ftp://ftp.freetype.org/freetype/freetype2/
+		SAVANNAH/freetype \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/freetype/freetype2/&,}
 DISTNAME=	${PORTNAME:S/2//}-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -32,17 +24,19 @@
 LIBTOOLFILES=	builds/unix/configure
 CONFIGURE_WRKSRC=	${WRKSRC}/builds/unix
 
+# The TrueType bytecode patents have expired and are on by default.
+# The bit below is for LCD rendering or ClearType which is still covert by patents.
 .if defined(WITH_LCD_FILTERING)
 CFLAGS+=	-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
 .endif
 
-.if defined(WITH_CJK)
+#.if defined(WITH_CJK)
 #PATCH_SITES+=	http://lwj-hinet.myweb.hinet.net/ \
 #		ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \
 #		http://bsdchat.com/dist/firefly-cjk-patchset/
 #PATCHFILES+=	cjk-freetype-2.1.10-20051219.patch.gz
 #PATCH_DIST_STRIP+=	-p1
-.endif
+#.endif
 
 pre-everything::
 .if !defined(WITH_LCD_FILTERING)
Index: print/freetype2/distinfo
===================================================================
--- print/freetype2/distinfo	(revision 308602)
+++ print/freetype2/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (freetype-2.4.9.tar.bz2) = c4204ac1d48e99d4375a2f32bf4f3f92780a9d9f015e64e57e852f6c004859b9
-SIZE (freetype-2.4.9.tar.bz2) = 1504819
+SHA256 (freetype-2.4.10.tar.bz2) = 0c8e242c33c45928de560d7d595db06feb41d1b22167e37260ceabe72f9e992f
+SIZE (freetype-2.4.10.tar.bz2) = 1508927
Index: print/freetype2/files/patch-aa
===================================================================
--- print/freetype2/files/patch-aa	(revision 308602)
+++ print/freetype2/files/patch-aa	(working copy)
@@ -1,24 +0,0 @@
---- builds/unix/detect.mk.orig	2006-12-09 13:51:54.000000000 -0500
-+++ builds/unix/detect.mk	2007-07-06 12:55:05.000000000 -0400
-@@ -21,6 +21,9 @@ ifeq ($(PLATFORM),ansi)
-   is_unix := $(strip $(wildcard /sbin/init) \
-                      $(wildcard /usr/sbin/init) \
-                      $(wildcard /hurd/auth))
-+  # FreeBSD is "unix" so just mandate this to fix the build in
-+  # jails that do not have init (see PR#113470).
-+  is_unix := true
-   ifneq ($(is_unix),)
- 
-     PLATFORM := unix
-@@ -79,9 +82,9 @@ ifeq ($(PLATFORM),unix)
-   ifdef must_configure
-     ifneq ($(have_Makefile),)
-       # we are building FT2 not in the src tree
--	      $(TOP_DIR)/builds/unix/configure $(value CFG)
-+#	      $(TOP_DIR)/builds/unix/configure $(value CFG)
-     else
--	      cd builds/unix; ./configure $(value CFG)
-+#	      cd builds/unix; ./configure $(value CFG)
-     endif
-   endif
- 
Index: print/freetype2/files/patch-src_type1_t1load.c
===================================================================
--- print/freetype2/files/patch-src_type1_t1load.c	(revision 308602)
+++ print/freetype2/files/patch-src_type1_t1load.c	(working copy)
@@ -1,101 +0,0 @@
---- src/type1/t1load.c.orig	2012-04-07 12:20:49.000000000 +0200
-+++ src/type1/t1load.c	2012-04-07 12:21:10.000000000 +0200
-@@ -71,6 +71,13 @@
- #include "t1errors.h"
- 
- 
-+#ifdef FT_CONFIG_OPTION_INCREMENTAL
-+#define IS_INCREMENTAL  ( face->root.internal->incremental_interface != 0 )
-+#else
-+#define IS_INCREMENTAL  0
-+#endif
-+
-+
-   /*************************************************************************/
-   /*                                                                       */
-   /* The macro FT_COMPONENT is used in trace mode.  It is an implicit      */
-@@ -1030,7 +1037,8 @@
-   static int
-   read_binary_data( T1_Parser  parser,
-                     FT_Long*   size,
--                    FT_Byte**  base )
-+                    FT_Byte**  base,
-+                    FT_Bool    incremental )
-   {
-     FT_Byte*  cur;
-     FT_Byte*  limit = parser->root.limit;
-@@ -1065,8 +1073,12 @@
-       }
-     }
- 
--    FT_ERROR(( "read_binary_data: invalid size field\n" ));
--    parser->root.error = T1_Err_Invalid_File_Format;
-+    if( !incremental )
-+    {
-+      FT_ERROR(( "read_binary_data: invalid size field\n" ));
-+      parser->root.error = T1_Err_Invalid_File_Format;
-+    }
-+
-     return 0;
-   }
- 
-@@ -1387,16 +1399,17 @@
-       FT_Byte*  base;
- 
- 
--      /* If the next token isn't `dup' we are done. */
--      if ( parser->root.cursor + 4 < parser->root.limit            &&
--           ft_strncmp( (char*)parser->root.cursor, "dup", 3 ) != 0 )
-+      /* If we are out of data, or if the next token isn't `dup', */
-+      /* we are done.                                             */
-+      if ( parser->root.cursor + 4 >= parser->root.limit          ||
-+          ft_strncmp( (char*)parser->root.cursor, "dup", 3 ) != 0 )
-         break;
- 
-       T1_Skip_PS_Token( parser );       /* `dup' */
- 
-       idx = T1_ToInt( parser );
- 
--      if ( !read_binary_data( parser, &size, &base ) )
-+      if ( !read_binary_data( parser, &size, &base, IS_INCREMENTAL ) )
-         return;
- 
-       /* The binary string is followed by one token, e.g. `NP' */
-@@ -1582,7 +1595,7 @@
-         cur++;                              /* skip `/' */
-         len = parser->root.cursor - cur;
- 
--        if ( !read_binary_data( parser, &size, &base ) )
-+        if ( !read_binary_data( parser, &size, &base, IS_INCREMENTAL ) )
-           return;
- 
-         /* for some non-standard fonts like `Optima' which provides */
-@@ -1871,7 +1884,7 @@
- 
- 
-         parser->root.cursor = start_binary;
--        if ( !read_binary_data( parser, &s, &b ) )
-+        if ( !read_binary_data( parser, &s, &b, IS_INCREMENTAL ) )
-           return T1_Err_Invalid_File_Format;
-         have_integer = 0;
-       }
-@@ -1884,7 +1897,7 @@
- 
- 
-         parser->root.cursor = start_binary;
--        if ( !read_binary_data( parser, &s, &b ) )
-+        if ( !read_binary_data( parser, &s, &b, IS_INCREMENTAL ) )
-           return T1_Err_Invalid_File_Format;
-         have_integer = 0;
-       }
-@@ -2160,9 +2173,7 @@
-       type1->subrs_len   = loader.subrs.lengths;
-     }
- 
--#ifdef FT_CONFIG_OPTION_INCREMENTAL
--    if ( !face->root.internal->incremental_interface )
--#endif
-+    if ( !IS_INCREMENTAL )
-       if ( !loader.charstrings.init )
-       {
-         FT_ERROR(( "T1_Open_Face: no `/CharStrings' array in face\n" ));