Update GConf2 and GConf2-ui to 2.14.0:

2.14.0
======

 Misc
  - Improved manual page (Christopher Hanna)
  - Uses the new g_slice API (Benoît Dejean)
  - Got rid of padding members in private structs (Benoît)
  - Speed up the installation of multiple schema files (Josselin Mouette,
    Mark LcLoughlin)

 Fixes
  - Only calls closelog() when it has HAVE_SYSLOG_H (Tor Lillqvist)
  - Fixed a memory leak, bugs #332528 and #334047 (Kjartan Maraas,
    Matthias Clasen)

 Translators
  - Petr Tomeš (cs)
  - Rhys Jones (cy)
  - Ole Laursen (da)
  - Hendrik Richter (de)
  - Kostas Papadimas (el)
  - Ivar Smolin (et)
  - Iñaki Larrañaga (eu)
  - Rajesh Ranjan (hi)
  - Gabor Kelemen (hu)
  - Alessio Frusciante (it)
  - Takeshi AIHANA (ja)
  - Changwoo Ryu (ko)
  - Gnome PL Team (pl)
  - Evandro Fernandes Giovanini (pt_BR)
  - Duarte Loreto (pt)
  - Mişu Moldovan (ro)
  - Leonid Kanter (ru)
  - Laurent Dhima (sq)
  - Слободан Д. Средојевић (sr)
  - Christian Rose (sv)
  - Maxim Dziumanenko (uk)
  - Funda Wang (zh_CN)

2.13.5
======

 Features
  - Save translations in separate file with markup backend's "meged" mode (Mark McLoughlin)
  - Switch on "merged" mode for the defaults database (Mark McLoughlin)
  - Make gconf_value_compare() and gconf_entry_equal() public (Jorn Baayen)
  - Lots of new docs (Dinoop Thomas)

 Fixes
  - Remove unused --enable-gconf-source configure option (Mark McLoughlin)
  - Fix parallel build (Thomas Vander Stichele)
  - Make gconf_client_remove_dir() clear the dir's cache (Vincent Untz)
  - Win32 build fix - include DLLs in zipfile package (Tor Lillqvist)
  - Make gconf_value_decode() work with schemas (Nicolas Peninguy)
  - Fix segault unescaping strings (Dan Williams)
  - Remove C99 usage (Jens Granseuer)

 Translators
  - Ales Nyakhaychyk (be)
  - Alexander Shopov (bg)
  - Jordi Mallach (ca)
  - Adam Weinberger (en_CA)
  - Francisco Javier F. Serrador (es)
  - Ivar Smolin (et)
  - Ilkka Tuohela (fi)
  - Christophe Merlet (RedFox) (fr)
  - Ignacio Casal Quinteiro (gl)
  - Ankit Patel (gu)
  - Takeshi AIHANA (ja)
  - Žygimantas Beručka (lt)
  - Kjartan Maraas (nb)
  - Tino Meinen (nl)
  - Åsmund Skjæveland (nn)
  - Kjartan Maraas (no)
  - Evandro Fernandes Giovanini (pt_BR)
  - Marcel Telka (sk)
  - Theppitak Karoonboonyanan (th)
  - Clytie Siddall (vi)
  - Abel Cheung (zh_HK)
  - Chao-Hsiung Liao (zh_TW)

6 files changed, 16 insertions, 31 deletions

diff --git a/devel/GConf2-ui/Makefile b/devel/GConf2-ui/Makefile
index 92ed7f5d8c8..3da14a8b159 100644
--- a/devel/GConf2-ui/Makefile
+++ b/devel/GConf2-ui/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.24 2006/02/05 23:08:38 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/03/30 20:50:02 jmmv Exp $
 #
 
 .include "../../devel/GConf2/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/GConf/GConf2-ui/}
-PKGREVISION=	2
 
-BUILDLINK_DEPENDS.GConf2+=	GConf2>=2.12.1
+BUILDLINK_DEPENDS.GConf2+=	GConf2>=${GCONF2_VERSION}
 
 CONFIGURE_ARGS+=	--enable-gtk
 
