From owner-freebsd-gnome@FreeBSD.ORG Thu Feb 12 17:59:10 2009 Return-Path: Delivered-To: gnome@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C46081065742 for ; Thu, 12 Feb 2009 17:59:10 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from mx0.deglitch.com (backbone.deglitch.com [IPv6:2001:16d8:fffb:4::abba]) by mx1.freebsd.org (Postfix) with ESMTP id 6EEAC8FC14 for ; Thu, 12 Feb 2009 17:59:10 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from DSPAM-Daemon (localhost [127.0.0.1]) by mx0.deglitch.com (Postfix) with SMTP id 535BB8FC26 for ; Thu, 12 Feb 2009 20:59:09 +0300 (MSK) Received: from orion.SpringDaemons.com (unknown [85.21.245.235]) by mx0.deglitch.com (Postfix) with ESMTPA id D8EC18FC1D for ; Thu, 12 Feb 2009 20:59:08 +0300 (MSK) Received: from orion (localhost [127.0.0.1]) by orion.SpringDaemons.com (Postfix) with SMTP id 4305A39B1B for ; Thu, 12 Feb 2009 20:59:32 +0300 (MSK) Date: Thu, 12 Feb 2009 20:59:32 +0300 From: Stanislav Sedov To: gnome@FreeBSD.org Message-Id: <20090212205932.b8c9ab3e.stas@FreeBSD.org> Organization: The FreeBSD Project X-XMPP: ssedov@jabber.ru X-Voice: +7 916 849 20 23 X-PGP-Fingerprint: F21E D6CC 5626 9609 6CE2 A385 2BF5 5993 EB26 9581 X-Mailer: carrier-pigeon Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-DSPAM-Result: Innocent X-DSPAM-Processed: Thu Feb 12 20:59:09 2009 X-DSPAM-Confidence: 1.0000 X-DSPAM-Improbability: 1 in 98689409 chance of being spam X-DSPAM-Probability: 0.0023 X-DSPAM-Signature: 4994636d967001887442476 Cc: Subject: [PATCH]: libgsf - make gconf optional X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Feb 2009 17:59:11 -0000 Hi! gconf2 isn't strictly required for libgsf (only the thumbnailer need it). The patch attached makes thumbnailer optional. Can you, please, review? Thanks! Index: Makefile =================================================================== RCS file: /home/pcvs/ports/devel/libgsf/Makefile,v retrieving revision 1.46 diff -u -r1.46 Makefile --- Makefile 10 Jan 2009 05:21:24 -0000 1.46 +++ Makefile 12 Feb 2009 17:58:38 -0000 @@ -24,7 +24,7 @@ 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 @@ 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 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/devel/libgsf/pkg-plist,v retrieving revision 1.24 diff -u -r1.24 pkg-plist --- pkg-plist 10 Jan 2009 05:21:25 -0000 1.24 +++ pkg-plist 12 Feb 2009 17:58:38 -0000 @@ -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 -- Stanislav Sedov ST4096-RIPE !DSPAM:4994636d967001887442476!