[pkgsrc/trunk]: pkgsrc/sysutils/coreutils The 'readlink' conflict is only in ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d189fc548f66
branches:  trunk
changeset: 491995:d189fc548f66
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Sat Apr 02 20:38:45 2005 +0000

description:
The 'readlink' conflict is only in teTeX 1 & 2, not in 3 ("kpsereadlink").
Adjust CONFLICTS.

diffstat:

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

diffs (23 lines):

diff -r f5ac7aa5dde0 -r d189fc548f66 sysutils/coreutils/Makefile
--- a/sysutils/coreutils/Makefile       Sat Apr 02 20:37:31 2005 +0000
+++ b/sysutils/coreutils/Makefile       Sat Apr 02 20:38:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/03/21 14:44:08 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/04/02 20:38:45 hubertf Exp $
 
 DISTNAME=      coreutils-5.2.1
 PKGREVISION=   1
@@ -48,10 +48,10 @@
 CONFLICTS+=            geneweb-[0-9]*
 CONFLICTS+=            graphviz-[0-9]*
 .endif
-# print/teTeX*-bin installs a 'readlink' program, so conflict with it if
-# GNU_PROGRAM_PREFIX == ''
+# print/teTeX-bin and print/teTeX1-bin installs a 'readlink' program, so
+# conflict with it if GNU_PROGRAM_PREFIX == '' (no problem in teTeX3-bin)
 .if ${GNU_PROGRAM_PREFIX} == ""
-CONFLICTS+=            teTeX-bin-[0-9]*
+CONFLICTS+=            teTeX-bin<3
 .endif
 
 PLIST_SUBST+=          GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}