summaryrefslogtreecommitdiff
path: root/chat/xchat/Makefile
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2003-10-03 07:43:11 +0000
committerxtraeme <xtraeme@pkgsrc.org>2003-10-03 07:43:11 +0000
commit032ee2da13b03e45e3c438bbfebc9042465bb984 (patch)
tree7b4d1ca7e9d9c3ba80a6b2a98524de6782fd92af /chat/xchat/Makefile
parent94870412ce9269073b43331073361d8478afd95c (diff)
downloadpkgsrc-032ee2da13b03e45e3c438bbfebc9042465bb984.tar.gz
Revert previous commit (wiz told me there's no need to CONFLICT betweeen
them, because they share the same PKGBASE).
Diffstat (limited to 'chat/xchat/Makefile')
-rw-r--r--chat/xchat/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 2382a785818..38bd81ba541 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2003/10/03 07:20:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.28 2003/10/03 07:43:11 xtraeme Exp $
.include "Makefile.common"
@@ -7,7 +7,7 @@
CONFIGURE_ARGS+= --disable-gnome
CONFIGURE_ARGS+= --disable-zvt
-CONFLICTS+= xchat-gnome-[0-9]* xchat-2.[0-9]*
+CONFLICTS+= xchat-gnome-[0-9]*
.include "../../graphics/gdk-pixbuf/buildlink2.mk"
.include "../../x11/gtk/buildlink2.mk"