Tue Nov 6 18:51:46 2012 UTC ()
update to 0.14.1
this switches to a new release branch


(drochner)
diff -r1.13 -r1.14 pkgsrc/devel/dconf/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/dconf/PLIST
diff -r1.4 -r1.5 pkgsrc/devel/dconf/distinfo
diff -r0 -r1.3 pkgsrc/devel/dconf/patches/patch-aa
diff -r1.1 -r0 pkgsrc/devel/dconf/patches/patch-bin_Makefile.in
diff -r1.2 -r1.3 pkgsrc/devel/dconf/patches/patch-editor_Makefile.in
cvs diff -r1.13 -r1.14 pkgsrc/devel/dconf/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/dconf/Makefile 2012/10/31 11:16:51 1.13
+++ pkgsrc/devel/dconf/Makefile 2012/11/06 18:51:46 1.14
@@ -1,28 +1,35 @@ @@ -1,28 +1,35 @@
1# $NetBSD: Makefile,v 1.13 2012/10/31 11:16:51 asau Exp $ 1# $NetBSD: Makefile,v 1.14 2012/11/06 18:51:46 drochner Exp $
2# 2#
3# Attention: Update this only together with devel/dconf-editor 3# Attention: Update this only together with devel/dconf-editor
4# 4#
5 5
6DISTNAME= dconf-0.12.1 6DISTNAME= dconf-0.14.1
7PKGREVISION= 1 
8CATEGORIES= devel 7CATEGORIES= devel
9MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dconf/0.12/} 8MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dconf/0.14/}
10EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
11 10
12MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://live.gnome.org/dconf 12HOMEPAGE= http://live.gnome.org/dconf
14COMMENT= Backend for gsettings 13COMMENT= Backend for gsettings
15LICENSE= gnu-lgpl-v2.1 14LICENSE= gnu-lgpl-v2.1
16 15
17GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
18CONFIGURE_ARGS+= --disable-editor 17CONFIGURE_ARGS+= --disable-editor
19USE_LIBTOOL= yes 18USE_LIBTOOL= yes
20USE_TOOLS+= pkg-config gmake 19USE_TOOLS+= pkg-config gmake intltool
21 20
22PKGCONFIG_OVERRIDE+= client/dconf.pc.in dbus-1/dconf-dbus-1.pc.in 21PKGCONFIG_OVERRIDE+= client/dconf.pc.in dbus-1/dconf-dbus-1.pc.in
23 22
 23.include "../../mk/bsd.prefs.mk"
 24.if ${OPSYS} == "NetBSD"
 25BUILDLINK_TRANSFORM+= rm:-ldl
 26.endif
 27
 28BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
 29BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 30
