pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators/suse_libc5 Remove CONFLICT lines with mozill...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a273c87ee384
branches:  trunk
changeset: 466566:a273c87ee384
user:      abs <abs%pkgsrc.org@localhost>
date:      Tue Jan 20 18:19:23 2004 +0000

description:
Remove CONFLICT lines with mozilla-bin and phoenix-bin - no longer appears
to be an issue

diffstat:

 emulators/suse_libc5/Makefile |  5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diffs (19 lines):

diff -r 4a104aae0a9f -r a273c87ee384 emulators/suse_libc5/Makefile
--- a/emulators/suse_libc5/Makefile     Tue Jan 20 18:05:35 2004 +0000
+++ b/emulators/suse_libc5/Makefile     Tue Jan 20 18:19:23 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/09/18 16:25:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 18:19:23 abs Exp $
 
 DISTNAME=              shlibs5
 PKGNAME=               suse_libc5-${SUSE_VERSION}
@@ -12,9 +12,6 @@
 
 DEPENDS+=              suse_compat>=${SUSE_VERSION}:../../emulators/suse_compat
 
-CONFLICTS+=            mozilla-bin-[0-9]*
-CONFLICTS+=            phoenix-bin-[0-9]*
-
 ONLY_FOR_PLATFORM=      NetBSD-*-i386
 
 EXTRACT_ONLY=          # empty



Home | Main Index | Thread Index | Old Index