Changes 2.1.8:

* bug fixes

* Both  PCF  and BDF  drivers  now  handle  the SETWIDTH_NAME  and
  ADD_STYLE_NAME    properties.     Values    are   appended    to
  face->style_name; example: `Bold SemiCondensed'.

* The PCF driver now handles bitmap  fonts compressed with the LZW
  algorithm (extension .pcf.Z, compressed with `compress').

* A  new  API   function  `FT_Get_CMap_Language_ID'  (declared  in
  `tttables.h')  is  available  to   get  the  language  ID  of  a
  TrueType/SFNT cmap.

* The hexadecimal format of  data after the `StartData' command in
  CID-keyed Type 1 fonts is now supported.  While this can't occur
  in  file-based   fonts,  it  can   happen  in  document-embedded
  resources of PostScript documents.

* Embedded bitmaps in SFNT-based CFF fonts are now supported.

* A simple  API is  now available  to control  FreeType's  tracing
  mechanism if compiled  with FT_DEBUG_LEVEL_TRACE.   See the file
  `ftdebug.h' for more details.

* YAMATO Masatake contributed improved  handling of MacOS resource
  forks on non-MacOS platforms (for example, Linux can mount MacOS
  file systems).

* Support for MacOS has been improved; there is now a new function
  `FT_New_Face_From_FSSpec'  similar to `FT_New_Face'  except that
  it accepts an FSSpec instead of a path.

* The cache sub-system has been rewritten.

5 files changed, 33 insertions, 44 deletions

diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index 5664defbd83..00879b3d6d3 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.30 2004/03/29 10:17:49 recht Exp $
+# $NetBSD: Makefile,v 1.31 2004/04/27 14:59:49 adam Exp $
 #
 
-DISTNAME=	freetype-2.1.5
-PKGNAME=	freetype2-2.1.5
+DISTNAME=	freetype-2.1.8
+PKGNAME=	freetype2-2.1.8
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.freetype.org/freetype/freetype2/		\
-		ftp://ftp.ntua.gr/mirror/freetype/freetype2/		\
-		ftp://ring.aist.go.jp/pub/graphics/freetype/freetype2/	\
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freetype/} \
+		ftp://ftp.freetype.org/freetype/freetype2/ \
+		ftp://ftp.ntua.gr/mirror/freetype/freetype2/ \
+		ftp://ring.aist.go.jp/pub/graphics/freetype/freetype2/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/freetype/freetype2/ \
 		http://gd.tuwien.ac.at/publishing/freetype/freetype2/
-# comment out sf: contains different 2.1.4 tarball with same contents
-# ${MASTER_SITE_SOURCEFORGE:=freetype/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	rh@NetBSD.org
diff --git a/graphics/freetype2/PLIST b/graphics/freetype2/PLIST
index 869a28c030f..2f228423b7c 100644
--- a/graphics/freetype2/PLIST
+++ b/graphics/freetype2/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.7 2003/12/19 13:45:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/04/27 15:03:17 adam Exp $
 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/cache/ftlru.h
 include/freetype2/freetype/config/ftconfig.h
 include/freetype2/freetype/config/ftheader.h
 include/freetype2/freetype/config/ftmodule.h
@@ -24,10 +24,11 @@ include/freetype2/freetype/ftgzip.h
 include/freetype2/freetype/ftimage.h
 include/freetype2/freetype/ftincrem.h
 include/freetype2/freetype/ftlist.h
+include/freetype2/freetype/ftlzw.h
 include/freetype2/freetype/ftmac.h
 include/freetype2/freetype/ftmm.h
+include/freetype2/freetype/ftmodapi.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
@@ -43,30 +44,33 @@ 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/bdftypes.h
-include/freetype2/freetype/internal/cfftypes.h
-include/freetype2/freetype/internal/fnttypes.h
 include/freetype2/freetype/internal/ftcalc.h
