diff options
| author | drochner <drochner> | 2009-11-12 00:13:26 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2009-11-12 00:13:26 +0000 |
| commit | e0d7df6f6bdbb9c39c8f52ef824ffd53d2410ca8 (patch) | |
| tree | 02fc48ade99458dad8dd248930eb9a47c5710853 /sysutils/gnome-vfs | |
| parent | 6346225477617da333e6915136cee46606b981ea (diff) | |
| download | pkgsrc-e0d7df6f6bdbb9c39c8f52ef824ffd53d2410ca8.tar.gz | |
resolve conflict between gnome-vfs and gnome-vfs-dns-sd (which has
been there from the beginning):
-add an "avahi" option to gnome-vfs (default off)
-add CONFLICTS statement
-bump PKGREVISION
-remove gnome-vfs-dns-sd
Diffstat (limited to 'sysutils/gnome-vfs')
| -rw-r--r-- | sysutils/gnome-vfs/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/gnome-vfs/options.mk | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile index e324e9f8a60..522ebfc396b 100644 --- a/sysutils/gnome-vfs/Makefile +++ b/sysutils/gnome-vfs/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.76 2009/10/22 15:19:39 drochner Exp $ +# $NetBSD: Makefile,v 1.77 2009/11/12 00:13:26 drochner Exp $ + +PKGREVISION= 1 PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in @@ -25,6 +27,7 @@ MAKE_JOBS_SAFE= no .include "options.mk" CONFLICTS+= gnome-vfs2-[0-9]* +CONFLICTS+= gnome-vfs-dns-sd-[0-9]* .include "../../devel/GConf/schemas.mk" diff --git a/sysutils/gnome-vfs/options.mk b/sysutils/gnome-vfs/options.mk index 4ac71aec0f4..60cf48e13c9 100644 --- a/sysutils/gnome-vfs/options.mk +++ b/sysutils/gnome-vfs/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.3 2009/04/12 20:08:04 abs Exp $ +# $NetBSD: options.mk,v 1.4 2009/11/12 00:13:26 drochner Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-vfs -PKG_SUPPORTED_OPTIONS= fam gssapi hal inet6 +PKG_SUPPORTED_OPTIONS= fam gssapi hal inet6 avahi PKG_SUGGESTED_OPTIONS= fam hal .include "../../mk/bsd.prefs.mk" @@ -41,3 +41,10 @@ CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif + +.if !empty(PKG_OPTIONS:Mavahi) +CONFIGURE_ARGS+= --enable-avahi +.include "../../net/avahi/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-avahi +.endif |