diff --git a/x11/xfce4/exo/Makefile b/x11/xfce4/exo/Makefile
index cb173161537..f51071c7364 100644
--- a/x11/xfce4/exo/Makefile
+++ b/x11/xfce4/exo/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.36 2011/10/14 11:37:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.37 2011/12/03 22:32:21 ajacoutot Exp $
 
 COMMENT=	Xfce4 extension library
 
 XFCE_VERSION=	0.6.2
 XFCE_PROJECT=	exo
 
-REVISION=	3
+REVISION=	4
 
 SHARED_LIBS=	exo-1		0.0
 
@@ -19,6 +19,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 MODXFCE_DESKTOP_FILE=	Yes
+MODFXCE_ICON_CACHE=	Yes
 
 CONFIGURE_ARGS=	--disable-python --disable-linker-opts
 CONFIGURE_ENV=	ac_cv_header_sys_ucred_h=yes \
diff --git a/x11/xfce4/exo/pkg/PLIST b/x11/xfce4/exo/pkg/PLIST
index 86b7390a11c..ca54514ed6e 100644
--- a/x11/xfce4/exo/pkg/PLIST
+++ b/x11/xfce4/exo/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.13 2011/03/07 19:22:02 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.14 2011/12/03 22:32:21 ajacoutot Exp $
 %%SHARED%%
 @bin bin/exo-csource
 @bin bin/exo-desktop-item-edit
@@ -313,7 +313,7 @@ share/xfce4/helpers/thunderbird.desktop
 share/xfce4/helpers/urxvt.desktop
 share/xfce4/helpers/w3m.desktop
 share/xfce4/helpers/xterm.desktop
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
diff --git a/x11/xfce4/libxfce4ui/Makefile b/x11/xfce4/libxfce4ui/Makefile
index 44d119b6b71..d5d8767b18d 100644
--- a/x11/xfce4/libxfce4ui/Makefile
+++ b/x11/xfce4/libxfce4ui/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2011/10/13 16:43:21 jasper Exp $
+# $OpenBSD: Makefile,v 1.4 2011/12/03 22:32:21 ajacoutot Exp $
 
 COMMENT=	Xfce4 widget library
 
 XFCE_PROJECT=	libxfce4ui
-REVISION=	1
+REVISION=	2
 
 SHARED_LIBS=	xfce4ui-1		0.0	\
 		xfce4kbd-private-2	0.0	# 0.0
@@ -20,6 +20,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 
+MODFXCE_ICON_CACHE=	Yes
 LIB_DEPENDS=	x11/xfce4/xfconf>=4.8.0 \
 		x11/gtk+2 \
 		devel/startup-notification
diff --git a/x11/xfce4/libxfce4ui/pkg/PLIST b/x11/xfce4/libxfce4ui/pkg/PLIST
index 23755c0631a..69d4dba40f3 100644
--- a/x11/xfce4/libxfce4ui/pkg/PLIST
+++ b/x11/xfce4/libxfce4ui/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/01/18 19:59:33 landry Exp $
+@comment $OpenBSD: PLIST,v 1.2 2011/12/03 22:32:21 ajacoutot Exp $
 @conflict libxfcegui4-<4.7.0
 %%SHARED%%
 include/xfce4/
@@ -127,5 +127,5 @@ share/locale/ur_PK/LC_MESSAGES/
 share/locale/ur_PK/LC_MESSAGES/libxfce4ui.mo
 share/locale/zh_CN/LC_MESSAGES/libxfce4ui.mo
 share/locale/zh_TW/LC_MESSAGES/libxfce4ui.mo
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
diff --git a/x11/xfce4/libxfcegui4/Makefile b/x11/xfce4/libxfcegui4/Makefile
index 6432e989704..cb5506331fc 100644
--- a/x11/xfce4/libxfcegui4/Makefile
+++ b/x11/xfce4/libxfcegui4/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.34 2011/10/13 18:43:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.35 2011/12/03 22:32:21 ajacoutot Exp $
 
 COMMENT=	Xfce4 widget library
 
 XFCE_PROJECT=	libxfcegui4
 
-REVISION=	1
+REVISION=	2
 
 SHARED_LIBS=	xfcegui4	5.0
 
@@ -18,6 +18,8 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 
+MODFXCE_ICON_CACHE=	Yes
+
 CONFIGURE_ARGS+=	--disable-linker-opts
 LIB_DEPENDS=	x11/xfce4/libxfce4util>=4.8.0 \
 		devel/startup-notification \
diff --git a/x11/xfce4/libxfcegui4/pkg/PLIST b/x11/xfce4/libxfcegui4/pkg/PLIST
index d116f7b4aa0..2025141cbb3 100644
--- a/x11/xfce4/libxfcegui4/pkg/PLIST
+++ b/x11/xfce4/libxfcegui4/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.15 2011/01/18 21:34:58 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.16 2011/12/03 22:32:21 ajacoutot Exp $
 @conflict xfce4-panel-<4.4.1
 %%SHARED%%
 include/xfce4/
@@ -209,5 +209,5 @@ share/locale/ur_PK/LC_MESSAGES/
 share/locale/ur_PK/LC_MESSAGES/libxfcegui4.mo
 share/locale/zh_CN/LC_MESSAGES/libxfcegui4.mo
 share/locale/zh_TW/LC_MESSAGES/libxfcegui4.mo
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
diff --git a/x11/xfce4/notification-daemon-xfce/Makefile b/x11/xfce4/notification-daemon-xfce/Makefile
index d4e44300f74..25776af3fab 100644
--- a/x11/xfce4/notification-daemon-xfce/Makefile
+++ b/x11/xfce4/notification-daemon-xfce/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2011/10/14 11:37:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.25 2011/12/03 22:32:21 ajacoutot Exp $
 
 COMMENT=	Xfce4 notification daemon
 
 XFCE_VERSION=	0.3.7
 XFCE_GOODIE=	notification-daemon-xfce
-REVISION=	15
+REVISION=	16
 
 MASTER_SITES=	http://archive.xfce.org/src/archive/${XFCE_GOODIE}/${XFCE_BRANCH}/
 # GPLv2
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 MODXFCE_DESKTOP_FILE=	Yes
+MODFXCE_ICON_CACHE=	Yes
 
 LIB_DEPENDS=	x11/xfce4/libxfcegui4 \
 		x11/libsexy \
