From owner-svn-ports-head@FreeBSD.ORG Mon Feb 25 00:55:45 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 18798C58; Mon, 25 Feb 2013 00:55:45 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D00A314F; Mon, 25 Feb 2013 00:55:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1P0ti0p055337; Mon, 25 Feb 2013 00:55:44 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1P0tifo055335; Mon, 25 Feb 2013 00:55:44 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201302250055.r1P0tifo055335@svn.freebsd.org> From: Alexey Dokuchaev Date: Mon, 25 Feb 2013 00:55:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312896 - head/devel/libgsf X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2013 00:55:45 -0000 Author: danfe Date: Mon Feb 25 00:55:43 2013 New Revision: 312896 URL: http://svnweb.freebsd.org/changeset/ports/312896 Log: - Convert to OptionsNG, explicitly pass --without-gconf if GCONF is disabled - Drop leading indefinite article from COMMENT, i/o -> I/O - Since PLIST_SUB was covering just one file, turn it into PLIST_FILES+= Approved by: mezz (on behalf of gnome) Modified: head/devel/libgsf/Makefile head/devel/libgsf/pkg-plist Modified: head/devel/libgsf/Makefile ============================================================================== --- head/devel/libgsf/Makefile Mon Feb 25 00:38:18 2013 (r312895) +++ head/devel/libgsf/Makefile Mon Feb 25 00:55:43 2013 (r312896) @@ -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 @@ MASTER_SITES= GNOME 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 @@ LDFLAGS+= -L${LOCALBASE}/lib 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 Modified: head/devel/libgsf/pkg-plist ============================================================================== --- head/devel/libgsf/pkg-plist Mon Feb 25 00:38:18 2013 (r312895) +++ head/devel/libgsf/pkg-plist Mon Feb 25 00:55:43 2013 (r312896) @@ -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