Hi,
During upgrade on one of the machines I got following error:
Collision in e2fsprogs-1.41.4p4->e2fsprogs-1.41.4p5: the following files
already exist
/usr/local/lib/pkgconfig/uuid.pc (ossp-uuid-1.6.2)
Update candidates: e2fsprogs-1.41.4p4 -> e2fsprogs-1.41.4p5 ()
I think it should have additional conflict marker with
ossp-uuid-<=1.6.2. I've also changed uuid conflict marker to cover any
version of uuid package to match it with packaging list of ossp-uuid
package (see conflict markers in devel/uuid/pkg/PLIST-main).
Patch was *not* tested, but I believe is correct.
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/e2fsprogs/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile 6 Jul 2011 07:21:24 -0000 1.21
+++ Makefile 28 Jul 2011 16:23:43 -0000
@@ -4,7 +4,7 @@
COMMENT= utilities to manipulate ext2 filesystems
DISTNAME= e2fsprogs-1.41.4
-REVISION = 5
+REVISION= 6
CATEGORIES= sysutils devel
SHARED_LIBS= blkid 0.0 \
e2p 3.0 \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/e2fsprogs/pkg/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- pkg/PLIST 6 Jul 2011 07:21:24 -0000 1.8
+++ pkg/PLIST 28 Jul 2011 16:23:43 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.8 2011/07/06 07:21:24 jasper Exp $
@conflict e2fs-uuid-*
-@conflict uuid-1.6.2
+@conflict uuid-*
+@conflict ossp-uuid-<=1.6.2
@pkgpath sysutils/e2fsprogs,-main
@pkgpath sysutils/e2fsprogs,-uuid
@bin bin/chattr
--
best regards
q#
