Update to 2.6.0. Summary of changes unavailable since the previous stable

version (just the ChangeLog, but it's usually meaningless). AFAICT, this
comes with a new XML backend, aside bug fixes.

9 files changed, 109 insertions, 37 deletions

diff --git a/devel/GConf2/Makefile b/devel/GConf2/Makefile
index f08e0bd0d1c..48093e88b49 100644
--- a/devel/GConf2/Makefile
+++ b/devel/GConf2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2004/02/12 19:07:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2004/04/01 18:17:29 jmmv Exp $
 #
 
 .include "../../devel/GConf2/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/GConf/GConf2/}
-PKGREVISION=	4
 
 USE_PKGINSTALL=	YES
 
diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common
index 1d57a27f9ee..ca15624c9c9 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.common,v 1.16 2004/02/14 18:26:27 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.17 2004/04/01 18:17:29 jmmv Exp $
 #
 
-DISTNAME=		GConf-2.4.0.1
+DISTNAME=		GConf-2.6.0
 CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.4/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
-HOMEPAGE=		http://advogato.org/proj/GConf/
+HOMEPAGE=		http://www.gnome.org/projects/gconf/
 COMMENT=		Configuration database system used by GNOME (v2)
 
 BUILD_USES_MSGFMT=	yes
diff --git a/devel/GConf2/PLIST b/devel/GConf2/PLIST
index 64e0bf3f83f..ffb9ca0ef47 100644
--- a/devel/GConf2/PLIST
+++ b/devel/GConf2/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.12 2004/01/23 17:51:24 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/04/01 18:17:29 jmmv Exp $
+bin/gconf-merge-tree
 bin/gconftool-2
 include/gconf/2/gconf/gconf-changeset.h
 include/gconf/2/gconf/gconf-client.h
@@ -9,6 +10,9 @@ include/gconf/2/gconf/gconf-listeners.h
 include/gconf/2/gconf/gconf-schema.h
 include/gconf/2/gconf/gconf-value.h
 include/gconf/2/gconf/gconf.h
+lib/GConf/2/libgconfbackend-oldxml.a
+lib/GConf/2/libgconfbackend-oldxml.la
+lib/GConf/2/libgconfbackend-oldxml.so
 lib/GConf/2/libgconfbackend-xml.a
 lib/GConf/2/libgconfbackend-xml.la
 lib/GConf/2/libgconfbackend-xml.so
@@ -19,7 +23,43 @@ lib/libgconf-2.so.5
 lib/libgconf-2.so.5.0
 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
+share/doc/html/gconf/ch02s02.html
+share/doc/html/gconf/ch02s03.html
+share/doc/html/gconf/ch02s04.html
+share/doc/html/gconf/ch06.html
+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-client-reference.html
+share/doc/html/gconf/gconf-client.html
+share/doc/html/gconf/gconf-gconf-backend.html
+share/doc/html/gconf/gconf-gconf-changeset.html
+share/doc/html/gconf/gconf-gconf-engine.html
+share/doc/html/gconf/gconf-gconf-error.html
+share/doc/html/gconf/gconf-gconf-internals.html
+share/doc/html/gconf/gconf-gconf-listeners.html
+share/doc/html/gconf/gconf-gconf-locale.html
+share/doc/html/gconf/gconf-gconf-schema.html
+share/doc/html/gconf/gconf-gconf-sources.html
+share/doc/html/gconf/gconf-gconf-value.html
+share/doc/html/gconf/gconf-gconf.html
+share/doc/html/gconf/gconf-internals-reference.html
+share/doc/html/gconf/gconf-reference.html
+share/doc/html/gconf/gconf.devhelp
+share/doc/html/gconf/gconftool.html
+share/doc/html/gconf/home.png
+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/up.png
 share/examples/GConf2/path
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/GConf2.mo
@@ -41,11 +81,13 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/GConf2.mo
 ${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/it/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/GConf2.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/GConf2.mo
@@ -78,6 +120,7 @@ share/sgml/gconf/gconf-1.0.dtd
 @dirrm share/gconf/schemas
 @unexec ${RMDIR} -p %D/share/gconf 2>/dev/null || ${TRUE}
 @dirrm share/examples/GConf2
+@dirrm share/doc/html/gconf
 @dirrm lib/GConf/2
 @unexec ${RMDIR} -p %D/lib/GConf 2>/dev/null || ${TRUE}
 @dirrm include/gconf/2/gconf
diff --git a/devel/GConf2/buildlink2.mk b/devel/GConf2/buildlink2.mk
index c809ec5bda1..b70bf7b263a 100644
--- a/devel/GConf2/buildlink2.mk
+++ b/devel/GConf2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.19 2003/12/14 19:44:38 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.20 2004/04/01 18:17:29 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use GConf2.
 #
@@ -9,7 +9,7 @@
 GCONF2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			GConf2
-BUILDLINK_DEPENDS.GConf2?=		GConf2>=2.4.0.1
+BUILDLINK_DEPENDS.GConf2?=		GConf2>=2.6.0
 BUILDLINK_PKGSRCDIR.GConf2?=		../../devel/GConf2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.GConf2=GConf2
diff --git a/devel/GConf2/buildlink3.mk b/devel/GConf2/buildlink3.mk
index 577c3b2fe91..d0906c0d71c 100644
--- a/devel/GConf2/buildlink3.mk
+++ b/devel/GConf2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/04/01 18:17:29 jmmv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCONF2_BUILDLINK3_MK:=	${GCONF2_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGConf2}
 BUILDLINK_PACKAGES+=	GConf2
 
 .if !empty(GCONF2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GConf2+=	GConf2>=2.4.0.1
+BUILDLINK_DEPENDS.GConf2+=	GConf2>=2.6.0
 BUILDLINK_PKGSRCDIR.GConf2?=	../../devel/GConf2
 .endif	# GCONF2_BUILDLINK3_MK
 
diff --git a/devel/GConf2/distinfo b/devel/GConf2/distinfo
index 47f46d170f5..687c42cb8c0 100644
--- a/devel/GConf2/distinfo
+++ b/devel/GConf2/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.9 2004/01/23 17:51:24 jmmv Exp $
+$NetBSD: distinfo,v 1.10 2004/04/01 18:17:29 jmmv Exp $
 
-SHA1 (GConf-2.4.0.1.tar.bz2) = 190ed06d34699976a9a425e9e14d4ccb26220ba8
-Size (GConf-2.4.0.1.tar.bz2) = 1288876 bytes
-SHA1 (patch-aa) = 7bac8f0cc027a135b8bd1f55f5608a0691b13f51
+SHA1 (GConf-2.6.0.tar.bz2) = 1193855aee79f6d79ed7d373040caa9666237d00
+Size (GConf-2.6.0.tar.bz2) = 1428714 bytes
+SHA1 (patch-aa) = f45e30d562ade5e9d8e5bc71c9a3d3ce3fc40393
 SHA1 (patch-ab) = eb9ffa0ec87fe21b0f754aef019221d619b37b11
 SHA1 (patch-ac) = de42b523072ff5eac020525c2ccb4ce93ed792c6
-SHA1 (patch-ad) = 50b0d919768b179d0209c49aee25a7c64ca5b497
+SHA1 (patch-ad) = 85dc152912bd5fea68c159b7cc98817318c6e042
 SHA1 (patch-ae) = 292895b5a71e9b21963d258c6eeed976c9b01d30
-SHA1 (patch-af) = 1ea380a3cef4ea2cc561269f4389a89a7b44e7b6
+SHA1 (patch-af) = f9c0ecc8603ebab3d1ebf7ed8729148377c26349
diff --git a/devel/GConf2/patches/patch-aa b/devel/GConf2/patches/patch-aa
index c5409917f1f..1bc4d89a2e5 100644
--- a/devel/GConf2/patches/patch-aa
+++ b/devel/GConf2/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.4 2003/12/14 19:44:38 jmmv Exp $
+$NetBSD: patch-aa,v 1.5 2004/04/01 18:17:29 jmmv Exp $
 
 Disable GTK2 support.  This is a workaround until bug #102825 gets fixed.
 See http://bugzilla.gnome.org/show_bug.cgi?id=102825 for more details.
 
---- configure.orig	2003-10-25 23:07:14.000000000 +0000
-+++ configure	2003-10-25 23:08:46.000000000 +0000
-@@ -18961,6 +18961,7 @@
+--- configure.orig	2004-02-24 16:50:54.000000000 +0100
++++ configure
+@@ -19672,6 +19672,7 @@ fi
  
    fi
  
@@ -13,7 +13,7 @@ See http://bugzilla.gnome.org/show_bug.cgi?id=102825 for more details.
    if test "$PKG_CONFIG" = "no" ; then
       echo "*** The pkg-config script could not be found. Make sure it is"
       echo "*** in your path, or set the PKG_CONFIG environment variable"
-@@ -19004,6 +19005,7 @@
+@@ -19715,6 +19716,7 @@ echo "${ECHO_T}$DEPENDENT_WITH_GTK_LIBS"
          echo "*** See http://www.freedesktop.org/software/pkgconfig"
       fi
    fi
@@ -21,7 +21,7 @@ See http://bugzilla.gnome.org/show_bug.cgi?id=102825 for more details.
  
    if test $succeeded = yes; then
       HAVE_GTK=yes
-@@ -19057,6 +19059,7 @@
+@@ -19768,6 +19770,7 @@ fi
  
    fi
  
@@ -29,7 +29,7 @@ See http://bugzilla.gnome.org/show_bug.cgi?id=102825 for more details.
    if test "$PKG_CONFIG" = "no" ; then
       echo "*** The pkg-config script could not be found. Make sure it is"
       echo "*** in your path, or set the PKG_CONFIG environment variable"
-@@ -19100,6 +19103,7 @@
+@@ -19811,6 +19814,7 @@ echo "${ECHO_T}$DEPENDENT_WITH_XML_AND_G
          echo "*** See http://www.freedesktop.org/software/pkgconfig"
       fi
    fi
diff --git a/devel/GConf2/patches/patch-ad b/devel/GConf2/patches/patch-ad
index 18b23482f70..740535451d9 100644
--- a/devel/GConf2/patches/patch-ad
+++ b/devel/GConf2/patches/patch-ad
@@ -1,17 +1,33 @@
-$NetBSD: patch-ad,v 1.1 2003/02/14 20:04:10 jmmv Exp $
+$NetBSD: patch-ad,v 1.2 2004/04/01 18:17:29 jmmv Exp $
 
---- gconf/default.path.in.orig	2000-01-31 22:49:05.000000000 +0100
+--- gconf/default.path.in.orig	2003-11-03 00:23:30.000000000 +0000
 +++ gconf/default.path.in
-@@ -7,7 +7,7 @@
+@@ -7,13 +7,13 @@
  
  # Look first in systemwide mandatory settings directory
  # (commented out until xml backend knows how to be read-only for users)
 -xml:readonly:@EXPANDED_SYSCONFDIR@/gconf/gconf.xml.mandatory
 +xml:readonly:@EXPANDED_SYSCONFDIR@/gconf.xml.mandatory
  
+ # To read in any mandatory settings that the Sys Admin may have created
+ # prior to a desktop system upgrade. The SysAdmin can stick read-only system
+ # wide sources in this file.
+ 
+-include @EXPANDED_SYSCONFDIR@/gconf/2/local-mandatory.path
++include @EXPANDED_SYSCONFDIR@/2/local-mandatory.path
+ 
  # Now see where users want us to look - basically the user can stick arbitrary 
  # sources in a ~/.gconf.path file and they're inserted here
-@@ -19,7 +19,7 @@ xml:readwrite:$(HOME)/.gconf
+@@ -23,7 +23,7 @@ include "$(HOME)/.gconf.path"
+ # prior to a desktop system upgrade. The SysAdmin can stick default values
+ # system-wide in this file.
+ 
+-include @EXPANDED_SYSCONFDIR@/gconf/2/local-defaults.path
++include @EXPANDED_SYSCONFDIR@/2/local-defaults.path
+ 
+ # Give users a default storage location, ~/.gconf
+ 
+@@ -31,7 +31,7 @@ xml:readwrite:$(HOME)/.gconf
  
  # Finally, look at the systemwide defaults
  # (commented out for now)
diff --git a/devel/GConf2/patches/patch-af b/devel/GConf2/patches/patch-af
index b58852c5b57..f3926b56794 100644
--- a/devel/GConf2/patches/patch-af
+++ b/devel/GConf2/patches/patch-af
@@ -1,15 +1,29 @@
-$NetBSD: patch-af,v 1.1 2004/01/23 17:51:24 jmmv Exp $
+$NetBSD: patch-af,v 1.2 2004/04/01 18:17:29 jmmv Exp $
 
-The package does not install documentation, so avoid creating the directory
-that should contain it.
+http://bugzilla.gnome.org/show_bug.cgi?id=134247
+http://bugzilla.gnome.org/show_bug.cgi?id=134319
 
---- doc/gconf/Makefile.in.orig	2004-01-23 18:41:17.000000000 +0100
+--- doc/gconf/Makefile.in.orig	2003-12-15 02:55:42.000000000 +0000
 +++ doc/gconf/Makefile.in
-@@ -381,6 +381,7 @@ maintainer-clean-local: clean
- 	cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+@@ -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:
-+dontdo-install-data-local:
- 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
- 	(installfiles=`echo $(srcdir)/html/*`; \
+-	$(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