webkit-gtk2 shlib changed its name. Chase all users. also update some

depend lines to include a version because there is now a webkitgtk-1.0 and
webkitgtk-3.0. So webkitgtk matches both.

While here reset epiphany back to the 2.30 version.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14295 df743ca5-7f9a-e211-a948-0013205c9059

27 files changed, 2680 insertions, 0 deletions

diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile
new file mode 100644
index 000000000..b4b0e30ab
--- /dev/null
+++ b/deskutils/cairo-dock-plugins/Makefile
@@ -0,0 +1,88 @@
+# New ports collection makefile for:	cairo-dock-plugins
+# Date created:		2010-03-19
+# Whom:			Ivan Klymenko <fidaj@ukr.net>
+#
+# $FreeBSD: ports/deskutils/cairo-dock-plugins/Makefile,v 1.3 2010/05/31 01:57:52 ade Exp $
+#
+
+PORTNAME=	cairo-dock-plugins
+DISTVERSION=	2.1.0
+PORTREVISION=	3
+CATEGORIES=	deskutils
+MASTER_SITES=	BERLIOS/cairo-dock
+
+MAINTAINER=	fidaj@ukr.net
+COMMENT=	Cairo-Dock-Plugins for Cairo-Dock
+
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/cairo-dock.pc:${PORTSDIR}/deskutils/cairo-dock
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/cairo-dock.pc:${PORTSDIR}/deskutils/cairo-dock
+
+DATADIR=	${PREFIX}/share/cairo-dock
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack pkgconfig glib20 gtk20 librsvg2 libxml2
+USE_LDCONFIG=	yes
+USE_XORG=	xrender
+
+OPTIONS+=	GMENU "Common Applications menu" On \
+		KEYBOARD_INDICATOR "Control the keyboard layout" Off \
+		TERMINAL "Add a terminal to your dock" On \
+		WEBLETS "To show an interactive web page" On \
+		XFCE_INTEGRATION "For XFCE environnement" Off
+
+.include <bsd.port.options.mk>
+
+CONFIGURE_ARGS+=	--disable-alsa-mixer \
+			--disable-old-gnome-integration
+
+.if defined(WITH_GMENU)
+LIB_DEPENDS+=		gnome-menu.2:${PORTSDIR}/x11/gnome-menus
+CONFIGURE_ARGS+=	--enable-gmenu
+PLIST_SUB+=	GMENU=""
+.else
+CONFIGURE_ARGS+=	--disable-gmenu
+PLIST_SUB+=	GMENU="@comment "
+.endif
+
+.if defined(WITH_KEYBOARD_INDICATOR)
+LIB_DEPENDS+=		exif.12:${PORTSDIR}/graphics/libexif \
+			xklavier.12:${PORTSDIR}/x11/libxklavier
+CONFIGURE_ARGS+=	--enable-keyboard-indicator
+PLIST_SUB+=	KEYBOARD_INDICATOR=""
+.else
+CONFIGURE_ARGS+=	--disable-keyboard-indicator
+PLIST_SUB+=	KEYBOARD_INDICATOR="@comment "
+.endif
+
+.if defined(WITH_TERMINAL)
+LIB_DEPENDS+=		vte.9:${PORTSDIR}/x11-toolkits/vte
+CONFIGURE_ARGS+=	--enable-terminal
+PLIST_SUB+=	TERMINAL=""
+.else
+CONFIGURE_ARGS+=	--disable-terminal
+PLIST_SUB+=	TERMINAL="@comment "
+.endif
+
+.if defined(WITH_WEBLETS)
+LIB_DEPENDS+=		webkitgtk-1.0.13:${PORTSDIR}/www/webkit-gtk2
+CONFIGURE_ARGS+=	--enable-weblets
+PLIST_SUB+=	WEBLETS=""
+.else
+CONFIGURE_ARGS+=	--disable-weblets
+PLIST_SUB+=	WEBLETS="@comment "
+.endif
+
+.if defined(WITH_XFCE_INTEGRATION)
+LIB_DEPENDS+=		thunar-vfs-1.5:${PORTSDIR}/x11-fm/thunar \
+			exif.12:${PORTSDIR}/graphics/libexif
+CONFIGURE_ARGS+=	--enable-xfce-integration
+PLIST_SUB+=	XFCE_INTEGRATION=""
+.else
+CONFIGURE_ARGS+=	--disable-xfce-integration
+PLIST_SUB+=	XFCE_INTEGRATION="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/deskutils/cairo-dock-plugins/distinfo b/deskutils/cairo-dock-plugins/distinfo
new file mode 100644
index 000000000..b9e8f79ef
--- /dev/null
+++ b/deskutils/cairo-dock-plugins/distinfo
@@ -0,0 +1,3 @@
+MD5 (cairo-dock-plugins-2.1.0.tar.bz2) = 4e7fb258f0efd0b91ab6d3f324e4da05
+SHA256 (cairo-dock-plugins-2.1.0.tar.bz2) = 7245abb8f123b1e5a69bd383688a2a6d811254b010100687905f0c0004bb9a85
+SIZE (cairo-dock-plugins-2.1.0.tar.bz2) = 5703719
diff --git a/deskutils/cairo-dock-plugins/files/patch-Makefile.am b/deskutils/cairo-dock-plugins/files/patch-Makefile.am
new file mode 100644
index 000000000..3c98a62ee
--- /dev/null
+++ b/deskutils/cairo-dock-plugins/files/patch-Makefile.am
@@ -0,0 +1,539 @@
+--- Animated-icons/src/Makefile.am.orig	2010-02-03 22:31:08.000000000 +0200
++++ Animated-icons/src/Makefile.am	2010-02-03 22:31:31.000000000 +0200
+@@ -49,8 +49,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- Cairo-Penguin/src/Makefile.am.orig	2010-02-03 22:31:59.000000000 +0200
++++ Cairo-Penguin/src/Makefile.am	2010-02-03 22:32:09.000000000 +0200
+@@ -35,8 +35,7 @@
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- Clipper/src/Makefile.am.orig	2010-02-03 22:32:25.000000000 +0200
++++ Clipper/src/Makefile.am	2010-02-03 22:32:33.000000000 +0200
+@@ -31,8 +31,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- Dbus/src/Makefile.am.orig	2010-02-03 22:32:46.000000000 +0200
++++ Dbus/src/Makefile.am	2010-02-03 22:33:00.000000000 +0200
+@@ -38,8 +38,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- GMenu/src/Makefile.am.orig	2010-02-03 22:33:12.000000000 +0200
++++ GMenu/src/Makefile.am	2010-02-03 22:33:19.000000000 +0200
+@@ -46,8 +46,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- Network-Monitor/src/Makefile.am.orig	2010-02-03 22:33:42.000000000 +0200
++++ Network-Monitor/src/Makefile.am	2010-02-03 22:33:49.000000000 +0200
+@@ -32,8 +32,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- Scooby-Do/src/Makefile.am.orig	2010-02-03 22:34:01.000000000 +0200
++++ Scooby-Do/src/Makefile.am	2010-02-03 22:34:06.000000000 +0200
+@@ -47,8 +47,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- System-Monitor/src/Makefile.am.orig	2010-02-03 22:34:17.000000000 +0200
++++ System-Monitor/src/Makefile.am	2010-02-03 22:34:22.000000000 +0200
+@@ -39,8 +39,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- Toons/src/Makefile.am.orig	2010-02-03 22:34:32.000000000 +0200
++++ Toons/src/Makefile.am	2010-02-03 22:34:37.000000000 +0200
+@@ -35,8 +35,7 @@
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- Xgamma/src/Makefile.am.orig	2010-02-03 22:34:48.000000000 +0200
++++ Xgamma/src/Makefile.am	2010-02-03 22:34:53.000000000 +0200
+@@ -32,8 +32,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- alsaMixer/src/Makefile.am.orig	2010-02-03 22:35:05.000000000 +0200
++++ alsaMixer/src/Makefile.am	2010-02-03 22:35:10.000000000 +0200
+@@ -34,8 +34,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- clock/src/Makefile.am.orig	2010-02-03 22:35:20.000000000 +0200
++++ clock/src/Makefile.am	2010-02-03 22:35:27.000000000 +0200
+@@ -37,8 +37,7 @@
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	 -Wall\
+-	-O3
++	 -Wall
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- compiz-icon/src/Makefile.am.orig	2010-02-03 22:36:28.000000000 +0200
++++ compiz-icon/src/Makefile.am	2010-02-03 22:36:32.000000000 +0200
+@@ -33,8 +33,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- desklet-rendering/src/Makefile.am.orig	2010-02-03 22:36:41.000000000 +0200
++++ desklet-rendering/src/Makefile.am	2010-02-03 22:36:48.000000000 +0200
+@@ -43,8 +43,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-Wno-unused-parameter
+ #	-g -ggdb -W -Wall
+ 
+--- dialog-rendering/src/Makefile.am.orig	2010-02-03 22:36:58.000000000 +0200
++++ dialog-rendering/src/Makefile.am	2010-02-03 22:37:03.000000000 +0200
+@@ -39,8 +39,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- dnd2share/src/Makefile.am.orig	2010-02-03 22:37:14.000000000 +0200
++++ dnd2share/src/Makefile.am	2010-02-03 22:37:18.000000000 +0200
+@@ -46,8 +46,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- dock-rendering/src/Makefile.am.orig	2010-02-03 22:37:28.000000000 +0200
++++ dock-rendering/src/Makefile.am	2010-02-03 22:37:33.000000000 +0200
+@@ -43,8 +43,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-Wno-unused-parameter
+ #	-g -ggdb -W -Wall
+ 
+--- drop-indicator/src/Makefile.am.orig	2010-02-03 22:37:45.000000000 +0200
++++ drop-indicator/src/Makefile.am	2010-02-03 22:37:50.000000000 +0200
+@@ -34,8 +34,7 @@
+ 	-DMY_APPLET_MASK_INDICATOR_NAME=\""texture-bilinear-gradation.png"\"\
+         -DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- dustbin/src/Makefile.am.orig	2010-02-03 22:38:05.000000000 +0200
++++ dustbin/src/Makefile.am	2010-02-03 22:38:10.000000000 +0200
+@@ -31,8 +31,7 @@
+ 	-DMY_APPLET_GETTEXT_DOMAIN=\""$(GETTEXT_DUSTBIN)"\"\
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+-	-std=c99\
+-	-O3
++	-std=c99
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- gnome-integration/src/Makefile.am.orig	2010-02-03 22:38:19.000000000 +0200
++++ gnome-integration/src/Makefile.am	2010-02-03 22:38:29.000000000 +0200
+@@ -29,8 +29,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- gnome-integration-old/src/Makefile.am.orig	2010-02-03 22:38:39.000000000 +0200
++++ gnome-integration-old/src/Makefile.am	2010-02-03 22:38:44.000000000 +0200
+@@ -29,8 +29,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- icon-effect/src/Makefile.am.orig	2010-02-03 22:38:53.000000000 +0200
++++ icon-effect/src/Makefile.am	2010-02-03 22:38:57.000000000 +0200
+@@ -41,8 +41,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+         -DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- illusion/src/Makefile.am.orig	2010-02-03 22:39:07.000000000 +0200
++++ illusion/src/Makefile.am	2010-02-03 22:39:11.000000000 +0200
+@@ -42,8 +42,7 @@
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- keyboard-indicator/src/Makefile.am.orig	2010-02-03 22:39:20.000000000 +0200
++++ keyboard-indicator/src/Makefile.am	2010-02-03 22:39:25.000000000 +0200
+@@ -34,8 +34,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- logout/src/Makefile.am.orig	2010-02-03 22:39:34.000000000 +0200
++++ logout/src/Makefile.am	2010-02-03 22:39:38.000000000 +0200
+@@ -28,8 +28,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- mail/src/Makefile.am.orig	2010-02-03 22:39:48.000000000 +0200
++++ mail/src/Makefile.am	2010-02-03 22:40:04.000000000 +0200
+@@ -37,7 +37,7 @@
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+ 	-Werror-implicit-function-declaration\
+-	-g -ggdb -W
++	-W
+ #	-fgnu89-inline\
+ #	-O3
+ 
+--- motion-blur/src/Makefile.am.orig	2010-02-03 22:40:16.000000000 +0200
++++ motion-blur/src/Makefile.am	2010-02-03 22:40:21.000000000 +0200
+@@ -29,8 +29,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- musicPlayer/src/Makefile.am.orig	2010-02-03 22:40:31.000000000 +0200
++++ musicPlayer/src/Makefile.am	2010-02-03 22:40:36.000000000 +0200
+@@ -63,8 +63,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- netspeed/src/Makefile.am.orig	2010-02-03 22:40:46.000000000 +0200
++++ netspeed/src/Makefile.am	2010-02-03 22:40:50.000000000 +0200
+@@ -32,8 +32,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- powermanager/src/Makefile.am.orig	2010-02-03 22:41:05.000000000 +0200
++++ powermanager/src/Makefile.am	2010-02-03 22:41:09.000000000 +0200
+@@ -32,8 +32,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ libcd_powermanager_la_LIBADD = \
+--- quick-browser/src/Makefile.am.orig	2010-02-03 22:41:20.000000000 +0200
++++ quick-browser/src/Makefile.am	2010-02-03 22:41:24.000000000 +0200
+@@ -32,8 +32,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- shortcuts/src/Makefile.am.orig	2010-02-03 22:41:33.000000000 +0200
++++ shortcuts/src/Makefile.am	2010-02-03 22:41:53.000000000 +0200
+@@ -35,8 +35,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- show-mouse/src/Makefile.am.orig	2010-02-03 22:42:12.000000000 +0200
++++ show-mouse/src/Makefile.am	2010-02-03 22:42:17.000000000 +0200
+@@ -31,8 +31,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+         -DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- showDesklets/src/Makefile.am.orig	2010-02-03 22:42:25.000000000 +0200
++++ showDesklets/src/Makefile.am	2010-02-03 22:42:32.000000000 +0200
+@@ -29,8 +29,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- showDesktop/src/Makefile.am.orig	2010-02-03 22:42:42.000000000 +0200
++++ showDesktop/src/Makefile.am	2010-02-03 22:42:46.000000000 +0200
+@@ -29,8 +29,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- slider/src/Makefile.am.orig	2010-02-03 22:42:57.000000000 +0200
++++ slider/src/Makefile.am	2010-02-03 22:43:04.000000000 +0200
+@@ -41,8 +41,7 @@
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-Werror-implicit-function-declaration\
+-	-std=c99\
+-	-O3
++	-std=c99
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- stack/src/Makefile.am.orig	2010-02-03 22:43:13.000000000 +0200
++++ stack/src/Makefile.am	2010-02-03 22:43:18.000000000 +0200
+@@ -37,8 +37,7 @@
+ 	-DCD_STACK_DEFAULT_URL_ICON=\""url-icon.svg"\"\
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-Werror-implicit-function-declaration\
+-	-std=c99\
+-	-O3
++	-std=c99
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- switcher/src/Makefile.am.orig	2010-02-03 22:43:28.000000000 +0200
++++ switcher/src/Makefile.am	2010-02-03 22:43:31.000000000 +0200
+@@ -35,8 +35,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""workspaces.svg"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- systray/src/Makefile.am.orig	2010-02-03 22:43:40.000000000 +0200
++++ systray/src/Makefile.am	2010-02-03 22:43:45.000000000 +0200
+@@ -34,8 +34,7 @@
+         -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall -W -Werror
+ 
+ libcd_systray_la_LIBADD = \
+--- terminal/src/Makefile.am.orig	2010-02-03 22:43:56.000000000 +0200
++++ terminal/src/Makefile.am	2010-02-03 22:44:01.000000000 +0200
+@@ -33,8 +33,7 @@
+         -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall  -W -Werror
+ 
+ 
+--- tomboy/src/Makefile.am.orig	2010-02-03 22:44:12.000000000 +0200
++++ tomboy/src/Makefile.am	2010-02-03 22:44:18.000000000 +0200
+@@ -32,8 +32,7 @@
+ 	-DMY_APPLET_GETTEXT_DOMAIN=\""$(GETTEXT_TOMBOY)"\"\
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+-	-std=c99\
+-	-O3
++	-std=c99
+ #	-g -ggdb -W -Wall
+ #-Werror-implicit-function-declaration
+ 
+--- weather/src/Makefile.am.orig	2010-02-03 22:44:34.000000000 +0200
++++ weather/src/Makefile.am	2010-02-03 22:44:38.000000000 +0200
+@@ -33,8 +33,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- weblets/src/Makefile.am.orig	2010-02-03 22:44:48.000000000 +0200
++++ weblets/src/Makefile.am	2010-02-03 22:44:55.000000000 +0200
+@@ -31,8 +31,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-DCD_APPLET_MULTI_INSTANCE=1
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ libcd_weblets_la_LIBADD = \
+--- wifi/src/Makefile.am.orig	2010-02-03 22:45:07.000000000 +0200
++++ wifi/src/Makefile.am	2010-02-03 22:45:11.000000000 +0200
+@@ -33,8 +33,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
+--- xfce-integration/src/Makefile.am.orig	2010-02-03 22:45:21.000000000 +0200
++++ xfce-integration/src/Makefile.am	2010-02-03 22:45:25.000000000 +0200
+@@ -29,8 +29,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ #	-g -ggdb -W -Wall
+ 
+ 
diff --git a/deskutils/cairo-dock-plugins/files/patch-Makefile.in b/deskutils/cairo-dock-plugins/files/patch-Makefile.in
new file mode 100644
index 000000000..0cd20e6dc
--- /dev/null
+++ b/deskutils/cairo-dock-plugins/files/patch-Makefile.in
@@ -0,0 +1,539 @@
+--- Animated-icons/src/Makefile.in.orig	2010-02-03 22:31:14.000000000 +0200
++++ Animated-icons/src/Makefile.in	2010-02-03 22:31:27.000000000 +0200
+@@ -534,8 +534,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_Animated_icons_la_LIBADD = \
+--- Cairo-Penguin/src/Makefile.in.orig	2010-02-03 22:32:01.000000000 +0200
++++ Cairo-Penguin/src/Makefile.in	2010-02-03 22:32:16.000000000 +0200
+@@ -512,8 +512,7 @@
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_Cairo_Penguin_la_LIBADD = \
+--- Clipper/src/Makefile.in.orig	2010-02-03 22:32:27.000000000 +0200
++++ Clipper/src/Makefile.in	2010-02-03 22:32:39.000000000 +0200
+@@ -506,8 +506,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_Clipper_la_LIBADD = \
+--- Dbus/src/Makefile.in.orig	2010-02-03 22:32:49.000000000 +0200
++++ Dbus/src/Makefile.in	2010-02-03 22:33:06.000000000 +0200
+@@ -514,8 +514,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_Dbus_la_LIBADD = \
+--- GMenu/src/Makefile.in.orig	2010-02-03 22:33:14.000000000 +0200
++++ GMenu/src/Makefile.in	2010-02-03 22:33:25.000000000 +0200
+@@ -522,8 +522,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_GMenu_la_LIBADD = \
+--- Network-Monitor/src/Makefile.in.orig	2010-02-03 22:33:42.000000000 +0200
++++ Network-Monitor/src/Makefile.in	2010-02-03 22:33:55.000000000 +0200
+@@ -510,8 +510,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_Network_Monitor_la_LIBADD = \
+--- Scooby-Do/src/Makefile.in.orig	2010-02-03 22:34:01.000000000 +0200
++++ Scooby-Do/src/Makefile.in	2010-02-03 22:34:11.000000000 +0200
+@@ -239,8 +239,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_Scooby_Do_la_LIBADD = \
+--- System-Monitor/src/Makefile.in.orig	2010-02-03 22:34:17.000000000 +0200
++++ System-Monitor/src/Makefile.in	2010-02-03 22:34:27.000000000 +0200
+@@ -520,8 +520,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_System_Monitor_la_LIBADD = \
+--- Toons/src/Makefile.in.orig	2010-02-03 22:34:32.000000000 +0200
++++ Toons/src/Makefile.in	2010-02-03 22:34:43.000000000 +0200
+@@ -510,8 +510,7 @@
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_Toons_la_LIBADD = \
+--- Xgamma/src/Makefile.in.orig	2010-02-03 22:34:48.000000000 +0200
++++ Xgamma/src/Makefile.in	2010-02-03 22:34:58.000000000 +0200
+@@ -508,8 +508,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_Xgamma_la_LIBADD = \
+--- alsaMixer/src/Makefile.in.orig	2010-02-03 22:35:05.000000000 +0200
++++ alsaMixer/src/Makefile.in	2010-02-03 22:35:14.000000000 +0200
+@@ -511,8 +511,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_AlsaMixer_la_LIBADD = \
+--- clock/src/Makefile.in.orig	2010-02-03 22:35:20.000000000 +0200
++++ clock/src/Makefile.in	2010-02-03 22:35:32.000000000 +0200
+@@ -513,8 +513,7 @@
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	 -Wall\
+-	-O3
++	 -Wall
+ 
+ #	-g -ggdb -W -Wall
+ libcd_clock_la_LIBADD = \
+--- compiz-icon/src/Makefile.in.orig	2010-02-03 22:36:28.000000000 +0200
++++ compiz-icon/src/Makefile.in	2010-02-03 22:36:36.000000000 +0200
+@@ -509,8 +509,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_compiz_icon_la_LIBADD = \
+--- desklet-rendering/src/Makefile.in.orig	2010-02-03 22:36:41.000000000 +0200
++++ desklet-rendering/src/Makefile.in	2010-02-03 22:36:53.000000000 +0200
+@@ -526,8 +526,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-Wno-unused-parameter
+ #	-g -ggdb -W -Wall
+--- dialog-rendering/src/Makefile.in.orig	2010-02-03 22:36:58.000000000 +0200
++++ dialog-rendering/src/Makefile.in	2010-02-03 22:37:08.000000000 +0200
+@@ -520,8 +520,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_dialog_rendering_la_LIBADD = \
+--- dnd2share/src/Makefile.in.orig	2010-02-03 22:37:14.000000000 +0200
++++ dnd2share/src/Makefile.in	2010-02-03 22:37:24.000000000 +0200
+@@ -529,8 +529,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_dnd2share_la_LIBADD = \
+--- dock-rendering/src/Makefile.in.orig	2010-02-03 22:37:28.000000000 +0200
++++ dock-rendering/src/Makefile.in	2010-02-03 22:37:38.000000000 +0200
+@@ -524,8 +524,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-Wno-unused-parameter
+ #	-g -ggdb -W -Wall
+--- drop-indicator/src/Makefile.in.orig	2010-02-03 22:37:45.000000000 +0200
++++ drop-indicator/src/Makefile.in	2010-02-03 22:37:55.000000000 +0200
+@@ -510,8 +510,7 @@
+ 	-DMY_APPLET_MASK_INDICATOR_NAME=\""texture-bilinear-gradation.png"\"\
+         -DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_drop_indicator_la_LIBADD = \
+--- dustbin/src/Makefile.in.orig	2010-02-03 22:38:05.000000000 +0200
++++ dustbin/src/Makefile.in	2010-02-03 22:38:15.000000000 +0200
+@@ -507,8 +507,7 @@
+ 	-DMY_APPLET_GETTEXT_DOMAIN=\""$(GETTEXT_DUSTBIN)"\"\
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+-	-std=c99\
+-	-O3
++	-std=c99
+ 
+ #	-g -ggdb -W -Wall
+ libcd_dustbin_la_LIBADD = \
+--- gnome-integration/src/Makefile.in.orig	2010-02-03 22:38:19.000000000 +0200
++++ gnome-integration/src/Makefile.in	2010-02-03 22:38:34.000000000 +0200
+@@ -506,8 +506,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_gnome_integration_la_LIBADD = \
+--- gnome-integration-old/src/Makefile.in.orig	2010-02-03 22:38:39.000000000 +0200
++++ gnome-integration-old/src/Makefile.in	2010-02-03 22:38:49.000000000 +0200
+@@ -506,8 +506,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_gnome_integration_old_la_LIBADD = \
+--- icon-effect/src/Makefile.in.orig	2010-02-03 22:38:53.000000000 +0200
++++ icon-effect/src/Makefile.in	2010-02-03 22:39:03.000000000 +0200
+@@ -520,8 +520,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+         -DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_icon_effect_la_LIBADD = \
+--- illusion/src/Makefile.in.orig	2010-02-03 22:39:07.000000000 +0200
++++ illusion/src/Makefile.in	2010-02-03 22:39:16.000000000 +0200
+@@ -523,8 +523,7 @@
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_illusion_la_LIBADD = \
+--- keyboard-indicator/src/Makefile.in.orig	2010-02-03 22:39:20.000000000 +0200
++++ keyboard-indicator/src/Makefile.in	2010-02-03 22:39:30.000000000 +0200
+@@ -513,8 +513,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_keyboard_indicator_la_LIBADD = \
+--- logout/src/Makefile.in.orig	2010-02-03 22:39:34.000000000 +0200
++++ logout/src/Makefile.in	2010-02-03 22:39:43.000000000 +0200
+@@ -503,8 +503,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_logout_la_LIBADD = \
+--- mail/src/Makefile.in.orig	2010-02-03 22:39:48.000000000 +0200
++++ mail/src/Makefile.in	2010-02-03 22:40:12.000000000 +0200
+@@ -514,7 +514,7 @@
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+ 	-Werror-implicit-function-declaration\
+-	-g -ggdb -W
++	-W
+ 
+ #	-fgnu89-inline\
+ #	-O3
+--- motion-blur/src/Makefile.in.orig	2010-02-03 22:40:16.000000000 +0200
++++ motion-blur/src/Makefile.in	2010-02-03 22:40:27.000000000 +0200
+@@ -503,8 +503,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_motion_blur_la_LIBADD = \
+--- musicPlayer/src/Makefile.in.orig	2010-02-03 22:40:31.000000000 +0200
++++ musicPlayer/src/Makefile.in	2010-02-03 22:40:41.000000000 +0200
+@@ -554,8 +554,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_musicPlayer_la_LIBADD = \
+--- netspeed/src/Makefile.in.orig	2010-02-03 22:40:46.000000000 +0200
++++ netspeed/src/Makefile.in	2010-02-03 22:40:58.000000000 +0200
+@@ -507,8 +507,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_netspeed_la_LIBADD = \
+--- powermanager/src/Makefile.in.orig	2010-02-03 22:41:05.000000000 +0200
++++ powermanager/src/Makefile.in	2010-02-03 22:41:16.000000000 +0200
+@@ -510,8 +510,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_powermanager_la_LIBADD = \
+--- quick-browser/src/Makefile.in.orig	2010-02-03 22:41:20.000000000 +0200
++++ quick-browser/src/Makefile.in	2010-02-03 22:41:29.000000000 +0200
+@@ -508,8 +508,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.svg"\"\
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_quick_browser_la_LIBADD = \
+--- shortcuts/src/Makefile.in.orig	2010-02-03 22:41:33.000000000 +0200
++++ shortcuts/src/Makefile.in	2010-02-03 22:42:04.000000000 +0200
+@@ -513,8 +513,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_shortcuts_la_LIBADD = \
+--- show-mouse/src/Makefile.in.orig	2010-02-03 22:42:12.000000000 +0200
++++ show-mouse/src/Makefile.in	2010-02-03 22:42:21.000000000 +0200
+@@ -505,8 +505,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+         -DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_show_mouse_la_LIBADD = \
+--- showDesklets/src/Makefile.in.orig	2010-02-03 22:42:25.000000000 +0200
++++ showDesklets/src/Makefile.in	2010-02-03 22:42:37.000000000 +0200
+@@ -504,8 +504,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_showDesklets_la_LIBADD = \
+--- showDesktop/src/Makefile.in.orig	2010-02-03 22:42:42.000000000 +0200
++++ showDesktop/src/Makefile.in	2010-02-03 22:42:52.000000000 +0200
+@@ -503,8 +503,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_showDesktop_la_LIBADD = \
+--- slider/src/Makefile.in.orig	2010-02-03 22:42:57.000000000 +0200
++++ slider/src/Makefile.in	2010-02-03 22:43:09.000000000 +0200
+@@ -515,8 +515,7 @@
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-DGL_GLEXT_PROTOTYPES=\""1"\"\
+ 	-Werror-implicit-function-declaration\
+-	-std=c99\
+-	-O3
++	-std=c99
+ 
+ #	-g -ggdb -W -Wall
+ libcd_slider_la_LIBADD = \
+--- stack/src/Makefile.in.orig	2010-02-03 22:43:13.000000000 +0200
++++ stack/src/Makefile.in	2010-02-03 22:43:24.000000000 +0200
+@@ -513,8 +513,7 @@
+ 	-DCD_STACK_DEFAULT_URL_ICON=\""url-icon.svg"\"\
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-Werror-implicit-function-declaration\
+-	-std=c99\
+-	-O3
++	-std=c99
+ 
+ #	-g -ggdb -W -Wall
+ libcd_stack_la_LIBADD = \
+--- switcher/src/Makefile.in.orig	2010-02-03 22:43:28.000000000 +0200
++++ switcher/src/Makefile.in	2010-02-03 22:43:36.000000000 +0200
+@@ -512,8 +512,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""workspaces.svg"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_switcher_la_LIBADD = \
+--- systray/src/Makefile.in.orig	2010-02-03 22:43:40.000000000 +0200
++++ systray/src/Makefile.in	2010-02-03 22:43:50.000000000 +0200
+@@ -512,8 +512,7 @@
+         -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall -W -Werror
+ libcd_systray_la_LIBADD = \
+--- terminal/src/Makefile.in.orig	2010-02-03 22:43:56.000000000 +0200
++++ terminal/src/Makefile.in	2010-02-03 22:44:06.000000000 +0200
+@@ -511,8 +511,7 @@
+         -DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall  -W -Werror
+ libcd_terminal_la_LIBADD = \
+--- tomboy/src/Makefile.in.orig	2010-02-03 22:44:12.000000000 +0200
++++ tomboy/src/Makefile.in	2010-02-03 22:44:23.000000000 +0200
+@@ -508,8 +508,7 @@
+ 	-DMY_APPLET_GETTEXT_DOMAIN=\""$(GETTEXT_TOMBOY)"\"\
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+-	-std=c99\
+-	-O3
++	-std=c99
+ 
+ #	-g -ggdb -W -Wall
+ #-Werror-implicit-function-declaration
+--- weather/src/Makefile.in.orig	2010-02-03 22:44:34.000000000 +0200
++++ weather/src/Makefile.in	2010-02-03 22:44:43.000000000 +0200
+@@ -510,8 +510,7 @@
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-DCD_APPLET_MULTI_INSTANCE=\"1\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_weather_la_LIBADD = \
+--- weblets/src/Makefile.in.orig	2010-02-03 22:44:48.000000000 +0200
++++ weblets/src/Makefile.in	2010-02-03 22:45:02.000000000 +0200
+@@ -819,8 +819,7 @@
+ 
+  #dnl Process this file with automake to produce src/Makefile.in
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+--- wifi/src/Makefile.in.orig	2010-02-03 22:45:07.000000000 +0200
++++ wifi/src/Makefile.in	2010-02-03 22:45:16.000000000 +0200
+@@ -508,8 +508,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_wifi_la_LIBADD = \
+--- xfce-integration/src/Makefile.in.orig	2010-02-03 22:45:21.000000000 +0200
++++ xfce-integration/src/Makefile.in	2010-02-03 22:45:31.000000000 +0200
+@@ -506,8 +506,7 @@
+ 	-DMY_APPLET_DOCK_VERSION=\""$(dock_version)"\"\
+ 	-DMY_APPLET_ICON_FILE=\""icon.png"\"\
+ 	-std=c99\
+-	-Werror-implicit-function-declaration\
+-	-O3
++	-Werror-implicit-function-declaration
+ 
+ #	-g -ggdb -W -Wall
+ libcd_xfce_integration_la_LIBADD = \
diff --git a/deskutils/cairo-dock-plugins/files/patch-shortcuts b/deskutils/cairo-dock-plugins/files/patch-shortcuts
new file mode 100644
index 000000000..597e7782f
--- /dev/null
+++ b/deskutils/cairo-dock-plugins/files/patch-shortcuts
@@ -0,0 +1,84 @@
+--- shortcuts/src/applet-disk-usage.c.orig	2009-09-27 19:14:51.000000000 +0300
++++ shortcuts/src/applet-disk-usage.c	2010-02-03 22:25:09.000000000 +0200
+@@ -18,10 +18,18 @@
+ */
+ 
+ #include <string.h>
+-#include <mntent.h>
+ #include <sys/types.h>
+-#include <sys/statfs.h>
++#if defined(__FreeBSD__)
++#ifdef HAVE_MNTENT_H
+ #include <mntent.h>
++#endif
++#include <sys/param.h>
++#include <sys/ucred.h>
++#include <sys/mount.h>
++#else
++#include <mntent.h>
++#include <sys/statfs.h>
++#endif
+ 
+ #include <cairo-dock.h>
+ 
+@@ -178,18 +186,50 @@
+ void cd_shortcuts_get_fs_info (const gchar *cDiskURI, GString *sInfo)
+ {
+ 	const gchar *cMountPath = (strncmp (cDiskURI, "file://", 7) == 0 ? cDiskURI + 7 : cDiskURI);
++#if defined(__FreeBSD__)
++	struct statfs *me;
++//	FILE *mtab;
++#else
+ 	struct mntent *me;
+ 	FILE *mtab = setmntent ("/etc/mtab", "r");
++#endif
+ 	char *search_path;
+ 	int match;
+ 	char *slash;
+ 
++#if defined(__FreeBSD__)
++	 int i;
++         int count = getfsstat(me, NULL, MNT_WAIT);
++//         int count = getfsstat(me, NULL, MNT_NOWAIT);
++	 if (count>0)
++	 {
++	  for (i=0; i<count; i++)
++	  {
++	   if (me->f_mntonname && strcmp (me->f_mntonname, cMountPath) == 0)
++	   {
++	    g_string_append_printf (sInfo, "Mount point : %s\nFile system : %s\nDevice : %s\nMount options : %s",
++				    me->f_mntonname,
++				    me->f_mntfromname,
++				    me->f_fstypename,
++				    me->f_charspare);
++//	    if (me->mnt_freq != 0)
++//	     g_string_append_printf (sInfo, "\nBackup frequency : %d days", me->mnt_freq);
++	    break ;
++	   }
++	  }
++	 }
++	 else
++	 {
++	  cd_warning ("error getfsstat...");
++	  return ;
++	 }
++#else
+ 	if (mtab == NULL)
+ 	{
+ 		cd_warning ("couldn't open /etc/mtab");
+ 		return ;
+ 	}
+-	
++
+ 	gchar *cFsInfo = NULL;
+ 	while ((me = getmntent (mtab)) != NULL)
+ 	{
+@@ -205,6 +245,7 @@
+ 			break ;
+ 		}
+ 	}
+-	
++
+ 	endmntent (mtab);
++#endif
+ }
diff --git a/deskutils/cairo-dock-plugins/files/patch-tomboy b/deskutils/cairo-dock-plugins/files/patch-tomboy
new file mode 100644
index 000000000..14c077577
--- /dev/null
+++ b/deskutils/cairo-dock-plugins/files/patch-tomboy
@@ -0,0 +1,22 @@
+--- tomboy/src/tomboy-dbus.c.orig	2010-01-31 16:18:01.000000000 +0200
++++ tomboy/src/tomboy-dbus.c	2010-01-28 19:49:18.000000000 +0200
+@@ -28,7 +28,7 @@
+ 
+ static DBusGProxy *dbus_proxy_tomboy = NULL;
+ 
+-extern struct tm *localtime_r (time_t *timer, struct tm *tp);
++//extern struct tm *localtime_r (time_t *timer, struct tm *tp);
+ 
+ 
+ 
+--- tomboy/src/tomboy-draw.c.orig	2010-01-31 16:18:10.000000000 +0200
++++ tomboy/src/tomboy-draw.c	2010-01-28 19:48:00.000000000 +0200
+@@ -113,7 +113,7 @@
+ 	}
+ 	else
+ 	{
+-		cairo_dock_show_temporary_dialog_with_icon ("%d %s", pIconsList ? pIconsList->data : myDesklet->icons->data, myContainer, 3000, MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE, iNbResults, iNbResults > 1 ? D_("results") : D_("result"));
++		cairo_dock_show_temporary_dialog_with_icon_printf ("%d %s", pIconsList ? pIconsList->data : myDesklet->icons->data, myContainer, 3000, MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE, iNbResults, iNbResults > 1 ? D_("results") : D_("result"));
+ 	}
+ }
+ 
diff --git a/deskutils/cairo-dock-plugins/pkg-descr b/deskutils/cairo-dock-plugins/pkg-descr
new file mode 100644
index 000000000..4a2f9cbb4
--- /dev/null
+++ b/deskutils/cairo-dock-plugins/pkg-descr
@@ -0,0 +1,7 @@
+Cairo-Dock-Plugins for Cairo-Dock is a light and eye-candy dock to launch your
+programs easily. It uses Cairo / OpenGL to render nice graphics (many in
+correlation with Compiz) with hardware acceleration. It's fully configurable
+and customizable and can be a taskbar too. You can easily plug applets into it
+or in a desklet mode.
+
+WWW:	https://launchpad.net/cairo-dock
diff --git a/deskutils/cairo-dock-plugins/pkg-plist b/deskutils/cairo-dock-plugins/pkg-plist
new file mode 100644
index 000000000..7fc46bcae
--- /dev/null
+++ b/deskutils/cairo-dock-plugins/pkg-plist
@@ -0,0 +1,472 @@
+lib/cairo-dock/libcd-Animated-icons.la
+lib/cairo-dock/libcd-Animated-icons.so
+lib/cairo-dock/libcd-Cairo-Penguin.la
+lib/cairo-dock/libcd-Cairo-Penguin.so
+lib/cairo-dock/libcd-Clipper.la
+lib/cairo-dock/libcd-Clipper.so
+lib/cairo-dock/libcd-Dbus.la
+lib/cairo-dock/libcd-Dbus.so
+%%GMENU%%lib/cairo-dock/libcd-GMenu.la
+%%GMENU%%lib/cairo-dock/libcd-GMenu.so
+lib/cairo-dock/libcd-System-Monitor.la
+lib/cairo-dock/libcd-System-Monitor.so
+lib/cairo-dock/libcd-Toons.la
+lib/cairo-dock/libcd-Toons.so
+lib/cairo-dock/libcd-Xgamma.la
+lib/cairo-dock/libcd-Xgamma.so
+lib/cairo-dock/libcd-clock.la
+lib/cairo-dock/libcd-clock.so
+lib/cairo-dock/libcd-compiz-icon.la
+lib/cairo-dock/libcd-compiz-icon.so
+lib/cairo-dock/libcd-desklet-rendering.la
+lib/cairo-dock/libcd-desklet-rendering.so
+lib/cairo-dock/libcd-dialog-rendering.la
+lib/cairo-dock/libcd-dialog-rendering.so
+lib/cairo-dock/libcd-dnd2share.la
+lib/cairo-dock/libcd-dnd2share.so
+lib/cairo-dock/libcd-drop_indicator.la
+lib/cairo-dock/libcd-drop_indicator.so
+lib/cairo-dock/libcd-dustbin.la
+lib/cairo-dock/libcd-dustbin.so
+lib/cairo-dock/libcd-icon-effect.la
+lib/cairo-dock/libcd-icon-effect.so
+lib/cairo-dock/libcd-illusion.la
+lib/cairo-dock/libcd-illusion.so
+%%KEYBOARD_INDICATOR%%lib/cairo-dock/libcd-keyboard-indicator.la
+%%KEYBOARD_INDICATOR%%lib/cairo-dock/libcd-keyboard-indicator.so
+lib/cairo-dock/libcd-logout.la
+lib/cairo-dock/libcd-logout.so
+lib/cairo-dock/libcd-motion_blur.la
+lib/cairo-dock/libcd-motion_blur.so
+lib/cairo-dock/libcd-musicPlayer.la
+lib/cairo-dock/libcd-musicPlayer.so
+lib/cairo-dock/libcd-netspeed.la
+lib/cairo-dock/libcd-netspeed.so
+lib/cairo-dock/libcd-powermanager.la
+lib/cairo-dock/libcd-powermanager.so
+lib/cairo-dock/libcd-quick-browser.la
+lib/cairo-dock/libcd-quick-browser.so
+lib/cairo-dock/libcd-rendering.la
+lib/cairo-dock/libcd-rendering.so
+lib/cairo-dock/libcd-shortcuts.la
+lib/cairo-dock/libcd-shortcuts.so
+lib/cairo-dock/libcd-showDesklets.la
+lib/cairo-dock/libcd-showDesklets.so
+lib/cairo-dock/libcd-showDesktop.la
+lib/cairo-dock/libcd-showDesktop.so
+lib/cairo-dock/libcd-show_mouse.la
+lib/cairo-dock/libcd-show_mouse.so
+lib/cairo-dock/libcd-slider.la
+lib/cairo-dock/libcd-slider.so
+lib/cairo-dock/libcd-stack.la
+lib/cairo-dock/libcd-stack.so
+lib/cairo-dock/libcd-switcher.la
+lib/cairo-dock/libcd-switcher.so
+lib/cairo-dock/libcd-systray.la
+lib/cairo-dock/libcd-systray.so
+%%TERMINAL%%lib/cairo-dock/libcd-terminal.la
+%%TERMINAL%%lib/cairo-dock/libcd-terminal.so
+lib/cairo-dock/libcd-tomboy.la
+lib/cairo-dock/libcd-tomboy.so
+lib/cairo-dock/libcd-weather.la
+lib/cairo-dock/libcd-weather.so
+%%WEBLETS%%lib/cairo-dock/libcd-weblets.la
+%%WEBLETS%%lib/cairo-dock/libcd-weblets.so
+lib/cairo-dock/libcd-wifi.la
+lib/cairo-dock/libcd-wifi.so
+lib/cairo-dock/libcd_gnome-integration.la
+lib/cairo-dock/libcd_gnome-integration.so
+%%XFCE_INTEGRATION%%lib/cairo-dock/libcd_xfce-integration.la
+%%XFCE_INTEGRATION%%lib/cairo-dock/libcd_xfce-integration.so
+share/locale/en_GB/LC_MESSAGES/cairo-dock-plugins.mo
+share/locale/fr/LC_MESSAGES/cairo-dock-plugins.mo
+share/locale/it/LC_MESSAGES/cairo-dock-plugins.mo
+share/locale/ja/LC_MESSAGES/cairo-dock-plugins.mo
+share/locale/nl/LC_MESSAGES/cairo-dock-plugins.mo
+share/locale/pt/LC_MESSAGES/cairo-dock-plugins.mo
+share/locale/pt_BR/LC_MESSAGES/cairo-dock-plugins.mo
+share/locale/ru/LC_MESSAGES/cairo-dock-plugins.mo
+share/locale/sv/LC_MESSAGES/cairo-dock-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/cairo-dock-plugins.mo
+%%DATADIR%%/plug-ins/Animated-icons/Animated-icons.conf
+%%DATADIR%%/plug-ins/Animated-icons/preview.png
+%%DATADIR%%/plug-ins/Animated-icons/icon.svg
+%%DATADIR%%/plug-ins/Animated-icons/texture-chrome.png
+%%DATADIR%%/plug-ins/Animated-icons/icon-rotation.png
+%%DATADIR%%/plug-ins/Animated-icons/spot.png
+%%DATADIR%%/plug-ins/Animated-icons/halo.png
+%%DATADIR%%/plug-ins/Animated-icons/spot-front2.png
+%%DATADIR%%/plug-ins/Animated-icons/ray.png
+%%DATADIR%%/plug-ins/Animated-icons/icon-wave.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/Cairo-Penguin.conf
+%%DATADIR%%/plug-ins/Cairo-Penguin/preview.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/icon.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/theme.conf
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/readme
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/basher.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/blocker.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/boarder.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/bomber.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/bridger.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/climber.xpm
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/digger.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/drownfall.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/drownwalk.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/exit.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/faller.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/floater.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/miner.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/reader.xpm
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/slider.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/superman.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/tumble.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/waiter.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/walker.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/sitter.png
+%%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic/xmas-walker.png
+%%DATADIR%%/plug-ins/Clipper/Clipper.conf
+%%DATADIR%%/plug-ins/Clipper/preview.png
+%%DATADIR%%/plug-ins/Clipper/icon.svg
+%%DATADIR%%/plug-ins/Clipper/Clipper-actions-gnome.conf
+%%DATADIR%%/plug-ins/Clipper/Clipper-actions-xfce.conf
+%%DATADIR%%/plug-ins/Clipper/Clipper-actions-kde.conf
+%%DATADIR%%/plug-ins/clock/clock.conf
+%%DATADIR%%/plug-ins/clock/preview.jpg
+%%DATADIR%%/plug-ins/clock/dates.svg
+%%DATADIR%%/plug-ins/clock/icon.png
+%%DATADIR%%/plug-ins/clock/icon-alarm.png
+%%DATADIR%%/plug-ins/clock/themes/default/readme
+%%DATADIR%%/plug-ins/clock/themes/default/clock-drop-shadow.svg
+%%DATADIR%%/plug-ins/clock/themes/default/clock-face-shadow.svg
+%%DATADIR%%/plug-ins/clock/themes/default/clock-face.svg
+%%DATADIR%%/plug-ins/clock/themes/default/clock-frame.svg
+%%DATADIR%%/plug-ins/clock/themes/default/clock-glass.svg
+%%DATADIR%%/plug-ins/clock/themes/default/clock-hour-hand-shadow.svg
+%%DATADIR%%/plug-ins/clock/themes/default/clock-hour-hand.svg
+%%DATADIR%%/plug-ins/clock/themes/default/clock-marks.svg
+%%DATADIR%%/plug-ins/clock/themes/default/clock-minute-hand-shadow.svg
+%%DATADIR%%/plug-ins/clock/themes/default/clock-minute-hand.svg
+%%DATADIR%%/plug-ins/clock/themes/default/clock-second-hand-shadow.svg
+%%DATADIR%%/plug-ins/clock/themes/default/clock-second-hand.svg
+%%DATADIR%%/plug-ins/clock/themes/default/theme.conf
+%%DATADIR%%/plug-ins/clock/digital/default/config
+%%DATADIR%%/plug-ins/clock/digital/default/frame_0.svg
+%%DATADIR%%/plug-ins/clock/digital/default/frame_1.svg
+%%DATADIR%%/plug-ins/clock/digital/default/frame_2.svg
+%%DATADIR%%/plug-ins/clock/digital/default/frame_3.svg
+%%DATADIR%%/plug-ins/compiz-icon/compiz
+%%DATADIR%%/plug-ins/compiz-icon/compiz-kill
+%%DATADIR%%/plug-ins/compiz-icon/compiz-icon.conf
+%%DATADIR%%/plug-ins/compiz-icon/preview.png
+%%DATADIR%%/plug-ins/compiz-icon/default.svg
+%%DATADIR%%/plug-ins/compiz-icon/broken.svg
+%%DATADIR%%/plug-ins/compiz-icon/other.svg
+%%DATADIR%%/plug-ins/compiz-icon/0.svg
+%%DATADIR%%/plug-ins/compiz-icon/1.svg
+%%DATADIR%%/plug-ins/compiz-icon/2.svg
+%%DATADIR%%/plug-ins/compiz-icon/3.svg
+%%DATADIR%%/plug-ins/compiz-icon/4.svg
+%%DATADIR%%/plug-ins/compiz-icon/icon.png
+%%DATADIR%%/plug-ins/Dbus/Dbus.conf
+%%DATADIR%%/plug-ins/Dbus/icon.svg
+%%DATADIR%%/plug-ins/desklet-rendering/icon.svg
+%%DATADIR%%/plug-ins/desklet-rendering/branche1.svg
+%%DATADIR%%/plug-ins/desklet-rendering/branche2.svg
+%%DATADIR%%/plug-ins/desklet-rendering/scotch.svg
+%%DATADIR%%/plug-ins/desklet-rendering/scotch+frame.svg
+%%DATADIR%%/plug-ins/desklet-rendering/frame.svg
+%%DATADIR%%/plug-ins/desklet-rendering/reflect.svg
+%%DATADIR%%/plug-ins/desklet-rendering/cd_box_cover.svg
+%%DATADIR%%/plug-ins/desklet-rendering/cd_box.svg
+%%DATADIR%%/plug-ins/desklet-rendering/starcraft2.png
+%%DATADIR%%/plug-ins/desklet-rendering/dark-bg.png
+%%DATADIR%%/plug-ins/desklet-rendering/clear-bg.svg
+%%DATADIR%%/plug-ins/desklet-rendering/board.png
+%%DATADIR%%/plug-ins/dialog-rendering/dialog-rendering.conf
+%%DATADIR%%/plug-ins/dialog-rendering/preview.png
+%%DATADIR%%/plug-ins/dialog-rendering/icon.svg
+%%DATADIR%%/plug-ins/dnd2share/upload2free.sh
+%%DATADIR%%/plug-ins/dnd2share/dnd2share.conf
+%%DATADIR%%/plug-ins/dnd2share/readme
+%%DATADIR%%/plug-ins/dnd2share/preview.png
+%%DATADIR%%/plug-ins/dnd2share/icon.png
+%%GMENU%%%%DATADIR%%/plug-ins/GMenu/GMenu.conf
+%%GMENU%%%%DATADIR%%/plug-ins/GMenu/icon-recent.png
+%%GMENU%%%%DATADIR%%/plug-ins/GMenu/icon.svg
+%%GMENU%%%%DATADIR%%/plug-ins/GMenu/preview.png
+%%DATADIR%%/plug-ins/drop-indicator/drop_indicator.conf
+%%DATADIR%%/plug-ins/drop-indicator/preview.png
+%%DATADIR%%/plug-ins/drop-indicator/icon.svg
+%%DATADIR%%/plug-ins/drop-indicator/default-drop-indicator.svg
+%%DATADIR%%/plug-ins/drop-indicator/default-hover-indicator.svg
+%%DATADIR%%/plug-ins/dustbin/dustbin.conf
+%%DATADIR%%/plug-ins/dustbin/preview.jpg
+%%DATADIR%%/plug-ins/dustbin/icon.png
+%%DATADIR%%/plug-ins/dustbin/themes/default/trashcan_full.svg
+%%DATADIR%%/plug-ins/dustbin/themes/default/trashcan_empty.svg
+%%DATADIR%%/plug-ins/gnome-integration/icon.png
+%%DATADIR%%/plug-ins/icon-effect/icon-effect.conf
+%%DATADIR%%/plug-ins/icon-effect/preview.png
+%%DATADIR%%/plug-ins/icon-effect/icon.png
+%%DATADIR%%/plug-ins/icon-effect/star.png
+%%DATADIR%%/plug-ins/icon-effect/snow.png
+%%DATADIR%%/plug-ins/icon-effect/rain.png
+%%DATADIR%%/plug-ins/icon-effect/icon-fire.svg
+%%DATADIR%%/plug-ins/icon-effect/icon-storm.png
+%%DATADIR%%/plug-ins/illusion/illusion.conf
+%%DATADIR%%/plug-ins/illusion/preview.png
+%%DATADIR%%/plug-ins/illusion/icon.svg
+%%DATADIR%%/plug-ins/illusion/icon-black-hole.svg
+%%DATADIR%%/plug-ins/illusion/icon-break.svg
+%%DATADIR%%/plug-ins/illusion/icon-evaporate.svg
+%%DATADIR%%/plug-ins/illusion/icon-explode.svg
+%%DATADIR%%/plug-ins/illusion/icon-fade-out.svg
+%%KEYBOARD_INDICATOR%%%%DATADIR%%/plug-ins/keyboard-indicator/icon.svg
+%%KEYBOARD_INDICATOR%%%%DATADIR%%/plug-ins/keyboard-indicator/keyboard-indicator.conf
+%%KEYBOARD_INDICATOR%%%%DATADIR%%/plug-ins/keyboard-indicator/preview.png
+%%DATADIR%%/plug-ins/logout/logout.conf
+%%DATADIR%%/plug-ins/logout/preview.png
+%%DATADIR%%/plug-ins/logout/icon.svg
+%%DATADIR%%/plug-ins/logout/icon-scheduling.png
+%%DATADIR%%/plug-ins/motion-blur/motion_blur.conf
+%%DATADIR%%/plug-ins/motion-blur/preview.png
+%%DATADIR%%/plug-ins/motion-blur/icon.png
+%%DATADIR%%/plug-ins/musicPlayer/musicPlayer.conf
+%%DATADIR%%/plug-ins/musicPlayer/broken.svg
+%%DATADIR%%/plug-ins/musicPlayer/pause.svg
+%%DATADIR%%/plug-ins/musicPlayer/play.svg
+%%DATADIR%%/plug-ins/musicPlayer/stop.svg
+%%DATADIR%%/plug-ins/musicPlayer/default.svg
+%%DATADIR%%/plug-ins/musicPlayer/broken.jpg
+%%DATADIR%%/plug-ins/musicPlayer/pause.jpg
+%%DATADIR%%/plug-ins/musicPlayer/play.jpg
+%%DATADIR%%/plug-ins/musicPlayer/stop.jpg
+%%DATADIR%%/plug-ins/musicPlayer/default.jpg
+%%DATADIR%%/plug-ins/musicPlayer/0.svg
+%%DATADIR%%/plug-ins/musicPlayer/1.svg
+%%DATADIR%%/plug-ins/musicPlayer/2.svg
+%%DATADIR%%/plug-ins/musicPlayer/3.svg
+%%DATADIR%%/plug-ins/musicPlayer/preview.png
+%%DATADIR%%/plug-ins/musicPlayer/icon.png
+%%DATADIR%%/plug-ins/musicPlayer/themes/cd_box_simple/readme
+%%DATADIR%%/plug-ins/musicPlayer/themes/cd_box_simple/preview
+%%DATADIR%%/plug-ins/musicPlayer/themes/cd_box_simple/frame.svg
+%%DATADIR%%/plug-ins/musicPlayer/themes/cd_box_simple/reflect.svg
+%%DATADIR%%/plug-ins/musicPlayer/themes/cd_box_simple/theme.conf
+%%DATADIR%%/plug-ins/netspeed/netspeed.conf
+%%DATADIR%%/plug-ins/netspeed/preview.png
+%%DATADIR%%/plug-ins/netspeed/default.png
+%%DATADIR%%/plug-ins/netspeed/icon.png
+%%DATADIR%%/plug-ins/netspeed/ok.png
+%%DATADIR%%/plug-ins/netspeed/unknown.png
+%%DATADIR%%/plug-ins/netspeed/bad.png
+%%DATADIR%%/plug-ins/netspeed/netspeed
+%%DATADIR%%/plug-ins/powermanager/sector.svg
+%%DATADIR%%/plug-ins/powermanager/default-battery.svg
+%%DATADIR%%/plug-ins/powermanager/default-charge.svg
+%%DATADIR%%/plug-ins/powermanager/powermanager.conf
+%%DATADIR%%/plug-ins/powermanager/preview.png
+%%DATADIR%%/plug-ins/powermanager/icon.png
+%%DATADIR%%/plug-ins/quick_browser/quick-browser.conf
+%%DATADIR%%/plug-ins/quick_browser/preview.png
+%%DATADIR%%/plug-ins/quick_browser/icon.svg
+%%DATADIR%%/plug-ins/rendering/rendering.conf
+%%DATADIR%%/plug-ins/rendering/icon.svg
+%%DATADIR%%/plug-ins/rendering/preview-caroussel.jpg
+%%DATADIR%%/plug-ins/rendering/preview-parabolic.jpg
+%%DATADIR%%/plug-ins/rendering/preview-3D-plane.jpg
+%%DATADIR%%/plug-ins/rendering/preview-rainbow.jpg
+%%DATADIR%%/plug-ins/rendering/preview-diapo.jpg
+%%DATADIR%%/plug-ins/rendering/preview-diapo-simple.jpg
+%%DATADIR%%/plug-ins/rendering/preview-curve.jpg
+%%DATADIR%%/plug-ins/rendering/readme-3D-plane-view
+%%DATADIR%%/plug-ins/rendering/readme-caroussel-view
+%%DATADIR%%/plug-ins/rendering/readme-curve-view
+%%DATADIR%%/plug-ins/rendering/readme-diapo-simple-view
+%%DATADIR%%/plug-ins/rendering/readme-diapo-view
+%%DATADIR%%/plug-ins/rendering/readme-parabolic-view
+%%DATADIR%%/plug-ins/rendering/readme-rainbow-view
+%%DATADIR%%/plug-ins/shortcuts/shortcuts.conf
+%%DATADIR%%/plug-ins/shortcuts/icon.png
+%%DATADIR%%/plug-ins/shortcuts/preview.png
+%%DATADIR%%/plug-ins/showDesklets/showDesklets.conf
+%%DATADIR%%/plug-ins/showDesklets/preview.png
+%%DATADIR%%/plug-ins/showDesklets/show-desklets.svg
+%%DATADIR%%/plug-ins/showDesklets/hide-desklets.svg
+%%DATADIR%%/plug-ins/showDesklets/icon.png
+%%DATADIR%%/plug-ins/showDesktop/showDesktop.conf
+%%DATADIR%%/plug-ins/showDesktop/preview.png
+%%DATADIR%%/plug-ins/showDesktop/icon.png
+%%DATADIR%%/plug-ins/show_mouse/show_mouse.conf
+%%DATADIR%%/plug-ins/show_mouse/preview.png
+%%DATADIR%%/plug-ins/show_mouse/icon.png
+%%DATADIR%%/plug-ins/slider/slider.conf
+%%DATADIR%%/plug-ins/slider/preview.png
+%%DATADIR%%/plug-ins/slider/icon.png
+%%DATADIR%%/plug-ins/stack/stack.conf
+%%DATADIR%%/plug-ins/stack/preview.png
+%%DATADIR%%/plug-ins/stack/icon.png
+%%DATADIR%%/plug-ins/stack/default-icon.png
+%%DATADIR%%/plug-ins/stack/text-icon.svg
+%%DATADIR%%/plug-ins/stack/url-icon.svg
+%%DATADIR%%/plug-ins/switcher/broken.svg
+%%DATADIR%%/plug-ins/switcher/default.svg
+%%DATADIR%%/plug-ins/switcher/workspaces.svg
+%%DATADIR%%/plug-ins/switcher/preview.png
+%%DATADIR%%/plug-ins/switcher/switcher.conf
+%%DATADIR%%/plug-ins/System-monitor/nvidia-config
+%%DATADIR%%/plug-ins/System-monitor/System-Monitor.conf
+%%DATADIR%%/plug-ins/System-monitor/preview.png
+%%DATADIR%%/plug-ins/System-monitor/icon.png
+%%DATADIR%%/plug-ins/System-monitor/button-cpu.png
+%%DATADIR%%/plug-ins/System-monitor/button-ram.png
+%%DATADIR%%/plug-ins/systray/systray.conf
+%%DATADIR%%/plug-ins/systray/preview.png
+%%DATADIR%%/plug-ins/systray/icon.png
+%%TERMINAL%%%%DATADIR%%/plug-ins/terminal/icon.png
+%%TERMINAL%%%%DATADIR%%/plug-ins/terminal/preview.png
+%%TERMINAL%%%%DATADIR%%/plug-ins/terminal/terminal.conf
+%%DATADIR%%/plug-ins/tomboy/default.svg
+%%DATADIR%%/plug-ins/tomboy/close.svg
+%%DATADIR%%/plug-ins/tomboy/broken.svg
+%%DATADIR%%/plug-ins/tomboy/note.svg
+%%DATADIR%%/plug-ins/tomboy/tomboy.conf
+%%DATADIR%%/plug-ins/tomboy/icon.png
+%%DATADIR%%/plug-ins/tomboy/preview.png
+%%DATADIR%%/plug-ins/Toons/Toons.conf
+%%DATADIR%%/plug-ins/Toons/preview.jpg
+%%DATADIR%%/plug-ins/Toons/icon.svg
+%%DATADIR%%/plug-ins/Toons/themes/Classic/theme.conf
+%%DATADIR%%/plug-ins/Toons/themes/Classic/readme
+%%DATADIR%%/plug-ins/Toons/themes/Classic/toon.svg
+%%DATADIR%%/plug-ins/Toons/themes/Classic/pupil.svg
+%%DATADIR%%/plug-ins/Toons/themes/Classic/eyelid.svg
+%%DATADIR%%/plug-ins/weather/weather.conf
+%%DATADIR%%/plug-ins/weather/preview.png
+%%DATADIR%%/plug-ins/weather/broken.png
+%%DATADIR%%/plug-ins/weather/icon.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/0.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/1.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/2.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/3.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/4.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/5.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/6.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/7.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/8.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/9.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/10.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/11.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/12.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/13.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/14.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/15.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/16.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/17.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/18.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/19.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/20.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/21.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/22.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/23.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/24.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/25.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/26.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/27.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/28.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/29.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/30.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/31.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/32.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/33.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/34.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/35.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/36.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/37.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/38.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/39.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/40.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/41.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/42.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/43.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/44.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/45.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/46.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/47.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/na.png
+%%DATADIR%%/plug-ins/weather/themes/Classic/preview
+%%DATADIR%%/plug-ins/weather/themes/Classic/readme
+%%WEBLETS%%%%DATADIR%%/plug-ins/weblets/icon.png
+%%WEBLETS%%%%DATADIR%%/plug-ins/weblets/preview.png
+%%WEBLETS%%%%DATADIR%%/plug-ins/weblets/weblets.conf
+%%DATADIR%%/plug-ins/wifi/wifi
+%%DATADIR%%/plug-ins/wifi/wifi.conf
+%%DATADIR%%/plug-ins/wifi/preview.png
+%%DATADIR%%/plug-ins/wifi/link-0.svg
+%%DATADIR%%/plug-ins/wifi/link-1.svg
+%%DATADIR%%/plug-ins/wifi/link-2.svg
+%%DATADIR%%/plug-ins/wifi/link-3.svg
+%%DATADIR%%/plug-ins/wifi/link-4.svg
+%%DATADIR%%/plug-ins/wifi/link-5.svg
+%%DATADIR%%/plug-ins/wifi/icon.png
+
+%%XFCE_INTEGRATION%%%%DATADIR%%/plug-ins/xfce-integration/icon.png
+%%DATADIR%%/plug-ins/Xgamma/Xgamma.conf
+%%DATADIR%%/plug-ins/Xgamma/preview.png
+%%DATADIR%%/plug-ins/Xgamma/icon.png
+@dirrm %%DATADIR%%/plug-ins/Animated-icons
+@dirrm %%DATADIR%%/plug-ins/Cairo-Penguin/themes/Classic
+@dirrm %%DATADIR%%/plug-ins/Cairo-Penguin/themes
+@dirrm %%DATADIR%%/plug-ins/Cairo-Penguin
+@dirrm %%DATADIR%%/plug-ins/Clipper
+@dirrm %%DATADIR%%/plug-ins/Dbus
+%%GMENU%%@dirrm %%DATADIR%%/plug-ins/GMenu
+@dirrm %%DATADIR%%/plug-ins/System-monitor
+@dirrm %%DATADIR%%/plug-ins/Toons/themes/Classic
+@dirrm %%DATADIR%%/plug-ins/Toons/themes
+@dirrm %%DATADIR%%/plug-ins/Toons
+@dirrm %%DATADIR%%/plug-ins/Xgamma
+@dirrm %%DATADIR%%/plug-ins/clock/digital/default
+@dirrm %%DATADIR%%/plug-ins/clock/digital
+@dirrm %%DATADIR%%/plug-ins/clock/themes/default
+@dirrm %%DATADIR%%/plug-ins/clock/themes
+@dirrm %%DATADIR%%/plug-ins/clock
+@dirrm %%DATADIR%%/plug-ins/compiz-icon
+@dirrm %%DATADIR%%/plug-ins/desklet-rendering
+@dirrm %%DATADIR%%/plug-ins/dialog-rendering
+@dirrm %%DATADIR%%/plug-ins/dnd2share
+@dirrm %%DATADIR%%/plug-ins/drop-indicator
+@dirrm %%DATADIR%%/plug-ins/dustbin/themes/default
+@dirrm %%DATADIR%%/plug-ins/dustbin/themes
+@dirrm %%DATADIR%%/plug-ins/dustbin
+@dirrm %%DATADIR%%/plug-ins/gnome-integration
+@dirrm %%DATADIR%%/plug-ins/icon-effect
+@dirrm %%DATADIR%%/plug-ins/illusion
+%%KEYBOARD_INDICATOR%%@dirrm %%DATADIR%%/plug-ins/keyboard-indicator
+@dirrm %%DATADIR%%/plug-ins/logout
+@dirrm %%DATADIR%%/plug-ins/motion-blur
+@dirrm %%DATADIR%%/plug-ins/musicPlayer/themes/cd_box_simple
+@dirrm %%DATADIR%%/plug-ins/musicPlayer/themes
+@dirrm %%DATADIR%%/plug-ins/musicPlayer
+@dirrm %%DATADIR%%/plug-ins/netspeed
+@dirrm %%DATADIR%%/plug-ins/powermanager
+@dirrm %%DATADIR%%/plug-ins/quick_browser
+@dirrm %%DATADIR%%/plug-ins/rendering
+@dirrm %%DATADIR%%/plug-ins/shortcuts
+@dirrm %%DATADIR%%/plug-ins/showDesklets
+@dirrm %%DATADIR%%/plug-ins/showDesktop
+@dirrm %%DATADIR%%/plug-ins/show_mouse
+@dirrm %%DATADIR%%/plug-ins/slider
+@dirrm %%DATADIR%%/plug-ins/stack
+@dirrm %%DATADIR%%/plug-ins/switcher
+@dirrm %%DATADIR%%/plug-ins/systray
+%%TERMINAL%%@dirrm %%DATADIR%%/plug-ins/terminal
+@dirrm %%DATADIR%%/plug-ins/tomboy
+@dirrm %%DATADIR%%/plug-ins/weather/themes/Classic
+@dirrm %%DATADIR%%/plug-ins/weather/themes
+@dirrm %%DATADIR%%/plug-ins/weather
+%%WEBLETS%%@dirrm %%DATADIR%%/plug-ins/weblets
+@dirrm %%DATADIR%%/plug-ins/wifi
+%%XFCE_INTEGRATION%%@dirrm %%DATADIR%%/plug-ins/xfce-integration
+@dirrm %%DATADIR%%/plug-ins
+@dirrm lib/cairo-dock
diff --git a/deskutils/google-gadgets/Makefile b/deskutils/google-gadgets/Makefile
new file mode 100644
index 000000000..df450cf8a
--- /dev/null
+++ b/deskutils/google-gadgets/Makefile
@@ -0,0 +1,149 @@
+# New ports collection makefile for:	google-gadgets
+# Date created:		2008-06-08
+# Whom:			Ashish Shukla <wahjava@gmail.com>
+#
+# $FreeBSD: ports/deskutils/google-gadgets/Makefile,v 1.19 2010/06/11 13:37:34 ashish Exp $
+#
+
+PORTNAME=	google-gadgets
+PORTVERSION=	0.11.2
+PORTREVISION=	3
+CATEGORIES=	deskutils
+MASTER_SITES=	http://google-gadgets-for-linux.googlecode.com/files/
+DISTNAME=	${PORTNAME}-for-linux-${PORTVERSION}
+
+MAINTAINER=	ashish@FreeBSD.org
+COMMENT=	Google Desktop Gadgets
+
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus \
+		${LOCALBASE}/libdata/pkgconfig/libcurl.pc:${PORTSDIR}/ftp/curl \
+		${LOCALBASE}/libdata/pkgconfig/libxml-2.0.pc:${PORTSDIR}/textproc/libxml2 \
+		${LOCALBASE}/libdata/pkgconfig/cairo.pc:${PORTSDIR}/graphics/cairo \
+		${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc:${PORTSDIR}/graphics/librsvg2 \
+		${LOCALBASE}/libdata/pkgconfig/libstartup-notification-1.0.pc:${PORTSDIR}/x11/startup-notification \
+		zip:${PORTSDIR}/archivers/zip
+LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
+		xml2.5:${PORTSDIR}/textproc/libxml2 \
+		dbus-1.3:${PORTSDIR}/devel/dbus \
+		curl.6:${PORTSDIR}/ftp/curl \
+		rsvg-2.2:${PORTSDIR}/graphics/librsvg2 \
+		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+RUN_DEPENDS=	${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
+
+USE_BZIP2=	yes
+USE_LDCONFIG=	yes
+USE_GMAKE=	yes
+USE_GCC=	4.2+
+USE_GSTREAMER=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -Wno-deprecated-declarations" LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--enable-ltdl-install=no --with-browser-plugins-dir=${LOCALBASE}/lib/browser_plugins
+USE_AUTOTOOLS=	libtool:22:env autoconf:262:env automake:110:env aclocal:110:env libltdl:22
+WANT_GNOME=	yes
+USE_GNOME=	gnomehack
+INSTALLS_ICONS=	yes
+
+OPTIONS=	DEBUGGING	"Enable debug output on runtime"	on\
+		GTK		"Build GTK Host"			on\
+		QT		"Build Qt Host"				on\
+		GTKWEBKIT	"Build with GTK Webkit support"		on\
+		MOZILLA		"Build with Mozilla support"		on
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_QT)
+USE_QT_VER=	4
+QT_COMPONENTS=	webkit opengl gui corelib script network moc_build
+.endif
+
+.if defined(WITH_GTKWEBKIT)
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/webkit-1.0.pc:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+=	webkitgtk-1.0.13:${PORTSDIR}/www/webkit-gtk2
+.endif
+
+.if defined(WITH_MOZILLA)
+USE_GECKO=	libxul firefox mozilla seamonkey xulrunner
+.endif
+
+.if defined(WITHOUT_GTKWEBKIT) && defined(WITHOUT_MOZILLA) && defined(WITH_GTK)
+IGNORE=	gtk host requires GTK Webkit or/and Mozilla support to be enabled. Please, rerun 'make config'
+.elif defined(WITH_GTKWEBKIT) && defined(WITHOUT_GTK)
+.undef WITHOUT_GTK
+WITH_GTK=yes
+
+pre-everything::
+	@${ECHO_MSG} "==> GTK Webkit or/and Mozilla support is enabled."
+	@${ECHO_MSG} "==> Enabling GTK support. If this is not desired,"
+	@${ECHO_MSG} "==> please rerun 'make config'."
+.endif
+
+.include <bsd.port.pre.mk>
+
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -Wno-deprecated-declarations"
+
+.if ${OSVERSION} < 700000
+IGNORE=	needs 7.X or higher
+.endif
+
+.if defined(WITH_DEBUGGING)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
+
+.if defined(WITHOUT_GTK)
+PLIST_SUB+=	GTK="@comment "
+CONFIGURE_ARGS+=	--disable-gtk-host \
+			--disable-libggadget-gtk \
+			--disable-gtkmoz-browser-element \
+			--disable-gtk-system-framework \
+			--disable-webkit-script-runtime \
+			--disable-gtkwebkit-browser-element \
+			--disable-soup-xml-http-request
+.elif defined(WITH_GTK)
+USE_GNOME=	gtk20
+PLIST_SUB+=	GTK=""
+CONFIGURE_ARGS+=	--enable-gtk-host
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/libsoup-2.4.pc:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS+=	soup-2.4.1:${PORTSDIR}/devel/libsoup
+RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+CONFIGURE_ARGS+=	--with-ssl-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
+
+.endif
+
+.if defined(WITHOUT_GTKWEBKIT)
+PLIST_SUB+=	GTKWEBKIT="@comment "
+CONFIGURE_ARGS+=	--disable-webkit-script-runtime	--disable-gtkwebkit-browser-element
+.elif defined(WITH_GTKWEBKIT)
+PLIST_SUB+=	GTKWEBKIT=""
+.endif
+
+.if defined(WITHOUT_MOZILLA)
+PLIST_SUB+=	MOZILLA="@comment "
+CONFIGURE_ARGS+=	--disable-smjs-script-runtime	--disable-gtkmoz-browser-element
+.elif defined(WITH_MOZILLA)
+PLIST_SUB+=	MOZILLA=""
+.endif
+
+.if defined(WITHOUT_QT)
+PLIST_SUB+=	QT="@comment "
+CONFIGURE_ARGS+=	--disable-qt-host --disable-libggadget-qt --disable-qt-system-framework\
+			--disable-qtwebkit-browser-element --disable-qt-script-runtime --disable-qt-xml-http-request
+.else
+PLIST_SUB+=	QT=""
+CONFIGURE_ARGS+=	--enable-qt-host
+.endif
+
+.if defined(WITHOUT_QT) && defined(WITHOUT_GTK)
+IGNORE=	requires GTK or/and Qt host to be enabled. Please, rerun 'make config'
+.endif
+
+post-patch:
+	@${FIND} ${WRKSRC} -type f -name Makefile.am -exec ${GREP} -l pkgconfig {} \; | ${XARGS} ${REINPLACE_CMD} -e 's|^\(pkgconfigdir[[:space:]]*=\).*|\1 $$(prefix)/libdata/pkgconfig|'
+
+pre-configure:
+	@cd ${WRKSRC} && ${SH} autotools/bootstrap.sh && ${CP} ${AUTOMAKE_DIR}/mkinstalldirs libltdl/
+	@cd ${WRKSRC} && ${CHMOD} +x autotools/install-sh
+
+post-install:
+	@-update-desktop-database
+
+.include <bsd.port.post.mk>
diff --git a/deskutils/google-gadgets/distinfo b/deskutils/google-gadgets/distinfo
new file mode 100644
index 000000000..fde6c8d04
--- /dev/null
+++ b/deskutils/google-gadgets/distinfo
@@ -0,0 +1,3 @@
+MD5 (google-gadgets-for-linux-0.11.2.tar.bz2) = 279305553bcbf74f3e3615f6abc36a5e
+SHA256 (google-gadgets-for-linux-0.11.2.tar.bz2) = 2f129ae6c294876b3bc29bdf66c0f02e2c1000f97aadb3540d296560a14f343f
+SIZE (google-gadgets-for-linux-0.11.2.tar.bz2) = 2539750
diff --git a/deskutils/google-gadgets/files/patch-configure.ac b/deskutils/google-gadgets/files/patch-configure.ac
new file mode 100644
index 000000000..3398f0c32
--- /dev/null
+++ b/deskutils/google-gadgets/files/patch-configure.ac
@@ -0,0 +1,36 @@
+
+$FreeBSD: ports/deskutils/google-gadgets/files/patch-configure.ac,v 1.5 2009/12/29 11:09:51 miwi Exp $
+
+--- configure.ac.orig
++++ configure.ac
+@@ -501,6 +501,13 @@
+     GGL_PLATFORM="\"linux\""
+     build_linux_system_framework=yes
+     ;;
++  *freebsd* )
++    ggl_host_type=freebsd
++    PREDEFINED_MACROS="$PREDEFINED_MACROS -DGGL_HOST_LINUX=1"
++    build_linux_system_framework=yes
++    GGL_PLATFORM_SHORT=\"freebsd\"
++    GGL_PLATFORM=\"freebsd\"
++    ;;
+   *solaris* )
+     ggl_host_type=solaris
+     PREDEFINED_MACROS="$PREDEFINED_MACROS -DGGL_HOST_SOLARIS=1"
+@@ -526,6 +533,7 @@
+ AM_CONDITIONAL([GGL_HOST_MACOSX], [test x$ggl_host_type = xmacosx])
+ AM_CONDITIONAL([GGL_HOST_LINUX], [test x$ggl_host_type = xlinux])
+ AM_CONDITIONAL([GGL_HOST_SOLARIS], [test x$ggl_host_type = xsolaris])
++AM_CONDITIONAL([GGL_HOST_FREEBSD], [test x$ggl_host_type = xfreebsd])
+ 
+ AC_SUBST(PREDEFINED_MACROS)
+ AC_SUBST(DEFAULT_COMPILE_FLAGS)
+@@ -651,7 +659,7 @@
+ has_qtwebkit=no
+ has_qtscript=no
+ if test x$build_libggadget_qt = xyes; then
+-  if test x$ggl_host_type = xlinux; then
++  if test x$ggl_host_type = xlinux -o x$ggl_host_type = xfreebsd; then
+     PKG_CHECK_MODULES(QT4, [QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3],
+                       [has_qt4=yes
+                        MOC=`$PKG_CONFIG --variable=moc_location QtCore`],
diff --git a/deskutils/google-gadgets/files/patch-extensions_gst__audio__framework_gst__audio__framework.cc b/deskutils/google-gadgets/files/patch-extensions_gst__audio__framework_gst__audio__framework.cc
new file mode 100644
index 000000000..5c804f74e
--- /dev/null
+++ b/deskutils/google-gadgets/files/patch-extensions_gst__audio__framework_gst__audio__framework.cc
@@ -0,0 +1,77 @@
+
+$FreeBSD: ports/deskutils/google-gadgets/files/patch-extensions_gst__audio__framework_gst__audio__framework.cc,v 1.1 2008/06/09 00:52:55 ahze Exp $
+
+--- extensions/gst_audio_framework/gst_audio_framework.cc.orig
++++ extensions/gst_audio_framework/gst_audio_framework.cc
+@@ -91,7 +91,7 @@
+     }
+ 
+     // Use fakesink as video-sink to discard the video output.
+-    g_object_set(G_OBJECT(playbin_), "video-sink", videosink, NULL);
++    g_object_set(G_OBJECT(playbin_), "video-sink", videosink, (gchar*)0);
+ 
+     // Create new audio sink with panorama support if possible.
+     GstElement *audiosink = NULL;
+@@ -114,7 +114,7 @@
+     // panorama support.
+     if (panorama_) {
+       GstElement *audiobin = gst_bin_new("audiobin");
+-      gst_bin_add_many(GST_BIN(audiobin), panorama_, audiosink, NULL);
++      gst_bin_add_many(GST_BIN(audiobin), panorama_, audiosink, (GstElement*)0);
+       gst_element_link(panorama_, audiosink);
+       GstPad *sinkpad = gst_element_get_pad(panorama_, "sink");
+       gst_element_add_pad(audiobin, gst_ghost_pad_new("sink", sinkpad));
+@@ -123,7 +123,7 @@
+     }
+ 
+     // Set audio-sink to our new audiosink.
+-    g_object_set(G_OBJECT(playbin_), "audio-sink", audiosink, NULL);
++    g_object_set(G_OBJECT(playbin_), "audio-sink", audiosink, (gchar*)0);
+ 
+     // Watch the message bus.
+     // The host using this class must use a g_main_loop to capture the
+@@ -153,7 +153,7 @@
+   virtual int GetBalance() const {
+     if (playbin_ && panorama_) {
+       gfloat balance;
+-      g_object_get(G_OBJECT(panorama_), "panorama", &balance, NULL);
++      g_object_get(G_OBJECT(panorama_), "panorama", &balance, (gchar*)0);
+       int gg_balance = static_cast<int>(((balance + 1) / 2) *
+                                         (kMaxBalance - kMinBalance) +
+                                         kMinBalance);
+@@ -177,7 +177,7 @@
+       }
+       gfloat gst_balance =
+         (gfloat(balance - kMinBalance) / (kMaxBalance - kMinBalance)) * 2 - 1;
+-      g_object_set(G_OBJECT(panorama_), "panorama", gst_balance, NULL);
++      g_object_set(G_OBJECT(panorama_), "panorama", gst_balance, (gchar*)0);
+     } else {
+       if (!playbin_)
+         DLOG("Playbin was not initialized correctly.");
+@@ -237,7 +237,7 @@
+       // FIXME:
+       // Playbin won't produce ERROR whether it's a bad uri or the file's
+       // format is not supported. We must check here.
+-      g_object_set(G_OBJECT(playbin_), "uri", src, NULL);
++      g_object_set(G_OBJECT(playbin_), "uri", src, (gchar*)0);
+     } else {
+       if (!playbin_)
+         DLOG("Playbin was not initialized correctly.");
+@@ -253,7 +253,7 @@
+   virtual int GetVolume() const {
+     if (playbin_) {
+       double volume;
+-      g_object_get(G_OBJECT(playbin_), "volume", &volume, NULL);
++      g_object_get(G_OBJECT(playbin_), "volume", &volume, (gchar*)0);
+       int gg_volume = static_cast<int>((volume / kMaxGstVolume) *
+                                         (kMaxVolume - kMinVolume) +
+                                         kMinVolume);
+@@ -275,7 +275,7 @@
+         (gdouble(volume - kMinVolume) / (kMaxVolume - kMinVolume)) *
+         kMaxGstVolume;
+ 
+-      g_object_set(G_OBJECT(playbin_), "volume", gst_volume, NULL);
++      g_object_set(G_OBJECT(playbin_), "volume", gst_volume, (gchar*)0);
+     } else {
+       DLOG("Playbin was not initialized correctly.");
+     }
diff --git a/deskutils/google-gadgets/files/patch-extensions_gst__video__element_gadget__videosink.cc b/deskutils/google-gadgets/files/patch-extensions_gst__video__element_gadget__videosink.cc
new file mode 100644
index 000000000..9af2a7ccd
--- /dev/null
+++ b/deskutils/google-gadgets/files/patch-extensions_gst__video__element_gadget__videosink.cc
@@ -0,0 +1,50 @@
+
+$FreeBSD: ports/deskutils/google-gadgets/files/patch-extensions_gst__video__element_gadget__videosink.cc,v 1.1 2008/10/19 14:59:03 miwi Exp $
+
+--- extensions/gst_video_element/gadget_videosink.cc.orig
++++ extensions/gst_video_element/gadget_videosink.cc
+@@ -459,10 +459,10 @@
+       nom = gst_value_get_fraction_numerator(videosink->par_);
+       den = gst_value_get_fraction_denominator(videosink->par_);
+       gst_structure_set(structure, "pixel-aspect-ratio",
+-                        GST_TYPE_FRACTION, nom, den, NULL);
++                        GST_TYPE_FRACTION, nom, den, (gchar*)0);
+     } else {
+       gst_structure_set(structure, "pixel-aspect-ratio",
+-                        GST_TYPE_FRACTION, 1, 1, NULL);
++                        GST_TYPE_FRACTION, 1, 1, (gchar*)0);
+     }
+   }
+ 
+@@ -672,18 +672,18 @@
+       desired_caps = gst_caps_copy(caps);
+       desired_struct = gst_caps_get_structure(desired_caps, 0);
+ 
+-      gst_structure_set (desired_struct, "width", G_TYPE_INT, result.w, NULL);
+-      gst_structure_set (desired_struct, "height", G_TYPE_INT, result.h, NULL);
++      gst_structure_set (desired_struct, "width", G_TYPE_INT, result.w, (gchar*)0);
++      gst_structure_set (desired_struct, "height", G_TYPE_INT, result.h, (gchar*)0);
+ 
+       // PAR property overrides the default one.
+       if (videosink->par_) {
+         nom = gst_value_get_fraction_numerator(videosink->par_);
+         den = gst_value_get_fraction_denominator(videosink->par_);
+         gst_structure_set(desired_struct, "pixel-aspect-ratio",
+-                           GST_TYPE_FRACTION, nom, den, NULL);
++			  GST_TYPE_FRACTION, nom, den, (gchar*)0);
+       } else {
+         gst_structure_set(desired_struct, "pixel-aspect-ratio",
+-                          GST_TYPE_FRACTION, 1, 1, NULL);
++                          GST_TYPE_FRACTION, 1, 1, (gchar*)0);
+       }
+ 
+       // see if peer accepts our new suggestion, if there is no peer, this
+@@ -895,7 +895,7 @@
+   nom = gst_value_get_fraction_numerator(par_);
+   den = gst_value_get_fraction_denominator(par_);
+   gst_caps_set_simple(caps_, const_cast<gchar*>("pixel-aspect-ratio"),
+-                      GST_TYPE_FRACTION, 1, 1, NULL);
++                      GST_TYPE_FRACTION, 1, 1, (gchar*)0);
+ }
+ 
+ // This function converts the image format if necessary, puts the image into
diff --git a/deskutils/google-gadgets/files/patch-extensions_gst__video__element_gst__video__element.cc b/deskutils/google-gadgets/files/patch-extensions_gst__video__element_gst__video__element.cc
new file mode 100644
index 000000000..96dfaf456
--- /dev/null
+++ b/deskutils/google-gadgets/files/patch-extensions_gst__video__element_gst__video__element.cc
@@ -0,0 +1,123 @@
+
+$FreeBSD: ports/deskutils/google-gadgets/files/patch-extensions_gst__video__element_gst__video__element.cc,v 1.2 2008/11/23 22:51:45 miwi Exp $
+
+--- extensions/gst_video_element/gst_video_element.cc.orig
++++ extensions/gst_video_element/gst_video_element.cc
+@@ -125,7 +125,7 @@
+     return;
+   } else {
+     g_object_get(G_OBJECT(videosink_),
+-                 "receive-image-handler", &receive_image_handler_, NULL);
++                 "receive-image-handler", &receive_image_handler_, (gchar*)0);
+     if (!receive_image_handler_) {
+       gst_object_unref(GST_OBJECT(playbin_));
+       gst_object_unref(GST_OBJECT(videosink_));
+@@ -135,7 +135,7 @@
+   }
+ 
+   // Set videosink to receive video output.
+-  g_object_set(G_OBJECT(playbin_), "video-sink", videosink_, NULL);
++  g_object_set(G_OBJECT(playbin_), "video-sink", videosink_, (gchar*)0);
+ 
+   // Create new audio sink with panorama support if possible.
+   GstElement *audiosink = NULL;
+@@ -161,15 +161,15 @@
+     GstElement *audiobin = gst_bin_new("audiobin");
+     GstPad *sinkpad;
+     if (volume_ && panorama_) {
+-      gst_bin_add_many(GST_BIN(audiobin), volume_, panorama_, audiosink, NULL);
+-      gst_element_link_many(volume_, panorama_, audiosink, NULL);
++      gst_bin_add_many(GST_BIN(audiobin), volume_, panorama_, audiosink, (gchar*)0);
++      gst_element_link_many(volume_, panorama_, audiosink, (gchar*)0);
+       sinkpad = gst_element_get_pad(volume_, "sink");
+     } else if (volume_) {
+-      gst_bin_add_many(GST_BIN(audiobin), volume_, audiosink, NULL);
++      gst_bin_add_many(GST_BIN(audiobin), volume_, audiosink, (gchar*)0);
+       gst_element_link(volume_, audiosink);
+       sinkpad = gst_element_get_pad(volume_, "sink");
+     } else {
+-      gst_bin_add_many(GST_BIN(audiobin), panorama_, audiosink, NULL);
++      gst_bin_add_many(GST_BIN(audiobin), panorama_, audiosink, (gchar*)0);
+       gst_element_link(panorama_, audiosink);
+       sinkpad = gst_element_get_pad(panorama_, "sink");
+     }
+@@ -179,7 +179,7 @@
+   }
+ 
+   // Set audio-sink to our new audiosink.
+-  g_object_set(G_OBJECT(playbin_), "audio-sink", audiosink, NULL);
++  g_object_set(G_OBJECT(playbin_), "audio-sink", audiosink, (gchar*)0);
+ 
+   // Watch the message bus.
+   // The host using this class must use a g_main_loop to capture the
+@@ -357,14 +357,14 @@
+ 
+     src_ = src;
+     media_changed_ = true;
+-    g_object_set(G_OBJECT(playbin_), "uri", src_.c_str(), NULL);
++    g_object_set(G_OBJECT(playbin_), "uri", src_.c_str(), (gchar*)0);
+   }
+ }
+ 
+ int GstVideoElement::GetVolume() const {
+   if (playbin_) {
+     double volume;
+-    g_object_get(G_OBJECT(playbin_), "volume", &volume, NULL);
++    g_object_get(G_OBJECT(playbin_), "volume", &volume, (gchar*)0);
+     int gg_volume = static_cast<int>((volume / kMaxGstVolume) *
+                                      (kMaxVolume - kMinVolume) + kMinVolume);
+     return Clamp(gg_volume, kMinVolume, kMaxVolume);
+@@ -381,7 +381,7 @@
+     }
+     gdouble gg_volume = ((gdouble(volume - kMinVolume) /
+                           (kMaxVolume - kMinVolume)) * kMaxGstVolume);
+-    g_object_set(G_OBJECT(playbin_), "volume", gg_volume, NULL);
++    g_object_set(G_OBJECT(playbin_), "volume", gg_volume, (gchar*)0);
+   } else {
+     DLOG("Playbin was not initialized correctly.");
+   }
+@@ -403,7 +403,7 @@
+ int GstVideoElement::GetBalance() const {
+   if (playbin_ && panorama_) {
+     gfloat balance;
+-    g_object_get(G_OBJECT(panorama_), "panorama", &balance, NULL);
++    g_object_get(G_OBJECT(panorama_), "panorama", &balance, (gchar*)0);
+     int gg_balance = static_cast<int>(((balance + 1) / 2) *
+                                       (kMaxBalance - kMinBalance) +
+                                       kMinBalance);
+@@ -426,7 +426,7 @@
+     }
+     gfloat gg_balance = (gfloat(balance - kMinBalance) /
+                           (kMaxBalance - kMinBalance)) * 2 - 1;
+-    g_object_set(G_OBJECT(panorama_), "panorama", gg_balance, NULL);
++    g_object_set(G_OBJECT(panorama_), "panorama", gg_balance, (gchar*)0);
+   } else {
+     if (!playbin_)
+       DLOG("Playbin was not initialized correctly.");
+@@ -438,7 +438,7 @@
+ bool GstVideoElement::IsMute() const {
+   if (playbin_ && volume_) {
+     gboolean mute;
+-    g_object_get(G_OBJECT(volume_), "mute", &mute, NULL);
++    g_object_get(G_OBJECT(volume_), "mute", &mute, (gchar*)0);
+     return static_cast<bool>(mute);
+   } else {
+     if (!playbin_)
+@@ -451,7 +451,7 @@
+ 
+ void GstVideoElement::SetMute(bool mute) {
+   if (playbin_ && volume_) {
+-    g_object_set(G_OBJECT(volume_), "mute", static_cast<gboolean>(mute), NULL);
++    g_object_set(G_OBJECT(volume_), "mute", static_cast<gboolean>(mute), (gchar*)0);
+   } else {
+     if (!playbin_)
+       DLOG("Playbin was not initialized correctly.");
+@@ -464,7 +464,7 @@
+   if (playbin_ && videosink_) {
+     g_object_set(G_OBJECT(videosink_),
+                  "geometry-width", static_cast<int>(width),
+-                 "geometry-height", static_cast<int>(height), NULL);
++                 "geometry-height", static_cast<int>(height), (gchar*)0);
+   } else {
+     if (!playbin_)
+       DLOG("Playbin was not initialized correctly.");
diff --git a/deskutils/google-gadgets/files/patch-extensions_gtk__system__framework_gtk__system__framework.cc b/deskutils/google-gadgets/files/patch-extensions_gtk__system__framework_gtk__system__framework.cc
new file mode 100644
index 000000000..a47712b00
--- /dev/null
+++ b/deskutils/google-gadgets/files/patch-extensions_gtk__system__framework_gtk__system__framework.cc
@@ -0,0 +1,14 @@
+
+$FreeBSD: ports/deskutils/google-gadgets/files/patch-extensions_gtk__system__framework_gtk__system__framework.cc,v 1.2 2009/01/15 12:11:25 miwi Exp $
+
+--- extensions/gtk_system_framework/gtk_system_framework.cc.orig
++++ extensions/gtk_system_framework/gtk_system_framework.cc
+@@ -137,7 +137,7 @@
+         whole_title.c_str(), NULL, action,
+         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+         GTK_STOCK_OK, GTK_RESPONSE_OK,
+-        NULL);
++        (gint*)0);
+     gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
+ 
+     if (action == GTK_FILE_CHOOSER_ACTION_SAVE) {
diff --git a/deskutils/google-gadgets/files/patch-extensions_gtkmoz__browser__element_Makefile.am b/deskutils/google-gadgets/files/patch-extensions_gtkmoz__browser__element_Makefile.am
new file mode 100644
index 000000000..701f34ec7
--- /dev/null
+++ b/deskutils/google-gadgets/files/patch-extensions_gtkmoz__browser__element_Makefile.am
@@ -0,0 +1,15 @@
+
+$FreeBSD: ports/deskutils/google-gadgets/files/patch-extensions_gtkmoz__browser__element_Makefile.am,v 1.2 2009/01/15 12:11:25 miwi Exp $
+
+--- extensions/gtkmoz_browser_element/Makefile.am.orig
++++ extensions/gtkmoz_browser_element/Makefile.am
+@@ -63,8 +63,7 @@
+ 
+ gtkmoz_browser_child_LDADD	= $(GTK2_LIBS) \
+ 				  $(GTKMOZEMBED_LIBS) \
+-				  $(top_builddir)/ggadget/libggadget@GGL_EPOCH@.la \
+-				  -ldl
++				  $(top_builddir)/ggadget/libggadget@GGL_EPOCH@.la
+ 
+ gtkmoz_browser_child_LDFLAGS	= $(GTKMOZEMBED_LDFLAGS)
+ 
diff --git a/deskutils/google-gadgets/files/patch-extensions_gtkmoz__browser__element_browser__element.cc b/deskutils/google-gadgets/files/patch-extensions_gtkmoz__browser__element_browser__element.cc
new file mode 100644
index 000000000..747438cdb
--- /dev/null
+++ b/deskutils/google-gadgets/files/patch-extensions_gtkmoz__browser__element_browser__element.cc
@@ -0,0 +1,14 @@
+
+$FreeBSD: ports/deskutils/google-gadgets/files/patch-extensions_gtkmoz__browser__element_browser__element.cc,v 1.3 2009/03/08 12:53:52 beat Exp $
+
+--- extensions/gtkmoz_browser_element/browser_element.cc.orig
++++ extensions/gtkmoz_browser_element/browser_element.cc
+@@ -164,7 +164,7 @@
+       std::string up_fd_str = StringPrintf("%d", up_fds[1]);
+       for (size_t i = 0; kBrowserChildNames[i]; ++i) {
+         execl(kBrowserChildNames[i], kBrowserChildNames[i],
+-              down_fd_str.c_str(), up_fd_str.c_str(), NULL);
++              down_fd_str.c_str(), up_fd_str.c_str(), (char*)0);
+       }
+       LOG("Failed to execute browser child");
+       _exit(-1);
diff --git a/deskutils/google-gadgets/files/patch-extensions_gtkwebkit__browser__element_browser__element.cc b/deskutils/google-gadgets/files/patch-extensions_gtkwebkit__browser__element_browser__element.cc
new file mode 100644
index 000000000..b12321525
--- /dev/null
+++ b/deskutils/google-gadgets/files/patch-extensions_gtkwebkit__browser__element_browser__element.cc
@@ -0,0 +1,23 @@
+
+$FreeBSD: ports/deskutils/google-gadgets/files/patch-extensions_gtkwebkit__browser__element_browser__element.cc,v 1.1 2010/01/09 19:30:45 pav Exp $
+
+--- extensions/gtkwebkit_browser_element/browser_element.cc.orig
++++ extensions/gtkwebkit_browser_element/browser_element.cc
+@@ -540,7 +540,7 @@
+                                        Impl *impl) {
+     if (!impl->owner_) return;
+     gint width = 0;
+-    g_object_get(features, "width", &width, NULL);
++    g_object_get(features, "width", &width, (const gchar*)0);
+     ScopedLogContext log_context(impl->owner_->GetView()->GetGadget());
+     DLOG("WebViewWindowWidthNotify(Impl=%p, width=%d)", impl, width);
+   }
+@@ -550,7 +550,7 @@
+                                         Impl *impl) {
+     if (!impl->owner_) return;
+     gint height = 0;
+-    g_object_get(features, "height", &height, NULL);
++    g_object_get(features, "height", &height, (const gchar*)0);
+     ScopedLogContext log_context(impl->owner_->GetView()->GetGadget());
+     DLOG("WebViewWindowHeightNotify(Impl=%p, width=%d)", impl, height);
+   }
diff --git a/deskutils/google-gadgets/files/patch-extensions_linux__system__framework_file__system.cc b/deskutils/google-gadgets/files/patch-extensions_linux__system__framework_file__system.cc
new file mode 100644
index 000000000..cfb78e594
--- /dev/null
+++ b/deskutils/google-gadgets/files/patch-extensions_linux__system__framework_file__system.cc
@@ -0,0 +1,27 @@
+
+$FreeBSD: ports/deskutils/google-gadgets/files/patch-extensions_linux__system__framework_file__system.cc,v 1.2 2008/10/19 14:59:03 miwi Exp $
+
+--- extensions/linux_system_framework/file_system.cc.orig
++++ extensions/linux_system_framework/file_system.cc
+@@ -463,8 +463,8 @@
+   if (stat(path, &stat_value))
+     return Date(0);
+ 
+-  return Date(stat_value.st_mtim.tv_sec * 1000
+-              + stat_value.st_mtim.tv_nsec / 1000000);
++  return Date(statbuf.st_mtimespec.tv_sec * 1000
++              + statbuf.st_mtimespec.tv_nsec / 1000000);
+ }
+ 
+ static Date GetDateLastAccessed(const char *path) {
+@@ -476,8 +476,8 @@
+   if (stat(path, &stat_value))
+     return Date(0);
+ 
+-  return Date(stat_value.st_atim.tv_sec * 1000
+-              + stat_value.st_atim.tv_nsec / 1000000);
++  return Date(statbuf.st_atimespec.tv_sec * 1000
++              + statbuf.st_atimespec.tv_nsec / 1000000);
+ }
+ 
+ class Drive : public DriveInterface {
diff --git a/deskutils/google-gadgets/files/patch-extensions_smjs__script__runtime_Makefile.am b/deskutils/google-gadgets/files/patch-extensions_smjs__script__runtime_Makefile.am
new file mode 100644
index 000000000..df06e8234
--- /dev/null
+++ b/deskutils/google-gadgets/files/patch-extensions_smjs__script__runtime_Makefile.am
@@ -0,0 +1,15 @@
+
+$FreeBSD: ports/deskutils/google-gadgets/files/patch-extensions_smjs__script__runtime_Makefile.am,v 1.1 2008/11/23 22:51:45 miwi Exp $
+
+--- extensions/smjs_script_runtime/Makefile.am.orig
++++ extensions/smjs_script_runtime/Makefile.am
+@@ -72,8 +72,7 @@
+ smjs_script_runtime_la_LIBADD = \
+ 			  $(top_builddir)/ggadget/libggadget@GGL_EPOCH@.la \
+ 			  libggadget-smjs.la \
+-			  $(LIBMOZJS_LIBS) \
+-			  -ldl
++			  $(LIBMOZJS_LIBS)
+ 
+ smjs_script_runtime_la_LDFLAGS = \
+ 			  -avoid-version \
diff --git a/deskutils/google-gadgets/files/patch-extensions_smjs__script__runtime_tests_Makefile.am b/deskutils/google-gadgets/files/patch-extensions_smjs__script__runtime_tests_Makefile.am
new file mode 100644
index 000000000..4ce89a660
--- /dev/null
+++ b/deskutils/google-gadgets/files/patch-extensions_smjs__script__runtime_tests_Makefile.am
@@ -0,0 +1,15 @@
+
+$FreeBSD: ports/deskutils/google-gadgets/files/patch-extensions_smjs__script__runtime_tests_Makefile.am,v 1.1 2008/11/23 22:51:45 miwi Exp $
+
+--- extensions/smjs_script_runtime/tests/Makefile.am.orig
++++ extensions/smjs_script_runtime/tests/Makefile.am
+@@ -30,8 +30,7 @@
+ 			  $(top_builddir)/ggadget/libggadget@GGL_EPOCH@.la \
+ 			  $(top_builddir)/ggadget/js/libggadget-js@GGL_EPOCH@.la \
+ 			  $(top_builddir)/third_party/editline/libeditline.la \
+-			  $(LIBMOZJS_LIBS) \
+-			  -ldl
++			  $(LIBMOZJS_LIBS)
+ 
+ check_PROGRAMS		= cross_context_test \
+ 			  dom_test_shell \
diff --git a/deskutils/google-gadgets/files/patch-extensions_soup__xml__http__request_soup__xml__http__request.cc b/deskutils/google-gadgets/files/patch-extensions_soup__xml__http__request_soup__xml__http__request.cc
new file mode 100644
index 000000000..9051e3f02
--- /dev/null
+++ b/deskutils/google-gadgets/files/patch-extensions_soup__xml__http__request_soup__xml__http__request.cc
@@ -0,0 +1,32 @@
+
+$FreeBSD: ports/deskutils/google-gadgets/files/patch-extensions_soup__xml__http__request_soup__xml__http__request.cc,v 1.1 2010/01/09 19:30:45 pav Exp $
+
+--- extensions/soup_xml_http_request/soup_xml_http_request.cc.orig
++++ extensions/soup_xml_http_request/soup_xml_http_request.cc
+@@ -1004,7 +1004,7 @@
+            it != sessions_.end(); ++it) {
+         g_object_set(G_OBJECT(it->second),
+                      SOUP_SESSION_USER_AGENT, default_user_agent_.c_str(),
+-                     NULL);
++                     (const gchar*)0);
+       }
+     }
+   }
+@@ -1016,7 +1016,7 @@
+ #ifdef HAVE_LIBSOUP_GNOME
+         SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_RESOLVER_GNOME,
+ #endif
+-        NULL);
++        (const char*)0);
+ 
+     if (session) {
+ #ifdef SOUP_XHR_VERBOSE
+@@ -1031,7 +1031,7 @@
+ #ifdef GGL_DEFAULT_SSL_CA_FILE
+                    SOUP_SESSION_SSL_CA_FILE, GGL_DEFAULT_SSL_CA_FILE,
+ #endif
+-                   NULL);
++                   (const gchar*)0);
+ 
+       g_signal_connect(G_OBJECT(session), "authenticate",
+                        G_CALLBACK(AuthenticateCallback), this);
diff --git a/deskutils/google-gadgets/files/patch-gadgets_designer_designer__script__utils.cc b/deskutils/google-gadgets/files/patch-gadgets_designer_designer__script__utils.cc
new file mode 100644
index 000000000..1f72a3afc
--- /dev/null
+++ b/deskutils/google-gadgets/files/patch-gadgets_designer_designer__script__utils.cc
@@ -0,0 +1,14 @@
+
+$FreeBSD: ports/deskutils/google-gadgets/files/patch-gadgets_designer_designer__script__utils.cc,v 1.1 2008/10/19 14:59:03 miwi Exp $
+
+--- gadgets/designer/designer_script_utils.cc.orig
++++ gadgets/designer/designer_script_utils.cc
+@@ -231,7 +231,7 @@
+     if ((pid = fork()) == 0) {
+       if (fork() != 0)
+         _exit(0);
+-      execlp(command, command, file, NULL);
++      execlp(command, command, file, (char*)0);
+       DLOG("Failed to exec command: %s", command);
+       _exit(-1);
+     }
diff --git a/deskutils/google-gadgets/files/patch-ggadget_gtk_utilities.cc b/deskutils/google-gadgets/files/patch-ggadget_gtk_utilities.cc
new file mode 100644
index 000000000..22b385665
--- /dev/null
+++ b/deskutils/google-gadgets/files/patch-ggadget_gtk_utilities.cc
@@ -0,0 +1,11 @@
+--- ggadget/gtk/utilities.cc.orig	2008-12-03 18:01:36.000000000 +1000
++++ ggadget/gtk/utilities.cc	2009-01-07 00:52:52.000000000 +1000
+@@ -83,7 +83,7 @@
+                                     "%s", message);
+     gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_NO, GTK_RESPONSE_NO,
+                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-                           GTK_STOCK_YES, GTK_RESPONSE_YES, NULL);
++                           GTK_STOCK_YES, GTK_RESPONSE_YES, (const gchar*)0);
+     gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_YES);
+   } else {
+     dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
diff --git a/deskutils/google-gadgets/files/patch-ggadget_npapi_Makefile.am b/deskutils/google-gadgets/files/patch-ggadget_npapi_Makefile.am
new file mode 100644
index 000000000..a802e097e
--- /dev/null
+++ b/deskutils/google-gadgets/files/patch-ggadget_npapi_Makefile.am
@@ -0,0 +1,15 @@
+
+$FreeBSD: ports/deskutils/google-gadgets/files/patch-ggadget_npapi_Makefile.am,v 1.1 2008/11/23 22:51:45 miwi Exp $
+
+--- ggadget/npapi/Makefile.am.orig
++++ ggadget/npapi/Makefile.am
+@@ -44,8 +44,7 @@
+ 
+ libggadget_npapi@GGL_EPOCH@_la_LIBADD = \
+ 			  $(top_builddir)/ggadget/libggadget@GGL_EPOCH@.la \
+-			  $(X_LIBS) \
+-			  -ldl
++			  $(X_LIBS)
+ 
+ libggadget_npapi@GGL_EPOCH@_la_LDFLAGS = \
+ 			  -version-info $(LIBGGADGET_VERSION) \
diff --git a/deskutils/google-gadgets/pkg-descr b/deskutils/google-gadgets/pkg-descr
new file mode 100644
index 000000000..414555d6f
--- /dev/null
+++ b/deskutils/google-gadgets/pkg-descr
@@ -0,0 +1,4 @@
+Google Gadgets for Linux provides a platform for running desktop
+gadgets under Linux, catering to the unique needs of Linux users.
+
+WWW:	http://code.google.com/p/google-gadgets-for-linux/
diff --git a/deskutils/google-gadgets/pkg-plist b/deskutils/google-gadgets/pkg-plist
new file mode 100644
index 000000000..e220c9d4b
--- /dev/null
+++ b/deskutils/google-gadgets/pkg-plist
@@ -0,0 +1,289 @@
+%%GTK%%bin/ggl-gtk
+%%QT%%bin/ggl-qt
+include/google-gadgets/ggadget/anchor_element.h
+include/google-gadgets/ggadget/audioclip_interface.h
+include/google-gadgets/ggadget/backoff.h
+include/google-gadgets/ggadget/basic_element.h
+include/google-gadgets/ggadget/button_element.h
+include/google-gadgets/ggadget/canvas_interface.h
+include/google-gadgets/ggadget/canvas_utils.h
+include/google-gadgets/ggadget/checkbox_element.h
+include/google-gadgets/ggadget/clip_region.h
+include/google-gadgets/ggadget/color.h
+include/google-gadgets/ggadget/combobox_element.h
+include/google-gadgets/ggadget/common.h
+include/google-gadgets/ggadget/content_item.h
+include/google-gadgets/ggadget/contentarea_element.h
+include/google-gadgets/ggadget/copy_element.h
+include/google-gadgets/ggadget/dbus/dbus_proxy.h
+include/google-gadgets/ggadget/dbus/dbus_result_receiver.h
+include/google-gadgets/ggadget/decorated_view_host.h
+include/google-gadgets/ggadget/details_view_data.h
+include/google-gadgets/ggadget/details_view_decorator.h
+include/google-gadgets/ggadget/digest_utils.h
+include/google-gadgets/ggadget/dir_file_manager.h
+include/google-gadgets/ggadget/display_window.h
+include/google-gadgets/ggadget/div_element.h
+include/google-gadgets/ggadget/docked_main_view_decorator.h
+include/google-gadgets/ggadget/edit_element_base.h
+include/google-gadgets/ggadget/element_factory.h
+include/google-gadgets/ggadget/elements.h
+include/google-gadgets/ggadget/encryptor_interface.h
+include/google-gadgets/ggadget/event.h
+include/google-gadgets/ggadget/extension_manager.h
+include/google-gadgets/ggadget/file_manager_factory.h
+include/google-gadgets/ggadget/file_manager_interface.h
+include/google-gadgets/ggadget/file_manager_wrapper.h
+include/google-gadgets/ggadget/file_system_interface.h
+include/google-gadgets/ggadget/floating_main_view_decorator.h
+include/google-gadgets/ggadget/font_interface.h
+include/google-gadgets/ggadget/framed_view_decorator_base.h
+include/google-gadgets/ggadget/framework_interface.h
+include/google-gadgets/ggadget/gadget.h
+include/google-gadgets/ggadget/gadget_consts.h
+include/google-gadgets/ggadget/gadget_manager_interface.h
+include/google-gadgets/ggadget/graphics_interface.h
+%%GTK%%include/google-gadgets/ggadget/gtk/cairo_graphics.h
+%%GTK%%include/google-gadgets/ggadget/gtk/hotkey.h
+%%GTK%%include/google-gadgets/ggadget/gtk/key_convert.h
+%%GTK%%include/google-gadgets/ggadget/gtk/main_loop.h
+%%GTK%%include/google-gadgets/ggadget/gtk/menu_builder.h
+%%GTK%%include/google-gadgets/ggadget/gtk/npapi_plugin_element.h
+%%GTK%%include/google-gadgets/ggadget/gtk/single_view_host.h
+%%GTK%%include/google-gadgets/ggadget/gtk/tooltip.h
+%%GTK%%include/google-gadgets/ggadget/gtk/utilities.h
+%%GTK%%include/google-gadgets/ggadget/gtk/view_widget_binder.h
+include/google-gadgets/ggadget/host_interface.h
+include/google-gadgets/ggadget/host_utils.h
+include/google-gadgets/ggadget/image_cache.h
+include/google-gadgets/ggadget/image_interface.h
+include/google-gadgets/ggadget/img_element.h
+include/google-gadgets/ggadget/item_element.h
+include/google-gadgets/ggadget/js/js_utils.h
+include/google-gadgets/ggadget/js/jscript_massager.h
+include/google-gadgets/ggadget/label_element.h
+include/google-gadgets/ggadget/light_map.h
+include/google-gadgets/ggadget/listbox_element.h
+include/google-gadgets/ggadget/locales.h
+include/google-gadgets/ggadget/localized_file_manager.h
+include/google-gadgets/ggadget/logger.h
+include/google-gadgets/ggadget/main_loop_interface.h
+include/google-gadgets/ggadget/main_view_decorator_base.h
+include/google-gadgets/ggadget/math_utils.h
+include/google-gadgets/ggadget/memory_options.h
+include/google-gadgets/ggadget/menu_interface.h
+include/google-gadgets/ggadget/messages.h
+include/google-gadgets/ggadget/module.h
+include/google-gadgets/ggadget/npapi/npapi_plugin.h
+include/google-gadgets/ggadget/object_element.h
+include/google-gadgets/ggadget/object_videoplayer.h
+include/google-gadgets/ggadget/options_interface.h
+include/google-gadgets/ggadget/permissions.h
+include/google-gadgets/ggadget/popout_main_view_decorator.h
+include/google-gadgets/ggadget/progressbar_element.h
+%%QT%%include/google-gadgets/ggadget/qt/qt_graphics.h
+%%QT%%include/google-gadgets/ggadget/qt/qt_main_loop.h
+%%QT%%include/google-gadgets/ggadget/qt/qt_menu.h
+%%QT%%include/google-gadgets/ggadget/qt/qt_view_host.h
+%%QT%%include/google-gadgets/ggadget/qt/qt_view_widget.h
+%%QT%%include/google-gadgets/ggadget/qt/utilities.h
+include/google-gadgets/ggadget/registerable_interface.h
+include/google-gadgets/ggadget/run_once.h
+include/google-gadgets/ggadget/scoped_ptr.h
+include/google-gadgets/ggadget/script_context_interface.h
+include/google-gadgets/ggadget/script_runtime_interface.h
+include/google-gadgets/ggadget/script_runtime_manager.h
+include/google-gadgets/ggadget/scriptable_array.h
+include/google-gadgets/ggadget/scriptable_binary_data.h
+include/google-gadgets/ggadget/scriptable_enumerator.h
+include/google-gadgets/ggadget/scriptable_event.h
+include/google-gadgets/ggadget/scriptable_file_system.h
+include/google-gadgets/ggadget/scriptable_framework.h
+include/google-gadgets/ggadget/scriptable_function.h
+include/google-gadgets/ggadget/scriptable_helper.h
+include/google-gadgets/ggadget/scriptable_holder.h
+include/google-gadgets/ggadget/scriptable_image.h
+include/google-gadgets/ggadget/scriptable_interface.h
+include/google-gadgets/ggadget/scriptable_map.h
+include/google-gadgets/ggadget/scriptable_menu.h
+include/google-gadgets/ggadget/scriptable_options.h
+include/google-gadgets/ggadget/scriptable_view.h
+include/google-gadgets/ggadget/scrollbar_element.h
+include/google-gadgets/ggadget/scrolling_element.h
+include/google-gadgets/ggadget/sidebar.h
+include/google-gadgets/ggadget/signals.h
+include/google-gadgets/ggadget/slot.h
+include/google-gadgets/ggadget/small_object.h
+include/google-gadgets/ggadget/string_utils.h
+include/google-gadgets/ggadget/system_utils.h
+include/google-gadgets/ggadget/text_frame.h
+include/google-gadgets/ggadget/texture.h
+include/google-gadgets/ggadget/unicode_utils.h
+include/google-gadgets/ggadget/usage_collector_interface.h
+include/google-gadgets/ggadget/uuid.h
+include/google-gadgets/ggadget/variant.h
+include/google-gadgets/ggadget/video_element_base.h
+include/google-gadgets/ggadget/view.h
+include/google-gadgets/ggadget/view_decorator_base.h
+include/google-gadgets/ggadget/view_element.h
+include/google-gadgets/ggadget/view_host_interface.h
+include/google-gadgets/ggadget/view_interface.h
+include/google-gadgets/ggadget/xdg/desktop_entry.h
+include/google-gadgets/ggadget/xdg/utilities.h
+include/google-gadgets/ggadget/xml_dom.h
+include/google-gadgets/ggadget/xml_dom_interface.h
+include/google-gadgets/ggadget/xml_http_request_interface.h
+include/google-gadgets/ggadget/xml_http_request_utils.h
+include/google-gadgets/ggadget/xml_parser_interface.h
+include/google-gadgets/ggadget/xml_utils.h
+include/google-gadgets/ggadget/zip_file_manager.h
+%%GTK%%%%MOZILLA%%lib/google-gadgets/gtkmoz-browser-child
+lib/google-gadgets/include/ggadget/sysdeps.h
+lib/google-gadgets/modules/analytics-usage-collector.a
+lib/google-gadgets/modules/analytics-usage-collector.la
+lib/google-gadgets/modules/analytics-usage-collector.so
+lib/google-gadgets/modules/curl-xml-http-request.a
+lib/google-gadgets/modules/curl-xml-http-request.la
+lib/google-gadgets/modules/curl-xml-http-request.so
+lib/google-gadgets/modules/dbus-script-class.a
+lib/google-gadgets/modules/dbus-script-class.la
+lib/google-gadgets/modules/dbus-script-class.so
+lib/google-gadgets/modules/default-framework.a
+lib/google-gadgets/modules/default-framework.la
+lib/google-gadgets/modules/default-framework.so
+lib/google-gadgets/modules/default-options.a
+lib/google-gadgets/modules/default-options.la
+lib/google-gadgets/modules/default-options.so
+lib/google-gadgets/modules/google-gadget-manager.a
+lib/google-gadgets/modules/google-gadget-manager.la
+lib/google-gadgets/modules/google-gadget-manager.so
+lib/google-gadgets/modules/gst-audio-framework.a
+lib/google-gadgets/modules/gst-audio-framework.la
+lib/google-gadgets/modules/gst-audio-framework.so
+lib/google-gadgets/modules/gst-video-element.a
+lib/google-gadgets/modules/gst-video-element.la
+lib/google-gadgets/modules/gst-video-element.so
+%%GTK%%lib/google-gadgets/modules/gtk-edit-element.a
+%%GTK%%lib/google-gadgets/modules/gtk-edit-element.la
+%%GTK%%lib/google-gadgets/modules/gtk-edit-element.so
+%%GTK%%lib/google-gadgets/modules/gtk-flash-element.a
+%%GTK%%lib/google-gadgets/modules/gtk-flash-element.la
+%%GTK%%lib/google-gadgets/modules/gtk-flash-element.so
+%%GTK%%lib/google-gadgets/modules/gtk-system-framework.a
+%%GTK%%lib/google-gadgets/modules/gtk-system-framework.la
+%%GTK%%lib/google-gadgets/modules/gtk-system-framework.so
+%%GTK%%%%MOZILLA%%lib/google-gadgets/modules/gtkmoz-browser-element.a
+%%GTK%%%%MOZILLA%%lib/google-gadgets/modules/gtkmoz-browser-element.la
+%%GTK%%%%MOZILLA%%lib/google-gadgets/modules/gtkmoz-browser-element.so
+%%GTKWEBKIT%%lib/google-gadgets/modules/gtkwebkit-browser-element.a
+%%GTKWEBKIT%%lib/google-gadgets/modules/gtkwebkit-browser-element.la
+%%GTKWEBKIT%%lib/google-gadgets/modules/gtkwebkit-browser-element.so
+lib/google-gadgets/modules/html-flash-element.a
+lib/google-gadgets/modules/html-flash-element.la
+lib/google-gadgets/modules/html-flash-element.so
+lib/google-gadgets/modules/libxml2-xml-parser.a
+lib/google-gadgets/modules/libxml2-xml-parser.la
+lib/google-gadgets/modules/libxml2-xml-parser.so
+%%QT%%lib/google-gadgets/modules/qt-edit-element.a
+%%QT%%lib/google-gadgets/modules/qt-edit-element.la
+%%QT%%lib/google-gadgets/modules/qt-edit-element.so
+%%QT%%lib/google-gadgets/modules/qt-script-runtime.a
+%%QT%%lib/google-gadgets/modules/qt-script-runtime.la
+%%QT%%lib/google-gadgets/modules/qt-script-runtime.so
+%%QT%%lib/google-gadgets/modules/qt-system-framework.a
+%%QT%%lib/google-gadgets/modules/qt-system-framework.la
+%%QT%%lib/google-gadgets/modules/qt-system-framework.so
+%%QT%%lib/google-gadgets/modules/qt-xml-http-request.a
+%%QT%%lib/google-gadgets/modules/qt-xml-http-request.la
+%%QT%%lib/google-gadgets/modules/qt-xml-http-request.so
+%%QT%%lib/google-gadgets/modules/qtwebkit-browser-element.a
+%%QT%%lib/google-gadgets/modules/qtwebkit-browser-element.la
+%%QT%%lib/google-gadgets/modules/qtwebkit-browser-element.so
+%%MOZILLA%%lib/google-gadgets/modules/smjs-script-runtime.a
+%%MOZILLA%%lib/google-gadgets/modules/smjs-script-runtime.la
+%%MOZILLA%%lib/google-gadgets/modules/smjs-script-runtime.so
+%%GTK%%lib/google-gadgets/modules/soup-xml-http-request.a
+%%GTK%%lib/google-gadgets/modules/soup-xml-http-request.la
+%%GTK%%lib/google-gadgets/modules/soup-xml-http-request.so
+%%GTKWEBKIT%%lib/google-gadgets/modules/webkit-script-runtime.a
+%%GTKWEBKIT%%lib/google-gadgets/modules/webkit-script-runtime.la
+%%GTKWEBKIT%%lib/google-gadgets/modules/webkit-script-runtime.so
+lib/libggadget-1.0.a
+lib/libggadget-1.0.la
+lib/libggadget-1.0.so
+lib/libggadget-1.0.so.0
+lib/libggadget-dbus-1.0.a
+lib/libggadget-dbus-1.0.la
+lib/libggadget-dbus-1.0.so
+lib/libggadget-dbus-1.0.so.0
+%%GTK%%lib/libggadget-gtk-1.0.a
+%%GTK%%lib/libggadget-gtk-1.0.la
+%%GTK%%lib/libggadget-gtk-1.0.so
+%%GTK%%lib/libggadget-gtk-1.0.so.0
+lib/libggadget-js-1.0.a
+lib/libggadget-js-1.0.la
+lib/libggadget-js-1.0.so
+lib/libggadget-js-1.0.so.0
+lib/libggadget-npapi-1.0.a
+lib/libggadget-npapi-1.0.la
+lib/libggadget-npapi-1.0.so
+lib/libggadget-npapi-1.0.so.0
+%%QT%%lib/libggadget-qt-1.0.a
+%%QT%%lib/libggadget-qt-1.0.la
+%%QT%%lib/libggadget-qt-1.0.so
+%%QT%%lib/libggadget-qt-1.0.so.0
+%%GTKWEBKIT%%lib/libggadget-webkitjs-1.0.a
+%%GTKWEBKIT%%lib/libggadget-webkitjs-1.0.la
+%%GTKWEBKIT%%lib/libggadget-webkitjs-1.0.so
+%%GTKWEBKIT%%lib/libggadget-webkitjs-1.0.so.0
+lib/libggadget-xdg-1.0.a
+lib/libggadget-xdg-1.0.la
+lib/libggadget-xdg-1.0.so
+lib/libggadget-xdg-1.0.so.0
+libdata/pkgconfig/libggadget-1.0.pc
+libdata/pkgconfig/libggadget-dbus-1.0.pc
+%%GTK%%libdata/pkgconfig/libggadget-gtk-1.0.pc
+libdata/pkgconfig/libggadget-js-1.0.pc
+libdata/pkgconfig/libggadget-npapi-1.0.pc
+%%QT%%libdata/pkgconfig/libggadget-qt-1.0.pc
+libdata/pkgconfig/libggadget-xdg-1.0.pc
+%%GTK%%share/applications/ggl-designer.desktop
+%%GTK%%share/applications/ggl-gtk.desktop
+%%QT%%share/applications/ggl-qt.desktop
+%%DATADIR%%/analog-clock.gg
+%%DATADIR%%/designer.gg
+%%DATADIR%%/digital-alarm-clock.gg
+%%DATADIR%%/google-gadget-browser.gg
+%%DATADIR%%/igoogle.gg
+%%DATADIR%%/photos.gg
+%%DATADIR%%/resources.gg
+%%DATADIR%%/rss.gg
+share/icons/hicolor/128x128/apps/google-gadgets.png
+share/icons/hicolor/128x128/mimetypes/application-x-google-gadget.png
+share/icons/hicolor/192x192/apps/google-gadgets.png
+share/icons/hicolor/192x192/mimetypes/application-x-google-gadget.png
+share/icons/hicolor/32x32/apps/google-gadgets.png
+share/icons/hicolor/32x32/mimetypes/application-x-google-gadget.png
+share/icons/hicolor/48x48/apps/google-gadgets.png
+share/icons/hicolor/48x48/mimetypes/application-x-google-gadget.png
+share/icons/hicolor/64x64/apps/google-gadgets.png
+share/icons/hicolor/64x64/mimetypes/application-x-google-gadget.png
+share/mime/packages/00-google-gadgets.xml
+share/pixmaps/google-gadgets.png
+@dirrm %%DATADIR%%
+@dirrm lib/google-gadgets/modules
+@dirrm lib/google-gadgets/include/ggadget
+@dirrm lib/google-gadgets/include
+@dirrm lib/google-gadgets
+@dirrm include/google-gadgets/ggadget/xdg
+%%QT%%@dirrm include/google-gadgets/ggadget/qt
+@dirrm include/google-gadgets/ggadget/npapi
+@dirrm include/google-gadgets/ggadget/js
+%%GTK%%@dirrm include/google-gadgets/ggadget/gtk
+@dirrm include/google-gadgets/ggadget/dbus
+@dirrm include/google-gadgets/ggadget
+@dirrm include/google-gadgets
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true