Skip site navigation (1)Skip section navigation (2)
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>

next in thread | raw e-mail | index | archive | help

--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--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130222163516.GA51990>