diff --git a/x11/xfce4/notification-daemon-xfce/pkg/PLIST b/x11/xfce4/notification-daemon-xfce/pkg/PLIST
index d30a38da66f..75298bb2fb3 100644
--- a/x11/xfce4/notification-daemon-xfce/pkg/PLIST
+++ b/x11/xfce4/notification-daemon-xfce/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2011/01/18 21:34:58 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.9 2011/12/03 22:32:21 ajacoutot Exp $
 @conflict notification-daemon-*
 @conflict xfce4-notifyd-*
 %%SHARED%%
@@ -29,7 +29,7 @@ share/locale/hu/LC_MESSAGES/notification-daemon-xfce.mo
 share/locale/nl/LC_MESSAGES/notification-daemon-xfce.mo
 share/locale/pl/LC_MESSAGES/notification-daemon-xfce.mo
 share/locale/uk/LC_MESSAGES/notification-daemon-xfce.mo
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
diff --git a/x11/xfce4/orage/Makefile b/x11/xfce4/orage/Makefile
index 7a5c7c9a116..c4dd56811a8 100644
--- a/x11/xfce4/orage/Makefile
+++ b/x11/xfce4/orage/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.33 2011/10/14 11:37:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.34 2011/12/03 22:32:21 ajacoutot Exp $
 
 COMMENT=	Xfce4 advanced calendar
 
 XFCE_GOODIE=	orage
 XFCE_VERSION=	4.8.2
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE=	http://www.xfce.org/projects/orage
 # GPLv2
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 MODXFCE_DESKTOP_FILE=	Yes
+MODFXCE_ICON_CACHE=	Yes
 
 LIB_DEPENDS =	x11/xfce4/xfce4-panel \
 		devel/popt \
diff --git a/x11/xfce4/orage/pkg/PLIST b/x11/xfce4/orage/pkg/PLIST
index ed0f19b4183..73eddcaaf72 100644
--- a/x11/xfce4/orage/pkg/PLIST
+++ b/x11/xfce4/orage/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.12 2011/09/16 21:03:05 landry Exp $
+@comment $OpenBSD: PLIST,v 1.13 2011/12/03 22:32:21 ajacoutot Exp $
 @conflict xfcalendar-*
 @bin bin/globaltime
 @bin bin/orage
@@ -168,7 +168,7 @@ share/orage/sounds/Wall_c.wav
 share/xfce4/
 share/xfce4/panel-plugins/
 share/xfce4/panel-plugins/xfce4-orageclock-plugin.desktop
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
diff --git a/x11/xfce4/parole/Makefile b/x11/xfce4/parole/Makefile
index 8a3280e571d..0bed28c38ff 100644
--- a/x11/xfce4/parole/Makefile
+++ b/x11/xfce4/parole/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2011/10/14 11:37:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.13 2011/12/03 22:32:21 ajacoutot Exp $
 
 COMMENT =	Xfce4 media player
 
 XFCE_VERSION =	0.2.0.5
 XFCE_GOODIE =	parole
 CATEGORIES +=	audio
-REVISION=	1
+REVISION=	2
 
 # GPLv2
 PERMIT_DISTFILES_CDROM =	Yes
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_FTP =	Yes
 
 MODULES =	x11/xfce4
 MODXFCE_DESKTOP_FILE =	Yes
+MODFXCE_ICON_CACHE=	Yes
 
 CONFIGURE_ARGS =	--disable-power-manager-plugin
 
diff --git a/x11/xfce4/parole/pkg/PLIST b/x11/xfce4/parole/pkg/PLIST
index 9f98de214b9..4764496d990 100644
--- a/x11/xfce4/parole/pkg/PLIST
+++ b/x11/xfce4/parole/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2011/04/17 10:36:50 landry Exp $
+@comment $OpenBSD: PLIST,v 1.5 2011/12/03 22:32:21 ajacoutot Exp $
 %%SHARED%%
 @bin bin/parole
 include/parole/
@@ -69,7 +69,7 @@ share/parole/parole-plugins-0/window-title.desktop
 share/parole/pixmaps/
 share/parole/pixmaps/loader.gif
 share/parole/pixmaps/parole.png
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
diff --git a/x11/xfce4/ristretto/Makefile b/x11/xfce4/ristretto/Makefile
index 8ec2e3a8bbf..6138ebbc630 100644
--- a/x11/xfce4/ristretto/Makefile
+++ b/x11/xfce4/ristretto/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2011/10/14 11:37:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.25 2011/12/03 22:32:21 ajacoutot Exp $
 
 COMMENT=	Xfce4 lightweight image-viewer
 
 XFCE_VERSION=	0.0.93
 XFCE_GOODIE=	ristretto
-REVISION =      0
+REVISION =      1
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 MODXFCE_DESKTOP_FILE=	Yes
+MODFXCE_ICON_CACHE=	Yes
 RUN_DEPENDS=	misc/shared-mime-info
 
 LIB_DEPENDS=	x11/dbus-glib \
diff --git a/x11/xfce4/ristretto/pkg/PLIST b/x11/xfce4/ristretto/pkg/PLIST
index 3e6ef4b248d..e647df5dab5 100644
--- a/x11/xfce4/ristretto/pkg/PLIST
+++ b/x11/xfce4/ristretto/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.11 2011/03/03 21:02:34 landry Exp $
+@comment $OpenBSD: PLIST,v 1.12 2011/12/03 22:32:21 ajacoutot Exp $
 @bin bin/ristretto
 share/applications/ristretto.desktop
 share/doc/ristretto/
@@ -73,7 +73,7 @@ share/locale/ur_PK/LC_MESSAGES/
 share/locale/ur_PK/LC_MESSAGES/ristretto.mo
 share/locale/vi/LC_MESSAGES/ristretto.mo
 share/locale/zh_CN/LC_MESSAGES/ristretto.mo
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
diff --git a/x11/xfce4/terminal/Makefile b/x11/xfce4/terminal/Makefile
index dd04e245817..9cfcaaa0ad2 100644
--- a/x11/xfce4/terminal/Makefile
+++ b/x11/xfce4/terminal/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2011/10/14 11:37:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.34 2011/12/03 22:32:21 ajacoutot Exp $
 
 COMMENT=	Xfce4 vte-based terminal
 
@@ -6,7 +6,7 @@ XFCE_VERSION=	0.4.8
 XFCE_GOODIE=	Terminal
 # :L is here for a reason
 PKGNAME=	xfce4-${DISTNAME:L}
-REVISION=	3
+REVISION=	4
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
@@ -16,6 +16,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 MODXFCE_DESKTOP_FILE=	Yes
+MODFXCE_ICON_CACHE=	Yes
 USE_GROFF =	Yes
 CONFIGURE_ARGS +=	--program-transform-name='s/Terminal/xfce4-terminal/' \
 			--disable-linker-opts
