10 files changed, 63 insertions, 148 deletions

diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 9440aead96cc..79ff67ce1752 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	freetype2
-PORTVERSION=	2.1.10
-PORTREVISION=	5
+PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
@@ -24,7 +24,7 @@ COMMENT=	A free and portable TrueType font rendering engine
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	TOP=""
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnometarget pkgconfig
 LIBTOOLFILES=	builds/unix/configure
@@ -36,11 +36,11 @@ CFLAGS+=	-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
 .endif
 
 .if defined(WITH_CJK)
-PATCH_SITES+=	http://lwj-hinet.myweb.hinet.net/ \
+#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
+#PATCHFILES+=	cjk-freetype-2.1.10-20051219.patch.gz
+#PATCH_DIST_STRIP+=	-p1
 .endif
 
 pre-everything::
@@ -60,6 +60,10 @@ pre-everything::
 pre-patch:
 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/builds/unix/install.mk
+.if !defined(WITHOUT_TTF_BYTECODE_ENABLED)
+	@${REINPLACE_CMD} -e '/#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER/s,/\* \(.*\) \*/,\1,; /#define TT_CONFIG_OPTION_UNPATENTED_HINTING/s,^\(.*\),/* \1 \*/,' \
+		${WRKSRC}/include/freetype/config/ftoption.h
+.endif
 
 post-configure:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup)
diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo
index 627daaa44048..208832af0a19 100644
--- a/print/freetype2/distinfo
+++ b/print/freetype2/distinfo
@@ -1,6 +1,3 @@
-MD5 (freetype-2.1.10.tar.bz2) = a4012e7d1f6400df44a16743b11b8423
-SHA256 (freetype-2.1.10.tar.bz2) = fed2ed148d7d105b95493c5e95561c8b05ee7909e00f828f036d8ed1be6a5e53
-SIZE (freetype-2.1.10.tar.bz2) = 1037107
-MD5 (cjk-freetype-2.1.10-20051219.patch.gz) = dc8f11908c22f5c617c0fff73bd07a52
-SHA256 (cjk-freetype-2.1.10-20051219.patch.gz) = 7bc8d79d4a68dbb4fbc640f6befe3b0868ff0de8295522a316a6dc21ab07a9b0
-SIZE (cjk-freetype-2.1.10-20051219.patch.gz) = 1081
+MD5 (freetype-2.2.1.tar.bz2) = 5b2f827082c544392a7701f7423f0781
+SHA256 (freetype-2.2.1.tar.bz2) = 0e8eb40392752b306d3a3de21f9fa479d53c17bd774b8051771cb258e162e006
+SIZE (freetype-2.2.1.tar.bz2) = 1212258
diff --git a/print/freetype2/files/patch-aa b/print/freetype2/files/patch-aa
index 6db517ee1afa..87863d444bb2 100644
--- a/print/freetype2/files/patch-aa
+++ b/print/freetype2/files/patch-aa
@@ -1,15 +1,14 @@
---- builds/unix/detect.mk.orig	Sun Jan  9 21:12:51 2005
-+++ builds/unix/detect.mk	Sun Jan  9 21:13:42 2005
-@@ -78,10 +78,10 @@
-   ifneq ($(have_mk),)
-     # we are building FT2 not in the src tree
-     $(BUILD_DIR)/unix-def.mk: $(TOP_DIR)/builds/unix/unix-def.in
--	    $(TOP_DIR)/builds/unix/configure $(CFG)
-+#	    $(TOP_DIR)/builds/unix/configure $(CFG)
-   else
-     $(BUILD_DIR)/unix-def.mk: $(TOP_DIR)/builds/unix/unix-def.in
--	    cd builds/unix; ./configure $(CFG)
-+#	    cd builds/unix; ./configure $(CFG)
+--- builds/unix/detect.mk.orig	Tue Aug 22 17:53:59 2006
++++ builds/unix/detect.mk	Tue Aug 22 17:54:09 2006
+@@ -78,9 +78,9 @@ ifeq ($(PLATFORM),unix)
+   ifdef must_configure
+     ifneq ($(have_Makefile),)
+       # we are building FT2 not in the src tree
+-	      $(TOP_DIR)/builds/unix/configure $(CFG)
++#	      $(TOP_DIR)/builds/unix/configure $(CFG)
+     else
+-	      cd builds/unix; ./configure $(CFG)
++#	      cd builds/unix; ./configure $(CFG)
+     endif
    endif
  
