Update to 2.18.0.1:

2.18.0.1
========

 Misc
  - Don't fail db sync operations and leave %gconf-tree.xml.new
    files laying around if there wasn't a %gconf-tree.xml to start
    with (Loïc Minier)

2.18.0
======

 Misc
  - Make sure error strings are utf-8 (Christian Persch)
  - don't include xml-entry.h twice (Kjartan Maraas)
  - fix leak in gconf meta info code (Richard Hult, Ray Strode)
  - remove more popt gunk (Chris Wilson, Ray)
  - when installing a batch of schema files, don't abort
    the entire transaction if one fails (Laszlo Peter)
  - don't close already closed file descriptors if fdwalk()
    is available (Padraig O'Briain)
  - use g_file_test instead of gconf_file_test or
    gconf_file_exists (Paolo Borelli)
  - remove dead code found from coverity scan (Paolo Borelli)
  - retain file permissions on gconf database files when
    syncing a tree to disk (Narayana Pattipati)
  - Add g_return_val_if_fail checks on type inputs for
    gconf_value_new_from_string (Kjartan Maraas, Ray)

 Translators
  - Gintautas Miliauskas (lt)

2.16.1
======

 Misc
  - Fix error handling in the getters (Matthias Clasen)
  - Fix a leak (Pascal Terjan)
  - Close write end of pipe in parent (Tom Tromey)

 Translators
  - Khaled Hosny (ar)
  - Josep Puigdemont i Casamajó (ca)
  - Priit Laes (et)
  - Adam Weinberger (en_CA)
  - Yair Hershkovitz (he)
  - Gabor Kelemen (hu)
  - Luca Ferretti (it)
  - Vladimer Sichinava (ka)
  - Thierry Randrianiriana (mg)
  - The GNOME PL Team (pl)
  - Leonardo Ferreira Fontenelle (pt_BR)
  - Laurent Dhima (sq)
  - Daniel Nylander (sv)
  - Maxim Dziumanenko (uk)
  - Nguyễn Thái Ngọc Duy (vi)

5 files changed, 16 insertions, 17 deletions

diff --git a/devel/GConf2/Makefile b/devel/GConf2/Makefile
index c78452af097..0dd503651fc 100644
--- a/devel/GConf2/Makefile
+++ b/devel/GConf2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2006/10/23 15:37:52 tron Exp $
+# $NetBSD: Makefile,v 1.41 2007/04/09 00:55:44 wiz 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 d60b9c08bac..76f5b1ddd2e 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.42 2006/10/23 09:03:03 drochner Exp $
+# $NetBSD: Makefile.common,v 1.43 2007/04/09 00:55:45 wiz Exp $
 #
 
-GCONF2_VERSION=		2.16.0
+GCONF2_VERSION=		2.18.0.1
 
 DISTNAME=		GConf-${GCONF2_VERSION}
 CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.16/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.18/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
diff --git a/devel/GConf2/PLIST b/devel/GConf2/PLIST
index 9858fc5be38..fb52fc18bab 100644
--- a/devel/GConf2/PLIST
+++ b/devel/GConf2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2006/10/23 15:37:52 tron Exp $
+@comment $NetBSD: PLIST,v 1.30 2007/04/09 00:55:45 wiz Exp $
 bin/gconf-merge-tree
 bin/gconftool-2
 include/gconf/2/gconf/gconf-changeset.h
@@ -78,6 +78,7 @@ share/locale/ko/LC_MESSAGES/GConf2.mo
 share/locale/ku/LC_MESSAGES/GConf2.mo
 share/locale/lt/LC_MESSAGES/GConf2.mo
 share/locale/lv/LC_MESSAGES/GConf2.mo
+share/locale/mg/LC_MESSAGES/GConf2.mo
 share/locale/mk/LC_MESSAGES/GConf2.mo
 share/locale/ml/LC_MESSAGES/GConf2.mo
 share/locale/mn/LC_MESSAGES/GConf2.mo
diff --git a/devel/GConf2/distinfo b/devel/GConf2/distinfo
index d50ee11b67d..96a37e7b64d 100644
--- a/devel/GConf2/distinfo
+++ b/devel/GConf2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2006/10/23 00:22:14 wiz Exp $
+$NetBSD: distinfo,v 1.27 2007/04/09 00:55:45 wiz Exp $
 
-SHA1 (GConf-2.16.0.tar.bz2) = 4fbd2aa7e0d6deb1673c3c6db64892491edcdb6a
-RMD160 (GConf-2.16.0.tar.bz2) = b3c429a45ac96cf79b7231666ecb8e1de645a4f8
-Size (GConf-2.16.0.tar.bz2) = 1307732 bytes
+SHA1 (GConf-2.18.0.1.tar.bz2) = 6bbceafc636457ec14ec2d7b4358235ff6cf08d3
+RMD160 (GConf-2.18.0.1.tar.bz2) = 79bad5a19404277abfbd7f17b61e09274dcc1aa3
+Size (GConf-2.18.0.1.tar.bz2) = 1347765 bytes
 SHA1 (patch-ab) = ca0c9f45ff46ceb05a10c03c59f94b6a5be562b0
 SHA1 (patch-ac) = 856ff83a03658fcc33ba746a5aacbd74f2738583
-SHA1 (patch-ad) = e5b5be99da47b21e3e7dcd7c3925dffa6cfe5bfa
+SHA1 (patch-ad) = 5d90ad4651d4c2562277c9008a3056568afe7317
diff --git a/devel/GConf2/patches/patch-ad b/devel/GConf2/patches/patch-ad
index 6ff69cdc2b1..dd600bf46f5 100644
--- a/devel/GConf2/patches/patch-ad
+++ b/devel/GConf2/patches/patch-ad
@@ -1,16 +1,15 @@
-$NetBSD: patch-ad,v 1.5 2005/10/24 22:10:29 rillig Exp $
+$NetBSD: patch-ad,v 1.6 2007/04/09 00:55:45 wiz Exp $
 
 Needed for Solaris 9. Without the <lber.h> header, struct berval, which
 is used as a member of another struct in <ldap.h>, has an unknown size.
 
---- backends/evoldap-backend.c.orig	Mon Oct 24 23:58:16 2005
-+++ backends/evoldap-backend.c	Mon Oct 24 23:59:16 2005
-@@ -24,6 +24,10 @@
- #include <sys/types.h>
+--- backends/evoldap-backend.c.orig	2007-03-02 22:10:18.000000000 +0000
++++ backends/evoldap-backend.c
+@@ -25,6 +25,9 @@
  #include <unistd.h>
+ #include <string.h>
  #include <time.h>
 +#ifdef __sun
-+#include <string.h>
 +#include <lber.h>
 +#endif
  #include <ldap.h>