diff --git a/x11/xfce4/terminal/pkg/PLIST b/x11/xfce4/terminal/pkg/PLIST
index 1572dd8ad58..9c9b4aa9dae 100644
--- a/x11/xfce4/terminal/pkg/PLIST
+++ b/x11/xfce4/terminal/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.13 2011/03/03 21:03:09 landry Exp $
+@comment $OpenBSD: PLIST,v 1.14 2011/12/03 22:32:21 ajacoutot Exp $
 @conflict terminal-<=0.4.5p1
 @bin bin/xfce4-terminal
 man/ca/
@@ -343,7 +343,7 @@ share/locale/zh_CN/LC_MESSAGES/Terminal.mo
 share/locale/zh_TW/LC_MESSAGES/Terminal.mo
 share/pixmaps/
 share/pixmaps/terminal.xpm
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
diff --git a/x11/xfce4/thunar-archive/Makefile b/x11/xfce4/thunar-archive/Makefile
index b16594be6c5..b5eb454304b 100644
--- a/x11/xfce4/thunar-archive/Makefile
+++ b/x11/xfce4/thunar-archive/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2011/03/03 21:17:11 landry Exp $
+# $OpenBSD: Makefile,v 1.10 2011/12/03 22:32:21 ajacoutot Exp $
 
 COMMENT =	Thunar archive plugin
 
 XFCE_VERSION =	0.3.0
 THUNAR_PLUGIN =	thunar-archive-plugin
+REVISION=	0
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
@@ -13,6 +14,8 @@ PERMIT_DISTFILES_FTP =	Yes
 
 MODULES =	x11/xfce4
 
+MODFXCE_ICON_CACHE=	Yes
+
 BUILD_DEPENDS +=${RUN_DEPENDS}
 RUN_DEPENDS =	x11/xfce4/thunar \
 		xarchiver-*|file-roller-*|kdeutils-*:x11/xarchiver
diff --git a/x11/xfce4/thunar-archive/pkg/PLIST b/x11/xfce4/thunar-archive/pkg/PLIST
index 9205b502323..5451c47c88d 100644
--- a/x11/xfce4/thunar-archive/pkg/PLIST
+++ b/x11/xfce4/thunar-archive/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2011/03/03 21:17:11 landry Exp $
+@comment $OpenBSD: PLIST,v 1.6 2011/12/03 22:32:21 ajacoutot Exp $
 %%SHARED%%
 @comment lib/thunarx-2/thunar-archive-plugin.a
 @comment lib/thunarx-2/thunar-archive-plugin.la
@@ -48,5 +48,5 @@ share/locale/ur/LC_MESSAGES/thunar-archive-plugin.mo
 share/locale/ur_PK/LC_MESSAGES/thunar-archive-plugin.mo
 share/locale/zh_CN/LC_MESSAGES/thunar-archive-plugin.mo
 share/locale/zh_TW/LC_MESSAGES/thunar-archive-plugin.mo
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
diff --git a/x11/xfce4/thunar-vcs/Makefile b/x11/xfce4/thunar-vcs/Makefile
index 6040f87ef1f..6be1658c08f 100644
--- a/x11/xfce4/thunar-vcs/Makefile
+++ b/x11/xfce4/thunar-vcs/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2011/10/14 11:37:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.18 2011/12/03 22:32:21 ajacoutot Exp $
 
 COMMENT =	Thunar vcs integration plugin
 
 XFCE_VERSION =	0.1.4
 THUNAR_PLUGIN =	thunar-vcs-plugin
-REVISION=	1
+REVISION=	2
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
@@ -19,6 +19,8 @@ CONFIGURE_ARGS +=	--disable-linker-opts
 # correctly find bindtextdomain
 CONFIGURE_ENV +=	LIBS='-liconv'
 
+MODFXCE_ICON_CACHE=	Yes
+
 RUN_DEPENDS =	x11/xfce4/thunar \
 		devel/git
 BUILD_DEPENDS +=x11/xfce4/thunar
diff --git a/x11/xfce4/thunar-vcs/pkg/PLIST b/x11/xfce4/thunar-vcs/pkg/PLIST
index e888e7f2281..a200669d1da 100644
--- a/x11/xfce4/thunar-vcs/pkg/PLIST
+++ b/x11/xfce4/thunar-vcs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2011/03/20 20:27:00 landry Exp $
+@comment $OpenBSD: PLIST,v 1.9 2011/12/03 22:32:21 ajacoutot Exp $
 @conflict thunar-vcs-plugin-*
 %%SHARED%%
 @comment lib/thunarx-2/thunar-vcs-plugin.a
@@ -29,5 +29,5 @@ share/locale/sv/LC_MESSAGES/thunar-vcs-plugin.mo
 share/locale/ur/LC_MESSAGES/thunar-vcs-plugin.mo
 share/locale/ur_PK/LC_MESSAGES/thunar-vcs-plugin.mo
 share/locale/zh_CN/LC_MESSAGES/thunar-vcs-plugin.mo
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
diff --git a/x11/xfce4/thunar/Makefile b/x11/xfce4/thunar/Makefile
index 508b6f4185f..ec123958f7f 100644
--- a/x11/xfce4/thunar/Makefile
+++ b/x11/xfce4/thunar/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2011/10/13 21:25:44 jasper Exp $
+# $OpenBSD: Makefile,v 1.42 2011/12/03 22:32:21 ajacoutot Exp $
 
 COMMENT=	Xfce4 file manager
 
@@ -7,7 +7,7 @@ XFCE_PROJECT=	Thunar
 # :L is here for a reason
 PKGNAME=	${DISTNAME:L}
 
-REVISION=	0
+REVISION=	1
 
 SHARED_LIBS=	thunarx-2	0.0
 
@@ -19,6 +19,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 MODXFCE_DESKTOP_FILE=	Yes
+MODFXCE_ICON_CACHE=	Yes
 NO_REGRESS=	Yes
 
 CONFIGURE_ENV=	ac_cv_header_sys_ucred_h=yes \
diff --git a/x11/xfce4/thunar/pkg/PLIST b/x11/xfce4/thunar/pkg/PLIST
index 6cd25850da2..2006bc72692 100644
--- a/x11/xfce4/thunar/pkg/PLIST
+++ b/x11/xfce4/thunar/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.16 2011/09/20 23:03:09 landry Exp $
+@comment $OpenBSD: PLIST,v 1.17 2011/12/03 22:32:21 ajacoutot Exp $
 @conflict xffm-*
 %%SHARED%%
 @bin bin/Thunar
@@ -447,7 +447,7 @@ share/pixmaps/Thunar/
 share/pixmaps/Thunar/Thunar-about-logo.png
 share/xfce4/panel-plugins/
 share/xfce4/panel-plugins/thunar-tpa.desktop
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
diff --git a/x11/xfce4/xfce-utils/Makefile b/x11/xfce4/xfce-utils/Makefile
index b5185de7d85..4f816dee0be 100644
--- a/x11/xfce4/xfce-utils/Makefile
+++ b/x11/xfce4/xfce-utils/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.40 2011/10/14 12:22:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.41 2011/12/03 22:32:21 ajacoutot Exp $
 
 COMMENT=	Xfce4 essential utilities and scripts
 
 XFCE_PROJECT=	xfce-utils
 XFCE_VERSION=	4.8.3
-REVISION =	0
+REVISION =	1
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 MODXFCE_DESKTOP_FILE=	Yes
+MODFXCE_ICON_CACHE=	Yes
 
 LIB_DEPENDS=	x11/xfce4/libxfce4ui>=4.8.0 \
 		x11/dbus-glib
diff --git a/x11/xfce4/xfce-utils/pkg/PLIST b/x11/xfce4/xfce-utils/pkg/PLIST
index a0308490adf..0728624ac51 100644
--- a/x11/xfce4/xfce-utils/pkg/PLIST
+++ b/x11/xfce4/xfce-utils/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.17 2011/09/22 22:20:10 landry Exp $
+@comment $OpenBSD: PLIST,v 1.18 2011/12/03 22:32:21 ajacoutot Exp $
 bin/startxfce4
 bin/xfbrowser4
 @bin bin/xfce4-about
@@ -191,7 +191,7 @@ share/locale/zh_CN/LC_MESSAGES/xfce-utils.mo
 share/locale/zh_TW/LC_MESSAGES/xfce-utils.mo
 share/xsessions/
 share/xsessions/xfce.desktop
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
diff --git a/x11/xfce4/xfce4-appfinder/Makefile b/x11/xfce4/xfce4-appfinder/Makefile
index 4b834fe1720..2c63910be60 100644
--- a/x11/xfce4/xfce4-appfinder/Makefile
+++ b/x11/xfce4/xfce4-appfinder/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.32 2011/10/14 12:22:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.33 2011/12/03 22:32:21 ajacoutot Exp $
 
 COMMENT=	Xfce4 application finder
 
 XFCE_PROJECT=	xfce4-appfinder
-REVISION =      0
+REVISION =      1
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 MODXFCE_DESKTOP_FILE=	Yes
+MODFXCE_ICON_CACHE=	Yes
 
 CONFIGURE_ARGS= --disable-linker-opts
 LIB_DEPENDS=	x11/xfce4/garcon \
diff --git a/x11/xfce4/xfce4-appfinder/pkg/PLIST b/x11/xfce4/xfce4-appfinder/pkg/PLIST
index f95774c3bc1..a9e2293705b 100644
--- a/x11/xfce4/xfce4-appfinder/pkg/PLIST
+++ b/x11/xfce4/xfce4-appfinder/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.14 2011/01/18 20:28:24 landry Exp $
+@comment $OpenBSD: PLIST,v 1.15 2011/12/03 22:32:21 ajacoutot Exp $
 @bin bin/xfce4-appfinder
 share/applications/xfce4-appfinder.desktop
 share/icons/
@@ -109,7 +109,7 @@ share/locale/ur_PK/LC_MESSAGES/
 share/locale/ur_PK/LC_MESSAGES/xfce4-appfinder.mo
 share/locale/zh_CN/LC_MESSAGES/xfce4-appfinder.mo
 share/locale/zh_TW/LC_MESSAGES/xfce4-appfinder.mo
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
diff --git a/x11/xfce4/xfce4-battery/Makefile b/x11/xfce4/xfce4-battery/Makefile
index 9ec1fd229f0..b3eb9e3cdec 100644
--- a/x11/xfce4/xfce4-battery/Makefile
+++ b/x11/xfce4/xfce4-battery/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2011/10/14 12:22:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.32 2011/12/03 22:32:21 ajacoutot Exp $
 
 ONLY_FOR_ARCHS=	${APM_ARCHS}
 
@@ -6,7 +6,7 @@ COMMENT=	Xfce4 battery monitor panel plugin
 
 XFCE_VERSION=	1.0.0
 XFCE_PLUGIN=	battery
-REVISION=	1
+REVISION=	2
 
 # BSD
 PERMIT_DISTFILES_CDROM=	Yes
@@ -16,6 +16,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 LIB_DEPENDS =	x11/xfce4/libxfcegui4
+MODFXCE_ICON_CACHE=	Yes
 
 WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 		Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \
diff --git a/x11/xfce4/xfce4-battery/pkg/PLIST b/x11/xfce4/xfce4-battery/pkg/PLIST
index fd0b0b777af..85d14acdc1e 100644
--- a/x11/xfce4/xfce4-battery/pkg/PLIST
+++ b/x11/xfce4/xfce4-battery/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2011/01/03 22:31:48 landry Exp $
+@comment $OpenBSD: PLIST,v 1.9 2011/12/03 22:32:21 ajacoutot Exp $
 @conflict xfce4-battery-plugin-*
 libexec/xfce4/
 libexec/xfce4/panel-plugins/
@@ -79,5 +79,5 @@ share/locale/zh_TW/LC_MESSAGES/xfce4-battery-plugin.mo
 share/xfce4/
 share/xfce4/panel-plugins/
 share/xfce4/panel-plugins/battmon.desktop
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
diff --git a/x11/xfce4/xfce4-clipman/Makefile b/x11/xfce4/xfce4-clipman/Makefile
index 61191ac78b0..44be3c8a6aa 100644
--- a/x11/xfce4/xfce4-clipman/Makefile
+++ b/x11/xfce4/xfce4-clipman/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.31 2011/10/14 12:22:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.32 2011/12/03 22:32:22 ajacoutot Exp $
 
 COMMENT=	Xfce4 clipboard history panel plugin
 
 XFCE_VERSION=	1.1.3
 XFCE_PLUGIN=	clipman
-REVISION =      0
+REVISION =      1
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 MODXFCE_DESKTOP_FILE=	Yes
+MODFXCE_ICON_CACHE=	Yes
 
 LIB_DEPENDS+=	x11/xfce4/xfconf \
 		x11/xfce4/libxfcegui4 \
