Depend on gnome1-dirs to handle shared directories. Bump PKGREVISION.

12 files changed, 33 insertions, 20 deletions

diff --git a/chat/everybuddy-gnome/Makefile b/chat/everybuddy-gnome/Makefile
index 65df57199e8..1fb12d129e9 100644
--- a/chat/everybuddy-gnome/Makefile
+++ b/chat/everybuddy-gnome/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2002/12/24 06:09:45 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/27 12:54:54 jmmv Exp $
 
 .include "../everybuddy/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
-PKGREVISION=	3
+PKGREVISION=	4
 CONFLICTS+=	everybuddy-[0-9]*
 COMMENT+=	with GNOME support
 
diff --git a/chat/everybuddy/Makefile b/chat/everybuddy/Makefile
index b3cc30d1b21..8b2b5017f1e 100644
--- a/chat/everybuddy/Makefile
+++ b/chat/everybuddy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/10/05 17:29:19 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/27 12:54:52 jmmv Exp $
 
 .include "Makefile.common"
-PKGREVISION=	1
+PKGREVISION=	2
 
 USE_BUILDLINK2=	yes
 CONFLICTS+=	everybuddy-gnome-[0-9]*
diff --git a/chat/everybuddy/Makefile.common b/chat/everybuddy/Makefile.common
index 8b0da16f8d5..52fba5e8f36 100644
--- a/chat/everybuddy/Makefile.common
+++ b/chat/everybuddy/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2002/10/10 07:32:15 tron Exp $
+# $NetBSD: Makefile.common,v 1.3 2003/01/27 12:54:53 jmmv Exp $
 
 DISTNAME=	everybuddy-0.2.0
 CATEGORIES=	chat
@@ -26,3 +26,5 @@ post-build:
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/wrapper ${PREFIX}/bin/everybuddy
+
+.include "../../misc/gnome1-dirs/buildlink2.mk"
diff --git a/chat/everybuddy/PLIST b/chat/everybuddy/PLIST
index 0b9ff2d4fdc..b409be3e999 100644
--- a/chat/everybuddy/PLIST
+++ b/chat/everybuddy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/12/19 14:10:04 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/27 12:54:53 jmmv Exp $
 bin/everybuddy
 libexec/everybuddy/everybuddy
 libexec/everybuddy/contact-update.pl
@@ -11,4 +11,5 @@ share/sounds/everybuddy/BuddyLeave.au
 share/sounds/everybuddy/Send.au
 share/sounds/everybuddy/Receive.au
 @dirrm share/sounds/everybuddy
+@comment in gnome-dirs: @dirrm share/gnome/apps/Internet
 @dirrm libexec/everybuddy
diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile
index a70ee2212ca..a54273e7820 100644
--- a/chat/gabber/Makefile
+++ b/chat/gabber/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/01/23 17:12:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/27 12:54:54 jmmv Exp $
 
 DISTNAME=	gabber-0.8.7
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gabber/}
 
@@ -24,6 +24,7 @@ CONFIGURE_ARGS+=	--disable-xmms --disable-sigctest
 .include "../../devel/libsigc++/buildlink2.mk"
 .include "../../lang/gcc/buildlink2.mk"
 .include "../../graphics/freetype-lib/buildlink2.mk"
+.include "../../misc/gnome1-dirs/buildlink2.mk"
 .include "../../textproc/scrollkeeper/buildlink2.mk"
 .include "../../x11/gtk--/buildlink2.mk"
 .include "../../x11/gnome--/buildlink2.mk"
diff --git a/chat/gabber/PLIST b/chat/gabber/PLIST
index c6184b8f52a..1d1ebe94d8d 100644
--- a/chat/gabber/PLIST
+++ b/chat/gabber/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/09/11 23:39:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/01/27 12:54:54 jmmv Exp $
 bin/gabber
 etc/sound/events/gabber.soundlist
 man/man1/gabber.1
@@ -173,7 +173,7 @@ share/sounds/gabber/gabber_subrequest.wav
 @dirrm share/gnome/help/gabber/C/stylesheet-images
 @dirrm share/gnome/help/gabber/C
 @dirrm share/gnome/help/gabber
-@unexec ${RMDIR} %D/share/gnome/help 2> /dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome/apps/Internet 2> /dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome/apps 2> /dev/null || ${TRUE}
+@comment in gnome-dirs: @dirrm share/gnome/help
+@comment in gnome-dirs: @dirrm share/gnome/apps/Internet
+@comment in gnome-dirs: @dirrm share/gnome/apps
 @dirrm share/gabber
