summaryrefslogtreecommitdiff
path: root/x11/asclock-gtk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>1999-10-10 06:47:53 +0000
committerjlam <jlam@pkgsrc.org>1999-10-10 06:47:53 +0000
commitd8b2e688b5be7034d3f1a59c2b1a7ed4d7507430 (patch)
tree126de34a221782b3badfd63952a46951f864eb23 /x11/asclock-gtk
parent441579e4f7f92db290edae763bba9586e6c9c387 (diff)
downloadpkgsrc-d8b2e688b5be7034d3f1a59c2b1a7ed4d7507430.tar.gz
Mark conflict with gnome-core.
Diffstat (limited to 'x11/asclock-gtk')
-rw-r--r--x11/asclock-gtk/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/x11/asclock-gtk/Makefile b/x11/asclock-gtk/Makefile
index 8277f4670f9..5660495079e 100644
--- a/x11/asclock-gtk/Makefile
+++ b/x11/asclock-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/10/07 17:25:05 jlam Exp $
+# $NetBSD: Makefile,v 1.2 1999/10/10 06:47:53 jlam Exp $
#
DISTNAME= asclock-gtk-2.1.10beta
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.asclock.org/
DEPENDS+= gtk+-1.2.*:../../x11/gtk
-CONFLICTS= asclock-* asclock-xlib-*
+CONFLICTS= asclock-* asclock-xlib-* gnome-core-*
USE_X11BASE= yes