Update pango to 1.29.4

[Patrick Welche <prlw1%cam.ac.uk@localhost>]

Newish gtk3 needs pango >= 1.29.0, pango 1.29.5 needs glib >=2.31, so plump
for pango 1.29.4 which only needs glib >= 2.26.

I not sure about the ABI_DEPENDS in buildlink3. I set it to 1.29.4. AFAICT
programs compiled against 1.28.4.nb2 are happy without needing to be
relinked, so is upping it necessary? API_DEPENDS correctly remains at 1.6.0.

I removed patch-aa as it risks making configure be regenerated, which isn't
necessary as it is already patched by patch-ab. patch-ab looks a little
suspect to me: is "-features=%all,no%except" a valid flag for all c++
compilers other than gcc?

I have tested with the libthai option. I don't have access to darwin to
test that. In options.mk, there is reference to PLIST.carbon, but carbon
is not listed in PLIST_VARS - can that work? Is carbon defined elsewhere?
(I didn't find it in pkgsrc/mk)

If pango does work on darwin, there is a novelty in 1.29.4 which didn't
exist in 1.28.4, which is a CoreText module. It seems that the configure
script looks for CoreText. If it is found, pango installs the the coretext
module, if not, it installs the atsui module. How does one do that sort
of thing in pkgsrc? (PLIST would be different => invent VARS, but then
what test do you use - add an option?) (The patch can be applied before
this is sorted out, as it does no worse than what is here currently.)

Cheers,

Patrick

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/pango/Makefile,v
retrieving revision 1.155
diff -u -r1.155 Makefile
--- Makefile    1 Nov 2011 06:01:02 -0000       1.155
+++ Makefile    16 Jan 2012 18:40:46 -0000
@@ -1,10 +1,9 @@
 # $NetBSD: Makefile,v 1.155 2011/11/01 06:01:02 sbd Exp $
 
-DISTNAME=              pango-1.28.4
-PKGREVISION=           2
+DISTNAME=              pango-1.29.4
 CATEGORIES=            devel fonts
-MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/pango/1.28/}
-EXTRACT_SUFX=          .tar.bz2
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/pango/1.29/}
+EXTRACT_SUFX=          .tar.xz
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.pango.org/
@@ -43,7 +42,7 @@
 
 .include "options.mk"
 
-BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.24.0
+BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.26.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.8.0
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/pango/PLIST,v
retrieving revision 1.51
diff -u -r1.51 PLIST
--- PLIST       16 Oct 2010 18:00:02 -0000      1.51
+++ PLIST       16 Jan 2012 18:40:46 -0000
@@ -81,6 +81,7 @@
 share/gtk-doc/html/pango/index-1.24.html
 share/gtk-doc/html/pango/index-1.26.html
 share/gtk-doc/html/pango/index-1.28.html
+share/gtk-doc/html/pango/index-1.30.html
 share/gtk-doc/html/pango/index-1.4.html
 share/gtk-doc/html/pango/index-1.6.html
 share/gtk-doc/html/pango/index-1.8.html
@@ -115,7 +116,6 @@
 share/gtk-doc/html/pango/pango-hierarchy.html
 share/gtk-doc/html/pango/pango-pango-renderer.html
 share/gtk-doc/html/pango/pango-querymodules.html
-share/gtk-doc/html/pango/pango.devhelp
 share/gtk-doc/html/pango/pango.devhelp2
 share/gtk-doc/html/pango/pango.html
 share/gtk-doc/html/pango/rendering.html
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/pango/buildlink3.mk,v
retrieving revision 1.27
diff -u -r1.27 buildlink3.mk
--- buildlink3.mk       1 Nov 2011 06:01:02 -0000       1.27
+++ buildlink3.mk       16 Jan 2012 18:40:46 -0000
@@ -6,7 +6,7 @@
 PANGO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pango+=  pango>=1.6.0
-BUILDLINK_ABI_DEPENDS.pango+=  pango>=1.28.4nb2
+BUILDLINK_ABI_DEPENDS.pango+=  pango>=1.29.4
 BUILDLINK_PKGSRCDIR.pango?=    ../../devel/pango
 
 .include "../../mk/bsd.fast.prefs.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/pango/distinfo,v
retrieving revision 1.89
diff -u -r1.89 distinfo
--- distinfo    11 Apr 2011 15:35:53 -0000      1.89
+++ distinfo    16 Jan 2012 18:40:47 -0000
@@ -1,7 +1,6 @@
 $NetBSD: distinfo,v 1.89 2011/04/11 15:35:53 drochner Exp $
 
-SHA1 (pango-1.28.4.tar.bz2) = e715954a5a3b358889d15b6235e1965303dbb622
-RMD160 (pango-1.28.4.tar.bz2) = e9dc19b62263fdbd5b58c00092220af87ed929df
-Size (pango-1.28.4.tar.bz2) = 1503441 bytes
-SHA1 (patch-aa) = 1a87d055dc722eff28517a11d0832ae19df5eb59
+SHA1 (pango-1.29.4.tar.xz) = e1fc4a729440b168a033addea0c2aa5ce17c6e5c
+RMD160 (pango-1.29.4.tar.xz) = 90fc0b73022f980e8971922fec990653bddb4431
+Size (pango-1.29.4.tar.xz) = 1155456 bytes
 SHA1 (patch-ab) = 12c09b12ba31be19fa0d602f89909811e6221bd8