>Number:         25906
>Category:       pkg
>Synopsis:       (patch) fonts/Xft2 update to 2.1.6
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Jun 12 12:35:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Christopher Richards
>Release:        NetBSD 2.0_BETA
>Organization:
>Environment:
	
	
System: NetBSD zembla.localdomain 2.0_BETA NetBSD 2.0_BETA (ZEMBLA) #4: Sun Jun 6 02:48:45 EDT 2004 richards@zembla.localdomain:/usr/obj/sys/arch/i386/compile/ZEMBLA i386
Architecture: i386
Machine: i386
>Description:
	Interesing changes from 2.1.2 to 2.1.6:

	Add support for FC_HINT_STYLE.  The "hintstyle" property
	can range, in order of increasing contrast, over
	"hintnone", "hintslight", "hintmedium", and "hintfull".

        Use FT_LOAD_TARGET_LCD/FT_LOAD_TARGET_LCD_V so that the
	autohinter will snap stems to pixel boundaries.

>How-To-Repeat:
	
>Fix:
	Patch follows:

Index: fonts/Xft2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/Xft2/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- fonts/Xft2/Makefile	27 May 2004 23:17:43 -0000	1.30
+++ fonts/Xft2/Makefile	12 Jun 2004 12:06:12 -0000
@@ -1,10 +1,9 @@
 # $NetBSD: Makefile,v 1.30 2004/05/27 23:17:43 reed Exp $
 
-DISTNAME=	xft-2.1.2
-PKGNAME=	Xft2-2.1.2
-PKGREVISION=	2
+DISTNAME=	libXft-2.1.6
+PKGNAME=	Xft2-2.1.6
 CATEGORIES=	fonts x11
-MASTER_SITES=	http://x2.freedesktop.org/Software/fontconfig/releases/
+MASTER_SITES=	http://freedesktop.org/~xlibs/release/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://fontconfig.org/
Index: fonts/Xft2/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/Xft2/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- fonts/Xft2/distinfo	27 Apr 2004 15:14:53 -0000	1.8
+++ fonts/Xft2/distinfo	12 Jun 2004 12:06:12 -0000
@@ -1,5 +1,4 @@
 $NetBSD: distinfo,v 1.8 2004/04/27 15:14:53 adam Exp $
 
-SHA1 (xft-2.1.2.tar.gz) = 892d57cac909ef51c3c49b9a6aaf54e6b6ab6b92
-Size (xft-2.1.2.tar.gz) = 243680 bytes
-SHA1 (patch-aa) = c778ef743e228035249ef8a128861c25eab06c4d
+SHA1 (libXft-2.1.6.tar.gz) = aac238e77e30d00df2ff3aa8970acbe31af8a297
+Size (libXft-2.1.6.tar.gz) = 334803 bytes
Index: fonts/Xft2/patches/patch-aa
===================================================================
RCS file: fonts/Xft2/patches/patch-aa
diff -N fonts/Xft2/patches/patch-aa
--- fonts/Xft2/patches/patch-aa	27 Apr 2004 15:10:51 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2004/04/27 15:10:51 adam Exp $
-
---- Xft.h.orig	2004-04-26 12:00:26.000000000 +0000
-+++ Xft.h
-@@ -38,6 +38,7 @@
- #define XftVersion	XFT_VERSION
- 
- #include <stdarg.h>
-+#include <ft2build.h>
- #include <freetype/freetype.h>
- #include <fontconfig/fontconfig.h>
- #include <X11/extensions/Xrender.h>

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