Date: Thu, 12 Feb 2009 20:59:32 +0300 From: Stanislav Sedov <stas@FreeBSD.org> To: gnome@FreeBSD.org Subject: [PATCH]: libgsf - make gconf optional Message-ID: <20090212205932.b8c9ab3e.stas@FreeBSD.org>
next in thread | raw e-mail | index | archive | help
Hi!
gconf2 isn't strictly required for libgsf (only the thumbnailer need it).
The patch attached makes thumbnailer optional.
Can you, please, review? Thanks!
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/libgsf/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
--- Makefile 10 Jan 2009 05:21:24 -0000 1.46
+++ Makefile 12 Feb 2009 17:58:38 -0000
@@ -24,7 +24,7 @@
USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
-USE_GNOME?= gnomehack gnomeprefix glib20 libxml2 gconf2 ltverhack intlhack
+USE_GNOME?= gnomehack gnomeprefix glib20 libxml2 ltverhack intlhack
USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS?=--without-gnome-vfs --without-python --with-gio \
--without-bonobo
@@ -32,8 +32,15 @@
LDFLAGS="-L${LOCALBASE}/lib"
.if !defined(GSF_SLAVE)
-GCONF_SCHEMAS= gsf-office-thumbnailer.schemas
MAN1= gsf.1 gsf-office-thumbnailer.1 gsf-vba-dump.1
.endif
+.if !defined(WITHOUT_GCONF) || exists(${LOCALBASE}/bin/gconftool-2)
+USE_GNOME+= gconf2
+PLIST_SUB+= THUMB=""
+GCONF_SCHEMAS= gsf-office-thumbnailer.schemas
+.else
+PLIST_SUB+= THUMB="@comment "
+.endif
+
.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/devel/libgsf/pkg-plist,v
retrieving revision 1.24
diff -u -r1.24 pkg-plist
--- pkg-plist 10 Jan 2009 05:21:25 -0000 1.24
+++ pkg-plist 12 Feb 2009 17:58:38 -0000
@@ -1,5 +1,5 @@
bin/gsf
-bin/gsf-office-thumbnailer
+%%THUMB%%bin/gsf-office-thumbnailer
bin/gsf-vba-dump
include/libgsf-1/gsf/gsf-blob.h
include/libgsf-1/gsf/gsf-clip-data.h
--
Stanislav Sedov
ST4096-RIPE
!DSPAM:4994636d967001887442476!
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090212205932.b8c9ab3e.stas>