24BUILDLINK_DEPMETHOD.vala= build 31BUILDLINK_DEPMETHOD.vala= build
25.include "../../lang/vala018/buildlink3.mk" 32.include "../../lang/vala018/buildlink3.mk"
26.include "../../devel/glib2/modules.mk" 33.include "../../devel/glib2/modules.mk"
27.include "../../sysutils/dbus/buildlink3.mk" 34.include "../../sysutils/dbus/buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/devel/dconf/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/dconf/PLIST 2012/08/01 11:28:59 1.3
+++ pkgsrc/devel/dconf/PLIST 2012/11/06 18:51:46 1.4
@@ -1,35 +1,94 @@ @@ -1,35 +1,94 @@
1@comment $NetBSD: PLIST,v 1.3 2012/08/01 11:28:59 drochner Exp $ 1@comment $NetBSD: PLIST,v 1.4 2012/11/06 18:51:46 drochner Exp $
2bin/dconf 2bin/dconf
3include/dconf-dbus-1/dconf-dbus-1.h 3include/dconf-dbus-1/dconf-dbus-1.h
4include/dconf/dconf-client.h 4include/dconf/client/dconf-client.h
5include/dconf/dconf-engine.h 5include/dconf/common/dconf-changeset.h
6include/dconf/dconf-paths.h 6include/dconf/common/dconf-paths.h
7include/dconf/dconf.h 7include/dconf/dconf.h
8lib/gio/modules/libdconfsettings.so 8lib/gio/modules/libdconfsettings.so
9lib/libdconf-dbus-1.so 9lib/libdconf-dbus-1.so
10lib/libdconf-dbus-1.so.0 10lib/libdconf-dbus-1.so.0
11lib/libdconf-dbus-1.so.0.0.0 11lib/libdconf-dbus-1.so.0.0.0
12lib/libdconf.so 12lib/libdconf.so
13lib/libdconf.so.0 13lib/libdconf.so.1
14lib/libdconf.so.0.0.0 14lib/libdconf.so.1.0.0
15lib/pkgconfig/dconf-dbus-1.pc 15lib/pkgconfig/dconf-dbus-1.pc
16lib/pkgconfig/dconf.pc 16lib/pkgconfig/dconf.pc
17libexec/dconf-service 17libexec/dconf-service
18share/bash-completion.d/dconf-bash-completion.sh 18man/man1/dconf-editor.1
 19man/man1/dconf-service.1
 20man/man1/dconf.1
 21man/man7/dconf.7
 22share/bash-completion/completions/dconf
19share/dbus-1/services/ca.desrt.dconf.service 23share/dbus-1/services/ca.desrt.dconf.service
20share/gtk-doc/html/dconf/DConfClient.html 24share/gtk-doc/html/dconf/DConfClient.html
21share/gtk-doc/html/dconf/annotation-glossary.html 25share/gtk-doc/html/dconf/annotation-glossary.html
22share/gtk-doc/html/dconf/api-index-full.html 26share/gtk-doc/html/dconf/api-index-full.html
23share/gtk-doc/html/dconf/ch01.html 27share/gtk-doc/html/dconf/ch01.html
24share/gtk-doc/html/dconf/dconf-DConf-Paths.html 28share/gtk-doc/html/dconf/dconf-DConf-Paths.html
 29share/gtk-doc/html/dconf/dconf-DConfChangeset.html
 30share/gtk-doc/html/dconf/dconf-editor.html
 31share/gtk-doc/html/dconf/dconf-overview.html
 32share/gtk-doc/html/dconf/dconf-service.html
 33share/gtk-doc/html/dconf/dconf-tool.html
25share/gtk-doc/html/dconf/dconf.devhelp2 34share/gtk-doc/html/dconf/dconf.devhelp2
26share/gtk-doc/html/dconf/home.png 35share/gtk-doc/html/dconf/home.png
27share/gtk-doc/html/dconf/index.html 36share/gtk-doc/html/dconf/index.html
28share/gtk-doc/html/dconf/index.sgml 37share/gtk-doc/html/dconf/index.sgml
29share/gtk-doc/html/dconf/left.png 38share/gtk-doc/html/dconf/left.png
30share/gtk-doc/html/dconf/object-tree.html 39share/gtk-doc/html/dconf/object-tree.html
 40share/gtk-doc/html/dconf/programs.html
