From 95cb28e52c3a6d313b61ecd5b359bd567942d47b Mon Sep 17 00:00:00 2001 From: Stanislav Sedov Date: Thu, 12 Feb 2009 18:34:49 +0000 Subject: [PATCH] - Make gconf dependency optional by knob. Approved by: gnome (marcus) --- devel/libgsf/Makefile | 11 +++++++++-- devel/libgsf/pkg-plist | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index 147844c249a6..ff0742830189 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -24,7 +24,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes -USE_GNOME?= gnomehack gnomeprefix glib20 libxml2 gconf2 ltverhack intlhack +USE_GNOME?= gnomehack gnomeprefix glib20 libxml2 ltverhack intlhack USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS?=--without-gnome-vfs --without-python --with-gio \ --without-bonobo @@ -32,8 +32,15 @@ CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" .if !defined(GSF_SLAVE) -GCONF_SCHEMAS= gsf-office-thumbnailer.schemas MAN1= gsf.1 gsf-office-thumbnailer.1 gsf-vba-dump.1 .endif +.if !defined(WITHOUT_GCONF) || exists(${LOCALBASE}/bin/gconftool-2) +USE_GNOME+= gconf2 +PLIST_SUB+= THUMB="" +GCONF_SCHEMAS= gsf-office-thumbnailer.schemas +.else +PLIST_SUB+= THUMB="@comment " +.endif + .include diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist index 99a0e886b406..a77cad2f4ca3 100644 --- a/devel/libgsf/pkg-plist +++ b/devel/libgsf/pkg-plist @@ -1,5 +1,5 @@ bin/gsf -bin/gsf-office-thumbnailer +%%THUMB%%bin/gsf-office-thumbnailer bin/gsf-vba-dump include/libgsf-1/gsf/gsf-blob.h include/libgsf-1/gsf/gsf-clip-data.h