diff --git a/devel/GConf2/Makefile b/devel/GConf2/Makefile
index c5e3f987f65..e6be83de849 100644
--- a/devel/GConf2/Makefile
+++ b/devel/GConf2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2006/02/07 19:11:32 minskim Exp $
+# $NetBSD: Makefile,v 1.38 2006/03/30 20:50:02 jmmv Exp $
 #
 
 .include "../../devel/GConf2/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/GConf/GConf2/}
-PKGREVISION=	1
 
 CONFIGURE_ARGS+=	--disable-gtk
 CONFIGURE_ARGS+=	ac_cv_header_ldap_h=no
diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common
index 7123846aa32..b66e2f31f5f 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile.common,v 1.36 2005/12/31 00:05:11 wiz Exp $
+# $NetBSD: Makefile.common,v 1.37 2006/03/30 20:50:02 jmmv Exp $
 #
 
-DISTNAME=		GConf-2.12.1
+GCONF2_VERSION=		2.14.0
+
+DISTNAME=		GConf-${GCONF2_VERSION}
 CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.12/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.14/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -34,7 +36,7 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	--disable-gtk-doc
 CONFIGURE_ARGS+=	--enable-gconf-source=xml::${PKG_SYSCONFDIR}/gconf.xml.defaults
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.8.0
+BUILDLINK_DEPENDS.glib2+=	glib2>=2.10.0
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
diff --git a/devel/GConf2/PLIST b/devel/GConf2/PLIST
index 321b67d6682..c732d2fad04 100644
--- a/devel/GConf2/PLIST
+++ b/devel/GConf2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2005/12/31 00:05:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.25 2006/03/30 20:50:02 jmmv Exp $
 bin/gconf-merge-tree
 bin/gconftool-2
 include/gconf/2/gconf/gconf-changeset.h
@@ -68,6 +68,7 @@ ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/GConf2.mo
+${PKGLOCALEDIR}/locale/is/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/GConf2.mo
@@ -104,6 +105,7 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/GConf2.mo
+${PKGLOCALEDIR}/locale/zh_HK/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/GConf2.mo
 share/sgml/gconf/gconf-1.0.dtd
 @dirrm share/sgml/gconf
diff --git a/devel/GConf2/distinfo b/devel/GConf2/distinfo
index bc90d0dc0b7..151ac7dbd61 100644
--- a/devel/GConf2/distinfo
+++ b/devel/GConf2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2006/01/09 01:28:05 rillig Exp $
+$NetBSD: distinfo,v 1.25 2006/03/30 20:50:02 jmmv Exp $
 
-SHA1 (GConf-2.12.1.tar.bz2) = bfcb6283b32361df05b245ae2ff65a9ec79d4c6c
-RMD160 (GConf-2.12.1.tar.bz2) = f5c664c619ca069801dc8b1147454a1544c14b74
-Size (GConf-2.12.1.tar.bz2) = 1945241 bytes
+SHA1 (GConf-2.14.0.tar.bz2) = 97784779cbecb1f52e1728647889dd4b48f04f62
+RMD160 (GConf-2.14.0.tar.bz2) = 4e281fc8046238df2056cbb1c1b068dc9663041b
+Size (GConf-2.14.0.tar.bz2) = 1895477 bytes
 SHA1 (patch-ab) = 67044ae449164931949f8a67d9f14db15d59365d
 SHA1 (patch-ac) = 03045811c13261088f291e2fbad24e2965c592dc
 SHA1 (patch-ad) = e5b5be99da47b21e3e7dcd7c3925dffa6cfe5bfa
diff --git a/devel/GConf2/patches/patch-ae b/devel/GConf2/patches/patch-ae
deleted file mode 100644
index 669372bcd60..00000000000
--- a/devel/GConf2/patches/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2006/01/09 01:28:05 rillig Exp $
-
-Keywords: c90
-
---- gconf/gconf-listeners.c.orig	2005-11-03 15:53:04.000000000 +0100
-+++ gconf/gconf-listeners.c	2006-01-09 02:21:13.000000000 +0100
-@@ -366,9 +366,9 @@ ltable_insert(LTable* lt, const gchar* w
- 
-       while (across != NULL)
-         {
--          lte = across->data;
-           int cmp;
- 
-+          lte = across->data;
-           cmp = strcmp(lte->name, dirnames[i]);
- 
-           if (cmp == 0)