31share/gtk-doc/html/dconf/right.png 41share/gtk-doc/html/dconf/right.png
32share/gtk-doc/html/dconf/style.css 42share/gtk-doc/html/dconf/style.css
33share/gtk-doc/html/dconf/up.png 43share/gtk-doc/html/dconf/up.png
 44share/locale/ar/LC_MESSAGES/dconf.mo
 45share/locale/as/LC_MESSAGES/dconf.mo
 46share/locale/be/LC_MESSAGES/dconf.mo
 47share/locale/bg/LC_MESSAGES/dconf.mo
 48share/locale/bn_IN/LC_MESSAGES/dconf.mo
 49share/locale/ca/LC_MESSAGES/dconf.mo
 50share/locale/ca@valencia/LC_MESSAGES/dconf.mo
 51share/locale/cs/LC_MESSAGES/dconf.mo
 52share/locale/da/LC_MESSAGES/dconf.mo
 53share/locale/de/LC_MESSAGES/dconf.mo
 54share/locale/el/LC_MESSAGES/dconf.mo
 55share/locale/en_GB/LC_MESSAGES/dconf.mo
 56share/locale/eo/LC_MESSAGES/dconf.mo
 57share/locale/es/LC_MESSAGES/dconf.mo
 58share/locale/et/LC_MESSAGES/dconf.mo
 59share/locale/fa/LC_MESSAGES/dconf.mo
 60share/locale/fi/LC_MESSAGES/dconf.mo
 61share/locale/fr/LC_MESSAGES/dconf.mo
 62share/locale/gl/LC_MESSAGES/dconf.mo
 63share/locale/he/LC_MESSAGES/dconf.mo
 64share/locale/hi/LC_MESSAGES/dconf.mo
 65share/locale/hu/LC_MESSAGES/dconf.mo
 66share/locale/id/LC_MESSAGES/dconf.mo
 67share/locale/it/LC_MESSAGES/dconf.mo
 68share/locale/ja/LC_MESSAGES/dconf.mo
 69share/locale/ko/LC_MESSAGES/dconf.mo
 70share/locale/lt/LC_MESSAGES/dconf.mo
 71share/locale/lv/LC_MESSAGES/dconf.mo
 72share/locale/ml/LC_MESSAGES/dconf.mo
 73share/locale/mr/LC_MESSAGES/dconf.mo
 74share/locale/nb/LC_MESSAGES/dconf.mo
 75share/locale/pa/LC_MESSAGES/dconf.mo
 76share/locale/pl/LC_MESSAGES/dconf.mo
 77share/locale/pt/LC_MESSAGES/dconf.mo
 78share/locale/pt_BR/LC_MESSAGES/dconf.mo
 79share/locale/ru/LC_MESSAGES/dconf.mo
 80share/locale/sk/LC_MESSAGES/dconf.mo
 81share/locale/sl/LC_MESSAGES/dconf.mo
 82share/locale/sr/LC_MESSAGES/dconf.mo
 83share/locale/sr@latin/LC_MESSAGES/dconf.mo
 84share/locale/sv/LC_MESSAGES/dconf.mo
 85share/locale/ta/LC_MESSAGES/dconf.mo
 86share/locale/te/LC_MESSAGES/dconf.mo
 87share/locale/th/LC_MESSAGES/dconf.mo
 88share/locale/uk/LC_MESSAGES/dconf.mo
 89share/locale/vi/LC_MESSAGES/dconf.mo
 90share/locale/zh_CN/LC_MESSAGES/dconf.mo
 91share/locale/zh_HK/LC_MESSAGES/dconf.mo
 92share/locale/zh_TW/LC_MESSAGES/dconf.mo
34share/vala/vapi/dconf.deps 93share/vala/vapi/dconf.deps
35share/vala/vapi/dconf.vapi 94share/vala/vapi/dconf.vapi
cvs diff -r1.4 -r1.5 pkgsrc/devel/dconf/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/dconf/distinfo 2012/08/01 11:28:59 1.4
+++ pkgsrc/devel/dconf/distinfo 2012/11/06 18:51:46 1.5
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.4 2012/08/01 11:28:59 drochner Exp $ 1$NetBSD: distinfo,v 1.5 2012/11/06 18:51:46 drochner Exp $
2 2
3SHA1 (dconf-0.12.1.tar.xz) = 1bdbf53b2e699fe58f69fa7a42164351e8560e05 3SHA1 (dconf-0.14.1.tar.xz) = 1983e832f03408ebb8544064604dd2d4379c47eb
4RMD160 (dconf-0.12.1.tar.xz) = e9b0a54230e76e68470958d1ea115d9f3b99cda7 4RMD160 (dconf-0.14.1.tar.xz) = 23daf76fa909950dbbaabb18f8a0dd58ee30c1f4
5Size (dconf-0.12.1.tar.xz) = 202112 bytes 5Size (dconf-0.14.1.tar.xz) = 291300 bytes
6SHA1 (patch-bin_Makefile.in) = acf5ef1e506461e0968250e8a45e4113b087eee4 6SHA1 (patch-aa) = 11e3582b976b4d60a5e096c8408e7b0aa6e1142e
7SHA1 (patch-editor_Makefile.in) = eb444efc4a131e4c03e46d51b63b5d5f9cf84ad0 7SHA1 (patch-editor_Makefile.in) = bb4da6a9b3aa2137e7dc1c43e0e7cfc8930e9c7a
File Added: pkgsrc/devel/dconf/patches/Attic/patch-aa
$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
File Deleted: pkgsrc/devel/dconf/patches/Attic/patch-bin_Makefile.in
cvs diff -r1.2 -r1.3 pkgsrc/devel/dconf/patches/Attic/patch-editor_Makefile.in (expand / switch to unified diff)

