[pkgsrc/trunk]: pkgsrc/x11/gnome-core Conflict with gnome2-terminal. Bump PK...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/df648c418f47
branches:  trunk
changeset: 460975:df648c418f47
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Mon Sep 08 18:08:33 2003 +0000

description:
Conflict with gnome2-terminal.  Bump PKGREVISION to 7.

diffstat:

 x11/gnome-core/Makefile |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 04b53d0278a4 -r df648c418f47 x11/gnome-core/Makefile
--- a/x11/gnome-core/Makefile   Mon Sep 08 18:07:21 2003 +0000
+++ b/x11/gnome-core/Makefile   Mon Sep 08 18:08:33 2003 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.91 2003/07/13 13:53:55 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2003/09/08 18:08:33 jmmv Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=           6
+PKGREVISION=           7
 
 COMMENT=               Core component of GNU Network Object Management Environment
 
@@ -14,6 +14,8 @@
 BUILD_DEPENDS+=                gtk-doc>=0.9:../../textproc/gtk-doc
 BUILD_USES_MSGFMT=     YES
 
+CONFLICTS+=            gnome2-terminal-[0-9]*
+
 .include "../../mk/bsd.prefs.mk"
 .if (${LOCALBASE} == ${X11PREFIX})
 BUILDLINK_DEPENDS.gnome-pixmaps=gnome{,2}-pixmaps>=1.4.2