Update to dconf-0.14.0.

2012-09-27 08:32:05 +00:00 · 2012-09-27 08:32:05 +00:00 · 9a90d07b6f
commit 9a90d07b6f
parent 61dd4506e7
10 changed files with 196 additions and 170 deletions
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 2012/09/01 14:36:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.40 2012/09/27 08:32:05 ajacoutot Exp $

 SHARED_ONLY=	Yes

@ -6,16 +6,13 @@ COMMENT-main=	configuration backend system
 COMMENT-editor=	editor for the dconf configuration storage system

 GNOME_PROJECT=	dconf
-GNOME_VERSION=	0.12.1
+GNOME_VERSION=	0.14.0

 PKGNAME-main=	${DISTNAME}
 PKGNAME-editor=	dconf-editor-${GNOME_VERSION}

-REVISION-main=	0
-REVISION-editor=1
-
-SHARED_LIBS+=	dconf        0.0 # 0.0.0
-SHARED_LIBS+=	dconf-dbus-1 0.0 # 0.0.0
+SHARED_LIBS+=	dconf        1.0 # 1.0.0
+SHARED_LIBS+=	dconf-dbus-1 1.0 # 1.0.0

 CATEGORIES=	devel

@ -53,6 +50,9 @@ MODGNOME_DESKTOP_FILE= Yes

 BUILD_DEPENDS=	lang/vala

+# man pages
+BUILD_DEPENDS += textproc/docbook-xsl # adds textproc/libxslt
+
 RUN_DEPENDS-main=	# empty
 LIB_DEPENDS-main=	devel/glib2 \
 			x11/dbus
@ -60,6 +60,7 @@ LIB_DEPENDS-main=	devel/glib2 \
 RUN_DEPENDS-editor=	${RUN_DEPENDS} \
 			devel/desktop-file-utils
 LIB_DEPENDS-editor=	${MODGETTEXT_LIB_DEPENDS} \
+			${BASE_PKGPATH},-main \
 			x11/gtk+3

 CONFIGURE_STYLE=gnu
