Handle some shared directories by depending on (or updating dependancies to

the latest versions) xdg-dirs, xdg-x11-dirs or gnome*-dirs.
Bump PKGREVISION.

12 files changed, 31 insertions, 27 deletions

diff --git a/chat/everybuddy/Makefile b/chat/everybuddy/Makefile
index f7f58a8c044..ded896818a1 100644
--- a/chat/everybuddy/Makefile
+++ b/chat/everybuddy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/08/15 22:48:04 jmc Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/08 19:40:36 jmmv Exp $
 
 .include "Makefile.common"
-PKGREVISION=	4
+PKGREVISION=	5
 
 CONFLICTS+=	everybuddy-gnome-[0-9]*
 
diff --git a/chat/everybuddy/Makefile.common b/chat/everybuddy/Makefile.common
index b31f9469a06..073ba8d501a 100644
--- a/chat/everybuddy/Makefile.common
+++ b/chat/everybuddy/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2004/01/22 07:49:20 grant Exp $
+# $NetBSD: Makefile.common,v 1.13 2004/03/08 19:40:36 jmmv Exp $
 
 DISTNAME=	everybuddy-0.2.0
 CATEGORIES=	chat
@@ -8,7 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.everybuddy.com/
 COMMENT=	Universal Instant Messaging Client
 
-DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=	gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile
index c299c067bd7..1bd7d448d2f 100644
--- a/chat/gabber/Makefile
+++ b/chat/gabber/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2004/03/07 12:09:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.31 2004/03/08 19:40:36 jmmv Exp $
 
 DISTNAME=	gabber-0.8.8
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gabber/}
 
@@ -9,6 +9,8 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://gabber.sourceforge.net/
 COMMENT=	Gnome Jabber Client
 
+DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_GNU_TOOLS+=		make
diff --git a/chat/gabber/PLIST b/chat/gabber/PLIST
index ffef85d0569..626b86358c6 100644
--- a/chat/gabber/PLIST
+++ b/chat/gabber/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/07/10 19:50:11 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/03/08 19:40:36 jmmv Exp $
 bin/gabber
 etc/sound/events/gabber.soundlist
 man/man1/gabber.1
@@ -157,7 +157,6 @@ share/sounds/gabber/gabber_ooochat_recv.wav
 share/sounds/gabber/gabber_startup.wav
 share/sounds/gabber/gabber_subrequest.wav
 @dirrm share/sounds/gabber
-@unexec ${RMDIR} %D/share/sounds 2> /dev/null || ${TRUE}
 @dirrm share/pixmaps/gabber
 @dirrm share/omf/gabber
 @comment in scrollkeeper: @dirrm share/omf
diff --git a/chat/gaim-gnome/Makefile b/chat/gaim-gnome/Makefile
index 62d643cc516..d8ad8996db9 100644
--- a/chat/gaim-gnome/Makefile
+++ b/chat/gaim-gnome/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2004/01/03 18:49:35 reed Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/08 19:40:36 jmmv Exp $
 
 .include "../gaim-gtk1/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
-PKGREVISION=	6
+PKGREVISION=	7
 CONFLICTS+=	gaim-[0-9]*
 COMMENT+=	with GNOME support
 
diff --git a/chat/gaim-gtk1/Makefile.common b/chat/gaim-gtk1/Makefile.common
index 04c779a5833..e4ea1e49072 100644
--- a/chat/gaim-gtk1/Makefile.common
+++ b/chat/gaim-gtk1/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.7 2004/02/14 17:21:34 jlam Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	gaim-0.59.8
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	chat x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/} \
 		ftp://ftp.marko.net/pub/gaim/
@@ -17,7 +17,7 @@ PATCHDIR=	${.CURDIR}/../gaim-gtk1/patches
 PKGDIR=		${.CURDIR}/../gaim-gtk1
 PLIST_SRC=      ${.CURDIR}/../gaim-gtk1/PLIST.common
 
-DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=	gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 USE_GNU_TOOLS+=		make
 USE_X11BASE=		YES
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index ea35c472d49..7fc449b5381 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2004/03/01 15:19:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.56 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	gaim-0.75
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	chat x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +12,7 @@ HOMEPAGE=	http://gaim.sourceforge.net/
 COMMENT=	GTK2 based client for the AOL Instant Messenger chat system
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=	gnome2-dirs>=1.1:../../misc/gnome2-dirs
+DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 CONFLICTS+=	gaim-gnome-[0-9]*
 
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
index 3b2c2e7d4cf..cf01a6bd469 100644
--- a/chat/gaim/PLIST
+++ b/chat/gaim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2004/01/11 20:54:07 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.24 2004/03/08 19:40:36 jmmv Exp $
 bin/gaim
 bin/gaim-remote
 include/gaim-remote/remote-socket.h
@@ -350,7 +350,6 @@ share/sounds/gaim/receive.wav
 share/sounds/gaim/redalert.wav
 share/sounds/gaim/send.wav
 @dirrm share/sounds/gaim
-@unexec ${RMDIR} %D/share/sounds 2>/dev/null || ${TRUE}
 @dirrm share/pixmaps/gaim/status/default
 @dirrm share/pixmaps/gaim/status
 @dirrm share/pixmaps/gaim/smileys/default
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index 670cd7be57c..3227c5cf35c 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/01/22 07:49:20 grant Exp $
+# $NetBSD: Makefile,v 1.19 2004/03/08 19:40:36 jmmv Exp $
 
 DISTNAME=	gnomeicu-0.96
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	chat gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnomeicu/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,6 +10,8 @@ MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://gnomeicu.sourceforge.net/
 COMMENT=	GNOME ICQ client
 
+DEPENDS+=	xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile
index 2591d82b53d..63c75aa54b0 100644
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/03/08 15:48:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	gossip-0.7.2
+PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gossip/0.7/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,7 +11,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GTK2 Jabber Instant Messaging client
 
-DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 BUILD_DEPENDS=		p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
 BUILD_USES_MSGFMT=	yes
 
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index e86b03f30cc..b9faa5d7cde 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.23 2004/01/22 07:49:21 grant Exp $
+# $NetBSD: Makefile.common,v 1.24 2004/03/08 19:40:36 jmmv Exp $
 
 DISTNAME=	xchat-1.8.11
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	chat x11
 MASTER_SITES=	${HOMEPAGE}files/source/1.8/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +11,7 @@ HOMEPAGE=	http://xchat.org/
 COMMENT=	X11 (X Window System) IRC client, using the GTK+ toolkit
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
+DEPENDS+=		gnome1-dirs>=1.5:../../misc/gnome1-dirs
 
 DISTINFO_FILE=	${.CURDIR}/../xchat/distinfo
 FILESDIR=	${.CURDIR}/../xchat/files
diff --git a/chat/xchat2/Makefile b/chat/xchat2/Makefile
index 1aa6e5d4039..bd54a86313a 100644
--- a/chat/xchat2/Makefile
+++ b/chat/xchat2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:35 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2004/03/08 19:40:36 jmmv Exp $
 #
 
 DISTNAME=	xchat-2.0.7
+PKGREVISION=	1
 CATEGORIES=	chat gnome
 MASTER_SITES=	http://www.xchat.org/files/source/2.0/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +12,7 @@ HOMEPAGE=	http://www.xchat.org/
 COMMENT=	X11 (X Window System) IRC client, using the GTK2 toolkit
 
 BUILD_USES_MSGFMT=	YES
-DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
+DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 CONFLICTS=		xchat-gnome-[0-9]*