Make GConf dependency optional, based on patch from David Demelier

in PR 42878.

3 files changed, 14 insertions, 11 deletions

diff --git a/chat/libpurple/Makefile b/chat/libpurple/Makefile
index 9f026973dbc..208de1fea89 100644
--- a/chat/libpurple/Makefile
+++ b/chat/libpurple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2010/02/10 19:17:33 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/02/26 09:48:56 wiz Exp $
 #
 
 PKGNAME=	libpurple-${PIDGIN_VERSION}
@@ -14,8 +14,6 @@ MAKE_ENV+=		GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
 
 USE_TOOLS+=		msgfmt intltool
 
-GCONF_SCHEMAS+=	purple.schemas
-
 PKGCONFIG_OVERRIDE+=	gaim.pc.in
 PKGCONFIG_OVERRIDE+=	libpurple/purple.pc.in
 
@@ -29,7 +27,6 @@ BUILD_DIRS=	m4macros libpurple po share/ca-certs share/sounds
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/GConf/schemas.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/libpurple/PLIST b/chat/libpurple/PLIST
index aed21de3351..ec06d029cd6 100644
--- a/chat/libpurple/PLIST
+++ b/chat/libpurple/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2009/12/08 12:45:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2010/02/26 09:48:56 wiz Exp $
 include/libpurple/account.h
 include/libpurple/accountopt.h
 include/libpurple/blist.h
@@ -94,7 +94,7 @@ lib/purple-2/ssl.la
 lib/purple-2/statenotify.la
 ${PLIST.tcl}lib/purple-2/tcl.la
 share/aclocal/purple.m4
-share/gconf/schemas/purple.schemas
+${PLIST.gnome}share/gconf/schemas/purple.schemas
 share/locale/af/LC_MESSAGES/pidgin.mo
 share/locale/am/LC_MESSAGES/pidgin.mo
 share/locale/ar/LC_MESSAGES/pidgin.mo
diff --git a/chat/libpurple/options.mk b/chat/libpurple/options.mk
index 7620cbc67e1..6b1ec63e686 100644
--- a/chat/libpurple/options.mk
+++ b/chat/libpurple/options.mk
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.12 2009/12/08 12:45:42 wiz Exp $
+# $NetBSD: options.mk,v 1.13 2010/02/26 09:48:56 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.libpurple
-PKG_SUPPORTED_OPTIONS+=		gnutls perl tcl debug dbus sasl avahi
-PKG_SUPPORTED_OPTIONS+=		farsight gstreamer
-PKG_SUGGESTED_OPTIONS+=		gnutls dbus avahi farsight gstreamer
+PKG_SUPPORTED_OPTIONS+=		avahi dbus debug farsight gnome gnutls
+PKG_SUPPORTED_OPTIONS+=		gstreamer perl sasl tcl
+PKG_SUGGESTED_OPTIONS+=		avahi dbus farsight gnome gnutls gstreamer
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		avahi dbus gnutls nss perl tcl
+PLIST_VARS+=		avahi dbus gnome gnutls nss perl tcl
 
 .if !empty(PKG_OPTIONS:Mavahi)
 PLIST.avahi=            yes
@@ -15,6 +15,12 @@ CONFIGURE_ARGS+=	--enable-avahi
 .  include "../../net/avahi/buildlink3.mk"
 .endif
 
+.if !empty(PKG_OPTIONS:Mgnome)
+PLIST.gnome= 		yes
+.  include "../../devel/GConf/schemas.mk"
+GCONF_SCHEMAS+=		purple.schemas
+.endif
+
 .if !empty(PKG_OPTIONS:Mgnutls)
 PLIST.gnutls=		yes
 CONFIGURE_ARGS+=	--enable-gnutls