- endif   # test PLATFORM unix
diff --git a/print/freetype2/files/patch-builds::unix::freetype2.in b/print/freetype2/files/patch-builds::unix::freetype2.in
deleted file mode 100644
index 3edd50098026..000000000000
--- a/print/freetype2/files/patch-builds::unix::freetype2.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- builds/unix/freetype2.in.orig	Wed Mar  2 20:22:23 2005
-+++ builds/unix/freetype2.in	Wed Mar  2 20:22:53 2005
-@@ -8,4 +8,4 @@
- Version: @ft_version@
- Requires:
- Libs: -L${libdir} -lfreetype @LIBZ@
--Cflags: -I${includedir}/freetype2
-+Cflags: -I${includedir}/freetype2 -I${includedir}
diff --git a/print/freetype2/files/patch-src::base::ftsynth.c b/print/freetype2/files/patch-src::base::ftsynth.c
deleted file mode 100644
index 0a6a99e032d5..000000000000
--- a/print/freetype2/files/patch-src::base::ftsynth.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/base/ftsynth.c.orig	Tue Dec 13 00:44:56 2005
-+++ src/base/ftsynth.c	Tue Dec 13 00:45:05 2005
-@@ -123,7 +123,6 @@
-     if ( !error )
-     {
-       slot->advance.x += xstr;
--      slot->advance.y += ystr;
- 
-       slot->metrics.width        += xstr;
-       slot->metrics.height       += ystr;
diff --git a/print/freetype2/files/patch-src_pcf_pcfdrivr.c b/print/freetype2/files/patch-src_pcf_pcfdrivr.c
index a12810cc3324..01758d8a9091 100644
--- a/print/freetype2/files/patch-src_pcf_pcfdrivr.c
+++ b/print/freetype2/files/patch-src_pcf_pcfdrivr.c
@@ -1,6 +1,6 @@
---- src/pcf/pcfdrivr.c.orig	Wed Jul 28 00:09:02 2004
-+++ src/pcf/pcfdrivr.c	Tue Aug 22 21:39:43 2006
-@@ -203,19 +203,24 @@ THE SOFTWARE.
+--- src/pcf/pcfdrivr.c.orig	2006-02-17 07:40:36.000000000 +0100
++++ src/pcf/pcfdrivr.c
+@@ -203,19 +203,23 @@ THE SOFTWARE.
  
      /* free properties */
      {
@@ -13,26 +13,25 @@
 +      if ( face->properties )
        {
 -        prop = &face->properties[i];
-+	for ( i = 0; i < face->nprops; i++ )
++        for ( i = 0; i < face->nprops; i++ )
 +        {
 +          prop = &face->properties[i];
  
 -        FT_FREE( prop->name );
 -        if ( prop->isString )
--          FT_FREE( prop->value );
--      }
-+	  if ( prop ) {
+-          FT_FREE( prop->value.atom );
++          if ( prop ) {
 +            FT_FREE( prop->name );
-+	    if ( prop->isString )
-+	      FT_FREE( prop->value.atom );
-+	  }
-+	}
- 
-+      }
++            if ( prop->isString )
++              FT_FREE( prop->value.atom );
++          }
++        }
+       }
+-
        FT_FREE( face->properties );
      }
  
-@@ -258,6 +263,8 @@ THE SOFTWARE.
+@@ -258,6 +262,8 @@ THE SOFTWARE.
        FT_Error  error2;
  
  
@@ -41,7 +40,7 @@
        /* this didn't work, try gzip support! */
        error2 = FT_Stream_OpenGzip( &face->gzip_stream, stream );
        if ( FT_ERROR_BASE( error2 ) == FT_Err_Unimplemented_Feature )
-@@ -357,6 +364,7 @@ THE SOFTWARE.
+@@ -357,6 +363,7 @@ THE SOFTWARE.
  
    Fail:
      FT_TRACE2(( "[not a valid PCF file]\n" ));
diff --git a/print/freetype2/files/patch-src_pcf_pcfread.c b/print/freetype2/files/patch-src_pcf_pcfread.c
index a5b3f45aad6e..c9117f2062cc 100644
--- a/print/freetype2/files/patch-src_pcf_pcfread.c
+++ b/print/freetype2/files/patch-src_pcf_pcfread.c
@@ -1,5 +1,5 @@
---- src/pcf/pcfread.c.orig	Sun May  1 11:38:55 2005
-+++ src/pcf/pcfread.c	Wed Aug 23 00:07:33 2006
+--- src/pcf/pcfread.c.orig	2006-01-23 17:35:18.000000000 +0100
++++ src/pcf/pcfread.c
 @@ -102,7 +102,8 @@ THE SOFTWARE.
        return PCF_Err_Cannot_Open_Resource;
  
@@ -345,15 +345,7 @@
      return error;
    }
  
