[pkgsrc/trunk]: pkgsrc/devel/libgnome add an option for use of esound, make i...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ef9257787dae
branches:  trunk
changeset: 400912:ef9257787dae
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Oct 29 23:05:00 2009 +0000

description:
add an option for use of esound, make it off per default which is
a change to the previuos pkg, bump PKGREV

diffstat:

 devel/libgnome/Makefile      |  17 ++++++++++++-----
 devel/libgnome/buildlink3.mk |  11 ++++++++---
 2 files changed, 20 insertions(+), 8 deletions(-)

diffs (75 lines):

diff -r a3cc277cc9e2 -r ef9257787dae devel/libgnome/Makefile
--- a/devel/libgnome/Makefile   Thu Oct 29 22:58:38 2009 +0000
+++ b/devel/libgnome/Makefile   Thu Oct 29 23:05:00 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.74 2009/10/21 15:57:25 drochner Exp $
+# $NetBSD: Makefile,v 1.75 2009/10/29 23:05:00 drochner Exp $
 #
 
 DISTNAME=      libgnome-2.28.0
+PKGREVISION=   1
 CATEGORIES=    devel gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/libgnome/2.28/}
 EXTRACT_SUFX=  .tar.bz2
@@ -54,12 +55,20 @@
 GCONF_SCHEMAS+=        desktop_gnome_applications_at_visual.schemas
 GCONF_SCHEMAS+=        desktop_gnome_applications_office.schemas
 
+PKG_OPTIONS_VAR= PKG_OPTIONS.libgnome
+PKG_SUPPORTED_OPTIONS= esound
+.include "../../mk/bsd.options.mk"
+.if !empty(PKG_OPTIONS:Mesound)
+.include "../../audio/esound/buildlink3.mk"
 BUILDLINK_API_DEPENDS.audiofile+=      libaudiofile>=0.2.3
+.include "../../audio/libaudiofile/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-esd
+.endif
+
 BUILDLINK_API_DEPENDS.glib2+=          glib2>=2.8.0
 BUILDLINK_API_DEPENDS.libbonobo+=      libbonobo>=2.13.0
 
-.include "../../audio/esound/buildlink3.mk"
-.include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
@@ -67,6 +76,4 @@
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a3cc277cc9e2 -r ef9257787dae devel/libgnome/buildlink3.mk
--- a/devel/libgnome/buildlink3.mk      Thu Oct 29 22:58:38 2009 +0000
+++ b/devel/libgnome/buildlink3.mk      Thu Oct 29 23:05:00 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:24:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2009/10/29 23:05:00 drochner Exp $
 
 BUILDLINK_TREE+=       libgnome
 
@@ -9,15 +9,20 @@
 BUILDLINK_ABI_DEPENDS.libgnome+=       libgnome>=2.20.1.1nb1
 BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome
 
+.include "../../mk/bsd.fast.prefs.mk"
+
+pkgbase := libgnome
+.include "../../mk/pkg-build-options.mk"
+.if !empty(PKG_BUILD_OPTIONS.libgnome:Mesound)
 .include "../../audio/esound/buildlink3.mk"
+.endif
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
 .endif # LIBGNOME_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libgnome