--- a/devel/dconf/distinfo
+++ b/devel/dconf/distinfo
@ -1,5 +1,2 @@
-MD5 (dconf-0.12.1.tar.xz) = Drv6UKtp5dZ5z4ocaOdb8w==
-RMD160 (dconf-0.12.1.tar.xz) = 6bClQjDnbmhHCVjR6hFdnzuZzac=
-SHA1 (dconf-0.12.1.tar.xz) = G9v1Oy5pn+WPafp6QhZDUehWDgU=
-SHA256 (dconf-0.12.1.tar.xz) = PNMreNiO176Q2s5dReLPimq9slPUPb+l71IQOzKdwhQ=
-SIZE (dconf-0.12.1.tar.xz) = 202112
+SHA256 (dconf-0.14.0.tar.xz) = muhIvyXD3g+4wBV2eWMN3zm+HBDtLzvrK48BZddo2jM=
+SIZE (dconf-0.14.0.tar.xz) = 288872
--- a/devel/dconf/patches/patch-bin_Makefile_in
+++ b/devel/dconf/patches/patch-bin_Makefile_in
@ -1,30 +1,21 @@
-$OpenBSD: patch-bin_Makefile_in,v 1.7 2012/05/01 06:17:38 ajacoutot Exp $
--- bin/Makefile.in.orig	Tue May  1 07:09:12 2012
-+++ bin/Makefile.in	Tue May  1 07:28:38 2012
-@@ -52,7 +52,7 @@ am_dconf_OBJECTS = dconf.$(OBJEXT) dconf-update.$(OBJE
- 	dconf-dump.$(OBJEXT) gvdb-builder.$(OBJEXT)
+$OpenBSD: patch-bin_Makefile_in,v 1.8 2012/09/27 08:32:05 ajacoutot Exp $
+--- bin/Makefile.in.orig	Thu Sep 27 09:24:29 2012
+++ bin/Makefile.in	Thu Sep 27 09:25:10 2012
+@@ -70,7 +70,7 @@ am_dconf_OBJECTS = dconf-gvdb-builder.$(OBJEXT) \
+ 	dconf-dconf.$(OBJEXT)
 dconf_OBJECTS = $(am_dconf_OBJECTS)
 am__DEPENDENCIES_1 =
-dconf_DEPENDENCIES = $(am__DEPENDENCIES_1) ../client/libdconf.so.0
-+dconf_DEPENDENCIES = $(am__DEPENDENCIES_1) ../client/libdconf.so.${LIBdconf_VERSION}
+-dconf_DEPENDENCIES = ../client/libdconf.so.1 $(am__DEPENDENCIES_1)
+dconf_DEPENDENCIES = ../client/libdconf.so.${LIBdconf_VERSION} $(am__DEPENDENCIES_1)
+ dconf_LINK = $(CCLD) $(dconf_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/aux/depcomp
- am__depfiles_maybe = depfiles
-@@ -122,7 +122,7 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ -Wno-error -Wno-unused-but-set-variable \
-+CFLAGS = @CFLAGS@ -Wno-error \
- 	-Wno-unused-variable
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -231,7 +231,7 @@ top_srcdir = @top_srcdir@
- AM_CFLAGS = -Wall -Wmissing-prototypes -Wwrite-strings
- INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/engine -I$(top_srcdir)/client -I$(top_srcdir)/gvdb $(gio_CFLAGS)
- dconf_VALAFLAGS = --vapidir ../client --pkg=gio-2.0 --pkg=posix --pkg=dconf
-dconf_LDADD = $(gio_LIBS) ../client/libdconf.so.0
-+dconf_LDADD = $(gio_LIBS) ../client/libdconf.so.${LIBdconf_VERSION}
- dconf_SOURCES = dconf.vala dconf-update.vala dconf-dump.vala ../gvdb/gvdb-builder.c gvdb.vapi
- completiondir = $(sysconfdir)/bash_completion.d
- completion_DATA = dconf-bash-completion.sh
+@@ -296,7 +296,7 @@ dconf_CFLAGS = \
+ 	-w
+ 
+ dconf_LDADD = \
+-	../client/libdconf.so.1		\
+	../client/libdconf.so.${LIBdconf_VERSION}		\
+ 	$(gio_LIBS)
+ 
+ dconf_SOURCES = \
--- a/devel/dconf/patches/patch-client_Makefile_in
+++ b/devel/dconf/patches/patch-client_Makefile_in
@ -1,67 +1,55 @@
-$OpenBSD: patch-client_Makefile_in,v 1.8 2012/05/01 06:17:38 ajacoutot Exp $
--- client/Makefile.in.orig	Tue May  1 07:09:12 2012
-+++ client/Makefile.in	Tue May  1 07:28:38 2012
-@@ -34,7 +34,7 @@ POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-shlib_PROGRAMS = libdconf.so.0.0.0$(EXEEXT)
+$OpenBSD: patch-client_Makefile_in,v 1.9 2012/09/27 08:32:05 ajacoutot Exp $
+--- client/Makefile.in.orig	Wed Sep 26 20:07:41 2012
+++ client/Makefile.in	Thu Sep 27 10:04:02 2012
+@@ -55,7 +55,7 @@ POST_UNINSTALL = :
+ DIST_COMMON = $(dconfclientinclude_HEADERS) $(dconfinclude_HEADERS) \
+ 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(srcdir)/dconf.pc.in $(top_srcdir)/Makefile.gtester
+-shlib_PROGRAMS = libdconf.so.1.0.0$(EXEEXT)
 +shlib_PROGRAMS = libdconf.so.${LIBdconf_VERSION}$(EXEEXT)
 subdir = client
- DIST_COMMON = $(dconfinclude_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(srcdir)/dconf.pc.in dconf-client.c \
-@@ -129,7 +129,7 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ -Wno-error -Wno-unused-but-set-variable \
-+CFLAGS = @CFLAGS@ -Wno-error \
- 	-Wno-unused-variable
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -238,13 +238,13 @@ top_srcdir = @top_srcdir@
- AM_CFLAGS = -std=c89 -Wall -Wmissing-prototypes -Wwrite-strings -D__dconf_h__ -fPIC -DPIC
- INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/gvdb -I$(top_srcdir)/engine $(gio_CFLAGS)
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+@@ -306,7 +306,7 @@ top_srcdir = @top_srcdir@
+ # initialize variables for unconditional += appending
+ TEST_PROGS = 
 shlibdir = $(libdir)
-nodist_noinst_DATA = libdconf.so.0 libdconf.so
+-nodist_noinst_DATA = libdconf.so.1 libdconf.so
 +nodist_noinst_DATA =
- dconfinclude_HEADERS = \
- 	dconf-client.h	\
- 	dconf.h
+ noinst_LIBRARIES = libdconf-client.a
+ dconfinclude_HEADERS = dconf.h
+ dconfclientinclude_HEADERS = dconf-client.h
+@@ -324,7 +324,7 @@ libdconf_so_1_0_0_LDADD = \
+ 	../shm/libdconf-shm-shared.a			\
+ 	$(gio_LIBS)
 
- libdconf_so_0_0_0_LDADD = $(gio_LIBS)
-libdconf_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.0
-+libdconf_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.${LIBdconf_VERSION}
- libdconf_so_0_0_0_SOURCES = \
- 	../common/dconf-shmdir.c	\
- 	../common/dconf-paths.c		\
-@@ -332,8 +332,8 @@ uninstall-shlibPROGRAMS:
+-libdconf_so_1_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.1
+libdconf_so_1_0_0_LDFLAGS = -shared
+ libdconf_so_1_0_0_SOURCES = $(libdconf_client_a_SOURCES)
+ EXTRA_DIST = dconf.vapi dconf.deps
+ vapi_DATA = dconf.vapi dconf.deps
+@@ -416,8 +416,8 @@ uninstall-shlibPROGRAMS:
 
 clean-shlibPROGRAMS:
 	-test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
-libdconf.so.0.0.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_0_0_0_DEPENDENCIES) 
-	@rm -f libdconf.so.0.0.0$(EXEEXT)
-+libdconf.so.${LIBdconf_VERSION}$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_0_0_0_DEPENDENCIES) 
+-libdconf.so.1.0.0$(EXEEXT): $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_1_0_0_DEPENDENCIES) 
+-	@rm -f libdconf.so.1.0.0$(EXEEXT)
+libdconf.so.${LIBdconf_VERSION}$(EXEEXT): $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_1_0_0_DEPENDENCIES) 
 +	@rm -f libdconf.so.${LIBdconf_VERSION}$(EXEEXT)
