pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/graphics/graphviz conflict with sysutils/coreutils, wh...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5c19401ded33
branches:  trunk
changeset: 469498:5c19401ded33
user:      grant <grant%pkgsrc.org@localhost>
date:      Tue Feb 24 14:29:34 2004 +0000

description:
conflict with sysutils/coreutils, which installs a program named
'gpr'.

diffstat:

 graphics/graphviz/Makefile |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (24 lines):

diff -r fcced1cddb2c -r 5c19401ded33 graphics/graphviz/Makefile
--- a/graphics/graphviz/Makefile        Tue Feb 24 14:11:36 2004 +0000
+++ b/graphics/graphviz/Makefile        Tue Feb 24 14:29:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:42 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2004/02/24 14:29:34 grant Exp $
 #
 
 DISTNAME=      graphviz-1.10
@@ -18,6 +18,14 @@
 USE_X11=               yes
 XAW_TYPE=              standard
 
+.include "../../mk/bsd.prefs.mk"
+
+# sysutils/coreutils installs a 'gpr' program, so conflict with it if
+# GNU_PROGRAM_PREFIX == 'g'
+.if ${GNU_PROGRAM_PREFIX} == "g"
+CONFLICTS+=            coreutils-[0-9]*
+.endif
+
 CONFIGURE_ENV+=                TCLCONFIG=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
 CONFIGURE_ENV+=                TKCONFIG=${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
 CONFIGURE_ENV+=                X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}



Home | Main Index | Thread Index | Old Index