[pkgsrc/trunk]: pkgsrc/sysutils/coreutils Conflict with linuxls; and sort ent...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/535c9d3e7b23
branches:  trunk
changeset: 468266:535c9d3e7b23
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Wed Feb 11 23:12:50 2004 +0000

description:
Conflict with linuxls; and sort entries in variable.

diffstat:

 sysutils/coreutils/Makefile |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 2c89dce3a2a8 -r 535c9d3e7b23 sysutils/coreutils/Makefile
--- a/sysutils/coreutils/Makefile       Wed Feb 11 23:11:30 2004 +0000
+++ b/sysutils/coreutils/Makefile       Wed Feb 11 23:12:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/17 00:14:14 recht Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/11 23:12:50 jmmv Exp $
 
 DISTNAME=      coreutils-5.0
 PKGREVISION=   4
@@ -12,7 +12,7 @@
 
 BUILD_USES_MSGFMT=     YES
 
-CONFLICTS=     sh-utils-* fileutils-* textutils-*
+CONFLICTS=     fileutils-* linuxls-* sh-utils-* textutils-*
 
 GNU_CONFIGURE=         YES
 USE_BUILDLINK2=                YES