-@@ -571,7 +662,6 @@ THE SOFTWARE.
-     FT_Long    bitmapSizes[GLYPHPADOPTIONS];
-     FT_ULong   format, size;
-     int        nbitmaps, i, sizebitmaps = 0;
--    char*      bitmaps;
- 
- 
-     error = pcf_seek_to_table_type( stream,
-@@ -598,14 +688,16 @@ THE SOFTWARE.
+@@ -597,14 +688,16 @@ THE SOFTWARE.
      if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) )
        return PCF_Err_Invalid_File_Format;
  
@@ -372,7 +364,7 @@
      for ( i = 0; i < nbitmaps; i++ )
      {
        if ( PCF_BYTE_ORDER( format ) == MSBFirst )
-@@ -613,7 +705,7 @@ THE SOFTWARE.
+@@ -612,7 +705,7 @@ THE SOFTWARE.
        else
          (void)FT_READ_LONG_LE( offsets[i] );
  
@@ -381,7 +373,7 @@
                    i, offsets[i], offsets[i] ));
      }
      if ( error )
-@@ -641,16 +733,22 @@ THE SOFTWARE.
+@@ -640,15 +733,22 @@ THE SOFTWARE.
      FT_UNUSED( sizebitmaps );       /* only used for debugging */
  
      for ( i = 0; i < nbitmaps; i++ )
@@ -389,10 +381,10 @@
 +    {
 +      /* rough estimate */
 +      if ( ( offsets[i] < 0 )              ||
-+		      ( (FT_ULong)offsets[i] > size ) )
++           ( (FT_ULong)offsets[i] > size ) )
 +      {
 +        FT_ERROR(( "pcf_get_bitmaps:"));
-+	FT_ERROR(( " invalid offset to bitmap data of glyph %d\n", i ));
++        FT_ERROR(( " invalid offset to bitmap data of glyph %d\n", i ));
 +      }
 +      else
 +        face->metrics[i].bits = stream->pos + offsets[i];
@@ -404,12 +396,12 @@
 -    return error;
 -
    Bail:
-     FT_FREE ( offsets );
--    FT_FREE ( bitmaps );
+-    FT_FREE ( offsets );
++    FT_FREE( offsets );
      return error;
    }
  
-@@ -736,7 +834,7 @@ THE SOFTWARE.
+@@ -734,7 +834,7 @@ THE SOFTWARE.
  
          tmpEncoding[j].glyph = (FT_Short)encodingOffset;
  
@@ -418,7 +410,7 @@
                      tmpEncoding[j].enc, tmpEncoding[j].enc,
                      tmpEncoding[j].glyph ));
  
-@@ -830,7 +928,8 @@ THE SOFTWARE.
+@@ -828,7 +928,8 @@ THE SOFTWARE.
      if ( error )
        goto Bail;
  
@@ -428,7 +420,7 @@
  
      if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT )    &&
           !PCF_FORMAT_MATCH( format, PCF_ACCEL_W_INKBOUNDS ) )
-@@ -878,7 +977,6 @@ THE SOFTWARE.
+@@ -876,7 +977,6 @@ THE SOFTWARE.
        accel->ink_minbounds = accel->minbounds; /* I'm not sure about this */
        accel->ink_maxbounds = accel->maxbounds;
      }
@@ -436,7 +428,7 @@
  
    Bail:
      return error;
-@@ -1084,11 +1182,12 @@ THE SOFTWARE.
+@@ -1082,11 +1182,12 @@ THE SOFTWARE.
        else
          root->family_name = NULL;
  
@@ -452,7 +444,7 @@
         */
        root->num_glyphs = face->nmetrics + 1;
  
