diff options
| author | kei <kei> | 2003-05-27 08:24:16 +0000 |
|---|---|---|
| committer | kei <kei> | 2003-05-27 08:24:16 +0000 |
| commit | c01e78a7339807ac8a32797002cc509937c9ff7f (patch) | |
| tree | 7899bad031533712a6762a0982d6c5df9c42ecbb | |
| parent | d8b76fb5594de6dde7ce338cc76240ae852acf06 (diff) | |
| download | pkgsrc-c01e78a7339807ac8a32797002cc509937c9ff7f.tar.gz | |
add CONFLICTS to suse_libc5 with mozilla-bin and phoenix-bin packages each
other. addresses pkg/21675.
| -rw-r--r-- | emulators/suse_libc5/Makefile | 5 | ||||
| -rw-r--r-- | www/mozilla-bin/Makefile.NetBSD.i386 | 4 | ||||
| -rw-r--r-- | www/phoenix-bin/Makefile.NetBSD.i386 | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/emulators/suse_libc5/Makefile b/emulators/suse_libc5/Makefile index 7c2fdf46dc4..31b089d155e 100644 --- a/emulators/suse_libc5/Makefile +++ b/emulators/suse_libc5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2003/03/26 04:05:47 jschauma Exp $ +# $NetBSD: Makefile,v 1.20 2003/05/27 08:24:16 kei Exp $ DISTNAME= shlibs5 PKGNAME= suse_libc5-${SUSE_VERSION} @@ -12,6 +12,9 @@ COMMENT= Linux compatibility package for libc5 binaries DEPENDS+= suse_compat>=${SUSE_VERSION}:../suse_compat +CONFLICTS+= mozilla-bin-[0-9]* +CONFLICTS+= phoenix-bin-[0-9]* + ONLY_FOR_PLATFORM= NetBSD-*-i386 EXTRACT_ONLY= # empty diff --git a/www/mozilla-bin/Makefile.NetBSD.i386 b/www/mozilla-bin/Makefile.NetBSD.i386 index cda85a6a6d2..04f130503fe 100644 --- a/www/mozilla-bin/Makefile.NetBSD.i386 +++ b/www/mozilla-bin/Makefile.NetBSD.i386 @@ -1,10 +1,12 @@ -# $NetBSD: Makefile.NetBSD.i386,v 1.2 2003/04/14 22:50:18 grant Exp $ +# $NetBSD: Makefile.NetBSD.i386,v 1.3 2003/05/27 08:24:17 kei Exp $ # DEPENDS+= suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat DEPENDS+= suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11 DEPENDS+= suse_gtk>=7.3:../../emulators/${SUSE_DIR_PREFIX}_gtk +CONFLICTS+= suse_libc5-[0-9]* + .include "Makefile.Linux.i386" .include "../../emulators/suse_linux/Makefile.application" diff --git a/www/phoenix-bin/Makefile.NetBSD.i386 b/www/phoenix-bin/Makefile.NetBSD.i386 index 650c62b9521..04f130503fe 100644 --- a/www/phoenix-bin/Makefile.NetBSD.i386 +++ b/www/phoenix-bin/Makefile.NetBSD.i386 @@ -1,10 +1,12 @@ -# $NetBSD: Makefile.NetBSD.i386,v 1.2 2003/04/14 22:59:31 grant Exp $ +# $NetBSD: Makefile.NetBSD.i386,v 1.3 2003/05/27 08:24:17 kei Exp $ # DEPENDS+= suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat DEPENDS+= suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11 DEPENDS+= suse_gtk>=7.3:../../emulators/${SUSE_DIR_PREFIX}_gtk +CONFLICTS+= suse_libc5-[0-9]* + .include "Makefile.Linux.i386" .include "../../emulators/suse_linux/Makefile.application" |