[pkgsrc/trunk]: pkgsrc/chat Revert previous commit (wiz told me there's no ne...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/40412b858a79
branches:  trunk
changeset: 462444:40412b858a79
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Fri Oct 03 07:43:11 2003 +0000

description:
Revert previous commit (wiz told me there's no need to CONFLICT betweeen
them, because they share the same PKGBASE).

diffstat:

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

diffs (69 lines):

diff -r 65767e045568 -r 40412b858a79 chat/xchat-gnome/Makefile
--- a/chat/xchat-gnome/Makefile Fri Oct 03 07:24:20 2003 +0000
+++ b/chat/xchat-gnome/Makefile Fri Oct 03 07:43:11 2003 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2003/10/03 07:20:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2003/10/03 07:43:11 xtraeme Exp $
 
 .include "../xchat/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-gnome-/}
 # Don't set "PKGREVISION" here, set it in "../xchat/Makefile.common".
-CONFLICTS+=    xchat-1.[0-9]* xchat-2.[0-9]*
+CONFLICTS+=    xchat-1.[0-9]*
 COMMENT+=      and GNOME libraries
 
 CONFIGURE_ARGS+=       --enable-panel
diff -r 65767e045568 -r 40412b858a79 chat/xchat/Makefile
--- a/chat/xchat/Makefile       Fri Oct 03 07:24:20 2003 +0000
+++ b/chat/xchat/Makefile       Fri Oct 03 07:43:11 2003 +0000
@@ -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 -r 65767e045568 -r 40412b858a79 chat/xchat/Makefile.common
--- a/chat/xchat/Makefile.common        Fri Oct 03 07:24:20 2003 +0000
+++ b/chat/xchat/Makefile.common        Fri Oct 03 07:43:11 2003 +0000
@@ -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
diff -r 65767e045568 -r 40412b858a79 chat/xchat2/Makefile
--- a/chat/xchat2/Makefile      Fri Oct 03 07:24:20 2003 +0000
+++ b/chat/xchat2/Makefile      Fri Oct 03 07:43:11 2003 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/10/03 07:20:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2003/10/03 07:43:11 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
@@ -14,8 +13,6 @@
 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