[pkgsrc/trunk]: pkgsrc Update glib2 and therefore gdbus-codegen and gio-fam t...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/510b144f1fc9
branches:  trunk
changeset: 609598:510b144f1fc9
user:      prlw1 <prlw1%pkgsrc.org@localhost>
date:      Sat Oct 06 20:44:04 2012 +0000

description:
Update glib2 and therefore gdbus-codegen and gio-fam to 2.34.0

- patch-ar and patch-as to avoid dependending on python are no longer
  necessary since the introduction of --disable-modular-tests
- patch-co has been committed to glib in 2360d04e
- other patches cargo culted across
- statfs test was fixed in glib with commit afa82ae8
- no longer provide man pages as that requires docbook & xsltproc

Many changes in glib since 2.32.4, especially GDBus improvements.
See NEWS file http://git.gnome.org/browse/glib/plain/NEWS?id=2.34.0 for details.

diffstat:

 devel/gdbus-codegen/Makefile |   4 +-
 devel/glib2/Makefile         |   3 +-
 devel/glib2/Makefile.common  |  13 ++++----
 devel/glib2/PLIST            |  56 ++++++++++++++++++-------------------
 devel/glib2/buildlink3.mk    |   4 +-
 devel/glib2/distinfo         |  25 +++++++---------
 devel/glib2/options.mk       |   8 ++--
 devel/glib2/patches/patch-aa |  46 ++++++++++++++++++------------
 devel/glib2/patches/patch-ak |  43 ++++++++++++++++------------
 devel/glib2/patches/patch-am |   8 ++--
 devel/glib2/patches/patch-an |  12 ++++----
 devel/glib2/patches/patch-ar |  65 --------------------------------------------
 devel/glib2/patches/patch-as |  53 -----------------------------------
 devel/glib2/patches/patch-co |  13 --------
 sysutils/gio-fam/Makefile    |   5 +--
 15 files changed, 117 insertions(+), 241 deletions(-)

diffs (truncated from 781 to 300 lines):

diff -r d2e94e8b51de -r 510b144f1fc9 devel/gdbus-codegen/Makefile
--- a/devel/gdbus-codegen/Makefile      Sat Oct 06 18:39:18 2012 +0000
+++ b/devel/gdbus-codegen/Makefile      Sat Oct 06 20:44:04 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/07/15 00:28:09 marino Exp $
+# $NetBSD: Makefile,v 1.4 2012/10/06 20:44:04 prlw1 Exp $
 
 .include "../../devel/glib2/Makefile.common"
 
@@ -9,7 +9,7 @@
 
 NOT_FOR_PLATFORM=      HPUX-*-* OSF1-*-*
 
-USE_TOOLS+=            pkg-config msgfmt
+USE_TOOLS+=            pkg-config msgfmt perl:run
 
 BUILD_DIRS=            gio/gdbus-2.0/codegen
 INSTALL_DIRS=          ${BUILD_DIRS}
diff -r d2e94e8b51de -r 510b144f1fc9 devel/glib2/Makefile
--- a/devel/glib2/Makefile      Sat Oct 06 18:39:18 2012 +0000
+++ b/devel/glib2/Makefile      Sat Oct 06 20:44:04 2012 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.211 2012/10/03 21:54:30 wiz Exp $
+# $NetBSD: Makefile,v 1.212 2012/10/06 20:44:04 prlw1 Exp $
 
 .include "Makefile.common"
 .include "options.mk"
 
-PKGREVISION=           2
 CATEGORIES=            devel
 
 COMMENT=               Some useful routines for C programming (glib2)
diff -r d2e94e8b51de -r 510b144f1fc9 devel/glib2/Makefile.common
--- a/devel/glib2/Makefile.common       Sat Oct 06 18:39:18 2012 +0000
+++ b/devel/glib2/Makefile.common       Sat Oct 06 20:44:04 2012 +0000
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile.common,v 1.20 2012/07/24 18:23:38 drochner Exp $
+# $NetBSD: Makefile.common,v 1.21 2012/10/06 20:44:04 prlw1 Exp $
 #
 # used by devel/glib2/Makefile
