diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2003-10-03 07:43:11 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2003-10-03 07:43:11 +0000 |
| commit | 032ee2da13b03e45e3c438bbfebc9042465bb984 (patch) | |
| tree | 7b4d1ca7e9d9c3ba80a6b2a98524de6782fd92af | |
| parent | 94870412ce9269073b43331073361d8478afd95c (diff) | |
| download | pkgsrc-032ee2da13b03e45e3c438bbfebc9042465bb984.tar.gz | |
Revert previous commit (wiz told me there's no need to CONFLICT betweeen
them, because they share the same PKGBASE).
| -rw-r--r-- | chat/xchat-gnome/Makefile | 4 | ||||
| -rw-r--r-- | chat/xchat/Makefile | 4 | ||||
| -rw-r--r-- | chat/xchat/Makefile.common | 4 | ||||
| -rw-r--r-- | chat/xchat2/Makefile | 5 |
4 files changed, 7 insertions, 10 deletions
diff --git a/chat/xchat-gnome/Makefile b/chat/xchat-gnome/Makefile index f82c7b04be3..d33d17892a5 100644 --- a/chat/xchat-gnome/Makefile +++ b/chat/xchat-gnome/Makefile @@ -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 --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 diff --git a/chat/xchat2/Makefile b/chat/xchat2/Makefile index c5fde3abbb0..12e584ed4bf 100644 --- a/chat/xchat2/Makefile +++ b/chat/xchat2/Makefile @@ -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 @@ 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 |