pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/coreutils Conflict with sysutils/mktemp iff $...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b23590cc94e2
branches:  trunk
changeset: 539555:b23590cc94e2
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Mar 08 01:09:50 2008 +0000

description:
Conflict with sysutils/mktemp iff ${GNU_PROGRAM_PREFIX} == ""

diffstat:

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

diffs (26 lines):

diff -r 61b03afaaa6f -r b23590cc94e2 sysutils/coreutils/Makefile
--- a/sysutils/coreutils/Makefile       Sat Mar 08 01:07:38 2008 +0000
+++ b/sysutils/coreutils/Makefile       Sat Mar 08 01:09:50 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2008/03/08 01:06:52 tnn Exp $
+# $NetBSD: Makefile,v 1.44 2008/03/08 01:09:50 tnn Exp $
 
 DISTNAME=      coreutils-6.10
 CATEGORIES=    sysutils
@@ -12,7 +12,7 @@
 PKG_DESTDIR_SUPPORT=   user-destdir
 NOT_FOR_PLATFORM=      NetBSD-2.0[D-H]-*
 
-CONFLICTS=     fileutils-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]* mktemp-[0-9]*
+CONFLICTS=     fileutils-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]*
 
 CFLAGS+=               -g
 LDFLAGS+=              -g
@@ -62,6 +62,7 @@
 # conflict with it if GNU_PROGRAM_PREFIX == '' (no problem in teTeX3-bin)
 .if ${GNU_PROGRAM_PREFIX} == ""
 CONFLICTS+=            teTeX-bin<3
+CONFLICTS+=            mktemp-[0-9]*
 .endif
 
 PLIST_SUBST+=          GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}



Home | Main Index | Thread Index | Old Index