Date: Sat, 23 Feb 2013 11:20:09 +0700 From: Alexey Dokuchaev <danfe@nsu.ru> To: Jeremy Messenger <mezz.freebsd@gmail.com> Cc: gnome@freebsd.org Subject: Re: [patch] devel/libgsf: make GCONF really OPTIONal Message-ID: <20130223042009.GA99230@regency.nsu.ru> In-Reply-To: <CADLFttcHuHnSmi1FEbwqkAST84JgAehFDbFJFfrN4bnMQNfuYA@mail.gmail.com> References: <20130222163516.GA51990@regency.nsu.ru> <CADLFttcHuHnSmi1FEbwqkAST84JgAehFDbFJFfrN4bnMQNfuYA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <danfe@nsu.ru> 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 <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
# $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 <bsd.port.options.mk>
+
+.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 <bsd.port.mk>
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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130223042009.GA99230>