- 	$(AM_V_CCLD)$(libdconf_so_0_0_0_LINK) $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_LDADD) $(LIBS)
+ 	$(AM_V_CCLD)$(libdconf_so_1_0_0_LINK) $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_LDADD) $(LIBS)
 
 mostlyclean-compile:
-@@ -695,17 +695,12 @@ uninstall-am: uninstall-dconfincludeHEADERS uninstall-
- 	uninstall-vapiDATA
+@@ -837,13 +837,6 @@ test-report perf-report full-report:	${TEST_PROGS}
 
- 
-libdconf.so.0 libdconf.so: libdconf.so.0.0.0
-	$(AM_V_GEN) ln -fs libdconf.so.0.0.0 $@
+ # run tests in cwd as part of make check
+ check-local: test-nonrecursive
 -
- install-data-hook:
-	ln -fs libdconf.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.0
-	ln -fs libdconf.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf.so
+-libdconf.so.1 libdconf.so: libdconf.so.1.0.0
+-	$(AM_V_GEN) ln -fs libdconf.so.1.0.0 $@
+-
+-install-data-hook:
+-	ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.1
+-	ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so
 
 uninstall-hook:
- 	rm -f $(DESTDIR)$(shlibdir)/libdconf.so.0
- 	rm -f $(DESTDIR)$(shlibdir)/libdconf.so
-dconf.vapi: libdconf.so.0
-+dconf.vapi: libdconf.so.${LIBdconf_VERSION}
- 
- dconf.deps:
- 	$(AM_V_GEN) echo gio-2.0 > dconf.deps
+ 	rm -f $(DESTDIR)$(shlibdir)/libdconf.so.1
--- a/devel/dconf/patches/patch-dbus-1_Makefile_in
+++ b/devel/dconf/patches/patch-dbus-1_Makefile_in
@ -1,33 +1,28 @@
-$OpenBSD: patch-dbus-1_Makefile_in,v 1.6 2012/05/01 06:17:38 ajacoutot Exp $
--- dbus-1/Makefile.in.orig	Tue May  1 07:09:12 2012
-+++ dbus-1/Makefile.in	Tue May  1 07:28:38 2012
-@@ -34,7 +34,7 @@ POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0$(EXEEXT)
-+shlib_PROGRAMS = libdconf-dbus-1.so.${LIBdconf-dbus-1_VERSION}
- subdir = dbus-1
+$OpenBSD: patch-dbus-1_Makefile_in,v 1.7 2012/09/27 08:32:05 ajacoutot Exp $
+--- dbus-1/Makefile.in.orig	Thu Sep 27 09:27:23 2012
+++ dbus-1/Makefile.in	Thu Sep 27 09:29:28 2012
+@@ -55,7 +55,7 @@ POST_UNINSTALL = :
 DIST_COMMON = $(dconf_dbus_1include_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(srcdir)/dconf-dbus-1.pc.in
-@@ -239,14 +239,14 @@ pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = dconf-dbus-1.pc
- shlibdir = $(libdir)
- libdconf_dbus_1_so_0_0_0_LDADD = $(glib_LIBS) $(dbus_LIBS)
-libdconf_dbus_1_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf-dbus-1.so.0
-+libdconf_dbus_1_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf-dbus-1.so.${LIBdconf-dbus-1_VERSION}
- libdconf_dbus_1_so_0_0_0_SOURCES = \
- 	../engine/dconf-engine.c	\
- 	../common/dconf-shmdir.c	\
- 	../gvdb/gvdb-reader.c		\
- 	dconf-dbus-1.c
+ 	$(srcdir)/Makefile.in $(srcdir)/dconf-dbus-1.pc.in \
+ 	$(top_srcdir)/Makefile.gtester
+-shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0$(EXEEXT)
+shlib_PROGRAMS = libdconf-dbus-1.so.${LIBdconf-dbus-1_VERSION}$(EXEEXT)
+ subdir = dbus-1
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+@@ -339,9 +339,9 @@ libdconf_dbus_1_so_0_0_0_LDADD = \
+ 	 $(dbus_LIBS)					\
+ 	$(glib_LIBS)
 
-noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0
-+noinst_DATA =
+-libdconf_dbus_1_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf-dbus-1.so.0
+libdconf_dbus_1_so_0_0_0_LDFLAGS = -shared
+ libdconf_dbus_1_so_0_0_0_SOURCES = dconf-dbus-1.c
+-nodist_noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0
+nodist_noinst_DATA =
 CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
 all: all-am
 
-@@ -321,8 +321,8 @@ uninstall-shlibPROGRAMS:
+@@ -431,8 +431,8 @@ uninstall-shlibPROGRAMS:
 
 clean-shlibPROGRAMS:
 	-test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
@ -38,11 +33,10 @@ $OpenBSD: patch-dbus-1_Makefile_in,v 1.6 2012/05/01 06:17:38 ajacoutot Exp $
 	$(AM_V_CCLD)$(libdconf_dbus_1_so_0_0_0_LINK) $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_LDADD) $(LIBS)
 
 mostlyclean-compile:
