From owner-freebsd-gnome@FreeBSD.ORG  Fri Feb 22 16:35:56 2013
Return-Path: <owner-freebsd-gnome@FreeBSD.ORG>
Delivered-To: gnome@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 15799BE5
 for <gnome@freebsd.org>; Fri, 22 Feb 2013 16:35:56 +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 B500AA96
 for <gnome@freebsd.org>; Fri, 22 Feb 2013 16:35:55 +0000 (UTC)
Received: from regency.nsu.ru ([193.124.210.26])
 by mx.nsu.ru with esmtp (Exim 4.69)
 (envelope-from <danfe@regency.nsu.ru>) id 1U8vae-0004Q9-6u
 for gnome@freebsd.org; Fri, 22 Feb 2013 23:35:16 +0700
Received: from regency.nsu.ru (localhost [127.0.0.1])
 by regency.nsu.ru (8.14.2/8.14.2) with ESMTP id r1MGZXOP053108
 for <gnome@freebsd.org>; Fri, 22 Feb 2013 23:35:33 +0700 (NOVT)
 (envelope-from danfe@regency.nsu.ru)
Received: (from danfe@localhost)
 by regency.nsu.ru (8.14.2/8.14.2/Submit) id r1MGZHfs053029
 for gnome@freebsd.org; Fri, 22 Feb 2013 23:35:17 +0700 (NOVT)
 (envelope-from danfe)
Date: Fri, 22 Feb 2013 23:35:16 +0700
From: Alexey Dokuchaev <danfe@nsu.ru>
To: gnome@freebsd.org
Subject: [patch] devel/libgsf: make GCONF really OPTIONal
Message-ID: <20130222163516.GA51990@regency.nsu.ru>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="tThc/1wpZn/ma/RB"
Content-Disposition: inline
User-Agent: Mutt/1.4.2.1i
X-BeenThere: freebsd-gnome@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: GNOME for FreeBSD -- porting and maintaining
 <freebsd-gnome.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Fri, 22 Feb 2013 16:35:56 -0000


--tThc/1wpZn/ma/RB
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

hi there,

it's a bit inconvenient to manually specify WITHOUT_GCONF every time i
build devel/libgsf.  mind if i commit attached patch?

./danfe

--tThc/1wpZn/ma/RB
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="libgsf.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,7 +31,12 @@
 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} || exists(${LOCALBASE}/bin/gconftool-2)
 USE_GNOME+=	gconf2
 PLIST_SUB+=	THUMB=""
 . if !defined(GSF_SLAVE)

--tThc/1wpZn/ma/RB--