svn commit: r312896 - head/devel/libgsf

[Alexey Dokuchaev]

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 <sobomax at FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax at 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 @@ MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome at 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 <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>

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