diff --git a/x11/xfce4/xfce4-clipman/pkg/PLIST b/x11/xfce4/xfce4-clipman/pkg/PLIST
index a07b9576271..0e51d69478b 100644
--- a/x11/xfce4/xfce4-clipman/pkg/PLIST
+++ b/x11/xfce4/xfce4-clipman/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.10 2011/01/18 21:02:04 landry Exp $
+@comment $OpenBSD: PLIST,v 1.11 2011/12/03 22:32:22 ajacoutot Exp $
 @bin bin/xfce4-clipman
 @bin bin/xfce4-clipman-settings
 @bin bin/xfce4-popup-clipman
@@ -131,7 +131,7 @@ share/xfce4/doc/zh_CN/images/clipman-settings-general.png
 share/xfce4/doc/zh_CN/xfce4-clipman-plugin.html
 share/xfce4/panel-plugins/
 share/xfce4/panel-plugins/xfce4-clipman-plugin.desktop
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
diff --git a/x11/xfce4/xfce4-cpugraph/Makefile b/x11/xfce4/xfce4-cpugraph/Makefile
index 18daf3cfd04..f6e44b7c96b 100644
--- a/x11/xfce4/xfce4-cpugraph/Makefile
+++ b/x11/xfce4/xfce4-cpugraph/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2011/10/14 12:22:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2011/12/03 22:32:22 ajacoutot Exp $
 
 COMMENT=	Xfce4 cpu usage graph panel plugin
 
 XFCE_VERSION=	1.0.1
 XFCE_PLUGIN=	cpugraph
-REVISION =	2
+REVISION =	3
 
 # GPLv2+
 PERMIT_DISTFILES_CDROM=	Yes
@@ -13,6 +13,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
+
+MODFXCE_ICON_CACHE=	Yes
 LIB_DEPENDS =	x11/xfce4/libxfcegui4
 
 WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
diff --git a/x11/xfce4/xfce4-cpugraph/pkg/PLIST b/x11/xfce4/xfce4-cpugraph/pkg/PLIST
index 9e0ca54db51..2f49dac9380 100644
--- a/x11/xfce4/xfce4-cpugraph/pkg/PLIST
+++ b/x11/xfce4/xfce4-cpugraph/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2010/12/05 18:13:18 landry Exp $
+@comment $OpenBSD: PLIST,v 1.3 2011/12/03 22:32:22 ajacoutot Exp $
 @conflict xfce4-diskperf-plugin-*
 libexec/xfce4/
 libexec/xfce4/panel-plugins/
@@ -70,5 +70,5 @@ share/locale/zh_TW/LC_MESSAGES/xfce4-cpugraph-plugin.mo
 share/xfce4/
 share/xfce4/panel-plugins/
 share/xfce4/panel-plugins/cpugraph.desktop
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
diff --git a/x11/xfce4/xfce4-dict/Makefile b/x11/xfce4/xfce4-dict/Makefile
index 5490911d364..b4cdc6b07f7 100644
--- a/x11/xfce4/xfce4-dict/Makefile
+++ b/x11/xfce4/xfce4-dict/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2011/10/14 12:22:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.24 2011/12/03 22:32:22 ajacoutot Exp $
 
 COMMENT=	Xfce4 dictionary application
 
 XFCE_VERSION=	0.6.0
 XFCE_GOODIE=	xfce4-dict
-REVISION=	4
+REVISION=	5
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 MODXFCE_DESKTOP_FILE=	Yes
+MODFXCE_ICON_CACHE=	Yes
 
 LIB_DEPENDS=	x11/xfce4/xfce4-panel \
 		x11/xfce4/libxfcegui4
diff --git a/x11/xfce4/xfce4-dict/pkg/PLIST b/x11/xfce4/xfce4-dict/pkg/PLIST
index b5f46866a8c..b3b9ea2bc3c 100644
--- a/x11/xfce4/xfce4-dict/pkg/PLIST
+++ b/x11/xfce4/xfce4-dict/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.9 2009/12/31 12:01:26 landry Exp $
+@comment $OpenBSD: PLIST,v 1.10 2011/12/03 22:32:22 ajacoutot Exp $
 @bin bin/xfce4-dict
 libexec/xfce4/
 libexec/xfce4/panel-plugins/
@@ -55,7 +55,7 @@ share/locale/zh_CN/LC_MESSAGES/xfce4-dict.mo
 share/xfce4/
 share/xfce4/panel-plugins/
 share/xfce4/panel-plugins/xfce4-dict-plugin.desktop
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
diff --git a/x11/xfce4/xfce4-fsguard/Makefile b/x11/xfce4/xfce4-fsguard/Makefile
index 3cb128370ca..cb4fe5b09c5 100644
--- a/x11/xfce4/xfce4-fsguard/Makefile
+++ b/x11/xfce4/xfce4-fsguard/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.28 2011/10/14 12:22:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.29 2011/12/03 22:32:22 ajacoutot Exp $
 
 COMMENT =	Xfce4 disk usage monitor panel plugin
 
 XFCE_VERSION =	1.0.0
 XFCE_PLUGIN =	fsguard
-REVISION =	1
+REVISION =	2
 
 # BSD
 PERMIT_DISTFILES_CDROM=	Yes
@@ -13,6 +13,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES =	x11/xfce4
+
+MODFXCE_ICON_CACHE=	Yes
 LIB_DEPENDS =	x11/xfce4/libxfcegui4
 
 WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
diff --git a/x11/xfce4/xfce4-fsguard/pkg/PLIST b/x11/xfce4/xfce4-fsguard/pkg/PLIST
index 351f6bcf630..58c70408745 100644
--- a/x11/xfce4/xfce4-fsguard/pkg/PLIST
+++ b/x11/xfce4/xfce4-fsguard/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.10 2010/12/23 16:44:46 landry Exp $
+@comment $OpenBSD: PLIST,v 1.11 2011/12/03 22:32:22 ajacoutot Exp $
 @conflict xfce4-fsguard-plugin-*
 libexec/xfce4/
 libexec/xfce4/panel-plugins/
@@ -98,5 +98,5 @@ share/locale/zh_TW/LC_MESSAGES/xfce4-fsguard-plugin.mo
 share/xfce4/
 share/xfce4/panel-plugins/
 share/xfce4/panel-plugins/fsguard.desktop
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
diff --git a/x11/xfce4/xfce4-mailwatch/Makefile b/x11/xfce4/xfce4-mailwatch/Makefile
index a357d826432..e0b85bcf852 100644
--- a/x11/xfce4/xfce4-mailwatch/Makefile
+++ b/x11/xfce4/xfce4-mailwatch/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2011/10/14 12:22:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.19 2011/12/03 22:32:22 ajacoutot Exp $
 
 COMMENT=	Xfce4 mailboxes monitor panel plugin
 
 XFCE_VERSION=	1.1.0
 XFCE_PLUGIN=	mailwatch
