Depend on hicolor-icon-theme to:

1) Handle the shared share/icons/hicolor directory.
2) Properly regenerate the icon theme cache during (de)installation.
Bump PKGREVISION.

16 files changed, 48 insertions, 32 deletions

diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 7badacba816..563af2103cb 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.16 2006/03/09 21:04:42 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/02 09:49:00 jmmv Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-mixer-${XFCE4_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 COMMENT=	Xfce mixer plugin
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index 10fc3c11ac3..fa3e3de920c 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:09:14 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/02 09:49:01 jmmv Exp $
 
 DISTNAME=	enigma-0.92
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://savannah.nongnu.org/download/enigma/
 
@@ -26,4 +26,5 @@ SUBST_SED.enigma=	-e s!/usr/local/!${PREFIX}/!
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../devel/SDL_ttf/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freesci/Makefile b/games/freesci/Makefile
index 50393e55d11..4fe1e6a61d9 100644
--- a/games/freesci/Makefile
+++ b/games/freesci/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2006/03/09 21:04:43 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/04/02 09:49:01 jmmv Exp $
 #
 
 DISTNAME=		freesci-0.3.4c
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		games
 MASTER_SITES=		http://www-plan.cs.colorado.edu/reichenb/freesci/ \
 			http://teksolv.de/~jameson/
@@ -25,6 +25,7 @@ post-install:
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 #.include "../../mk/motif.buildlink3.mk"
 #.include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp24/Makefile b/graphics/gimp24/Makefile
index 19c7f28c46b..6c3ead3226a 100644
--- a/graphics/gimp24/Makefile
+++ b/graphics/gimp24/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2006/03/06 00:18:11 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/02 09:49:01 jmmv Exp $
 
 DISTNAME=	gimp-2.3.7
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.3/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/v2.3/ \
@@ -57,6 +57,7 @@ LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 .include "../../devel/pango/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/aalib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
diff --git a/graphics/xfce4-iconbox/Makefile b/graphics/xfce4-iconbox/Makefile
index 1214f118446..12a03a107e0 100644
--- a/graphics/xfce4-iconbox/Makefile
+++ b/graphics/xfce4-iconbox/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:09:41 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/02 09:49:01 jmmv Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-iconbox-${XFCE4_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 COMMENT=	Xfce icon displayer
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index e660e837546..665fab8109d 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2006/03/21 06:00:46 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2006/04/02 09:49:01 jmmv Exp $
 
 DISTNAME=	balsa-2.3.10
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://balsa.gnome.org/				\
 		ftp://ftp.newton.cx/pub/balsa/
@@ -47,6 +47,7 @@ BUILDLINK_DEPENDS.gmime+=	gmime>=2.1.9
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mail/gmime/buildlink3.mk"
 .include "../../mail/libesmtp/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index e21aa16b565..2aece29e169 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2006/02/20 08:17:09 martti Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/02 09:49:01 jmmv Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 PKGNAME=	xfce4-print-${XFCE4_VERSION}
 DISTNAME=	xfprint-${XFCE4_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
 COMMENT=	Xfce print dialog
 
@@ -18,6 +18,7 @@ PLIST_SUBST+=	SOLARIS="@comment "
 PLIST_SUBST+=	SOLARIS=""
 .endif
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../print/a2ps/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-fm/Makefile b/sysutils/xfce4-fm/Makefile
index 4229081c611..18508081dbd 100644
--- a/sysutils/xfce4-fm/Makefile
+++ b/sysutils/xfce4-fm/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/02 09:49:01 jmmv Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xffm-${XFCE4_VERSION}
 PKGNAME=	xfce4-fm-${XFCE4_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 COMMENT=	Xfce filemanager
 
@@ -18,6 +18,7 @@ LIBS+=			${PTHREAD_LDFLAGS}
 UNLIMIT_RESOURCES+=	datasize
 
 .include "../../databases/dbh/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/time/xfce4-calendar/Makefile b/time/xfce4-calendar/Makefile
index 19f6588240c..f5db4f2fc05 100644
--- a/time/xfce4-calendar/Makefile
+++ b/time/xfce4-calendar/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:11:11 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/04/02 09:49:01 jmmv Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfcalendar-${XFCE4_VERSION}
 PKGNAME=	xfce4-calendar-${XFCE4_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	time
 COMMENT=	Xfce calendar
 
 .include "../../databases/dbh/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/xfce4-wm/Makefile b/wm/xfce4-wm/Makefile
index 2550b2bf7d2..6cdaadf552a 100644
--- a/wm/xfce4-wm/Makefile
+++ b/wm/xfce4-wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:11:16 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/04/02 09:49:01 jmmv Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -6,10 +6,11 @@ XFCE4_VERSION=	4.2.3.2
 
 DISTNAME=	xfwm4-${XFCE4_VERSION}
 PKGNAME=	xfce4-wm-${XFCE4_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	wm
 COMMENT=	Xfce window manager
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile
index 91caace3407..a202675effd 100644
--- a/x11/xfce4-desktop/Makefile
+++ b/x11/xfce4-desktop/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2006/02/24 14:15:12 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/02 09:49:01 jmmv Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfdesktop-${XFCE4_VERSION}
 PKGNAME=	xfce4-desktop-${XFCE4_VERSION}
 #PKGREVISION=	1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 COMMENT=	Xfce desktop background manager
 
@@ -29,6 +29,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
 
 REQD_DIRS+=		${XFCE4_EGBASE:Q} ${EGDIR:Q}
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-mcs-manager/Makefile b/x11/xfce4-mcs-manager/Makefile
index 77193373a6d..cea31b73f53 100644
--- a/x11/xfce4-mcs-manager/Makefile
+++ b/x11/xfce4-mcs-manager/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:11:46 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/02 09:49:01 jmmv Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce-mcs-manager-${XFCE4_VERSION}
 PKGNAME=	xfce4-mcs-manager-${XFCE4_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 COMMENT=	Xfce settings manager
 
 PKGCONFIG_OVERRIDE=	xfce-mcs-manager/xfce-mcs-manager.pc.in
 PTHREAD_AUTO_VARS=	yes
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../x11/libxfce4mcs/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/x11/xfce4-mcs-plugins/Makefile b/x11/xfce4-mcs-plugins/Makefile
index 7f10407698c..e8c28a06b64 100644
--- a/x11/xfce4-mcs-plugins/Makefile
+++ b/x11/xfce4-mcs-plugins/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:11:46 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/02 09:49:01 jmmv Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce-mcs-plugins-${XFCE4_VERSION}
 PKGNAME=	xfce4-mcs-plugins-${XFCE4_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 COMMENT=	Xfce settings manager plugins
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-mcs-manager/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index 2eeb0fa128b..78acb449954 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.25 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: Makefile,v 1.26 2006/04/02 09:49:01 jmmv Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-panel-${XFCE4_VERSION}
 #PKGREVISION=	1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 COMMENT=	Xfce panel
 
@@ -25,6 +25,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
 
 REQD_DIRS+=		${XFCE4_EGBASE} ${EGDIR}
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index 1b3cbf88427..cdd0697d082 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/02 09:49:01 jmmv Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-session-${XFCE4_VERSION}
 #PKGREVISION=	1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 COMMENT=	Xfce session manager
 
@@ -21,5 +21,6 @@ REQD_DIRS+=		${XFCE4_EGBASE} ${EGDIR}
 
 USE_TOOLS+=	iceauth:run
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile
index 9e078b0079a..85c6d281515 100644
--- a/x11/xfce4-utils/Makefile
+++ b/x11/xfce4-utils/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2006/03/20 06:29:09 martti Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/02 09:49:01 jmmv Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce-utils-${XFCE4_VERSION}
 PKGNAME=	xfce4-utils-${XFCE4_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 COMMENT=	Xfce utilities
 
@@ -19,5 +19,6 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
 
 .include "options.mk"
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"