diff options
| author | hubertf <hubertf> | 2005-04-02 20:38:45 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2005-04-02 20:38:45 +0000 |
| commit | 7a8b920955971a58116a86c7420e115c972b6ad8 (patch) | |
| tree | 2bc6caf83e6ae915be8170bb99044783cadf4b20 /sysutils | |
| parent | 2a0157cad263e17a11d20e112a8480c101240e69 (diff) | |
| download | pkgsrc-7a8b920955971a58116a86c7420e115c972b6ad8.tar.gz | |
The 'readlink' conflict is only in teTeX 1 & 2, not in 3 ("kpsereadlink").
Adjust CONFLICTS.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/coreutils/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile index ec5a83bc677..b021db0f9f6 100644 --- a/sysutils/coreutils/Makefile +++ b/sysutils/coreutils/Makefile @@ -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+= id-utils-[0-9]* gnome-utils<1.4.1.2nb2 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} |