diff options
| author | kei <kei@pkgsrc.org> | 2003-05-27 08:24:16 +0000 |
|---|---|---|
| committer | kei <kei@pkgsrc.org> | 2003-05-27 08:24:16 +0000 |
| commit | 719847a33d13e6dff55d8629074e28bc0d98de0f (patch) | |
| tree | 7899bad031533712a6762a0982d6c5df9c42ecbb /www | |
| parent | 20f9854e3420046e056d8f0cd56dae33557d39ed (diff) | |
| download | pkgsrc-719847a33d13e6dff55d8629074e28bc0d98de0f.tar.gz | |
add CONFLICTS to suse_libc5 with mozilla-bin and phoenix-bin packages each
other. addresses pkg/21675.
Diffstat (limited to 'www')
| -rw-r--r-- | www/mozilla-bin/Makefile.NetBSD.i386 | 4 | ||||
| -rw-r--r-- | www/phoenix-bin/Makefile.NetBSD.i386 | 4 |
2 files changed, 6 insertions, 2 deletions
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" |