Update to 2.1.3.

5 files changed, 13 insertions, 51 deletions

diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index a2daed7665ab..2b2f08cfdd24 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	freetype2
-PORTVERSION=	2.1.2
-PORTREVISION=	1
+PORTVERSION=	2.1.3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo
index ac4a767ed99b..99b096b25677 100644
--- a/print/freetype2/distinfo
+++ b/print/freetype2/distinfo
@@ -1 +1 @@
-MD5 (freetype-2.1.2.tar.bz2) = 23d04bf0cfc48772b8d698c95eec37bd
+MD5 (freetype-2.1.3.tar.bz2) = 09775a4111e066f782866d8a57d8481b
diff --git a/print/freetype2/files/patch-include::freetype::config::ftoption.h b/print/freetype2/files/patch-include::freetype::config::ftoption.h
index 3fb2b5b645d3..e443eb8c57af 100644
--- a/print/freetype2/files/patch-include::freetype::config::ftoption.h
+++ b/print/freetype2/files/patch-include::freetype::config::ftoption.h
@@ -1,22 +1,13 @@
 
 $FreeBSD$
 
---- include/freetype/config/ftoption.h.orig	Sat Jun  8 04:05:56 2002
-+++ include/freetype/config/ftoption.h	Fri Jun 21 15:49:27 2002
-@@ -82,7 +82,7 @@
+--- include/freetype/config/ftoption.h.orig	Thu Nov  7 00:32:53 2002
++++ include/freetype/config/ftoption.h	Fri Jan 17 20:44:08 2003
+@@ -378,7 +378,7 @@
+   /*   do not #undef this macro here, since the build system might         */
+   /*   define for certain configurations                                   */
    /*                                                                       */
-   /*   Define this if you want generic cmap support.                       */
-   /*                                                                       */
--#define FT_CONFIG_OPTION_USE_CMAPS
-+#undef FT_CONFIG_OPTION_USE_CMAPS
- 
- 
-   /*************************************************************************/
-@@ -375,7 +375,7 @@
-   /* By undefining this, you will only compile the code necessary to load  */
-   /* TrueType glyphs without hinting.                                      */
-   /*                                                                       */
--#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+-/* #define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
 +#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
  
  
diff --git a/print/freetype2/files/patch-xft-fonts b/print/freetype2/files/patch-xft-fonts
deleted file mode 100644
index f3cd8e7316ec..000000000000
--- a/print/freetype2/files/patch-xft-fonts
+++ /dev/null
@@ -1,33 +0,0 @@
-This patch fixes a problem with diagonal fonts being displayed in mozilla-devel
-with Xft support enabled.  It was obtained from:
-
-http://www.xfree86.org/pipermail/fonts/2002-September/002161.html
-
-This is already in freetype2 CVS, and should not be needed when the next
-release of freetype2 comes out.
---- src/base/ftoutln.c.orig	Thu Oct 24 14:32:25 2002
-+++ src/base/ftoutln.c	Thu Oct 24 14:33:09 2002
-@@ -628,9 +628,9 @@
-       return;
- 
-     xz = FT_MulFix( vector->x, matrix->xx ) +
--         FT_MulFix( vector->y, matrix->yx );
-+         FT_MulFix( vector->y, matrix->xy );
- 
--    yz = FT_MulFix( vector->x, matrix->xy ) +
-+    yz = FT_MulFix( vector->x, matrix->yx ) +
-          FT_MulFix( vector->y, matrix->yy );
- 
-     vector->x = xz;
---- src/truetype/ttgload.c.orig	Thu Oct 24 14:33:38 2002
-+++ src/truetype/ttgload.c	Thu Oct 24 14:34:09 2002
-@@ -544,8 +544,8 @@
-       else if ( subglyph->flags & WE_HAVE_A_2X2 )
-       {
-         xx = (FT_Fixed)FT_GET_SHORT() << 2;
--        xy = (FT_Fixed)FT_GET_SHORT() << 2;
-         yx = (FT_Fixed)FT_GET_SHORT() << 2;
-+	xy = (FT_Fixed)FT_GET_SHORT() << 2;
-         yy = (FT_Fixed)FT_GET_SHORT() << 2;
-       }
- 
diff --git a/print/freetype2/pkg-plist b/print/freetype2/pkg-plist
index deca03cb586a..9ffc44107d9c 100644
--- a/print/freetype2/pkg-plist
+++ b/print/freetype2/pkg-plist
@@ -19,16 +19,20 @@ include/freetype2/freetype/ftchapters.h
 include/freetype2/freetype/fterrdef.h
 include/freetype2/freetype/fterrors.h
 include/freetype2/freetype/ftglyph.h
+include/freetype2/freetype/ftgzip.h
 include/freetype2/freetype/ftimage.h
+include/freetype2/freetype/ftincrem.h
 include/freetype2/freetype/ftlist.h
 include/freetype2/freetype/ftmac.h
 include/freetype2/freetype/ftmm.h
 include/freetype2/freetype/ftmoderr.h
 include/freetype2/freetype/ftmodule.h
 include/freetype2/freetype/ftoutln.h
+include/freetype2/freetype/ftpfr.h
 include/freetype2/freetype/ftrender.h
 include/freetype2/freetype/ftsizes.h
 include/freetype2/freetype/ftsnames.h
+include/freetype2/freetype/ftstroker.h
 include/freetype2/freetype/ftsynth.h
 include/freetype2/freetype/ftsysio.h
 include/freetype2/freetype/ftsysmem.h
@@ -54,6 +58,7 @@ include/freetype2/freetype/internal/ftstream.h
 include/freetype2/freetype/internal/fttrace.h
 include/freetype2/freetype/internal/internal.h
 include/freetype2/freetype/internal/pcftypes.h
+include/freetype2/freetype/internal/pfr.h
 include/freetype2/freetype/internal/psaux.h
 include/freetype2/freetype/internal/pshints.h
 include/freetype2/freetype/internal/psnames.h