-@@ -638,14 +638,6 @@ uninstall-am: uninstall-dconf_dbus_1includeHEADERS \
- 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
- 	uninstall-am uninstall-dconf_dbus_1includeHEADERS \
- 	uninstall-hook uninstall-pkgconfigDATA uninstall-shlibPROGRAMS
-
+@@ -820,13 +820,6 @@ test-report perf-report full-report:	${TEST_PROGS}
+ 
+ # run tests in cwd as part of make check
+ check-local: test-nonrecursive
 -
 -libdconf-dbus-1.so.0 libdconf-dbus-1.so: libdconf-dbus-1.so.0.0.0
 -	$(AM_V_GEN) ln -fs libdconf-dbus-1.so.0.0.0 $@
--- a/devel/dconf/patches/patch-editor_Makefile_in
+++ b/devel/dconf/patches/patch-editor_Makefile_in
@ -1,30 +1,21 @@
-$OpenBSD: patch-editor_Makefile_in,v 1.6 2012/05/01 06:17:38 ajacoutot Exp $
--- editor/Makefile.in.orig	Tue May  1 07:09:12 2012
-+++ editor/Makefile.in	Tue May  1 07:28:38 2012
-@@ -55,7 +55,7 @@ am_dconf_editor_OBJECTS = dconf-editor.$(OBJEXT) dconf
- 	dconf-schema.$(OBJEXT) dconf-view.$(OBJEXT)
+$OpenBSD: patch-editor_Makefile_in,v 1.7 2012/09/27 08:32:05 ajacoutot Exp $
+--- editor/Makefile.in.orig	Thu Sep 27 09:29:41 2012
+++ editor/Makefile.in	Thu Sep 27 09:30:08 2012
+@@ -72,7 +72,7 @@ am_dconf_editor_OBJECTS = dconf_editor-dconf-editor.$(
+ 	dconf_editor-dconf-view.$(OBJEXT)
 dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS)
 am__DEPENDENCIES_1 =
