Update dconf to 0.26.0

XXX is SUBST_CLASSES.Darwin+= libname still needed?

Changes in dconf 0.26.0
========================

None.

Changes in dconf 0.25.1
========================

 - the libdbus-1 backend has been removed.  dconf now always uses GDBus.

 - support has been added for system administration frameworks to set up
   the dconf profile via a file placed in the XDG_RUNTIME_DIR or in
   /run/dconf/.  In the case of the file in /run/dconf/, it is not
   possible to modify the proile, even via the DCONF_PROFILE environment
   variable, which makes it slightly more difficult to evade lockdown.

 - directory resets are now implemented properly in DConfChangeset which
   means that reading a subkey through a changeset that contains a reset
   for a parent directory of that key will return TRUE with a NULL value

 - a new API dconf_client_read_full() has been added which allows
   reading the user value, the default value, or querying what the
   effective value would be if a changeset were to be applied.

 - a new API has been added for listing the locks that are in effect:
   dconf_client_list_locks()

 - DConfClient has a new "writability-changed" signal

 - support for reading default values and listing locks have been added
   to the dconf commandline tool

 - support for g_autoptr() has been added for DConfClient and
   DConfChangeset

 - the handling of reading of default values via GSettings has been made
   more efficient.  More major changes to the GSettings backend are
   expected in the near future.

Changes in dconf 0.24.0
========================

The version number was increased and a new entry was added to the NEWS.

Changes in dconf 0.23.2
========================

 - remove dconf-editor manpage (accidentally missed during the split)

 - fix whitespace issues in 'dconf --help'

Changes in dconf 0.23.1
========================

 - dconf-editor is now in a separate package

 - portability improvements

7 files changed, 42 insertions, 152 deletions

diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index f394138b25f..114af5c734b 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -1,21 +1,37 @@
-# $NetBSD: Makefile,v 1.32 2016/04/10 19:38:52 prlw1 Exp $
-
-PKGREVISION=	5
-.include "Makefile.common"
-
-CONFIGURE_ARGS+=	--disable-editor
-
-PKGCONFIG_OVERRIDE+=	client/dconf.pc.in dbus-1/dconf-dbus-1.pc.in
+# $NetBSD: Makefile,v 1.33 2016/04/20 22:00:55 prlw1 Exp $
+
+DISTNAME=	dconf-0.26.0
+CATEGORIES=	devel gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dconf/${PKGVERSION_NOREV:R}/}
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://wiki.gnome.org/Projects/dconf
+COMMENT=	Backend for gsettings
+LICENSE=	gnu-lgpl-v2.1
+
+GNU_CONFIGURE=	yes
+USE_LANGUAGES=	c99
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config gmake
+
+SUBST_CLASSES+=		sysdir
+SUBST_MESSAGE.sysdir=	Fixes hard-coded dconf database directory name
+SUBST_STAGE.sysdir=	post-configure
+SUBST_FILES.sysdir+=	engine/dconf-engine-source-system.c
+SUBST_FILES.sysdir+=	engine/dconf-engine-profile.c
+SUBST_FILES.sysdir+=	tests/engine.c
+SUBST_FILES.sysdir+=	bin/dconf-update.c
+SUBST_FILES.sysdir+=	bin/dconf-update.vala
+SUBST_SED.sysdir=	-e s,/etc,${PKG_SYSCONFDIR},g
+
+PKGCONFIG_OVERRIDE+=	client/dconf.pc.in
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
-BUILDLINK_TRANSFORM+=	rm:-ldl
-.endif
-
 SUBST_CLASSES.Darwin+=	libname
 SUBST_STAGE.libname=	pre-configure
-SUBST_FILES.libname=	client/Makefile.in dbus-1/Makefile.in
+SUBST_FILES.libname=	client/Makefile.in
 SUBST_FILES.libname+=	gsettings/Makefile.in
 SUBST_SED.libname=	-e "s|-Wl,-soname=|-install_name ${PREFIX}/lib/|g"
 SUBST_SED.libname+=	-e "/^libdconfsettings_so_LDFLAGS/s,$$, -install_name ${PREFIX}/lib/gio/modules/libdconfsettings.so,g"
