From ad988db510f65e98abdca859c4ac56cba3cb710c Mon Sep 17 00:00:00 2001
From: tnn <tnn>
Date: Fri, 15 Jan 2010 18:41:54 +0000
Subject: Update to libXft-2.1.14. Changes:

Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Set Xft.h version numbers from configure.ac
Split NEWS & README, update both
Add generated Xft.h to .gitignore
libXft 2.1.14
Header cleanup (bug#4703)
Fix install of generated Xft.h when builddir != srcdir
Janitor: Correct make distcheck and sparse warnings.
Added fake bold support (#1579, Novell #38202/223682).
---
 x11/libXft/Makefile         |  4 ++--
 x11/libXft/distinfo         |  8 ++++----
 x11/libXft/patches/patch-ae | 21 ---------------------
 3 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 x11/libXft/patches/patch-ae

(limited to 'x11')

diff --git a/x11/libXft/Makefile b/x11/libXft/Makefile
index dff62704894..43ec4b82984 100644
--- a/x11/libXft/Makefile
+++ b/x11/libXft/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2008/07/13 23:41:02 bjs Exp $
+# $NetBSD: Makefile,v 1.8 2010/01/15 18:41:54 tnn Exp $
 
-DISTNAME=	libXft-2.1.13
+DISTNAME=	libXft-2.1.14
 CATEGORIES=	fonts x11
 MASTER_SITES=	${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/libXft/distinfo b/x11/libXft/distinfo
index 1e23a72cf91..3480eabb755 100644
--- a/x11/libXft/distinfo
+++ b/x11/libXft/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2008/07/14 06:12:29 tnn Exp $
+$NetBSD: distinfo,v 1.6 2010/01/15 18:41:55 tnn Exp $
 
-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 (libXft-2.1.14.tar.bz2) = e08ae6b1f56e160179b9f141b4ab799333ec725e
+RMD160 (libXft-2.1.14.tar.bz2) = d167f657ad1d574496c757fb24f9f361c7f405a9
+Size (libXft-2.1.14.tar.bz2) = 289068 bytes
 SHA1 (patch-ae) = 09d00a1cda14b6a7a2e6a38597b538948889179a
diff --git a/x11/libXft/patches/patch-ae b/x11/libXft/patches/patch-ae
deleted file mode 100644
index 9124d119563..00000000000
--- a/x11/libXft/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2008/01/29 04:18:45 bjs Exp $
-
-If HAVE_FT_GLYPHSLOT_EMBOLDEN is defined in config.h, then
-FT_GlyphSlot_Embolden() is called.  This function's prototype
-is in <freetype/ftsynth.h>, so conditionally include it.
-
-Implicit declaration bad.  Prototypes good.  Fixes warning.
-
---- src/xftglyphs.c.orig	2006-12-07 05:17:19.000000000 -0500
-+++ src/xftglyphs.c
-@@ -25,6 +25,10 @@
- #include "xftint.h"
- #include <freetype/ftoutln.h>
- 
-+#if HAVE_FT_GLYPHSLOT_EMBOLDEN
-+#include <freetype/ftsynth.h>
-+#endif
-+
- static const int    filters[3][3] = {
-     /* red */
- #if 0
-- 
cgit v1.2.3