-include/freetype2/freetype/internal/ftcore.h
 include/freetype2/freetype/internal/ftdebug.h
 include/freetype2/freetype/internal/ftdriver.h
-include/freetype2/freetype/internal/ftexcept.h
 include/freetype2/freetype/internal/ftgloadr.h
-include/freetype2/freetype/internal/fthash.h
 include/freetype2/freetype/internal/ftmemory.h
-include/freetype2/freetype/internal/ftobject.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/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
 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/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/t42types.h
 include/freetype2/freetype/internal/tttypes.h
 include/freetype2/freetype/t1tables.h
 include/freetype2/freetype/ttnameid.h
@@ -78,7 +82,7 @@ lib/libfreetype.a
 lib/libfreetype.la
 lib/libfreetype.so
 lib/libfreetype.so.9
-lib/libfreetype.so.9.4
+lib/libfreetype.so.9.6
 lib/pkgconfig/freetype2.pc
 share/aclocal/freetype2.m4
 @unexec ${RMDIR} %D/share/aclocal 2>/dev/null || ${TRUE}
diff --git a/graphics/freetype2/distinfo b/graphics/freetype2/distinfo
index 9447544af8e..28a8924ce13 100644
--- a/graphics/freetype2/distinfo
+++ b/graphics/freetype2/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.10 2003/12/19 13:46:00 adam Exp $
+$NetBSD: distinfo,v 1.11 2004/04/27 14:59:49 adam Exp $
 
-SHA1 (freetype-2.1.5.tar.bz2) = 4cee0581671928f7e721206ef1d4e9f9d37f0faa
-Size (freetype-2.1.5.tar.bz2) = 850767 bytes
-SHA1 (patch-aa) = 7bcff26021b690e4d789c4760baf820c2dc280a5
-SHA1 (patch-ab) = cb1394b51c2b0eb1a4adf0ebef4b460a1adb20f6
+SHA1 (freetype-2.1.8.tar.bz2) = c11759d337cb0bded649a4e25935a779873365b1
+Size (freetype-2.1.8.tar.bz2) = 976821 bytes
+SHA1 (patch-ab) = f44dcb79e7067a225cfe55cf8b95fdd28caeeec3
diff --git a/graphics/freetype2/patches/patch-aa b/graphics/freetype2/patches/patch-aa
deleted file mode 100644
index c13705bb368..00000000000
--- a/graphics/freetype2/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/09/13 08:32:19 adam Exp $
-
---- builds/unix/freetype-config.in.orig	Mon Dec 16 16:51:23 2002
-+++ builds/unix/freetype-config.in
-@@ -90,7 +90,7 @@ fi
- if test "$echo_libs" = "yes" ; then
-  libs="-lfreetype @LIBZ@"
-  if test "@libdir@" != "/usr/lib" ; then
--  echo -L@libdir@ $libs
-+  echo -L@libdir@ -Wl,@RPATH_FLAG@@libdir@ $libs
-  else
-   echo $libs
-  fi
diff --git a/graphics/freetype2/patches/patch-ab b/graphics/freetype2/patches/patch-ab
index df5dc62b3f7..922131e4305 100644
--- a/graphics/freetype2/patches/patch-ab
+++ b/graphics/freetype2/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.5 2003/12/19 13:46:00 adam Exp $
+$NetBSD: patch-ab,v 1.6 2004/04/27 14:59:50 adam Exp $
 
---- builds/unix/configure.orig	2003-07-26 08:08:14.000000000 +0200
+--- builds/unix/configure.orig	2004-04-14 08:49:09.000000000 +0000
 +++ builds/unix/configure
-@@ -9388,6 +9388,7 @@ s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
- s,@LIBTOOL@,$LIBTOOL,;t t
+@@ -21749,6 +21749,7 @@ s,@hardcode_libdir_flag_spec@,$hardcode_
+ s,@wl@,$wl,;t t
  s,@LIBOBJS@,$LIBOBJS,;t t
  s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 +s,@RPATH_FLAG@,$RPATH_FLAG,;t t