Fixed: build failure on 5.99.55

Update to 2.4.6, No answer from maintainer.

 CHANGES BETWEEN 2.4.5 and 2.4.6

  I. IMPORTANT BUG FIXES

    - For TrueType based fonts, the ascender and descender values were
      incorrect sometimes  (off by a pixel if the ppem value was not a
      multiple of 5).   Depending on the use you might now  experience
      a different  layout; the  change should  result in  better, more
      consistent line spacing.

    - Fix CVE-2011-0226  which causes a  vulnerability while  handling
      Type 1 fonts.

    - BDF fonts  containing  glyphs with negative values  for ENCODING
      were  incorrectly  rejected.  This  bug has  been introduced  in
      FreeType version 2.2.0.

    - David Bevan contributed a major revision of the FreeType stroker
      code:

      . The behaviour of FT_STROKER_LINEJOIN_BEVEL has been corrected.

      . A new  line join style,  FT_STROKER_LINEJOIN_MITER_FIXED,  has
        been introduced to support PostScript and PDF miter joins.

      . FT_STROKER_LINEJOIN_MITER_VARIABLE  has been introduced ches has
        been fixed.


  II. MISCELLANEOUS

      - SFNT bitmap fonts which contain an outline glyph for `.notdef'
        only no longer set the FT_FACE_FLAG_SCALABLE flag.

CHANGES BETWEEN 2.4.4 and 2.4.5

  I. IMPORTANT BUG FIXES

    - A rendering regression  for second-order B#zier curves  has been
      fixed, introduced in 2.4.3.


  II. IMPORTANT CHANGES

    - If autohinting  is not  explicitly disabled,  FreeType now  uses
      the autohinter if  a TrueType based font doesn't  contain native
      hints.

    - The load flag FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH  has been made
      redundant and  is simply ignored;  this means that FreeType  now
      ignores the global advance width value in TrueType fonts.


  III. MISCELLANEOUS

    - `FT_Sfnt_Table_Info' can now return the number of SFNT tables of
      a font.

    - Support for PCF files compressed with bzip2 has been contributed
      by Joel  Klinghed.  To  make this  work, the  OS must  provide a
      bzip2 library.

    - Bradley  Grainger  contributed  project  and  solution  files in
      Visual Studio 2010 format.

    - Again some fixes to better handle broken fonts.

4 files changed, 25 insertions, 123 deletions

diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index d7cb1e5c225..a977160e45b 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.81 2011/07/12 16:30:28 drochner Exp $
+# $NetBSD: Makefile,v 1.82 2011/08/03 08:25:41 cheusov Exp $
 
-DISTNAME=	freetype-2.4.5
+DISTNAME=	freetype-2.4.6
 PKGNAME=	${DISTNAME:S/-/2-/}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freetype/}
diff --git a/graphics/freetype2/distinfo b/graphics/freetype2/distinfo
index 8ab4a7ffbef..3dac8bb88d2 100644
--- a/graphics/freetype2/distinfo
+++ b/graphics/freetype2/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.43 2011/07/18 09:54:27 drochner Exp $
+$NetBSD: distinfo,v 1.44 2011/08/03 08:25:41 cheusov Exp $
 
-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 (freetype-2.4.6.tar.bz2) = 9d874398118c805478e81d80449dc4aa5a40b6f2
+RMD160 (freetype-2.4.6.tar.bz2) = 9b01c88a53549af59c40d9dd5846cc5a34cbc181
+Size (freetype-2.4.6.tar.bz2) = 1487579 bytes
 SHA1 (patch-aa) = 85bf9979802e04345a9f5ac3ada2cac9520dabcb
-SHA1 (patch-ab) = c5b63fd9ffa9efbe846d67e657a30a5d2543acf8
-SHA1 (patch-ac) = 2cf82cd42c0c129b0fae7aef894852045abe1648
+SHA1 (patch-ab) = cb8c9552e2db1e1f3da3d20971c22f174e343162
diff --git a/graphics/freetype2/patches/patch-ab b/graphics/freetype2/patches/patch-ab
index 8a5632ab29a..295f634ac02 100644
--- a/graphics/freetype2/patches/patch-ab
+++ b/graphics/freetype2/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.16 2010/12/26 19:16:16 adam Exp $
+$NetBSD: patch-ab,v 1.17 2011/08/03 08:25:41 cheusov Exp $
 
---- builds/unix/unix-cc.in.orig	2010-12-26 19:07:52.000000000 +0000
+--- builds/unix/unix-cc.in.orig	2010-08-31 11:04:28.000000000 +0000
 +++ builds/unix/unix-cc.in
-@@ -101,7 +101,7 @@ LDFLAGS := @LDFLAGS@
+@@ -89,7 +89,7 @@ ANSIFLAGS := @XX_ANSIFLAGS@
+ #
+ #
+ CCraw := $(CC)
+-CC    := $(LIBTOOL) --mode=compile $(CCraw)
++CC    := $(LIBTOOL) --tag=CC --mode=compile $(CCraw)
+ 
+ # Linker flags.
+ #
+@@ -101,12 +101,12 @@ LDFLAGS := @LDFLAGS@
  CCraw_build  := @CC_BUILD@	# native CC of building system
  E_BUILD      := @EXEEXT_BUILD@	# extension for exexutable on building system
  EXPORTS_LIST := $(OBJ_DIR)/ftexport.sym
@@ -11,3 +20,9 @@ $NetBSD: patch-ab,v 1.16 2010/12/26 19:16:16 adam Exp $
  
  
  # Library linking
+ #
+-LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
++LINK_LIBRARY = $(LIBTOOL) --tag=CC --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
+                           -rpath $(libdir) -version-info $(version_info) \
+                           $(LDFLAGS) -no-undefined \
+                           # -export-symbols $(EXPORTS_LIST)
diff --git a/graphics/freetype2/patches/patch-ac b/graphics/freetype2/patches/patch-ac
deleted file mode 100644
index 2660c8e2352..00000000000
--- a/graphics/freetype2/patches/patch-ac
+++ /dev/null
@@ -1,112 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2011/07/18 09:54:27 drochner Exp $
-
-CVE-2011-0226
-
---- src/psaux/t1decode.c.orig	2010-11-23 18:28:53.000000000 +0000
-+++ src/psaux/t1decode.c
-@@ -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", Fix2Int( value ) ));
- #endif
- 
-         *top++       = value;
-@@ -684,8 +686,8 @@
- 
-         top -= 2;
- 
--        subr_no = (FT_Int)( top[1] >> 16 );
--        arg_cnt = (FT_Int)( 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:"