Wed Aug 1 11:28:59 2012 UTC ()
update to 0.12.1
This switches to the current stable branch.


(drochner)
diff -r1.9 -r1.10 pkgsrc/devel/dconf/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/dconf/PLIST
diff -r1.3 -r1.4 pkgsrc/devel/dconf/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/dconf/patches/patch-editor_Makefile.in
cvs diff -r1.9 -r1.10 pkgsrc/devel/dconf/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/dconf/Makefile 2012/07/31 15:46:20 1.9
+++ pkgsrc/devel/dconf/Makefile 2012/08/01 11:28:59 1.10
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.9 2012/07/31 15:46:20 wiz Exp $ 1# $NetBSD: Makefile,v 1.10 2012/08/01 11:28:59 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.11.0 6DISTNAME= dconf-0.12.1
7CATEGORIES= devel 7CATEGORIES= devel
8MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dconf/0.11/} 8MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dconf/0.12/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://live.gnome.org/dconf 12HOMEPAGE= http://live.gnome.org/dconf
13COMMENT= Backend for gsettings 13COMMENT= Backend for gsettings
14LICENSE= gnu-lgpl-v2.1 14LICENSE= gnu-lgpl-v2.1
15 15
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17 17
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19CONFIGURE_ARGS+= --disable-editor 19CONFIGURE_ARGS+= --disable-editor
20USE_LIBTOOL= yes 20USE_LIBTOOL= yes
21USE_TOOLS+= pkg-config gmake 21USE_TOOLS+= pkg-config gmake
22 22
23PKGCONFIG_OVERRIDE+= client/dconf.pc.in dbus-1/dconf-dbus-1.pc.in 23PKGCONFIG_OVERRIDE+= client/dconf.pc.in dbus-1/dconf-dbus-1.pc.in
24 24
25BUILDLINK_DEPMETHOD.vala= build 25BUILDLINK_DEPMETHOD.vala= build
26.include "../../lang/vala/buildlink3.mk" 26.include "../../lang/vala016/buildlink3.mk"
27.include "../../devel/glib2/modules.mk" 27.include "../../devel/glib2/modules.mk"
28.include "../../sysutils/dbus/buildlink3.mk" 28.include "../../sysutils/dbus/buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/dconf/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/dconf/PLIST 2012/07/31 15:46:20 1.2
+++ pkgsrc/devel/dconf/PLIST 2012/08/01 11:28:59 1.3
@@ -1,21 +1,19 @@ @@ -1,21 +1,19 @@
1@comment $NetBSD: PLIST,v 1.2 2012/07/31 15:46:20 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.3 2012/08/01 11:28:59 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/dconf-client.h
5include/dconf/dconf-engine.h 5include/dconf/dconf-engine.h
6include/dconf/dconf-paths.h 6include/dconf/dconf-paths.h
7include/dconf/dconf-readtype.h 
8include/dconf/dconf-resetlist.h 
9include/dconf/dconf.h 7include/dconf/dconf.h
10lib/gio/modules/libdconfsettings.so 8lib/gio/modules/libdconfsettings.so
11lib/libdconf-dbus-1.so 9lib/libdconf-dbus-1.so
12lib/libdconf-dbus-1.so.0 10lib/libdconf-dbus-1.so.0
13lib/libdconf-dbus-1.so.0.0.0 11lib/libdconf-dbus-1.so.0.0.0
14lib/libdconf.so 12lib/libdconf.so
15lib/libdconf.so.0 13lib/libdconf.so.0
16lib/libdconf.so.0.0.0 14lib/libdconf.so.0.0.0
17lib/pkgconfig/dconf-dbus-1.pc 15lib/pkgconfig/dconf-dbus-1.pc
18lib/pkgconfig/dconf.pc 16lib/pkgconfig/dconf.pc
19libexec/dconf-service 17libexec/dconf-service
20share/bash-completion.d/dconf-bash-completion.sh 18share/bash-completion.d/dconf-bash-completion.sh
21share/dbus-1/services/ca.desrt.dconf.service 19share/dbus-1/services/ca.desrt.dconf.service
cvs diff -r1.3 -r1.4 pkgsrc/devel/dconf/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/dconf/distinfo 2012/07/31 15:46:20 1.3
+++ pkgsrc/devel/dconf/distinfo 2012/08/01 11:28:59 1.4
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.3 2012/07/31 15:46:20 wiz Exp $ 1$NetBSD: distinfo,v 1.4 2012/08/01 11:28:59 drochner Exp $
2 2
3SHA1 (dconf-0.11.0.tar.bz2) = d1d81af4901fe20d9e4c7840e4b562ef4a09dabb 3SHA1 (dconf-0.12.1.tar.xz) = 1bdbf53b2e699fe58f69fa7a42164351e8560e05
4RMD160 (dconf-0.11.0.tar.bz2) = e7d1a63019398bdd2f0b809dec32b43cdf048969 4RMD160 (dconf-0.12.1.tar.xz) = e9b0a54230e76e68470958d1ea115d9f3b99cda7
5Size (dconf-0.11.0.tar.bz2) = 211800 bytes 5Size (dconf-0.12.1.tar.xz) = 202112 bytes
6SHA1 (patch-bin_Makefile.in) = acf5ef1e506461e0968250e8a45e4113b087eee4 6SHA1 (patch-bin_Makefile.in) = acf5ef1e506461e0968250e8a45e4113b087eee4
7SHA1 (patch-editor_Makefile.in) = 47932981464911411b7a13f97231d7e741ce7f12 7SHA1 (patch-editor_Makefile.in) = eb444efc4a131e4c03e46d51b63b5d5f9cf84ad0
cvs diff -r1.1 -r1.2 pkgsrc/devel/dconf/patches/Attic/patch-editor_Makefile.in (expand / switch to unified diff)

