From owner-freebsd-gnome@FreeBSD.ORG Sat Feb 23 04:20:17 2013 Return-Path: Delivered-To: gnome@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 912BFAB0 for ; Sat, 23 Feb 2013 04:20:17 +0000 (UTC) (envelope-from danfe@regency.nsu.ru) Received: from mx.nsu.ru (mx.nsu.ru [84.237.50.39]) by mx1.freebsd.org (Postfix) with ESMTP id 3DC10AFC for ; Sat, 23 Feb 2013 04:20:16 +0000 (UTC) Received: from regency.nsu.ru ([193.124.210.26]) by mx.nsu.ru with esmtp (Exim 4.69) (envelope-from ) id 1U96am-0005f2-9l; Sat, 23 Feb 2013 11:20:08 +0700 Received: from regency.nsu.ru (localhost [127.0.0.1]) by regency.nsu.ru (8.14.2/8.14.2) with ESMTP id r1N4KPxY001712; Sat, 23 Feb 2013 11:20:25 +0700 (NOVT) (envelope-from danfe@regency.nsu.ru) Received: (from danfe@localhost) by regency.nsu.ru (8.14.2/8.14.2/Submit) id r1N4K9Rk001693; Sat, 23 Feb 2013 11:20:09 +0700 (NOVT) (envelope-from danfe) Date: Sat, 23 Feb 2013 11:20:09 +0700 From: Alexey Dokuchaev To: Jeremy Messenger Subject: Re: [patch] devel/libgsf: make GCONF really OPTIONal Message-ID: <20130223042009.GA99230@regency.nsu.ru> References: <20130222163516.GA51990@regency.nsu.ru> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="IS0zKkzwUGydFO0o" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.1i Cc: gnome@freebsd.org X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 04:20:17 -0000 --IS0zKkzwUGydFO0o Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Feb 22, 2013 at 12:46:53PM -0600, Jeremy Messenger wrote: > On Fri, Feb 22, 2013 at 10:35 AM, Alexey Dokuchaev wrote: > > hi there, > > > > it's a bit inconvenient to manually specify WITHOUT_GCONF every time i > > build devel/libgsf. mind if i commit attached patch? > > We can't use OPTIONS with the auto check dependency. It breaks the > user usability, IMO. I can't access to the FreeBSD for a few weeks, > so can you check to see if there is flag in its configure to disable > gconf? If it does then remove that auto check and add the disable flag > then you can commit it. Thanks! Yes, there is a --without-gconf switch, and it works as advertised. I've also removed PLIST_SUB magic, as it seems a bit excessive for just one file, and used PLIST_FILES instead. New diff is attached. ./danfe --IS0zKkzwUGydFO0o Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="libgsf2.diff" Index: Makefile =================================================================== --- Makefile (revision 312694) +++ Makefile (working copy) @@ -1,10 +1,6 @@ -# New ports collection makefile for: libgsf -# Date created: 11 September 2002 -# Whom: Maxim Sobolev -# +# Created by: Maxim Sobolev # $FreeBSD$ # $MCom: ports/devel/libgsf/Makefile,v 1.35 2010/04/10 08:51:15 kwm Exp $ -# PORTNAME= libgsf PORTVERSION= 1.14.21 @@ -14,7 +10,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT?= An extensible i/o abstraction for dealing with structured file formats +COMMENT?= Extensible I/O abstraction for dealing with structured file formats .if !exists(/usr/lib/libbz2.so) LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 @@ -35,14 +31,19 @@ MAN1= gsf.1 gsf-office-thumbnailer.1 gsf-vba-dump.1 .endif -.if !defined(WITHOUT_GCONF) || exists(${LOCALBASE}/bin/gconftool-2) +OPTIONS_DEFINE= GCONF +OPTIONS_DEFAULT= GCONF + +.include + +.if ${PORT_OPTIONS:MGCONF} USE_GNOME+= gconf2 -PLIST_SUB+= THUMB="" +PLIST_FILES+= bin/gsf-office-thumbnailer . if !defined(GSF_SLAVE) GCONF_SCHEMAS= gsf-office-thumbnailer.schemas . endif .else -PLIST_SUB+= THUMB="@comment " +CONFIGURE_ARGS+= --without-gconf .endif .include Index: pkg-plist =================================================================== --- pkg-plist (revision 312694) +++ pkg-plist (working copy) @@ -1,5 +1,4 @@ bin/gsf -%%THUMB%%bin/gsf-office-thumbnailer bin/gsf-vba-dump include/libgsf-1/gsf/gsf-blob.h include/libgsf-1/gsf/gsf-clip-data.h --IS0zKkzwUGydFO0o--