-dconf_editor_DEPENDENCIES = ../client/libdconf.so.0 \
+-dconf_editor_DEPENDENCIES = ../client/libdconf.so.1 \
 +dconf_editor_DEPENDENCIES = ../client/libdconf.so.${LIBdconf_VERSION} \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-@@ -124,7 +124,7 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ -Wno-error -Wno-unused-but-set-variable \
-+CFLAGS = @CFLAGS@ -Wno-error \
- 	-Wno-unused-variable
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-@@ -232,7 +232,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CFLAGS = $(gtk_CFLAGS) $(gmodule_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client -DPKGDATADIR=\"@datadir@/dconf-editor\"
- AM_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf
-dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS)
-+dconf_editor_LDADD = ../client/libdconf.so.${LIBdconf_VERSION} $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS)
- dconf_editor_SOURCES = config.vapi dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala
- desktopdir = $(datadir)/applications
- desktop_in_files = dconf-editor.desktop.in.in
+ dconf_editor_LINK = $(CCLD) $(dconf_editor_CFLAGS) $(CFLAGS) \
+@@ -297,7 +297,7 @@ TEST_PROGS = 
+ INCLUDES = -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		\
+	../client/libdconf.so.${LIBdconf_VERSION}		\
+ 	$(gtk_LIBS)			\
+ 	$(gee_LIBS)			\
+ 	$(gmodule_LIBS)			\
--- a/devel/dconf/patches/patch-engine_dconf-engine_c
+++ b/devel/dconf/patches/patch-engine_dconf-engine_c
@ -1,15 +0,0 @@
-$OpenBSD: patch-engine_dconf-engine_c,v 1.8 2012/03/29 06:26:38 ajacoutot Exp $
--- engine/dconf-engine.c.orig	Mon Mar 26 16:29:26 2012
-+++ engine/dconf-engine.c	Wed Mar 28 21:10:21 2012
-@@ -144,6 +144,11 @@ dconf_engine_refresh_user (DConfEngine *engine,
- {
-   g_assert ((engine->gvdbs[i] == NULL) >= (engine->shm[i] == NULL));
- 
-+#ifdef __OpenBSD__
-+  if (engine->shm)
-+    msync (engine->shm[i], 1, MS_INVALIDATE);
-+#endif
-+
-   /* if we failed the first time, fail forever */
-   if (engine->shm[i] && *engine->shm[i] == 1)
-     {
--- a/devel/dconf/patches/patch-tests_Makefile_in
+++ b/devel/dconf/patches/patch-tests_Makefile_in
@ -0,0 +1,22 @@
+$OpenBSD: patch-tests_Makefile_in,v 1.1 2012/09/27 08:32:05 ajacoutot Exp $
+--- tests/Makefile.in.orig	Thu Sep 27 09:21:40 2012
+++ tests/Makefile.in	Thu Sep 27 09:21:48 2012
+@@ -349,8 +349,7 @@ changeset_SOURCES = changeset.c
+ shm_CFLAGS = $(glib_CFLAGS)
+ shm_LDADD = \
+ 	../shm/libdconf-shm.a			\
+-	$(glib_LIBS)				\
+-	-ldl
+	$(glib_LIBS)
+ 
+ shm_SOURCES = \
+ 	shm.c					\
+@@ -395,7 +394,7 @@ engine_LDADD = \
+ 	../common/libdconf-common.a		\
+ 	libdconf-mock.a				\
+ 	$(glib_LIBS)				\
+-	-ldl -lm
+	-lm
+ 
+ engine_SOURCES = engine.c
+ client_CFLAGS = $(gio_CFLAGS) -DSRCDIR=\"$(abs_srcdir)\"
--- a/devel/dconf/pkg/PLIST-editor
+++ b/devel/dconf/pkg/PLIST-editor
@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST-editor,v 1.7 2012/06/15 08:32:14 ajacoutot Exp $
+@comment $OpenBSD: PLIST-editor,v 1.8 2012/09/27 08:32:05 ajacoutot Exp $
@conflict dconf-<0.5.1p5
@bin bin/dconf-editor
 share/applications/dconf-editor.desktop
 share/dconf-editor/
+share/dconf-editor/dconf-editor-menu.ui
 share/dconf-editor/dconf-editor.ui
 share/glib-2.0/schemas/ca.desrt.dconf-editor.gschema.xml
 share/icons/hicolor/128x128/apps/dconf-editor.png
--- a/devel/dconf/pkg/PLIST-main
+++ b/devel/dconf/pkg/PLIST-main
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.5 2012/03/29 06:26:38 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.6 2012/09/27 08:32:05 ajacoutot Exp $
@conflict vala-<0.10
@pkgpath devel/dconf
@extraunexec rm -rf ${SYSCONFDIR}/dconf/db/*
@ -7,9 +7,11 @@
 include/dconf/
 include/dconf-dbus-1/
 include/dconf-dbus-1/dconf-dbus-1.h
-include/dconf/dconf-client.h
-include/dconf/dconf-engine.h
-include/dconf/dconf-paths.h
+include/dconf/client/
+include/dconf/client/dconf-client.h
+include/dconf/common/
+include/dconf/common/dconf-changeset.h
+include/dconf/common/dconf-paths.h
 include/dconf/dconf.h
 lib/gio/modules/libdconfsettings.so
@lib lib/libdconf-dbus-1.so.${LIBdconf-dbus-1_VERSION}
@ -17,29 +19,83 @@ lib/gio/modules/libdconfsettings.so
 lib/pkgconfig/dconf-dbus-1.pc
 lib/pkgconfig/dconf.pc
@bin libexec/dconf-service
+@man man/man1/dconf-editor.1
+@man man/man1/dconf-service.1
+@man man/man1/dconf.1
+@man man/man7/dconf.7
 share/dbus-1/services/ca.desrt.dconf.service
 share/examples/dconf/
 share/examples/dconf/bash_completion.d/
@sample ${SYSCONFDIR}/bash_completion.d/
-share/examples/dconf/bash_completion.d/dconf-bash-completion.sh
-@sample ${SYSCONFDIR}/bash_completion.d/dconf-bash-completion.sh
-share/gtk-doc/
-share/gtk-doc/html/
+share/examples/dconf/bash_completion.d/dconf
+@sample ${SYSCONFDIR}/bash_completion.d/dconf
 share/gtk-doc/html/dconf/
 share/gtk-doc/html/dconf/DConfClient.html
 share/gtk-doc/html/dconf/annotation-glossary.html
 share/gtk-doc/html/dconf/api-index-full.html
 share/gtk-doc/html/dconf/ch01.html
 share/gtk-doc/html/dconf/dconf-DConf-Paths.html
+share/gtk-doc/html/dconf/dconf-DConfChangeset.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
 share/gtk-doc/html/dconf/dconf.devhelp2
 share/gtk-doc/html/dconf/home.png
 share/gtk-doc/html/dconf/index.html
 share/gtk-doc/html/dconf/index.sgml
 share/gtk-doc/html/dconf/left.png
 share/gtk-doc/html/dconf/object-tree.html
+share/gtk-doc/html/dconf/programs.html
 share/gtk-doc/html/dconf/right.png
 share/gtk-doc/html/dconf/style.css
 share/gtk-doc/html/dconf/up.png
+share/locale/as/LC_MESSAGES/dconf.mo
+share/locale/be/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/fa/LC_MESSAGES/dconf.mo
+share/locale/fi/LC_MESSAGES/dconf.mo
+share/locale/fr/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/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/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/th/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/
 share/vala/vapi/
 share/vala/vapi/dconf.deps