--- pkgsrc/devel/dconf/patches/Attic/patch-editor_Makefile.in 2012/07/31 15:46:20 1.1
+++ pkgsrc/devel/dconf/patches/Attic/patch-editor_Makefile.in 2012/08/01 11:28:59 1.2
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: patch-editor_Makefile.in,v 1.1 2012/07/31 15:46:20 wiz Exp $ 1$NetBSD: patch-editor_Makefile.in,v 1.2 2012/08/01 11:28:59 drochner Exp $
2 2
3Adapt for pkgsrc split of dconf-editor into separate package. 3Adapt for pkgsrc split of dconf-editor into separate package.
4 4
5--- editor/Makefile.in.orig 2011-10-26 19:02:16.000000000 +0000 5--- editor/Makefile.in.orig 2012-05-01 05:09:12.000000000 +0000
6+++ editor/Makefile.in 6+++ editor/Makefile.in
7@@ -55,7 +55,7 @@ am_dconf_editor_OBJECTS = dconf-editor.$ 7@@ -55,7 +55,7 @@ am_dconf_editor_OBJECTS = dconf-editor.$
8 dconf-schema.$(OBJEXT) dconf-view.$(OBJEXT) 8 dconf-schema.$(OBJEXT) dconf-view.$(OBJEXT)
9 dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS) 9 dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS)
10 am__DEPENDENCIES_1 = 10 am__DEPENDENCIES_1 =
11-dconf_editor_DEPENDENCIES = ../client/libdconf.so.0 \ 11-dconf_editor_DEPENDENCIES = ../client/libdconf.so.0 \
12+dconf_editor_DEPENDENCIES = \ 12+dconf_editor_DEPENDENCIES = \
13 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ 13 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
14 $(am__DEPENDENCIES_1) 14 $(am__DEPENDENCIES_1)
15 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) 15 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
16@@ -225,7 +225,7 @@ top_builddir = @top_builddir@ 16@@ -232,7 +232,7 @@ top_builddir = @top_builddir@
17 top_srcdir = @top_srcdir@ 17 top_srcdir = @top_srcdir@
18 AM_CFLAGS = $(gtk_CFLAGS) $(gmodule_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client -DPKGDATADIR=\"@datadir@/dconf-editor\" 18 AM_CFLAGS = $(gtk_CFLAGS) $(gmodule_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client -DPKGDATADIR=\"@datadir@/dconf-editor\"
19 AM_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
20-dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS) 20-dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS)
21+dconf_editor_LDADD = $(prefix)/client/libdconf.so.0 $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS) 21+dconf_editor_LDADD = $(prefix)/lib/libdconf.so.0 $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS)
22 dconf_editor_SOURCES = config.vapi dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala 22 dconf_editor_SOURCES = config.vapi dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala
23 desktopdir = $(datadir)/applications 23 desktopdir = $(datadir)/applications
24 desktop_in_files = dconf-editor.desktop.in.in 24 desktop_in_files = dconf-editor.desktop.in.in