+# used by devel/gdbus-codegen/Makefile
 # used by sysutils/gio-fam/Makefile
 
 # When updating this package, please apply patch-ak to configure.in and
 # then run a matching version of autoconf to regen patch-aa.
-DISTNAME=      glib-2.32.4
+DISTNAME=      glib-2.34.0
 PKGNAME=       ${DISTNAME:S/glib/glib2/}
 CATEGORIES=    # empty; redefined in Makefile
 MASTER_SITES=  ftp://ftp.gtk.org/pub/glib/${PKGVERSION_NOREV:R}/ \
@@ -36,6 +37,7 @@
 CONFIGURE_ARGS+=       ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
 CONFIGURE_ARGS+=       --with-pcre=system
 CONFIGURE_ARGS+=       --disable-dtrace
+CONFIGURE_ARGS+=       --disable-modular-tests
 
 CONFIGURE_ARGS.gnu-iconv+=     --with-libiconv=gnu
 
@@ -43,10 +45,6 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD"
-# configure detects wrongly
-CONFIGURE_ENV+=                ac_cv_func_statfs=no
-.endif
 
 CPPFLAGS+=             -DPREFIX="\"${PREFIX}\""
 CPPFLAGS+=             -DPKGLOCALEDIR="\"${PKGLOCALEDIR}\""
