>Number:         21191
>Category:       pkg
>Synopsis:       Update freetype2 to 2.1.4 (patch)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Apr 15 15:10:02 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Christopher Richards
>Release:        NetBSD 1.6.1_RC2
>Organization:
>Environment:
	
	
System: NetBSD zembla.localdomain 1.6.1_RC2 NetBSD 1.6.1_RC2 (ZEMBLA) #1: Sat Mar 22 18:58:36 EST 2003 richards@zembla.Princeton.EDU:/usr/src/sys/arch/i386/compile/ZEMBLA i386
Architecture: i386
Machine: i386
>Description:
	Contains a few important fixes and rendering improvements.
	More details available at
	http://sourceforge.net/project/shownotes.php?release_id=151578 .

>How-To-Repeat:

>Fix:
	Patch follows:

Index: graphics/freetype2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/freetype2/Makefile,v
retrieving revision 1.15
diff -u -b -r1.15 Makefile
--- graphics/freetype2/Makefile	2003/03/21 22:25:50	1.15
+++ graphics/freetype2/Makefile	2003/04/15 15:01:24
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.15 2003/03/21 22:25:50 dillo Exp $
 #
 
-DISTNAME=	freetype-2.1.3
-PKGNAME=	freetype2-2.1.3
-PKGREVISION=	1
+DISTNAME=	freetype-2.1.4
+PKGNAME=	freetype2-2.1.4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freetype/}			\
 		ftp://ftp.freetype.org/freetype/freetype2/		\
@@ -30,4 +29,5 @@
 post-configure:
 	cd ${WRKSRC} && ${LN} -s builds/unix/unix.mk config.mk
 
+.include "../../devel/zlib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
Index: graphics/freetype2/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/freetype2/PLIST,v
retrieving revision 1.3
diff -u -b -r1.3 PLIST
--- graphics/freetype2/PLIST	2002/12/24 00:04:16	1.3
+++ graphics/freetype2/PLIST	2003/04/15 15:01:24
@@ -40,6 +40,7 @@
 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/bdftypes.h
@@ -76,7 +77,7 @@
 lib/libfreetype.la
 lib/libfreetype.so
 lib/libfreetype.so.9
-lib/libfreetype.so.9.2
+lib/libfreetype.so.9.3
 share/aclocal/freetype2.m4
 @unexec ${RMDIR} %D/share/aclocal 2>/dev/null || ${TRUE}
 @dirrm include/freetype2/freetype/internal
Index: graphics/freetype2/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/freetype2/distinfo,v
retrieving revision 1.6
diff -u -b -r1.6 distinfo
--- graphics/freetype2/distinfo	2003/03/21 22:25:50	1.6
+++ graphics/freetype2/distinfo	2003/04/15 15:01:24
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.6 2003/03/21 22:25:50 dillo Exp $
 
-SHA1 (freetype-2.1.3.tar.bz2) = 7b101c9220c1a64061eec8f007301fb249a52737
-Size (freetype-2.1.3.tar.bz2) = 790213 bytes
-SHA1 (patch-aa) = e95285428ba58ce9ceeeec89d6f3fef04099488c
-SHA1 (patch-ab) = 62ce099789f031845fcf71506302b4cdb1672066
+SHA1 (freetype-2.1.4.tar.bz2) = 1610f7cea5c132764c28047618991085c2f51bb4
+Size (freetype-2.1.4.tar.bz2) = 806647 bytes
+SHA1 (patch-aa) = bdfc47360ca1952ce6cb540e795a69523ca8a665
+SHA1 (patch-ab) = 93449315852a2c868d5e3b09a9ae32d005141b14
Index: graphics/freetype2/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/freetype2/patches/patch-aa,v
retrieving revision 1.1
diff -u -b -r1.1 patch-aa
--- graphics/freetype2/patches/patch-aa	2003/03/21 22:25:51	1.1
+++ graphics/freetype2/patches/patch-aa	2003/04/15 15:01:24
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2003/03/21 22:25:51 dillo Exp $
+$NetBSD$
 
---- builds/unix/freetype-config.in.orig	Sat Feb  2 16:05:38 2002
+--- builds/unix/freetype-config.in.orig	Mon Dec 16 16:51:23 2002
 +++ builds/unix/freetype-config.in
 @@ -81,7 +81,7 @@ fi
  if test "$echo_cflags" = "yes" ; then
@@ -13,7 +13,7 @@
   fi
 @@ -90,7 +90,7 @@ fi
  if test "$echo_libs" = "yes" ; then
-  libs="-lfreetype"
+  libs="-lfreetype @LIBZ@"
   if test "@libdir@" != "/usr/lib" ; then
 -  echo -L@libdir@ $libs
 +  echo -L@libdir@ -Wl,@RPATH_FLAG@@libdir@ $libs
Index: graphics/freetype2/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/freetype2/patches/patch-ab,v
retrieving revision 1.1
diff -u -b -r1.1 patch-ab
--- graphics/freetype2/patches/patch-ab	2003/03/21 22:25:51	1.1
+++ graphics/freetype2/patches/patch-ab	2003/04/15 15:01:24
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.1 2003/03/21 22:25:51 dillo Exp $
+$NetBSD$
 
---- builds/unix/configure.orig	Fri Mar 21 23:12:07 2003
+--- builds/unix/configure.orig	Sat Jan 18 11:39:18 2003
 +++ builds/unix/configure
-@@ -9259,6 +9259,7 @@ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
- s,@STRIP@,$STRIP,;t t
- s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
+@@ -9374,6 +9374,7 @@ s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
  s,@LIBTOOL@,$LIBTOOL,;t t
+ s,@LIBOBJS@,$LIBOBJS,;t t
+ s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 +s,@RPATH_FLAG@,$RPATH_FLAG,;t t
  CEOF
  

>Release-Note:
>Audit-Trail:
>Unformatted: