summaryrefslogtreecommitdiff
path: root/chat/xchat
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
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')
-rw-r--r--chat/xchat/Makefile4
-rw-r--r--chat/xchat/Makefile.common4
2 files changed, 4 insertions, 4 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"
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index 4a1cf90d557..03b1d6f7d7b 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.19 2003/10/03 07:20:00 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.20 2003/10/03 07:43:11 xtraeme Exp $
DISTNAME= xchat-1.8.11
-PKGREVISION= 4
+PKGREVISION= 3
CATEGORIES= chat x11
MASTER_SITES= ${HOMEPAGE}files/source/1.8/
EXTRACT_SUFX= .tar.bz2