@@ -89,3 +87,6 @@
 SUBST_FILES.dbusdb+=   po/glib20.pot
 SUBST_FILES.dbusdb+=   po/*.po
 SUBST_SED.dbusdb=      -e 's,/var/lib/dbus,${VARBASE}/db/dbus,g'
+
+pre-configure:
+       ${TOUCH} ${WRKSRC}/configure ${WRKSRC}/aclocal.m4 ${WRKSRC}/config.h.in
diff -r d2e94e8b51de -r 510b144f1fc9 devel/glib2/PLIST
--- a/devel/glib2/PLIST Sat Oct 06 18:39:18 2012 +0000
+++ b/devel/glib2/PLIST Sat Oct 06 20:44:04 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.69 2012/07/24 18:23:38 drochner Exp $
+@comment $NetBSD: PLIST,v 1.70 2012/10/06 20:44:04 prlw1 Exp $
 bin/gdbus
 bin/gio-querymodules
 bin/glib-compile-resources
@@ -108,6 +108,7 @@
 include/glib/glib-2.0/gio/gpermission.h
 include/glib/glib-2.0/gio/gpollableinputstream.h
 include/glib/glib-2.0/gio/gpollableoutputstream.h
+include/glib/glib-2.0/gio/gpollableutils.h
 include/glib/glib-2.0/gio/gproxy.h
 include/glib/glib-2.0/gio/gproxyaddress.h
 include/glib/glib-2.0/gio/gproxyaddressenumerator.h
@@ -135,6 +136,7 @@
 include/glib/glib-2.0/gio/gsrvtarget.h
 include/glib/glib-2.0/gio/gtcpconnection.h
 include/glib/glib-2.0/gio/gtcpwrapperconnection.h
+include/glib/glib-2.0/gio/gtestdbus.h
 include/glib/glib-2.0/gio/gthemedicon.h
 include/glib/glib-2.0/gio/gthreadedsocketservice.h
 include/glib/glib-2.0/gio/gtlsbackend.h
@@ -266,24 +268,11 @@
 lib/pkgconfig/gmodule-no-export-2.0.pc
 lib/pkgconfig/gobject-2.0.pc
 lib/pkgconfig/gthread-2.0.pc
-man/man1/gdbus-codegen.1
-man/man1/gdbus.1
-man/man1/gio-querymodules.1
-man/man1/glib-compile-resources.1
-man/man1/glib-compile-schemas.1
-man/man1/glib-genmarshal.1
-man/man1/glib-gettextize.1
-man/man1/glib-mkenums.1
-man/man1/gobject-query.1
-man/man1/gresource.1
-man/man1/gsettings.1
-man/man1/gtester-report.1
-man/man1/gtester.1
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/aclocal/gsettings.m4
-share/gdb/auto-load/libglib-2.0.so.0.3200.4-gdb.py
-share/gdb/auto-load/libgobject-2.0.so.0.3200.4-gdb.py
+share/gdb/auto-load/libglib-2.0.so.0.3400.0-gdb.py
+share/gdb/auto-load/libgobject-2.0.so.0.3400.0-gdb.py
 share/glib-2.0/gdb/glib.py
 share/glib-2.0/gdb/gobject.py
 share/glib-2.0/gettext/mkinstalldirs
@@ -384,6 +373,7 @@
 share/gtk-doc/html/gio/GSrvTarget.html
 share/gtk-doc/html/gio/GTcpConnection.html
 share/gtk-doc/html/gio/GTcpWrapperConnection.html
+share/gtk-doc/html/gio/GTestDBus.html
 share/gtk-doc/html/gio/GThemedIcon.html
 share/gtk-doc/html/gio/GThreadedSocketService.html
 share/gtk-doc/html/gio/GTlsBackend.html
@@ -416,6 +406,7 @@
 share/gtk-doc/html/gio/api-index-2-28.html
 share/gtk-doc/html/gio/api-index-2-30.html
 share/gtk-doc/html/gio/api-index-2-32.html
+share/gtk-doc/html/gio/api-index-2-34.html
 share/gtk-doc/html/gio/api-index-deprecated.html
 share/gtk-doc/html/gio/api-index-full.html
 share/gtk-doc/html/gio/application.html
@@ -423,22 +414,22 @@
 share/gtk-doc/html/gio/ch01.html
 share/gtk-doc/html/gio/ch02.html
 share/gtk-doc/html/gio/ch03.html
-share/gtk-doc/html/gio/ch27.html
-share/gtk-doc/html/gio/ch28.html
-share/gtk-doc/html/gio/ch28s02.html
-share/gtk-doc/html/gio/ch28s03.html
 share/gtk-doc/html/gio/ch29.html
-share/gtk-doc/html/gio/ch29s02.html
-share/gtk-doc/html/gio/ch29s03.html
-share/gtk-doc/html/gio/ch29s04.html
-share/gtk-doc/html/gio/ch29s05.html
-share/gtk-doc/html/gio/ch29s06.html
-share/gtk-doc/html/gio/ch29s07.html
 share/gtk-doc/html/gio/ch30.html
 share/gtk-doc/html/gio/ch30s02.html
 share/gtk-doc/html/gio/ch30s03.html
-share/gtk-doc/html/gio/ch30s04.html
-share/gtk-doc/html/gio/ch30s05.html
+share/gtk-doc/html/gio/ch31.html
+share/gtk-doc/html/gio/ch31s02.html
+share/gtk-doc/html/gio/ch31s03.html
+share/gtk-doc/html/gio/ch31s04.html
+share/gtk-doc/html/gio/ch31s05.html
+share/gtk-doc/html/gio/ch31s06.html
+share/gtk-doc/html/gio/ch31s07.html
+share/gtk-doc/html/gio/ch32.html
+share/gtk-doc/html/gio/ch32s02.html
+share/gtk-doc/html/gio/ch32s03.html
+share/gtk-doc/html/gio/ch32s04.html
+share/gtk-doc/html/gio/ch32s05.html
 share/gtk-doc/html/gio/conversion.html
 share/gtk-doc/html/gio/extending-gio.html
 share/gtk-doc/html/gio/extending.html
@@ -474,6 +465,7 @@
 share/gtk-doc/html/gio/gio-TLS-Overview.html
 share/gtk-doc/html/gio/gio-Unix-Mounts.html
 share/gtk-doc/html/gio/gio-Watching-Bus-Names.html
+share/gtk-doc/html/gio/gio-gpollableutils.html
 share/gtk-doc/html/gio/gio-hierarchy.html
 share/gtk-doc/html/gio/gio-querymodules.html
 share/gtk-doc/html/gio/gio.devhelp2
@@ -498,9 +490,11 @@
 share/gtk-doc/html/gio/resolver.html
 share/gtk-doc/html/gio/resources.html
 share/gtk-doc/html/gio/right.png
+share/gtk-doc/html/gio/running-gio-apps.html
 share/gtk-doc/html/gio/settings.html
 share/gtk-doc/html/gio/streaming.html
 share/gtk-doc/html/gio/style.css
+share/gtk-doc/html/gio/testing.html
 share/gtk-doc/html/gio/tls.html
 share/gtk-doc/html/gio/tools.html
 share/gtk-doc/html/gio/types.html
@@ -521,6 +515,7 @@
 share/gtk-doc/html/glib/api-index-2-28.html
 share/gtk-doc/html/glib/api-index-2-30.html
 share/gtk-doc/html/glib/api-index-2-32.html
+share/gtk-doc/html/glib/api-index-2-34.html
 share/gtk-doc/html/glib/api-index-2-4.html
 share/gtk-doc/html/glib/api-index-2-6.html
 share/gtk-doc/html/glib/api-index-2-8.html
@@ -606,6 +601,7 @@
 share/gtk-doc/html/glib/glib-data-types.html
 share/gtk-doc/html/glib/glib-fundamentals.html
 share/gtk-doc/html/glib/glib-gettextize.html
+share/gtk-doc/html/glib/glib-programming.html
 share/gtk-doc/html/glib/glib-regex-syntax.html
 share/gtk-doc/html/glib/glib-resources.html
 share/gtk-doc/html/glib/glib-running.html
@@ -640,13 +636,13 @@
 share/gtk-doc/html/gobject/api-index-2-28.html
 share/gtk-doc/html/gobject/api-index-2-30.html
 share/gtk-doc/html/gobject/api-index-2-32.html
+share/gtk-doc/html/gobject/api-index-2-34.html
 share/gtk-doc/html/gobject/api-index-2-4.html
 share/gtk-doc/html/gobject/api-index-2-6.html
 share/gtk-doc/html/gobject/api-index-2-8.html
 share/gtk-doc/html/gobject/api-index-deprecated.html
 share/gtk-doc/html/gobject/api-index-full.html
 share/gtk-doc/html/gobject/ch01s02.html
-share/gtk-doc/html/gobject/ch06s03.html
 share/gtk-doc/html/gobject/chapter-gobject.html
 share/gtk-doc/html/gobject/chapter-gtype.html
 share/gtk-doc/html/gobject/chapter-intro.html
@@ -681,6 +677,8 @@
 share/gtk-doc/html/gobject/howto-gobject-methods.html
 share/gtk-doc/html/gobject/howto-gobject.html
 share/gtk-doc/html/gobject/howto-interface-implement.html
+share/gtk-doc/html/gobject/howto-interface-override.html
+share/gtk-doc/html/gobject/howto-interface-prerequisite.html
 share/gtk-doc/html/gobject/howto-interface-properties.html
 share/gtk-doc/html/gobject/howto-interface.html
 share/gtk-doc/html/gobject/howto-signals.html
diff -r d2e94e8b51de -r 510b144f1fc9 devel/glib2/buildlink3.mk
--- a/devel/glib2/buildlink3.mk Sat Oct 06 18:39:18 2012 +0000
+++ b/devel/glib2/buildlink3.mk Sat Oct 06 20:44:04 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2012/09/15 10:04:09 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2012/10/06 20:44:04 prlw1 Exp $
 
 BUILDLINK_TREE+=       glib2
 
@@ -6,7 +6,7 @@
 GLIB2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.4.0
-BUILDLINK_ABI_DEPENDS.glib2+=  glib2>=2.32.4nb1
+BUILDLINK_ABI_DEPENDS.glib2+=  glib2>=2.34.0
 BUILDLINK_PKGSRCDIR.glib2?=    ../../devel/glib2
 
 .include "../../converters/libiconv/buildlink3.mk"
diff -r d2e94e8b51de -r 510b144f1fc9 devel/glib2/distinfo
--- a/devel/glib2/distinfo      Sat Oct 06 18:39:18 2012 +0000
+++ b/devel/glib2/distinfo      Sat Oct 06 20:44:04 2012 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.176 2012/07/24 18:23:38 drochner Exp $
+$NetBSD: distinfo,v 1.177 2012/10/06 20:44:04 prlw1 Exp $
 
-SHA1 (glib-2.32.4.tar.xz) = 5b6481cbb34f560e8ea78887200b6b7f5448dcb4
-RMD160 (glib-2.32.4.tar.xz) = 9ed87203d42b9432842ddbc0d5b1bd0cab61ae13
-Size (glib-2.32.4.tar.xz) = 6178556 bytes
-SHA1 (glib-gio-kqueue-2.32.1-v1.patch) = 4498e11396bc33ac48a5b7c27056914f66951a32
-RMD160 (glib-gio-kqueue-2.32.1-v1.patch) = 6d2a8eb014822c7734c6cd7a733d51fa4ca810d4
-Size (glib-gio-kqueue-2.32.1-v1.patch) = 100340 bytes
-SHA1 (patch-aa) = 059197e7e9ee88c87cea168635467780912519e0
+SHA1 (glib-2.34.0.tar.xz) = f695d4d3a6ded331e4d45f077a9774d6ca8a47e4
+RMD160 (glib-2.34.0.tar.xz) = e24d7b410937c7469a725c7dfd51cff671819966
+Size (glib-2.34.0.tar.xz) = 6368532 bytes
+SHA1 (glib-gio-kqueue-2.32.4-v3.patch) = e849a2b306caa17aeffae1a4a480999681e98b5b
+RMD160 (glib-gio-kqueue-2.32.4-v3.patch) = 38c00a1ea75a5176720fcc4bc8160d1d9b0c3895
+Size (glib-gio-kqueue-2.32.4-v3.patch) = 100892 bytes
+SHA1 (patch-aa) = 71405ed89d2abd25edec375d52c43fe50c9f7c82
 SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
@@ -15,14 +15,12 @@
 SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7
 SHA1 (patch-ai) = ec634baa67088c08513c3dfeca137c4765e79492
 SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
-SHA1 (patch-ak) = 9b64fa949785f3e61cf7bc46ea7096da85d4a0ae
+SHA1 (patch-ak) = 2d6826e2a07852a7c093353996361547cce1d17f
 SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e
-SHA1 (patch-am) = 7298efee37f50d81b6a1b1b00d60dca33b19ce9f
-SHA1 (patch-an) = 45d695332ad9c79938a0a808928f89fffc86cf48
+SHA1 (patch-am) = 387d1ebb481052a2f7b9c14fa916c0286efcdb97
+SHA1 (patch-an) = c93823539ba95a0e182a25714ef5024c91da3a47
 SHA1 (patch-ap) = eeabf999a65cc51bc792798e4d81fef2ad35837b
 SHA1 (patch-aq) = 42ee287341bb3569bb95959a09fcde7c94e49088
-SHA1 (patch-ar) = 17b698a22b08434690c25569cfc7d483daf08a76
-SHA1 (patch-as) = 2e1eb46d4fe4b2c66994ff83d30a2e009e50c490
 SHA1 (patch-at) = f4c4a2fbe84eb8b361fb342f3c3b0b5a226d1794
 SHA1 (patch-ba) = f4233cd4e0109f9bee5630c655b0ab7b22ba0c61
 SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
@@ -37,7 +35,6 @@