-REVISION=	8
+REVISION=	9
 
 HOMEPAGE=	http://spuriousinterrupt.org/projects/mailwatch
 
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_FTP=	Yes
 MODULES=	x11/xfce4
 MASTER_SITES=	http://spuriousinterrupt.org/files/mailwatch/
 
+MODFXCE_ICON_CACHE=	Yes
+
 LIB_DEPENDS+=	security/gnutls
 LIB_DEPENDS+=	x11/xfce4/libxfcegui4 \
 		security/libgcrypt
diff --git a/x11/xfce4/xfce4-mailwatch/pkg/PLIST b/x11/xfce4/xfce4-mailwatch/pkg/PLIST
index e3ac3d7d80e..d1ae65bd815 100644
--- a/x11/xfce4/xfce4-mailwatch/pkg/PLIST
+++ b/x11/xfce4/xfce4-mailwatch/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2009/12/21 16:07:44 landry Exp $
+@comment $OpenBSD: PLIST,v 1.6 2011/12/03 22:32:22 ajacoutot Exp $
 libexec/xfce4/
 libexec/xfce4/panel-plugins/
 @bin libexec/xfce4/panel-plugins/xfce4-mailwatch-plugin
@@ -69,5 +69,5 @@ share/xfce4/doc/C/images/mailwatch-properties.png
 share/xfce4/doc/C/xfce4-mailwatch-plugin.html
 share/xfce4/panel-plugins/
 share/xfce4/panel-plugins/mailwatch.desktop
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
diff --git a/x11/xfce4/xfce4-netload/Makefile b/x11/xfce4/xfce4-netload/Makefile
index 7b66afc5171..c4c88402bc6 100644
--- a/x11/xfce4/xfce4-netload/Makefile
+++ b/x11/xfce4/xfce4-netload/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2011/10/14 12:22:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.25 2011/12/03 22:32:22 ajacoutot Exp $
 
 COMMENT=	Xfce4 network load monitor panel plugin
 
 XFCE_VERSION=	1.0.0
 XFCE_PLUGIN=	netload
-REVISION =	1
+REVISION =	2
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
@@ -13,6 +13,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
+
+MODFXCE_ICON_CACHE=	Yes
 LIB_DEPENDS+=	x11/xfce4/libxfcegui4
 
 WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
diff --git a/x11/xfce4/xfce4-netload/pkg/PLIST b/x11/xfce4/xfce4-netload/pkg/PLIST
index a395f341471..9ab88f21187 100644
--- a/x11/xfce4/xfce4-netload/pkg/PLIST
+++ b/x11/xfce4/xfce4-netload/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2010/12/08 20:13:48 landry Exp $
+@comment $OpenBSD: PLIST,v 1.8 2011/12/03 22:32:22 ajacoutot Exp $
 libexec/xfce4/
 libexec/xfce4/panel-plugins/
 @bin libexec/xfce4/panel-plugins/xfce4-netload-plugin
@@ -70,5 +70,5 @@ share/locale/zh_CN/LC_MESSAGES/xfce4-netload-plugin.mo
 share/xfce4/
 share/xfce4/panel-plugins/
 share/xfce4/panel-plugins/netload.desktop
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
diff --git a/x11/xfce4/xfce4-notes/Makefile b/x11/xfce4/xfce4-notes/Makefile
index 18bd355f13e..8abc98c74f2 100644
--- a/x11/xfce4/xfce4-notes/Makefile
+++ b/x11/xfce4/xfce4-notes/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.34 2011/10/14 12:22:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.35 2011/12/03 22:32:22 ajacoutot Exp $
 
 COMMENT=	Xfce4 sticky notes panel plugin
 
 XFCE_VERSION=	1.7.7
 XFCE_PLUGIN=	notes
 
-REVISION=	1
+REVISION=	2
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 MODXFCE_DESKTOP_FILE =	Yes
+MODFXCE_ICON_CACHE=	Yes
 
 LIB_DEPENDS +=	devel/libunique
 LIB_DEPENDS +=	x11/xfce4/libxfcegui4
diff --git a/x11/xfce4/xfce4-notes/pkg/PLIST b/x11/xfce4/xfce4-notes/pkg/PLIST
index 3135436fd45..11e2a74f973 100644
--- a/x11/xfce4/xfce4-notes/pkg/PLIST
+++ b/x11/xfce4/xfce4-notes/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.15 2011/01/18 21:34:58 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.16 2011/12/03 22:32:22 ajacoutot Exp $
 @bin bin/xfce4-notes
 @bin bin/xfce4-notes-settings
 @bin bin/xfce4-popup-notes
@@ -109,7 +109,7 @@ share/xfce4-notes-plugin/pixmaps/notes-menu-active.png
 share/xfce4-notes-plugin/pixmaps/notes-menu.png
 share/xfce4/panel-plugins/
 share/xfce4/panel-plugins/xfce4-notes-plugin-47.desktop
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
diff --git a/x11/xfce4/xfce4-panel/Makefile b/x11/xfce4/xfce4-panel/Makefile
index c5ea35618c6..a53432d23d3 100644
--- a/x11/xfce4/xfce4-panel/Makefile
+++ b/x11/xfce4/xfce4-panel/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.45 2011/10/13 17:19:15 jasper Exp $
+# $OpenBSD: Makefile,v 1.46 2011/12/03 22:32:22 ajacoutot Exp $
 
 COMMENT=	Xfce4 desktop panel
 
 XFCE_PROJECT=	xfce4-panel
 XFCE_VERSION=	4.8.6
 SHARED_LIBS=	xfce4panel-1.0	0.0	# 3.0
-REVISION=	0
+REVISION=	1
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 MODXFCE_DESKTOP_FILE=	Yes
+MODFXCE_ICON_CACHE=	Yes
 
 CONFIGURE_ARGS=--disable-linker-opts
 LIB_DEPENDS=	x11/xfce4/exo>=0.6.0 \
