update to 0.14.1

this switches to a new release branch

6 files changed, 112 insertions, 50 deletions

diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index a9a37fb7ff9..d765dfced40 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2012/10/31 11:16:51 asau Exp $
+# $NetBSD: Makefile,v 1.14 2012/11/06 18:51:46 drochner Exp $
 #
 # Attention: Update this only together with devel/dconf-editor
 #
 
-DISTNAME=	dconf-0.12.1
-PKGREVISION=	1
+DISTNAME=	dconf-0.14.1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dconf/0.12/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dconf/0.14/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -17,10 +16,18 @@ LICENSE=	gnu-lgpl-v2.1
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --disable-editor
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config gmake
+USE_TOOLS+=	pkg-config gmake intltool
 
 PKGCONFIG_OVERRIDE+=	client/dconf.pc.in dbus-1/dconf-dbus-1.pc.in
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "NetBSD"
+BUILDLINK_TRANSFORM+=   rm:-ldl
+.endif
+
+BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
+BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+
 BUILDLINK_DEPMETHOD.vala= build
 .include "../../lang/vala018/buildlink3.mk"
 .include "../../devel/glib2/modules.mk"
diff --git a/devel/dconf/PLIST b/devel/dconf/PLIST
index 706e9c09ca9..7ce1ae0fcb6 100644
--- a/devel/dconf/PLIST
+++ b/devel/dconf/PLIST
@@ -1,35 +1,94 @@
-@comment $NetBSD: PLIST,v 1.3 2012/08/01 11:28:59 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/11/06 18:51:46 drochner Exp $
 bin/dconf
 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/dconf-client.h
+include/dconf/common/dconf-changeset.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.0
-lib/libdconf.so.0.0.0
+lib/libdconf.so.1
+lib/libdconf.so.1.0.0
 lib/pkgconfig/dconf-dbus-1.pc
 lib/pkgconfig/dconf.pc
 libexec/dconf-service
-share/bash-completion.d/dconf-bash-completion.sh
+man/man1/dconf-editor.1
+man/man1/dconf-service.1
+man/man1/dconf.1
+man/man7/dconf.7
+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-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/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/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/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/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/vapi/dconf.deps
 share/vala/vapi/dconf.vapi
diff --git a/devel/dconf/distinfo b/devel/dconf/distinfo
index 84ea407bbe7..9a662ae8987 100644
--- a/devel/dconf/distinfo
+++ b/devel/dconf/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2012/08/01 11:28:59 drochner Exp $
+$NetBSD: distinfo,v 1.5 2012/11/06 18:51:46 drochner Exp $
 
-SHA1 (dconf-0.12.1.tar.xz) = 1bdbf53b2e699fe58f69fa7a42164351e8560e05
-RMD160 (dconf-0.12.1.tar.xz) = e9b0a54230e76e68470958d1ea115d9f3b99cda7
-Size (dconf-0.12.1.tar.xz) = 202112 bytes
-SHA1 (patch-bin_Makefile.in) = acf5ef1e506461e0968250e8a45e4113b087eee4
-SHA1 (patch-editor_Makefile.in) = eb444efc4a131e4c03e46d51b63b5d5f9cf84ad0
+SHA1 (dconf-0.14.1.tar.xz) = 1983e832f03408ebb8544064604dd2d4379c47eb
+RMD160 (dconf-0.14.1.tar.xz) = 23daf76fa909950dbbaabb18f8a0dd58ee30c1f4
+Size (dconf-0.14.1.tar.xz) = 291300 bytes
+SHA1 (patch-aa) = 11e3582b976b4d60a5e096c8408e7b0aa6e1142e
+SHA1 (patch-editor_Makefile.in) = bb4da6a9b3aa2137e7dc1c43e0e7cfc8930e9c7a
diff --git a/devel/dconf/patches/patch-aa b/devel/dconf/patches/patch-aa
new file mode 100644
index 00000000000..caac9e4d549
--- /dev/null
+++ b/devel/dconf/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2012/11/06 18:51:46 drochner Exp $
+
+--- configure.orig	2012-11-01 15:09:26.000000000 +0000
++++ configure
+@@ -5303,7 +5303,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-bin_Makefile.in b/devel/dconf/patches/patch-bin_Makefile.in
deleted file mode 100644
index c2fcc52d8de..00000000000
--- a/devel/dconf/patches/patch-bin_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bin_Makefile.in,v 1.1 2012/07/31 15:46:20 wiz Exp $
-
-Adapt bash completion file path for pkgsrc.
-
---- bin/Makefile.in.orig	2012-07-31 15:35:54.000000000 +0000
-+++ bin/Makefile.in
-@@ -226,7 +226,7 @@ INCLUDES = -I$(top_srcdir)/common -I$(to
- dconf_VALAFLAGS = --vapidir ../client --pkg=gio-2.0 --pkg=posix --pkg=dconf
- dconf_LDADD = $(gio_LIBS) ../client/libdconf.so.0
- dconf_SOURCES = dconf.vala dconf-update.vala dconf-dump.vala ../gvdb/gvdb-builder.c gvdb.vapi
--completiondir = $(sysconfdir)/bash_completion.d
-+completiondir = $(prefix)/share/bash-completion.d
- completion_DATA = dconf-bash-completion.sh
- EXTRA_DIST = $(completion_DATA)
- all: all-am
diff --git a/devel/dconf/patches/patch-editor_Makefile.in b/devel/dconf/patches/patch-editor_Makefile.in
index c77b7ae9ccf..48946ef6e88 100644
--- a/devel/dconf/patches/patch-editor_Makefile.in
+++ b/devel/dconf/patches/patch-editor_Makefile.in
@@ -1,24 +1,22 @@
-$NetBSD: patch-editor_Makefile.in,v 1.2 2012/08/01 11:28:59 drochner Exp $
+$NetBSD: patch-editor_Makefile.in,v 1.3 2012/11/06 18:51:46 drochner Exp $
 
-Adapt for pkgsrc split of dconf-editor into separate package.
-
---- editor/Makefile.in.orig	2012-05-01 05:09:12.000000000 +0000
+--- editor/Makefile.in.orig	2012-11-01 15:09:26.000000000 +0000
 +++ editor/Makefile.in
-@@ -55,7 +55,7 @@ am_dconf_editor_OBJECTS = dconf-editor.$
- 	dconf-schema.$(OBJEXT) dconf-view.$(OBJEXT)
+@@ -72,7 +72,7 @@ am_dconf_editor_OBJECTS = dconf_editor-d
+ 	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 = \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-@@ -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 = $(prefix)/lib/libdconf.so.0 $(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		\
++	$(prefix)/lib/libdconf.so.0	\
+ 	$(gtk_LIBS)			\
+ 	$(gee_LIBS)			\
+ 	$(gmodule_LIBS)			\