summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorasau <asau>2009-08-12 13:36:06 +0000
committerasau <asau>2009-08-12 13:36:06 +0000
commit08baf9bb2e7b250500bf288f80defc068656c212 (patch)
tree800fc34114e44c2b97c9bb48bddcf07d9a2677b8 /sysutils
parent677104bfbd244f5ddfcc00b2450d4a1edabd5860 (diff)
downloadpkgsrc-08baf9bb2e7b250500bf288f80defc068656c212.tar.gz
Conflicts with gnuls (misc/gnuls), as noted by Mihkel Ader in PR 41876.
Bump revision.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/coreutils/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index 7d0ac196f71..1daa9d4a5be 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.48 2009/05/17 23:11:21 dholland Exp $
+# $NetBSD: Makefile,v 1.49 2009/08/12 13:36:06 asau Exp $
.include "../../sysutils/coreutils/Makefile.common"
-PKGREVISION= 1
+PKGREVISION= 2
-CONFLICTS= fileutils-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]*
+CONFLICTS= fileutils-[0-9]* gnuls-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]*
# if GNU_PROGRAM_PREFIX == 'g'
# devel/id-utils installs a 'gid' program, so conflict with it