Update GConf2 and GConf2-ui to 2.6.2:

Fixes:
- Get rid of duplicate '/' with AM_GCONF_SOURCE_2 (Daniel Elstner)
- Don't create a directory for docs if we're not installing them (Julio M.
  Merino Vidal)
- Fix a bug with the markup backend on 64-bit (Joe Marcus Clarke)
- Fix a leak (Kjartan)
- Return an error for incorrect source addresses (Mark)

Translators:
- Gisela Carbonell (ca)
- Christian Neumair (de)
- Christophe Merlet (RedFox) (fr)
- LoneStar (zh_CN)

5 files changed, 8 insertions, 50 deletions

diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common
index a32b91b7b81..70d8a4a028e 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.20 2004/06/11 18:12:11 minskim Exp $
+# $NetBSD: Makefile.common,v 1.21 2004/06/28 12:52:45 jmmv Exp $
 #
 
-DISTNAME=		GConf-2.6.1
+DISTNAME=		GConf-2.6.2
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.6/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/GConf2/PLIST b/devel/GConf2/PLIST
index a1a6df00f2f..9a9fb42172e 100644
--- a/devel/GConf2/PLIST
+++ b/devel/GConf2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2004/05/03 20:55:36 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.17 2004/06/28 12:52:45 jmmv Exp $
 bin/gconf-merge-tree
 bin/gconftool-2
 include/gconf/2/gconf/gconf-changeset.h
@@ -25,7 +25,6 @@ lib/pkgconfig/gconf-2.0.pc
 libexec/gconfd-2
 man/man1/gconftool-2.1
 share/aclocal/gconf-2.m4
-share/doc/html/gconf/GConfClient.html
 share/doc/html/gconf/ch01.html
 share/doc/html/gconf/ch01s02.html
 share/doc/html/gconf/ch02.html
@@ -37,6 +36,7 @@ share/doc/html/gconf/ch06s02.html
 share/doc/html/gconf/ch06s03.html
 share/doc/html/gconf/ch07.html
 share/doc/html/gconf/conventions.html
+share/doc/html/gconf/gconf-GConfClient.html
 share/doc/html/gconf/gconf-client-reference.html
 share/doc/html/gconf/gconf-client.html
 share/doc/html/gconf/gconf-gconf-backend.html
@@ -59,6 +59,7 @@ share/doc/html/gconf/index.html
 share/doc/html/gconf/index.sgml
 share/doc/html/gconf/left.png
 share/doc/html/gconf/right.png
+share/doc/html/gconf/style.css
 share/doc/html/gconf/up.png
 share/examples/GConf2/path
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/GConf2.mo
diff --git a/devel/GConf2/distinfo b/devel/GConf2/distinfo
index 1c0aa4d2630..34b68b4c7c4 100644
--- a/devel/GConf2/distinfo
+++ b/devel/GConf2/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.13 2004/05/04 11:46:26 tron Exp $
+$NetBSD: distinfo,v 1.14 2004/06/28 12:52:45 jmmv Exp $
 
-SHA1 (GConf-2.6.1.tar.bz2) = 807ad0852ce761f5c6ee7970c8a7f63b4e0fe531
-Size (GConf-2.6.1.tar.bz2) = 1483080 bytes
-SHA1 (patch-aa) = d53e3429bdc36edd94bd343f81db08959354678d
+SHA1 (GConf-2.6.2.tar.bz2) = e8317ff32782d4abd43a97ccdd86678af5549438
+Size (GConf-2.6.2.tar.bz2) = 1521902 bytes
 SHA1 (patch-ab) = eb9ffa0ec87fe21b0f754aef019221d619b37b11
 SHA1 (patch-ac) = 95fdcf832a0c1fb4744a0e12be08b1314c6a923b
 SHA1 (patch-ad) = ef6172650190df26f0a829506e99b0c65c8d2385
 SHA1 (patch-ae) = 6ddf36cc1df4c72c4d3b48e389b0fb2df20dc87a
-SHA1 (patch-af) = f9c0ecc8603ebab3d1ebf7ed8729148377c26349
diff --git a/devel/GConf2/patches/patch-aa b/devel/GConf2/patches/patch-aa
deleted file mode 100644
index 2a21ed09ec7..00000000000
--- a/devel/GConf2/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2004/05/04 11:46:26 tron Exp $
-
---- gconf/gconf-internals.c.orig	Mon Apr 19 12:08:20 2004
-+++ gconf/gconf-internals.c	Tue May  4 13:43:58 2004
-@@ -2839,7 +2839,6 @@
-                        GError  **error)
- {
-   ConfigServer server = CORBA_OBJECT_NIL;
--;
-   int p[2] = { -1, -1 };
-   char buf[1];
-   GError *tmp_err;
diff --git a/devel/GConf2/patches/patch-af b/devel/GConf2/patches/patch-af
deleted file mode 100644
index f3926b56794..00000000000
--- a/devel/GConf2/patches/patch-af
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-af,v 1.2 2004/04/01 18:17:29 jmmv Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=134247
-http://bugzilla.gnome.org/show_bug.cgi?id=134319
-
---- doc/gconf/Makefile.in.orig	2003-12-15 02:55:42.000000000 +0000
-+++ doc/gconf/Makefile.in
-@@ -381,18 +381,18 @@ maintainer-clean-local: clean
- 	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
- 
- install-data-local:
--	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
--	(installfiles=`echo $(srcdir)/html/*`; \
-+	installfiles=`echo $(srcdir)/html/*`; \
- 	if test "$$installfiles" = '$(srcdir)/html/*'; \
- 	then echo '-- Nothing to install' ; \
- 	else \
-+	  $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
- 	  for i in $$installfiles; do \
- 	    echo '-- Installing '$$i ; \
- 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
- 	  done; \
- 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
- 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
--	fi)
-+	fi
- 
- #
- # Require gtk-doc when making dist