Subject: pkg/36340: make libgsf respect the gnome option
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Yorick Hardy <yhardy@uj.ac.za>
List: pkgsrc-bugs
Date: 05/15/2007 08:10:00
>Number:         36340
>Category:       pkg
>Synopsis:       make libgsf respect the gnome option
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue May 15 08:10:00 +0000 2007
>Originator:     Yorick Hardy
>Release:        NetBSD 4.99.16
>Organization:
>Environment:
System: NetBSD yorick 4.99.16 NetBSD 4.99.16 (HPNX6310DRMcurrent) #0: Sun Apr 8 20:20:02 SAST 2007 root@yorick:/var/tmp/build/objcur/sys/arch/i386/compile/HPNX6310DRMcurrent i386
Architecture: i386
Machine: i386
>Description:
libgsf does not respect the gnome option
>How-To-Repeat:
>Fix:
--- devel/libgsf/Makefile.orig	2007-04-27 01:21:18.000000000 +0200
+++ devel/libgsf/Makefile	2007-04-27 09:19:59.000000000 +0200
@@ -24,11 +24,19 @@
 
 GCONF2_SCHEMAS=		gsf-office-thumbnailer.schemas
 
+.include "../../mk/bsd.options.mk"
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mgnome)
+. include "../../devel/libbonobo/buildlink3.mk"
+.endif
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mgnome)
+. include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.endif
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.if !empty(PKG_OPTIONS:Mgnome)
+. include "../../devel/GConf2/schemas.mk"
+.endif
 .include "../../mk/bsd.pkg.mk"
--- devel/libgsf/buildlink3.mk.orig	2007-04-27 01:21:24.000000000 +0200
+++ devel/libgsf/buildlink3.mk	2007-04-27 09:20:24.000000000 +0200
@@ -17,11 +17,17 @@
 BUILDLINK_PKGSRCDIR.libgsf?=	../../devel/libgsf
 .endif	# LIBGSF_BUILDLINK3_MK
 
+.include "../../mk/bsd.options.mk"
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mgnome)
+. include "../../devel/libbonobo/buildlink3.mk"
+.endif
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mgnome)
+. include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.endif
 .include "../../textproc/libxml2/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}