diff options
| author | drochner <drochner@pkgsrc.org> | 2009-10-29 23:05:00 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2009-10-29 23:05:00 +0000 |
| commit | a4de49c1e2724c38b9cf2f91dd65133c65ba79ba (patch) | |
| tree | 705cc39a06e656203fe6656c3977e65c4b5743de /devel | |
| parent | bb9068165f9e91d21323de67c1b7263503a9451e (diff) | |
| download | pkgsrc-a4de49c1e2724c38b9cf2f91dd65133c65ba79ba.tar.gz | |
add an option for use of esound, make it off per default which is
a change to the previuos pkg, bump PKGREV
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libgnome/Makefile | 17 | ||||
| -rw-r--r-- | devel/libgnome/buildlink3.mk | 11 |
2 files changed, 20 insertions, 8 deletions
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile index 4f9125cfb87..252a1591bba 100644 --- a/devel/libgnome/Makefile +++ b/devel/libgnome/Makefile @@ -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_mobility.schemas 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 @@ BUILDLINK_API_DEPENDS.libbonobo+= libbonobo>=2.13.0 .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 --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk index 2729d413c47..2d0ebee6b48 100644 --- a/devel/libgnome/buildlink3.mk +++ b/devel/libgnome/buildlink3.mk @@ -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_API_DEPENDS.libgnome+= libgnome>=2.8.0 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 |