summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorschmonz <schmonz>2002-11-25 11:16:01 +0000
committerschmonz <schmonz>2002-11-25 11:16:01 +0000
commit767f3ad058969660335c03b31f597caa19a7a7bf (patch)
tree5f46114bdcc781cd3fa9f2e791b4ad7c380b4531 /emulators
parent5832a0d2c1412fdfe9c2816227d49071f49a068f (diff)
downloadpkgsrc-767f3ad058969660335c03b31f597caa19a7a7bf.tar.gz
These Linux emulation packages conflict.
Diffstat (limited to 'emulators')
-rw-r--r--emulators/linuxppc_lib/Makefile4
-rw-r--r--emulators/suse_base/Makefile4
2 files changed, 5 insertions, 3 deletions
diff --git a/emulators/linuxppc_lib/Makefile b/emulators/linuxppc_lib/Makefile
index 7f0bc497452..8dc0eaee68b 100644
--- a/emulators/linuxppc_lib/Makefile
+++ b/emulators/linuxppc_lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/02/05 05:56:36 jmc Exp $
+# $NetBSD: Makefile,v 1.15 2002/11/25 11:16:01 schmonz Exp $
DISTNAME= linuxppc_lib-2000.4.6
CATEGORIES= emulators
@@ -20,6 +20,8 @@ COMMENT= libraries to run Linux binaries on NetBSD/powerpc (includes X11)
BUILD_DEPENDS+= rpm2pkg-1.2:../../pkgtools/rpm2pkg
+CONFLICTS= suse_base-[0-9]*
+
ONLY_FOR_PLATFORM= NetBSD-1.5[U-Z]-macppc NetBSD-1.5Z[A-Z]-macppc \
NetBSD-1.[6-9]*-macppc \
NetBSD-1.5[U-Z]-powerpc NetBSD-1.5Z[A-Z]-powerpc \
diff --git a/emulators/suse_base/Makefile b/emulators/suse_base/Makefile
index 00b559e6cf3..939868958f4 100644
--- a/emulators/suse_base/Makefile
+++ b/emulators/suse_base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2002/11/25 11:01:13 schmonz Exp $
+# $NetBSD: Makefile,v 1.34 2002/11/25 11:16:02 schmonz Exp $
DISTNAME= suse_base-${SUSE_VERSION}
CATEGORIES= emulators
@@ -11,7 +11,7 @@ MAINTAINER= tron@netbsd.org
HOMEPAGE= http://www.suse.com/
COMMENT= Linux compatibility package
-CONFLICTS= linux_SuSE-5.3 linux_lib-2.4
+CONFLICTS= linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]*
ONLY_FOR_PLATFORM= NetBSD-1.5Z[C-Z]-i386 NetBSD-1.6*-i386 NetBSD-*-powerpc
USE_BUILDLINK2= # defined