From 367d281f8c15050a85c1aeb1678d3974d2dc4349 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Fri, 11 Nov 2011 11:39:13 +0000
Subject: [PATCH] convert dconf to bsd.port.arch.mk recognize small build
 needed for boostrapping

---
 devel/dconf/Makefile      | 15 ++++++++-------
 devel/dconf/dconf.port.mk |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 10421cb2cd8..1bbbc13a371 100755
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2011/11/03 22:13:23 jasper Exp $
+# $OpenBSD: Makefile,v 1.34 2011/11/11 11:39:13 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -42,9 +42,9 @@ WANTLIB-editor += expat fontconfig freetype gdk-3 gdk_pixbuf-2.0
 WANTLIB-editor += gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
 WANTLIB-editor += png pthread-stubs xcb xcb-render xcb-shm xml2 z dconf
 
-MULTI_PACKAGES=	-main
+MULTI_PACKAGES=	-main -editor
 
-PSEUDO_FLAVORS=	no_editor
+PSEUDO_FLAVORS=	no_editor bootstrap
 FLAVOR?=
 
 MODULES=	devel/gettext \
@@ -69,11 +69,12 @@ MODGNOME_LDFLAGS=	-pthread
 
 FAKE_FLAGS=	completiondir=${PREFIX}/share/examples/dconf/bash_completion.d
 
-.if ${FLAVOR:L:Mno_editor}
-CONFIGURE_ARGS +=	--disable-editor
-.else
-MULTI_PACKAGES +=	-editor
+.include <bsd.port.arch.mk>
+
+.if ${BUILD_PACKAGES:M-editor}
 CONFIGURE_ARGS +=	--enable-editor
+.else
+CONFIGURE_ARGS +=	--disable-editor
 .endif
 
 pre-configure:
diff --git a/devel/dconf/dconf.port.mk b/devel/dconf/dconf.port.mk
index e9e467051ee..256d8d1eb74 100644
--- a/devel/dconf/dconf.port.mk
+++ b/devel/dconf/dconf.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: dconf.port.mk,v 1.3 2011/05/28 08:15:33 ajacoutot Exp $
+# $OpenBSD: dconf.port.mk,v 1.4 2011/11/11 11:39:13 espie Exp $
 
 # This module is used by ports installing gsettings schemas under
 #     PREFIX/share/glib-2.0/schemas/
@@ -10,7 +10,7 @@
 # use the "no_editor" FLAVOR to prevent a cyclic dependency
 MODDCONF_BUILD_DEPENDS=	devel/glib2
 MODDCONF_RUN_DEPENDS=	devel/glib2 \
-			devel/dconf,no_editor
+			devel/dconf,no_editor,bootstrap
 
 BUILD_DEPENDS +=	${MODDCONF_BUILD_DEPENDS}
 RUN_DEPENDS +=		${MODDCONF_RUN_DEPENDS}