build dconf's editor GUI (in an extra pkg to limit dependencies)

9 files changed, 102 insertions, 4 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 84a9e59e12a..02cdb67f51f 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1418 2011/01/11 20:45:54 drochner Exp $
+# $NetBSD: Makefile,v 1.1419 2011/01/12 13:52:09 drochner Exp $
 #
 
 COMMENT=	Development utilities
@@ -141,6 +141,7 @@ SUBDIR+=	cxref
 SUBDIR+=	darcs
 SUBDIR+=	darts
 SUBDIR+=	dconf
+SUBDIR+=	dconf-editor
 SUBDIR+=	ddd
 SUBDIR+=	dejagnu
 SUBDIR+=	dev86
diff --git a/devel/dconf-editor/DESCR b/devel/dconf-editor/DESCR
new file mode 100644
index 00000000000..4ecd2a6f734
--- /dev/null
+++ b/devel/dconf-editor/DESCR
@@ -0,0 +1,3 @@
+dconf is a low-level configuration system. Its main purpose is
+to provide a backend to GSettings on platforms that don't already
+have configuration storage systems.
diff --git a/devel/dconf-editor/Makefile b/devel/dconf-editor/Makefile
new file mode 100644
index 00000000000..0eef809180e
--- /dev/null
+++ b/devel/dconf-editor/Makefile
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile,v 1.1 2011/01/12 13:52:10 drochner Exp $
+#
+
+DISTNAME=	dconf-0.5.1
+PKGNAME=	dconf-editor-0.5.1
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dconf/0.5/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://live.gnome.org/dconf
+COMMENT=	Backend for gsettings
+#LICENSE=	# TODO: (see mk/license.mk)
+
+DISTINFO_FILE=	${.CURDIR}/../../devel/dconf/distinfo
+PATCHDIR=	${.CURDIR}/../../devel/dconf/patches
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+= --enable-editor
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config gmake
+
+BUILD_DIRS=	editor
+INSTALL_DIRS=	editor
+
+SUBST_CLASSES+=	prefix
+SUBST_STAGE.prefix=	pre-configure
+SUBST_FILES.prefix=	editor/dconf-model.vala
+SUBST_VARS.prefix=	PREFIX
+BUILD_DEPENDS+=	vala-[0-9]*:../../lang/vala
+
+# SUBST doesn't touch - force rebuild
+pre-build:
+	${RM} ${WRKSRC}/editor/dconf-model.c
+
+.include "../../devel/dconf/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/dconf-editor/PLIST b/devel/dconf-editor/PLIST
new file mode 100644
index 00000000000..ff1cf92ae83
--- /dev/null
+++ b/devel/dconf-editor/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2011/01/12 13:52:10 drochner Exp $
+bin/dconf-editor
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 26531a1f5f1..0536e5c44a0 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/11/17 14:35:32 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2011/01/12 13:52:09 drochner Exp $
 #
 
 DISTNAME=	dconf-0.5.1
@@ -16,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --disable-editor
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	pkg-config gmake
 
 PKGCONFIG_OVERRIDE+=	client/dconf.pc.in
 
diff --git a/devel/dconf/buildlink3.mk b/devel/dconf/buildlink3.mk
new file mode 100644
index 00000000000..2660210c760
--- /dev/null
+++ b/devel/dconf/buildlink3.mk
@@ -0,0 +1,14 @@
+# $NetBSD: buildlink3.mk,v 1.1 2011/01/12 13:52:10 drochner Exp $
+
+BUILDLINK_TREE+=	dconf
+
+.if !defined(DCONF_BUILDLINK3_MK)
+DCONF_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.dconf+=	dconf>=0.5.1
+BUILDLINK_PKGSRCDIR.dconf?=	../../devel/dconf
+
+.include "../../devel/glib2/buildlink3.mk"
+.endif	# DCONF_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-dconf
diff --git a/devel/dconf/distinfo b/devel/dconf/distinfo
index 262ea234bd4..7253fd527e9 100644
--- a/devel/dconf/distinfo
+++ b/devel/dconf/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/11/16 19:47:07 drochner Exp $
+$NetBSD: distinfo,v 1.2 2011/01/12 13:52:10 drochner Exp $
 
 SHA1 (dconf-0.5.1.tar.bz2) = 4e1dab1f744aad0bff1896ac6f288ad6a9dfece8
 RMD160 (dconf-0.5.1.tar.bz2) = ebc02b010a44d78ac48dc1c4426cc723430b3016
 Size (dconf-0.5.1.tar.bz2) = 251287 bytes
 SHA1 (patch-aa) = 4e0ca83a57cae340cb0f661e36a4af4e772ae91b
 SHA1 (patch-ab) = c9878b23be5bf4b2305aae6318026cd081c674ce
+SHA1 (patch-ac) = 44a5e59474a26d42398dcbb099110f917492829a
+SHA1 (patch-ad) = 9e7b4dd33c755225562a6747ade1ce628e2f9125
diff --git a/devel/dconf/patches/patch-ac b/devel/dconf/patches/patch-ac
new file mode 100644
index 00000000000..7743626438c
--- /dev/null
+++ b/devel/dconf/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2011/01/12 13:52:10 drochner Exp $
+
+--- editor/Makefile.in.orig	2010-09-15 20:11:43.000000000 +0000
++++ editor/Makefile.in
+@@ -50,7 +50,7 @@ am_dconf_editor_OBJECTS = dconf-editor.$
+ 	dconf-schema.$(OBJEXT) dconf-view.$(OBJEXT)
+ dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS)
+ am__DEPENDENCIES_1 =
+-dconf_editor_DEPENDENCIES = ../client/libdconf.so.0 \
++dconf_editor_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/aux/depcomp
+@@ -194,7 +194,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = $(gtk_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client
+ AM_VALAFLAGS = --vapidir ../client --pkg gtk+-2.0 --pkg libxml-2.0 --pkg dconf
+-dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gee_LIBS) $(libxml_LIBS)
++dconf_editor_LDADD = $(prefix)/lib/libdconf.so.0 $(gtk_LIBS) $(gee_LIBS) $(libxml_LIBS)
+ dconf_editor_SOURCES = dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala
+ all: all-am
+ 
diff --git a/devel/dconf/patches/patch-ad b/devel/dconf/patches/patch-ad
new file mode 100644
index 00000000000..ab8cbbb264d
--- /dev/null
+++ b/devel/dconf/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2011/01/12 13:52:10 drochner Exp $
+
+--- editor/dconf-model.vala.orig	2010-09-15 13:34:58.000000000 +0000
++++ editor/dconf-model.vala
+@@ -469,7 +469,7 @@ public class SettingsModel: GLib.Object,
+         schemas = new SchemaList();
+         try
+         {
+-            schemas.load_directory("/usr/share/glib-2.0/schemas");
++            schemas.load_directory("@PREFIX@/share/glib-2.0/schemas");
+         } catch (Error e) {
+             warning("Failed to parse schemas: %s", e.message);
+         }