[pkgsrc/trunk]: pkgsrc/x11/libXft On second thought, update to libXft-2.1.12....

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0fcee0cda941
branches:  trunk
changeset: 524314:0fcee0cda941
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jan 23 15:20:08 2007 +0000

description:
On second thought, update to libXft-2.1.12. This fixes a memory leak and
other minor errors. In contrast to upstream, keep XftNameUnparse public
for now until the tree has been evaluated.

diffstat:

 x11/libXft/Makefile         |   6 ++----
 x11/libXft/distinfo         |  10 ++++++----
 x11/libXft/patches/patch-aa |  14 ++++++++++++++
 x11/libXft/patches/patch-ab |  17 +++++++++++++++++
 4 files changed, 39 insertions(+), 8 deletions(-)

diffs (68 lines):

diff -r fda7deb5ab92 -r 0fcee0cda941 x11/libXft/Makefile
--- a/x11/libXft/Makefile       Tue Jan 23 14:57:39 2007 +0000
+++ b/x11/libXft/Makefile       Tue Jan 23 15:20:08 2007 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2007/01/23 14:57:39 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/01/23 15:20:08 joerg Exp $
 
-# Do NOT update to 2.1.12 as XftNameUnparse is removed again, but
-# referenced in other packages.
-DISTNAME=      libXft-2.1.10
+DISTNAME=      libXft-2.1.12
 CATEGORIES=    fonts x11
 MASTER_SITES=  http://xorg.freedesktop.org/releases/individual/lib/
 EXTRACT_SUFX=  .tar.bz2
diff -r fda7deb5ab92 -r 0fcee0cda941 x11/libXft/distinfo
--- a/x11/libXft/distinfo       Tue Jan 23 14:57:39 2007 +0000
+++ b/x11/libXft/distinfo       Tue Jan 23 15:20:08 2007 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/11/03 21:26:36 joerg Exp $
+$NetBSD: distinfo,v 1.2 2007/01/23 15:20:08 joerg Exp $
 
-SHA1 (libXft-2.1.10.tar.bz2) = a5d661544c5605c44d22ccd76383344dee03254b
-RMD160 (libXft-2.1.10.tar.bz2) = 41fa35fff3ff5c8e9d9402c73b2b9971283acbc3
-Size (libXft-2.1.10.tar.bz2) = 252786 bytes
+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 (patch-aa) = aa6f081596084e97e3767ce2b1d4648cf7917a6c
+SHA1 (patch-ab) = e275990e6469819724d76b393d8a451cca778f9a
diff -r fda7deb5ab92 -r 0fcee0cda941 x11/libXft/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/libXft/patches/patch-aa       Tue Jan 23 15:20:08 2007 +0000
@@ -0,0 +1,14 @@
+$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 -r fda7deb5ab92 -r 0fcee0cda941 x11/libXft/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/libXft/patches/patch-ab       Tue Jan 23 15:20:08 2007 +0000
@@ -0,0 +1,17 @@
+$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'