diff options
| author | jmmv <jmmv> | 2003-04-24 20:46:36 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2003-04-24 20:46:36 +0000 |
| commit | f9d80852e6240a8f47557338c33b7a5b52788e58 (patch) | |
| tree | ad5cc2592ad18f6206d75fa2603f5a15bf847151 /chat | |
| parent | 6c9377b431b87bbc652a3f230223315d4289cf7b (diff) | |
| download | pkgsrc-f9d80852e6240a8f47557338c33b7a5b52788e58.tar.gz | |
gaim-gtk1's package basename is the same as gaim's one; adjust CONFLICTS
accordingly.
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/gaim-gtk1/Makefile | 4 | ||||
| -rw-r--r-- | chat/gaim/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chat/gaim-gtk1/Makefile b/chat/gaim-gtk1/Makefile index 365b0ae1e62..4d04254cad4 100644 --- a/chat/gaim-gtk1/Makefile +++ b/chat/gaim-gtk1/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2003/04/23 02:09:58 jmc Exp $ +# $NetBSD: Makefile,v 1.3 2003/04/24 20:46:36 jmmv Exp $ # .include "Makefile.common" -CONFLICTS+= gaim-[0-9]* gaim-gnome-[0-9]* +CONFLICTS+= gaim>0.59.8 gaim-gnome-[0-9]* USE_BUILDLINK2= YES diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile index bcd1af6eeef..a79ccd006f4 100644 --- a/chat/gaim/Makefile +++ b/chat/gaim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2003/04/11 15:41:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.27 2003/04/24 20:46:36 jmmv Exp $ # DISTNAME= gaim-0.61 @@ -12,7 +12,7 @@ COMMENT= GTK2 based client for the AOL Instant Messenger chat system DEPENDS+= gnome2-dirs>=1.1:../../misc/gnome2-dirs -CONFLICTS+= gaim-gtk1-[0-9]* gaim-gnome-[0-9]* +CONFLICTS+= gaim<0.61 gaim-gnome-[0-9]* GNU_CONFIGURE= YES USE_BUILDLINK2= YES |