pkg/42855: devel/libgsf without gnome

[demelier.david%gmail.com@localhost]

>Number:         42855
>Category:       pkg
>Synopsis:       devel/libgsf without gnome
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Feb 20 20:55:00 +0000 2010
>Originator:     Demelier David
>Release:        NetBSD-5
>Organization:
>Environment:
NetBSD Abricot.malikania.org 5.0_STABLE NetBSD 5.0_STABLE (Abricot 0.2) #1: Fri 
Feb 12 13:38:30 CET 2010  
root%Abricot.malikania.org@localhost:/usr/obj/sys/arch/i386/compile/Abricot i386

>Description:
Because libgsf can also works without some gnome dependencies I made this 
little patch to remove some gnome dependencies.

As you can see, the ./configure script handles automatically if gconftool is 
not found, so the optional gconf dependency can be safely removed.

checking for gconftool-2... no
configure: WARNING: thumbnailer will not be built, unable to find gconftool-2



>How-To-Repeat:

>Fix:
--- Makefile.orig       2010-02-20 21:35:53.000000000 +0100
+++ Makefile    2010-02-20 21:42:20.000000000 +0100
@@ -25,14 +25,10 @@
 
 CONFIGURE_ARGS+=       --without-python
 
-# XXX workaround for missing substitution in configure
-MAKE_ENV+=     GCONF2_SCHEMAS_DIR=${GCONF_SCHEMAS_DIR}
-
-GCONF_SCHEMAS= gsf-office-thumbnailer.schemas
+.include "options.mk"
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../devel/GConf/schemas.mk"
 .include "../../mk/bsd.pkg.mk"
--- PLIST.orig  2010-02-20 21:47:01.000000000 +0100
+++ PLIST       2010-02-20 21:46:55.000000000 +0100
@@ -1,6 +1,6 @@
 @comment $NetBSD: PLIST,v 1.28 2010/02/16 13:29:26 wiz Exp $
 bin/gsf
-bin/gsf-office-thumbnailer
+${PLIST.gnome}bin/gsf-office-thumbnailer
 bin/gsf-vba-dump
 include/libgsf-1/gsf/gsf-blob.h
 include/libgsf-1/gsf/gsf-clip-data.h
@@ -55,7 +55,7 @@
 man/man1/gsf-office-thumbnailer.1
 man/man1/gsf-vba-dump.1
 man/man1/gsf.1
-share/gconf/schemas/gsf-office-thumbnailer.schemas
+${PLIST.gnome}share/gconf/schemas/gsf-office-thumbnailer.schemas
 share/gtk-doc/html/gsf/GsfClipData.html
 share/gtk-doc/html/gsf/api.html
 share/gtk-doc/html/gsf/dependencies.html
--- /dev/null   2010-02-20 21:48:45.000000000 +0100
+++ options.mk  2010-02-20 21:42:03.000000000 +0100
@@ -0,0 +1,14 @@
+PKG_OPTIONS_VAR=       PKG_OPTIONS.libgsf
+PKG_SUPPORTED_OPTIONS= gnome
+PKG_SUGGESTED_OPTIONS= gnome
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+= gnome
+
+.if !empty(PKG_OPTIONS:Mgnome)
+.include "../../devel/GConf/schemas.mk"
+GCONF_SCHEMAS=  gsf-office-thumbnailer.schemas
+MAKE_ENV+=  GCONF2_SCHEMAS_DIR=${GCONF_SCHEMAS_DIR}
+PLIST.gnome=   yes
+.endif