diff --git a/x11/xfce4/xfce4-panel/pkg/PLIST b/x11/xfce4/xfce4-panel/pkg/PLIST
index 0f4e32489e7..09da0f191b8 100644
--- a/x11/xfce4/xfce4-panel/pkg/PLIST
+++ b/x11/xfce4/xfce4-panel/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.20 2011/09/22 10:56:38 landry Exp $
+@comment $OpenBSD: PLIST,v 1.21 2011/12/03 22:32:22 ajacoutot Exp $
 @conflict xfce4-datetime-*
 @conflict xfce4-iconbox-*
 @conflict xfce4-showdesktop-*
@@ -292,7 +292,7 @@ share/xfce4/panel/plugins/showdesktop.desktop
 share/xfce4/panel/plugins/systray.desktop
 share/xfce4/panel/plugins/tasklist.desktop
 share/xfce4/panel/plugins/windowmenu.desktop
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
diff --git a/x11/xfce4/xfce4-power-manager/Makefile b/x11/xfce4/xfce4-power-manager/Makefile
index c7a77340ae1..43865e30c43 100644
--- a/x11/xfce4/xfce4-power-manager/Makefile
+++ b/x11/xfce4/xfce4-power-manager/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2011/10/14 12:22:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2011/12/03 22:32:22 ajacoutot Exp $
 
 COMMENT =	Xfce4 power manager
 
 XFCE_VERSION =	1.0.10
 XFCE_GOODIE =	xfce4-power-manager
-REVISION =      0
+REVISION =      1
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES =	x11/xfce4
 MODXFCE_DESKTOP_FILE =	Yes
+MODFXCE_ICON_CACHE =	Yes
 
 LIB_DEPENDS =	x11/xfce4/xfce4-panel \
 		devel/libnotify
diff --git a/x11/xfce4/xfce4-power-manager/pkg/PLIST b/x11/xfce4/xfce4-power-manager/pkg/PLIST
index 9614c1942c9..30c928eaaa5 100644
--- a/x11/xfce4/xfce4-power-manager/pkg/PLIST
+++ b/x11/xfce4/xfce4-power-manager/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/05/23 19:18:15 landry Exp $
+@comment $OpenBSD: PLIST,v 1.2 2011/12/03 22:32:22 ajacoutot Exp $
 @bin bin/xfce4-power-information
 @bin bin/xfce4-power-manager
 @bin bin/xfce4-power-manager-settings
@@ -320,7 +320,7 @@ share/xfce4/doc/C/images/xfpm-general-settings.png
 share/xfce4/doc/C/xfce4-power-manager.html
 share/xfce4/panel-plugins/
 share/xfce4/panel-plugins/xfce4-brightness-plugin.desktop
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
diff --git a/x11/xfce4/xfce4-screenshooter/Makefile b/x11/xfce4/xfce4-screenshooter/Makefile
index 94453e2b2bd..82af9f39b82 100644
--- a/x11/xfce4/xfce4-screenshooter/Makefile
+++ b/x11/xfce4/xfce4-screenshooter/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2011/10/14 12:22:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.20 2011/12/03 22:32:22 ajacoutot Exp $
 
 COMMENT=	Xfce4 desktop screenshot panel plugin
 
 XFCE_VERSION=	1.7.9
 XFCE_GOODIE=	xfce4-screenshooter
-REVISION=	1
+REVISION=	2
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
@@ -19,6 +19,7 @@ LIB_DEPENDS=	x11/xfce4/xfce4-panel \
 		devel/libsoup
 
 MODXFCE_DESKTOP_FILE=	Yes
+MODFXCE_ICON_CACHE=	Yes
 
 WANTLIB += GL ICE SM X11 X11-xcb Xau Xcomposite Xcursor Xdamage
 WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
diff --git a/x11/xfce4/xfce4-screenshooter/pkg/PLIST b/x11/xfce4/xfce4-screenshooter/pkg/PLIST
index 895f4d96a38..934b5bf4daa 100644
--- a/x11/xfce4/xfce4-screenshooter/pkg/PLIST
+++ b/x11/xfce4/xfce4-screenshooter/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2011/01/18 21:09:46 landry Exp $
+@comment $OpenBSD: PLIST,v 1.6 2011/12/03 22:32:22 ajacoutot Exp $
 @bin bin/xfce4-screenshooter
 libexec/xfce4/
 libexec/xfce4/panel-plugins/
@@ -160,7 +160,7 @@ share/xfce4/doc/zh_CN/images/xfce4-screenshooter-zimagez-result-dialog.png
 share/xfce4/doc/zh_CN/xfce4-screenshooter.html
 share/xfce4/panel-plugins/
 share/xfce4/panel-plugins/screenshooter.desktop
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
diff --git a/x11/xfce4/xfce4-session/Makefile b/x11/xfce4/xfce4-session/Makefile
index 0acef5b1566..397c5bbb317 100644
--- a/x11/xfce4/xfce4-session/Makefile
+++ b/x11/xfce4/xfce4-session/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.53 2011/11/24 10:22:33 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.54 2011/12/03 22:32:22 ajacoutot Exp $
 
 COMMENT=	Xfce4 session manager
 
 XFCE_PROJECT=	xfce4-session
 XFCE_VERSION=	4.8.2
-REVISION=	1
+REVISION=	2
 
 SHARED_LIBS +=	xfsm-4.6	0.0 # .0.0
 
@@ -16,6 +16,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 MODXFCE_DESKTOP_FILE=	Yes
+MODFXCE_ICON_CACHE=	Yes
 
 CONFIGURE_ARGS=	--disable-linker-opts \
 		--disable-hal \
diff --git a/x11/xfce4/xfce4-session/pkg/PLIST b/x11/xfce4/xfce4-session/pkg/PLIST
index b9321f7bf01..95a057c8796 100644
--- a/x11/xfce4/xfce4-session/pkg/PLIST
+++ b/x11/xfce4/xfce4-session/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.20 2011/09/16 21:03:46 landry Exp $
+@comment $OpenBSD: PLIST,v 1.21 2011/12/03 22:32:22 ajacoutot Exp $
 @conflict xfce4-toys-*
 %%SHARED%%
 @bin bin/xfce4-session
@@ -232,7 +232,7 @@ share/xfce4/panel-plugins/
 share/xfce4/panel-plugins/xfsm-logout-plugin.desktop
 share/xfce4/tips/
 share/xfce4/tips/tips
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
diff --git a/x11/xfce4/xfce4-weather/Makefile b/x11/xfce4/xfce4-weather/Makefile
index 05137fb0e1f..d9521004ec6 100644
--- a/x11/xfce4/xfce4-weather/Makefile
+++ b/x11/xfce4/xfce4-weather/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.39 2011/10/14 12:22:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.40 2011/12/03 22:32:22 ajacoutot Exp $
 
 COMMENT=	Xfce4 temperature/weather conditions panel plugin
 
 XFCE_VERSION=	0.7.4
 XFCE_PLUGIN=	weather