diff --git a/chat/gaim/Makefile.common b/chat/gaim/Makefile.common
index 365fd5866a4..2986e9a2318 100644
--- a/chat/gaim/Makefile.common
+++ b/chat/gaim/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.10 2003/01/10 13:32:05 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.11 2003/01/27 12:54:55 jmmv Exp $
 #
 
 DISTNAME=	gaim-0.59.8
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	chat x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/} \
 		ftp://ftp.marko.net/pub/gaim/
@@ -47,3 +47,4 @@ CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ENV+=		gt_cv_func_gnugettext1_libc=yes
 
 .include "../../converters/libiconv/buildlink2.mk"
+.include "../../misc/gnome1-dirs/buildlink2.mk"
diff --git a/chat/gaim/PLIST.common b/chat/gaim/PLIST.common
index eda395a8ff6..2799045eef5 100644
--- a/chat/gaim/PLIST.common
+++ b/chat/gaim/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.3 2002/08/28 07:43:54 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.4 2003/01/27 12:54:55 jmmv Exp $
 lib/gaim/autorecon.so
 lib/gaim/chatlist.so
 lib/gaim/iconaway.so
@@ -49,4 +49,5 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gaim.mo
 share/pixmaps/gaim.png
+@comment in gnome-dirs: @dirrm share/gnome/apps/Internet
 @dirrm lib/gaim
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index 4ff26a9e049..6f94b5da6e2 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2002/12/24 06:09:46 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/01/27 12:54:55 jmmv Exp $
 
 DISTNAME=	gnomeicu-0.96
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	chat gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnomeicu/}
 EXTRACT_SUFX=	.tar.bz2
@@ -20,6 +20,7 @@ LIBS+=		-liconv
 
 .include "../../databases/gdbm/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../misc/gnome1-dirs/buildlink2.mk"
 .include "../../x11/gnome-core/buildlink2.mk"
 .include "../../converters/libiconv/buildlink2.mk"
 
diff --git a/chat/gnomeicu/PLIST b/chat/gnomeicu/PLIST
index b3430e4746f..702b242893e 100644
--- a/chat/gnomeicu/PLIST
+++ b/chat/gnomeicu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/12/09 16:01:15 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/01/27 12:54:55 jmmv Exp $
 bin/gnomeicu
 bin/gnomeicu-client
 etc/CORBA/servers/GnomeICU.gnorba
@@ -115,6 +115,9 @@ share/sounds/gnomeicu/message.wav
 @dirrm share/gnome/help/gnomeicu/C/images
 @dirrm share/gnome/help/gnomeicu/C
 @dirrm share/gnome/help/gnomeicu
+@comment in gnome-dirs: @dirrm share/gnome/help
+@comment in gnome-dirs: @dirrm share/gnome/apps/Internet
+@comment in gnome-dirs: @dirrm share/gnome/apps
 @dirrm share/gnomeicu/icons/Default
 @dirrm share/gnomeicu/icons/Eyeballs
 @dirrm share/gnomeicu/icons/reDubbed
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index 2b743c44c20..fabd29faf43 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.13 2003/01/12 21:49:06 tron Exp $
+# $NetBSD: Makefile.common,v 1.14 2003/01/27 12:54:56 jmmv Exp $
 
 DISTNAME=	xchat-1.8.11
+PKGREVISION=	1
 CATEGORIES=	chat x11
 MASTER_SITES=	${HOMEPAGE}files/source/1.8/
 EXTRACT_SUFX=	.tar.bz2
@@ -54,3 +55,4 @@ post-install:
 .include "../../devel/glib/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../lang/python/application.mk"
+.include "../../misc/gnome1-dirs/buildlink2.mk"
diff --git a/chat/xchat/PLIST b/chat/xchat/PLIST
index bb69a89d705..0437cb1c1b9 100644
--- a/chat/xchat/PLIST
+++ b/chat/xchat/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/12 21:49:07 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/01/27 12:54:56 jmmv Exp $
 bin/xchat
 bin/xchat-text
 share/doc/xchat/xchat-1.html
@@ -45,4 +45,5 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/xchat.mo
 share/pixmaps/xchat.png
+@comment in gnome-dirs: @dirrm share/gnome/apps/Internet
 @dirrm share/doc/xchat