7 files changed, 8 insertions, 86 deletions
diff --git a/x11/libXft/Makefile b/x11/libXft/Makefile
index 811051e2dd0..dff62704894 100644
--- a/x11/libXft/Makefile
+++ b/x11/libXft/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2008/05/24 21:45:15 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2008/07/13 23:41:02 bjs Exp $
 
-DISTNAME=	libXft-2.1.12
-PKGREVISION=	1
+DISTNAME=	libXft-2.1.13
 CATEGORIES=	fonts x11
 MASTER_SITES=	${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/libXft/buildlink3.mk b/x11/libXft/buildlink3.mk
index 14b5adaec1a..c2c3ce90ce9 100644
--- a/x11/libXft/buildlink3.mk
+++ b/x11/libXft/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/11/05 16:55:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2008/07/13 23:41:02 bjs Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -19,6 +19,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXft
 
 .if ${LIBXFT_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.libXft+=	libXft>=2.1.10
+BUILDLiNK_ABI_DEPENDS.libXft+=	libXft>=2.1.13
 BUILDLINK_PKGSRCDIR.libXft?=	../../x11/libXft
 .endif	# LIBXFT_BUILDLINK3_MK
 
diff --git a/x11/libXft/distinfo b/x11/libXft/distinfo
index f1da110f62a..35d067a6f87 100644
--- a/x11/libXft/distinfo
+++ b/x11/libXft/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2008/01/29 04:18:44 bjs Exp $
+$NetBSD: distinfo,v 1.4 2008/07/13 23:41:02 bjs Exp $
 
-SHA1 (libXft-2.1.12.tar.bz2) = c55fb1b79e6e8459a343e4986f0607a438eff340
-RMD160 (libXft-2.1.12.tar.bz2) = 98ee482a0bdb9d41bbea667ea84d00421e51424b
-Size (libXft-2.1.12.tar.bz2) = 260437 bytes
+SHA1 (libXft-2.1.13.tar.bz2) = 7ce291fe4306de8e73e545ab9af2285cc1c26dce
+RMD160 (libXft-2.1.13.tar.bz2) = f9cbfd6710a9999a12f49e2bb23b8061eee01e9e
+Size (libXft-2.1.13.tar.bz2) = 268153 bytes
 SHA1 (patch-aa) = aa6f081596084e97e3767ce2b1d4648cf7917a6c
 SHA1 (patch-ab) = e275990e6469819724d76b393d8a451cca778f9a
 SHA1 (patch-ac) = d00925dcc3ad35933036c6708626d9b745712119
diff --git a/x11/libXft/patches/patch-aa b/x11/libXft/patches/patch-aa
deleted file mode 100644
index d40062773a1..00000000000
--- a/x11/libXft/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/01/23 15:20:08 joerg Exp $
-
---- include/X11/Xft/Xft.h.orig	2006-12-07 11:20:30.000000000 +0100
-+++ include/X11/Xft/Xft.h
-@@ -447,6 +447,9 @@ XftListFonts (Display	*dpy,
- FcPattern 
- *XftNameParse (_Xconst char *name);
- 
-+FcBool
-+XftNameUnparse (FcPattern *pat, char *dest, int len);
-+
- /* xftrender.c */
- void
- XftGlyphRender (Display		*dpy,
diff --git a/x11/libXft/patches/patch-ab b/x11/libXft/patches/patch-ab
deleted file mode 100644
index b24760b0423..00000000000
--- a/x11/libXft/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/01/23 15:20:08 joerg Exp $
-
---- configure.orig	2007-01-23 16:04:17.000000000 +0100
-+++ configure
-@@ -2269,10 +2269,10 @@ AMSHOWCMDSAT=''
- AMDEPSHOWCMDSAT=''
- AMPRETTYECHO=true
- AMCMDECHO=echo
--if test "x$enable_pretty_cmds" == xyes;
-+if test "x$enable_pretty_cmds" = xyes;
- then
-   AMSHOWCMDSAT='@'
--  test x$enable_dependency_tracking == xno && AMDEPSHOWCMDSAT='@'
-+  test x$enable_dependency_tracking = xno && AMDEPSHOWCMDSAT='@'
-   AMPRETTYECHO=echo
-   AMCMDECHO=true
-   LT_QUIET='--quiet'
diff --git a/x11/libXft/patches/patch-ac b/x11/libXft/patches/patch-ac
deleted file mode 100644
index 1f041ced869..00000000000
--- a/x11/libXft/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/01/29 04:18:44 bjs Exp $
-
-XftFontOpenInfo: Use of uninitialised value of size 8 (bug 11200)
-(from freedesktop.org GIT)
-
---- src/xftfreetype.c.orig	2006-12-07 05:17:19.000000000 -0500
-+++ src/xftfreetype.c
-@@ -392,6 +392,13 @@ XftFontInfoFill (Display *dpy, _Xconst F
- 	return FcFalse;
- 
-     /*
-+     * Initialize the whole XftFontInfo so that padding doesn't interfere with
-+     * hash or XftFontInfoEqual().
-+     */
-+ 
-+    memset (fi, '\0', sizeof(*fi));
-+
-+    /*
-      * Find the associated file
-      */
-     switch (FcPatternGetString (pattern, FC_FILE, 0, &filename)) {
-@@ -419,8 +426,6 @@ XftFontInfoFill (Display *dpy, _Xconst F
-     else if (FcPatternGetFTFace (pattern, FC_FT_FACE, 0, &face) == FcResultMatch
- 	     && face)
- 	fi->file = _XftGetFaceFile (face);
--    else
--	fi->file = 0;
-     if (!fi->file)
-         goto bail0;
- 
diff --git a/x11/libXft/patches/patch-ad b/x11/libXft/patches/patch-ad
deleted file mode 100644
index ca82d9ac895..00000000000
--- a/x11/libXft/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/01/29 04:18:45 bjs Exp $
-
-Register objects used by libXft. (patch from freedesktop.org GIT)
- 
-libXft was using XFT_MAX_GLYPH_MEMORY without first registering
-with fontconfig.
-
---- src/xftname.c.orig	2006-12-07 05:17:45.000000000 -0500
-+++ src/xftname.c
-@@ -28,6 +28,7 @@ static const FcObjectType	_XftObjectType
-     { XFT_CORE,		FcTypeBool, },
-     { XFT_XLFD,		FcTypeString, },
-     { XFT_RENDER,	FcTypeBool, },
-+    { XFT_MAX_GLYPH_MEMORY, FcTypeInteger, },
- };
- 
- #define NUM_OBJECT_TYPES    (sizeof _XftObjectTypes / sizeof _XftObjectTypes[0])