update to 2.4.5

changes:
-fixed rendering regression  for second-order Bezier curves
-FreeType now  uses the autohinter per default
-Support for PCF files compressed with bzip2
-misc fixes and improvements
pkgsrc change: clean up patch-ac (which fixes SA45167): put sign extension
stuff into a macro and move checks to make it closer to the upstream fix

4 files changed, 102 insertions, 16 deletions

diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index 3d7951207f8..d7cb1e5c225 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2011/07/07 17:02:12 drochner Exp $
+# $NetBSD: Makefile,v 1.81 2011/07/12 16:30:28 drochner Exp $
 
-DISTNAME=	freetype-2.4.4
+DISTNAME=	freetype-2.4.5
 PKGNAME=	${DISTNAME:S/-/2-/}
-PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freetype/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/freetype2/PLIST b/graphics/freetype2/PLIST
index 49895a5af0d..5fc1c64ba70 100644
--- a/graphics/freetype2/PLIST
+++ b/graphics/freetype2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2009/06/14 17:59:12 joerg Exp $
+@comment $NetBSD: PLIST,v 1.18 2011/07/12 16:30:28 drochner Exp $
 bin/freetype-config
 include/freetype2/freetype/config/ftconfig.h
 include/freetype2/freetype/config/ftheader.h
@@ -10,6 +10,7 @@ include/freetype2/freetype/ftadvanc.h
 include/freetype2/freetype/ftbbox.h
 include/freetype2/freetype/ftbdf.h
 include/freetype2/freetype/ftbitmap.h
+include/freetype2/freetype/ftbzip2.h
 include/freetype2/freetype/ftcache.h
 include/freetype2/freetype/ftchapters.h
 include/freetype2/freetype/ftcid.h
diff --git a/graphics/freetype2/distinfo b/graphics/freetype2/distinfo
index a50115b6500..6f11e03541e 100644
--- a/graphics/freetype2/distinfo
+++ b/graphics/freetype2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.41 2011/07/07 17:02:12 drochner Exp $
+$NetBSD: distinfo,v 1.42 2011/07/12 16:30:28 drochner Exp $
 
-SHA1 (freetype-2.4.4.tar.bz2) = 1d136cbc51c67b212c91ba04dc5db797f35e64e6
-RMD160 (freetype-2.4.4.tar.bz2) = 6b9b37ccdc8d1bfe0883f0e25df6de49ab30379e
-Size (freetype-2.4.4.tar.bz2) = 1442053 bytes
+SHA1 (freetype-2.4.5.tar.bz2) = edc5217f1a0e3bec37f9846bb5203e8d005cf470
+RMD160 (freetype-2.4.5.tar.bz2) = ec6719f2f851ebdb7135030ffd481d9ca53a54c1
+Size (freetype-2.4.5.tar.bz2) = 1483537 bytes
 SHA1 (patch-aa) = 85bf9979802e04345a9f5ac3ada2cac9520dabcb
 SHA1 (patch-ab) = c5b63fd9ffa9efbe846d67e657a30a5d2543acf8
-SHA1 (patch-ac) = 5d42610de8c177407a717157d84322a5b06045ee
+SHA1 (patch-ac) = b47d43414115caeb75f806df98b25407291964cb
diff --git a/graphics/freetype2/patches/patch-ac b/graphics/freetype2/patches/patch-ac
index 49b8ed6907b..f6f40a1ed64 100644
--- a/graphics/freetype2/patches/patch-ac
+++ b/graphics/freetype2/patches/patch-ac
@@ -1,26 +1,112 @@
-$NetBSD: patch-ac,v 1.8 2011/07/07 17:02:12 drochner Exp $
+$NetBSD: patch-ac,v 1.9 2011/07/12 16:30:28 drochner Exp $
 
-avoid sign extension
+SA45167
 
 --- src/psaux/t1decode.c.orig	2010-11-23 18:28:53.000000000 +0000
 +++ src/psaux/t1decode.c
-@@ -662,7 +662,7 @@
+@@ -28,6 +28,8 @@
+ 
+ #include "psauxerr.h"
+ 
++/* ensure proper sign extension */
++#define Fix2Int(f) ((FT_Int)(FT_Short)((f) >> 16))
+ 
+   /*************************************************************************/
+   /*                                                                       */
+@@ -662,7 +664,7 @@
          if ( large_int )
            FT_TRACE4(( " %ld", value ));
          else
 -          FT_TRACE4(( " %ld", (FT_Int32)( value >> 16 ) ));
