[pkgsrc/trunk]: pkgsrc resolve conflict between gnome-vfs and gnome-vfs-dns-s...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1ae6e6a628fa
branches:  trunk
changeset: 567283:1ae6e6a628fa
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Nov 12 00:13:26 2009 +0000

description:
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:

 net/gnome-vfs-dns-sd/DESCR    |   6 ------
 net/gnome-vfs-dns-sd/Makefile |  15 ---------------
 net/gnome-vfs-dns-sd/PLIST    |   2 --
 sysutils/gnome-vfs/Makefile   |   5 ++++-
 sysutils/gnome-vfs/options.mk |  11 +++++++++--
 5 files changed, 13 insertions(+), 26 deletions(-)

diffs (79 lines):

diff -r 9fb8d0d80552 -r 1ae6e6a628fa net/gnome-vfs-dns-sd/DESCR
--- a/net/gnome-vfs-dns-sd/DESCR        Wed Nov 11 22:28:51 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 9fb8d0d80552 -r 1ae6e6a628fa net/gnome-vfs-dns-sd/Makefile
--- a/net/gnome-vfs-dns-sd/Makefile     Wed Nov 11 22:28:51 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 9fb8d0d80552 -r 1ae6e6a628fa net/gnome-vfs-dns-sd/PLIST
--- a/net/gnome-vfs-dns-sd/PLIST        Wed Nov 11 22:28:51 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 9fb8d0d80552 -r 1ae6e6a628fa sysutils/gnome-vfs/Makefile
--- a/sysutils/gnome-vfs/Makefile       Wed Nov 11 22:28:51 2009 +0000
+++ b/sysutils/gnome-vfs/Makefile       Thu Nov 12 00:13:26 2009 +0000
@@ -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 @@
 .include "options.mk"
 
 CONFLICTS+=            gnome-vfs2-[0-9]*
+CONFLICTS+=            gnome-vfs-dns-sd-[0-9]*
 
 .include "../../devel/GConf/schemas.mk"
 
diff -r 9fb8d0d80552 -r 1ae6e6a628fa sysutils/gnome-vfs/options.mk
--- a/sysutils/gnome-vfs/options.mk     Wed Nov 11 22:28:51 2009 +0000
+++ b/sysutils/gnome-vfs/options.mk     Thu Nov 12 00:13:26 2009 +0000
@@ -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 @@
 .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