--- pkgsrc/devel/dconf/patches/Attic/patch-editor_Makefile.in 2012/08/01 11:28:59 1.2
+++ pkgsrc/devel/dconf/patches/Attic/patch-editor_Makefile.in 2012/11/06 18:51:46 1.3
@@ -1,24 +1,22 @@ @@ -1,24 +1,22 @@
1$NetBSD: patch-editor_Makefile.in,v 1.2 2012/08/01 11:28:59 drochner Exp $ 1$NetBSD: patch-editor_Makefile.in,v 1.3 2012/11/06 18:51:46 drochner Exp $
2 2
3Adapt for pkgsrc split of dconf-editor into separate package. 3--- editor/Makefile.in.orig 2012-11-01 15:09:26.000000000 +0000
4 
5--- editor/Makefile.in.orig 2012-05-01 05:09:12.000000000 +0000 
6+++ editor/Makefile.in 4+++ editor/Makefile.in
7@@ -55,7 +55,7 @@ am_dconf_editor_OBJECTS = dconf-editor.$ 5@@ -72,7 +72,7 @@ am_dconf_editor_OBJECTS = dconf_editor-d
8 dconf-schema.$(OBJEXT) dconf-view.$(OBJEXT) 6 dconf_editor-dconf-view.$(OBJEXT)
9 dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS) 7 dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS)
10 am__DEPENDENCIES_1 = 8 am__DEPENDENCIES_1 =
11-dconf_editor_DEPENDENCIES = ../client/libdconf.so.0 \ 9-dconf_editor_DEPENDENCIES = ../client/libdconf.so.1 \
12+dconf_editor_DEPENDENCIES = \ 10+dconf_editor_DEPENDENCIES = \
13 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ 11 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
14 $(am__DEPENDENCIES_1) 12 $(am__DEPENDENCIES_1)
15 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) 13 dconf_editor_LINK = $(CCLD) $(dconf_editor_CFLAGS) $(CFLAGS) \
16@@ -232,7 +232,7 @@ top_builddir = @top_builddir@ 14@@ -297,7 +297,7 @@ TEST_PROGS =
17 top_srcdir = @top_srcdir@ 15 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/client
18 AM_CFLAGS = $(gtk_CFLAGS) $(gmodule_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client -DPKGDATADIR=\"@datadir@/dconf-editor\" 16 dconf_editor_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf
19 AM_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf 17 dconf_editor_LDADD = \
20-dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS) 18- ../client/libdconf.so.1 \
21+dconf_editor_LDADD = $(prefix)/lib/libdconf.so.0 $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS) 19+ $(prefix)/lib/libdconf.so.0 \
22 dconf_editor_SOURCES = config.vapi dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala 20 $(gtk_LIBS) \
23 desktopdir = $(datadir)/applications 21 $(gee_LIBS) \
24 desktop_in_files = dconf-editor.desktop.in.in 22 $(gmodule_LIBS) \