update to 0.12.1

This switches to the current stable branch.

4 files changed, 15 insertions, 17 deletions

diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 95f46e20fe3..98632ab9f3a 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.9 2012/07/31 15:46:20 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2012/08/01 11:28:59 drochner Exp $
 #
 # Attention: Update this only together with devel/dconf-editor
 #
 
-DISTNAME=	dconf-0.11.0
+DISTNAME=	dconf-0.12.1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dconf/0.11/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dconf/0.12/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://live.gnome.org/dconf
@@ -23,7 +23,7 @@ USE_TOOLS+=	pkg-config gmake
 PKGCONFIG_OVERRIDE+=	client/dconf.pc.in dbus-1/dconf-dbus-1.pc.in
 
 BUILDLINK_DEPMETHOD.vala= build
-.include "../../lang/vala/buildlink3.mk"
+.include "../../lang/vala016/buildlink3.mk"
 .include "../../devel/glib2/modules.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/dconf/PLIST b/devel/dconf/PLIST
index 50ead2f75c5..706e9c09ca9 100644
--- a/devel/dconf/PLIST
+++ b/devel/dconf/PLIST
@@ -1,11 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2012/07/31 15:46:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/08/01 11:28:59 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/dconf-readtype.h
-include/dconf/dconf-resetlist.h
 include/dconf/dconf.h
 lib/gio/modules/libdconfsettings.so
 lib/libdconf-dbus-1.so
diff --git a/devel/dconf/distinfo b/devel/dconf/distinfo
index d5cbdd518d1..84ea407bbe7 100644
--- a/devel/dconf/distinfo
+++ b/devel/dconf/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2012/07/31 15:46:20 wiz Exp $
+$NetBSD: distinfo,v 1.4 2012/08/01 11:28:59 drochner Exp $
 
-SHA1 (dconf-0.11.0.tar.bz2) = d1d81af4901fe20d9e4c7840e4b562ef4a09dabb
-RMD160 (dconf-0.11.0.tar.bz2) = e7d1a63019398bdd2f0b809dec32b43cdf048969
-Size (dconf-0.11.0.tar.bz2) = 211800 bytes
+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) = 47932981464911411b7a13f97231d7e741ce7f12
+SHA1 (patch-editor_Makefile.in) = eb444efc4a131e4c03e46d51b63b5d5f9cf84ad0
diff --git a/devel/dconf/patches/patch-editor_Makefile.in b/devel/dconf/patches/patch-editor_Makefile.in
index 85acdd110fa..c77b7ae9ccf 100644
--- a/devel/dconf/patches/patch-editor_Makefile.in
+++ b/devel/dconf/patches/patch-editor_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-editor_Makefile.in,v 1.1 2012/07/31 15:46:20 wiz Exp $
+$NetBSD: patch-editor_Makefile.in,v 1.2 2012/08/01 11:28:59 drochner Exp $
 
 Adapt for pkgsrc split of dconf-editor into separate package.
 
---- editor/Makefile.in.orig	2011-10-26 19:02:16.000000000 +0000
+--- editor/Makefile.in.orig	2012-05-01 05:09:12.000000000 +0000
 +++ editor/Makefile.in
 @@ -55,7 +55,7 @@ am_dconf_editor_OBJECTS = dconf-editor.$
  	dconf-schema.$(OBJEXT) dconf-view.$(OBJEXT)
@@ -13,12 +13,12 @@ Adapt for pkgsrc split of dconf-editor into separate package.
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-@@ -225,7 +225,7 @@ top_builddir = @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)/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