summaryrefslogtreecommitdiff
path: root/x11/gnome-core
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2003-09-08 18:08:33 +0000
committerjmmv <jmmv@pkgsrc.org>2003-09-08 18:08:33 +0000
commit44e50bea60c7f0faec94b0260d1399ea54201558 (patch)
treebb1d709e818186e8676c38869a1fa39887c4fcb3 /x11/gnome-core
parenta4207a9569d647a6abc78bb358b15011d1897df2 (diff)
downloadpkgsrc-44e50bea60c7f0faec94b0260d1399ea54201558.tar.gz
Conflict with gnome2-terminal. Bump PKGREVISION to 7.
Diffstat (limited to 'x11/gnome-core')
-rw-r--r--x11/gnome-core/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index 8aaf10574e6..1cadd666267 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -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 @@ DEPENDS+= gnome-panel>=1.4.2:../../x11/gnome1-panel
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