diff options
| author | danfe <danfe@FreeBSD.org> | 2013-02-25 08:55:43 +0800 |
|---|---|---|
| committer | danfe <danfe@FreeBSD.org> | 2013-02-25 08:55:43 +0800 |
| commit | 80ce204ec10a0250ab623172c9fc863ac64c0863 (patch) | |
| tree | d54efc156c189a97a0f44db5ff19f3881c7b780b | |
| parent | 468f4e3fbfaa13537c0f334d35abad29776d34b7 (diff) | |
| download | freebsd-ports-graphics-80ce204ec10a0250ab623172c9fc863ac64c0863.tar.gz freebsd-ports-graphics-80ce204ec10a0250ab623172c9fc863ac64c0863.tar.zst freebsd-ports-graphics-80ce204ec10a0250ab623172c9fc863ac64c0863.zip | |
- 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)
| -rw-r--r-- | devel/libgsf/Makefile | 19 | ||||
| -rw-r--r-- | devel/libgsf/pkg-plist | 1 |
2 files changed, 10 insertions, 10 deletions
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index 0634b5b414f..74c08c71a9a 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -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 @@ 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 <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> diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist index 2aa2625a2f1..3f71bd38c89 100644 --- a/devel/libgsf/pkg-plist +++ b/devel/libgsf/pkg-plist @@ -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 |