summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2004-02-11 23:12:50 +0000
committerjmmv <jmmv@pkgsrc.org>2004-02-11 23:12:50 +0000
commit6099983cd1bd57997995eaa5831f09985b2a7b51 (patch)
treeebb17e09cab73c37d3d6bf9f2b97c0d288233a9c /sysutils
parentabe929429e379f5c31b205cfa8794723c06ed4e5 (diff)
downloadpkgsrc-6099983cd1bd57997995eaa5831f09985b2a7b51.tar.gz
Conflict with linuxls; and sort entries in variable.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/coreutils/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index bced3676373..384456cbe23 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -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 @@ COMMENT= GNU basic file, shell and text manipulation utilities
BUILD_USES_MSGFMT= YES
-CONFLICTS= sh-utils-* fileutils-* textutils-*
+CONFLICTS= fileutils-* linuxls-* sh-utils-* textutils-*
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES