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

3 files changed, 0 insertions, 23 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