summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorsborrill <sborrill>2011-10-03 17:01:23 +0000
committersborrill <sborrill>2011-10-03 17:01:23 +0000
commit1f7fe6a29bd2f53dfe5c096159ff1f6c77e29d9f (patch)
tree6f6fbbc92fcbd49c8742d48eb215e85c3d6a9b33 /sysutils
parent9ed2054ef93c98e8279bb5edb927d672bb62763f (diff)
downloadpkgsrc-1f7fe6a29bd2f53dfe5c096159ff1f6c77e29d9f.tar.gz
Conflict with xenstoretools
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/xentools3-hvm/Makefile3
-rw-r--r--sysutils/xentools3/Makefile3
-rw-r--r--sysutils/xentools33/Makefile3
3 files changed, 6 insertions, 3 deletions
diff --git a/sysutils/xentools3-hvm/Makefile b/sysutils/xentools3-hvm/Makefile
index 2d5968f8abb..dc209c82d87 100644
--- a/sysutils/xentools3-hvm/Makefile
+++ b/sysutils/xentools3-hvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2010/02/10 19:17:46 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2011/10/03 17:01:24 sborrill Exp $
#
VERSION= 3.1.4
@@ -22,6 +22,7 @@ ONLY_FOR_PLATFORM= Linux-2.[46]*-i386 Linux-2.[46]*-x86_64
ONLY_FOR_PLATFORM+= NetBSD-*-i386 NetBSD-*-x86_64
CONFLICTS= xentools30-* xentools33-*
+CONFLICTS+= xenstoretools-*
WRKSRC= ${WRKDIR}/xen-${VERSION}/tools
CHECK_PORTABILITY_SKIP+= examples/* xm-test/ramdisk/make-release.sh
diff --git a/sysutils/xentools3/Makefile b/sysutils/xentools3/Makefile
index 99de8a95998..b7dc601a023 100644
--- a/sysutils/xentools3/Makefile
+++ b/sysutils/xentools3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2011/04/22 13:44:46 obache Exp $
+# $NetBSD: Makefile,v 1.25 2011/10/03 17:01:23 sborrill Exp $
#
VERSION= 3.1.4
@@ -28,6 +28,7 @@ ONLY_FOR_PLATFORM+= NetBSD-*-i386 NetBSD-*-x86_64
CONFLICTS+= libxen-[0-9]*
CONFLICTS+= xentools20-[0-9]*
CONFLICTS+= xentools30-* xentools33-*
+CONFLICTS+= xenstoretools-*
WRKSRC= ${WRKDIR}/xen-${VERSION}/tools
CHECK_PORTABILITY_SKIP= examples/* xm-test/ramdisk/make-release.sh
diff --git a/sysutils/xentools33/Makefile b/sysutils/xentools33/Makefile
index adb8b6d970a..56ad13e49ad 100644
--- a/sysutils/xentools33/Makefile
+++ b/sysutils/xentools33/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2011/05/20 17:09:21 bouyer Exp $
+# $NetBSD: Makefile,v 1.27 2011/10/03 17:01:24 sborrill Exp $
#
VERSION= 3.3.2
@@ -30,6 +30,7 @@ ONLY_FOR_PLATFORM+= NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386
CONFLICTS+= libxen-[0-9]*
CONFLICTS+= xentools20-[0-9]*
CONFLICTS+= xentools30-* xentools3-*
+CONFLICTS+= xenstoretools-*
WRKSRC= ${WRKDIR}/xen-${VERSION}/tools
CHECK_PORTABILITY_SKIP= examples/* xm-test/ramdisk/make-release.sh