pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/coreutils Add a comment why coreutils conflic...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e68827c97a51
branches: trunk
changeset: 470229:e68827c97a51
user: recht <recht%pkgsrc.org@localhost>
date: Sun Mar 07 11:31:34 2004 +0000
description:
Add a comment why coreutils conflicts with databases/geneweb.
While at it combine all GNU_PROGRAM_PREFIX conflicts in a single if.
diffstat:
sysutils/coreutils/Makefile | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diffs (37 lines):
diff -r 88fdc1722d84 -r e68827c97a51 sysutils/coreutils/Makefile
--- a/sysutils/coreutils/Makefile Sun Mar 07 11:23:27 2004 +0000
+++ b/sysutils/coreutils/Makefile Sun Mar 07 11:31:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/02/24 14:11:36 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/03/07 11:31:34 recht Exp $
DISTNAME= coreutils-5.2.0
CATEGORIES= sysutils
@@ -24,22 +24,20 @@
.include "../../mk/bsd.prefs.mk"
CONFIGURE_ARGS= --program-prefix=${GNU_PROGRAM_PREFIX}
-# devel/id-utils installs a 'gid' program, so conflict with it if
-# GNU_PROGRAM_PREFIX == 'g'
+# if GNU_PROGRAM_PREFIX == 'g'
+# devel/id-utils installs a 'gid' program, so conflict with it
+# databases/geneweb a 'gwc' program, so conflict with it
+# graphics/graphviz installs a 'gpr' program, so conflict with it
.if ${GNU_PROGRAM_PREFIX} == "g"
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 == ''
.if ${GNU_PROGRAM_PREFIX} == ""
CONFLICTS+= teTeX-bin-[0-9]*
.endif
-# graphics/graphviz installs a 'gpr' program, so conflict with it if
-# GNU_PROGRAM_PREFIX == 'g'
-.if ${GNU_PROGRAM_PREFIX} == "g"
-CONFLICTS+= graphviz-[0-9]*
-.endif
PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
BUILD_DEFS+= GNU_PROGRAM_PREFIX
Home |
Main Index |
Thread Index |
Old Index