Subject: Re: missing @pkgcfl in gnome-vfs package
To: None <tech-pkg@netbsd.org>
From: Matthias Drochner <M.Drochner@fz-juelich.de>
List: tech-pkg
Date: 10/30/2007 21:24:21
This is a multipart MIME message.

--==_Exmh_88266435893530
Content-Type: text/plain; charset=us-ascii


> My gnome-vfs-2.18.1nb3/+CONTENTS and gnome-vfs2-2.14.0nb2/+CONTENTS do not 
> have any @pkgcfl conflicts lines.

You are right, this was not done correctly.
The appended patch should fix it. (I've hand-edited it, so there might be
some minor line number skew.)

best regards
Matthias





-----------------------------------------------------------------------------------------
-----------------------------------------------------------------------------------------
Forschungszentrum Juelich GmbH
52425 Juelich

Sitz der Gesellschaft: Juelich
Eingetragen im Handelsregister des Amtsgerichts Dueren Nr. HR B 3498
Vorsitzende des Aufsichtsrats: MinDirig'in Baerbel Brumme-Bothe
Geschaeftsfuehrung: Prof. Dr. Achim Bachem (Vorsitzender), Dr. Ulrich Krafft (stellv. 
Vorsitzender)
-----------------------------------------------------------------------------------------
-----------------------------------------------------------------------------------------

--==_Exmh_88266435893530
Content-Type: application/x-patch ; name="vfs.patch"
Content-Description: vfs.patch
Content-Disposition: attachment; filename="vfs.patch"

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gnome-vfs/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- Makefile	21 Sep 2007 13:04:18 -0000	1.63
+++ Makefile	30 Oct 2007 20:16:13 -0000
@@ -25,6 +24,8 @@
 
 CONFIGURE_ARGS+=	--enable-fam
 
+CONFLICTS+=		gnome-vfs2-[0-9]*
+
 .include "../../devel/GConf/schemas.mk"
 
 .include "../../archivers/bzip2/buildlink3.mk"
Index: Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gnome-vfs/Makefile.common,v
retrieving revision 1.4
diff -u -r1.4 Makefile.common
--- Makefile.common	13 Oct 2007 13:13:16 -0000	1.4
+++ Makefile.common	30 Oct 2007 20:16:13 -0000
@@ -82,7 +82,7 @@
 CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-${GNOME_VFS_FLAG}/--enable-${GNOME_VFS_FLAG}/}
 COMMENT+=		- ${GNOME_VFS_NAME} plugin
 
-CONFLICTS+=		gnome-vfs2-[0-9]*
+CONFLICTS+=		${DISTNAME:S/gnome-vfs/gnome-vfs2-${GNOME_VFS_NAME}/}
 
 BUILD_TARGET=		lib${GNOME_VFS_NAME}.la
 BUILD_DIRS=		modules

--==_Exmh_88266435893530--