-+          FT_TRACE4(( " %ld", (FT_Int32)( (FT_UInt32)value >> 16 ) ));
++          FT_TRACE4(( " %ld", Fix2Int( value ) ));
  #endif
  
          *top++       = value;
-@@ -684,8 +684,8 @@
+@@ -684,8 +686,8 @@
  
          top -= 2;
  
 -        subr_no = (FT_Int)( top[1] >> 16 );
 -        arg_cnt = (FT_Int)( top[0] >> 16 );
-+        subr_no = (FT_Int)( (FT_ULong)top[1] >> 16 );
-+        arg_cnt = (FT_Int)( (FT_ULong)top[0] >> 16 );
++        subr_no = Fix2Int( top[1] );
++        arg_cnt = Fix2Int( top[0] );
  
          /***********************************************************/
          /*                                                         */
+@@ -698,6 +700,8 @@
+         /* for unhandled othersubrs the following pops adjust the  */
+         /* stack pointer as necessary                              */
+ 
++	if ( arg_cnt < 0 )
++	  goto Syntax_Error;
+         if ( arg_cnt > top - decoder->stack )
+           goto Stack_Underflow;
+ 
+@@ -862,7 +866,7 @@
+             if ( arg_cnt != 1 || blend == NULL )
+               goto Unexpected_OtherSubr;
+ 
+-            idx = (FT_Int)( top[0] >> 16 );
++            idx = Fix2Int( top[0] );
+ 
+             if ( idx < 0                                           ||
+                  idx + blend->num_designs > decoder->len_buildchar )
+@@ -930,7 +934,7 @@
+             if ( arg_cnt != 2 || blend == NULL )
+               goto Unexpected_OtherSubr;
+ 
+-            idx = (FT_Int)( top[1] >> 16 );
++            idx = Fix2Int( top[1] );
+ 
+             if ( idx < 0 || (FT_UInt) idx >= decoder->len_buildchar )
+               goto Unexpected_OtherSubr;
+@@ -951,7 +955,7 @@
+             if ( arg_cnt != 1 || blend == NULL )
+               goto Unexpected_OtherSubr;
+ 
+-            idx = (FT_Int)( top[0] >> 16 );
++            idx = Fix2Int( top[0] );
+ 
+             if ( idx < 0 || (FT_UInt) idx >= decoder->len_buildchar )
+               goto Unexpected_OtherSubr;
+@@ -1009,11 +1013,15 @@
+           break;
+ 
+         default:
+-          FT_ERROR(( "t1_decoder_parse_charstrings:"
+-                     " unknown othersubr [%d %d], wish me luck\n",
+-                     arg_cnt, subr_no ));
+-          unknown_othersubr_result_cnt = arg_cnt;
+-          break;
++	  if ( subr_no >= 0 )
++	  {
++            FT_ERROR(( "t1_decoder_parse_charstrings:"
++                       " unknown othersubr [%d %d], wish me luck\n",
++                       arg_cnt, subr_no ));
++            unknown_othersubr_result_cnt = arg_cnt;
++            break;
++	  }
++	  /* FALLTHROUGH */
+ 
+         Unexpected_OtherSubr:
+           FT_ERROR(( "t1_decoder_parse_charstrings:"
+@@ -1139,8 +1147,8 @@
+                                   top[0],
+                                   top[1],
+                                   top[2],
+-                                  (FT_Int)( top[3] >> 16 ),
+-                                  (FT_Int)( top[4] >> 16 ) );
++                                  Fix2Int( top[3] ),
++                                  Fix2Int( top[4] ) );
+ 
+         case op_sbw:
+           FT_TRACE4(( " sbw" ));
+@@ -1324,7 +1332,7 @@
+ 
+             FT_TRACE4(( " callsubr" ));
+ 
+-            idx = (FT_Int)( top[0] >> 16 );
++            idx = Fix2Int( top[0] );
+             if ( idx < 0 || idx >= (FT_Int)decoder->num_subrs )
+             {
+               FT_ERROR(( "t1_decoder_parse_charstrings:"