From 6e0bfab3722e020a20ff6c44b422525fc5be8178 Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme@pkgsrc.org>
Date: Fri, 3 Oct 2003 07:20:00 +0000
Subject: xchat2 can't coexist with xchat{-gnome} and viceversa. Closes PR
 pkg/23039 by Stefan Krueger.

Bump PKGREVISION.
---
 chat/xchat-gnome/Makefile  | 4 ++--
 chat/xchat/Makefile        | 4 ++--
 chat/xchat/Makefile.common | 4 ++--
 chat/xchat2/Makefile       | 5 ++++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/chat/xchat-gnome/Makefile b/chat/xchat-gnome/Makefile
index 2e5c08e991d..f82c7b04be3 100644
--- a/chat/xchat-gnome/Makefile
+++ b/chat/xchat-gnome/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2002/12/24 09:35:54 tron Exp $
+# $NetBSD: Makefile,v 1.8 2003/10/03 07:20:00 xtraeme Exp $
 
 .include "../xchat/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
 # Don't set "PKGREVISION" here, set it in "../xchat/Makefile.common".
-CONFLICTS+=	xchat-[0-9]*
+CONFLICTS+=	xchat-1.[0-9]* xchat-2.[0-9]*
 COMMENT+=	and GNOME libraries
 
 CONFIGURE_ARGS+=	--enable-panel
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 47b8c4312ef..2382a785818 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/12/24 09:35:53 tron Exp $
+# $NetBSD: Makefile,v 1.27 2003/10/03 07:20:00 xtraeme Exp $
 
 .include "Makefile.common"
 
@@ -7,7 +7,7 @@
 CONFIGURE_ARGS+=	--disable-gnome
 CONFIGURE_ARGS+=	--disable-zvt
 
-CONFLICTS+=		xchat-gnome-[0-9]*
+CONFLICTS+=		xchat-gnome-[0-9]* xchat-2.[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 a04ee0de00f..4a1cf90d557 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.18 2003/07/17 21:26:28 grant Exp $
+# $NetBSD: Makefile.common,v 1.19 2003/10/03 07:20:00 xtraeme Exp $
 
 DISTNAME=	xchat-1.8.11
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	chat x11
 MASTER_SITES=	${HOMEPAGE}files/source/1.8/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/chat/xchat2/Makefile b/chat/xchat2/Makefile
index 58a954ace05..c5fde3abbb0 100644
--- a/chat/xchat2/Makefile
+++ b/chat/xchat2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/09/23 22:00:51 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2003/10/03 07:20:00 xtraeme Exp $
 #
 
 DISTNAME=	xchat-2.0.5
+PKGREVISION=	1
 CATEGORIES=	chat gnome
 MASTER_SITES=	http://www.xchat.org/files/source/2.0/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,6 +14,8 @@ COMMENT=	X11 (X Window System) IRC client, using the GTK2 toolkit
 BUILD_USES_MSGFMT=	YES
 DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
 
+CONFLICTS=		xchat-1.[0-9]* xchat-gnome-1.[0-9]*
+
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
-- 
cgit v1.2.3