-@@ -1170,7 +1269,7 @@ THE SOFTWARE.
+@@ -1171,7 +1272,7 @@ THE SOFTWARE.
    Exit:
      if ( error )
      {
diff --git a/print/freetype2/files/patch-src_sfnt_sfdriver.c b/print/freetype2/files/patch-src_sfnt_sfdriver.c
deleted file mode 100644
index 0d877ff7b8e3..000000000000
--- a/print/freetype2/files/patch-src_sfnt_sfdriver.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/sfnt/sfdriver.c.orig	Wed Aug  3 18:46:34 2005
-+++ src/sfnt/sfdriver.c	Wed Aug  3 18:47:24 2005
-@@ -367,8 +367,13 @@
-     /* see `ttsbit.h' and `sfnt.h' */
-     tt_face_set_sbit_strike,
-     tt_face_load_sbit_strikes,
--    0 /* tt_find_sbit_image */,
--    0 /* tt_load_sbit_metrics */,
-+#ifdef FT_OPTIMIZE_MEMORY
-+    0,
-+    0,
-+#else
-+    tt_find_sbit_image,
-+    tt_load_sbit_metrics,
-+#endif
-     tt_face_load_sbit_image,
-     tt_face_free_sbit_strikes,
- 
diff --git a/print/freetype2/pkg-descr b/print/freetype2/pkg-descr
index 302f713214b8..538d9a8f8fa2 100644
--- a/print/freetype2/pkg-descr
+++ b/print/freetype2/pkg-descr
@@ -1,9 +1,10 @@
-The FreeType engine is a free and portable TrueType font rendering
-engine.  It  has been developed to  provide TT support  to a great
-variety of platforms and environments.
+This includes some tools that are in FreeType 1's contrib directory.
 
-Notice that  FreeType is a *library*.   It is *not*  a font server
-for  your preferred environment,  even though  it was  designed to
-allow the design of many font servers.
+ttf2pfb: Converting TrueType fonts to the Postscript Type 1 format.
+ttf2pk:  A simple conversion tool to bring TrueType quality to the
+         TeX world.
+ttf2bdf: Produce bitmapped fonts from TrueType files for your X11
+         applications.
+ttfbanner: make posters using a TrueType font
 
-WWW: http://www.freetype.org/
+WWW: http://freetype.sourceforge.net/freetype1/projects.html
diff --git a/print/freetype2/pkg-plist b/print/freetype2/pkg-plist
index bffaedf32e40..1be8c735027d 100644
--- a/print/freetype2/pkg-plist
+++ b/print/freetype2/pkg-plist
@@ -1,25 +1,19 @@
 bin/freetype-config
-include/freetype2/freetype/cache/ftccache.h
-include/freetype2/freetype/cache/ftccmap.h
-include/freetype2/freetype/cache/ftcglyph.h
-include/freetype2/freetype/cache/ftcimage.h
-include/freetype2/freetype/cache/ftcmanag.h
-include/freetype2/freetype/cache/ftcmru.h
-include/freetype2/freetype/cache/ftcsbits.h
 include/freetype2/freetype/config/ftconfig.h
 include/freetype2/freetype/config/ftheader.h
 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/ftbitmap.h
 include/freetype2/freetype/ftcache.h
 include/freetype2/freetype/ftchapters.h
 include/freetype2/freetype/fterrdef.h
 include/freetype2/freetype/fterrors.h
 include/freetype2/freetype/ftglyph.h
+include/freetype2/freetype/ftgxval.h
 include/freetype2/freetype/ftgzip.h
 include/freetype2/freetype/ftimage.h
 include/freetype2/freetype/ftincrem.h
@@ -37,44 +31,11 @@ include/freetype2/freetype/ftsizes.h
 include/freetype2/freetype/ftsnames.h
 include/freetype2/freetype/ftstroke.h
 include/freetype2/freetype/ftsynth.h
-include/freetype2/freetype/ftsysio.h
-include/freetype2/freetype/ftsysmem.h
 include/freetype2/freetype/ftsystem.h
 include/freetype2/freetype/fttrigon.h
 include/freetype2/freetype/fttypes.h
 include/freetype2/freetype/ftwinfnt.h
 include/freetype2/freetype/ftxf86.h
-include/freetype2/freetype/internal/autohint.h
-include/freetype2/freetype/internal/ftcalc.h
-include/freetype2/freetype/internal/ftdebug.h
-include/freetype2/freetype/internal/ftdriver.h
-include/freetype2/freetype/internal/ftgloadr.h
-include/freetype2/freetype/internal/ftmemory.h
-include/freetype2/freetype/internal/ftobjs.h
-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
-include/freetype2/freetype/internal/pshints.h
-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
-include/freetype2/freetype/internal/svpsinfo.h
-include/freetype2/freetype/internal/svsfnt.h
-include/freetype2/freetype/internal/svttcmap.h
-include/freetype2/freetype/internal/svwinfnt.h
-include/freetype2/freetype/internal/svxf86nm.h
-include/freetype2/freetype/internal/t1types.h
-include/freetype2/freetype/internal/tttypes.h
 include/freetype2/freetype/t1tables.h
 include/freetype2/freetype/ttnameid.h
 include/freetype2/freetype/tttables.h
@@ -87,8 +48,6 @@ lib/libfreetype.so
 lib/libfreetype.so.9
 libdata/pkgconfig/freetype2.pc
 share/aclocal/freetype2.m4
-@dirrm include/freetype2/freetype/internal
 @dirrm include/freetype2/freetype/config
-@dirrm include/freetype2/freetype/cache
 @dirrm include/freetype2/freetype
 @dirrm include/freetype2