From owner-freebsd-gnome@FreeBSD.ORG  Thu Feb 12 18:29:37 2009
Return-Path: <owner-freebsd-gnome@FreeBSD.ORG>
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 EB5921065674;
	Thu, 12 Feb 2009 18:29:37 +0000 (UTC)
	(envelope-from marcus@freebsd.org)
Received: from av-tac-rtp.cisco.com (hen.cisco.com [64.102.19.198])
	by mx1.freebsd.org (Postfix) with ESMTP id 95F2C8FC08;
	Thu, 12 Feb 2009 18:29:37 +0000 (UTC)
	(envelope-from marcus@freebsd.org)
X-TACSUNS: Virus Scanned
Received: from rooster.cisco.com (localhost.cisco.com [127.0.0.1])
	by av-tac-rtp.cisco.com (8.13.8+Sun/8.13.8) with ESMTP id
	n1CITa4m006904; Thu, 12 Feb 2009 13:29:36 -0500 (EST)
Received: from [64.102.221.205] (dhcp-64-102-221-205.cisco.com
	[64.102.221.205])
	by rooster.cisco.com (8.13.8+Sun/8.13.8) with ESMTP id n1CITaMH021812; 
	Thu, 12 Feb 2009 13:29:36 -0500 (EST)
Message-ID: <49946A94.8060502@freebsd.org>
Date: Thu, 12 Feb 2009 13:29:40 -0500
From: Joe Marcus Clarke <marcus@freebsd.org>
Organization: FreeBSD, Inc.
User-Agent: Thunderbird 2.0.0.19 (Macintosh/20081209)
MIME-Version: 1.0
To: Stanislav Sedov <stas@freebsd.org>
References: <20090212205932.b8c9ab3e.stas@FreeBSD.org>
In-Reply-To: <20090212205932.b8c9ab3e.stas@FreeBSD.org>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: gnome@freebsd.org
Subject: Re: [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
	<freebsd-gnome.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gnome>
List-Post: <mailto:freebsd-gnome@freebsd.org>
List-Help: <mailto:freebsd-gnome-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Feb 2009 18:29:38 -0000

Stanislav Sedov wrote:
> Hi!
> 
> gconf2 isn't strictly required for libgsf (only the thumbnailer need it).
> The patch attached makes thumbnailer optional.

Okay.

Joe

> 
> 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 <bsd.port.mk>
> 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
> 


-- 
Joe Marcus Clarke
FreeBSD GNOME Team	::	gnome@FreeBSD.org
FreeNode / #freebsd-gnome
http://www.FreeBSD.org/gnome