-REVISION=	1
+REVISION=	2
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 
+MODFXCE_ICON_CACHE=	Yes
+
 LIB_DEPENDS=	textproc/libxml
 LIB_DEPENDS +=	x11/xfce4/libxfcegui4
 
diff --git a/x11/xfce4/xfce4-weather/pkg/PLIST b/x11/xfce4/xfce4-weather/pkg/PLIST
index 44a03ff1255..43c6aa47d87 100644
--- a/x11/xfce4/xfce4-weather/pkg/PLIST
+++ b/x11/xfce4/xfce4-weather/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.12 2011/03/03 21:11:29 landry Exp $
+@comment $OpenBSD: PLIST,v 1.13 2011/12/03 22:32:22 ajacoutot Exp $
 @conflict xfce4-weather-plugin-*
 libexec/xfce4/
 libexec/xfce4/panel-plugins/
@@ -117,5 +117,5 @@ share/xfce4/weather/icons/liquid/7.png
 share/xfce4/weather/icons/liquid/8.png
 share/xfce4/weather/icons/liquid/9.png
 share/xfce4/weather/icons/liquid/99.png
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
diff --git a/x11/xfce4/xfce4-wmdock/Makefile b/x11/xfce4/xfce4-wmdock/Makefile
index faf75bee3d7..b143ac6fa41 100644
--- a/x11/xfce4/xfce4-wmdock/Makefile
+++ b/x11/xfce4/xfce4-wmdock/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.15 2011/10/14 12:22:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.16 2011/12/03 22:32:22 ajacoutot Exp $
 
 COMMENT=	Xfce4 WindowMaker dockapps wrapper panel plugin
 
 XFCE_VERSION=	0.2.0
 XFCE_PLUGIN=	wmdock
-REVISION=	8
+REVISION=	9
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 
+MODFXCE_ICON_CACHE=	Yes
+
 LIB_DEPENDS=	devel/libwnck
 LIB_DEPENDS +=	x11/xfce4/libxfcegui4
 
diff --git a/x11/xfce4/xfce4-wmdock/pkg/PLIST b/x11/xfce4/xfce4-wmdock/pkg/PLIST
index f6a410b7e47..b27619d5499 100644
--- a/x11/xfce4/xfce4-wmdock/pkg/PLIST
+++ b/x11/xfce4/xfce4-wmdock/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2009/12/21 16:07:45 landry Exp $
+@comment $OpenBSD: PLIST,v 1.5 2011/12/03 22:32:22 ajacoutot Exp $
 libexec/xfce4/
 libexec/xfce4/panel-plugins/
 @bin libexec/xfce4/panel-plugins/xfce4-wmdock-plugin
@@ -10,5 +10,5 @@ share/icons/hicolor/48x48/apps/xfce4-wmdock.png
 share/xfce4/
 share/xfce4/panel-plugins/
 share/xfce4/panel-plugins/wmdock.desktop
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
diff --git a/x11/xfce4/xfdesktop/Makefile b/x11/xfce4/xfdesktop/Makefile
index 3dfe6aef980..9517c6b88bb 100644
--- a/x11/xfce4/xfdesktop/Makefile
+++ b/x11/xfce4/xfdesktop/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.41 2011/10/14 12:22:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.42 2011/12/03 22:32:22 ajacoutot Exp $
 
 COMMENT=	Xfce4 desktop manager
 
 XFCE_PROJECT=	xfdesktop
 XFCE_VERSION=	4.8.3
-REVISION =      0
+REVISION =      1
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 MODXFCE_DESKTOP_FILE=	Yes
+MODFXCE_ICON_CACHE=	Yes
 
 CONFIGURE_ARGS=	--enable-thunarx \
 		--enable-exo
diff --git a/x11/xfce4/xfdesktop/pkg/PLIST b/x11/xfce4/xfdesktop/pkg/PLIST
index 52cb4f05c68..b9481f07952 100644
--- a/x11/xfce4/xfdesktop/pkg/PLIST
+++ b/x11/xfce4/xfdesktop/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.18 2011/09/16 21:02:23 landry Exp $
+@comment $OpenBSD: PLIST,v 1.19 2011/12/03 22:32:22 ajacoutot Exp $
 @bin bin/xfdesktop
 @bin bin/xfdesktop-settings
 @man man/man1/xfdesktop.1
@@ -221,7 +221,7 @@ share/xfce4/backdrops/xfce-stripes.png
 share/xfce4/backdrops/xfce-turbulence.png
 share/xfce4/backdrops/xfce4gradientcurve.png
 share/xfce4/backdrops/xfce4logo.png
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
diff --git a/x11/xfce4/xfprint/Makefile b/x11/xfce4/xfprint/Makefile
index 3b7a1f67cec..ae1fec45de7 100644
--- a/x11/xfce4/xfprint/Makefile
+++ b/x11/xfce4/xfprint/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.27 2011/10/14 12:22:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.28 2011/12/03 22:32:22 ajacoutot Exp $
 
 COMMENT=	Xfce4 printing helper
 
 XFCE_PROJECT=	xfprint
 XFCE_VERSION=	4.6.1
-REVISION=	11
+REVISION=	12
 
 MASTER_SITES=	http://archive.xfce.org/src/archive/${XFCE_PROJECT}/${XFCE_BRANCH}/
 SHARED_LIBS=	xfprint	0.1
@@ -17,6 +17,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	x11/xfce4
 MODXFCE_DESKTOP_FILE=	Yes
+MODFXCE_ICON_CACHE=	Yes
 
 CONFIGURE_ARGS=	--enable-cups \
 		--enable-bsdlpr \
diff --git a/x11/xfce4/xfprint/pkg/PLIST b/x11/xfce4/xfprint/pkg/PLIST
index d98acae45dc..b78c00ab662 100644
--- a/x11/xfce4/xfprint/pkg/PLIST
+++ b/x11/xfce4/xfprint/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2011/01/18 21:34:59 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.9 2011/12/03 22:32:22 ajacoutot Exp $
 %%SHARED%%
 @bin bin/xfprint-settings
 @bin bin/xfprint4
@@ -172,7 +172,7 @@ share/xfce4/doc/fr/images/xfprint_prettyprinting.png
 share/xfce4/doc/fr/images/xfprint_sheets.png
 share/xfce4/doc/fr/images/xfprint_virtualpages.png
 share/xfce4/doc/fr/xfprint.html
-@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
-@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database