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

5 files changed, 13 insertions, 26 deletions

diff --git a/net/gnome-vfs-dns-sd/DESCR b/net/gnome-vfs-dns-sd/DESCR
deleted file mode 100644
index 68ea9344d0f..00000000000
--- a/net/gnome-vfs-dns-sd/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-GNOME VFS provides an abstraction layer of the file system; applications
-use this layer to access many different protocols and simulate that they
-are part of the local file system.
-
-This package provides the dns-sd module for GNOME VFS, which allows it to
-discover sftp, webdav, and ftp services advertised with multicast DNS.
diff --git a/net/gnome-vfs-dns-sd/Makefile b/net/gnome-vfs-dns-sd/Makefile
deleted file mode 100644
index a1898c3bded..00000000000
--- a/net/gnome-vfs-dns-sd/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2009/10/22 15:21:19 drochner Exp $
-#
-
-GNOME_VFS_NAME=		dns-sd
-GNOME_VFS_FLAG=		avahi
-CATEGORIES=		net
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-INSTALLATION_DIRS+=	${EGDIR}/modules
-
-.include "../../sysutils/gnome-vfs/Makefile.common"
-
-.include "../../net/avahi/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/gnome-vfs-dns-sd/PLIST b/net/gnome-vfs-dns-sd/PLIST
deleted file mode 100644
index 65903e67819..00000000000
--- a/net/gnome-vfs-dns-sd/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:09:28 joerg Exp $
-lib/gnome-vfs-2.0/modules/libdns-sd.la
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