From 979bcdfa52a2cd6afb5252a08570a4ef4b16a046 Mon Sep 17 00:00:00 2001
From: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Sat, 2 Jul 2011 06:02:22 +0000
Subject: Make the dconf-editor an option. Dconf is pulled in by gconf2. This
 option allows users to avoid gtk3.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16097 df743ca5-7f9a-e211-a948-0013205c9059
---
 devel/dconf/Makefile  | 16 ++++++++++++++--
 devel/dconf/pkg-plist |  6 +++---
 2 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'devel/dconf')

diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 9b5883c97..f1f6e3486 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/dconf/Makefile,v 1.22 2011/05/09 17:53:48 kwm Exp $
+#   $MCom: ports/devel/dconf/Makefile,v 1.23 2011/06/11 19:51:13 mezz Exp $
 #
 
 PORTNAME=	dconf
@@ -21,13 +21,25 @@ LIB_DEPENDS=	gee.2:${PORTSDIR}/devel/libgee \
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gtk20 gtk30
+USE_GNOME=	gnomehack glib20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+
+OPTIONS=	EDITOR "Build the dconf editor (requires Gtk+3)" On
+
+.include <bsd.port.options.mk>
+
+.if defined(WITHOUT_EDITOR)
+CONFIGURE_ARGS+=--disable-editor
+PLIST_SUB+=	EDITOR="@comment "
+.else
+USE_GNOME+=	gtk30
 GLIB_SCHEMAS=	ca.desrt.dconf-editor.gschema.xml
+PLIST_SUB+=	EDITOR=""
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
diff --git a/devel/dconf/pkg-plist b/devel/dconf/pkg-plist
index e79f28311..0d8bcf386 100644
--- a/devel/dconf/pkg-plist
+++ b/devel/dconf/pkg-plist
@@ -1,5 +1,5 @@
 bin/dconf
-bin/dconf-editor
+%%EDITOR%%bin/dconf-editor
 etc/bash_completion.d/dconf-bash-completion.sh
 include/dconf/dconf-client.h
 include/dconf-dbus-1/dconf-dbus-1.h
@@ -16,10 +16,10 @@ lib/libdconf-dbus-1.so.0
 libdata/pkgconfig/dconf.pc
 libdata/pkgconfig/dconf-dbus-1.pc
 libexec/dconf-service
-share/applications/dconf-editor.desktop
+%%EDITOR%%share/applications/dconf-editor.desktop
 share/dbus-1/services/ca.desrt.dconf.service
 share/dbus-1/system-services/ca.desrt.dconf.service
-share/dconf-editor/dconf-editor.ui
+%%EDITOR%%share/dconf-editor/dconf-editor.ui
 share/gtk-doc/html/dconf/DConfClient.html
 share/gtk-doc/html/dconf/dconf-DConf-Paths.html
 share/gtk-doc/html/dconf/annotation-glossary.html
-- 
cgit