@@ -27,7 +43,6 @@ BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 BUILDLINK_DEPMETHOD.vala=	build
 BUILDLINK_API_DEPENDS.vala+=	vala>=0.18.0
 .include "../../lang/vala/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.39.1
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.44.0
 .include "../../devel/glib2/modules.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/dconf/Makefile.common b/devel/dconf/Makefile.common
deleted file mode 100644
index 4e4ed64500f..00000000000
--- a/devel/dconf/Makefile.common
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile.common,v 1.8 2016/03/02 22:45:01 ryoon Exp $
-#
-# used by devel/dconf-editor/Makefile
-
-DISTNAME=	dconf-0.22.0
-CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dconf/${PKGVERSION_NOREV:R}/}
-EXTRACT_SUFX=	.tar.xz
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://wiki.gnome.org/Projects/dconf
-COMMENT=	Backend for gsettings
-LICENSE=	gnu-lgpl-v2.1
-
-GNU_CONFIGURE=	yes
-USE_LANGUAGES=	c99
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config gmake intltool msgfmt
-
-SUBST_CLASSES+=		sysdir
-SUBST_MESSAGE.sysdir=	Fixes hard-coded dconf database directory name
-SUBST_STAGE.sysdir=	post-configure
-SUBST_FILES.sysdir+=	engine/dconf-engine-source-system.c
-SUBST_FILES.sysdir+=	engine/dconf-engine-profile.c
-SUBST_FILES.sysdir+=	tests/engine.c
-SUBST_FILES.sysdir+=	bin/dconf-update.c
-SUBST_FILES.sysdir+=	bin/dconf-update.vala
-SUBST_SED.sysdir=	-e s,/etc,${PKG_SYSCONFDIR},g
diff --git a/devel/dconf/PLIST b/devel/dconf/PLIST
index a494417d229..113b4903876 100644
--- a/devel/dconf/PLIST
+++ b/devel/dconf/PLIST
@@ -1,22 +1,16 @@
-@comment $NetBSD: PLIST,v 1.7 2014/09/10 10:54:46 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.8 2016/04/20 22:00:55 prlw1 Exp $
 bin/dconf
-include/dconf-dbus-1/dconf-dbus-1.h
 include/dconf/client/dconf-client.h
 include/dconf/common/dconf-changeset.h
-include/dconf/common/dconf-error.h
+include/dconf/common/dconf-enums.h
 include/dconf/common/dconf-paths.h
 include/dconf/dconf.h
 lib/gio/modules/libdconfsettings.so
-lib/libdconf-dbus-1.so
-lib/libdconf-dbus-1.so.0
-lib/libdconf-dbus-1.so.0.0.0
 lib/libdconf.so
 lib/libdconf.so.1
 lib/libdconf.so.1.0.0
-lib/pkgconfig/dconf-dbus-1.pc
 lib/pkgconfig/dconf.pc
 libexec/dconf-service
-man/man1/dconf-editor.1
 man/man1/dconf-service.1
 man/man1/dconf.1
 man/man7/dconf.7
@@ -24,12 +18,15 @@ share/bash-completion/completions/dconf
 share/dbus-1/services/ca.desrt.dconf.service
 share/gtk-doc/html/dconf/DConfClient.html
 share/gtk-doc/html/dconf/annotation-glossary.html
+share/gtk-doc/html/dconf/api-index-0.16.html
+share/gtk-doc/html/dconf/api-index-0.18.html
+share/gtk-doc/html/dconf/api-index-0.20.html
+share/gtk-doc/html/dconf/api-index-0.26.html
 share/gtk-doc/html/dconf/api-index-full.html
 share/gtk-doc/html/dconf/ch01.html
 share/gtk-doc/html/dconf/dconf-DConfChangeset.html
 share/gtk-doc/html/dconf/dconf-DConfError.html
 share/gtk-doc/html/dconf/dconf-dconf-Paths.html
-share/gtk-doc/html/dconf/dconf-editor.html
 share/gtk-doc/html/dconf/dconf-overview.html
 share/gtk-doc/html/dconf/dconf-service.html
 share/gtk-doc/html/dconf/dconf-tool.html
