[pkgsrc/trunk]: pkgsrc/sysutils Make xentools3 packages conflict with xentoo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e7dc93ba96a9
branches:  trunk
changeset: 546387:e7dc93ba96a9
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Sat Aug 30 16:05:30 2008 +0000

description:
Make xentools3 packages conflict with  xentools33

diffstat:

 sysutils/xentools3-hvm/Makefile |  4 ++--
 sysutils/xentools3/Makefile     |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r fcf943876801 -r e7dc93ba96a9 sysutils/xentools3-hvm/Makefile
--- a/sysutils/xentools3-hvm/Makefile   Sat Aug 30 12:18:56 2008 +0000
+++ b/sysutils/xentools3-hvm/Makefile   Sat Aug 30 16:05:30 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/08/07 16:00:14 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/08/30 16:05:30 bouyer Exp $
 #
 
 VERSION=               3.1.4
@@ -21,7 +21,7 @@
 ONLY_FOR_PLATFORM=     Linux-2.[46]*-i386 Linux-2.[46]*-x86_64
 ONLY_FOR_PLATFORM+=    NetBSD-*-i386 NetBSD-*-x86_64
 
-CONFLICTS=             xentools30-*
+CONFLICTS=             xentools30-* xentools33-*
 
 WRKSRC=                        ${WRKDIR}/xen-${VERSION}/tools
 CHECK_PORTABILITY_SKIP+=       examples/* xm-test/ramdisk/make-release.sh
diff -r fcf943876801 -r e7dc93ba96a9 sysutils/xentools3/Makefile
--- a/sysutils/xentools3/Makefile       Sat Aug 30 12:18:56 2008 +0000
+++ b/sysutils/xentools3/Makefile       Sat Aug 30 16:05:30 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/08/07 16:00:14 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2008/08/30 16:05:30 bouyer Exp $
 #
 
 VERSION=               3.1.4
@@ -24,7 +24,7 @@
 
 CONFLICTS+=            libxen-[0-9]*
 CONFLICTS+=            xentools20-[0-9]*
-CONFLICTS=             xentools30-*
+CONFLICTS+=            xentools30-* xentools33-*
 
 WRKSRC=                        ${WRKDIR}/xen-${VERSION}/tools
 CHECK_PORTABILITY_SKIP=        examples/* xm-test/ramdisk/make-release.sh