[pkgsrc/trunk]: pkgsrc/sysutils/gnome-vfs Move CONFLICTS line to correct place.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fb805080178e
branches:  trunk
changeset: 534760:fb805080178e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Oct 31 02:16:03 2007 +0000

description:
Move CONFLICTS line to correct place.

diffstat:

 sysutils/gnome-vfs/Makefile        |  4 +++-
 sysutils/gnome-vfs/Makefile.common |  4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r baf808b585dc -r fb805080178e sysutils/gnome-vfs/Makefile
--- a/sysutils/gnome-vfs/Makefile       Wed Oct 31 00:59:52 2007 +0000
+++ b/sysutils/gnome-vfs/Makefile       Wed Oct 31 02:16:03 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2007/09/21 13:04:18 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2007/10/31 02:16:03 wiz Exp $
 
 PKGREVISION=           3
 PKGCONFIG_OVERRIDE=    gnome-vfs-2.0.pc.in
@@ -25,6 +25,8 @@
 
 CONFIGURE_ARGS+=       --enable-fam
 
+ONFLICTS+=             gnome-vfs2-[0-9]*
+
 .include "../../devel/GConf/schemas.mk"
 
 .include "../../archivers/bzip2/buildlink3.mk"
diff -r baf808b585dc -r fb805080178e sysutils/gnome-vfs/Makefile.common
--- a/sysutils/gnome-vfs/Makefile.common        Wed Oct 31 00:59:52 2007 +0000
+++ b/sysutils/gnome-vfs/Makefile.common        Wed Oct 31 02:16:03 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2007/10/13 13:13:16 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.5 2007/10/31 02:16:03 wiz Exp $
 #
 
 GNOME_VFS_VERSION=     2.18.1
@@ -82,8 +82,6 @@
 CONFIGURE_ARGS:=       ${CONFIGURE_ARGS:S/--disable-${GNOME_VFS_FLAG}/--enable-${GNOME_VFS_FLAG}/}
 COMMENT+=              - ${GNOME_VFS_NAME} plugin
 
-CONFLICTS+=            gnome-vfs2-[0-9]*
-
 BUILD_TARGET=          lib${GNOME_VFS_NAME}.la
 BUILD_DIRS=            modules