@@ -46,61 +43,5 @@ share/gtk-doc/html/dconf/right.png
 share/gtk-doc/html/dconf/style.css
 share/gtk-doc/html/dconf/up-insensitive.png
 share/gtk-doc/html/dconf/up.png
-share/locale/an/LC_MESSAGES/dconf.mo
-share/locale/ar/LC_MESSAGES/dconf.mo
-share/locale/as/LC_MESSAGES/dconf.mo
-share/locale/be/LC_MESSAGES/dconf.mo
-share/locale/bg/LC_MESSAGES/dconf.mo
-share/locale/bn_IN/LC_MESSAGES/dconf.mo
-share/locale/ca/LC_MESSAGES/dconf.mo
-share/locale/ca@valencia/LC_MESSAGES/dconf.mo
-share/locale/cs/LC_MESSAGES/dconf.mo
-share/locale/da/LC_MESSAGES/dconf.mo
-share/locale/de/LC_MESSAGES/dconf.mo
-share/locale/el/LC_MESSAGES/dconf.mo
-share/locale/en_GB/LC_MESSAGES/dconf.mo
-share/locale/eo/LC_MESSAGES/dconf.mo
-share/locale/es/LC_MESSAGES/dconf.mo
-share/locale/et/LC_MESSAGES/dconf.mo
-share/locale/eu/LC_MESSAGES/dconf.mo
-share/locale/fa/LC_MESSAGES/dconf.mo
-share/locale/fi/LC_MESSAGES/dconf.mo
-share/locale/fr/LC_MESSAGES/dconf.mo
-share/locale/fur/LC_MESSAGES/dconf.mo
-share/locale/gl/LC_MESSAGES/dconf.mo
-share/locale/he/LC_MESSAGES/dconf.mo
-share/locale/hi/LC_MESSAGES/dconf.mo
-share/locale/hu/LC_MESSAGES/dconf.mo
-share/locale/id/LC_MESSAGES/dconf.mo
-share/locale/it/LC_MESSAGES/dconf.mo
-share/locale/ja/LC_MESSAGES/dconf.mo
-share/locale/ko/LC_MESSAGES/dconf.mo
-share/locale/lt/LC_MESSAGES/dconf.mo
-share/locale/lv/LC_MESSAGES/dconf.mo
-share/locale/ml/LC_MESSAGES/dconf.mo
-share/locale/mr/LC_MESSAGES/dconf.mo
-share/locale/nb/LC_MESSAGES/dconf.mo
-share/locale/nl/LC_MESSAGES/dconf.mo
-share/locale/pa/LC_MESSAGES/dconf.mo
-share/locale/pl/LC_MESSAGES/dconf.mo
-share/locale/pt/LC_MESSAGES/dconf.mo
-share/locale/pt_BR/LC_MESSAGES/dconf.mo
-share/locale/ru/LC_MESSAGES/dconf.mo
-share/locale/sk/LC_MESSAGES/dconf.mo
-share/locale/sl/LC_MESSAGES/dconf.mo
-share/locale/sr/LC_MESSAGES/dconf.mo
-share/locale/sr@latin/LC_MESSAGES/dconf.mo
-share/locale/sv/LC_MESSAGES/dconf.mo
-share/locale/ta/LC_MESSAGES/dconf.mo
-share/locale/te/LC_MESSAGES/dconf.mo
-share/locale/tg/LC_MESSAGES/dconf.mo
-share/locale/th/LC_MESSAGES/dconf.mo
-share/locale/tr/LC_MESSAGES/dconf.mo
-share/locale/ug/LC_MESSAGES/dconf.mo
-share/locale/uk/LC_MESSAGES/dconf.mo
-share/locale/vi/LC_MESSAGES/dconf.mo
-share/locale/zh_CN/LC_MESSAGES/dconf.mo
-share/locale/zh_HK/LC_MESSAGES/dconf.mo
-share/locale/zh_TW/LC_MESSAGES/dconf.mo
 share/vala/vapi/dconf.deps
 share/vala/vapi/dconf.vapi
diff --git a/devel/dconf/buildlink3.mk b/devel/dconf/buildlink3.mk
index 9a20dbe338f..c8bf0d1dd41 100644
--- a/devel/dconf/buildlink3.mk
+++ b/devel/dconf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2013/09/30 11:17:32 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2016/04/20 22:00:55 prlw1 Exp $
 
 BUILDLINK_TREE+=	dconf
 
