CVS commit: pkgsrc

[Matthias Drochner <drochner%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   drochner
Date:           Thu Nov 12 00:13:26 UTC 2009

Modified Files:
        pkgsrc/sysutils/gnome-vfs: Makefile options.mk
Removed Files:
        pkgsrc/net/gnome-vfs-dns-sd: DESCR Makefile PLIST

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/net/gnome-vfs-dns-sd/DESCR
cvs rdiff -u -r1.3 -r0 pkgsrc/net/gnome-vfs-dns-sd/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/net/gnome-vfs-dns-sd/PLIST
cvs rdiff -u -r1.76 -r1.77 pkgsrc/sysutils/gnome-vfs/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/gnome-vfs/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.