@@ -10,7 +10,6 @@ BUILDLINK_ABI_DEPENDS.dconf?=	dconf>=0.14.0
 BUILDLINK_PKGSRCDIR.dconf?=	../../devel/dconf
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
 .endif	# DCONF_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-dconf
diff --git a/devel/dconf/distinfo b/devel/dconf/distinfo
index 8cdd87e84a6..e33b7e5d0ba 100644
--- a/devel/dconf/distinfo
+++ b/devel/dconf/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.10 2015/11/03 03:27:22 agc Exp $
+$NetBSD: distinfo,v 1.11 2016/04/20 22:00:55 prlw1 Exp $
 
-SHA1 (dconf-0.22.0.tar.xz) = d1a03938451b19a53f0d2fd09b6c737542fdd4c4
-RMD160 (dconf-0.22.0.tar.xz) = a69abcb409ebdb3a72923ecbb23cbf5b43a5f98c
-SHA512 (dconf-0.22.0.tar.xz) = fee502b599da3634934eadc3d9fc138f2036118e88edadf0e3dc157f8e689ee1fee057342a296197b126e5f657fcb2bb1f399b6a3ffa9ff5fdcc3119d9433d9b
-Size (dconf-0.22.0.tar.xz) = 393260 bytes
-SHA1 (patch-aa) = c786bb85c3971f918294293df7c03fabf1ff201e
-SHA1 (patch-editor_Makefile.in) = 5caa945a7b792daa36fb090741b05e38f0f3945a
+SHA1 (dconf-0.26.0.tar.xz) = d4ab94969864c3e00515d0c0ee5b8090a7e0f896
+RMD160 (dconf-0.26.0.tar.xz) = 1421922be5703abb86fa59786a5d2e5c2d4cc646
+SHA512 (dconf-0.26.0.tar.xz) = ea225397a486815c90a113c064d943f113490dfc754e4acba049b033115aa3a6a3849a5cdc133663de09811cde41c963041bc244cfd9ed32d65399889e415d1e
+Size (dconf-0.26.0.tar.xz) = 219688 bytes
diff --git a/devel/dconf/patches/patch-aa b/devel/dconf/patches/patch-aa
deleted file mode 100644
index 8c973b2a39d..00000000000
--- a/devel/dconf/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2013/09/30 11:42:13 obache Exp $
-
---- configure.orig	2013-09-23 21:29:29.000000000 +0000
-+++ configure
-@@ -5423,7 +5423,7 @@ if test "${enable_gcov+set}" = set; then
- fi
- 
- 
--if test "x$enable_gcov" == "xyes"; then
-+if test "x$enable_gcov" = "xyes"; then
-   CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage"
-   LDFLAGS="$LDFLAGS -lgcov"
- fi
diff --git a/devel/dconf/patches/patch-editor_Makefile.in b/devel/dconf/patches/patch-editor_Makefile.in
deleted file mode 100644
index 06f0af6ebf6..00000000000
--- a/devel/dconf/patches/patch-editor_Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-editor_Makefile.in,v 1.4 2013/09/30 11:42:13 obache Exp $
-
---- editor/Makefile.in.orig	2013-09-23 21:29:28.000000000 +0000
-+++ editor/Makefile.in
-@@ -103,7 +103,7 @@ nodist_dconf_editor_OBJECTS = dconf_edit
- dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS) \
- 	$(nodist_dconf_editor_OBJECTS)
- am__DEPENDENCIES_1 =
--dconf_editor_DEPENDENCIES = ../client/libdconf.so.1 \
-+dconf_editor_DEPENDENCIES = \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
- dconf_editor_LINK = $(CCLD) $(dconf_editor_CFLAGS) $(CFLAGS) \
-@@ -355,7 +355,7 @@ TEST_PROGS = 
- AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/client
- dconf_editor_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf
- dconf_editor_LDADD = \
--	../client/libdconf.so.1		\
-+	$(prefix)/lib/libdconf.so.1	\
- 	$(gtk_LIBS)			\
- 	$(gee_LIBS)			\
- 	$(gmodule_LIBS)			\