summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/xfce4-mixer/Makefile5
-rw-r--r--audio/xfce4-mixer/PLIST16
-rw-r--r--audio/xfce4-mixer/buildlink3.mk5
-rw-r--r--audio/xfce4-mixer/distinfo10
-rw-r--r--audio/xfce4-mixer/patches/patch-aa19
-rw-r--r--audio/xfce4-mixer/patches/patch-ab20
-rw-r--r--audio/xfce4-xmms-plugin/Makefile13
-rw-r--r--audio/xfce4-xmms-plugin/PLIST34
-rw-r--r--audio/xfce4-xmms-plugin/buildlink3.mk8
-rw-r--r--audio/xfce4-xmms-plugin/distinfo10
-rw-r--r--audio/xfce4-xmms-plugin/options.mk15
-rw-r--r--audio/xfce4-xmms-plugin/patches/patch-aa22
-rw-r--r--audio/xfce4-xmms-plugin/patches/patch-ab22
-rw-r--r--graphics/xfce4-icon-theme/Makefile4
-rw-r--r--graphics/xfce4-icon-theme/PLIST409
-rw-r--r--graphics/xfce4-icon-theme/buildlink3.mk6
-rw-r--r--graphics/xfce4-icon-theme/distinfo8
-rw-r--r--graphics/xfce4-iconbox/DESCR1
-rw-r--r--graphics/xfce4-iconbox/Makefile17
-rw-r--r--graphics/xfce4-iconbox/PLIST52
-rw-r--r--graphics/xfce4-iconbox/buildlink3.mk23
-rw-r--r--graphics/xfce4-iconbox/distinfo5
-rw-r--r--meta-pkgs/xfce4-extras/Makefile27
-rw-r--r--meta-pkgs/xfce4-extras/PLIST2
-rw-r--r--meta-pkgs/xfce4/Makefile15
-rw-r--r--meta-pkgs/xfce4/Makefile.common13
-rw-r--r--meta-pkgs/xfce4/PLIST2
-rw-r--r--meta-pkgs/xfce4/buildlink3.mk17
-rw-r--r--misc/xfce4-weather-plugin/Makefile10
-rw-r--r--misc/xfce4-weather-plugin/PLIST24
-rw-r--r--misc/xfce4-weather-plugin/buildlink3.mk4
-rw-r--r--misc/xfce4-weather-plugin/distinfo9
-rw-r--r--misc/xfce4-weather-plugin/patches/patch-aa13
-rw-r--r--net/xfce4-wavelan-plugin/Makefile9
-rw-r--r--net/xfce4-wavelan-plugin/PLIST14
-rw-r--r--net/xfce4-wavelan-plugin/buildlink3.mk5
-rw-r--r--net/xfce4-wavelan-plugin/distinfo9
-rw-r--r--net/xfce4-wavelan-plugin/patches/patch-aa13
-rw-r--r--print/xfce4-print/Makefile3
-rw-r--r--print/xfce4-print/PLIST52
-rw-r--r--print/xfce4-print/buildlink3.mk5
-rw-r--r--print/xfce4-print/distinfo12
-rw-r--r--print/xfce4-print/options.mk2
-rw-r--r--print/xfce4-print/patches/patch-aa14
-rw-r--r--print/xfce4-print/patches/patch-ab14
-rw-r--r--sysutils/xfce4-appfinder/Makefile6
-rw-r--r--sysutils/xfce4-appfinder/PLIST26
-rw-r--r--sysutils/xfce4-appfinder/buildlink3.mk6
-rw-r--r--sysutils/xfce4-appfinder/distinfo8
-rw-r--r--sysutils/xfce4-cpugraph-plugin/Makefile10
-rw-r--r--sysutils/xfce4-cpugraph-plugin/PLIST5
-rw-r--r--sysutils/xfce4-cpugraph-plugin/buildlink3.mk5
-rw-r--r--sysutils/xfce4-cpugraph-plugin/distinfo12
-rw-r--r--sysutils/xfce4-cpugraph-plugin/patches/patch-aa147
-rw-r--r--sysutils/xfce4-cpugraph-plugin/patches/patch-ab8
-rw-r--r--sysutils/xfce4-cpugraph-plugin/patches/patch-ac16
-rw-r--r--sysutils/xfce4-cpugraph-plugin/patches/patch-ad2
-rw-r--r--sysutils/xfce4-diskperf-plugin/Makefile8
-rw-r--r--sysutils/xfce4-diskperf-plugin/PLIST10
-rw-r--r--sysutils/xfce4-diskperf-plugin/buildlink3.mk5
-rw-r--r--sysutils/xfce4-diskperf-plugin/distinfo8
-rw-r--r--sysutils/xfce4-diskperf-plugin/patches/patch-aa2
-rw-r--r--sysutils/xfce4-fm/DESCR1
-rw-r--r--sysutils/xfce4-fm/MESSAGE7
-rw-r--r--sysutils/xfce4-fm/Makefile30
-rw-r--r--sysutils/xfce4-fm/PLIST294
-rw-r--r--sysutils/xfce4-fm/buildlink3.mk25
-rw-r--r--sysutils/xfce4-fm/distinfo7
-rw-r--r--sysutils/xfce4-fm/patches/patch-aa14
-rw-r--r--sysutils/xfce4-fm/patches/patch-ab33
-rw-r--r--sysutils/xfce4-fsguard-plugin/Makefile10
-rw-r--r--sysutils/xfce4-fsguard-plugin/PLIST13
-rw-r--r--sysutils/xfce4-fsguard-plugin/buildlink3.mk4
-rw-r--r--sysutils/xfce4-fsguard-plugin/distinfo10
-rw-r--r--sysutils/xfce4-fsguard-plugin/patches/patch-aa19
-rw-r--r--sysutils/xfce4-netload-plugin/Makefile10
-rw-r--r--sysutils/xfce4-netload-plugin/PLIST19
-rw-r--r--sysutils/xfce4-netload-plugin/buildlink3.mk5
-rw-r--r--sysutils/xfce4-netload-plugin/distinfo10
-rw-r--r--sysutils/xfce4-netload-plugin/patches/patch-aa11
-rw-r--r--sysutils/xfce4-netload-plugin/patches/patch-ab12
-rw-r--r--sysutils/xfce4-quicklauncher-plugin/Makefile10
-rw-r--r--sysutils/xfce4-quicklauncher-plugin/PLIST12
-rw-r--r--sysutils/xfce4-quicklauncher-plugin/buildlink3.mk5
-rw-r--r--sysutils/xfce4-quicklauncher-plugin/distinfo8
-rw-r--r--sysutils/xfce4-systemload-plugin/Makefile8
-rw-r--r--sysutils/xfce4-systemload-plugin/PLIST26
-rw-r--r--sysutils/xfce4-systemload-plugin/buildlink3.mk5
-rw-r--r--sysutils/xfce4-systemload-plugin/distinfo13
-rw-r--r--sysutils/xfce4-systemload-plugin/patches/patch-aa60
-rw-r--r--sysutils/xfce4-systemload-plugin/patches/patch-ab8
-rw-r--r--sysutils/xfce4-systemload-plugin/patches/patch-ac14
-rw-r--r--sysutils/xfce4-systray/DESCR1
-rw-r--r--sysutils/xfce4-systray/Makefile12
-rw-r--r--sysutils/xfce4-systray/PLIST2
-rw-r--r--sysutils/xfce4-systray/buildlink3.mk23
-rw-r--r--sysutils/xfce4-systray/distinfo5
-rw-r--r--sysutils/xfce4-xkb-plugin/Makefile11
-rw-r--r--sysutils/xfce4-xkb-plugin/PLIST20
-rw-r--r--sysutils/xfce4-xkb-plugin/buildlink3.mk5
-rw-r--r--sysutils/xfce4-xkb-plugin/distinfo9
-rw-r--r--sysutils/xfce4-xkb-plugin/patches/patch-aa21
-rw-r--r--time/xfce4-datetime-plugin/Makefile9
-rw-r--r--time/xfce4-datetime-plugin/PLIST8
-rw-r--r--time/xfce4-datetime-plugin/buildlink3.mk5
-rw-r--r--time/xfce4-datetime-plugin/distinfo8
-rw-r--r--wm/xfce4-wm-themes/Makefile5
-rw-r--r--wm/xfce4-wm-themes/PLIST360
-rw-r--r--wm/xfce4-wm-themes/buildlink3.mk5
-rw-r--r--wm/xfce4-wm-themes/distinfo8
-rw-r--r--wm/xfce4-wm/Makefile8
-rw-r--r--wm/xfce4-wm/PLIST1215
-rw-r--r--wm/xfce4-wm/buildlink3.mk5
-rw-r--r--wm/xfce4-wm/distinfo9
-rw-r--r--wm/xfce4-wm/patches/patch-aa13
-rw-r--r--x11/libxfce4gui/Makefile13
-rw-r--r--x11/libxfce4gui/PLIST77
-rw-r--r--x11/libxfce4gui/buildlink3.mk8
-rw-r--r--x11/libxfce4gui/distinfo8
-rw-r--r--x11/libxfce4mcs/Makefile11
-rw-r--r--x11/libxfce4mcs/PLIST16
-rw-r--r--x11/libxfce4mcs/buildlink3.mk10
-rw-r--r--x11/libxfce4mcs/distinfo8
-rw-r--r--x11/libxfce4util/Makefile7
-rw-r--r--x11/libxfce4util/PLIST63
-rw-r--r--x11/libxfce4util/buildlink3.mk7
-rw-r--r--x11/libxfce4util/distinfo9
-rw-r--r--x11/libxfce4util/patches/patch-aa24
-rw-r--r--x11/xfce4-clipman-plugin/Makefile8
-rw-r--r--x11/xfce4-clipman-plugin/PLIST15
-rw-r--r--x11/xfce4-clipman-plugin/buildlink3.mk5
-rw-r--r--x11/xfce4-clipman-plugin/distinfo8
-rw-r--r--x11/xfce4-desktop/Makefile16
-rw-r--r--x11/xfce4-desktop/PLIST49
-rw-r--r--x11/xfce4-desktop/buildlink3.mk7
-rw-r--r--x11/xfce4-desktop/distinfo12
-rw-r--r--x11/xfce4-desktop/patches/patch-aa16
-rw-r--r--x11/xfce4-desktop/patches/patch-ab14
-rw-r--r--x11/xfce4-gtk2-engine/Makefile8
-rw-r--r--x11/xfce4-gtk2-engine/PLIST12
-rw-r--r--x11/xfce4-gtk2-engine/buildlink3.mk5
-rw-r--r--x11/xfce4-gtk2-engine/distinfo8
-rw-r--r--x11/xfce4-mcs-manager/Makefile3
-rw-r--r--x11/xfce4-mcs-manager/PLIST23
-rw-r--r--x11/xfce4-mcs-manager/buildlink3.mk5
-rw-r--r--x11/xfce4-mcs-manager/distinfo8
-rw-r--r--x11/xfce4-mcs-plugins/Makefile8
-rw-r--r--x11/xfce4-mcs-plugins/PLIST27
-rw-r--r--x11/xfce4-mcs-plugins/buildlink3.mk5
-rw-r--r--x11/xfce4-mcs-plugins/distinfo8
-rw-r--r--x11/xfce4-notes-plugin/Makefile8
-rw-r--r--x11/xfce4-notes-plugin/PLIST22
-rw-r--r--x11/xfce4-notes-plugin/buildlink3.mk5
-rw-r--r--x11/xfce4-notes-plugin/distinfo9
-rw-r--r--x11/xfce4-notes-plugin/patches/patch-aa26
-rw-r--r--x11/xfce4-panel/Makefile39
-rw-r--r--x11/xfce4-panel/PLIST185
-rw-r--r--x11/xfce4-panel/buildlink3.mk5
-rw-r--r--x11/xfce4-panel/distinfo9
-rw-r--r--x11/xfce4-panel/patches/patch-aa13
-rw-r--r--x11/xfce4-session/Makefile25
-rw-r--r--x11/xfce4-session/PLIST28
-rw-r--r--x11/xfce4-session/buildlink3.mk5
-rw-r--r--x11/xfce4-session/distinfo10
-rw-r--r--x11/xfce4-session/patches/patch-aa12
-rw-r--r--x11/xfce4-toys/DESCR1
-rw-r--r--x11/xfce4-toys/Makefile17
-rw-r--r--x11/xfce4-toys/PLIST78
-rw-r--r--x11/xfce4-toys/buildlink3.mk23
-rw-r--r--x11/xfce4-toys/distinfo5
-rw-r--r--x11/xfce4-trigger-launcher/DESCR1
-rw-r--r--x11/xfce4-trigger-launcher/Makefile11
-rw-r--r--x11/xfce4-trigger-launcher/PLIST51
-rw-r--r--x11/xfce4-trigger-launcher/buildlink3.mk22
-rw-r--r--x11/xfce4-trigger-launcher/distinfo5
-rw-r--r--x11/xfce4-utils/MESSAGE2
-rw-r--r--x11/xfce4-utils/Makefile11
-rw-r--r--x11/xfce4-utils/PLIST101
-rw-r--r--x11/xfce4-utils/buildlink3.mk5
-rw-r--r--x11/xfce4-utils/distinfo12
-rw-r--r--x11/xfce4-utils/patches/patch-aa12
-rw-r--r--x11/xfce4-utils/patches/patch-ab23
-rw-r--r--x11/xfce4-utils/patches/patch-ac13
183 files changed, 2646 insertions, 2445 deletions
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 44fa5cc9118..c42196f0111 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.19 2007/01/23 11:53:46 martti Exp $
+# $NetBSD: Makefile,v 1.20 2007/04/12 09:55:08 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-mixer-${XFCE4_VERSION}
-#PKGREVISION= 1
CATEGORIES= audio
COMMENT= Xfce mixer plugin
+USE_TOOLS+= intltool
+
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/audio/xfce4-mixer/PLIST b/audio/xfce4-mixer/PLIST
index a5da2074e79..168a5ee57ff 100644
--- a/audio/xfce4-mixer/PLIST
+++ b/audio/xfce4-mixer/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.14 2007/01/23 11:53:46 martti Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/04/12 09:55:08 martti Exp $
bin/xfce4-mixer
lib/xfce4/mcs-plugins/sound_settings.la
lib/xfce4/modules/libxfce4mixer.la
-lib/xfce4/panel-plugins/libmixer.la
+libexec/xfce4/panel-plugins/xfce4-mixer-plugin
share/applications/xfce-mixer-settings.desktop
share/icons/hicolor/48x48/apps/xfce4-mixer.png
-share/locale/af/LC_MESSAGES/xfce4-mixer.mo
share/locale/ar/LC_MESSAGES/xfce4-mixer.mo
share/locale/az/LC_MESSAGES/xfce4-mixer.mo
share/locale/be/LC_MESSAGES/xfce4-mixer.mo
@@ -13,8 +12,8 @@ share/locale/bg/LC_MESSAGES/xfce4-mixer.mo
share/locale/bn_IN/LC_MESSAGES/xfce4-mixer.mo
share/locale/ca/LC_MESSAGES/xfce4-mixer.mo
share/locale/cs/LC_MESSAGES/xfce4-mixer.mo
-share/locale/da/LC_MESSAGES/xfce4-mixer.mo
share/locale/de/LC_MESSAGES/xfce4-mixer.mo
+share/locale/dz/LC_MESSAGES/xfce4-mixer.mo
share/locale/el/LC_MESSAGES/xfce4-mixer.mo
share/locale/en_GB/LC_MESSAGES/xfce4-mixer.mo
share/locale/es/LC_MESSAGES/xfce4-mixer.mo
@@ -24,6 +23,7 @@ share/locale/eu/LC_MESSAGES/xfce4-mixer.mo
share/locale/fa/LC_MESSAGES/xfce4-mixer.mo
share/locale/fi/LC_MESSAGES/xfce4-mixer.mo
share/locale/fr/LC_MESSAGES/xfce4-mixer.mo
+share/locale/gl/LC_MESSAGES/xfce4-mixer.mo
share/locale/gu/LC_MESSAGES/xfce4-mixer.mo
share/locale/he/LC_MESSAGES/xfce4-mixer.mo
share/locale/hi/LC_MESSAGES/xfce4-mixer.mo
@@ -31,9 +31,10 @@ share/locale/hu/LC_MESSAGES/xfce4-mixer.mo
share/locale/hy/LC_MESSAGES/xfce4-mixer.mo
share/locale/it/LC_MESSAGES/xfce4-mixer.mo
share/locale/ja/LC_MESSAGES/xfce4-mixer.mo
+share/locale/ka/LC_MESSAGES/xfce4-mixer.mo
share/locale/ko/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ku/LC_MESSAGES/xfce4-mixer.mo
share/locale/lt/LC_MESSAGES/xfce4-mixer.mo
+share/locale/mk/LC_MESSAGES/xfce4-mixer.mo
share/locale/mr/LC_MESSAGES/xfce4-mixer.mo
share/locale/ms/LC_MESSAGES/xfce4-mixer.mo
share/locale/nb_NO/LC_MESSAGES/xfce4-mixer.mo
@@ -45,8 +46,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce4-mixer.mo
share/locale/ro/LC_MESSAGES/xfce4-mixer.mo
share/locale/ru/LC_MESSAGES/xfce4-mixer.mo
share/locale/sk/LC_MESSAGES/xfce4-mixer.mo
-share/locale/sl/LC_MESSAGES/xfce4-mixer.mo
-share/locale/sq/LC_MESSAGES/xfce4-mixer.mo
share/locale/sv/LC_MESSAGES/xfce4-mixer.mo
share/locale/ta/LC_MESSAGES/xfce4-mixer.mo
share/locale/tr/LC_MESSAGES/xfce4-mixer.mo
@@ -54,3 +53,6 @@ share/locale/uk/LC_MESSAGES/xfce4-mixer.mo
share/locale/vi/LC_MESSAGES/xfce4-mixer.mo
share/locale/zh_CN/LC_MESSAGES/xfce4-mixer.mo
share/locale/zh_TW/LC_MESSAGES/xfce4-mixer.mo
+share/xfce4/panel-plugins/xfce4-mixer.desktop
+@unexec ${RMDIR} %D/libexec/xfce4/panel-plugins 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/lib/xfce4/modules 2>/dev/null || ${TRUE}
diff --git a/audio/xfce4-mixer/buildlink3.mk b/audio/xfce4-mixer/buildlink3.mk
index c90895070f9..44973b8e6f8 100644
--- a/audio/xfce4-mixer/buildlink3.mk
+++ b/audio/xfce4-mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:46 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2007/04/12 09:55:08 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_MIXER_BUILDLINK3_MK:= ${XFCE4_MIXER_BUILDLINK3_MK}+
@@ -12,13 +12,14 @@ BUILDLINK_PACKAGES+= xfce4-mixer
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mixer
.if ${XFCE4_MIXER_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-mixer+= xfce4-mixer>=4.2.4
+BUILDLINK_API_DEPENDS.xfce4-mixer+= xfce4-mixer>=4.4.1
BUILDLINK_PKGSRCDIR.xfce4-mixer?= ../../audio/xfce4-mixer
.endif # XFCE4_MIXER_BUILDLINK3_MK
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/xfce4-mixer/distinfo b/audio/xfce4-mixer/distinfo
index 5ad62f7bf22..f0052a0d846 100644
--- a/audio/xfce4-mixer/distinfo
+++ b/audio/xfce4-mixer/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.14 2007/01/23 11:53:46 martti Exp $
+$NetBSD: distinfo,v 1.15 2007/04/12 09:55:08 martti Exp $
-SHA1 (xfce4-mixer-4.2.4.tar.gz) = aa3f12f6ce13774a296566db10c2c90396d0e3b2
-RMD160 (xfce4-mixer-4.2.4.tar.gz) = c545b70960cecc2f9ee5f923b3dd11a56cec05d1
-Size (xfce4-mixer-4.2.4.tar.gz) = 607409 bytes
-SHA1 (patch-aa) = 813b37e41c8a19c8ce2d2b4ed9fc5e53601dd025
-SHA1 (patch-ab) = 52d3d875c335a55e00870385cc114af7265748dc
+SHA1 (xfce4-mixer-4.4.1.tar.bz2) = 23bbaf2e56adea6d1c7be9e2b7bea4b9c1d27be5
+RMD160 (xfce4-mixer-4.4.1.tar.bz2) = 77c8c9cc206bd4ca9bd7c4b93ed20a35575350ac
+Size (xfce4-mixer-4.4.1.tar.bz2) = 459005 bytes
diff --git a/audio/xfce4-mixer/patches/patch-aa b/audio/xfce4-mixer/patches/patch-aa
deleted file mode 100644
index c7989e7cc96..00000000000
--- a/audio/xfce4-mixer/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/11/28 18:57:25 rillig Exp $
-
---- panel-plugin/plugin.c.orig 2006-11-28 19:25:31.314565636 +0100
-+++ panel-plugin/plugin.c 2006-11-28 19:27:08.972814548 +0100
-@@ -18,6 +18,14 @@
- /* DO: timeout -> update volume */
- #define UPDATE_TIMEOUT 1000
-
-+#ifdef XFCE_PANEL_THREADED
-+# define XFCE_PANEL_LOCK() gdk_threads_enter()
-+# define XFCE_PANEL_UNLOCK() gdk_threads_leave()
-+#else
-+# define XFCE_PANEL_LOCK() do { } while (0)
-+# define XFCE_PANEL_UNLOCK() do { } while (0)
-+#endif
-+
- typedef struct
- {
- GtkWidget *box;
diff --git a/audio/xfce4-mixer/patches/patch-ab b/audio/xfce4-mixer/patches/patch-ab
deleted file mode 100644
index abb62294577..00000000000
--- a/audio/xfce4-mixer/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/01/23 11:53:46 martti Exp $
-
-SunPro cannot handle function-like macros on the command line.
-
---- configure.orig 2007-01-14 21:05:51.000000000 +0000
-+++ configure 2007-01-23 12:35:37.000000000 +0000
-@@ -23199,13 +23199,9 @@
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_THREADED=1"
-- xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_LOCK\(\)=gdk_threads_enter\(\)"
-- xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_UNLOCK\(\)=gdk_threads_leave\(\)"
- else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-- xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_LOCK\(\)=do{}while\(0\)"
-- xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_UNLOCK\(\)=do{}while\(0\)"
- fi
- XFCE4_PANEL_CFLAGS="$xdt_cv_CFLAGS"
-
diff --git a/audio/xfce4-xmms-plugin/Makefile b/audio/xfce4-xmms-plugin/Makefile
index 49e9233d016..e555eca5238 100644
--- a/audio/xfce4-xmms-plugin/Makefile
+++ b/audio/xfce4-xmms-plugin/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.11 2006/04/17 13:46:13 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/04/12 09:55:08 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 0.3.1
+XFCE4_VERSION= 0.5.1
DISTNAME= xfce4-xmms-plugin-${XFCE4_VERSION}
-PKGREVISION= 3
+#PKGREVISION= 1
CATEGORIES= audio
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/xfce4-xmms-plugin/
COMMENT= Xfce XMMS plugin
-EXTRACT_SUFX= .tar.bz2
+USE_TOOLS+= intltool
+
+.include "options.mk"
-.include "../../audio/xmms/buildlink3.mk"
.include "../../x11/xfce4-panel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xfce4-xmms-plugin/PLIST b/audio/xfce4-xmms-plugin/PLIST
index 5bbde0056e8..7f3229caa18 100644
--- a/audio/xfce4-xmms-plugin/PLIST
+++ b/audio/xfce4-xmms-plugin/PLIST
@@ -1,18 +1,22 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/17 07:07:12 jlam Exp $
-lib/xfce4/panel-plugins/libxmms_plugin.la
+@comment $NetBSD: PLIST,v 1.5 2007/04/12 09:55:08 martti Exp $
+libexec/xfce4/panel-plugins/xfce4-xmms-plugin
+share/locale/ca/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-xmms-plugin.mo
share/locale/de/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/ja/LC_MESSAGES/xfce4-xmms-plugin.mo
share/locale/ko/LC_MESSAGES/xfce4-xmms-plugin.mo
share/locale/lt/LC_MESSAGES/xfce4-xmms-plugin.mo
-share/xfce4/xmms-plugin/xmms-plugin-menu-eject.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-icon.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-next.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-pause.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-play.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-prev.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-stop.png
-share/xfce4/xmms-plugin/xmms-plugin-next.png
-share/xfce4/xmms-plugin/xmms-plugin-pause.png
-share/xfce4/xmms-plugin/xmms-plugin-play.png
-share/xfce4/xmms-plugin/xmms-plugin-prev.png
-share/xfce4/xmms-plugin/xmms-plugin-stop.png
-@dirrm share/xfce4/xmms-plugin
+share/locale/pl/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/tr/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/vi/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/xfce4/panel-plugins/xfce4-xmms-plugin.desktop
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-menu.png
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-next.png
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-pause.png
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-play.png
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-prev.png
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-stop.png
+@dirrm share/xfce4/xfce4-xmms-plugin
diff --git a/audio/xfce4-xmms-plugin/buildlink3.mk b/audio/xfce4-xmms-plugin/buildlink3.mk
index 761304518eb..21ba5be9d94 100644
--- a/audio/xfce4-xmms-plugin/buildlink3.mk
+++ b/audio/xfce4-xmms-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/10/12 06:06:07 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2007/04/12 09:55:08 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:= ${XFCE4_XMMS_PLUGIN_BUILDLINK3_MK}+
@@ -12,12 +12,14 @@ BUILDLINK_PACKAGES+= xfce4-xmms-plugin
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-xmms-plugin
.if ${XFCE4_XMMS_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-xmms-plugin+= xfce4-xmms-plugin>=0.3.1nb3
+BUILDLINK_API_DEPENDS.xfce4-xmms-plugin+= xfce4-xmms-plugin>=0.5.1
BUILDLINK_PKGSRCDIR.xfce4-xmms-plugin?= ../../audio/xfce4-xmms-plugin
.endif # XFCE4_XMMS_PLUGIN_BUILDLINK3_MK
-.include "../../audio/xmms/buildlink3.mk"
+.include "options.mk"
+
.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/xfce4-xmms-plugin/distinfo b/audio/xfce4-xmms-plugin/distinfo
index bdb8f088233..5ed7c13de66 100644
--- a/audio/xfce4-xmms-plugin/distinfo
+++ b/audio/xfce4-xmms-plugin/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.4 2006/10/12 05:43:20 martti Exp $
+$NetBSD: distinfo,v 1.5 2007/04/12 09:55:08 martti Exp $
-SHA1 (xfce4-xmms-plugin-0.3.1.tar.bz2) = f59c799d672941dfadd19272daff6f6e5b1c02fd
-RMD160 (xfce4-xmms-plugin-0.3.1.tar.bz2) = 955f0ffcce94480d1144416076e3bfd8de76ac00
-Size (xfce4-xmms-plugin-0.3.1.tar.bz2) = 518730 bytes
-SHA1 (patch-aa) = 4fb80effa95987e87ae305db886cfc34cffb4292
-SHA1 (patch-ab) = b24664d40d4c05b872bdb5696a4182cd55ec088e
+SHA1 (xfce4-xmms-plugin-0.5.1.tar.bz2) = 8fa306b003935d1c54ed078c5f18cb61513df682
+RMD160 (xfce4-xmms-plugin-0.5.1.tar.bz2) = 52ac130a300a9b3e79d103e51a56c7bee639270c
+Size (xfce4-xmms-plugin-0.5.1.tar.bz2) = 314121 bytes
diff --git a/audio/xfce4-xmms-plugin/options.mk b/audio/xfce4-xmms-plugin/options.mk
new file mode 100644
index 00000000000..109f7610307
--- /dev/null
+++ b/audio/xfce4-xmms-plugin/options.mk
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2007/04/12 09:55:09 martti Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.xfce4-xmms-plugin
+PKG_SUPPORTED_OPTIONS=
+PKG_OPTIONS_REQUIRED_GROUPS+= xfce4-xmms-plugin-player
+PKG_OPTIONS_GROUP.xfce4-xmms-plugin-player= xmms bmp
+PKG_SUGGESTED_OPTIONS= xmms
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mbmp)
+.include "../../audio/bmp/buildlink3.mk"
+.else
+.include "../../audio/xmms/buildlink3.mk"
+.endif
diff --git a/audio/xfce4-xmms-plugin/patches/patch-aa b/audio/xfce4-xmms-plugin/patches/patch-aa
deleted file mode 100644
index a3f914aea77..00000000000
--- a/audio/xfce4-xmms-plugin/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/10/12 05:43:20 martti Exp $
-
---- configure.ac.orig 2006-10-12 08:38:23.000000000 +0000
-+++ configure.ac 2006-10-12 08:38:33.000000000 +0000
-@@ -35,7 +35,7 @@
- dnl check for player
- AC_MSG_CHECKING([what player to link with])
- AC_ARG_WITH([player], [ --with-player=xmms/beep Specify player to link with [default=xmms]])
--if test x"$with_player" == x"beep"; then
-+if test x"$with_player" = x"beep"; then
- AC_MSG_RESULT([Beep media player])
- BM_DEPEND([PLAYER], [beep], [0.9.6.0])
-
-@@ -44,7 +44,7 @@
- AC_MSG_RESULT([XMMS media player])
-
- AC_CHECK_PROGS([XMMS_CONFIG], [xmms-config], [no])
-- if test x"$XMMS_CONFIG" == x"no"; then
-+ if test x"$XMMS_CONFIG" = x"no"; then
- AC_MSG_ERROR([*** XMMS not found. Please install XMMS first. ***])
- fi
-
diff --git a/audio/xfce4-xmms-plugin/patches/patch-ab b/audio/xfce4-xmms-plugin/patches/patch-ab
deleted file mode 100644
index 869a2c40476..00000000000
--- a/audio/xfce4-xmms-plugin/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/10/12 05:43:20 martti Exp $
-
---- configure.orig 2006-10-12 08:39:06.000000000 +0000
-+++ configure 2006-10-12 08:39:35.000000000 +0000
-@@ -20790,7 +20790,7 @@
- withval="$with_player"
-
- fi;
--if test x"$with_player" == x"beep"; then
-+if test x"$with_player" = x"beep"; then
- echo "$as_me:$LINENO: result: Beep media player" >&5
- echo "${ECHO_T}Beep media player" >&6
-
-@@ -20942,7 +20942,7 @@
- done
- test -n "$XMMS_CONFIG" || XMMS_CONFIG="no"
-
-- if test x"$XMMS_CONFIG" == x"no"; then
-+ if test x"$XMMS_CONFIG" = x"no"; then
- { { echo "$as_me:$LINENO: error: *** XMMS not found. Please install XMMS first. ***" >&5
- echo "$as_me: error: *** XMMS not found. Please install XMMS first. ***" >&2;}
- { (exit 1); exit 1; }; }
diff --git a/graphics/xfce4-icon-theme/Makefile b/graphics/xfce4-icon-theme/Makefile
index 5798b6d5091..e6fa7e9d321 100644
--- a/graphics/xfce4-icon-theme/Makefile
+++ b/graphics/xfce4-icon-theme/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2007/01/23 11:53:46 martti Exp $
+# $NetBSD: Makefile,v 1.7 2007/04/12 09:55:09 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-icon-theme-${XFCE4_VERSION}
-#PKGREVISION= 1
CATEGORIES= graphics
COMMENT= Xfce icon themes
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xfce4-icon-theme/PLIST b/graphics/xfce4-icon-theme/PLIST
index af964a9cdac..720169a4b76 100644
--- a/graphics/xfce4-icon-theme/PLIST
+++ b/graphics/xfce4-icon-theme/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/01/17 12:47:07 martti Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/12 09:55:09 martti Exp $
+lib/pkgconfig/xfce4-icon-theme-1.0.pc
share/icons/Rodent/48x48/apps/applets-screenshooter.png
share/icons/Rodent/48x48/apps/bluefish-icon.png
share/icons/Rodent/48x48/apps/digikam.png
@@ -19,11 +20,13 @@ share/icons/Rodent/48x48/apps/gnome-graphics.png
share/icons/Rodent/48x48/apps/gnome-help.png
share/icons/Rodent/48x48/apps/gnome-info.png
share/icons/Rodent/48x48/apps/gnome-joystick.png
+share/icons/Rodent/48x48/apps/gnome-library.png
share/icons/Rodent/48x48/apps/gnome-lockscreen.png
share/icons/Rodent/48x48/apps/gnome-logout.png
share/icons/Rodent/48x48/apps/gnome-media-player-icon.png
share/icons/Rodent/48x48/apps/gnome-multimedia.png
share/icons/Rodent/48x48/apps/gnome-other.png
+share/icons/Rodent/48x48/apps/gnome-package.png
share/icons/Rodent/48x48/apps/gnome-pdf.png
share/icons/Rodent/48x48/apps/gnome-searchtool.png
share/icons/Rodent/48x48/apps/gnome-settings.png
@@ -112,6 +115,10 @@ share/icons/Rodent/48x48/emblems/emblem-sound.png
share/icons/Rodent/48x48/emblems/emblem-symbolic-link.png
share/icons/Rodent/48x48/emblems/emblem-urgent.png
share/icons/Rodent/48x48/emblems/emblem-web.png
+share/icons/Rodent/48x48/filesystems/blockdevice.png
+share/icons/Rodent/48x48/filesystems/chardevice.png
+share/icons/Rodent/48x48/filesystems/core.png
+share/icons/Rodent/48x48/filesystems/directory.png
share/icons/Rodent/48x48/filesystems/gnome-fs-blockdev.png
share/icons/Rodent/48x48/filesystems/gnome-fs-client.png
share/icons/Rodent/48x48/filesystems/gnome-fs-desktop.png
@@ -135,9 +142,106 @@ share/icons/Rodent/48x48/filesystems/mime-inode:chardevice.png
share/icons/Rodent/48x48/filesystems/mime-inode:core.png
share/icons/Rodent/48x48/filesystems/mime-inode:directory.png
share/icons/Rodent/48x48/filesystems/mime-inode:mount-point.png
+share/icons/Rodent/48x48/filesystems/mount-point.png
share/icons/Rodent/48x48/filesystems/network_fs.png
share/icons/Rodent/48x48/filesystems/open_folder.png
-share/icons/Rodent/48x48/mimetypes/gnome-library.png
+share/icons/Rodent/48x48/filesystems/user-home.png
+share/icons/Rodent/48x48/mimetypes/application-msword.png
+share/icons/Rodent/48x48/mimetypes/application-octet-stream.png
+share/icons/Rodent/48x48/mimetypes/application-ogg.png
+share/icons/Rodent/48x48/mimetypes/application-pdf.png
+share/icons/Rodent/48x48/mimetypes/application-pgp-encrypted.png
+share/icons/Rodent/48x48/mimetypes/application-pgp-keys.png
+share/icons/Rodent/48x48/mimetypes/application-pgp.png
+share/icons/Rodent/48x48/mimetypes/application-postscript.png
+share/icons/Rodent/48x48/mimetypes/application-qif.png
+share/icons/Rodent/48x48/mimetypes/application-rhythmbox-effect.png
+share/icons/Rodent/48x48/mimetypes/application-rhythmbox-playlist.png
+share/icons/Rodent/48x48/mimetypes/application-rtf.png
+share/icons/Rodent/48x48/mimetypes/application-smil.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.ms-excel.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.ms-powerpoint.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.ms-word.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.rn-realmedia.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.stardivision.calc.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.stardivision.chart.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.stardivision.impress.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.stardivision.writer.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.sun.xml.calc.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.sun.xml.chart.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.sun.xml.draw.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.sun.xml.impress.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.sun.xml.writer.png
+share/icons/Rodent/48x48/mimetypes/application-x-abiword.png
+share/icons/Rodent/48x48/mimetypes/application-x-archive.png
+share/icons/Rodent/48x48/mimetypes/application-x-arj.png
+share/icons/Rodent/48x48/mimetypes/application-x-blender.png
+share/icons/Rodent/48x48/mimetypes/application-x-bzip-compressed-tar.png
+share/icons/Rodent/48x48/mimetypes/application-x-bzip.png
+share/icons/Rodent/48x48/mimetypes/application-x-cd-image.png
+share/icons/Rodent/48x48/mimetypes/application-x-compress.png
+share/icons/Rodent/48x48/mimetypes/application-x-compressed-tar.png
+share/icons/Rodent/48x48/mimetypes/application-x-cpio-compressed.png
+share/icons/Rodent/48x48/mimetypes/application-x-cpio.png
+share/icons/Rodent/48x48/mimetypes/application-x-deb.png
+share/icons/Rodent/48x48/mimetypes/application-x-desktop.png
+share/icons/Rodent/48x48/mimetypes/application-x-dia-diagram.png
+share/icons/Rodent/48x48/mimetypes/application-x-dvi.png
+share/icons/Rodent/48x48/mimetypes/application-x-executable.png
+share/icons/Rodent/48x48/mimetypes/application-x-font-asm.png
+share/icons/Rodent/48x48/mimetypes/application-x-font-bdf.png
+share/icons/Rodent/48x48/mimetypes/application-x-font-linux-psf.png
+share/icons/Rodent/48x48/mimetypes/application-x-font-pcf.png
+share/icons/Rodent/48x48/mimetypes/application-x-font-ttf.png
+share/icons/Rodent/48x48/mimetypes/application-x-gettext-translation.png
+share/icons/Rodent/48x48/mimetypes/application-x-glade.png
+share/icons/Rodent/48x48/mimetypes/application-x-gnucash.png
+share/icons/Rodent/48x48/mimetypes/application-x-gnumeric.png
+share/icons/Rodent/48x48/mimetypes/application-x-gtktalog.png
+share/icons/Rodent/48x48/mimetypes/application-x-gzip.png
+share/icons/Rodent/48x48/mimetypes/application-x-kde-app-info.png
+share/icons/Rodent/48x48/mimetypes/application-x-killustrator.png
+share/icons/Rodent/48x48/mimetypes/application-x-kpresenter.png
+share/icons/Rodent/48x48/mimetypes/application-x-kspread.png
+share/icons/Rodent/48x48/mimetypes/application-x-kword.png
+share/icons/Rodent/48x48/mimetypes/application-x-lha.png
+share/icons/Rodent/48x48/mimetypes/application-x-object.png
+share/icons/Rodent/48x48/mimetypes/application-x-perl.png
+share/icons/Rodent/48x48/mimetypes/application-x-php.png
+share/icons/Rodent/48x48/mimetypes/application-x-python-bytecode.png
+share/icons/Rodent/48x48/mimetypes/application-x-python.png
+share/icons/Rodent/48x48/mimetypes/application-x-qw.png
+share/icons/Rodent/48x48/mimetypes/application-x-rar.png
+share/icons/Rodent/48x48/mimetypes/application-x-reject.png
+share/icons/Rodent/48x48/mimetypes/application-x-rpm.png
+share/icons/Rodent/48x48/mimetypes/application-x-share-library-la.png
+share/icons/Rodent/48x48/mimetypes/application-x-sharedlib.png
+share/icons/Rodent/48x48/mimetypes/application-x-shellscript.png
+share/icons/Rodent/48x48/mimetypes/application-x-shockwave-flash.png
+share/icons/Rodent/48x48/mimetypes/application-x-smil.png
+share/icons/Rodent/48x48/mimetypes/application-x-tar.png
+share/icons/Rodent/48x48/mimetypes/application-x-tex.png
+share/icons/Rodent/48x48/mimetypes/application-x-trash.png
+share/icons/Rodent/48x48/mimetypes/application-zip.png
+share/icons/Rodent/48x48/mimetypes/application.png
+share/icons/Rodent/48x48/mimetypes/audio-ac3.png
+share/icons/Rodent/48x48/mimetypes/audio-basic.png
+share/icons/Rodent/48x48/mimetypes/audio-midi.png
+share/icons/Rodent/48x48/mimetypes/audio-x-aiff.png
+share/icons/Rodent/48x48/mimetypes/audio-x-it.png
+share/icons/Rodent/48x48/mimetypes/audio-x-midi.png
+share/icons/Rodent/48x48/mimetypes/audio-x-mod.png
+share/icons/Rodent/48x48/mimetypes/audio-x-mp3.png
+share/icons/Rodent/48x48/mimetypes/audio-x-mpegurl.png
+share/icons/Rodent/48x48/mimetypes/audio-x-pn-realaudio.png
+share/icons/Rodent/48x48/mimetypes/audio-x-s3m.png
+share/icons/Rodent/48x48/mimetypes/audio-x-stm.png
+share/icons/Rodent/48x48/mimetypes/audio-x-ulaw.png
+share/icons/Rodent/48x48/mimetypes/audio-x-voc.png
+share/icons/Rodent/48x48/mimetypes/audio-x-wav.png
+share/icons/Rodent/48x48/mimetypes/audio-x-xi.png
+share/icons/Rodent/48x48/mimetypes/audio-x-xm.png
+share/icons/Rodent/48x48/mimetypes/audio.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-application-msword.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-application-octet-stream.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-application-ogg.png
@@ -153,6 +257,7 @@ share/icons/Rodent/48x48/mimetypes/gnome-mime-application-rtf.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-application-smil.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-application-vnd.ms-excel.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png
+share/icons/Rodent/48x48/mimetypes/gnome-mime-application-vnd.ms-word.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-application-vnd.stardivision.chart.png
@@ -238,6 +343,7 @@ share/icons/Rodent/48x48/mimetypes/gnome-mime-image-gif.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-image-ief.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-image-jpeg.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-image-png.png
+share/icons/Rodent/48x48/mimetypes/gnome-mime-image-svg+xml.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-image-svg.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-image-tiff.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-image-x-3ds.png
@@ -301,7 +407,31 @@ share/icons/Rodent/48x48/mimetypes/gnome-mime-x-directory-smb-server.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-x-directory-smb-share.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-x-directory-smb-workgroup.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-x-font-afm.png
-share/icons/Rodent/48x48/mimetypes/gnome-package.png
+share/icons/Rodent/48x48/mimetypes/gnome-mime-x-gdesklets-display.png
+share/icons/Rodent/48x48/mimetypes/image-bmp.png
+share/icons/Rodent/48x48/mimetypes/image-gif.png
+share/icons/Rodent/48x48/mimetypes/image-ief.png
+share/icons/Rodent/48x48/mimetypes/image-jpeg.png
+share/icons/Rodent/48x48/mimetypes/image-png.png
+share/icons/Rodent/48x48/mimetypes/image-svg+xml.png
+share/icons/Rodent/48x48/mimetypes/image-svg.png
+share/icons/Rodent/48x48/mimetypes/image-tiff.png
+share/icons/Rodent/48x48/mimetypes/image-x-3ds.png
+share/icons/Rodent/48x48/mimetypes/image-x-applix-graphic.png
+share/icons/Rodent/48x48/mimetypes/image-x-cmu-raster.png
+share/icons/Rodent/48x48/mimetypes/image-x-portable-anymap.png
+share/icons/Rodent/48x48/mimetypes/image-x-portable-bitmap.png
+share/icons/Rodent/48x48/mimetypes/image-x-portable-greymap.png
+share/icons/Rodent/48x48/mimetypes/image-x-portable-pixmap.png
+share/icons/Rodent/48x48/mimetypes/image-x-psd.png
+share/icons/Rodent/48x48/mimetypes/image-x-rgb.png
+share/icons/Rodent/48x48/mimetypes/image-x-tga.png
+share/icons/Rodent/48x48/mimetypes/image-x-xbitmap.png
+share/icons/Rodent/48x48/mimetypes/image-x-xcf.png
+share/icons/Rodent/48x48/mimetypes/image-x-xfig.png
+share/icons/Rodent/48x48/mimetypes/image-x-xpixmap.png
+share/icons/Rodent/48x48/mimetypes/image-x-xwindowdum.png
+share/icons/Rodent/48x48/mimetypes/image.png
share/icons/Rodent/48x48/mimetypes/mime-application.png
share/icons/Rodent/48x48/mimetypes/mime-application:msword.png
share/icons/Rodent/48x48/mimetypes/mime-application:octet-stream.png
@@ -318,6 +448,7 @@ share/icons/Rodent/48x48/mimetypes/mime-application:rtf.png
share/icons/Rodent/48x48/mimetypes/mime-application:smil.png
share/icons/Rodent/48x48/mimetypes/mime-application:vnd.ms-excel.png
share/icons/Rodent/48x48/mimetypes/mime-application:vnd.ms-powerpoint.png
+share/icons/Rodent/48x48/mimetypes/mime-application:vnd.ms-word.png
share/icons/Rodent/48x48/mimetypes/mime-application:vnd.rn-realmedia.png
share/icons/Rodent/48x48/mimetypes/mime-application:vnd.stardivision.calc.png
share/icons/Rodent/48x48/mimetypes/mime-application:vnd.stardivision.chart.png
@@ -403,6 +534,7 @@ share/icons/Rodent/48x48/mimetypes/mime-image:gif.png
share/icons/Rodent/48x48/mimetypes/mime-image:ief.png
share/icons/Rodent/48x48/mimetypes/mime-image:jpeg.png
share/icons/Rodent/48x48/mimetypes/mime-image:png.png
+share/icons/Rodent/48x48/mimetypes/mime-image:svg+xml.png
share/icons/Rodent/48x48/mimetypes/mime-image:svg.png
share/icons/Rodent/48x48/mimetypes/mime-image:tiff.png
share/icons/Rodent/48x48/mimetypes/mime-image:x-3ds.png
@@ -465,19 +597,78 @@ share/icons/Rodent/48x48/mimetypes/mime-x:directory-smb-server.png
share/icons/Rodent/48x48/mimetypes/mime-x:directory-smb-share.png
share/icons/Rodent/48x48/mimetypes/mime-x:directory-smb-workgroup.png
share/icons/Rodent/48x48/mimetypes/mime-x:font-afm.png
-share/icons/Rodent/48x48/mimetypes/stock_run.png
+share/icons/Rodent/48x48/mimetypes/mime-x:gdesklets-display.png
+share/icons/Rodent/48x48/mimetypes/text-css.png
+share/icons/Rodent/48x48/mimetypes/text-html.png
+share/icons/Rodent/48x48/mimetypes/text-sgml.png
+share/icons/Rodent/48x48/mimetypes/text-x-authors.png
+share/icons/Rodent/48x48/mimetypes/text-x-c++.png
+share/icons/Rodent/48x48/mimetypes/text-x-c++src.png
+share/icons/Rodent/48x48/mimetypes/text-x-c-header.png
+share/icons/Rodent/48x48/mimetypes/text-x-c.png
+share/icons/Rodent/48x48/mimetypes/text-x-chdr.png
+share/icons/Rodent/48x48/mimetypes/text-x-copying.png
+share/icons/Rodent/48x48/mimetypes/text-x-credits.png
+share/icons/Rodent/48x48/mimetypes/text-x-csh.png
+share/icons/Rodent/48x48/mimetypes/text-x-csharp.png
+share/icons/Rodent/48x48/mimetypes/text-x-csrc.png
+share/icons/Rodent/48x48/mimetypes/text-x-gettext-translation.png
+share/icons/Rodent/48x48/mimetypes/text-x-haskell.png
+share/icons/Rodent/48x48/mimetypes/text-x-install.png
+share/icons/Rodent/48x48/mimetypes/text-x-java.png
+share/icons/Rodent/48x48/mimetypes/text-x-literate-haskell.png
+share/icons/Rodent/48x48/mimetypes/text-x-log.png
+share/icons/Rodent/48x48/mimetypes/text-x-lyx.png
+share/icons/Rodent/48x48/mimetypes/text-x-makefile.png
+share/icons/Rodent/48x48/mimetypes/text-x-patch.png
+share/icons/Rodent/48x48/mimetypes/text-x-readme.png
+share/icons/Rodent/48x48/mimetypes/text-x-scheme.png
+share/icons/Rodent/48x48/mimetypes/text-x-sh.png
+share/icons/Rodent/48x48/mimetypes/text-x-tex.png
+share/icons/Rodent/48x48/mimetypes/text-x-troff-man.png
+share/icons/Rodent/48x48/mimetypes/text-x-vcalendar.png
+share/icons/Rodent/48x48/mimetypes/text-x-vcard.png
+share/icons/Rodent/48x48/mimetypes/text-x-xslt.png
+share/icons/Rodent/48x48/mimetypes/text-x-zsh.png
+share/icons/Rodent/48x48/mimetypes/text-xml.png
+share/icons/Rodent/48x48/mimetypes/text.png
+share/icons/Rodent/48x48/mimetypes/video-mpeg.png
+share/icons/Rodent/48x48/mimetypes/video-quicktime.png
+share/icons/Rodent/48x48/mimetypes/video-x-ms-asf.png
+share/icons/Rodent/48x48/mimetypes/video-x-ms-wmv.png
+share/icons/Rodent/48x48/mimetypes/video-x-msvideo.png
+share/icons/Rodent/48x48/mimetypes/video.png
+share/icons/Rodent/48x48/mimetypes/x-directory-nfs-server.png
+share/icons/Rodent/48x48/mimetypes/x-directory-smb-server.png
+share/icons/Rodent/48x48/mimetypes/x-directory-smb-share.png
+share/icons/Rodent/48x48/mimetypes/x-directory-smb-workgroup.png
+share/icons/Rodent/48x48/mimetypes/x-font-afm.png
share/icons/Rodent/48x48/mimetypes/x-gdesklets-display.png
+share/icons/Rodent/48x48/misc/arrow.png
share/icons/Rodent/48x48/misc/calc.png
share/icons/Rodent/48x48/misc/debian.png
share/icons/Rodent/48x48/misc/f-memory.png
share/icons/Rodent/48x48/misc/firewall.png
share/icons/Rodent/48x48/misc/fs-win.png
+share/icons/Rodent/48x48/misc/icon_view.png
+share/icons/Rodent/48x48/misc/menueditor.png
share/icons/Rodent/48x48/misc/money.png
share/icons/Rodent/48x48/misc/news.png
share/icons/Rodent/48x48/misc/notes.png
share/icons/Rodent/48x48/misc/root_terminal.png
+share/icons/Rodent/48x48/misc/run.png
+share/icons/Rodent/48x48/misc/settings.png
+share/icons/Rodent/48x48/misc/sm.png
+share/icons/Rodent/48x48/misc/sound.png
+share/icons/Rodent/48x48/misc/tabwin.png
+share/icons/Rodent/48x48/misc/taskbar.png
+share/icons/Rodent/48x48/misc/taskmanager.png
+share/icons/Rodent/48x48/misc/ui.png
share/icons/Rodent/48x48/misc/usb_key.png
share/icons/Rodent/48x48/misc/webcam.png
+share/icons/Rodent/48x48/misc/wksp.png
+share/icons/Rodent/48x48/misc/wm.png
+share/icons/Rodent/48x48/misc/xfce4-appfinder.png
share/icons/Rodent/48x48/stock/media-backward.png
share/icons/Rodent/48x48/stock/media-eject.png
share/icons/Rodent/48x48/stock/media-forward.png
@@ -486,6 +677,7 @@ share/icons/Rodent/48x48/stock/media-pause.png
share/icons/Rodent/48x48/stock/media-play.png
share/icons/Rodent/48x48/stock/media-prev.png
share/icons/Rodent/48x48/stock/media-record.png
+share/icons/Rodent/48x48/stock/media-shuffle.png
share/icons/Rodent/48x48/stock/media-stop.png
share/icons/Rodent/48x48/stock/rox-select.png
share/icons/Rodent/48x48/stock/rox-show-details.png
@@ -524,9 +716,14 @@ share/icons/Rodent/48x48/stock/stock_edit.png
share/icons/Rodent/48x48/stock/stock_epiphany-bookmark-page.png
share/icons/Rodent/48x48/stock/stock_execute.png
share/icons/Rodent/48x48/stock/stock_export.png
+share/icons/Rodent/48x48/stock/stock_file-properties.png
share/icons/Rodent/48x48/stock/stock_find-and-replace.png
share/icons/Rodent/48x48/stock/stock_find.png
share/icons/Rodent/48x48/stock/stock_floppy.png
+share/icons/Rodent/48x48/stock/stock_folder-copy.png
+share/icons/Rodent/48x48/stock/stock_folder-move.png
+share/icons/Rodent/48x48/stock/stock_folder-properties.png
+share/icons/Rodent/48x48/stock/stock_folder.png
share/icons/Rodent/48x48/stock/stock_fullscreen.png
share/icons/Rodent/48x48/stock/stock_go-back.png
share/icons/Rodent/48x48/stock/stock_go-down.png
@@ -560,12 +757,14 @@ share/icons/Rodent/48x48/stock/stock_mic.png
share/icons/Rodent/48x48/stock/stock_missing-image.png
share/icons/Rodent/48x48/stock/stock_multimedia.png
share/icons/Rodent/48x48/stock/stock_network.png
+share/icons/Rodent/48x48/stock/stock_new-dir.png
share/icons/Rodent/48x48/stock/stock_new-tab.png
share/icons/Rodent/48x48/stock/stock_new.png
share/icons/Rodent/48x48/stock/stock_no.png
share/icons/Rodent/48x48/stock/stock_ok.png
share/icons/Rodent/48x48/stock/stock_open.png
share/icons/Rodent/48x48/stock/stock_paste.png
+share/icons/Rodent/48x48/stock/stock_pastelink.png
share/icons/Rodent/48x48/stock/stock_preferences.png
share/icons/Rodent/48x48/stock/stock_print-preview.png
share/icons/Rodent/48x48/stock/stock_print.png
@@ -574,6 +773,7 @@ share/icons/Rodent/48x48/stock/stock_quit.png
share/icons/Rodent/48x48/stock/stock_redo.png
share/icons/Rodent/48x48/stock/stock_refresh.png
share/icons/Rodent/48x48/stock/stock_remove.png
+share/icons/Rodent/48x48/stock/stock_repeat.png
share/icons/Rodent/48x48/stock/stock_reset.png
share/icons/Rodent/48x48/stock/stock_revert-to-saved.png
share/icons/Rodent/48x48/stock/stock_run.png
@@ -627,11 +827,13 @@ share/icons/Rodent/scalable/apps/gnome-graphics.svg
share/icons/Rodent/scalable/apps/gnome-help.svg
share/icons/Rodent/scalable/apps/gnome-info.svg
share/icons/Rodent/scalable/apps/gnome-joystick.svg
+share/icons/Rodent/scalable/apps/gnome-library.svg
share/icons/Rodent/scalable/apps/gnome-lockscreen.svg
share/icons/Rodent/scalable/apps/gnome-logout.svg
share/icons/Rodent/scalable/apps/gnome-media-player-icon.svg
share/icons/Rodent/scalable/apps/gnome-multimedia.svg
share/icons/Rodent/scalable/apps/gnome-other.svg
+share/icons/Rodent/scalable/apps/gnome-package.svg
share/icons/Rodent/scalable/apps/gnome-pdf.svg
share/icons/Rodent/scalable/apps/gnome-searchtool.svg
share/icons/Rodent/scalable/apps/gnome-settings.svg
@@ -720,6 +922,10 @@ share/icons/Rodent/scalable/emblems/emblem-sound.svg
share/icons/Rodent/scalable/emblems/emblem-symbolic-link.svg
share/icons/Rodent/scalable/emblems/emblem-urgent.svg
share/icons/Rodent/scalable/emblems/emblem-web.svg
+share/icons/Rodent/scalable/filesystems/blockdevice.svg
+share/icons/Rodent/scalable/filesystems/chardevice.svg
+share/icons/Rodent/scalable/filesystems/core.svg
+share/icons/Rodent/scalable/filesystems/directory.svg
share/icons/Rodent/scalable/filesystems/gnome-fs-blockdev.svg
share/icons/Rodent/scalable/filesystems/gnome-fs-client.svg
share/icons/Rodent/scalable/filesystems/gnome-fs-desktop.svg
@@ -743,9 +949,106 @@ share/icons/Rodent/scalable/filesystems/mime-inode:chardevice.svg
share/icons/Rodent/scalable/filesystems/mime-inode:core.svg
share/icons/Rodent/scalable/filesystems/mime-inode:directory.svg
share/icons/Rodent/scalable/filesystems/mime-inode:mount-point.svg
+share/icons/Rodent/scalable/filesystems/mount-point.svg
share/icons/Rodent/scalable/filesystems/network_fs.svg
share/icons/Rodent/scalable/filesystems/open_folder.svg
-share/icons/Rodent/scalable/mimetypes/gnome-library.svg
+share/icons/Rodent/scalable/filesystems/user-home.svg
+share/icons/Rodent/scalable/mimetypes/application-msword.svg
+share/icons/Rodent/scalable/mimetypes/application-octet-stream.svg
+share/icons/Rodent/scalable/mimetypes/application-ogg.svg
+share/icons/Rodent/scalable/mimetypes/application-pdf.svg
+share/icons/Rodent/scalable/mimetypes/application-pgp-encrypted.svg
+share/icons/Rodent/scalable/mimetypes/application-pgp-keys.svg
+share/icons/Rodent/scalable/mimetypes/application-pgp.svg
+share/icons/Rodent/scalable/mimetypes/application-postscript.svg
+share/icons/Rodent/scalable/mimetypes/application-qif.svg
+share/icons/Rodent/scalable/mimetypes/application-rhythmbox-effect.svg
+share/icons/Rodent/scalable/mimetypes/application-rhythmbox-playlist.svg
+share/icons/Rodent/scalable/mimetypes/application-rtf.svg
+share/icons/Rodent/scalable/mimetypes/application-smil.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.ms-excel.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.ms-powerpoint.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.ms-word.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.rn-realmedia.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.stardivision.calc.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.stardivision.chart.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.stardivision.impress.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.stardivision.writer.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.sun.xml.calc.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.sun.xml.chart.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.sun.xml.draw.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.sun.xml.impress.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.sun.xml.writer.svg
+share/icons/Rodent/scalable/mimetypes/application-x-abiword.svg
+share/icons/Rodent/scalable/mimetypes/application-x-archive.svg
+share/icons/Rodent/scalable/mimetypes/application-x-arj.svg
+share/icons/Rodent/scalable/mimetypes/application-x-blender.svg
+share/icons/Rodent/scalable/mimetypes/application-x-bzip-compressed-tar.svg
+share/icons/Rodent/scalable/mimetypes/application-x-bzip.svg
+share/icons/Rodent/scalable/mimetypes/application-x-cd-image.svg
+share/icons/Rodent/scalable/mimetypes/application-x-compress.svg
+share/icons/Rodent/scalable/mimetypes/application-x-compressed-tar.svg
+share/icons/Rodent/scalable/mimetypes/application-x-cpio-compressed.svg
+share/icons/Rodent/scalable/mimetypes/application-x-cpio.svg
+share/icons/Rodent/scalable/mimetypes/application-x-deb.svg
+share/icons/Rodent/scalable/mimetypes/application-x-desktop.svg
+share/icons/Rodent/scalable/mimetypes/application-x-dia-diagram.svg
+share/icons/Rodent/scalable/mimetypes/application-x-dvi.svg
+share/icons/Rodent/scalable/mimetypes/application-x-executable.svg
+share/icons/Rodent/scalable/mimetypes/application-x-font-asm.svg
+share/icons/Rodent/scalable/mimetypes/application-x-font-bdf.svg
+share/icons/Rodent/scalable/mimetypes/application-x-font-linux-psf.svg
+share/icons/Rodent/scalable/mimetypes/application-x-font-pcf.svg
+share/icons/Rodent/scalable/mimetypes/application-x-font-ttf.svg
+share/icons/Rodent/scalable/mimetypes/application-x-gettext-translation.svg
+share/icons/Rodent/scalable/mimetypes/application-x-glade.svg
+share/icons/Rodent/scalable/mimetypes/application-x-gnucash.svg
+share/icons/Rodent/scalable/mimetypes/application-x-gnumeric.svg
+share/icons/Rodent/scalable/mimetypes/application-x-gtktalog.svg
+share/icons/Rodent/scalable/mimetypes/application-x-gzip.svg
+share/icons/Rodent/scalable/mimetypes/application-x-kde-app-info.svg
+share/icons/Rodent/scalable/mimetypes/application-x-killustrator.svg
+share/icons/Rodent/scalable/mimetypes/application-x-kpresenter.svg
+share/icons/Rodent/scalable/mimetypes/application-x-kspread.svg
+share/icons/Rodent/scalable/mimetypes/application-x-kword.svg
+share/icons/Rodent/scalable/mimetypes/application-x-lha.svg
+share/icons/Rodent/scalable/mimetypes/application-x-object.svg
+share/icons/Rodent/scalable/mimetypes/application-x-perl.svg
+share/icons/Rodent/scalable/mimetypes/application-x-php.svg
+share/icons/Rodent/scalable/mimetypes/application-x-python-bytecode.svg
+share/icons/Rodent/scalable/mimetypes/application-x-python.svg
+share/icons/Rodent/scalable/mimetypes/application-x-qw.svg
+share/icons/Rodent/scalable/mimetypes/application-x-rar.svg
+share/icons/Rodent/scalable/mimetypes/application-x-reject.svg
+share/icons/Rodent/scalable/mimetypes/application-x-rpm.svg
+share/icons/Rodent/scalable/mimetypes/application-x-share-library-la.svg
+share/icons/Rodent/scalable/mimetypes/application-x-sharedlib.svg
+share/icons/Rodent/scalable/mimetypes/application-x-shellscript.svg
+share/icons/Rodent/scalable/mimetypes/application-x-shockwave-flash.svg
+share/icons/Rodent/scalable/mimetypes/application-x-smil.svg
+share/icons/Rodent/scalable/mimetypes/application-x-tar.svg
+share/icons/Rodent/scalable/mimetypes/application-x-tex.svg
+share/icons/Rodent/scalable/mimetypes/application-x-trash.svg
+share/icons/Rodent/scalable/mimetypes/application-zip.svg
+share/icons/Rodent/scalable/mimetypes/application.svg
+share/icons/Rodent/scalable/mimetypes/audio-ac3.svg
+share/icons/Rodent/scalable/mimetypes/audio-basic.svg
+share/icons/Rodent/scalable/mimetypes/audio-midi.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-aiff.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-it.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-midi.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-mod.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-mp3.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-mpegurl.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-pn-realaudio.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-s3m.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-stm.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-ulaw.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-voc.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-wav.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-xi.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-xm.svg
+share/icons/Rodent/scalable/mimetypes/audio.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-application-msword.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-application-octet-stream.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-application-ogg.svg
@@ -761,6 +1064,7 @@ share/icons/Rodent/scalable/mimetypes/gnome-mime-application-rtf.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-application-smil.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-application-vnd.ms-excel.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-application-vnd.ms-powerpoint.svg
+share/icons/Rodent/scalable/mimetypes/gnome-mime-application-vnd.ms-word.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-application-vnd.stardivision.calc.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-application-vnd.stardivision.chart.svg
@@ -846,6 +1150,7 @@ share/icons/Rodent/scalable/mimetypes/gnome-mime-image-gif.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-image-ief.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-image-jpeg.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-image-png.svg
+share/icons/Rodent/scalable/mimetypes/gnome-mime-image-svg+xml.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-image-svg.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-image-tiff.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-image-x-3ds.svg
@@ -909,7 +1214,31 @@ share/icons/Rodent/scalable/mimetypes/gnome-mime-x-directory-smb-server.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-x-directory-smb-share.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-x-directory-smb-workgroup.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-x-font-afm.svg
-share/icons/Rodent/scalable/mimetypes/gnome-package.svg
+share/icons/Rodent/scalable/mimetypes/gnome-mime-x-gdesklets-display.svg
+share/icons/Rodent/scalable/mimetypes/image-bmp.svg
+share/icons/Rodent/scalable/mimetypes/image-gif.svg
+share/icons/Rodent/scalable/mimetypes/image-ief.svg
+share/icons/Rodent/scalable/mimetypes/image-jpeg.svg
+share/icons/Rodent/scalable/mimetypes/image-png.svg
+share/icons/Rodent/scalable/mimetypes/image-svg+xml.svg
+share/icons/Rodent/scalable/mimetypes/image-svg.svg
+share/icons/Rodent/scalable/mimetypes/image-tiff.svg
+share/icons/Rodent/scalable/mimetypes/image-x-3ds.svg
+share/icons/Rodent/scalable/mimetypes/image-x-applix-graphic.svg
+share/icons/Rodent/scalable/mimetypes/image-x-cmu-raster.svg
+share/icons/Rodent/scalable/mimetypes/image-x-portable-anymap.svg
+share/icons/Rodent/scalable/mimetypes/image-x-portable-bitmap.svg
+share/icons/Rodent/scalable/mimetypes/image-x-portable-greymap.svg
+share/icons/Rodent/scalable/mimetypes/image-x-portable-pixmap.svg
+share/icons/Rodent/scalable/mimetypes/image-x-psd.svg
+share/icons/Rodent/scalable/mimetypes/image-x-rgb.svg
+share/icons/Rodent/scalable/mimetypes/image-x-tga.svg
+share/icons/Rodent/scalable/mimetypes/image-x-xbitmap.svg
+share/icons/Rodent/scalable/mimetypes/image-x-xcf.svg
+share/icons/Rodent/scalable/mimetypes/image-x-xfig.svg
+share/icons/Rodent/scalable/mimetypes/image-x-xpixmap.svg
+share/icons/Rodent/scalable/mimetypes/image-x-xwindowdum.svg
+share/icons/Rodent/scalable/mimetypes/image.svg
share/icons/Rodent/scalable/mimetypes/mime-application.svg
share/icons/Rodent/scalable/mimetypes/mime-application:msword.svg
share/icons/Rodent/scalable/mimetypes/mime-application:octet-stream.svg
@@ -926,6 +1255,7 @@ share/icons/Rodent/scalable/mimetypes/mime-application:rtf.svg
share/icons/Rodent/scalable/mimetypes/mime-application:smil.svg
share/icons/Rodent/scalable/mimetypes/mime-application:vnd.ms-excel.svg
share/icons/Rodent/scalable/mimetypes/mime-application:vnd.ms-powerpoint.svg
+share/icons/Rodent/scalable/mimetypes/mime-application:vnd.ms-word.svg
share/icons/Rodent/scalable/mimetypes/mime-application:vnd.rn-realmedia.svg
share/icons/Rodent/scalable/mimetypes/mime-application:vnd.stardivision.calc.svg
share/icons/Rodent/scalable/mimetypes/mime-application:vnd.stardivision.chart.svg
@@ -1011,6 +1341,7 @@ share/icons/Rodent/scalable/mimetypes/mime-image:gif.svg
share/icons/Rodent/scalable/mimetypes/mime-image:ief.svg
share/icons/Rodent/scalable/mimetypes/mime-image:jpeg.svg
share/icons/Rodent/scalable/mimetypes/mime-image:png.svg
+share/icons/Rodent/scalable/mimetypes/mime-image:svg+xml.svg
share/icons/Rodent/scalable/mimetypes/mime-image:svg.svg
share/icons/Rodent/scalable/mimetypes/mime-image:tiff.svg
share/icons/Rodent/scalable/mimetypes/mime-image:x-3ds.svg
@@ -1073,19 +1404,76 @@ share/icons/Rodent/scalable/mimetypes/mime-x:directory-smb-server.svg
share/icons/Rodent/scalable/mimetypes/mime-x:directory-smb-share.svg
share/icons/Rodent/scalable/mimetypes/mime-x:directory-smb-workgroup.svg
share/icons/Rodent/scalable/mimetypes/mime-x:font-afm.svg
-share/icons/Rodent/scalable/mimetypes/stock_run.svg
+share/icons/Rodent/scalable/mimetypes/mime-x:gdesklets-display.svg
+share/icons/Rodent/scalable/mimetypes/text-css.svg
+share/icons/Rodent/scalable/mimetypes/text-html.svg
+share/icons/Rodent/scalable/mimetypes/text-sgml.svg
+share/icons/Rodent/scalable/mimetypes/text-x-authors.svg
+share/icons/Rodent/scalable/mimetypes/text-x-c++.svg
+share/icons/Rodent/scalable/mimetypes/text-x-c++src.svg
+share/icons/Rodent/scalable/mimetypes/text-x-c-header.svg
+share/icons/Rodent/scalable/mimetypes/text-x-c.svg
+share/icons/Rodent/scalable/mimetypes/text-x-chdr.svg
+share/icons/Rodent/scalable/mimetypes/text-x-copying.svg
+share/icons/Rodent/scalable/mimetypes/text-x-credits.svg
+share/icons/Rodent/scalable/mimetypes/text-x-csh.svg
+share/icons/Rodent/scalable/mimetypes/text-x-csharp.svg
+share/icons/Rodent/scalable/mimetypes/text-x-csrc.svg
+share/icons/Rodent/scalable/mimetypes/text-x-gettext-translation.svg
+share/icons/Rodent/scalable/mimetypes/text-x-haskell.svg
+share/icons/Rodent/scalable/mimetypes/text-x-install.svg
+share/icons/Rodent/scalable/mimetypes/text-x-java.svg
+share/icons/Rodent/scalable/mimetypes/text-x-literate-haskell.svg
+share/icons/Rodent/scalable/mimetypes/text-x-log.svg
+share/icons/Rodent/scalable/mimetypes/text-x-lyx.svg
+share/icons/Rodent/scalable/mimetypes/text-x-makefile.svg
+share/icons/Rodent/scalable/mimetypes/text-x-patch.svg
+share/icons/Rodent/scalable/mimetypes/text-x-readme.svg
+share/icons/Rodent/scalable/mimetypes/text-x-scheme.svg
+share/icons/Rodent/scalable/mimetypes/text-x-sh.svg
+share/icons/Rodent/scalable/mimetypes/text-x-tex.svg
+share/icons/Rodent/scalable/mimetypes/text-x-troff-man.svg
+share/icons/Rodent/scalable/mimetypes/text-x-vcalendar.svg
+share/icons/Rodent/scalable/mimetypes/text-x-vcard.svg
+share/icons/Rodent/scalable/mimetypes/text-x-xslt.svg
+share/icons/Rodent/scalable/mimetypes/text-x-zsh.svg
+share/icons/Rodent/scalable/mimetypes/text-xml.svg
+share/icons/Rodent/scalable/mimetypes/text.svg
+share/icons/Rodent/scalable/mimetypes/video-mpeg.svg
+share/icons/Rodent/scalable/mimetypes/video-quicktime.svg
+share/icons/Rodent/scalable/mimetypes/video-x-ms-asf.svg
+share/icons/Rodent/scalable/mimetypes/video-x-ms-wmv.svg
+share/icons/Rodent/scalable/mimetypes/video-x-msvideo.svg
+share/icons/Rodent/scalable/mimetypes/video.svg
+share/icons/Rodent/scalable/mimetypes/x-directory-nfs-server.svg
+share/icons/Rodent/scalable/mimetypes/x-directory-smb-server.svg
+share/icons/Rodent/scalable/mimetypes/x-directory-smb-share.svg
+share/icons/Rodent/scalable/mimetypes/x-directory-smb-workgroup.svg
+share/icons/Rodent/scalable/mimetypes/x-font-afm.svg
share/icons/Rodent/scalable/mimetypes/x-gdesklets-display.svg
share/icons/Rodent/scalable/misc/calc.svg
share/icons/Rodent/scalable/misc/debian.svg
share/icons/Rodent/scalable/misc/f-memory.svg
share/icons/Rodent/scalable/misc/firewall.svg
share/icons/Rodent/scalable/misc/fs-win.svg
+share/icons/Rodent/scalable/misc/icon_view.svg
share/icons/Rodent/scalable/misc/money.svg
share/icons/Rodent/scalable/misc/news.svg
share/icons/Rodent/scalable/misc/notes.svg
share/icons/Rodent/scalable/misc/root_terminal.svg
+share/icons/Rodent/scalable/misc/run.svg
+share/icons/Rodent/scalable/misc/settings.svg
+share/icons/Rodent/scalable/misc/sm.svg
+share/icons/Rodent/scalable/misc/sound.svg
+share/icons/Rodent/scalable/misc/tabwin.svg
+share/icons/Rodent/scalable/misc/taskbar.svg
+share/icons/Rodent/scalable/misc/taskmanager.svg
+share/icons/Rodent/scalable/misc/ui.svg
share/icons/Rodent/scalable/misc/usb_key.svg
share/icons/Rodent/scalable/misc/webcam.svg
+share/icons/Rodent/scalable/misc/wksp.svg
+share/icons/Rodent/scalable/misc/wm.svg
+share/icons/Rodent/scalable/misc/xfce4-appfinder.svg
share/icons/Rodent/scalable/stock/m-font.svg
share/icons/Rodent/scalable/stock/m-lock.svg
share/icons/Rodent/scalable/stock/m-spreadsheet.svg
@@ -1097,6 +1485,7 @@ share/icons/Rodent/scalable/stock/media-pause.svg
share/icons/Rodent/scalable/stock/media-play.svg
share/icons/Rodent/scalable/stock/media-prev.svg
share/icons/Rodent/scalable/stock/media-record.svg
+share/icons/Rodent/scalable/stock/media-shuffle.svg
share/icons/Rodent/scalable/stock/media-stop.svg
share/icons/Rodent/scalable/stock/rox-select.svg
share/icons/Rodent/scalable/stock/rox-show-details.svg
@@ -1134,9 +1523,14 @@ share/icons/Rodent/scalable/stock/stock_edit.svg
share/icons/Rodent/scalable/stock/stock_epiphany-bookmark-page.svg
share/icons/Rodent/scalable/stock/stock_execute.svg
share/icons/Rodent/scalable/stock/stock_export.svg
+share/icons/Rodent/scalable/stock/stock_file-properties.svg
share/icons/Rodent/scalable/stock/stock_find-and-replace.svg
share/icons/Rodent/scalable/stock/stock_find.svg
share/icons/Rodent/scalable/stock/stock_floppy.svg
+share/icons/Rodent/scalable/stock/stock_folder-copy.svg
+share/icons/Rodent/scalable/stock/stock_folder-move.svg
+share/icons/Rodent/scalable/stock/stock_folder-properties.svg
+share/icons/Rodent/scalable/stock/stock_folder.svg
share/icons/Rodent/scalable/stock/stock_fullscreen.svg
share/icons/Rodent/scalable/stock/stock_go-back.svg
share/icons/Rodent/scalable/stock/stock_go-down.svg
@@ -1184,6 +1578,7 @@ share/icons/Rodent/scalable/stock/stock_quit.svg
share/icons/Rodent/scalable/stock/stock_redo.svg
share/icons/Rodent/scalable/stock/stock_refresh.svg
share/icons/Rodent/scalable/stock/stock_remove.svg
+share/icons/Rodent/scalable/stock/stock_repeat.svg
share/icons/Rodent/scalable/stock/stock_reset.svg
share/icons/Rodent/scalable/stock/stock_revert-to-saved.svg
share/icons/Rodent/scalable/stock/stock_run.svg
diff --git a/graphics/xfce4-icon-theme/buildlink3.mk b/graphics/xfce4-icon-theme/buildlink3.mk
index 587fe8c9af6..f297c0cbeb2 100644
--- a/graphics/xfce4-icon-theme/buildlink3.mk
+++ b/graphics/xfce4-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2007/01/23 11:53:46 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2007/04/12 09:55:09 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_ICON_THEME_BUILDLINK3_MK:= ${XFCE4_ICON_THEME_BUILDLINK3_MK}+
@@ -12,10 +12,12 @@ BUILDLINK_PACKAGES+= xfce4-icon-theme
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-icon-theme
.if ${XFCE4_ICON_THEME_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-icon-theme+= xfce4-icon-theme>=4.2.4
+BUILDLINK_API_DEPENDS.xfce4-icon-theme+= xfce4-icon-theme>=4.4.1
BUILDLINK_PKGSRCDIR.xfce4-icon-theme?= ../../graphics/xfce4-icon-theme
.endif # XFCE4_ICON_THEME_BUILDLINK3_MK
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/xfce4-icon-theme/distinfo b/graphics/xfce4-icon-theme/distinfo
index 8218d7719c3..46320b0753c 100644
--- a/graphics/xfce4-icon-theme/distinfo
+++ b/graphics/xfce4-icon-theme/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2007/01/23 11:53:46 martti Exp $
+$NetBSD: distinfo,v 1.7 2007/04/12 09:55:09 martti Exp $
-SHA1 (xfce4-icon-theme-4.2.4.tar.gz) = 0f991041d1e00db6c2d2bb61930fef324e12a2a1
-RMD160 (xfce4-icon-theme-4.2.4.tar.gz) = 17fde5f3efed4431f837380ab24ff9d8c4aeb040
-Size (xfce4-icon-theme-4.2.4.tar.gz) = 1488480 bytes
+SHA1 (xfce4-icon-theme-4.4.1.tar.bz2) = 3966fe9d2f5d9097f52429e62a539e93b11d9883
+RMD160 (xfce4-icon-theme-4.4.1.tar.bz2) = eb84a2dc8d81826a54bdc8c1409a98e594638747
+Size (xfce4-icon-theme-4.4.1.tar.bz2) = 1862232 bytes
diff --git a/graphics/xfce4-iconbox/DESCR b/graphics/xfce4-iconbox/DESCR
deleted file mode 100644
index c28d1199014..00000000000
--- a/graphics/xfce4-iconbox/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Icon displayer for Xfce.
diff --git a/graphics/xfce4-iconbox/Makefile b/graphics/xfce4-iconbox/Makefile
deleted file mode 100644
index e1219ecae98..00000000000
--- a/graphics/xfce4-iconbox/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2007/01/23 11:53:46 martti Exp $
-
-.include "../../meta-pkgs/xfce4/Makefile.common"
-
-DISTNAME= xfce4-iconbox-${XFCE4_VERSION}
-#PKGREVISION= 1
-CATEGORIES= graphics
-COMMENT= Xfce icon displayer
-
-BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xfce4-iconbox/PLIST b/graphics/xfce4-iconbox/PLIST
deleted file mode 100644
index e6d6319fc85..00000000000
--- a/graphics/xfce4-iconbox/PLIST
+++ /dev/null
@@ -1,52 +0,0 @@
-@comment $NetBSD: PLIST,v 1.13 2007/01/23 11:53:46 martti Exp $
-bin/xfce4-iconbox
-lib/xfce4/mcs-plugins/xfce4-iconbox_settings.la
-share/applications/xfce-iconbox-settings.desktop
-share/icons/hicolor/48x48/apps/xfce4-iconbox.png
-share/icons/hicolor/scalable/apps/xfce4-iconbox.svg
-share/locale/af/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/ar/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/az/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/be/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/bg/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/bn_IN/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/ca/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/cs/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/da/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/de/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/el/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/es/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/es_MX/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/et/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/eu/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/fa/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/fi/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/fr/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/gu/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/he/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/hi/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/hu/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/it/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/ja/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/ko/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/ku/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/lt/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/ms/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/nb_NO/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/nl/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/pa/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/pl/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/pt_PT/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/ro/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/ru/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/sk/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/sq/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/sv/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/ta/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/tr/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/uk/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/vi/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-iconbox.mo
diff --git a/graphics/xfce4-iconbox/buildlink3.mk b/graphics/xfce4-iconbox/buildlink3.mk
deleted file mode 100644
index a9b93317c9f..00000000000
--- a/graphics/xfce4-iconbox/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.18 2007/01/23 11:53:46 martti Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XFCE4_ICONBOX_BUILDLINK3_MK:= ${XFCE4_ICONBOX_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= xfce4-iconbox
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-iconbox}
-BUILDLINK_PACKAGES+= xfce4-iconbox
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-iconbox
-
-.if ${XFCE4_ICONBOX_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-iconbox+= xfce4-iconbox>=4.2.4
-BUILDLINK_PKGSRCDIR.xfce4-iconbox?= ../../graphics/xfce4-iconbox
-.endif # XFCE4_ICONBOX_BUILDLINK3_MK
-
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/xfce4-iconbox/distinfo b/graphics/xfce4-iconbox/distinfo
deleted file mode 100644
index 64d1da8f54c..00000000000
--- a/graphics/xfce4-iconbox/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.13 2007/01/23 11:53:46 martti Exp $
-
-SHA1 (xfce4-iconbox-4.2.4.tar.gz) = a48369bacedceaf599c0acd11184ca6e08a9a5c1
-RMD160 (xfce4-iconbox-4.2.4.tar.gz) = d5733c9451d951dce435b2da9b8efa3ef0d7bc05
-Size (xfce4-iconbox-4.2.4.tar.gz) = 431502 bytes
diff --git a/meta-pkgs/xfce4-extras/Makefile b/meta-pkgs/xfce4-extras/Makefile
index 0bc0f723e45..c5a479efeb9 100644
--- a/meta-pkgs/xfce4-extras/Makefile
+++ b/meta-pkgs/xfce4-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/01/23 11:53:46 martti Exp $
+# $NetBSD: Makefile,v 1.20 2007/04/12 09:55:11 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
@@ -17,25 +17,36 @@ WRKSRC= ${WRKDIR}
do-install:
@${DO_NADA}
+# Xfce
+.include "../../meta-pkgs/xfce4/buildlink3.mk"
+
+#
+# Do you want to have more plugins? See http://goodies.xfce.org/releases/
+# for all available plugins...
+#
+
# Additional plugins etc.
.include "../../audio/xfce4-xmms-plugin/buildlink3.mk"
-.include "../../graphics/xfce4-artwork/buildlink3.mk"
.include "../../misc/xfce4-weather-plugin/buildlink3.mk"
.include "../../net/xfce4-wavelan-plugin/buildlink3.mk"
-.include "../../time/xfce4-datetime-plugin/buildlink3.mk"
.include "../../sysutils/xfce4-cpugraph-plugin/buildlink3.mk"
.include "../../sysutils/xfce4-diskperf-plugin/buildlink3.mk"
.include "../../sysutils/xfce4-fsguard-plugin/buildlink3.mk"
-.include "../../sysutils/xfce4-minicmd-plugin/buildlink3.mk"
.include "../../sysutils/xfce4-netload-plugin/buildlink3.mk"
.include "../../sysutils/xfce4-quicklauncher-plugin/buildlink3.mk"
-.include "../../sysutils/xfce4-showdesktop-plugin/buildlink3.mk"
.include "../../sysutils/xfce4-systemload-plugin/buildlink3.mk"
.include "../../sysutils/xfce4-xkb-plugin/buildlink3.mk"
+.include "../../time/xfce4-datetime-plugin/buildlink3.mk"
.include "../../x11/xfce4-clipman-plugin/buildlink3.mk"
.include "../../x11/xfce4-notes-plugin/buildlink3.mk"
-.include "../../x11/xfce4-taskbar-plugin/buildlink3.mk"
-.include "../../x11/xfce4-windowlist-plugin/buildlink3.mk"
-.include "../../meta-pkgs/xfce4/buildlink3.mk"
+## WHAT TO DO WITH THESE?
+# .include "../../graphics/xfce4-artwork/buildlink3.mk"
+
+## CURRENTLY NO SUPPORT FOR 4.4
+# .include "../../sysutils/xfce4-minicmd-plugin/buildlink3.mk"
+# .include "../../sysutils/xfce4-showdesktop-plugin/buildlink3.mk"
+# .include "../../x11/xfce4-taskbar-plugin/buildlink3.mk"
+# .include "../../x11/xfce4-windowlist-plugin/buildlink3.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/xfce4-extras/PLIST b/meta-pkgs/xfce4-extras/PLIST
index 6e2f27f7a49..d8baefce540 100644
--- a/meta-pkgs/xfce4-extras/PLIST
+++ b/meta-pkgs/xfce4-extras/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/23 14:04:45 martti Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/12 09:55:11 martti Exp $
@comment This PLIST is intentionally left empty
diff --git a/meta-pkgs/xfce4/Makefile b/meta-pkgs/xfce4/Makefile
index db2463060d1..651d70aa73e 100644
--- a/meta-pkgs/xfce4/Makefile
+++ b/meta-pkgs/xfce4/Makefile
@@ -1,12 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2007/01/23 11:53:46 martti Exp $
+# $NetBSD: Makefile,v 1.26 2007/04/12 09:55:10 martti Exp $
.include "Makefile.common"
-XFCE4_VERSION= 4.2.4
-
DISTNAME= xfce4-${XFCE4_VERSION}
DISTFILES= # empty
-#PKGREVISION= 1
CATEGORIES= meta-pkgs
COMMENT= Xfce
@@ -20,21 +17,19 @@ do-install:
@${DO_NADA}
.include "../../audio/xfce4-mixer/buildlink3.mk"
+.include "../../editors/xfce4-mousepad/buildlink3.mk"
.include "../../graphics/xfce4-icon-theme/buildlink3.mk"
-.include "../../graphics/xfce4-iconbox/buildlink3.mk"
.include "../../print/xfce4-print/buildlink3.mk"
.include "../../sysutils/xfce4-appfinder/buildlink3.mk"
-.include "../../sysutils/xfce4-fm/buildlink3.mk"
-.include "../../sysutils/xfce4-systray/buildlink3.mk"
-.include "../../time/xfce4-calendar/buildlink3.mk"
+.include "../../sysutils/xfce4-xarchiver/buildlink3.mk"
+.include "../../time/xfce4-orage/buildlink3.mk"
.include "../../wm/xfce4-wm-themes/buildlink3.mk"
.include "../../wm/xfce4-wm/buildlink3.mk"
.include "../../x11/xfce4-desktop/buildlink3.mk"
.include "../../x11/xfce4-gtk2-engine/buildlink3.mk"
.include "../../x11/xfce4-panel/buildlink3.mk"
.include "../../x11/xfce4-session/buildlink3.mk"
-.include "../../x11/xfce4-toys/buildlink3.mk"
-.include "../../x11/xfce4-trigger-launcher/buildlink3.mk"
+.include "../../x11/xfce4-terminal/buildlink3.mk"
.include "../../x11/xfce4-utils/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common
index 237089b4cf8..f2c9ba74aa3 100644
--- a/meta-pkgs/xfce4/Makefile.common
+++ b/meta-pkgs/xfce4/Makefile.common
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile.common,v 1.33 2007/02/01 13:03:53 joerg Exp $
+# $NetBSD: Makefile.common,v 1.34 2007/04/12 09:55:11 martti Exp $
-MASTER_SITES= http://www.xfce.org/archive/xfce-4.2.4/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.2.4/src/
+MASTER_SITES= http://www.xfce.org/archive/xfce-4.4.1/src/
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= martti@NetBSD.org
HOMEPAGE= http://www.xfce.org/
-XFCE4_VERSION= 4.2.4
+XFCE4_VERSION= 4.4.1
# Do NOT put a PKGREVISION statement in this file!
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake pkg-config msgfmt
+USE_TOOLS+= gmake pkg-config msgfmt perl
.if ${MACHINE_ARCH} == "alpha"
GCC_REQD+= 3.0
@@ -21,6 +21,9 @@ GCC_REQD+= 3.0
XFCE4_EGBASE= ${PREFIX}/share/examples/xfce4
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
## # Use the latest GNU tar when the native tar is buggy
diff --git a/meta-pkgs/xfce4/PLIST b/meta-pkgs/xfce4/PLIST
index efadb39196c..d8baefce540 100644
--- a/meta-pkgs/xfce4/PLIST
+++ b/meta-pkgs/xfce4/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/26 10:29:52 martti Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/12 09:55:11 martti Exp $
@comment This PLIST is intentionally left empty
diff --git a/meta-pkgs/xfce4/buildlink3.mk b/meta-pkgs/xfce4/buildlink3.mk
index cd3b6d9735f..fcb892a5feb 100644
--- a/meta-pkgs/xfce4/buildlink3.mk
+++ b/meta-pkgs/xfce4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/01/23 11:53:46 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2007/04/12 09:55:11 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_BUILDLINK3_MK:= ${XFCE4_BUILDLINK3_MK}+
@@ -12,27 +12,28 @@ BUILDLINK_PACKAGES+= xfce4
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4
.if ${XFCE4_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4+= xfce4>=4.2.4
+BUILDLINK_API_DEPENDS.xfce4+= xfce4>=4.4.1
BUILDLINK_PKGSRCDIR.xfce4?= ../../meta-pkgs/xfce4
.endif # XFCE4_BUILDLINK3_MK
.include "../../audio/xfce4-mixer/buildlink3.mk"
+.include "../../editors/xfce4-mousepad/buildlink3.mk"
.include "../../graphics/xfce4-icon-theme/buildlink3.mk"
-.include "../../graphics/xfce4-iconbox/buildlink3.mk"
.include "../../print/xfce4-print/buildlink3.mk"
.include "../../sysutils/xfce4-appfinder/buildlink3.mk"
-.include "../../sysutils/xfce4-fm/buildlink3.mk"
-.include "../../sysutils/xfce4-systray/buildlink3.mk"
-.include "../../time/xfce4-calendar/buildlink3.mk"
+.include "../../sysutils/xfce4-xarchiver/buildlink3.mk"
+.include "../../time/xfce4-orage/buildlink3.mk"
.include "../../wm/xfce4-wm-themes/buildlink3.mk"
.include "../../wm/xfce4-wm/buildlink3.mk"
.include "../../x11/xfce4-desktop/buildlink3.mk"
.include "../../x11/xfce4-gtk2-engine/buildlink3.mk"
.include "../../x11/xfce4-panel/buildlink3.mk"
.include "../../x11/xfce4-session/buildlink3.mk"
-.include "../../x11/xfce4-toys/buildlink3.mk"
-.include "../../x11/xfce4-trigger-launcher/buildlink3.mk"
+.include "../../x11/xfce4-terminal/buildlink3.mk"
.include "../../x11/xfce4-utils/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index 068a330051f..2828f763e3e 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2006/04/17 13:46:14 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/04/12 09:55:11 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 0.4.9
+XFCE4_VERSION= 0.6.0
DISTNAME= xfce4-weather-plugin-${XFCE4_VERSION}
-PKGREVISION= 3
+#PKGREVISION= 1
CATEGORIES= misc
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/xfce4-weather-plugin/
COMMENT= Xfce weather plugin
+USE_TOOLS+= intltool
+
.include "../../x11/xfce4-panel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/xfce4-weather-plugin/PLIST b/misc/xfce4-weather-plugin/PLIST
index a074f720593..548a3f2dcf6 100644
--- a/misc/xfce4-weather-plugin/PLIST
+++ b/misc/xfce4-weather-plugin/PLIST
@@ -1,9 +1,20 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/17 07:07:29 jlam Exp $
-lib/xfce4/panel-plugins/libweather.la
-share/locale/de/LC_MESSAGES/xfce4-weather.mo
-share/locale/fr/LC_MESSAGES/xfce4-weather.mo
-share/locale/nl/LC_MESSAGES/xfce4-weather.mo
-share/xfce4/weather/icons/liquid/-.png
+@comment $NetBSD: PLIST,v 1.5 2007/04/12 09:55:11 martti Exp $
+libexec/xfce4/panel-plugins/xfce4-weather-plugin
+share/icons/hicolor/48x48/apps/xfce4-weather.png
+share/locale/ca/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/fi/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/gl/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/lt/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/nl/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/sk/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-weather-plugin.mo
+share/xfce4/panel-plugins/weather.desktop
+share/xfce4/weather/icons/liquid/0.png
share/xfce4/weather/icons/liquid/1.png
share/xfce4/weather/icons/liquid/10.png
share/xfce4/weather/icons/liquid/11.png
@@ -51,6 +62,7 @@ share/xfce4/weather/icons/liquid/6.png
share/xfce4/weather/icons/liquid/7.png
share/xfce4/weather/icons/liquid/8.png
share/xfce4/weather/icons/liquid/9.png
+share/xfce4/weather/icons/liquid/99.png
@dirrm share/xfce4/weather/icons/liquid
@dirrm share/xfce4/weather/icons
@dirrm share/xfce4/weather
diff --git a/misc/xfce4-weather-plugin/buildlink3.mk b/misc/xfce4-weather-plugin/buildlink3.mk
index 50b3dfaafdd..5ca25fd16d4 100644
--- a/misc/xfce4-weather-plugin/buildlink3.mk
+++ b/misc/xfce4-weather-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/10/12 09:24:19 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2007/04/12 09:55:11 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK:= ${XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= xfce4-weather-plugin
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-weather-plugin
.if ${XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-weather-plugin+= xfce4-weather-plugin>=0.4.9nb3
+BUILDLINK_API_DEPENDS.xfce4-weather-plugin+= xfce4-weather-plugin>=0.6.0
BUILDLINK_PKGSRCDIR.xfce4-weather-plugin?= ../../misc/xfce4-weather-plugin
.endif # XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK
diff --git a/misc/xfce4-weather-plugin/distinfo b/misc/xfce4-weather-plugin/distinfo
index 619d9e41a18..7a676459a7d 100644
--- a/misc/xfce4-weather-plugin/distinfo
+++ b/misc/xfce4-weather-plugin/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/12/21 15:15:52 martti Exp $
+$NetBSD: distinfo,v 1.6 2007/04/12 09:55:11 martti Exp $
-SHA1 (xfce4-weather-plugin-0.4.9.tar.gz) = 32aac39dbf845b46ed1d6f09447fdc9fc623567b
-RMD160 (xfce4-weather-plugin-0.4.9.tar.gz) = 0c7048a46e21cb12408c284b9be66c27db85c71f
-Size (xfce4-weather-plugin-0.4.9.tar.gz) = 642215 bytes
-SHA1 (patch-aa) = e1eead0f08a8d866294f26455a5dc9c1a9496315
+SHA1 (xfce4-weather-plugin-0.6.0.tar.bz2) = 5420955693338052b3b6ddca10609072d53aa2e3
+RMD160 (xfce4-weather-plugin-0.6.0.tar.bz2) = 28f5b7029242ce87dd2784b4cd22741a451e7e75
+Size (xfce4-weather-plugin-0.6.0.tar.bz2) = 537194 bytes
diff --git a/misc/xfce4-weather-plugin/patches/patch-aa b/misc/xfce4-weather-plugin/patches/patch-aa
deleted file mode 100644
index 0feaebc7073..00000000000
--- a/misc/xfce4-weather-plugin/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/12/21 15:15:52 martti Exp $
-
---- panel-plugin/http_client.h.orig 2005-12-21 15:10:56.000000000 +0200
-+++ panel-plugin/http_client.h 2005-12-21 15:11:06.000000000 +0200
-@@ -1,7 +1,7 @@
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netdb.h>
- #include <netinet/in.h>
--#include <sys/types.h>
- #include <string.h>
- #include <unistd.h>
-
diff --git a/net/xfce4-wavelan-plugin/Makefile b/net/xfce4-wavelan-plugin/Makefile
index 6ad1761f463..a4e6bc36c5b 100644
--- a/net/xfce4-wavelan-plugin/Makefile
+++ b/net/xfce4-wavelan-plugin/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.11 2006/04/17 13:46:14 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/04/12 09:55:11 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 0.4.1
+XFCE4_VERSION= 0.5.4
DISTNAME= xfce4-wavelan-plugin-${XFCE4_VERSION}
-PKGREVISION= 4
+#PKGREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/xfce4-wavelan-plugin/
+EXTRACT_SUFX= .tar.gz
COMMENT= Xfce WLAN plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/net/xfce4-wavelan-plugin/PLIST b/net/xfce4-wavelan-plugin/PLIST
index e4dbd5bf580..c00010003b7 100644
--- a/net/xfce4-wavelan-plugin/PLIST
+++ b/net/xfce4-wavelan-plugin/PLIST
@@ -1,2 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:50 jlam Exp $
-lib/xfce4/panel-plugins/libwavelan.la
+@comment $NetBSD: PLIST,v 1.3 2007/04/12 09:55:11 martti Exp $
+libexec/xfce4/panel-plugins/xfce4-wavelan-plugin
+share/locale/de/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/it/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/ja/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/ko/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/locale/vi/LC_MESSAGES/xfce4-wavelan-plugin.mo
+share/xfce4/panel-plugins/wavelan.desktop
diff --git a/net/xfce4-wavelan-plugin/buildlink3.mk b/net/xfce4-wavelan-plugin/buildlink3.mk
index 8c4d7e2233c..6320d866b34 100644
--- a/net/xfce4-wavelan-plugin/buildlink3.mk
+++ b/net/xfce4-wavelan-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/10/12 09:24:19 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2007/04/12 09:55:11 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:= ${XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK}+
@@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+= xfce4-wavelan-plugin
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-wavelan-plugin
.if ${XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-wavelan-plugin+= xfce4-wavelan-plugin>=0.4.1nb4
+BUILDLINK_API_DEPENDS.xfce4-wavelan-plugin+= xfce4-wavelan-plugin>=0.5.3
BUILDLINK_PKGSRCDIR.xfce4-wavelan-plugin?= ../../net/xfce4-wavelan-plugin
.endif # XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK
.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/xfce4-wavelan-plugin/distinfo b/net/xfce4-wavelan-plugin/distinfo
index 3d44282461b..3ae785e7fd4 100644
--- a/net/xfce4-wavelan-plugin/distinfo
+++ b/net/xfce4-wavelan-plugin/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:14:07 agc Exp $
+$NetBSD: distinfo,v 1.6 2007/04/12 09:55:12 martti Exp $
-SHA1 (xfce4-wavelan-plugin-0.4.1.tar.gz) = 01dc3b0fda236c5a55cd69ddb9ddddea57b04ea9
-RMD160 (xfce4-wavelan-plugin-0.4.1.tar.gz) = 5a1a4b849dc71e5ed29163c024a144c5a6e2ddea
-Size (xfce4-wavelan-plugin-0.4.1.tar.gz) = 528911 bytes
-SHA1 (patch-aa) = 6005151b620377f0db44dd4ac812f6f0d04dbf3a
+SHA1 (xfce4-wavelan-plugin-0.5.4.tar.gz) = d45d8a13a1512fdb74aacf09c5b6ae99c4743fdd
+RMD160 (xfce4-wavelan-plugin-0.5.4.tar.gz) = 30d4893812004cfe0cf115790eb72daf92b4db5f
+Size (xfce4-wavelan-plugin-0.5.4.tar.gz) = 596378 bytes
diff --git a/net/xfce4-wavelan-plugin/patches/patch-aa b/net/xfce4-wavelan-plugin/patches/patch-aa
deleted file mode 100644
index 3663f3ec884..00000000000
--- a/net/xfce4-wavelan-plugin/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/02/10 12:22:29 martti Exp $
-
---- panel-plugin/wi_bsd.c.orig 2005-02-10 14:08:46.000000000 +0200
-+++ panel-plugin/wi_bsd.c 2005-02-10 14:16:01.000000000 +0200
-@@ -49,4 +49,8 @@
- #ifdef __NetBSD__
-+#if __NetBSD_Version__ > 106250000
- #include <net80211/ieee80211.h>
- #include <net80211/ieee80211_ioctl.h>
-+#else
-+#include <net/if_ieee80211.h>
-+#endif
- #include <dev/ic/wi_ieee.h>
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index f5c1d9a569f..74e7d1c067f 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/01/23 11:53:46 martti Exp $
+# $NetBSD: Makefile,v 1.20 2007/04/12 09:55:12 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
@@ -8,6 +8,7 @@ DISTNAME= xfprint-${XFCE4_VERSION}
CATEGORIES= print
COMMENT= Xfce print dialog
+CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc
CONFIGURE_ARGS+= --with-printcap=/etc/printcap
.include "options.mk"
diff --git a/print/xfce4-print/PLIST b/print/xfce4-print/PLIST
index 20452773f3c..626dbd62bea 100644
--- a/print/xfce4-print/PLIST
+++ b/print/xfce4-print/PLIST
@@ -1,14 +1,38 @@
-@comment $NetBSD: PLIST,v 1.15 2007/01/23 11:53:46 martti Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/04/12 09:55:12 martti Exp $
${SOLARIS}lib/xfce4/xfprint-plugins/bsdlpr_plugin.la
-bin/xfprint-manager
bin/xfprint4
+bin/xfprint4-manager
+include/xfce4/libxfprint/common.h
+include/xfce4/libxfprint/job.h
+include/xfce4/libxfprint/libxfprint.h
+include/xfce4/libxfprint/printer-list-window.h
+include/xfce4/libxfprint/printer-queue-window.h
+include/xfce4/libxfprint/printer.h
+include/xfce4/libxfprint/printing-system.h
+lib/libxfprint.la
+lib/pkgconfig/xfprint-1.0.pc
lib/xfce4/mcs-plugins/xfprint_plugin.la
share/applications/xfce-xfprint-settings.desktop
share/applications/xfprint-manager.desktop
share/applications/xfprint.desktop
-share/icons/hicolor/48x48/apps/xfprint.png
-share/icons/hicolor/scalable/apps/xfprint.svg
-share/locale/af/LC_MESSAGES/xfprint.mo
+share/doc/libxfprint/PrinterListWindow.html
+share/doc/libxfprint/PrinterQueueWindow.html
+share/doc/libxfprint/PrintingSystem.html
+share/doc/libxfprint/ch01.html
+share/doc/libxfprint/home.png
+share/doc/libxfprint/index.html
+share/doc/libxfprint/index.sgml
+share/doc/libxfprint/left.png
+share/doc/libxfprint/libxfprint-Job.html
+share/doc/libxfprint/libxfprint-Printer.html
+share/doc/libxfprint/libxfprint.devhelp
+share/doc/libxfprint/libxfprint.devhelp2
+share/doc/libxfprint/right.png
+share/doc/libxfprint/style.css
+share/doc/libxfprint/up.png
+share/icons/hicolor/24x24/devices/printer.png
+share/icons/hicolor/48x48/devices/printer.png
+share/icons/hicolor/scalable/devices/printer.svg
share/locale/ar/LC_MESSAGES/xfprint.mo
share/locale/az/LC_MESSAGES/xfprint.mo
share/locale/be/LC_MESSAGES/xfprint.mo
@@ -17,6 +41,7 @@ share/locale/bn_IN/LC_MESSAGES/xfprint.mo
share/locale/ca/LC_MESSAGES/xfprint.mo
share/locale/cs/LC_MESSAGES/xfprint.mo
share/locale/de/LC_MESSAGES/xfprint.mo
+share/locale/dz/LC_MESSAGES/xfprint.mo
share/locale/el/LC_MESSAGES/xfprint.mo
share/locale/en_GB/LC_MESSAGES/xfprint.mo
share/locale/es/LC_MESSAGES/xfprint.mo
@@ -26,15 +51,17 @@ share/locale/eu/LC_MESSAGES/xfprint.mo
share/locale/fa/LC_MESSAGES/xfprint.mo
share/locale/fi/LC_MESSAGES/xfprint.mo
share/locale/fr/LC_MESSAGES/xfprint.mo
+share/locale/gl/LC_MESSAGES/xfprint.mo
share/locale/gu/LC_MESSAGES/xfprint.mo
share/locale/he/LC_MESSAGES/xfprint.mo
share/locale/hi/LC_MESSAGES/xfprint.mo
share/locale/hu/LC_MESSAGES/xfprint.mo
share/locale/it/LC_MESSAGES/xfprint.mo
share/locale/ja/LC_MESSAGES/xfprint.mo
+share/locale/ka/LC_MESSAGES/xfprint.mo
share/locale/ko/LC_MESSAGES/xfprint.mo
-share/locale/ku/LC_MESSAGES/xfprint.mo
share/locale/lt/LC_MESSAGES/xfprint.mo
+share/locale/mk/LC_MESSAGES/xfprint.mo
share/locale/mr/LC_MESSAGES/xfprint.mo
share/locale/ms/LC_MESSAGES/xfprint.mo
share/locale/nl/LC_MESSAGES/xfprint.mo
@@ -45,8 +72,6 @@ share/locale/pt_PT/LC_MESSAGES/xfprint.mo
share/locale/ro/LC_MESSAGES/xfprint.mo
share/locale/ru/LC_MESSAGES/xfprint.mo
share/locale/sk/LC_MESSAGES/xfprint.mo
-share/locale/sl/LC_MESSAGES/xfprint.mo
-share/locale/sq/LC_MESSAGES/xfprint.mo
share/locale/sv/LC_MESSAGES/xfprint.mo
share/locale/ta/LC_MESSAGES/xfprint.mo
share/locale/tr/LC_MESSAGES/xfprint.mo
@@ -72,13 +97,6 @@ share/xfce4/doc/fr/images/xfprint_prettyprinting.png
share/xfce4/doc/fr/images/xfprint_sheets.png
share/xfce4/doc/fr/images/xfprint_virtualpages.png
share/xfce4/doc/fr/xfprint.html
-share/xfce4/doc/he/images/xfprint-manager-queue.png
-share/xfce4/doc/he/images/xfprint-manager.png
-share/xfce4/doc/he/images/xfprint_headings.png
-share/xfce4/doc/he/images/xfprint_input.png
-share/xfce4/doc/he/images/xfprint_mcs_plugin.png
-share/xfce4/doc/he/images/xfprint_prettyprinting.png
-share/xfce4/doc/he/images/xfprint_sheets.png
-share/xfce4/doc/he/images/xfprint_virtualpages.png
-share/xfce4/doc/he/xfprint.html
+@dirrm share/doc/libxfprint
@dirrm lib/xfce4/xfprint-plugins
+@dirrm include/xfce4/libxfprint
diff --git a/print/xfce4-print/buildlink3.mk b/print/xfce4-print/buildlink3.mk
index ca3154d8714..4b9b2cba481 100644
--- a/print/xfce4-print/buildlink3.mk
+++ b/print/xfce4-print/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:46 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2007/04/12 09:55:12 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_PRINT_BUILDLINK3_MK:= ${XFCE4_PRINT_BUILDLINK3_MK}+
@@ -12,13 +12,14 @@ BUILDLINK_PACKAGES+= xfce4-print
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-print
.if ${XFCE4_PRINT_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-print+= xfce4-print>=4.2.4
+BUILDLINK_API_DEPENDS.xfce4-print+= xfce4-print>=4.4.1
BUILDLINK_PKGSRCDIR.xfce4-print?= ../../print/xfce4-print
.endif # XFCE4_PRINT_BUILDLINK3_MK
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../print/a2ps/buildlink3.mk"
.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.if !defined(PKG_BUILD_OPTIONS.xfce4-print)
diff --git a/print/xfce4-print/distinfo b/print/xfce4-print/distinfo
index 98ec8dda9e0..d0bf421496c 100644
--- a/print/xfce4-print/distinfo
+++ b/print/xfce4-print/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2007/01/23 11:53:46 martti Exp $
+$NetBSD: distinfo,v 1.15 2007/04/12 09:55:12 martti Exp $
-SHA1 (xfprint-4.2.4.tar.gz) = ca65948df708453b77a32320671ada7a95b99566
-RMD160 (xfprint-4.2.4.tar.gz) = 7bfc68169925fb82cce0b4c402e522de1deee35e
-Size (xfprint-4.2.4.tar.gz) = 1165393 bytes
-SHA1 (patch-aa) = 09839619deef15afc2eee0a9e4e72109b6191398
-SHA1 (patch-ab) = dc426a6d42dabbef20b46c7d4d73744e5101570d
+SHA1 (xfprint-4.4.1.tar.bz2) = 28da63a9a47ae4ae528ab24b35a035f583efb1e4
+RMD160 (xfprint-4.4.1.tar.bz2) = a81078ff815a39c1b97181727ab4572552276caa
+Size (xfprint-4.4.1.tar.bz2) = 866136 bytes
+SHA1 (patch-aa) = a4aa713289f09642dab208e5c51deab0755eb84c
+SHA1 (patch-ab) = c9a6508cd7fa442a7574144800f8a2d630808fd1
diff --git a/print/xfce4-print/options.mk b/print/xfce4-print/options.mk
index fd9cbf0637d..3feeb33e30f 100644
--- a/print/xfce4-print/options.mk
+++ b/print/xfce4-print/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: options.mk,v 1.3 2007/04/12 09:55:12 martti Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.xfce4-print
PKG_SUPPORTED_OPTIONS= cups
diff --git a/print/xfce4-print/patches/patch-aa b/print/xfce4-print/patches/patch-aa
index 6cb52afeab3..2de362c2d12 100644
--- a/print/xfce4-print/patches/patch-aa
+++ b/print/xfce4-print/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.1 2005/03/31 18:12:29 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2007/04/12 09:55:12 martti Exp $
---- xfprint/Makefile.in.orig 2005-03-18 14:06:27.000000000 +0100
-+++ xfprint/Makefile.in
-@@ -266,7 +266,8 @@ xfprint4_CFLAGS = \
+--- xfprint/Makefile.in.orig 2006-07-10 12:16:08.000000000 +0000
++++ xfprint/Makefile.in 2006-07-14 11:16:56.000000000 +0000
+@@ -315,7 +315,8 @@
xfprint4_LDADD = \
- $(top_builddir)/common/libxfprint.la \
+ $(top_builddir)/libxfprint/libxfprint.la \
@LIBXFCE4MCS_CLIENT_LIBS@ \
- @LIBXFCEGUI4_LIBS@
+ @LIBXFCEGUI4_LIBS@ \
+ @GMODULE_LIBS@
- EXTRA_DIST = xfprint.desktop
- appsdir = $(datadir)/applications
+ xfprint4_DEPENDENCIES = \
+ $(top_builddir)/libxfprint/libxfprint.la
diff --git a/print/xfce4-print/patches/patch-ab b/print/xfce4-print/patches/patch-ab
index e3c69acec5e..3fd931bf471 100644
--- a/print/xfce4-print/patches/patch-ab
+++ b/print/xfce4-print/patches/patch-ab
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.1 2005/03/31 18:12:29 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2007/04/12 09:55:12 martti Exp $
---- xfprint-manager/Makefile.in.orig 2005-03-18 14:19:47.000000000 +0100
-+++ xfprint-manager/Makefile.in
-@@ -261,7 +261,8 @@ xfprint_manager_CFLAGS = \
- xfprint_manager_LDADD = \
- $(top_builddir)/common/libxfprint.la \
+--- xfprint-manager/Makefile.in.orig 2006-07-10 12:16:07.000000000 +0000
++++ xfprint-manager/Makefile.in 2006-07-14 11:17:25.000000000 +0000
+@@ -295,7 +295,8 @@
+ xfprint4_manager_LDADD = \
+ $(top_builddir)/libxfprint/libxfprint.la \
@LIBXFCE4MCS_CLIENT_LIBS@ \
- @LIBXFCEGUI4_LIBS@
+ @LIBXFCEGUI4_LIBS@ \
+ @GMODULE_LIBS@
- EXTRA_DIST = xfprint-manager.desktop
appsdir = $(datadir)/applications
+ apps_in_files = xfprint-manager.desktop.in
diff --git a/sysutils/xfce4-appfinder/Makefile b/sysutils/xfce4-appfinder/Makefile
index e3f4ec66c68..00a85a71ded 100644
--- a/sysutils/xfce4-appfinder/Makefile
+++ b/sysutils/xfce4-appfinder/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.6 2007/01/23 11:53:46 martti Exp $
+# $NetBSD: Makefile,v 1.7 2007/04/12 09:55:12 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-appfinder-${XFCE4_VERSION}
-#PKGREVISION= 1
CATEGORIES= sysutils
COMMENT= Xfce application finder
+USE_TOOLS+= intltool
+
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../x11/libxfce4gui/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-appfinder/PLIST b/sysutils/xfce4-appfinder/PLIST
index fb567969dee..83cf9ed4fac 100644
--- a/sysutils/xfce4-appfinder/PLIST
+++ b/sysutils/xfce4-appfinder/PLIST
@@ -1,30 +1,34 @@
-@comment $NetBSD: PLIST,v 1.7 2007/01/23 11:53:46 martti Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/04/12 09:55:12 martti Exp $
bin/xfce4-appfinder
share/applications/xfce4-appfinder.desktop
-share/locale/af/LC_MESSAGES/xfce4-appfinder.mo
+share/icons/hicolor/48x48/apps/xfce4-appfinder.png
share/locale/be/LC_MESSAGES/xfce4-appfinder.mo
share/locale/bn_IN/LC_MESSAGES/xfce4-appfinder.mo
share/locale/ca/LC_MESSAGES/xfce4-appfinder.mo
share/locale/cs/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/da/LC_MESSAGES/xfce4-appfinder.mo
share/locale/de/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/dz/LC_MESSAGES/xfce4-appfinder.mo
share/locale/el/LC_MESSAGES/xfce4-appfinder.mo
share/locale/en_GB/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/eo/LC_MESSAGES/xfce4-appfinder.mo
share/locale/es/LC_MESSAGES/xfce4-appfinder.mo
share/locale/es_MX/LC_MESSAGES/xfce4-appfinder.mo
share/locale/et/LC_MESSAGES/xfce4-appfinder.mo
share/locale/eu/LC_MESSAGES/xfce4-appfinder.mo
share/locale/fa/LC_MESSAGES/xfce4-appfinder.mo
share/locale/fi/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/fr/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/gl/LC_MESSAGES/xfce4-appfinder.mo
share/locale/gu/LC_MESSAGES/xfce4-appfinder.mo
share/locale/he/LC_MESSAGES/xfce4-appfinder.mo
share/locale/hu/LC_MESSAGES/xfce4-appfinder.mo
share/locale/hy/LC_MESSAGES/xfce4-appfinder.mo
share/locale/it/LC_MESSAGES/xfce4-appfinder.mo
share/locale/ja/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/ka/LC_MESSAGES/xfce4-appfinder.mo
share/locale/ko/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/ku/LC_MESSAGES/xfce4-appfinder.mo
share/locale/lt/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/mk/LC_MESSAGES/xfce4-appfinder.mo
share/locale/mr/LC_MESSAGES/xfce4-appfinder.mo
share/locale/nl/LC_MESSAGES/xfce4-appfinder.mo
share/locale/pa/LC_MESSAGES/xfce4-appfinder.mo
@@ -34,14 +38,11 @@ share/locale/pt_PT/LC_MESSAGES/xfce4-appfinder.mo
share/locale/ro/LC_MESSAGES/xfce4-appfinder.mo
share/locale/ru/LC_MESSAGES/xfce4-appfinder.mo
share/locale/sk/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/sl/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/sq/LC_MESSAGES/xfce4-appfinder.mo
share/locale/sv/LC_MESSAGES/xfce4-appfinder.mo
share/locale/tr/LC_MESSAGES/xfce4-appfinder.mo
share/locale/uk/LC_MESSAGES/xfce4-appfinder.mo
share/locale/zh_CN/LC_MESSAGES/xfce4-appfinder.mo
share/locale/zh_TW/LC_MESSAGES/xfce4-appfinder.mo
-share/pixmaps/xfce4-appfinder.png
share/xfce4/doc/C/images/appfinder-handle-popup.png
share/xfce4/doc/C/images/appfinder-item-popup.png
share/xfce4/doc/C/images/default_appfinder.png
@@ -50,14 +51,3 @@ share/xfce4/doc/fr/images/appfinder-handle-popup.png
share/xfce4/doc/fr/images/appfinder-item-popup.png
share/xfce4/doc/fr/images/default_appfinder.png
share/xfce4/doc/fr/xfce4-appfinder.html
-share/xfce4/doc/he/images/appfinder-handle-popup.png
-share/xfce4/doc/he/images/appfinder-item-popup.png
-share/xfce4/doc/he/images/default_appfinder.png
-share/xfce4/doc/he/xfce4-appfinder.html
-@unexec ${RMDIR} %D/share/xfce4/doc/he/images 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/xfce4/doc/he 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/xfce4/doc/fr/images 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/xfce4/doc/fr 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/xfce4/doc/C/images 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/xfce4/doc/C 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/xfce4/doc 2>/dev/null || ${TRUE}
diff --git a/sysutils/xfce4-appfinder/buildlink3.mk b/sysutils/xfce4-appfinder/buildlink3.mk
index 2ba135dfb48..fdc9684ba81 100644
--- a/sysutils/xfce4-appfinder/buildlink3.mk
+++ b/sysutils/xfce4-appfinder/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2007/01/23 11:53:46 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2007/04/12 09:55:12 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_APPFINDER_BUILDLINK3_MK:= ${XFCE4_APPFINDER_BUILDLINK3_MK}+
@@ -12,11 +12,13 @@ BUILDLINK_PACKAGES+= xfce4-appfinder
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-appfinder
.if ${XFCE4_APPFINDER_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-appfinder+= xfce4-appfinder>=4.2.4
+BUILDLINK_API_DEPENDS.xfce4-appfinder+= xfce4-appfinder>=4.4.1
BUILDLINK_PKGSRCDIR.xfce4-appfinder?= ../../sysutils/xfce4-appfinder
.endif # XFCE4_APPFINDER_BUILDLINK3_MK
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../x11/libxfce4gui/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-appfinder/distinfo b/sysutils/xfce4-appfinder/distinfo
index 74f1bed1913..b7c2643e411 100644
--- a/sysutils/xfce4-appfinder/distinfo
+++ b/sysutils/xfce4-appfinder/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2007/01/23 11:53:46 martti Exp $
+$NetBSD: distinfo,v 1.7 2007/04/12 09:55:12 martti Exp $
-SHA1 (xfce4-appfinder-4.2.4.tar.gz) = 3ac2b6e6b426edb2d246dbb0035dd2dce62880f3
-RMD160 (xfce4-appfinder-4.2.4.tar.gz) = 7474792cc2c71fc421d8bbcccf3a77e53c29452b
-Size (xfce4-appfinder-4.2.4.tar.gz) = 707800 bytes
+SHA1 (xfce4-appfinder-4.4.1.tar.bz2) = 0f433a4469975466cb141163ca9d71f75cd9916f
+RMD160 (xfce4-appfinder-4.4.1.tar.bz2) = 646514c5983f4d1691480ede63294cf372697cb1
+Size (xfce4-appfinder-4.4.1.tar.bz2) = 386278 bytes
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 36a690f0058..7641ed51e40 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2007/01/20 12:18:31 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2007/04/12 09:55:13 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 0.2.2
+XFCE4_VERSION= 0.3.0
DISTNAME= xfce4-cpugraph-plugin-${XFCE4_VERSION}
-PKGREVISION= 4
+#PKGREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/xfce4-cpugraph-plugin/
COMMENT= Xfce CPU load plugin
-WRKSRC= ${WRKDIR}/xfce4-cpugraph-plugin
+USE_TOOLS+= intltool
.include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/xfce4-cpugraph-plugin/PLIST b/sysutils/xfce4-cpugraph-plugin/PLIST
index aff17907e9f..50fd1123437 100644
--- a/sysutils/xfce4-cpugraph-plugin/PLIST
+++ b/sysutils/xfce4-cpugraph-plugin/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:54 jlam Exp $
-lib/xfce4/panel-plugins/libcpugraph.la
+@comment $NetBSD: PLIST,v 1.3 2007/04/12 09:55:13 martti Exp $
+libexec/xfce4/panel-plugins/xfce4-cpugraph-plugin
+share/xfce4/panel-plugins/cpugraph.desktop
diff --git a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
index 0c78661be7e..0c40dac8e25 100644
--- a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
+++ b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/10/12 09:24:19 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2007/04/12 09:55:13 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:= ${XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK}+
@@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+= xfce4-cpugraph-plugin
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-cpugraph-plugin
.if ${XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-cpugraph-plugin+= xfce4-cpugraph-plugin>=0.2.2nb4
+BUILDLINK_API_DEPENDS.xfce4-cpugraph-plugin+= xfce4-cpugraph-plugin>=0.3.0
BUILDLINK_PKGSRCDIR.xfce4-cpugraph-plugin?= ../../sysutils/xfce4-cpugraph-plugin
.endif # XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK
.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-cpugraph-plugin/distinfo b/sysutils/xfce4-cpugraph-plugin/distinfo
index d34cb16b2fa..91167e93fa1 100644
--- a/sysutils/xfce4-cpugraph-plugin/distinfo
+++ b/sysutils/xfce4-cpugraph-plugin/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.7 2007/01/20 12:33:37 joerg Exp $
+$NetBSD: distinfo,v 1.8 2007/04/12 09:55:13 martti Exp $
-SHA1 (xfce4-cpugraph-plugin-0.2.2.tar.gz) = 64914e2d766ba093b6158d45ab37c0021057121b
-RMD160 (xfce4-cpugraph-plugin-0.2.2.tar.gz) = c1af61ae6961b4cbdd16dad925bf805440c24aa5
-Size (xfce4-cpugraph-plugin-0.2.2.tar.gz) = 210953 bytes
-SHA1 (patch-aa) = fe1b2d46334ba73a9a6c661c09b14bc1f2a342a9
-SHA1 (patch-ab) = d0a98d9cf51d8030889e2554cef9564dea8dfd0b
-SHA1 (patch-ac) = 47c0e53b7dddf0307cc949aa69c335c1492e8584
+SHA1 (xfce4-cpugraph-plugin-0.3.0.tar.bz2) = d869625350d6c0ae4bef3203f03bbc409773494f
+RMD160 (xfce4-cpugraph-plugin-0.3.0.tar.bz2) = 99c309b3bf0ab622a9b95df9b568808a6c034055
+Size (xfce4-cpugraph-plugin-0.3.0.tar.bz2) = 102638 bytes
+SHA1 (patch-ab) = 049a27b8946d401ece639b5cfa999dada5ffd2eb
SHA1 (patch-ad) = a989f0ed1b91d2e1fbc61fa623b989d371be80e0
diff --git a/sysutils/xfce4-cpugraph-plugin/patches/patch-aa b/sysutils/xfce4-cpugraph-plugin/patches/patch-aa
deleted file mode 100644
index f23f34ce7b6..00000000000
--- a/sysutils/xfce4-cpugraph-plugin/patches/patch-aa
+++ /dev/null
@@ -1,147 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/01/01 00:02:56 kristerw Exp $
-
---- panel-plugin/cpu.c.orig Sat Jun 12 03:25:31 2004
-+++ panel-plugin/cpu.c Sat Jan 1 00:58:45 2005
-@@ -36,11 +36,12 @@
- void ReadSettings (Control *control, xmlNode *node)
- {
- xmlChar *value;
-+ CPUGraph *base;
-
- if (node == NULL || node->children == NULL)
- return;
-
-- CPUGraph *base = (CPUGraph *)control->data;
-+ base = (CPUGraph *)control->data;
-
- for (node = node->children; node; node = node->next)
- {
-@@ -48,10 +49,10 @@
- {
- if ((value = xmlGetProp (node, (const xmlChar *)"UpdateInterval")))
- {
-+ int update = 1000;
- base->m_UpdateInterval = atoi ((const char *)value);
- if (base->m_TimeoutID)
- g_source_remove (base->m_TimeoutID);
-- int update = 1000;
- if (base->m_UpdateInterval == 0)
- update = 250;
- else if (base->m_UpdateInterval == 1)
-@@ -223,10 +224,10 @@
- }
- gboolean CreateControl (Control *control)
- {
-+ int update = 1000;
- CPUGraph *base = NewCPU ();
- gtk_container_add (GTK_CONTAINER (control->base), GTK_WIDGET (base->m_Parent));
-
-- int update = 1000;
- if (base->m_UpdateInterval == 0)
- update = 250;
- else if (base->m_UpdateInterval == 1)
-@@ -254,6 +255,7 @@
- }
- void SetOrientation (Control *control, int orientation)
- {
-+ int update=1000;
- CPUGraph *base = (CPUGraph *)control->data;
- base->m_Orientation = orientation;
- SetRealGeometry (base);
-@@ -285,7 +287,6 @@
- gtk_widget_show (base->m_Parent);
- g_signal_connect (base->m_DrawArea, "expose_event", G_CALLBACK (DrawAreaExposeEvent), control->data);
-
-- int update=1000;
- if (base->m_UpdateInterval == 0)
- update = 250;
- else if (base->m_UpdateInterval == 1)
-@@ -651,6 +652,8 @@
-
- void DrawGraph (CPUGraph *base)
- {
-+ int startx, starty;
-+ float step;
- GdkGC *fg1, *fg2, *bg, *fc;
- GtkWidget *da = base->m_DrawArea;
-
-@@ -669,8 +672,8 @@
- gdk_gc_set_rgb_fg_color (fc, &base->m_FrameColor);
- }
-
-- int startx = base->m_Frame ? 1 : 0;
-- int starty = base->m_Frame ? 1 : 0;
-+ startx = base->m_Frame ? 1 : 0;
-+ starty = base->m_Frame ? 1 : 0;
-
- gdk_draw_rectangle (da->window,
- bg,
-@@ -689,7 +692,7 @@
- }
-
-
-- float step = base->m_Height/100.0;
-+ step = base->m_Height/100.0;
-
- if (base->m_Mode == 0)
- {
-@@ -729,12 +732,14 @@
- else if (base->m_Mode == 1)
- {
- GdkGC *gc;
-+ int nrx, nry;
-+ float tstep;
-+ int x, y;
- if (base->m_ColorMode > 0)
- gc = gdk_gc_new (da->window);
-- int nrx = (base->m_Width+1)/3.0;
-- int nry = (base->m_Height+1)/2.0;
-- float tstep = nry/100.0;
-- int x, y;
-+ nrx = (base->m_Width+1)/3.0;
-+ nry = (base->m_Height+1)/2.0;
-+ tstep = nry/100.0;
- for (x=nrx-1;x>=0;x--)
- {
- float usage = base->m_History[nrx - 1 - x]*tstep;
-@@ -772,12 +777,15 @@
- else if (base->m_Mode == 2)
- {
- GdkGC *gc;
-+ int y;
-+ float usage;
-+ int tmp;
-+ int length;
- if (base->m_ColorMode > 0)
- gc = gdk_gc_new (da->window);
-- int y;
-- float usage = base->m_History[0]*step;
-- int tmp=0;
-- int length = base->m_Height - (base->m_Height - usage);
-+ usage = base->m_History[0]*step;
-+ tmp=0;
-+ length = base->m_Height - (base->m_Height - usage);
- for (y=base->m_Height-1;y>=base->m_Height - usage;y--)
- {
- if (base->m_ColorMode > 0)
-@@ -831,9 +839,9 @@
-
- void ApplyChanges (CPUGraph *base)
- {
-+ int update=1000;
- if (base->m_TimeoutID)
- g_source_remove (base->m_TimeoutID);
-- int update=1000;
- if (base->m_UpdateInterval == 0)
- update = 250;
- else if (base->m_UpdateInterval == 1)
-@@ -946,8 +954,8 @@
-
- void SetHistorySize (CPUGraph *base, int size)
- {
-- base->m_History = (long *)realloc (base->m_History, size*sizeof (long));
- int i;
-+ base->m_History = (long *)realloc (base->m_History, size*sizeof (long));
- for (i=size-1;i>=base->m_Values;i--)
- base->m_History[i] = 0;
- base->m_Values = size;
diff --git a/sysutils/xfce4-cpugraph-plugin/patches/patch-ab b/sysutils/xfce4-cpugraph-plugin/patches/patch-ab
index da599560fa7..d02cd1bfd95 100644
--- a/sysutils/xfce4-cpugraph-plugin/patches/patch-ab
+++ b/sysutils/xfce4-cpugraph-plugin/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2007/01/20 12:33:37 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2007/04/12 09:55:13 martti Exp $
---- panel-plugin/os.c.orig 2004-06-07 01:16:30.000000000 +0000
-+++ panel-plugin/os.c
-@@ -63,6 +63,26 @@ long GetCPUUsage (int *oldusage, int *ol
+--- panel-plugin/os.c.orig 2004-07-24 17:25:15.000000000 +0000
++++ panel-plugin/os.c 2007-01-23 15:51:04.000000000 +0000
+@@ -67,6 +67,26 @@
return usage;
}
diff --git a/sysutils/xfce4-cpugraph-plugin/patches/patch-ac b/sysutils/xfce4-cpugraph-plugin/patches/patch-ac
deleted file mode 100644
index ebedabea59f..00000000000
--- a/sysutils/xfce4-cpugraph-plugin/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/01/20 12:18:31 joerg Exp $
-
-OS_LIBS contains -lkinfo on DragonFly.
-
---- panel-plugin/Makefile.in.orig 2007-01-20 12:00:36.000000000 +0000
-+++ panel-plugin/Makefile.in
-@@ -150,7 +150,8 @@ libcpugraph_la_CFLAGS = \
-
-
- libcpugraph_la_LIBADD = \
-- @XFCE4_PANEL_LIBS@
-+ @XFCE4_PANEL_LIBS@ \
-+ ${OS_LIBS}
-
- subdir = panel-plugin
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/sysutils/xfce4-cpugraph-plugin/patches/patch-ad b/sysutils/xfce4-cpugraph-plugin/patches/patch-ad
index 26b34fcc12f..1a3977c2df2 100644
--- a/sysutils/xfce4-cpugraph-plugin/patches/patch-ad
+++ b/sysutils/xfce4-cpugraph-plugin/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2007/01/20 12:18:31 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2007/04/12 09:55:13 martti Exp $
--- panel-plugin/os.h.orig 2007-01-20 12:05:51.000000000 +0000
+++ panel-plugin/os.h
diff --git a/sysutils/xfce4-diskperf-plugin/Makefile b/sysutils/xfce4-diskperf-plugin/Makefile
index 8c217bfc46a..385ae20f1ad 100644
--- a/sysutils/xfce4-diskperf-plugin/Makefile
+++ b/sysutils/xfce4-diskperf-plugin/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:13 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/04/12 09:55:13 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 1.5
+XFCE4_VERSION= 2.1.0
DISTNAME= xfce4-diskperf-plugin-${XFCE4_VERSION}
-PKGREVISION= 3
+#PKGREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/xfce4-diskperf-plugin/
COMMENT= Xfce disk performance plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/sysutils/xfce4-diskperf-plugin/PLIST b/sysutils/xfce4-diskperf-plugin/PLIST
index 6f95563bc63..961ec8334d8 100644
--- a/sysutils/xfce4-diskperf-plugin/PLIST
+++ b/sysutils/xfce4-diskperf-plugin/PLIST
@@ -1,2 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:54 jlam Exp $
-lib/xfce4/panel-plugins/libdiskperf.la
+@comment $NetBSD: PLIST,v 1.3 2007/04/12 09:55:13 martti Exp $
+libexec/xfce4/panel-plugins/xfce4-diskperf-plugin
+share/locale/ca/LC_MESSAGES/xfce4-diskperf-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-diskperf-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-diskperf-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-diskperf-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-diskperf-plugin.mo
+share/xfce4/panel-plugins/diskperf.desktop
diff --git a/sysutils/xfce4-diskperf-plugin/buildlink3.mk b/sysutils/xfce4-diskperf-plugin/buildlink3.mk
index e3fedd98afc..92167e81682 100644
--- a/sysutils/xfce4-diskperf-plugin/buildlink3.mk
+++ b/sysutils/xfce4-diskperf-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/10/12 09:24:19 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2007/04/12 09:55:13 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:= ${XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK}+
@@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+= xfce4-diskperf-plugin
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-diskperf-plugin
.if ${XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-diskperf-plugin+= xfce4-diskperf-plugin>=1.5nb3
+BUILDLINK_API_DEPENDS.xfce4-diskperf-plugin+= xfce4-diskperf-plugin>=2.1.0
BUILDLINK_PKGSRCDIR.xfce4-diskperf-plugin?= ../../sysutils/xfce4-diskperf-plugin
.endif # XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK
.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-diskperf-plugin/distinfo b/sysutils/xfce4-diskperf-plugin/distinfo
index b74e9be8016..52329182cd2 100644
--- a/sysutils/xfce4-diskperf-plugin/distinfo
+++ b/sysutils/xfce4-diskperf-plugin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2006/07/02 10:13:11 martti Exp $
+$NetBSD: distinfo,v 1.6 2007/04/12 09:55:13 martti Exp $
-SHA1 (xfce4-diskperf-plugin-1.5.tar.gz) = 1c1f2bea61d48c5a5ac25dd072d5734af0491854
-RMD160 (xfce4-diskperf-plugin-1.5.tar.gz) = 2eeb070aeb2be2b53ff57e86f684c9d430d637ab
-Size (xfce4-diskperf-plugin-1.5.tar.gz) = 226767 bytes
+SHA1 (xfce4-diskperf-plugin-2.1.0.tar.bz2) = 66db93af32f4a3ca0ce931fed312b267a3a3dece
+RMD160 (xfce4-diskperf-plugin-2.1.0.tar.bz2) = 7e66634d48499dc9be777580ac48e66c9e51039b
+Size (xfce4-diskperf-plugin-2.1.0.tar.bz2) = 183492 bytes
SHA1 (patch-aa) = 86a3cabe41c9470716f82000e41e6d9b64f6d372
diff --git a/sysutils/xfce4-diskperf-plugin/patches/patch-aa b/sysutils/xfce4-diskperf-plugin/patches/patch-aa
index 1ad37a8301e..9052518ce94 100644
--- a/sysutils/xfce4-diskperf-plugin/patches/patch-aa
+++ b/sysutils/xfce4-diskperf-plugin/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2006/07/02 10:13:11 martti Exp $
+$NetBSD: patch-aa,v 1.4 2007/04/12 09:55:13 martti Exp $
--- panel-plugin/devperf.c.orig 2003-11-30 12:58:54.000000000 +0200
+++ panel-plugin/devperf.c 2006-07-02 10:05:44.000000000 +0300
diff --git a/sysutils/xfce4-fm/DESCR b/sysutils/xfce4-fm/DESCR
deleted file mode 100644
index 2f5647c473d..00000000000
--- a/sysutils/xfce4-fm/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Filemanager for Xfce.
diff --git a/sysutils/xfce4-fm/MESSAGE b/sysutils/xfce4-fm/MESSAGE
deleted file mode 100644
index 38ee7ad82cd..00000000000
--- a/sysutils/xfce4-fm/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/09/26 10:32:34 martti Exp $
-
-You will need to install the samba package (pkgsrc/net/samba)
-before attempting to browse any Windows shares in your network
-with ${PKGNAME}.
-===========================================================================
diff --git a/sysutils/xfce4-fm/Makefile b/sysutils/xfce4-fm/Makefile
deleted file mode 100644
index edb5869897a..00000000000
--- a/sysutils/xfce4-fm/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2007/01/23 11:53:46 martti Exp $
-
-.include "../../meta-pkgs/xfce4/Makefile.common"
-
-DISTNAME= xffm-${XFCE4_VERSION}
-PKGNAME= xfce4-fm-${XFCE4_VERSION}
-#PKGREVISION= 1
-CATEGORIES= sysutils
-COMMENT= Xfce filemanager
-
-MESSAGE_SRC+= ${.CURDIR}/MESSAGE
-
-PKGCONFIG_OVERRIDE= src/xffm-1.0.pc.in
-
-CFLAGS+= ${PTHREAD_CFLAGS}
-LIBS+= ${PTHREAD_LDFLAGS}
-
-UNLIMIT_RESOURCES+= datasize
-
-BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../databases/dbh/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-fm/PLIST b/sysutils/xfce4-fm/PLIST
deleted file mode 100644
index 8b781167109..00000000000
--- a/sysutils/xfce4-fm/PLIST
+++ /dev/null
@@ -1,294 +0,0 @@
-@comment $NetBSD: PLIST,v 1.15 2007/01/23 17:43:47 drochner Exp $
-bin/fgr
-bin/scramble
-bin/xfbook
-bin/xfbook4
-bin/xfdiff4
-bin/xffm
-bin/xffrequent
-bin/xffrequent4
-bin/xffstab
-bin/xffstab4
-bin/xfglob4
-bin/xfmime-edit
-bin/xfrecent
-bin/xfrecent4
-bin/xfsamba4
-bin/xftrash4
-bin/xftree4
-lib/libxffm_actions.la
-lib/libxffm_basic.la
-lib/libxffm_calls.la
-lib/libxffm_cpy.la
-lib/libxffm_on_demand.la
-lib/libxffm_secondary.la
-lib/libxffm_tubo.la
-lib/pkgconfig/xffm-1.0.pc
-lib/xfce4/mcs-plugins/libxffmsettings.la
-lib/xfce4/xffm/libxffm_book.la
-lib/xfce4/xffm/libxffm_find.la
-lib/xfce4/xffm/libxffm_fstab.la
-lib/xfce4/xffm/libxffm_prop.la
-lib/xfce4/xffm/libxffm_recent.la
-lib/xfce4/xffm/libxffm_smb.la
-lib/xfce4/xffm/libxffm_trash.la
-man/man1/fgr.1
-share/applications/Xfbook.desktop
-share/applications/Xfdiff.desktop
-share/applications/Xffm.desktop
-share/applications/Xffstab.desktop
-share/applications/Xfglob.desktop
-share/applications/Xfmime_edit.desktop
-share/applications/Xfsamba.desktop
-share/applications/Xftree.desktop
-share/applications/xfce-filemanager-settings.desktop
-share/icons/hicolor/48x48/stock/generic/a-apply.png
-share/icons/hicolor/48x48/stock/generic/a-clear.png
-share/icons/hicolor/48x48/stock/generic/a-convert.png
-share/icons/hicolor/48x48/stock/generic/a-info.png
-share/icons/hicolor/48x48/stock/generic/a-next.png
-share/icons/hicolor/48x48/stock/generic/a-open.png
-share/icons/hicolor/48x48/stock/generic/a-pause.png
-share/icons/hicolor/48x48/stock/generic/a-prev.png
-share/icons/hicolor/48x48/stock/generic/a-question.png
-share/icons/hicolor/48x48/stock/generic/a-quit.png
-share/icons/hicolor/48x48/stock/generic/a-refresh.png
-share/icons/hicolor/48x48/stock/generic/a-stop.png
-share/icons/hicolor/48x48/stock/generic/b-book-closed.png
-share/icons/hicolor/48x48/stock/generic/b-book-open.png
-share/icons/hicolor/48x48/stock/generic/b-find.png
-share/icons/hicolor/48x48/stock/generic/b-frequent.png
-share/icons/hicolor/48x48/stock/generic/b-fstab.png
-share/icons/hicolor/48x48/stock/generic/b-home.png
-share/icons/hicolor/48x48/stock/generic/b-network.png
-share/icons/hicolor/48x48/stock/generic/b-recent.png
-share/icons/hicolor/48x48/stock/generic/b-trash.png
-share/icons/hicolor/48x48/stock/generic/b-xffm_icon.png
-share/icons/hicolor/48x48/stock/generic/c-gid.png
-share/icons/hicolor/48x48/stock/generic/c-mode.png
-share/icons/hicolor/48x48/stock/generic/c-name.png
-share/icons/hicolor/48x48/stock/generic/c-size.png
-share/icons/hicolor/48x48/stock/generic/c-time.png
-share/icons/hicolor/48x48/stock/generic/c-uid.png
-share/icons/hicolor/48x48/stock/generic/comp1.xpm
-share/icons/hicolor/48x48/stock/generic/d-application.png
-share/icons/hicolor/48x48/stock/generic/d-audio.png
-share/icons/hicolor/48x48/stock/generic/d-bomb.png
-share/icons/hicolor/48x48/stock/generic/d-exec.png
-share/icons/hicolor/48x48/stock/generic/d-file.png
-share/icons/hicolor/48x48/stock/generic/d-help.png
-share/icons/hicolor/48x48/stock/generic/d-image.png
-share/icons/hicolor/48x48/stock/generic/d-message.png
-share/icons/hicolor/48x48/stock/generic/d-model.png
-share/icons/hicolor/48x48/stock/generic/d-multipart.png
-share/icons/hicolor/48x48/stock/generic/d-no-access.png
-share/icons/hicolor/48x48/stock/generic/d-pirate.png
-share/icons/hicolor/48x48/stock/generic/d-symlink-broken.png
-share/icons/hicolor/48x48/stock/generic/d-symlink.png
-share/icons/hicolor/48x48/stock/generic/d-txt.png
-share/icons/hicolor/48x48/stock/generic/d-video.png
-share/icons/hicolor/48x48/stock/generic/d-waste_basket_empty.png
-share/icons/hicolor/48x48/stock/generic/d-waste_basket_full.png
-share/icons/hicolor/48x48/stock/generic/d-xfce.png
-share/icons/hicolor/48x48/stock/generic/dir-closed.png
-share/icons/hicolor/48x48/stock/generic/dir-open.png
-share/icons/hicolor/48x48/stock/generic/downarrow.png
-share/icons/hicolor/48x48/stock/generic/f-cdrom.png
-share/icons/hicolor/48x48/stock/generic/f-disk.png
-share/icons/hicolor/48x48/stock/generic/f-dvd.png
-share/icons/hicolor/48x48/stock/generic/f-floppy.png
-share/icons/hicolor/48x48/stock/generic/f-memory.png
-share/icons/hicolor/48x48/stock/generic/f-netdisk.png
-share/icons/hicolor/48x48/stock/generic/go-back.png
-share/icons/hicolor/48x48/stock/generic/go-forward.png
-share/icons/hicolor/48x48/stock/generic/go-home.png
-share/icons/hicolor/48x48/stock/generic/go-jump.png
-share/icons/hicolor/48x48/stock/generic/go-start.png
-share/icons/hicolor/48x48/stock/generic/go-up.png
-share/icons/hicolor/48x48/stock/generic/new_win.xpm
-share/icons/hicolor/48x48/stock/generic/p-edit.png
-share/icons/hicolor/48x48/stock/generic/p-file1.png
-share/icons/hicolor/48x48/stock/generic/p-file2.png
-share/icons/hicolor/48x48/stock/generic/p-games.png
-share/icons/hicolor/48x48/stock/generic/p-man.png
-share/icons/hicolor/48x48/stock/generic/p-multimedia.png
-share/icons/hicolor/48x48/stock/generic/p-network.png
-share/icons/hicolor/48x48/stock/generic/p-newmail.png
-share/icons/hicolor/48x48/stock/generic/p-nomail.png
-share/icons/hicolor/48x48/stock/generic/p-oldmail.png
-share/icons/hicolor/48x48/stock/generic/p-paint.png
-share/icons/hicolor/48x48/stock/generic/p-print.png
-share/icons/hicolor/48x48/stock/generic/p-schedule.png
-share/icons/hicolor/48x48/stock/generic/p-sound.png
-share/icons/hicolor/48x48/stock/generic/p-terminal.png
-share/icons/hicolor/48x48/stock/generic/p-unknown.png
-share/icons/hicolor/48x48/stock/generic/t-exec.png
-share/icons/hicolor/48x48/stock/generic/t-find.png
-share/icons/hicolor/48x48/stock/generic/t-new-directory.png
-share/icons/hicolor/48x48/stock/generic/t-new-file.png
-share/icons/hicolor/48x48/stock/generic/t-pastelink.png
-share/icons/hicolor/48x48/stock/generic/t-preferences.png
-share/icons/hicolor/48x48/stock/generic/t-quit.png
-share/icons/hicolor/48x48/stock/generic/t-reload.png
-share/icons/hicolor/48x48/stock/generic/t-terminal.png
-share/icons/hicolor/48x48/stock/generic/t-xfce-setting-show.png
-share/icons/hicolor/48x48/stock/generic/t-xfdiff.png
-share/icons/hicolor/48x48/stock/generic/t-xfmime-edit.png
-share/icons/hicolor/48x48/stock/generic/t-zoom-in.png
-share/icons/hicolor/48x48/stock/generic/t-zoom-out.png
-share/icons/hicolor/48x48/stock/generic/t-zoom-view.png
-share/icons/hicolor/48x48/stock/generic/ubu_head.jpg
-share/icons/hicolor/48x48/stock/generic/xfdiff.png
-share/icons/hicolor/48x48/stock/generic/xffm_icon.xpm
-share/locale/af/LC_MESSAGES/xffm.mo
-share/locale/ar/LC_MESSAGES/xffm.mo
-share/locale/az/LC_MESSAGES/xffm.mo
-share/locale/bg/LC_MESSAGES/xffm.mo
-share/locale/bn_IN/LC_MESSAGES/xffm.mo
-share/locale/ca/LC_MESSAGES/xffm.mo
-share/locale/cs/LC_MESSAGES/xffm.mo
-share/locale/de/LC_MESSAGES/xffm.mo
-share/locale/en_GB/LC_MESSAGES/xffm.mo
-share/locale/es/LC_MESSAGES/xffm.mo
-share/locale/es_MX/LC_MESSAGES/xffm.mo
-share/locale/et/LC_MESSAGES/xffm.mo
-share/locale/eu/LC_MESSAGES/xffm.mo
-share/locale/fa/LC_MESSAGES/xffm.mo
-share/locale/fi/LC_MESSAGES/xffm.mo
-share/locale/fr/LC_MESSAGES/xffm.mo
-share/locale/gu/LC_MESSAGES/xffm.mo
-share/locale/he/LC_MESSAGES/xffm.mo
-share/locale/hi/LC_MESSAGES/xffm.mo
-share/locale/hu/LC_MESSAGES/xffm.mo
-share/locale/it/LC_MESSAGES/xffm.mo
-share/locale/ja/LC_MESSAGES/xffm.mo
-share/locale/ko/LC_MESSAGES/xffm.mo
-share/locale/ku/LC_MESSAGES/xffm.mo
-share/locale/lt/LC_MESSAGES/xffm.mo
-share/locale/mr/LC_MESSAGES/xffm.mo
-share/locale/ms/LC_MESSAGES/xffm.mo
-share/locale/nb_NO/LC_MESSAGES/xffm.mo
-share/locale/nl/LC_MESSAGES/xffm.mo
-share/locale/pa/LC_MESSAGES/xffm.mo
-share/locale/pl/LC_MESSAGES/xffm.mo
-share/locale/pt_BR/LC_MESSAGES/xffm.mo
-share/locale/pt_PT/LC_MESSAGES/xffm.mo
-share/locale/sk/LC_MESSAGES/xffm.mo
-share/locale/sl/LC_MESSAGES/xffm.mo
-share/locale/sq/LC_MESSAGES/xffm.mo
-share/locale/sv/LC_MESSAGES/xffm.mo
-share/locale/ta/LC_MESSAGES/xffm.mo
-share/locale/tr/LC_MESSAGES/xffm.mo
-share/locale/uk/LC_MESSAGES/xffm.mo
-share/locale/vi/LC_MESSAGES/xffm.mo
-share/locale/zh_CN/LC_MESSAGES/xffm.mo
-share/locale/zh_TW/LC_MESSAGES/xffm.mo
-share/xfce4/doc/C/images/book_popup.png
-share/xfce4/doc/C/images/column_titles_popup.png
-share/xfce4/doc/C/images/diagnostics_window.png
-share/xfce4/doc/C/images/directory_popup.png
-share/xfce4/doc/C/images/directory_popup_unmount.png
-share/xfce4/doc/C/images/file_popup.png
-share/xfce4/doc/C/images/file_subpopup.png
-share/xfce4/doc/C/images/filter_box.png
-share/xfce4/doc/C/images/frequent_popup.png
-share/xfce4/doc/C/images/fstab_popup_mount.png
-share/xfce4/doc/C/images/fstab_popup_unmount.png
-share/xfce4/doc/C/images/go_menu.png
-share/xfce4/doc/C/images/hide_show_buttons.png
-share/xfce4/doc/C/images/icon_title_smartbutton.png
-share/xfce4/doc/C/images/main_menu.png
-share/xfce4/doc/C/images/mcs-plugin.png
-share/xfce4/doc/C/images/netfile_popup.png
-share/xfce4/doc/C/images/netshare_popup.png
-share/xfce4/doc/C/images/open_menu.png
-share/xfce4/doc/C/images/options_menu.png
-share/xfce4/doc/C/images/preferences_menu.png
-share/xfce4/doc/C/images/recent_popup.png
-share/xfce4/doc/C/images/sidebar_filesubmenu.png
-share/xfce4/doc/C/images/sidebar_go.png
-share/xfce4/doc/C/images/sidebar_multiple_select.png
-share/xfce4/doc/C/images/sidebar_open.png
-share/xfce4/doc/C/images/sidebar_options.png
-share/xfce4/doc/C/images/sidebar_paste.png
-share/xfce4/doc/C/images/sidebar_tools.png
-share/xfce4/doc/C/images/sort_subpopup.png
-share/xfce4/doc/C/images/t_main_menu.png
-share/xfce4/doc/C/images/tools_menu.png
-share/xfce4/doc/C/images/trash_popup.png
-share/xfce4/doc/C/images/xffm_default.png
-share/xfce4/doc/C/xffm.html
-share/xfce4/doc/fr/images/book_popup.png
-share/xfce4/doc/fr/images/column_titles_popup.png
-share/xfce4/doc/fr/images/diagnostics_window.png
-share/xfce4/doc/fr/images/directory_popup.png
-share/xfce4/doc/fr/images/directory_popup_unmount.png
-share/xfce4/doc/fr/images/file_popup.png
-share/xfce4/doc/fr/images/file_subpopup.png
-share/xfce4/doc/fr/images/filter_box.png
-share/xfce4/doc/fr/images/frequent_popup.png
-share/xfce4/doc/fr/images/fstab_popup_mount.png
-share/xfce4/doc/fr/images/go_menu.png
-share/xfce4/doc/fr/images/hide_show_buttons.png
-share/xfce4/doc/fr/images/icon_title_smartbutton.png
-share/xfce4/doc/fr/images/main_menu.png
-share/xfce4/doc/fr/images/mcs-plugin.png
-share/xfce4/doc/fr/images/netfile_popup.png
-share/xfce4/doc/fr/images/open_menu.png
-share/xfce4/doc/fr/images/options_menu.png
-share/xfce4/doc/fr/images/preferences_menu.png
-share/xfce4/doc/fr/images/recent_popup.png
-share/xfce4/doc/fr/images/sidebar_filesubmenu.png
-share/xfce4/doc/fr/images/sidebar_go.png
-share/xfce4/doc/fr/images/sidebar_multiple_select.png
-share/xfce4/doc/fr/images/sidebar_open.png
-share/xfce4/doc/fr/images/sidebar_options.png
-share/xfce4/doc/fr/images/sidebar_paste.png
-share/xfce4/doc/fr/images/sidebar_tools.png
-share/xfce4/doc/fr/images/sort_subpopup.png
-share/xfce4/doc/fr/images/tools_menu.png
-share/xfce4/doc/fr/images/trash_popup.png
-share/xfce4/doc/fr/images/xffm_default.png
-share/xfce4/doc/fr/xffm.html
-share/xfce4/doc/he/images/book_popup.png
-share/xfce4/doc/he/images/column_titles_popup.png
-share/xfce4/doc/he/images/diagnostics_window.png
-share/xfce4/doc/he/images/directory_popup.png
-share/xfce4/doc/he/images/directory_popup_unmount.png
-share/xfce4/doc/he/images/file_popup.png
-share/xfce4/doc/he/images/file_subpopup.png
-share/xfce4/doc/he/images/filter_box.png
-share/xfce4/doc/he/images/frequent_popup.png
-share/xfce4/doc/he/images/fstab_popup_mount.png
-share/xfce4/doc/he/images/go_menu.png
-share/xfce4/doc/he/images/hide_show_buttons.png
-share/xfce4/doc/he/images/icon_title_smartbutton.png
-share/xfce4/doc/he/images/main_menu.png
-share/xfce4/doc/he/images/mcs-plugin.png
-share/xfce4/doc/he/images/netfile_popup.png
-share/xfce4/doc/he/images/netshare_popup.png
-share/xfce4/doc/he/images/open_menu.png
-share/xfce4/doc/he/images/options_menu.png
-share/xfce4/doc/he/images/preferences_menu.png
-share/xfce4/doc/he/images/recent_popup.png
-share/xfce4/doc/he/images/sidebar_filesubmenu.png
-share/xfce4/doc/he/images/sidebar_go.png
-share/xfce4/doc/he/images/sidebar_multiple_select.png
-share/xfce4/doc/he/images/sidebar_open.png
-share/xfce4/doc/he/images/sidebar_options.png
-share/xfce4/doc/he/images/sidebar_paste.png
-share/xfce4/doc/he/images/sidebar_tools.png
-share/xfce4/doc/he/images/sort_subpopup.png
-share/xfce4/doc/he/images/tools_menu.png
-share/xfce4/doc/he/images/trash_popup.png
-share/xfce4/doc/he/images/xffm_default.png
-share/xfce4/doc/he/xffm.html
-share/xfce4/xffm/AUTHORS
-share/xfce4/xffm/AUTHORS.vi
-share/xfce4/xffm/xffm.spec
-share/xfce4/xffm/xffm.spec.in
-@dirrm share/xffm/pixmaps
-@dirrm share/xffm
-@dirrm share/xfce4/xffm
-@dirrm lib/xfce4/xffm
-@unexec ${RMDIR} %D/share/icons/hicolor/48x48/stock/generic 2>/dev/null || ${TRUE}
diff --git a/sysutils/xfce4-fm/buildlink3.mk b/sysutils/xfce4-fm/buildlink3.mk
deleted file mode 100644
index c144b55b11a..00000000000
--- a/sysutils/xfce4-fm/buildlink3.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.18 2007/01/23 11:53:46 martti Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XFCE4_FM_BUILDLINK3_MK:= ${XFCE4_FM_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= xfce4-fm
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-fm}
-BUILDLINK_PACKAGES+= xfce4-fm
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-fm
-
-.if ${XFCE4_FM_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-fm+= xfce4-fm>=4.2.4
-BUILDLINK_PKGSRCDIR.xfce4-fm?= ../../sysutils/xfce4-fm
-.endif # XFCE4_FM_BUILDLINK3_MK
-
-.include "../../databases/dbh/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-fm/distinfo b/sysutils/xfce4-fm/distinfo
deleted file mode 100644
index f6caf6b09a6..00000000000
--- a/sysutils/xfce4-fm/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.15 2007/01/23 11:53:46 martti Exp $
-
-SHA1 (xffm-4.2.4.tar.gz) = f2eaa1e0aeb23bbf9cff7636c7ad93ff3db2aaae
-RMD160 (xffm-4.2.4.tar.gz) = a2418f0dc11b231e5a0e7ad613cd377ae7016024
-Size (xffm-4.2.4.tar.gz) = 5077979 bytes
-SHA1 (patch-aa) = 06f2eabaad3d7901243d547e65f1737c29ba42a6
-SHA1 (patch-ab) = a2f8f23527945056cd4ba2f6acc53ba5c1fb7bfc
diff --git a/sysutils/xfce4-fm/patches/patch-aa b/sysutils/xfce4-fm/patches/patch-aa
deleted file mode 100644
index 8c2b7d57615..00000000000
--- a/sysutils/xfce4-fm/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/02/27 22:31:56 joerg Exp $
-
---- libs/uri.h.orig 2006-02-27 22:24:10.000000000 +0000
-+++ libs/uri.h
-@@ -38,8 +38,7 @@ enum
- URI_FTP,
- URI_TAR,
- URI_SMB
--}
--UriType;
-+};
-
- typedef struct
- {
diff --git a/sysutils/xfce4-fm/patches/patch-ab b/sysutils/xfce4-fm/patches/patch-ab
deleted file mode 100644
index 7de9fb7589a..00000000000
--- a/sysutils/xfce4-fm/patches/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/11/28 20:11:08 rillig Exp $
-
-SunPro says: Functions of type void cannot return a value.
-
---- libs/modules.c.orig 2005-11-05 18:13:43.000000000 +0100
-+++ libs/modules.c 2006-11-28 21:08:48.504015056 +0100
-@@ -104,7 +104,7 @@ void unload_module(const gchar *module_n
- }
-
- G_MODULE_EXPORT
--void unload_xfc(void){ return unload_module("xfce4_combo");}
-+void unload_xfc(void){ unload_module("xfce4_combo");}
- G_MODULE_EXPORT
- xfc_combo_functions *load_xfc(void){
- xfc_combo_functions *xfc_fun = (xfc_combo_functions *)load_module("modules","xfce4_combo");
-@@ -114,7 +114,7 @@ xfc_combo_functions *load_xfc(void){
- }
-
- G_MODULE_EXPORT
--void unload_mime_icon_module(void){return unload_module("xfce4_mime_icons");}
-+void unload_mime_icon_module(void){ unload_module("xfce4_mime_icons");}
- G_MODULE_EXPORT
- xfmime_icon_functions *load_mime_icon_module(void){
- xfmime_icon_functions *xfmime_icon_fun=(xfmime_icon_functions *)load_module("modules","xfce4_mime_icons");
-@@ -122,7 +122,7 @@ xfmime_icon_functions *load_mime_icon_mo
- }
-
- G_MODULE_EXPORT
--void unload_mime_module(void){return unload_module("xfce4_mime");}
-+void unload_mime_module(void){ unload_module("xfce4_mime");}
- G_MODULE_EXPORT
- xfmime_functions *load_mime_module(void){
- xfmime_functions *xfmime_fun=(xfmime_functions *)load_module("modules","xfce4_mime");
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index fbc42f50422..828c336a5b9 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.5 2006/04/17 13:46:14 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/04/12 09:55:15 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 0.2.1
+XFCE4_VERSION= 0.3.0
DISTNAME= xfce4-fsguard-plugin-${XFCE4_VERSION}
-PKGREVISION= 3
+#PKGREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/xfce4-fsguard-plugin/
COMMENT= Xfce disk space plugin
+USE_TOOLS+= intltool
+
.include "../../x11/xfce4-panel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-fsguard-plugin/PLIST b/sysutils/xfce4-fsguard-plugin/PLIST
index 46b52707ea2..ba7ac841d45 100644
--- a/sysutils/xfce4-fsguard-plugin/PLIST
+++ b/sysutils/xfce4-fsguard-plugin/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/17 07:07:35 jlam Exp $
-lib/xfce4/panel-plugins/libfsguard.la
-share/locale/de/LC_MESSAGES/xfce4-fsguard.mo
-share/locale/ko/LC_MESSAGES/xfce4-fsguard.mo
-share/locale/lt/LC_MESSAGES/xfce4-fsguard.mo
-share/locale/pl/LC_MESSAGES/xfce4-fsguard.mo
+@comment $NetBSD: PLIST,v 1.3 2007/04/12 09:55:16 martti Exp $
+libexec/xfce4/panel-plugins/xfce4-fsguard-plugin
+share/locale/de/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/locale/ko/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/locale/lt/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/xfce4/panel-plugins/fsguard.desktop
diff --git a/sysutils/xfce4-fsguard-plugin/buildlink3.mk b/sysutils/xfce4-fsguard-plugin/buildlink3.mk
index be7502c4bf3..427a47af4e4 100644
--- a/sysutils/xfce4-fsguard-plugin/buildlink3.mk
+++ b/sysutils/xfce4-fsguard-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/10/12 09:24:19 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2007/04/12 09:55:16 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK:= ${XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= xfce4-fsguard-plugin
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-fsguard-plugin
.if ${XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-fsguard-plugin+= xfce4-fsguard-plugin>=0.2.1nb3
+BUILDLINK_API_DEPENDS.xfce4-fsguard-plugin+= xfce4-fsguard-plugin>=0.3.0
BUILDLINK_PKGSRCDIR.xfce4-fsguard-plugin?= ../../sysutils/xfce4-fsguard-plugin
.endif # XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK
diff --git a/sysutils/xfce4-fsguard-plugin/distinfo b/sysutils/xfce4-fsguard-plugin/distinfo
index d0e33500022..ae1207d6e0e 100644
--- a/sysutils/xfce4-fsguard-plugin/distinfo
+++ b/sysutils/xfce4-fsguard-plugin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2007/01/23 17:07:58 joerg Exp $
+$NetBSD: distinfo,v 1.4 2007/04/12 09:55:16 martti Exp $
-SHA1 (xfce4-fsguard-plugin-0.2.1.tar.gz) = 86ad7752fdab209cd460f2da562f979196a1e643
-RMD160 (xfce4-fsguard-plugin-0.2.1.tar.gz) = 194290bf0e5d471cefb1d1446330d0320af38763
-Size (xfce4-fsguard-plugin-0.2.1.tar.gz) = 339959 bytes
-SHA1 (patch-aa) = c6a814bf0fa779099b8f24ca8f754d373dcd70eb
+SHA1 (xfce4-fsguard-plugin-0.3.0.tar.bz2) = 63241ada67681eff66f269bfd53d6d6b11a37d4b
+RMD160 (xfce4-fsguard-plugin-0.3.0.tar.bz2) = 7989c2209b0f363cc4a2ac778d8ea627fa22378e
+Size (xfce4-fsguard-plugin-0.3.0.tar.bz2) = 113601 bytes
+SHA1 (patch-aa) = 7d34aa74ab207c47a8f1208519089e42f8b97ba4
diff --git a/sysutils/xfce4-fsguard-plugin/patches/patch-aa b/sysutils/xfce4-fsguard-plugin/patches/patch-aa
index 9ed35d56017..cdb0e1124d7 100644
--- a/sysutils/xfce4-fsguard-plugin/patches/patch-aa
+++ b/sysutils/xfce4-fsguard-plugin/patches/patch-aa
@@ -1,19 +1,14 @@
-$NetBSD: patch-aa,v 1.3 2007/01/23 17:07:58 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2007/04/12 09:55:16 martti Exp $
---- panel-plugin/fsguard.c.orig 2005-10-11 20:27:09.000000000 +0000
-+++ panel-plugin/fsguard.c
-@@ -41,10 +41,13 @@
- #include <sys/stat.h>
- #if defined(__linux__)
- #include <sys/vfs.h>
--#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+--- panel-plugin/fsguard.c.orig 2006-09-07 10:10:41.000000000 +0000
++++ panel-plugin/fsguard.c 2006-09-07 10:11:25.000000000 +0000
+@@ -43,6 +43,9 @@
#include <sys/param.h>
#include <sys/mount.h>
#endif
+#if defined(__NetBSD__) && (__NetBSD_Version__ > 299000900) /* NetBSD 2.99.9 */
+#define statfs statvfs
+#endif
- #include <panel/plugins.h>
- #include <panel/xfce.h>
- #include <panel/xfce_support.h>
+
+ #include <gtk/gtk.h>
+ #include <libxfce4util/libxfce4util.h>
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index ba196c52b69..eb9e9a86abc 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.16 2006/04/17 13:46:13 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/04/12 09:55:16 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 0.3.3
+XFCE4_VERSION= 0.4.0
DISTNAME= xfce4-netload-plugin-${XFCE4_VERSION}
-PKGREVISION= 4
+#PKGREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/xfce4-netload-plugin/
COMMENT= Xfce network load plugin
-EXTRACT_SUFX= .tar.bz2
-
.include "../../x11/xfce4-panel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-netload-plugin/PLIST b/sysutils/xfce4-netload-plugin/PLIST
index c43ada7b60a..165707d67fe 100644
--- a/sysutils/xfce4-netload-plugin/PLIST
+++ b/sysutils/xfce4-netload-plugin/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2006/04/17 07:07:35 jlam Exp $
-lib/xfce4/panel-plugins/libnetload.la
-share/locale/ca/LC_MESSAGES/xfce4-netload.mo
-share/locale/de/LC_MESSAGES/xfce4-netload.mo
-share/locale/fr/LC_MESSAGES/xfce4-netload.mo
-share/locale/ko/LC_MESSAGES/xfce4-netload.mo
-share/locale/lt/LC_MESSAGES/xfce4-netload.mo
-share/locale/pl/LC_MESSAGES/xfce4-netload.mo
-share/locale/uk/LC_MESSAGES/xfce4-netload.mo
+@comment $NetBSD: PLIST,v 1.7 2007/04/12 09:55:16 martti Exp $
+libexec/xfce4/panel-plugins/xfce4-netload-plugin
+share/locale/ca/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/ko/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/lt/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/uk/LC_MESSAGES/xfce4-netload-plugin.mo
+share/xfce4/panel-plugins/netload.desktop
diff --git a/sysutils/xfce4-netload-plugin/buildlink3.mk b/sysutils/xfce4-netload-plugin/buildlink3.mk
index 721c3991876..29f396d9a46 100644
--- a/sysutils/xfce4-netload-plugin/buildlink3.mk
+++ b/sysutils/xfce4-netload-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/10/12 09:24:20 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2007/04/12 09:55:16 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:= ${XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK}+
@@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+= xfce4-netload-plugin
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-netload-plugin
.if ${XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-netload-plugin+= xfce4-netload-plugin>=0.3.3nb4
+BUILDLINK_API_DEPENDS.xfce4-netload-plugin+= xfce4-netload-plugin>=0.4.0
BUILDLINK_PKGSRCDIR.xfce4-netload-plugin?= ../../sysutils/xfce4-netload-plugin
.endif # XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK
.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-netload-plugin/distinfo b/sysutils/xfce4-netload-plugin/distinfo
index 51265114353..358b936b6c1 100644
--- a/sysutils/xfce4-netload-plugin/distinfo
+++ b/sysutils/xfce4-netload-plugin/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.8 2006/02/05 13:15:37 martti Exp $
+$NetBSD: distinfo,v 1.9 2007/04/12 09:55:16 martti Exp $
-SHA1 (xfce4-netload-plugin-0.3.3.tar.bz2) = 7f43826f7a5cc2256ac27657aa45fede2f2d764f
-RMD160 (xfce4-netload-plugin-0.3.3.tar.bz2) = db0ca8fc0cc8cb5856fdd3a4a9b5e5d52a354925
-Size (xfce4-netload-plugin-0.3.3.tar.bz2) = 247015 bytes
-SHA1 (patch-aa) = 0a5771eab05ab1acb20f8cc8b7775212d00d234a
-SHA1 (patch-ab) = 76217b49da5d6e4d4600d726842e1eb4047c318c
+SHA1 (xfce4-netload-plugin-0.4.0.tar.bz2) = 197231f99773f4e299c64125dd0d1a25bfb533bb
+RMD160 (xfce4-netload-plugin-0.4.0.tar.bz2) = 47d8183da3885b6a476504fd8d5762be7d4fffac
+Size (xfce4-netload-plugin-0.4.0.tar.bz2) = 125046 bytes
diff --git a/sysutils/xfce4-netload-plugin/patches/patch-aa b/sysutils/xfce4-netload-plugin/patches/patch-aa
deleted file mode 100644
index e8772549bcd..00000000000
--- a/sysutils/xfce4-netload-plugin/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/02/05 13:15:38 martti Exp $
-
---- panel-plugin/Makefile.am.orig 2006-02-05 13:08:23.000000000 +0200
-+++ panel-plugin/Makefile.am 2006-02-05 13:08:42.000000000 +0200
-@@ -28,6 +28,5 @@
- @XFCE4_PANEL_CFLAGS@
-
- libnetload_la_LIBADD = \
-- @LIBGTOP_LIBS@ \
- @SOLLIBS@ \
- @XFCE4_PANEL_LIBS@
diff --git a/sysutils/xfce4-netload-plugin/patches/patch-ab b/sysutils/xfce4-netload-plugin/patches/patch-ab
deleted file mode 100644
index bd1ac8020f3..00000000000
--- a/sysutils/xfce4-netload-plugin/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/02/05 13:15:38 martti Exp $
-
---- panel-plugin/Makefile.in.orig 2006-02-05 13:08:55.000000000 +0200
-+++ panel-plugin/Makefile.in 2006-02-05 13:09:01.000000000 +0200
-@@ -228,7 +228,6 @@
- @XFCE4_PANEL_CFLAGS@
-
- libnetload_la_LIBADD = \
-- @LIBGTOP_LIBS@ \
- @SOLLIBS@ \
- @XFCE4_PANEL_LIBS@
-
diff --git a/sysutils/xfce4-quicklauncher-plugin/Makefile b/sysutils/xfce4-quicklauncher-plugin/Makefile
index 0289c4af1e1..03c2a54efaf 100644
--- a/sysutils/xfce4-quicklauncher-plugin/Makefile
+++ b/sysutils/xfce4-quicklauncher-plugin/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.6 2006/04/17 13:46:14 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/04/12 09:55:17 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 0.81
+XFCE4_VERSION= 1.9.2
DISTNAME= xfce4-quicklauncher-plugin-${XFCE4_VERSION}
-PKGREVISION= 4
+#PKGREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/xfce4-quicklauncher-plugin/
COMMENT= Xfce quicklaunch plugin
+USE_TOOLS+= intltool
+
.include "../../x11/xfce4-panel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-quicklauncher-plugin/PLIST b/sysutils/xfce4-quicklauncher-plugin/PLIST
index e9c3943554f..12bb1febc93 100644
--- a/sysutils/xfce4-quicklauncher-plugin/PLIST
+++ b/sysutils/xfce4-quicklauncher-plugin/PLIST
@@ -1,3 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:35 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/04/12 09:55:17 martti Exp $
lib/xfce4/panel-plugins/libquicklauncher.la
+share/locale/cs/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
+share/locale/el/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
share/locale/fr/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
+share/locale/gl/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
+share/locale/ja/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
+share/locale/ru/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
+share/locale/vi/LC_MESSAGES/xfce4-quicklauncher-plugin.mo
+share/xfce4/panel-plugins/quicklauncher.desktop
diff --git a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
index 56d5d6c60be..4db2cccec67 100644
--- a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
+++ b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/10/12 09:24:20 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/04/12 09:55:17 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK:= ${XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK}+
@@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+= xfce4-quicklauncher-plugin
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-quicklauncher-plugin
.if ${XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-quicklauncher-plugin+= xfce4-quicklauncher-plugin>=0.81nb4
+BUILDLINK_API_DEPENDS.xfce4-quicklauncher-plugin+= xfce4-quicklauncher-plugin>=1.9.2
BUILDLINK_PKGSRCDIR.xfce4-quicklauncher-plugin?= ../../sysutils/xfce4-quicklauncher-plugin
.endif # XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK
.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-quicklauncher-plugin/distinfo b/sysutils/xfce4-quicklauncher-plugin/distinfo
index 67e9bff181e..e011a40811d 100644
--- a/sysutils/xfce4-quicklauncher-plugin/distinfo
+++ b/sysutils/xfce4-quicklauncher-plugin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/26 04:44:56 minskim Exp $
+$NetBSD: distinfo,v 1.2 2007/04/12 09:55:17 martti Exp $
-SHA1 (xfce4-quicklauncher-plugin-0.81.tar.gz) = bb4fda366e29ac09ab2544899d19d9dcc70216dd
-RMD160 (xfce4-quicklauncher-plugin-0.81.tar.gz) = f042389bf6c8127634b833950f0463dbe9fcae7b
-Size (xfce4-quicklauncher-plugin-0.81.tar.gz) = 411716 bytes
+SHA1 (xfce4-quicklauncher-plugin-1.9.2.tar.bz2) = 88e035799622a4b273b2b6b9c85d7cd4e42d74fe
+RMD160 (xfce4-quicklauncher-plugin-1.9.2.tar.bz2) = fabf4dcda63cc31de5158ce3eec8d6bb6fd262be
+Size (xfce4-quicklauncher-plugin-1.9.2.tar.bz2) = 324202 bytes
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index aa7935777fe..a2dba8aa0ce 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2007/01/19 16:28:15 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/04/12 09:55:17 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 0.3.6
+XFCE4_VERSION= 0.4.2
DISTNAME= xfce4-systemload-plugin-${XFCE4_VERSION}
-PKGREVISION= 4
+#PKGREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/xfce4-systemload-plugin/
COMMENT= Xfce system load plugin
.include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/xfce4-systemload-plugin/PLIST b/sysutils/xfce4-systemload-plugin/PLIST
index f707f71f805..d047d224822 100644
--- a/sysutils/xfce4-systemload-plugin/PLIST
+++ b/sysutils/xfce4-systemload-plugin/PLIST
@@ -1,7 +1,19 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/17 07:07:35 jlam Exp $
-lib/xfce4/panel-plugins/libsystemload.la
-share/locale/ca/LC_MESSAGES/xfce4-systemload.mo
-share/locale/de/LC_MESSAGES/xfce4-systemload.mo
-share/locale/hu/LC_MESSAGES/xfce4-systemload.mo
-share/locale/lt/LC_MESSAGES/xfce4-systemload.mo
-share/locale/uk/LC_MESSAGES/xfce4-systemload.mo
+@comment $NetBSD: PLIST,v 1.5 2007/04/12 09:55:17 martti Exp $
+libexec/xfce4/panel-plugins/xfce4-systemload-plugin
+share/locale/ca/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/gl/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/ko/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/lt/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/nl/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/sv/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/uk/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/vi/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/xfce4/panel-plugins/systemload.desktop
diff --git a/sysutils/xfce4-systemload-plugin/buildlink3.mk b/sysutils/xfce4-systemload-plugin/buildlink3.mk
index 86ad48586ed..5fa2774b767 100644
--- a/sysutils/xfce4-systemload-plugin/buildlink3.mk
+++ b/sysutils/xfce4-systemload-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/10/12 09:24:20 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2007/04/12 09:55:17 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:= ${XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK}+
@@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+= xfce4-systemload-plugin
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-systemload-plugin
.if ${XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-systemload-plugin+= xfce4-systemload-plugin>=0.3.6nb4
+BUILDLINK_API_DEPENDS.xfce4-systemload-plugin+= xfce4-systemload-plugin>=0.4.2
BUILDLINK_PKGSRCDIR.xfce4-systemload-plugin?= ../../sysutils/xfce4-systemload-plugin
.endif # XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK
.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-systemload-plugin/distinfo b/sysutils/xfce4-systemload-plugin/distinfo
index cce2afc6ecd..2e469088ddb 100644
--- a/sysutils/xfce4-systemload-plugin/distinfo
+++ b/sysutils/xfce4-systemload-plugin/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.8 2007/01/20 12:15:38 joerg Exp $
+$NetBSD: distinfo,v 1.9 2007/04/12 09:55:17 martti Exp $
-SHA1 (xfce4-systemload-plugin-0.3.6.tar.gz) = ed477e9c8499b8e34031658237586a83bc12cef4
-RMD160 (xfce4-systemload-plugin-0.3.6.tar.gz) = a7b3f28326262eeb5aa66d5cd966474ac0a4554b
-Size (xfce4-systemload-plugin-0.3.6.tar.gz) = 229985 bytes
-SHA1 (patch-aa) = f997c210580541883fa47738d2cec667517efcac
-SHA1 (patch-ab) = 51adca6bf236f78645b0ad0741f215603b7de8bf
-SHA1 (patch-ac) = cd16d045e24b5a802faffb260f58a86a49989077
+SHA1 (xfce4-systemload-plugin-0.4.2.tar.bz2) = 517cc051633cc6f28147d5adeaf5db56219dddfb
+RMD160 (xfce4-systemload-plugin-0.4.2.tar.bz2) = 228ad33b12a6a1151be6d079bd4c5a18fd50ba76
+Size (xfce4-systemload-plugin-0.4.2.tar.bz2) = 184575 bytes
+SHA1 (patch-aa) = 5526126b144359686781e6ddc1ef43fcd0afc03a
+SHA1 (patch-ab) = 9b7c4c4fd0db26a3ac239d1ffe5f3be7c32902f8
diff --git a/sysutils/xfce4-systemload-plugin/patches/patch-aa b/sysutils/xfce4-systemload-plugin/patches/patch-aa
index fd834abba32..796ea5fafe2 100644
--- a/sysutils/xfce4-systemload-plugin/patches/patch-aa
+++ b/sysutils/xfce4-systemload-plugin/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2007/01/19 16:28:15 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2007/04/12 09:55:17 martti Exp $
---- panel-plugin/memswap.c.orig 2003-11-06 00:39:52.000000000 +0000
-+++ panel-plugin/memswap.c
-@@ -113,7 +113,7 @@ gint read_memswap(gulong *mem, gulong *s
+--- panel-plugin/memswap.c.orig 2007-01-17 18:01:09.000000000 +0000
++++ panel-plugin/memswap.c 2007-01-23 21:42:59.000000000 +0000
+@@ -113,7 +113,7 @@
return 0;
}
@@ -11,55 +11,3 @@ $NetBSD: patch-aa,v 1.3 2007/01/19 16:28:15 joerg Exp $
/*
* This is inspired by /usr/src/usr.bin/top/machine.c
*
-@@ -284,7 +284,24 @@ gint read_memswap(gulong *mem, gulong *s
-
- #define ARRLEN(X) (sizeof(X)/sizeof(X[0]))
- {
-- static int mib[]={ CTL_HW, HW_PHYSMEM };
-+ static int mib[2];
-+
-+#ifdef HW_PHYSMEM64
-+ /* 64-bit datatype */
-+ if (sizeof(size_t) == 8) {
-+ mib[0] = CTL_HW;
-+ mib[1] = HW_PHYSMEM64;
-+ }
-+ /* assume 32-bit datatype */
-+ else {
-+ mib[0] = CTL_HW;
-+ mib[1] = HW_PHYSMEM;
-+ }
-+#else
-+ mib[0] = CTL_HW;
-+ mib[1] = HW_PHYSMEM;
-+#endif
-+
- len = sizeof(MTotal);
- sysctl(mib, ARRLEN(mib), &MTotal, &len, NULL, 0);
- MTotal >>= 10;
-@@ -395,7 +412,24 @@ gint read_memswap(gulong *mem, gulong *s
-
- #define ARRLEN(X) (sizeof(X)/sizeof(X[0]))
- {
-- static int mib[]={ CTL_HW, HW_PHYSMEM };
-+ static int mib[2];
-+
-+#ifdef HW_PHYSMEM64
-+ /* 64-bit datatype */
-+ if (sizeof(size_t) == 8) {
-+ mib[0] = CTL_HW;
-+ mib[1] = HW_PHYSMEM64;
-+ }
-+ /* assume 32-bit datatype */
-+ else {
-+ mib[0] = CTL_HW;
-+ mib[1] = HW_PHYSMEM;
-+ }
-+#else
-+ mib[0] = CTL_HW;
-+ mib[1] = HW_PHYSMEM;
-+#endif
-+
- len = sizeof(MTotal);
- sysctl(mib, ARRLEN(mib), &MTotal, &len, NULL, 0);
- MTotal >>= 10;
diff --git a/sysutils/xfce4-systemload-plugin/patches/patch-ab b/sysutils/xfce4-systemload-plugin/patches/patch-ab
index 39cfef6c5f8..5f5da767e92 100644
--- a/sysutils/xfce4-systemload-plugin/patches/patch-ab
+++ b/sysutils/xfce4-systemload-plugin/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2007/01/19 16:28:15 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2007/04/12 09:55:17 martti Exp $
---- panel-plugin/cpu.c.orig 2007-01-19 15:10:47.000000000 +0000
-+++ panel-plugin/cpu.c
-@@ -81,6 +81,31 @@ gulong read_cpuload()
+--- panel-plugin/cpu.c.orig 2007-01-17 18:01:09.000000000 +0000
++++ panel-plugin/cpu.c 2007-01-23 21:46:41.000000000 +0000
+@@ -78,6 +78,31 @@
return cpu_used;
}
diff --git a/sysutils/xfce4-systemload-plugin/patches/patch-ac b/sysutils/xfce4-systemload-plugin/patches/patch-ac
deleted file mode 100644
index c8ac5f25e63..00000000000
--- a/sysutils/xfce4-systemload-plugin/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2007/01/20 12:15:38 joerg Exp $
-
-OS_LIBS contains -lkinfo on DragonFly.
-
---- panel-plugin/Makefile.in.orig 2007-01-19 15:42:16.000000000 +0000
-+++ panel-plugin/Makefile.in
-@@ -206,6 +206,7 @@ libsystemload_la_CFLAGS = \
- @XFCE4_PANEL_CFLAGS@
-
- libsystemload_la_LIBADD = \
-+ ${OS_LIBS} \
- @XFCE4_PANEL_LIBS@
-
- all: all-am
diff --git a/sysutils/xfce4-systray/DESCR b/sysutils/xfce4-systray/DESCR
deleted file mode 100644
index 0c33a665a4c..00000000000
--- a/sysutils/xfce4-systray/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Systray plugin for Xfce.
diff --git a/sysutils/xfce4-systray/Makefile b/sysutils/xfce4-systray/Makefile
deleted file mode 100644
index b463474602a..00000000000
--- a/sysutils/xfce4-systray/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2007/01/23 11:53:46 martti Exp $
-
-.include "../../meta-pkgs/xfce4/Makefile.common"
-
-DISTNAME= xfce4-systray-${XFCE4_VERSION}
-#PKGREVISION= 1
-CATEGORIES= sysutils
-COMMENT= Xfce systray plugin
-
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-systray/PLIST b/sysutils/xfce4-systray/PLIST
deleted file mode 100644
index e0e4c367864..00000000000
--- a/sysutils/xfce4-systray/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:54 jlam Exp $
-lib/xfce4/panel-plugins/libsystray.la
diff --git a/sysutils/xfce4-systray/buildlink3.mk b/sysutils/xfce4-systray/buildlink3.mk
deleted file mode 100644
index e6e257c441f..00000000000
--- a/sysutils/xfce4-systray/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.18 2007/01/23 11:53:46 martti Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XFCE4_SYSTRAY_BUILDLINK3_MK:= ${XFCE4_SYSTRAY_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= xfce4-systray
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-systray}
-BUILDLINK_PACKAGES+= xfce4-systray
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-systray
-
-.if ${XFCE4_SYSTRAY_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-systray+= xfce4-systray>=4.2.4
-BUILDLINK_PKGSRCDIR.xfce4-systray?= ../../sysutils/xfce4-systray
-.endif # XFCE4_SYSTRAY_BUILDLINK3_MK
-
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-systray/distinfo b/sysutils/xfce4-systray/distinfo
deleted file mode 100644
index 5e5ee78b474..00000000000
--- a/sysutils/xfce4-systray/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.13 2007/01/23 11:53:46 martti Exp $
-
-SHA1 (xfce4-systray-4.2.4.tar.gz) = a5e3f06fcb5ccca1ef908747f7a42db61081d26f
-RMD160 (xfce4-systray-4.2.4.tar.gz) = a9e24e2005658451ab0e38542d78cf260f2fe5b6
-Size (xfce4-systray-4.2.4.tar.gz) = 330159 bytes
diff --git a/sysutils/xfce4-xkb-plugin/Makefile b/sysutils/xfce4-xkb-plugin/Makefile
index 5b12b61c9fb..661e03dd95c 100644
--- a/sysutils/xfce4-xkb-plugin/Makefile
+++ b/sysutils/xfce4-xkb-plugin/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.10 2007/01/19 14:58:17 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/04/12 09:55:19 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 0.3.3
+XFCE4_VERSION= 0.4.3
DISTNAME= xfce4-xkb-plugin-${XFCE4_VERSION}
-PKGREVISION= 1
+#PKGREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/xfce4-xkb-plugin/
COMMENT= Xfce Keyboard plugin
-.include "../../x11/libXpm/buildlink3.mk"
+USE_TOOLS+= intltool
+
.include "../../x11/xfce4-panel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-xkb-plugin/PLIST b/sysutils/xfce4-xkb-plugin/PLIST
index a4da7907735..73cfb2735b9 100644
--- a/sysutils/xfce4-xkb-plugin/PLIST
+++ b/sysutils/xfce4-xkb-plugin/PLIST
@@ -1,5 +1,19 @@
-@comment $NetBSD: PLIST,v 1.3 2006/03/10 08:25:05 martti Exp $
-lib/xfce4/panel-plugins/libxkb.la
+@comment $NetBSD: PLIST,v 1.4 2007/04/12 09:55:19 martti Exp $
+libexec/xfce4/panel-plugins/xfce4-xkb-plugin
+share/locale/bg/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/ca/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/el/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/gl/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/ja/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/ru/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/xfce4/panel-plugins/xkb-plugin.desktop
share/xfce4/xkb/flags/ae.png
share/xfce4/xkb/flags/am.png
share/xfce4/xkb/flags/ar.png
@@ -20,12 +34,12 @@ share/xfce4/xkb/flags/dk.png
share/xfce4/xkb/flags/dz.png
share/xfce4/xkb/flags/ee.png
share/xfce4/xkb/flags/eg.png
-share/xfce4/xkb/flags/el.png
share/xfce4/xkb/flags/es.png
share/xfce4/xkb/flags/eu.png
share/xfce4/xkb/flags/fi.png
share/xfce4/xkb/flags/fr.png
share/xfce4/xkb/flags/ge.png
+share/xfce4/xkb/flags/gr.png
share/xfce4/xkb/flags/hr.png
share/xfce4/xkb/flags/hu.png
share/xfce4/xkb/flags/il.png
diff --git a/sysutils/xfce4-xkb-plugin/buildlink3.mk b/sysutils/xfce4-xkb-plugin/buildlink3.mk
index ca1dbe2bae5..ff8de8d535e 100644
--- a/sysutils/xfce4-xkb-plugin/buildlink3.mk
+++ b/sysutils/xfce4-xkb-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/10/12 09:24:20 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2007/04/12 09:55:19 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_XKB_PLUGIN_BUILDLINK3_MK:= ${XFCE4_XKB_PLUGIN_BUILDLINK3_MK}+
@@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+= xfce4-xkb-plugin
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-xkb-plugin
.if ${XFCE4_XKB_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-xkb-plugin+= xfce4-xkb-plugin>=0.3.3nb1
+BUILDLINK_API_DEPENDS.xfce4-xkb-plugin+= xfce4-xkb-plugin>=0.4.3
BUILDLINK_PKGSRCDIR.xfce4-xkb-plugin?= ../../sysutils/xfce4-xkb-plugin
.endif # XFCE4_XKB_PLUGIN_BUILDLINK3_MK
.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-xkb-plugin/distinfo b/sysutils/xfce4-xkb-plugin/distinfo
index 8a2027c2872..9df43eed585 100644
--- a/sysutils/xfce4-xkb-plugin/distinfo
+++ b/sysutils/xfce4-xkb-plugin/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2006/05/04 06:14:51 martti Exp $
+$NetBSD: distinfo,v 1.7 2007/04/12 09:55:19 martti Exp $
-SHA1 (xfce4-xkb-plugin-0.3.3.tar.gz) = d326bad6ef61a7519f3b72e585f2b58a97d5bb62
-RMD160 (xfce4-xkb-plugin-0.3.3.tar.gz) = b14dcf6d8b8b30d5dd72c6b7cc41be7beae1659c
-Size (xfce4-xkb-plugin-0.3.3.tar.gz) = 338116 bytes
-SHA1 (patch-aa) = dce92aee6d21db1d4c609a3d67e7b1b17aacbcc8
+SHA1 (xfce4-xkb-plugin-0.4.3.tar.bz2) = 962f1fdc6b373fa5d8a886aaaa4d0fbb45c44234
+RMD160 (xfce4-xkb-plugin-0.4.3.tar.bz2) = b2f80e3a44123b82792a3fa981f40799cb29477f
+Size (xfce4-xkb-plugin-0.4.3.tar.bz2) = 231843 bytes
diff --git a/sysutils/xfce4-xkb-plugin/patches/patch-aa b/sysutils/xfce4-xkb-plugin/patches/patch-aa
deleted file mode 100644
index 06c80173c4f..00000000000
--- a/sysutils/xfce4-xkb-plugin/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/05/04 06:14:51 martti Exp $
-
---- panel-plugin/xfce4-xkb-plugin.c.orig 2006-05-04 06:04:50.000000000 +0300
-+++ panel-plugin/xfce4-xkb-plugin.c 2006-05-04 06:06:13.000000000 +0300
-@@ -77,6 +77,7 @@
- static t_xkb * xkb_new(void) {
- t_xkb *xkb;
- char *initial_group;
-+ NetkScreen* netk_screen;
-
- xkb = g_new(t_xkb, 1);
-
-@@ -122,7 +123,7 @@
- plugin = xkb;
-
- // track signals about window change
-- NetkScreen* netk_screen = netk_screen_get_default ();
-+ netk_screen = netk_screen_get_default ();
- win_change_hanler = g_signal_connect( G_OBJECT (netk_screen), "active_window_changed",
- G_CALLBACK(active_window_changed), NULL);
-
diff --git a/time/xfce4-datetime-plugin/Makefile b/time/xfce4-datetime-plugin/Makefile
index 5f924dd5a02..2963b33d24b 100644
--- a/time/xfce4-datetime-plugin/Makefile
+++ b/time/xfce4-datetime-plugin/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.13 2006/04/17 13:46:13 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/04/12 09:55:19 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 0.3.1
+XFCE4_VERSION= 0.5.0
DISTNAME= xfce4-datetime-plugin-${XFCE4_VERSION}
-PKGREVISION= 3
+#PKGREVISION= 1
CATEGORIES= time
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/xfce4-datetime-plugin/
+EXTRACT_SUFX= .tar.gz
COMMENT= Xfce calendar plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/time/xfce4-datetime-plugin/PLIST b/time/xfce4-datetime-plugin/PLIST
index bcf23e48c3f..05785002ec4 100644
--- a/time/xfce4-datetime-plugin/PLIST
+++ b/time/xfce4-datetime-plugin/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/17 07:07:36 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/04/12 09:55:19 martti Exp $
lib/xfce4/panel-plugins/libdatetime.la
-share/locale/ca/LC_MESSAGES/xfce4-datetime.mo
-share/locale/fr/LC_MESSAGES/xfce4-datetime.mo
-share/locale/ko/LC_MESSAGES/xfce4-datetime.mo
+share/locale/hu/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/locale/nl/LC_MESSAGES/xfce4-datetime-plugin.mo
+share/xfce4/panel-plugins/datetime.desktop
diff --git a/time/xfce4-datetime-plugin/buildlink3.mk b/time/xfce4-datetime-plugin/buildlink3.mk
index a3a9a204045..8dec343a651 100644
--- a/time/xfce4-datetime-plugin/buildlink3.mk
+++ b/time/xfce4-datetime-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/10/12 09:24:20 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2007/04/12 09:55:19 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK:= ${XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK}+
@@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+= xfce4-datetime-plugin
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-datetime-plugin
.if ${XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-datetime-plugin+= xfce4-datetime-plugin>=0.3.1nb3
+BUILDLINK_API_DEPENDS.xfce4-datetime-plugin+= xfce4-datetime-plugin>=0.4.1
BUILDLINK_PKGSRCDIR.xfce4-datetime-plugin?= ../../time/xfce4-datetime-plugin
.endif # XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK
.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/time/xfce4-datetime-plugin/distinfo b/time/xfce4-datetime-plugin/distinfo
index 7588b63ec4e..0fb6f574d54 100644
--- a/time/xfce4-datetime-plugin/distinfo
+++ b/time/xfce4-datetime-plugin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 19:14:56 wiz Exp $
+$NetBSD: distinfo,v 1.5 2007/04/12 09:55:19 martti Exp $
-SHA1 (xfce4-datetime-plugin-0.3.1.tar.gz) = 70b308fbc146b9e172e47d7e10fd10ed1707a46e
-RMD160 (xfce4-datetime-plugin-0.3.1.tar.gz) = 12d08ceb342d433e0c629e6047570c241be46256
-Size (xfce4-datetime-plugin-0.3.1.tar.gz) = 311941 bytes
+SHA1 (xfce4-datetime-plugin-0.5.0.tar.gz) = f18d788a907c251a6b586a15b1deb4eac0a0cb95
+RMD160 (xfce4-datetime-plugin-0.5.0.tar.gz) = 82923dcf911f9e7dc62543e3ef568e693694b14e
+Size (xfce4-datetime-plugin-0.5.0.tar.gz) = 374366 bytes
diff --git a/wm/xfce4-wm-themes/Makefile b/wm/xfce4-wm-themes/Makefile
index 465cde5762c..9170ccaaddd 100644
--- a/wm/xfce4-wm-themes/Makefile
+++ b/wm/xfce4-wm-themes/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.15 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: Makefile,v 1.16 2007/04/12 09:55:20 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfwm4-themes-${XFCE4_VERSION}
PKGNAME= xfce4-wm-themes-${XFCE4_VERSION}
-#PKGREVISION= 1
CATEGORIES= wm
COMMENT= Xfce window manager themes
-USE_DIRS= theme-1.1 xdg-1.1
+USE_DIRS+= theme-1.1 xdg-1.1
.include "../../wm/xfce4-wm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/xfce4-wm-themes/PLIST b/wm/xfce4-wm-themes/PLIST
index 01bae4981c7..26cc2be95b1 100644
--- a/wm/xfce4-wm-themes/PLIST
+++ b/wm/xfce4-wm-themes/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2007/01/23 11:53:47 martti Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/04/12 09:55:20 martti Exp $
share/themes/Adept/xfwm4/README
share/themes/Adept/xfwm4/bottom-active.xpm
share/themes/Adept/xfwm4/bottom-inactive.xpm
@@ -2276,6 +2276,65 @@ share/themes/Ops/xfwm4/top-left-active.xpm
share/themes/Ops/xfwm4/top-left-inactive.xpm
share/themes/Ops/xfwm4/top-right-active.xpm
share/themes/Ops/xfwm4/top-right-inactive.xpm
+share/themes/Opta/xfwm4/README
+share/themes/Opta/xfwm4/bottom-active.xpm
+share/themes/Opta/xfwm4/bottom-inactive.xpm
+share/themes/Opta/xfwm4/bottom-left-active.xpm
+share/themes/Opta/xfwm4/bottom-left-inactive.xpm
+share/themes/Opta/xfwm4/bottom-right-active.xpm
+share/themes/Opta/xfwm4/bottom-right-inactive.xpm
+share/themes/Opta/xfwm4/close-active.xpm
+share/themes/Opta/xfwm4/close-inactive.xpm
+share/themes/Opta/xfwm4/close-pressed.xpm
+share/themes/Opta/xfwm4/hide-active.xpm
+share/themes/Opta/xfwm4/hide-inactive.xpm
+share/themes/Opta/xfwm4/hide-pressed.xpm
+share/themes/Opta/xfwm4/left-active.xpm
+share/themes/Opta/xfwm4/left-inactive.xpm
+share/themes/Opta/xfwm4/maximize-active.xpm
+share/themes/Opta/xfwm4/maximize-inactive.xpm
+share/themes/Opta/xfwm4/maximize-pressed.xpm
+share/themes/Opta/xfwm4/maximize-toggled-active.xpm
+share/themes/Opta/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Opta/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Opta/xfwm4/menu-active.xpm
+share/themes/Opta/xfwm4/menu-inactive.xpm
+share/themes/Opta/xfwm4/menu-pressed.xpm
+share/themes/Opta/xfwm4/right-active.xpm
+share/themes/Opta/xfwm4/right-inactive.xpm
+share/themes/Opta/xfwm4/shade-active.xpm
+share/themes/Opta/xfwm4/shade-inactive.xpm
+share/themes/Opta/xfwm4/shade-pressed.xpm
+share/themes/Opta/xfwm4/shade-toggled-active.xpm
+share/themes/Opta/xfwm4/shade-toggled-inactive.xpm
+share/themes/Opta/xfwm4/shade-toggled-pressed.xpm
+share/themes/Opta/xfwm4/stick-active.xpm
+share/themes/Opta/xfwm4/stick-inactive.xpm
+share/themes/Opta/xfwm4/stick-pressed.xpm
+share/themes/Opta/xfwm4/stick-toggled-active.xpm
+share/themes/Opta/xfwm4/stick-toggled-inactive.xpm
+share/themes/Opta/xfwm4/stick-toggled-pressed.xpm
+share/themes/Opta/xfwm4/themerc
+share/themes/Opta/xfwm4/title-1-active.xpm
+share/themes/Opta/xfwm4/title-1-inactive.xpm
+share/themes/Opta/xfwm4/title-2-active.png
+share/themes/Opta/xfwm4/title-2-active.xpm
+share/themes/Opta/xfwm4/title-2-inactive.png
+share/themes/Opta/xfwm4/title-2-inactive.xpm
+share/themes/Opta/xfwm4/title-3-active.png
+share/themes/Opta/xfwm4/title-3-active.xpm
+share/themes/Opta/xfwm4/title-3-inactive.png
+share/themes/Opta/xfwm4/title-3-inactive.xpm
+share/themes/Opta/xfwm4/title-4-active.png
+share/themes/Opta/xfwm4/title-4-active.xpm
+share/themes/Opta/xfwm4/title-4-inactive.png
+share/themes/Opta/xfwm4/title-4-inactive.xpm
+share/themes/Opta/xfwm4/title-5-active.xpm
+share/themes/Opta/xfwm4/title-5-inactive.xpm
+share/themes/Opta/xfwm4/top-left-active.xpm
+share/themes/Opta/xfwm4/top-left-inactive.xpm
+share/themes/Opta/xfwm4/top-right-active.xpm
+share/themes/Opta/xfwm4/top-right-inactive.xpm
share/themes/Oroborus/xfwm4/README
share/themes/Oroborus/xfwm4/bottom-active.xpm
share/themes/Oroborus/xfwm4/bottom-inactive.xpm
@@ -2768,8 +2827,11 @@ share/themes/RedmondXP/xfwm4/maximize-toggled-inactive.png
share/themes/RedmondXP/xfwm4/maximize-toggled-inactive.xpm
share/themes/RedmondXP/xfwm4/maximize-toggled-pressed.png
share/themes/RedmondXP/xfwm4/maximize-toggled-pressed.xpm
+share/themes/RedmondXP/xfwm4/menu-active.png
share/themes/RedmondXP/xfwm4/menu-active.xpm
+share/themes/RedmondXP/xfwm4/menu-inactive.png
share/themes/RedmondXP/xfwm4/menu-inactive.xpm
+share/themes/RedmondXP/xfwm4/menu-pressed.png
share/themes/RedmondXP/xfwm4/menu-pressed.xpm
share/themes/RedmondXP/xfwm4/right-active.png
share/themes/RedmondXP/xfwm4/right-active.xpm
@@ -3071,6 +3133,110 @@ share/themes/Smoothwall/xfwm4/top-left-active.xpm
share/themes/Smoothwall/xfwm4/top-left-inactive.xpm
share/themes/Smoothwall/xfwm4/top-right-active.xpm
share/themes/Smoothwall/xfwm4/top-right-inactive.xpm
+share/themes/Symphony/xfwm4/README
+share/themes/Symphony/xfwm4/bottom-active.png
+share/themes/Symphony/xfwm4/bottom-active.xpm
+share/themes/Symphony/xfwm4/bottom-inactive.png
+share/themes/Symphony/xfwm4/bottom-inactive.xpm
+share/themes/Symphony/xfwm4/bottom-left-active.png
+share/themes/Symphony/xfwm4/bottom-left-active.xpm
+share/themes/Symphony/xfwm4/bottom-left-inactive.png
+share/themes/Symphony/xfwm4/bottom-left-inactive.xpm
+share/themes/Symphony/xfwm4/bottom-right-active.png
+share/themes/Symphony/xfwm4/bottom-right-active.xpm
+share/themes/Symphony/xfwm4/bottom-right-inactive.png
+share/themes/Symphony/xfwm4/bottom-right-inactive.xpm
+share/themes/Symphony/xfwm4/close-active.png
+share/themes/Symphony/xfwm4/close-active.xpm
+share/themes/Symphony/xfwm4/close-inactive.png
+share/themes/Symphony/xfwm4/close-inactive.xpm
+share/themes/Symphony/xfwm4/close-pressed.png
+share/themes/Symphony/xfwm4/close-pressed.xpm
+share/themes/Symphony/xfwm4/hide-active.png
+share/themes/Symphony/xfwm4/hide-active.xpm
+share/themes/Symphony/xfwm4/hide-inactive.png
+share/themes/Symphony/xfwm4/hide-inactive.xpm
+share/themes/Symphony/xfwm4/hide-pressed.png
+share/themes/Symphony/xfwm4/hide-pressed.xpm
+share/themes/Symphony/xfwm4/left-active.png
+share/themes/Symphony/xfwm4/left-active.xpm
+share/themes/Symphony/xfwm4/left-inactive.png
+share/themes/Symphony/xfwm4/left-inactive.xpm
+share/themes/Symphony/xfwm4/maximize-active.png
+share/themes/Symphony/xfwm4/maximize-active.xpm
+share/themes/Symphony/xfwm4/maximize-inactive.png
+share/themes/Symphony/xfwm4/maximize-inactive.xpm
+share/themes/Symphony/xfwm4/maximize-pressed.png
+share/themes/Symphony/xfwm4/maximize-pressed.xpm
+share/themes/Symphony/xfwm4/maximize-toggled-active.png
+share/themes/Symphony/xfwm4/maximize-toggled-active.xpm
+share/themes/Symphony/xfwm4/maximize-toggled-inactive.png
+share/themes/Symphony/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Symphony/xfwm4/maximize-toggled-pressed.png
+share/themes/Symphony/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Symphony/xfwm4/menu-active.png
+share/themes/Symphony/xfwm4/menu-active.xpm
+share/themes/Symphony/xfwm4/menu-inactive.png
+share/themes/Symphony/xfwm4/menu-inactive.xpm
+share/themes/Symphony/xfwm4/menu-pressed.png
+share/themes/Symphony/xfwm4/menu-pressed.xpm
+share/themes/Symphony/xfwm4/right-active.png
+share/themes/Symphony/xfwm4/right-active.xpm
+share/themes/Symphony/xfwm4/right-inactive.png
+share/themes/Symphony/xfwm4/right-inactive.xpm
+share/themes/Symphony/xfwm4/shade-active.png
+share/themes/Symphony/xfwm4/shade-active.xpm
+share/themes/Symphony/xfwm4/shade-inactive.png
+share/themes/Symphony/xfwm4/shade-inactive.xpm
+share/themes/Symphony/xfwm4/shade-pressed.png
+share/themes/Symphony/xfwm4/shade-pressed.xpm
+share/themes/Symphony/xfwm4/shade-toggled-active.png
+share/themes/Symphony/xfwm4/shade-toggled-active.xpm
+share/themes/Symphony/xfwm4/shade-toggled-inactive.png
+share/themes/Symphony/xfwm4/shade-toggled-inactive.xpm
+share/themes/Symphony/xfwm4/shade-toggled-pressed.png
+share/themes/Symphony/xfwm4/shade-toggled-pressed.xpm
+share/themes/Symphony/xfwm4/stick-active.png
+share/themes/Symphony/xfwm4/stick-active.xpm
+share/themes/Symphony/xfwm4/stick-inactive.png
+share/themes/Symphony/xfwm4/stick-inactive.xpm
+share/themes/Symphony/xfwm4/stick-pressed.png
+share/themes/Symphony/xfwm4/stick-pressed.xpm
+share/themes/Symphony/xfwm4/stick-toggled-active.png
+share/themes/Symphony/xfwm4/stick-toggled-active.xpm
+share/themes/Symphony/xfwm4/stick-toggled-inactive.png
+share/themes/Symphony/xfwm4/stick-toggled-inactive.xpm
+share/themes/Symphony/xfwm4/stick-toggled-pressed.png
+share/themes/Symphony/xfwm4/stick-toggled-pressed.xpm
+share/themes/Symphony/xfwm4/themerc
+share/themes/Symphony/xfwm4/title-1-active.png
+share/themes/Symphony/xfwm4/title-1-active.xpm
+share/themes/Symphony/xfwm4/title-1-inactive.png
+share/themes/Symphony/xfwm4/title-1-inactive.xpm
+share/themes/Symphony/xfwm4/title-2-active.png
+share/themes/Symphony/xfwm4/title-2-active.xpm
+share/themes/Symphony/xfwm4/title-2-inactive.png
+share/themes/Symphony/xfwm4/title-2-inactive.xpm
+share/themes/Symphony/xfwm4/title-3-active.png
+share/themes/Symphony/xfwm4/title-3-active.xpm
+share/themes/Symphony/xfwm4/title-3-inactive.png
+share/themes/Symphony/xfwm4/title-3-inactive.xpm
+share/themes/Symphony/xfwm4/title-4-active.png
+share/themes/Symphony/xfwm4/title-4-active.xpm
+share/themes/Symphony/xfwm4/title-4-inactive.png
+share/themes/Symphony/xfwm4/title-4-inactive.xpm
+share/themes/Symphony/xfwm4/title-5-active.png
+share/themes/Symphony/xfwm4/title-5-active.xpm
+share/themes/Symphony/xfwm4/title-5-inactive.png
+share/themes/Symphony/xfwm4/title-5-inactive.xpm
+share/themes/Symphony/xfwm4/top-left-active.png
+share/themes/Symphony/xfwm4/top-left-active.xpm
+share/themes/Symphony/xfwm4/top-left-inactive.png
+share/themes/Symphony/xfwm4/top-left-inactive.xpm
+share/themes/Symphony/xfwm4/top-right-active.png
+share/themes/Symphony/xfwm4/top-right-active.xpm
+share/themes/Symphony/xfwm4/top-right-inactive.png
+share/themes/Symphony/xfwm4/top-right-inactive.xpm
share/themes/Synthetic/xfwm4/README
share/themes/Synthetic/xfwm4/bottom-active.xpm
share/themes/Synthetic/xfwm4/bottom-inactive.xpm
@@ -3283,6 +3449,9 @@ share/themes/Tgc/xfwm4/left-inactive.xpm
share/themes/Tgc/xfwm4/maximize-active.xpm
share/themes/Tgc/xfwm4/maximize-inactive.xpm
share/themes/Tgc/xfwm4/maximize-pressed.xpm
+share/themes/Tgc/xfwm4/maximize-toggled-active.xpm
+share/themes/Tgc/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Tgc/xfwm4/maximize-toggled-pressed.xpm
share/themes/Tgc/xfwm4/menu-active.xpm
share/themes/Tgc/xfwm4/menu-inactive.xpm
share/themes/Tgc/xfwm4/menu-pressed.xpm
@@ -3291,9 +3460,15 @@ share/themes/Tgc/xfwm4/right-inactive.xpm
share/themes/Tgc/xfwm4/shade-active.xpm
share/themes/Tgc/xfwm4/shade-inactive.xpm
share/themes/Tgc/xfwm4/shade-pressed.xpm
+share/themes/Tgc/xfwm4/shade-toggled-active.xpm
+share/themes/Tgc/xfwm4/shade-toggled-inactive.xpm
+share/themes/Tgc/xfwm4/shade-toggled-pressed.xpm
share/themes/Tgc/xfwm4/stick-active.xpm
share/themes/Tgc/xfwm4/stick-inactive.xpm
share/themes/Tgc/xfwm4/stick-pressed.xpm
+share/themes/Tgc/xfwm4/stick-toggled-active.xpm
+share/themes/Tgc/xfwm4/stick-toggled-inactive.xpm
+share/themes/Tgc/xfwm4/stick-toggled-pressed.xpm
share/themes/Tgc/xfwm4/themerc
share/themes/Tgc/xfwm4/title-1-active.xpm
share/themes/Tgc/xfwm4/title-1-inactive.xpm
@@ -3588,6 +3763,177 @@ share/themes/Variation/xfwm4/top-left-active.xpm
share/themes/Variation/xfwm4/top-left-inactive.xpm
share/themes/Variation/xfwm4/top-right-active.xpm
share/themes/Variation/xfwm4/top-right-inactive.xpm
+share/themes/Waza/xfwm4/README
+share/themes/Waza/xfwm4/bottom-active.xpm
+share/themes/Waza/xfwm4/bottom-inactive.xpm
+share/themes/Waza/xfwm4/bottom-left-active.xpm
+share/themes/Waza/xfwm4/bottom-left-inactive.xpm
+share/themes/Waza/xfwm4/bottom-right-active.xpm
+share/themes/Waza/xfwm4/bottom-right-inactive.xpm
+share/themes/Waza/xfwm4/close-active.png
+share/themes/Waza/xfwm4/close-active.xpm
+share/themes/Waza/xfwm4/close-inactive.png
+share/themes/Waza/xfwm4/close-inactive.xpm
+share/themes/Waza/xfwm4/close-pressed.png
+share/themes/Waza/xfwm4/close-pressed.xpm
+share/themes/Waza/xfwm4/hide-active.png
+share/themes/Waza/xfwm4/hide-active.xpm
+share/themes/Waza/xfwm4/hide-inactive.png
+share/themes/Waza/xfwm4/hide-inactive.xpm
+share/themes/Waza/xfwm4/hide-pressed.png
+share/themes/Waza/xfwm4/hide-pressed.xpm
+share/themes/Waza/xfwm4/left-active.xpm
+share/themes/Waza/xfwm4/left-inactive.xpm
+share/themes/Waza/xfwm4/maximize-active.png
+share/themes/Waza/xfwm4/maximize-active.xpm
+share/themes/Waza/xfwm4/maximize-inactive.png
+share/themes/Waza/xfwm4/maximize-inactive.xpm
+share/themes/Waza/xfwm4/maximize-pressed.png
+share/themes/Waza/xfwm4/maximize-pressed.xpm
+share/themes/Waza/xfwm4/maximize-toggled-active.png
+share/themes/Waza/xfwm4/maximize-toggled-active.xpm
+share/themes/Waza/xfwm4/maximize-toggled-inactive.png
+share/themes/Waza/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Waza/xfwm4/maximize-toggled-pressed.png
+share/themes/Waza/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Waza/xfwm4/menu-active.png
+share/themes/Waza/xfwm4/menu-active.xpm
+share/themes/Waza/xfwm4/menu-inactive.png
+share/themes/Waza/xfwm4/menu-inactive.xpm
+share/themes/Waza/xfwm4/menu-pressed.png
+share/themes/Waza/xfwm4/menu-pressed.xpm
+share/themes/Waza/xfwm4/right-active.xpm
+share/themes/Waza/xfwm4/right-inactive.xpm
+share/themes/Waza/xfwm4/shade-active.png
+share/themes/Waza/xfwm4/shade-active.xpm
+share/themes/Waza/xfwm4/shade-inactive.png
+share/themes/Waza/xfwm4/shade-inactive.xpm
+share/themes/Waza/xfwm4/shade-pressed.png
+share/themes/Waza/xfwm4/shade-pressed.xpm
+share/themes/Waza/xfwm4/shade-toggled-active.png
+share/themes/Waza/xfwm4/shade-toggled-active.xpm
+share/themes/Waza/xfwm4/shade-toggled-inactive.png
+share/themes/Waza/xfwm4/shade-toggled-inactive.xpm
+share/themes/Waza/xfwm4/shade-toggled-pressed.png
+share/themes/Waza/xfwm4/shade-toggled-pressed.xpm
+share/themes/Waza/xfwm4/stick-active.png
+share/themes/Waza/xfwm4/stick-active.xpm
+share/themes/Waza/xfwm4/stick-inactive.png
+share/themes/Waza/xfwm4/stick-inactive.xpm
+share/themes/Waza/xfwm4/stick-pressed.png
+share/themes/Waza/xfwm4/stick-pressed.xpm
+share/themes/Waza/xfwm4/stick-toggled-active.png
+share/themes/Waza/xfwm4/stick-toggled-active.xpm
+share/themes/Waza/xfwm4/stick-toggled-inactive.png
+share/themes/Waza/xfwm4/stick-toggled-inactive.xpm
+share/themes/Waza/xfwm4/stick-toggled-pressed.png
+share/themes/Waza/xfwm4/stick-toggled-pressed.xpm
+share/themes/Waza/xfwm4/themerc
+share/themes/Waza/xfwm4/title-1-active.png
+share/themes/Waza/xfwm4/title-1-active.xpm
+share/themes/Waza/xfwm4/title-1-inactive.png
+share/themes/Waza/xfwm4/title-1-inactive.xpm
+share/themes/Waza/xfwm4/title-2-active.png
+share/themes/Waza/xfwm4/title-2-active.xpm
+share/themes/Waza/xfwm4/title-2-inactive.png
+share/themes/Waza/xfwm4/title-2-inactive.xpm
+share/themes/Waza/xfwm4/title-3-active.png
+share/themes/Waza/xfwm4/title-3-active.xpm
+share/themes/Waza/xfwm4/title-3-inactive.png
+share/themes/Waza/xfwm4/title-3-inactive.xpm
+share/themes/Waza/xfwm4/title-4-active.png
+share/themes/Waza/xfwm4/title-4-active.xpm
+share/themes/Waza/xfwm4/title-4-inactive.png
+share/themes/Waza/xfwm4/title-4-inactive.xpm
+share/themes/Waza/xfwm4/title-5-active.png
+share/themes/Waza/xfwm4/title-5-active.xpm
+share/themes/Waza/xfwm4/title-5-inactive.png
+share/themes/Waza/xfwm4/title-5-inactive.xpm
+share/themes/Waza/xfwm4/top-left-active.png
+share/themes/Waza/xfwm4/top-left-active.xpm
+share/themes/Waza/xfwm4/top-left-inactive.png
+share/themes/Waza/xfwm4/top-left-inactive.xpm
+share/themes/Waza/xfwm4/top-right-active.png
+share/themes/Waza/xfwm4/top-right-active.xpm
+share/themes/Waza/xfwm4/top-right-inactive.png
+share/themes/Waza/xfwm4/top-right-inactive.xpm
+share/themes/Wildbush/xfwm4/README
+share/themes/Wildbush/xfwm4/bottom-active.png
+share/themes/Wildbush/xfwm4/bottom-active.xpm
+share/themes/Wildbush/xfwm4/bottom-inactive.png
+share/themes/Wildbush/xfwm4/bottom-inactive.xpm
+share/themes/Wildbush/xfwm4/bottom-left-active.png
+share/themes/Wildbush/xfwm4/bottom-left-active.xpm
+share/themes/Wildbush/xfwm4/bottom-left-inactive.png
+share/themes/Wildbush/xfwm4/bottom-left-inactive.xpm
+share/themes/Wildbush/xfwm4/bottom-right-active.png
+share/themes/Wildbush/xfwm4/bottom-right-active.xpm
+share/themes/Wildbush/xfwm4/bottom-right-inactive.png
+share/themes/Wildbush/xfwm4/bottom-right-inactive.xpm
+share/themes/Wildbush/xfwm4/close-active.xpm
+share/themes/Wildbush/xfwm4/close-inactive.xpm
+share/themes/Wildbush/xfwm4/close-pressed.xpm
+share/themes/Wildbush/xfwm4/hide-active.xpm
+share/themes/Wildbush/xfwm4/hide-inactive.xpm
+share/themes/Wildbush/xfwm4/hide-pressed.xpm
+share/themes/Wildbush/xfwm4/left-active.png
+share/themes/Wildbush/xfwm4/left-active.xpm
+share/themes/Wildbush/xfwm4/left-inactive.png
+share/themes/Wildbush/xfwm4/left-inactive.xpm
+share/themes/Wildbush/xfwm4/maximize-active.xpm
+share/themes/Wildbush/xfwm4/maximize-inactive.xpm
+share/themes/Wildbush/xfwm4/maximize-pressed.xpm
+share/themes/Wildbush/xfwm4/maximize-toggled-active.xpm
+share/themes/Wildbush/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Wildbush/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Wildbush/xfwm4/menu-active.xpm
+share/themes/Wildbush/xfwm4/menu-inactive.xpm
+share/themes/Wildbush/xfwm4/menu-pressed.xpm
+share/themes/Wildbush/xfwm4/right-active.png
+share/themes/Wildbush/xfwm4/right-active.xpm
+share/themes/Wildbush/xfwm4/right-inactive.png
+share/themes/Wildbush/xfwm4/right-inactive.xpm
+share/themes/Wildbush/xfwm4/shade-active.xpm
+share/themes/Wildbush/xfwm4/shade-inactive.xpm
+share/themes/Wildbush/xfwm4/shade-pressed.xpm
+share/themes/Wildbush/xfwm4/shade-toggled-active.xpm
+share/themes/Wildbush/xfwm4/shade-toggled-inactive.xpm
+share/themes/Wildbush/xfwm4/shade-toggled-pressed.xpm
+share/themes/Wildbush/xfwm4/stick-active.xpm
+share/themes/Wildbush/xfwm4/stick-inactive.xpm
+share/themes/Wildbush/xfwm4/stick-pressed.xpm
+share/themes/Wildbush/xfwm4/stick-toggled-active.xpm
+share/themes/Wildbush/xfwm4/stick-toggled-inactive.xpm
+share/themes/Wildbush/xfwm4/stick-toggled-pressed.xpm
+share/themes/Wildbush/xfwm4/themerc
+share/themes/Wildbush/xfwm4/title-1-active.png
+share/themes/Wildbush/xfwm4/title-1-active.xpm
+share/themes/Wildbush/xfwm4/title-1-inactive.png
+share/themes/Wildbush/xfwm4/title-1-inactive.xpm
+share/themes/Wildbush/xfwm4/title-2-active.png
+share/themes/Wildbush/xfwm4/title-2-active.xpm
+share/themes/Wildbush/xfwm4/title-2-inactive.png
+share/themes/Wildbush/xfwm4/title-2-inactive.xpm
+share/themes/Wildbush/xfwm4/title-3-active.png
+share/themes/Wildbush/xfwm4/title-3-active.xpm
+share/themes/Wildbush/xfwm4/title-3-inactive.png
+share/themes/Wildbush/xfwm4/title-3-inactive.xpm
+share/themes/Wildbush/xfwm4/title-4-active.png
+share/themes/Wildbush/xfwm4/title-4-active.xpm
+share/themes/Wildbush/xfwm4/title-4-inactive.png
+share/themes/Wildbush/xfwm4/title-4-inactive.xpm
+share/themes/Wildbush/xfwm4/title-5-active.png
+share/themes/Wildbush/xfwm4/title-5-active.xpm
+share/themes/Wildbush/xfwm4/title-5-inactive.png
+share/themes/Wildbush/xfwm4/title-5-inactive.xpm
+share/themes/Wildbush/xfwm4/top-left-active.png
+share/themes/Wildbush/xfwm4/top-left-active.xpm
+share/themes/Wildbush/xfwm4/top-left-inactive.png
+share/themes/Wildbush/xfwm4/top-left-inactive.xpm
+share/themes/Wildbush/xfwm4/top-right-active.png
+share/themes/Wildbush/xfwm4/top-right-active.xpm
+share/themes/Wildbush/xfwm4/top-right-inactive.png
+share/themes/Wildbush/xfwm4/top-right-inactive.xpm
share/themes/Xfce/xfwm4/README
share/themes/Xfce/xfwm4/bottom-active.xpm
share/themes/Xfce/xfwm4/bottom-inactive.xpm
@@ -3633,6 +3979,10 @@ share/themes/Xfce/xfwm4/top-left-inactive.xpm
share/themes/Xfce/xfwm4/top-right-active.xpm
share/themes/Xfce/xfwm4/top-right-inactive.xpm
@dirrm share/themes/Xfce/xfwm4
+@dirrm share/themes/Wildbush/xfwm4
+@dirrm share/themes/Wildbush
+@dirrm share/themes/Waza/xfwm4
+@dirrm share/themes/Waza
@dirrm share/themes/Variation/xfwm4
@dirrm share/themes/Variation
@dirrm share/themes/Tubular/xfwm4
@@ -3655,6 +4005,8 @@ share/themes/Xfce/xfwm4/top-right-inactive.xpm
@dirrm share/themes/TUX
@dirrm share/themes/Synthetic/xfwm4
@dirrm share/themes/Synthetic
+@dirrm share/themes/Symphony/xfwm4
+@dirrm share/themes/Symphony
@dirrm share/themes/Smoothwall/xfwm4
@dirrm share/themes/Smoothwall
@dirrm share/themes/Smallscreen/xfwm4
@@ -3670,6 +4022,7 @@ share/themes/Xfce/xfwm4/top-right-inactive.xpm
@dirrm share/themes/RedmondXP/xfwm4
@dirrm share/themes/RedmondXP
@dirrm share/themes/Redmond/xfwm4
+@comment in theme-dirs: @dirrm share/themes/Redmond
@dirrm share/themes/R9X/xfwm4
@dirrm share/themes/R9X
@dirrm share/themes/Quinx/xfwm4
@@ -3688,6 +4041,8 @@ share/themes/Xfce/xfwm4/top-right-inactive.xpm
@dirrm share/themes/Perl
@dirrm share/themes/Oroborus/xfwm4
@dirrm share/themes/Oroborus
+@dirrm share/themes/Opta/xfwm4
+@dirrm share/themes/Opta
@dirrm share/themes/Ops/xfwm4
@dirrm share/themes/Ops
@dirrm share/themes/Next/xfwm4
@@ -3705,6 +4060,7 @@ share/themes/Xfce/xfwm4/top-right-inactive.xpm
@dirrm share/themes/Microcurve/xfwm4
@dirrm share/themes/Microcurve
@dirrm share/themes/Metabox/xfwm4
+@comment in theme-dirs: @dirrm share/themes/Metabox
@dirrm share/themes/Meenee/xfwm4
@dirrm share/themes/Meenee
@dirrm share/themes/Linea/xfwm4
@@ -3754,6 +4110,7 @@ share/themes/Xfce/xfwm4/top-right-inactive.xpm
@dirrm share/themes/Cruxish/xfwm4
@dirrm share/themes/Cruxish
@dirrm share/themes/Crux/xfwm4
+@comment in theme-dirs: @dirrm share/themes/Crux
@dirrm share/themes/Coolclean/xfwm4
@dirrm share/themes/Coolclean
@dirrm share/themes/Coldsteel/xfwm4
@@ -3777,6 +4134,7 @@ share/themes/Xfce/xfwm4/top-right-inactive.xpm
@dirrm share/themes/Atlanta2/xfwm4
@dirrm share/themes/Atlanta2
@dirrm share/themes/Atlanta/xfwm4
+@comment in theme-dirs: @dirrm share/themes/Atlanta
@dirrm share/themes/Alternate/xfwm4
@dirrm share/themes/Alternate
@dirrm share/themes/Agualemon/xfwm4
diff --git a/wm/xfce4-wm-themes/buildlink3.mk b/wm/xfce4-wm-themes/buildlink3.mk
index c67686a0b3b..b307500f990 100644
--- a/wm/xfce4-wm-themes/buildlink3.mk
+++ b/wm/xfce4-wm-themes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2007/04/12 09:55:20 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_WM_THEMES_BUILDLINK3_MK:= ${XFCE4_WM_THEMES_BUILDLINK3_MK}+
@@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+= xfce4-wm-themes
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-wm-themes
.if ${XFCE4_WM_THEMES_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-wm-themes+= xfce4-wm-themes>=4.2.4
+BUILDLINK_API_DEPENDS.xfce4-wm-themes+= xfce4-wm-themes>=4.4.1
BUILDLINK_PKGSRCDIR.xfce4-wm-themes?= ../../wm/xfce4-wm-themes
.endif # XFCE4_WM_THEMES_BUILDLINK3_MK
.include "../../wm/xfce4-wm/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/wm/xfce4-wm-themes/distinfo b/wm/xfce4-wm-themes/distinfo
index 167f3c43e48..4977575e9a4 100644
--- a/wm/xfce4-wm-themes/distinfo
+++ b/wm/xfce4-wm-themes/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2007/01/23 11:53:47 martti Exp $
+$NetBSD: distinfo,v 1.13 2007/04/12 09:55:20 martti Exp $
-SHA1 (xfwm4-themes-4.2.4.tar.gz) = b3e1cb8c864e212bdab5514edd4644c78a50511f
-RMD160 (xfwm4-themes-4.2.4.tar.gz) = 589d569f6e7dd7f647b8af02fba567e4008c7c17
-Size (xfwm4-themes-4.2.4.tar.gz) = 806016 bytes
+SHA1 (xfwm4-themes-4.4.1.tar.bz2) = e02932600d9971716e4058252588c0f7bff509ec
+RMD160 (xfwm4-themes-4.4.1.tar.bz2) = 00c14c73a26091e721f0b4534c9e26a142400ae7
+Size (xfwm4-themes-4.4.1.tar.bz2) = 498155 bytes
diff --git a/wm/xfce4-wm/Makefile b/wm/xfce4-wm/Makefile
index 9edb724ac2a..e389b8d7e08 100644
--- a/wm/xfce4-wm/Makefile
+++ b/wm/xfce4-wm/Makefile
@@ -1,21 +1,15 @@
-# $NetBSD: Makefile,v 1.21 2007/02/03 09:25:39 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/04/12 09:55:19 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfwm4-${XFCE4_VERSION}
PKGNAME= xfce4-wm-${XFCE4_VERSION}
-#PKGREVISION= 1
CATEGORIES= wm
COMMENT= Xfce window manager
-BUILDLINK_DEPMETHOD.libXt?= build
-
USE_DIRS+= xdg-1.4
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
diff --git a/wm/xfce4-wm/PLIST b/wm/xfce4-wm/PLIST
index a675fcc5e6e..0f7cf909487 100644
--- a/wm/xfce4-wm/PLIST
+++ b/wm/xfce4-wm/PLIST
@@ -1,15 +1,17 @@
-@comment $NetBSD: PLIST,v 1.13 2007/01/23 11:53:46 martti Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/04/12 09:55:19 martti Exp $
bin/xfwm4
+lib/xfce4/mcs-plugins/wmtweaks_plugin.la
lib/xfce4/mcs-plugins/workspaces_plugin.la
lib/xfce4/mcs-plugins/xfwm4_plugin.la
share/applications/xfce-wm-settings.desktop
+share/applications/xfce-wmtweaks-settings.desktop
share/applications/xfce-workspaces-settings.desktop
-share/icons/hicolor/48x48/apps/xfce4-keys.png
+share/icons/hicolor/48x48/apps/wmtweaks.png
share/icons/hicolor/48x48/apps/xfce4-workspaces.png
share/icons/hicolor/48x48/apps/xfwm4.png
+share/icons/hicolor/scalable/apps/wmtweaks.svg
share/icons/hicolor/scalable/apps/xfce4-workspaces.svg
share/icons/hicolor/scalable/apps/xfwm4.svg
-share/locale/af/LC_MESSAGES/xfwm4.mo
share/locale/ar/LC_MESSAGES/xfwm4.mo
share/locale/az/LC_MESSAGES/xfwm4.mo
share/locale/be/LC_MESSAGES/xfwm4.mo
@@ -18,6 +20,7 @@ share/locale/bn_IN/LC_MESSAGES/xfwm4.mo
share/locale/ca/LC_MESSAGES/xfwm4.mo
share/locale/cs/LC_MESSAGES/xfwm4.mo
share/locale/de/LC_MESSAGES/xfwm4.mo
+share/locale/dz/LC_MESSAGES/xfwm4.mo
share/locale/el/LC_MESSAGES/xfwm4.mo
share/locale/en_GB/LC_MESSAGES/xfwm4.mo
share/locale/eo/LC_MESSAGES/xfwm4.mo
@@ -28,15 +31,17 @@ share/locale/eu/LC_MESSAGES/xfwm4.mo
share/locale/fa/LC_MESSAGES/xfwm4.mo
share/locale/fi/LC_MESSAGES/xfwm4.mo
share/locale/fr/LC_MESSAGES/xfwm4.mo
+share/locale/gl/LC_MESSAGES/xfwm4.mo
share/locale/gu/LC_MESSAGES/xfwm4.mo
share/locale/he/LC_MESSAGES/xfwm4.mo
share/locale/hi/LC_MESSAGES/xfwm4.mo
share/locale/hu/LC_MESSAGES/xfwm4.mo
share/locale/it/LC_MESSAGES/xfwm4.mo
share/locale/ja/LC_MESSAGES/xfwm4.mo
+share/locale/ka/LC_MESSAGES/xfwm4.mo
share/locale/ko/LC_MESSAGES/xfwm4.mo
-share/locale/ku/LC_MESSAGES/xfwm4.mo
share/locale/lt/LC_MESSAGES/xfwm4.mo
+share/locale/mk/LC_MESSAGES/xfwm4.mo
share/locale/mr/LC_MESSAGES/xfwm4.mo
share/locale/ms/LC_MESSAGES/xfwm4.mo
share/locale/nb_NO/LC_MESSAGES/xfwm4.mo
@@ -48,8 +53,6 @@ share/locale/pt_PT/LC_MESSAGES/xfwm4.mo
share/locale/ro/LC_MESSAGES/xfwm4.mo
share/locale/ru/LC_MESSAGES/xfwm4.mo
share/locale/sk/LC_MESSAGES/xfwm4.mo
-share/locale/sl/LC_MESSAGES/xfwm4.mo
-share/locale/sq/LC_MESSAGES/xfwm4.mo
share/locale/sv/LC_MESSAGES/xfwm4.mo
share/locale/ta/LC_MESSAGES/xfwm4.mo
share/locale/tr/LC_MESSAGES/xfwm4.mo
@@ -57,6 +60,110 @@ share/locale/uk/LC_MESSAGES/xfwm4.mo
share/locale/vi/LC_MESSAGES/xfwm4.mo
share/locale/zh_CN/LC_MESSAGES/xfwm4.mo
share/locale/zh_TW/LC_MESSAGES/xfwm4.mo
+share/themes/Daloa/xfwm4/README
+share/themes/Daloa/xfwm4/bottom-active.png
+share/themes/Daloa/xfwm4/bottom-active.xpm
+share/themes/Daloa/xfwm4/bottom-inactive.png
+share/themes/Daloa/xfwm4/bottom-inactive.xpm
+share/themes/Daloa/xfwm4/bottom-left-active.png
+share/themes/Daloa/xfwm4/bottom-left-active.xpm
+share/themes/Daloa/xfwm4/bottom-left-inactive.png
+share/themes/Daloa/xfwm4/bottom-left-inactive.xpm
+share/themes/Daloa/xfwm4/bottom-right-active.png
+share/themes/Daloa/xfwm4/bottom-right-active.xpm
+share/themes/Daloa/xfwm4/bottom-right-inactive.png
+share/themes/Daloa/xfwm4/bottom-right-inactive.xpm
+share/themes/Daloa/xfwm4/close-active.png
+share/themes/Daloa/xfwm4/close-active.xpm
+share/themes/Daloa/xfwm4/close-inactive.png
+share/themes/Daloa/xfwm4/close-inactive.xpm
+share/themes/Daloa/xfwm4/close-pressed.png
+share/themes/Daloa/xfwm4/close-pressed.xpm
+share/themes/Daloa/xfwm4/hide-active.png
+share/themes/Daloa/xfwm4/hide-active.xpm
+share/themes/Daloa/xfwm4/hide-inactive.png
+share/themes/Daloa/xfwm4/hide-inactive.xpm
+share/themes/Daloa/xfwm4/hide-pressed.png
+share/themes/Daloa/xfwm4/hide-pressed.xpm
+share/themes/Daloa/xfwm4/left-active.png
+share/themes/Daloa/xfwm4/left-active.xpm
+share/themes/Daloa/xfwm4/left-inactive.png
+share/themes/Daloa/xfwm4/left-inactive.xpm
+share/themes/Daloa/xfwm4/maximize-active.png
+share/themes/Daloa/xfwm4/maximize-active.xpm
+share/themes/Daloa/xfwm4/maximize-inactive.png
+share/themes/Daloa/xfwm4/maximize-inactive.xpm
+share/themes/Daloa/xfwm4/maximize-pressed.png
+share/themes/Daloa/xfwm4/maximize-pressed.xpm
+share/themes/Daloa/xfwm4/maximize-toggled-active.png
+share/themes/Daloa/xfwm4/maximize-toggled-active.xpm
+share/themes/Daloa/xfwm4/maximize-toggled-inactive.png
+share/themes/Daloa/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Daloa/xfwm4/maximize-toggled-pressed.png
+share/themes/Daloa/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Daloa/xfwm4/menu-active.png
+share/themes/Daloa/xfwm4/menu-active.xpm
+share/themes/Daloa/xfwm4/menu-inactive.png
+share/themes/Daloa/xfwm4/menu-inactive.xpm
+share/themes/Daloa/xfwm4/menu-pressed.png
+share/themes/Daloa/xfwm4/menu-pressed.xpm
+share/themes/Daloa/xfwm4/right-active.png
+share/themes/Daloa/xfwm4/right-active.xpm
+share/themes/Daloa/xfwm4/right-inactive.png
+share/themes/Daloa/xfwm4/right-inactive.xpm
+share/themes/Daloa/xfwm4/shade-active.png
+share/themes/Daloa/xfwm4/shade-active.xpm
+share/themes/Daloa/xfwm4/shade-inactive.png
+share/themes/Daloa/xfwm4/shade-inactive.xpm
+share/themes/Daloa/xfwm4/shade-pressed.png
+share/themes/Daloa/xfwm4/shade-pressed.xpm
+share/themes/Daloa/xfwm4/shade-toggled-active.png
+share/themes/Daloa/xfwm4/shade-toggled-active.xpm
+share/themes/Daloa/xfwm4/shade-toggled-inactive.png
+share/themes/Daloa/xfwm4/shade-toggled-inactive.xpm
+share/themes/Daloa/xfwm4/shade-toggled-pressed.png
+share/themes/Daloa/xfwm4/shade-toggled-pressed.xpm
+share/themes/Daloa/xfwm4/stick-active.png
+share/themes/Daloa/xfwm4/stick-active.xpm
+share/themes/Daloa/xfwm4/stick-inactive.png
+share/themes/Daloa/xfwm4/stick-inactive.xpm
+share/themes/Daloa/xfwm4/stick-pressed.png
+share/themes/Daloa/xfwm4/stick-pressed.xpm
+share/themes/Daloa/xfwm4/stick-toggled-active.png
+share/themes/Daloa/xfwm4/stick-toggled-active.xpm
+share/themes/Daloa/xfwm4/stick-toggled-inactive.png
+share/themes/Daloa/xfwm4/stick-toggled-inactive.xpm
+share/themes/Daloa/xfwm4/stick-toggled-pressed.png
+share/themes/Daloa/xfwm4/stick-toggled-pressed.xpm
+share/themes/Daloa/xfwm4/themerc
+share/themes/Daloa/xfwm4/title-1-active.png
+share/themes/Daloa/xfwm4/title-1-active.xpm
+share/themes/Daloa/xfwm4/title-1-inactive.png
+share/themes/Daloa/xfwm4/title-1-inactive.xpm
+share/themes/Daloa/xfwm4/title-2-active.png
+share/themes/Daloa/xfwm4/title-2-active.xpm
+share/themes/Daloa/xfwm4/title-2-inactive.png
+share/themes/Daloa/xfwm4/title-2-inactive.xpm
+share/themes/Daloa/xfwm4/title-3-active.png
+share/themes/Daloa/xfwm4/title-3-active.xpm
+share/themes/Daloa/xfwm4/title-3-inactive.png
+share/themes/Daloa/xfwm4/title-3-inactive.xpm
+share/themes/Daloa/xfwm4/title-4-active.png
+share/themes/Daloa/xfwm4/title-4-active.xpm
+share/themes/Daloa/xfwm4/title-4-inactive.png
+share/themes/Daloa/xfwm4/title-4-inactive.xpm
+share/themes/Daloa/xfwm4/title-5-active.png
+share/themes/Daloa/xfwm4/title-5-active.xpm
+share/themes/Daloa/xfwm4/title-5-inactive.png
+share/themes/Daloa/xfwm4/title-5-inactive.xpm
+share/themes/Daloa/xfwm4/top-left-active.png
+share/themes/Daloa/xfwm4/top-left-active.xpm
+share/themes/Daloa/xfwm4/top-left-inactive.png
+share/themes/Daloa/xfwm4/top-left-inactive.xpm
+share/themes/Daloa/xfwm4/top-right-active.png
+share/themes/Daloa/xfwm4/top-right-active.xpm
+share/themes/Daloa/xfwm4/top-right-inactive.png
+share/themes/Daloa/xfwm4/top-right-inactive.xpm
share/themes/Default-4.0/xfwm4/README
share/themes/Default-4.0/xfwm4/bottom-active.xpm
share/themes/Default-4.0/xfwm4/bottom-inactive.xpm
@@ -110,6 +217,92 @@ share/themes/Default-4.0/xfwm4/top-left-active.xpm
share/themes/Default-4.0/xfwm4/top-left-inactive.xpm
share/themes/Default-4.0/xfwm4/top-right-active.xpm
share/themes/Default-4.0/xfwm4/top-right-inactive.xpm
+share/themes/Default-4.2/xfwm4/README
+share/themes/Default-4.2/xfwm4/bottom-active.png
+share/themes/Default-4.2/xfwm4/bottom-active.xpm
+share/themes/Default-4.2/xfwm4/bottom-inactive.png
+share/themes/Default-4.2/xfwm4/bottom-inactive.xpm
+share/themes/Default-4.2/xfwm4/bottom-left-active.png
+share/themes/Default-4.2/xfwm4/bottom-left-active.xpm
+share/themes/Default-4.2/xfwm4/bottom-left-inactive.png
+share/themes/Default-4.2/xfwm4/bottom-left-inactive.xpm
+share/themes/Default-4.2/xfwm4/bottom-right-active.png
+share/themes/Default-4.2/xfwm4/bottom-right-active.xpm
+share/themes/Default-4.2/xfwm4/bottom-right-inactive.png
+share/themes/Default-4.2/xfwm4/bottom-right-inactive.xpm
+share/themes/Default-4.2/xfwm4/close-active.xpm
+share/themes/Default-4.2/xfwm4/close-inactive.xpm
+share/themes/Default-4.2/xfwm4/close-pressed.png
+share/themes/Default-4.2/xfwm4/close-pressed.xpm
+share/themes/Default-4.2/xfwm4/hide-active.xpm
+share/themes/Default-4.2/xfwm4/hide-inactive.xpm
+share/themes/Default-4.2/xfwm4/hide-pressed.png
+share/themes/Default-4.2/xfwm4/hide-pressed.xpm
+share/themes/Default-4.2/xfwm4/left-active.png
+share/themes/Default-4.2/xfwm4/left-active.xpm
+share/themes/Default-4.2/xfwm4/left-inactive.png
+share/themes/Default-4.2/xfwm4/left-inactive.xpm
+share/themes/Default-4.2/xfwm4/maximize-active.xpm
+share/themes/Default-4.2/xfwm4/maximize-inactive.xpm
+share/themes/Default-4.2/xfwm4/maximize-pressed.png
+share/themes/Default-4.2/xfwm4/maximize-pressed.xpm
+share/themes/Default-4.2/xfwm4/maximize-toggled-active.xpm
+share/themes/Default-4.2/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Default-4.2/xfwm4/maximize-toggled-pressed.png
+share/themes/Default-4.2/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Default-4.2/xfwm4/menu-active.xpm
+share/themes/Default-4.2/xfwm4/menu-inactive.xpm
+share/themes/Default-4.2/xfwm4/menu-pressed.png
+share/themes/Default-4.2/xfwm4/menu-pressed.xpm
+share/themes/Default-4.2/xfwm4/right-active.png
+share/themes/Default-4.2/xfwm4/right-active.xpm
+share/themes/Default-4.2/xfwm4/right-inactive.png
+share/themes/Default-4.2/xfwm4/right-inactive.xpm
+share/themes/Default-4.2/xfwm4/shade-active.xpm
+share/themes/Default-4.2/xfwm4/shade-inactive.xpm
+share/themes/Default-4.2/xfwm4/shade-pressed.png
+share/themes/Default-4.2/xfwm4/shade-pressed.xpm
+share/themes/Default-4.2/xfwm4/shade-toggled-active.xpm
+share/themes/Default-4.2/xfwm4/shade-toggled-inactive.xpm
+share/themes/Default-4.2/xfwm4/shade-toggled-pressed.png
+share/themes/Default-4.2/xfwm4/shade-toggled-pressed.xpm
+share/themes/Default-4.2/xfwm4/stick-active.xpm
+share/themes/Default-4.2/xfwm4/stick-inactive.xpm
+share/themes/Default-4.2/xfwm4/stick-pressed.png
+share/themes/Default-4.2/xfwm4/stick-pressed.xpm
+share/themes/Default-4.2/xfwm4/stick-toggled-active.xpm
+share/themes/Default-4.2/xfwm4/stick-toggled-inactive.xpm
+share/themes/Default-4.2/xfwm4/stick-toggled-pressed.png
+share/themes/Default-4.2/xfwm4/stick-toggled-pressed.xpm
+share/themes/Default-4.2/xfwm4/themerc
+share/themes/Default-4.2/xfwm4/title-1-active.png
+share/themes/Default-4.2/xfwm4/title-1-active.xpm
+share/themes/Default-4.2/xfwm4/title-1-inactive.png
+share/themes/Default-4.2/xfwm4/title-1-inactive.xpm
+share/themes/Default-4.2/xfwm4/title-2-active.png
+share/themes/Default-4.2/xfwm4/title-2-active.xpm
+share/themes/Default-4.2/xfwm4/title-2-inactive.png
+share/themes/Default-4.2/xfwm4/title-2-inactive.xpm
+share/themes/Default-4.2/xfwm4/title-3-active.png
+share/themes/Default-4.2/xfwm4/title-3-active.xpm
+share/themes/Default-4.2/xfwm4/title-3-inactive.png
+share/themes/Default-4.2/xfwm4/title-3-inactive.xpm
+share/themes/Default-4.2/xfwm4/title-4-active.png
+share/themes/Default-4.2/xfwm4/title-4-active.xpm
+share/themes/Default-4.2/xfwm4/title-4-inactive.png
+share/themes/Default-4.2/xfwm4/title-4-inactive.xpm
+share/themes/Default-4.2/xfwm4/title-5-active.png
+share/themes/Default-4.2/xfwm4/title-5-active.xpm
+share/themes/Default-4.2/xfwm4/title-5-inactive.png
+share/themes/Default-4.2/xfwm4/title-5-inactive.xpm
+share/themes/Default-4.2/xfwm4/top-left-active.png
+share/themes/Default-4.2/xfwm4/top-left-active.xpm
+share/themes/Default-4.2/xfwm4/top-left-inactive.png
+share/themes/Default-4.2/xfwm4/top-left-inactive.xpm
+share/themes/Default-4.2/xfwm4/top-right-active.png
+share/themes/Default-4.2/xfwm4/top-right-active.xpm
+share/themes/Default-4.2/xfwm4/top-right-inactive.png
+share/themes/Default-4.2/xfwm4/top-right-inactive.xpm
share/themes/Default/xfwm4/README
share/themes/Default/xfwm4/bottom-active.png
share/themes/Default/xfwm4/bottom-active.xpm
@@ -123,11 +316,15 @@ share/themes/Default/xfwm4/bottom-right-active.png
share/themes/Default/xfwm4/bottom-right-active.xpm
share/themes/Default/xfwm4/bottom-right-inactive.png
share/themes/Default/xfwm4/bottom-right-inactive.xpm
+share/themes/Default/xfwm4/close-active.png
share/themes/Default/xfwm4/close-active.xpm
+share/themes/Default/xfwm4/close-inactive.png
share/themes/Default/xfwm4/close-inactive.xpm
share/themes/Default/xfwm4/close-pressed.png
share/themes/Default/xfwm4/close-pressed.xpm
+share/themes/Default/xfwm4/hide-active.png
share/themes/Default/xfwm4/hide-active.xpm
+share/themes/Default/xfwm4/hide-inactive.png
share/themes/Default/xfwm4/hide-inactive.xpm
share/themes/Default/xfwm4/hide-pressed.png
share/themes/Default/xfwm4/hide-pressed.xpm
@@ -136,15 +333,21 @@ share/themes/Default/xfwm4/left-active.png
share/themes/Default/xfwm4/left-active.xpm
share/themes/Default/xfwm4/left-inactive.png
share/themes/Default/xfwm4/left-inactive.xpm
+share/themes/Default/xfwm4/maximize-active.png
share/themes/Default/xfwm4/maximize-active.xpm
+share/themes/Default/xfwm4/maximize-inactive.png
share/themes/Default/xfwm4/maximize-inactive.xpm
share/themes/Default/xfwm4/maximize-pressed.png
share/themes/Default/xfwm4/maximize-pressed.xpm
+share/themes/Default/xfwm4/maximize-toggled-active.png
share/themes/Default/xfwm4/maximize-toggled-active.xpm
+share/themes/Default/xfwm4/maximize-toggled-inactive.png
share/themes/Default/xfwm4/maximize-toggled-inactive.xpm
share/themes/Default/xfwm4/maximize-toggled-pressed.png
share/themes/Default/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Default/xfwm4/menu-active.png
share/themes/Default/xfwm4/menu-active.xpm
+share/themes/Default/xfwm4/menu-inactive.png
share/themes/Default/xfwm4/menu-inactive.xpm
share/themes/Default/xfwm4/menu-pressed.png
share/themes/Default/xfwm4/menu-pressed.xpm
@@ -152,19 +355,27 @@ share/themes/Default/xfwm4/right-active.png
share/themes/Default/xfwm4/right-active.xpm
share/themes/Default/xfwm4/right-inactive.png
share/themes/Default/xfwm4/right-inactive.xpm
+share/themes/Default/xfwm4/shade-active.png
share/themes/Default/xfwm4/shade-active.xpm
+share/themes/Default/xfwm4/shade-inactive.png
share/themes/Default/xfwm4/shade-inactive.xpm
share/themes/Default/xfwm4/shade-pressed.png
share/themes/Default/xfwm4/shade-pressed.xpm
+share/themes/Default/xfwm4/shade-toggled-active.png
share/themes/Default/xfwm4/shade-toggled-active.xpm
+share/themes/Default/xfwm4/shade-toggled-inactive.png
share/themes/Default/xfwm4/shade-toggled-inactive.xpm
share/themes/Default/xfwm4/shade-toggled-pressed.png
share/themes/Default/xfwm4/shade-toggled-pressed.xpm
+share/themes/Default/xfwm4/stick-active.png
share/themes/Default/xfwm4/stick-active.xpm
+share/themes/Default/xfwm4/stick-inactive.png
share/themes/Default/xfwm4/stick-inactive.xpm
share/themes/Default/xfwm4/stick-pressed.png
share/themes/Default/xfwm4/stick-pressed.xpm
+share/themes/Default/xfwm4/stick-toggled-active.png
share/themes/Default/xfwm4/stick-toggled-active.xpm
+share/themes/Default/xfwm4/stick-toggled-inactive.png
share/themes/Default/xfwm4/stick-toggled-inactive.xpm
share/themes/Default/xfwm4/stick-toggled-pressed.png
share/themes/Default/xfwm4/stick-toggled-pressed.xpm
@@ -197,142 +408,526 @@ share/themes/Default/xfwm4/top-right-active.png
share/themes/Default/xfwm4/top-right-active.xpm
share/themes/Default/xfwm4/top-right-inactive.png
share/themes/Default/xfwm4/top-right-inactive.xpm
-share/themes/Opta/xfwm4/README
-share/themes/Opta/xfwm4/bottom-active.xpm
-share/themes/Opta/xfwm4/bottom-inactive.xpm
-share/themes/Opta/xfwm4/bottom-left-active.xpm
-share/themes/Opta/xfwm4/bottom-left-inactive.xpm
-share/themes/Opta/xfwm4/bottom-right-active.xpm
-share/themes/Opta/xfwm4/bottom-right-inactive.xpm
-share/themes/Opta/xfwm4/close-active.xpm
-share/themes/Opta/xfwm4/close-inactive.xpm
-share/themes/Opta/xfwm4/close-pressed.xpm
-share/themes/Opta/xfwm4/hide-active.xpm
-share/themes/Opta/xfwm4/hide-inactive.xpm
-share/themes/Opta/xfwm4/hide-pressed.xpm
-share/themes/Opta/xfwm4/left-active.xpm
-share/themes/Opta/xfwm4/left-inactive.xpm
-share/themes/Opta/xfwm4/maximize-active.xpm
-share/themes/Opta/xfwm4/maximize-inactive.xpm
-share/themes/Opta/xfwm4/maximize-pressed.xpm
-share/themes/Opta/xfwm4/maximize-toggled-active.xpm
-share/themes/Opta/xfwm4/maximize-toggled-inactive.xpm
-share/themes/Opta/xfwm4/maximize-toggled-pressed.xpm
-share/themes/Opta/xfwm4/menu-active.xpm
-share/themes/Opta/xfwm4/menu-inactive.xpm
-share/themes/Opta/xfwm4/menu-pressed.xpm
-share/themes/Opta/xfwm4/right-active.xpm
-share/themes/Opta/xfwm4/right-inactive.xpm
-share/themes/Opta/xfwm4/shade-active.xpm
-share/themes/Opta/xfwm4/shade-inactive.xpm
-share/themes/Opta/xfwm4/shade-pressed.xpm
-share/themes/Opta/xfwm4/shade-toggled-active.xpm
-share/themes/Opta/xfwm4/shade-toggled-inactive.xpm
-share/themes/Opta/xfwm4/shade-toggled-pressed.xpm
-share/themes/Opta/xfwm4/stick-active.xpm
-share/themes/Opta/xfwm4/stick-inactive.xpm
-share/themes/Opta/xfwm4/stick-pressed.xpm
-share/themes/Opta/xfwm4/stick-toggled-active.xpm
-share/themes/Opta/xfwm4/stick-toggled-inactive.xpm
-share/themes/Opta/xfwm4/stick-toggled-pressed.xpm
-share/themes/Opta/xfwm4/themerc
-share/themes/Opta/xfwm4/title-1-active.xpm
-share/themes/Opta/xfwm4/title-1-inactive.xpm
-share/themes/Opta/xfwm4/title-2-active.png
-share/themes/Opta/xfwm4/title-2-active.xpm
-share/themes/Opta/xfwm4/title-2-inactive.png
-share/themes/Opta/xfwm4/title-2-inactive.xpm
-share/themes/Opta/xfwm4/title-3-active.png
-share/themes/Opta/xfwm4/title-3-active.xpm
-share/themes/Opta/xfwm4/title-3-inactive.png
-share/themes/Opta/xfwm4/title-3-inactive.xpm
-share/themes/Opta/xfwm4/title-4-active.png
-share/themes/Opta/xfwm4/title-4-active.xpm
-share/themes/Opta/xfwm4/title-4-inactive.png
-share/themes/Opta/xfwm4/title-4-inactive.xpm
-share/themes/Opta/xfwm4/title-5-active.xpm
-share/themes/Opta/xfwm4/title-5-inactive.xpm
-share/themes/Opta/xfwm4/top-left-active.xpm
-share/themes/Opta/xfwm4/top-left-inactive.xpm
-share/themes/Opta/xfwm4/top-right-active.xpm
-share/themes/Opta/xfwm4/top-right-inactive.xpm
-share/themes/Symphony/xfwm4/README
-share/themes/Symphony/xfwm4/bottom-active.png
-share/themes/Symphony/xfwm4/bottom-active.xpm
-share/themes/Symphony/xfwm4/bottom-inactive.png
-share/themes/Symphony/xfwm4/bottom-inactive.xpm
-share/themes/Symphony/xfwm4/bottom-left-active.png
-share/themes/Symphony/xfwm4/bottom-left-active.xpm
-share/themes/Symphony/xfwm4/bottom-left-inactive.png
-share/themes/Symphony/xfwm4/bottom-left-inactive.xpm
-share/themes/Symphony/xfwm4/bottom-right-active.png
-share/themes/Symphony/xfwm4/bottom-right-active.xpm
-share/themes/Symphony/xfwm4/bottom-right-inactive.png
-share/themes/Symphony/xfwm4/bottom-right-inactive.xpm
-share/themes/Symphony/xfwm4/close-active.xpm
-share/themes/Symphony/xfwm4/close-inactive.xpm
-share/themes/Symphony/xfwm4/close-pressed.xpm
-share/themes/Symphony/xfwm4/hide-active.xpm
-share/themes/Symphony/xfwm4/hide-inactive.xpm
-share/themes/Symphony/xfwm4/hide-pressed.xpm
-share/themes/Symphony/xfwm4/left-active.png
-share/themes/Symphony/xfwm4/left-active.xpm
-share/themes/Symphony/xfwm4/left-inactive.png
-share/themes/Symphony/xfwm4/left-inactive.xpm
-share/themes/Symphony/xfwm4/maximize-active.xpm
-share/themes/Symphony/xfwm4/maximize-inactive.xpm
-share/themes/Symphony/xfwm4/maximize-pressed.xpm
-share/themes/Symphony/xfwm4/maximize-toggled-active.xpm
-share/themes/Symphony/xfwm4/maximize-toggled-inactive.xpm
-share/themes/Symphony/xfwm4/maximize-toggled-pressed.xpm
-share/themes/Symphony/xfwm4/menu-active.xpm
-share/themes/Symphony/xfwm4/menu-inactive.xpm
-share/themes/Symphony/xfwm4/menu-pressed.xpm
-share/themes/Symphony/xfwm4/right-active.png
-share/themes/Symphony/xfwm4/right-active.xpm
-share/themes/Symphony/xfwm4/right-inactive.png
-share/themes/Symphony/xfwm4/right-inactive.xpm
-share/themes/Symphony/xfwm4/shade-active.xpm
-share/themes/Symphony/xfwm4/shade-inactive.xpm
-share/themes/Symphony/xfwm4/shade-pressed.xpm
-share/themes/Symphony/xfwm4/shade-toggled-active.xpm
-share/themes/Symphony/xfwm4/shade-toggled-inactive.xpm
-share/themes/Symphony/xfwm4/shade-toggled-pressed.xpm
-share/themes/Symphony/xfwm4/stick-active.xpm
-share/themes/Symphony/xfwm4/stick-inactive.xpm
-share/themes/Symphony/xfwm4/stick-pressed.xpm
-share/themes/Symphony/xfwm4/stick-toggled-active.xpm
-share/themes/Symphony/xfwm4/stick-toggled-inactive.xpm
-share/themes/Symphony/xfwm4/stick-toggled-pressed.xpm
-share/themes/Symphony/xfwm4/themerc
-share/themes/Symphony/xfwm4/title-1-active.png
-share/themes/Symphony/xfwm4/title-1-active.xpm
-share/themes/Symphony/xfwm4/title-1-inactive.png
-share/themes/Symphony/xfwm4/title-1-inactive.xpm
-share/themes/Symphony/xfwm4/title-2-active.png
-share/themes/Symphony/xfwm4/title-2-active.xpm
-share/themes/Symphony/xfwm4/title-2-inactive.png
-share/themes/Symphony/xfwm4/title-2-inactive.xpm
-share/themes/Symphony/xfwm4/title-3-active.png
-share/themes/Symphony/xfwm4/title-3-active.xpm
-share/themes/Symphony/xfwm4/title-3-inactive.png
-share/themes/Symphony/xfwm4/title-3-inactive.xpm
-share/themes/Symphony/xfwm4/title-4-active.png
-share/themes/Symphony/xfwm4/title-4-active.xpm
-share/themes/Symphony/xfwm4/title-4-inactive.png
-share/themes/Symphony/xfwm4/title-4-inactive.xpm
-share/themes/Symphony/xfwm4/title-5-active.png
-share/themes/Symphony/xfwm4/title-5-active.xpm
-share/themes/Symphony/xfwm4/title-5-inactive.png
-share/themes/Symphony/xfwm4/title-5-inactive.xpm
-share/themes/Symphony/xfwm4/top-left-active.png
-share/themes/Symphony/xfwm4/top-left-active.xpm
-share/themes/Symphony/xfwm4/top-left-inactive.png
-share/themes/Symphony/xfwm4/top-left-inactive.xpm
-share/themes/Symphony/xfwm4/top-right-active.png
-share/themes/Symphony/xfwm4/top-right-active.xpm
-share/themes/Symphony/xfwm4/top-right-inactive.png
-share/themes/Symphony/xfwm4/top-right-inactive.xpm
+share/themes/Katiola/xfwm4/README
+share/themes/Katiola/xfwm4/bottom-active.png
+share/themes/Katiola/xfwm4/bottom-active.xpm
+share/themes/Katiola/xfwm4/bottom-inactive.png
+share/themes/Katiola/xfwm4/bottom-inactive.xpm
+share/themes/Katiola/xfwm4/bottom-left-active.png
+share/themes/Katiola/xfwm4/bottom-left-active.xpm
+share/themes/Katiola/xfwm4/bottom-left-inactive.png
+share/themes/Katiola/xfwm4/bottom-left-inactive.xpm
+share/themes/Katiola/xfwm4/bottom-right-active.png
+share/themes/Katiola/xfwm4/bottom-right-active.xpm
+share/themes/Katiola/xfwm4/bottom-right-inactive.png
+share/themes/Katiola/xfwm4/bottom-right-inactive.xpm
+share/themes/Katiola/xfwm4/close-active.png
+share/themes/Katiola/xfwm4/close-active.xpm
+share/themes/Katiola/xfwm4/close-inactive.png
+share/themes/Katiola/xfwm4/close-inactive.xpm
+share/themes/Katiola/xfwm4/close-pressed.png
+share/themes/Katiola/xfwm4/close-pressed.xpm
+share/themes/Katiola/xfwm4/hide-active.png
+share/themes/Katiola/xfwm4/hide-active.xpm
+share/themes/Katiola/xfwm4/hide-inactive.png
+share/themes/Katiola/xfwm4/hide-inactive.xpm
+share/themes/Katiola/xfwm4/hide-pressed.png
+share/themes/Katiola/xfwm4/hide-pressed.xpm
+share/themes/Katiola/xfwm4/left-active.png
+share/themes/Katiola/xfwm4/left-active.xpm
+share/themes/Katiola/xfwm4/left-inactive.png
+share/themes/Katiola/xfwm4/left-inactive.xpm
+share/themes/Katiola/xfwm4/maximize-active.png
+share/themes/Katiola/xfwm4/maximize-active.xpm
+share/themes/Katiola/xfwm4/maximize-inactive.png
+share/themes/Katiola/xfwm4/maximize-inactive.xpm
+share/themes/Katiola/xfwm4/maximize-pressed.png
+share/themes/Katiola/xfwm4/maximize-pressed.xpm
+share/themes/Katiola/xfwm4/maximize-toggled-active.png
+share/themes/Katiola/xfwm4/maximize-toggled-active.xpm
+share/themes/Katiola/xfwm4/maximize-toggled-inactive.png
+share/themes/Katiola/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Katiola/xfwm4/maximize-toggled-pressed.png
+share/themes/Katiola/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Katiola/xfwm4/menu-active.png
+share/themes/Katiola/xfwm4/menu-active.xpm
+share/themes/Katiola/xfwm4/menu-inactive.png
+share/themes/Katiola/xfwm4/menu-inactive.xpm
+share/themes/Katiola/xfwm4/menu-pressed.png
+share/themes/Katiola/xfwm4/menu-pressed.xpm
+share/themes/Katiola/xfwm4/right-active.png
+share/themes/Katiola/xfwm4/right-active.xpm
+share/themes/Katiola/xfwm4/right-inactive.png
+share/themes/Katiola/xfwm4/right-inactive.xpm
+share/themes/Katiola/xfwm4/shade-active.png
+share/themes/Katiola/xfwm4/shade-active.xpm
+share/themes/Katiola/xfwm4/shade-inactive.png
+share/themes/Katiola/xfwm4/shade-inactive.xpm
+share/themes/Katiola/xfwm4/shade-pressed.png
+share/themes/Katiola/xfwm4/shade-pressed.xpm
+share/themes/Katiola/xfwm4/shade-toggled-active.png
+share/themes/Katiola/xfwm4/shade-toggled-active.xpm
+share/themes/Katiola/xfwm4/shade-toggled-inactive.png
+share/themes/Katiola/xfwm4/shade-toggled-inactive.xpm
+share/themes/Katiola/xfwm4/shade-toggled-pressed.png
+share/themes/Katiola/xfwm4/shade-toggled-pressed.xpm
+share/themes/Katiola/xfwm4/stick-active.png
+share/themes/Katiola/xfwm4/stick-active.xpm
+share/themes/Katiola/xfwm4/stick-inactive.png
+share/themes/Katiola/xfwm4/stick-inactive.xpm
+share/themes/Katiola/xfwm4/stick-pressed.png
+share/themes/Katiola/xfwm4/stick-pressed.xpm
+share/themes/Katiola/xfwm4/stick-toggled-active.png
+share/themes/Katiola/xfwm4/stick-toggled-active.xpm
+share/themes/Katiola/xfwm4/stick-toggled-inactive.png
+share/themes/Katiola/xfwm4/stick-toggled-inactive.xpm
+share/themes/Katiola/xfwm4/stick-toggled-pressed.png
+share/themes/Katiola/xfwm4/stick-toggled-pressed.xpm
+share/themes/Katiola/xfwm4/themerc
+share/themes/Katiola/xfwm4/title-1-active.png
+share/themes/Katiola/xfwm4/title-1-active.xpm
+share/themes/Katiola/xfwm4/title-1-inactive.png
+share/themes/Katiola/xfwm4/title-1-inactive.xpm
+share/themes/Katiola/xfwm4/title-2-active.png
+share/themes/Katiola/xfwm4/title-2-active.xpm
+share/themes/Katiola/xfwm4/title-2-inactive.png
+share/themes/Katiola/xfwm4/title-2-inactive.xpm
+share/themes/Katiola/xfwm4/title-3-active.png
+share/themes/Katiola/xfwm4/title-3-active.xpm
+share/themes/Katiola/xfwm4/title-3-inactive.png
+share/themes/Katiola/xfwm4/title-3-inactive.xpm
+share/themes/Katiola/xfwm4/title-4-active.png
+share/themes/Katiola/xfwm4/title-4-active.xpm
+share/themes/Katiola/xfwm4/title-4-inactive.png
+share/themes/Katiola/xfwm4/title-4-inactive.xpm
+share/themes/Katiola/xfwm4/title-5-active.png
+share/themes/Katiola/xfwm4/title-5-active.xpm
+share/themes/Katiola/xfwm4/title-5-inactive.png
+share/themes/Katiola/xfwm4/title-5-inactive.xpm
+share/themes/Katiola/xfwm4/top-left-active.png
+share/themes/Katiola/xfwm4/top-left-active.xpm
+share/themes/Katiola/xfwm4/top-left-inactive.png
+share/themes/Katiola/xfwm4/top-left-inactive.xpm
+share/themes/Katiola/xfwm4/top-right-active.png
+share/themes/Katiola/xfwm4/top-right-active.xpm
+share/themes/Katiola/xfwm4/top-right-inactive.png
+share/themes/Katiola/xfwm4/top-right-inactive.xpm
+share/themes/Kokodi/xfwm4/README
+share/themes/Kokodi/xfwm4/bottom-active.png
+share/themes/Kokodi/xfwm4/bottom-active.xpm
+share/themes/Kokodi/xfwm4/bottom-inactive.png
+share/themes/Kokodi/xfwm4/bottom-inactive.xpm
+share/themes/Kokodi/xfwm4/bottom-left-active.png
+share/themes/Kokodi/xfwm4/bottom-left-active.xpm
+share/themes/Kokodi/xfwm4/bottom-left-inactive.png
+share/themes/Kokodi/xfwm4/bottom-left-inactive.xpm
+share/themes/Kokodi/xfwm4/bottom-right-active.png
+share/themes/Kokodi/xfwm4/bottom-right-active.xpm
+share/themes/Kokodi/xfwm4/bottom-right-inactive.png
+share/themes/Kokodi/xfwm4/bottom-right-inactive.xpm
+share/themes/Kokodi/xfwm4/close-active.png
+share/themes/Kokodi/xfwm4/close-active.xpm
+share/themes/Kokodi/xfwm4/close-inactive.png
+share/themes/Kokodi/xfwm4/close-inactive.xpm
+share/themes/Kokodi/xfwm4/close-pressed.png
+share/themes/Kokodi/xfwm4/close-pressed.xpm
+share/themes/Kokodi/xfwm4/hide-active.png
+share/themes/Kokodi/xfwm4/hide-active.xpm
+share/themes/Kokodi/xfwm4/hide-inactive.png
+share/themes/Kokodi/xfwm4/hide-inactive.xpm
+share/themes/Kokodi/xfwm4/hide-pressed.png
+share/themes/Kokodi/xfwm4/hide-pressed.xpm
+share/themes/Kokodi/xfwm4/left-active.png
+share/themes/Kokodi/xfwm4/left-active.xpm
+share/themes/Kokodi/xfwm4/left-inactive.png
+share/themes/Kokodi/xfwm4/left-inactive.xpm
+share/themes/Kokodi/xfwm4/maximize-active.png
+share/themes/Kokodi/xfwm4/maximize-active.xpm
+share/themes/Kokodi/xfwm4/maximize-inactive.png
+share/themes/Kokodi/xfwm4/maximize-inactive.xpm
+share/themes/Kokodi/xfwm4/maximize-pressed.png
+share/themes/Kokodi/xfwm4/maximize-pressed.xpm
+share/themes/Kokodi/xfwm4/maximize-toggled-active.png
+share/themes/Kokodi/xfwm4/maximize-toggled-active.xpm
+share/themes/Kokodi/xfwm4/maximize-toggled-inactive.png
+share/themes/Kokodi/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Kokodi/xfwm4/maximize-toggled-pressed.png
+share/themes/Kokodi/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Kokodi/xfwm4/menu-active.png
+share/themes/Kokodi/xfwm4/menu-active.xpm
+share/themes/Kokodi/xfwm4/menu-inactive.png
+share/themes/Kokodi/xfwm4/menu-inactive.xpm
+share/themes/Kokodi/xfwm4/menu-pressed.png
+share/themes/Kokodi/xfwm4/menu-pressed.xpm
+share/themes/Kokodi/xfwm4/right-active.png
+share/themes/Kokodi/xfwm4/right-active.xpm
+share/themes/Kokodi/xfwm4/right-inactive.png
+share/themes/Kokodi/xfwm4/right-inactive.xpm
+share/themes/Kokodi/xfwm4/shade-active.png
+share/themes/Kokodi/xfwm4/shade-active.xpm
+share/themes/Kokodi/xfwm4/shade-inactive.png
+share/themes/Kokodi/xfwm4/shade-inactive.xpm
+share/themes/Kokodi/xfwm4/shade-pressed.png
+share/themes/Kokodi/xfwm4/shade-pressed.xpm
+share/themes/Kokodi/xfwm4/shade-toggled-active.png
+share/themes/Kokodi/xfwm4/shade-toggled-active.xpm
+share/themes/Kokodi/xfwm4/shade-toggled-inactive.png
+share/themes/Kokodi/xfwm4/shade-toggled-inactive.xpm
+share/themes/Kokodi/xfwm4/shade-toggled-pressed.png
+share/themes/Kokodi/xfwm4/shade-toggled-pressed.xpm
+share/themes/Kokodi/xfwm4/stick-active.png
+share/themes/Kokodi/xfwm4/stick-active.xpm
+share/themes/Kokodi/xfwm4/stick-inactive.png
+share/themes/Kokodi/xfwm4/stick-inactive.xpm
+share/themes/Kokodi/xfwm4/stick-pressed.png
+share/themes/Kokodi/xfwm4/stick-pressed.xpm
+share/themes/Kokodi/xfwm4/stick-toggled-active.png
+share/themes/Kokodi/xfwm4/stick-toggled-active.xpm
+share/themes/Kokodi/xfwm4/stick-toggled-inactive.png
+share/themes/Kokodi/xfwm4/stick-toggled-inactive.xpm
+share/themes/Kokodi/xfwm4/stick-toggled-pressed.png
+share/themes/Kokodi/xfwm4/stick-toggled-pressed.xpm
+share/themes/Kokodi/xfwm4/themerc
+share/themes/Kokodi/xfwm4/title-1-active.png
+share/themes/Kokodi/xfwm4/title-1-active.xpm
+share/themes/Kokodi/xfwm4/title-1-inactive.png
+share/themes/Kokodi/xfwm4/title-1-inactive.xpm
+share/themes/Kokodi/xfwm4/title-2-active.png
+share/themes/Kokodi/xfwm4/title-2-active.xpm
+share/themes/Kokodi/xfwm4/title-2-inactive.png
+share/themes/Kokodi/xfwm4/title-2-inactive.xpm
+share/themes/Kokodi/xfwm4/title-3-active.png
+share/themes/Kokodi/xfwm4/title-3-active.xpm
+share/themes/Kokodi/xfwm4/title-3-inactive.png
+share/themes/Kokodi/xfwm4/title-3-inactive.xpm
+share/themes/Kokodi/xfwm4/title-4-active.png
+share/themes/Kokodi/xfwm4/title-4-active.xpm
+share/themes/Kokodi/xfwm4/title-4-inactive.png
+share/themes/Kokodi/xfwm4/title-4-inactive.xpm
+share/themes/Kokodi/xfwm4/title-5-active.png
+share/themes/Kokodi/xfwm4/title-5-active.xpm
+share/themes/Kokodi/xfwm4/title-5-inactive.png
+share/themes/Kokodi/xfwm4/title-5-inactive.xpm
+share/themes/Kokodi/xfwm4/top-left-active.png
+share/themes/Kokodi/xfwm4/top-left-active.xpm
+share/themes/Kokodi/xfwm4/top-left-inactive.png
+share/themes/Kokodi/xfwm4/top-left-inactive.xpm
+share/themes/Kokodi/xfwm4/top-right-active.png
+share/themes/Kokodi/xfwm4/top-right-active.xpm
+share/themes/Kokodi/xfwm4/top-right-inactive.png
+share/themes/Kokodi/xfwm4/top-right-inactive.xpm
+share/themes/Moheli/xfwm4/README
+share/themes/Moheli/xfwm4/bottom-active.png
+share/themes/Moheli/xfwm4/bottom-active.xpm
+share/themes/Moheli/xfwm4/bottom-inactive.png
+share/themes/Moheli/xfwm4/bottom-inactive.xpm
+share/themes/Moheli/xfwm4/bottom-left-active.png
+share/themes/Moheli/xfwm4/bottom-left-active.xpm
+share/themes/Moheli/xfwm4/bottom-left-inactive.png
+share/themes/Moheli/xfwm4/bottom-left-inactive.xpm
+share/themes/Moheli/xfwm4/bottom-right-active.png
+share/themes/Moheli/xfwm4/bottom-right-active.xpm
+share/themes/Moheli/xfwm4/bottom-right-inactive.png
+share/themes/Moheli/xfwm4/bottom-right-inactive.xpm
+share/themes/Moheli/xfwm4/close-active.png
+share/themes/Moheli/xfwm4/close-active.xpm
+share/themes/Moheli/xfwm4/close-inactive.png
+share/themes/Moheli/xfwm4/close-inactive.xpm
+share/themes/Moheli/xfwm4/close-pressed.png
+share/themes/Moheli/xfwm4/close-pressed.xpm
+share/themes/Moheli/xfwm4/hide-active.png
+share/themes/Moheli/xfwm4/hide-active.xpm
+share/themes/Moheli/xfwm4/hide-inactive.png
+share/themes/Moheli/xfwm4/hide-inactive.xpm
+share/themes/Moheli/xfwm4/hide-pressed.png
+share/themes/Moheli/xfwm4/hide-pressed.xpm
+share/themes/Moheli/xfwm4/left-active.png
+share/themes/Moheli/xfwm4/left-active.xpm
+share/themes/Moheli/xfwm4/left-inactive.png
+share/themes/Moheli/xfwm4/left-inactive.xpm
+share/themes/Moheli/xfwm4/maximize-active.png
+share/themes/Moheli/xfwm4/maximize-active.xpm
+share/themes/Moheli/xfwm4/maximize-inactive.png
+share/themes/Moheli/xfwm4/maximize-inactive.xpm
+share/themes/Moheli/xfwm4/maximize-pressed.png
+share/themes/Moheli/xfwm4/maximize-pressed.xpm
+share/themes/Moheli/xfwm4/maximize-toggled-active.png
+share/themes/Moheli/xfwm4/maximize-toggled-active.xpm
+share/themes/Moheli/xfwm4/maximize-toggled-inactive.png
+share/themes/Moheli/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Moheli/xfwm4/maximize-toggled-pressed.png
+share/themes/Moheli/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Moheli/xfwm4/menu-active.png
+share/themes/Moheli/xfwm4/menu-active.xpm
+share/themes/Moheli/xfwm4/menu-inactive.png
+share/themes/Moheli/xfwm4/menu-inactive.xpm
+share/themes/Moheli/xfwm4/menu-pressed.png
+share/themes/Moheli/xfwm4/menu-pressed.xpm
+share/themes/Moheli/xfwm4/right-active.png
+share/themes/Moheli/xfwm4/right-active.xpm
+share/themes/Moheli/xfwm4/right-inactive.png
+share/themes/Moheli/xfwm4/right-inactive.xpm
+share/themes/Moheli/xfwm4/shade-active.png
+share/themes/Moheli/xfwm4/shade-active.xpm
+share/themes/Moheli/xfwm4/shade-inactive.png
+share/themes/Moheli/xfwm4/shade-inactive.xpm
+share/themes/Moheli/xfwm4/shade-pressed.png
+share/themes/Moheli/xfwm4/shade-pressed.xpm
+share/themes/Moheli/xfwm4/shade-toggled-active.png
+share/themes/Moheli/xfwm4/shade-toggled-active.xpm
+share/themes/Moheli/xfwm4/shade-toggled-inactive.png
+share/themes/Moheli/xfwm4/shade-toggled-inactive.xpm
+share/themes/Moheli/xfwm4/shade-toggled-pressed.png
+share/themes/Moheli/xfwm4/shade-toggled-pressed.xpm
+share/themes/Moheli/xfwm4/stick-active.png
+share/themes/Moheli/xfwm4/stick-active.xpm
+share/themes/Moheli/xfwm4/stick-inactive.png
+share/themes/Moheli/xfwm4/stick-inactive.xpm
+share/themes/Moheli/xfwm4/stick-pressed.png
+share/themes/Moheli/xfwm4/stick-pressed.xpm
+share/themes/Moheli/xfwm4/stick-toggled-active.png
+share/themes/Moheli/xfwm4/stick-toggled-active.xpm
+share/themes/Moheli/xfwm4/stick-toggled-inactive.png
+share/themes/Moheli/xfwm4/stick-toggled-inactive.xpm
+share/themes/Moheli/xfwm4/stick-toggled-pressed.png
+share/themes/Moheli/xfwm4/stick-toggled-pressed.xpm
+share/themes/Moheli/xfwm4/themerc
+share/themes/Moheli/xfwm4/title-1-active.png
+share/themes/Moheli/xfwm4/title-1-active.xpm
+share/themes/Moheli/xfwm4/title-1-inactive.png
+share/themes/Moheli/xfwm4/title-1-inactive.xpm
+share/themes/Moheli/xfwm4/title-2-active.png
+share/themes/Moheli/xfwm4/title-2-active.xpm
+share/themes/Moheli/xfwm4/title-2-inactive.png
+share/themes/Moheli/xfwm4/title-2-inactive.xpm
+share/themes/Moheli/xfwm4/title-3-active.png
+share/themes/Moheli/xfwm4/title-3-active.xpm
+share/themes/Moheli/xfwm4/title-3-inactive.png
+share/themes/Moheli/xfwm4/title-3-inactive.xpm
+share/themes/Moheli/xfwm4/title-4-active.png
+share/themes/Moheli/xfwm4/title-4-active.xpm
+share/themes/Moheli/xfwm4/title-4-inactive.png
+share/themes/Moheli/xfwm4/title-4-inactive.xpm
+share/themes/Moheli/xfwm4/title-5-active.png
+share/themes/Moheli/xfwm4/title-5-active.xpm
+share/themes/Moheli/xfwm4/title-5-inactive.png
+share/themes/Moheli/xfwm4/title-5-inactive.xpm
+share/themes/Moheli/xfwm4/top-left-active.png
+share/themes/Moheli/xfwm4/top-left-active.xpm
+share/themes/Moheli/xfwm4/top-left-inactive.png
+share/themes/Moheli/xfwm4/top-left-inactive.xpm
+share/themes/Moheli/xfwm4/top-right-active.png
+share/themes/Moheli/xfwm4/top-right-active.xpm
+share/themes/Moheli/xfwm4/top-right-inactive.png
+share/themes/Moheli/xfwm4/top-right-inactive.xpm
+share/themes/Sassandra/xfwm4/README
+share/themes/Sassandra/xfwm4/bottom-active.png
+share/themes/Sassandra/xfwm4/bottom-active.xpm
+share/themes/Sassandra/xfwm4/bottom-inactive.png
+share/themes/Sassandra/xfwm4/bottom-inactive.xpm
+share/themes/Sassandra/xfwm4/bottom-left-active.png
+share/themes/Sassandra/xfwm4/bottom-left-active.xpm
+share/themes/Sassandra/xfwm4/bottom-left-inactive.png
+share/themes/Sassandra/xfwm4/bottom-left-inactive.xpm
+share/themes/Sassandra/xfwm4/bottom-right-active.png
+share/themes/Sassandra/xfwm4/bottom-right-active.xpm
+share/themes/Sassandra/xfwm4/bottom-right-inactive.png
+share/themes/Sassandra/xfwm4/bottom-right-inactive.xpm
+share/themes/Sassandra/xfwm4/close-active.png
+share/themes/Sassandra/xfwm4/close-active.xpm
+share/themes/Sassandra/xfwm4/close-inactive.png
+share/themes/Sassandra/xfwm4/close-inactive.xpm
+share/themes/Sassandra/xfwm4/close-pressed.png
+share/themes/Sassandra/xfwm4/close-pressed.xpm
+share/themes/Sassandra/xfwm4/hide-active.png
+share/themes/Sassandra/xfwm4/hide-active.xpm
+share/themes/Sassandra/xfwm4/hide-inactive.png
+share/themes/Sassandra/xfwm4/hide-inactive.xpm
+share/themes/Sassandra/xfwm4/hide-pressed.png
+share/themes/Sassandra/xfwm4/hide-pressed.xpm
+share/themes/Sassandra/xfwm4/left-active.png
+share/themes/Sassandra/xfwm4/left-active.xpm
+share/themes/Sassandra/xfwm4/left-inactive.png
+share/themes/Sassandra/xfwm4/left-inactive.xpm
+share/themes/Sassandra/xfwm4/maximize-active.png
+share/themes/Sassandra/xfwm4/maximize-active.xpm
+share/themes/Sassandra/xfwm4/maximize-inactive.png
+share/themes/Sassandra/xfwm4/maximize-inactive.xpm
+share/themes/Sassandra/xfwm4/maximize-pressed.png
+share/themes/Sassandra/xfwm4/maximize-pressed.xpm
+share/themes/Sassandra/xfwm4/maximize-toggled-active.png
+share/themes/Sassandra/xfwm4/maximize-toggled-active.xpm
+share/themes/Sassandra/xfwm4/maximize-toggled-inactive.png
+share/themes/Sassandra/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Sassandra/xfwm4/maximize-toggled-pressed.png
+share/themes/Sassandra/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Sassandra/xfwm4/menu-active.png
+share/themes/Sassandra/xfwm4/menu-active.xpm
+share/themes/Sassandra/xfwm4/menu-inactive.png
+share/themes/Sassandra/xfwm4/menu-inactive.xpm
+share/themes/Sassandra/xfwm4/menu-pressed.png
+share/themes/Sassandra/xfwm4/menu-pressed.xpm
+share/themes/Sassandra/xfwm4/right-active.png
+share/themes/Sassandra/xfwm4/right-active.xpm
+share/themes/Sassandra/xfwm4/right-inactive.png
+share/themes/Sassandra/xfwm4/right-inactive.xpm
+share/themes/Sassandra/xfwm4/shade-active.png
+share/themes/Sassandra/xfwm4/shade-active.xpm
+share/themes/Sassandra/xfwm4/shade-inactive.png
+share/themes/Sassandra/xfwm4/shade-inactive.xpm
+share/themes/Sassandra/xfwm4/shade-pressed.png
+share/themes/Sassandra/xfwm4/shade-pressed.xpm
+share/themes/Sassandra/xfwm4/shade-toggled-active.png
+share/themes/Sassandra/xfwm4/shade-toggled-active.xpm
+share/themes/Sassandra/xfwm4/shade-toggled-inactive.png
+share/themes/Sassandra/xfwm4/shade-toggled-inactive.xpm
+share/themes/Sassandra/xfwm4/shade-toggled-pressed.png
+share/themes/Sassandra/xfwm4/shade-toggled-pressed.xpm
+share/themes/Sassandra/xfwm4/stick-active.png
+share/themes/Sassandra/xfwm4/stick-active.xpm
+share/themes/Sassandra/xfwm4/stick-inactive.png
+share/themes/Sassandra/xfwm4/stick-inactive.xpm
+share/themes/Sassandra/xfwm4/stick-pressed.png
+share/themes/Sassandra/xfwm4/stick-pressed.xpm
+share/themes/Sassandra/xfwm4/stick-toggled-active.png
+share/themes/Sassandra/xfwm4/stick-toggled-active.xpm
+share/themes/Sassandra/xfwm4/stick-toggled-inactive.png
+share/themes/Sassandra/xfwm4/stick-toggled-inactive.xpm
+share/themes/Sassandra/xfwm4/stick-toggled-pressed.png
+share/themes/Sassandra/xfwm4/stick-toggled-pressed.xpm
+share/themes/Sassandra/xfwm4/themerc
+share/themes/Sassandra/xfwm4/title-1-active.png
+share/themes/Sassandra/xfwm4/title-1-active.xpm
+share/themes/Sassandra/xfwm4/title-1-inactive.png
+share/themes/Sassandra/xfwm4/title-1-inactive.xpm
+share/themes/Sassandra/xfwm4/title-2-active.png
+share/themes/Sassandra/xfwm4/title-2-active.xpm
+share/themes/Sassandra/xfwm4/title-2-inactive.png
+share/themes/Sassandra/xfwm4/title-2-inactive.xpm
+share/themes/Sassandra/xfwm4/title-3-active.png
+share/themes/Sassandra/xfwm4/title-3-active.xpm
+share/themes/Sassandra/xfwm4/title-3-inactive.png
+share/themes/Sassandra/xfwm4/title-3-inactive.xpm
+share/themes/Sassandra/xfwm4/title-4-active.png
+share/themes/Sassandra/xfwm4/title-4-active.xpm
+share/themes/Sassandra/xfwm4/title-4-inactive.png
+share/themes/Sassandra/xfwm4/title-4-inactive.xpm
+share/themes/Sassandra/xfwm4/title-5-active.png
+share/themes/Sassandra/xfwm4/title-5-active.xpm
+share/themes/Sassandra/xfwm4/title-5-inactive.png
+share/themes/Sassandra/xfwm4/title-5-inactive.xpm
+share/themes/Sassandra/xfwm4/top-left-active.png
+share/themes/Sassandra/xfwm4/top-left-active.xpm
+share/themes/Sassandra/xfwm4/top-left-inactive.png
+share/themes/Sassandra/xfwm4/top-left-inactive.xpm
+share/themes/Sassandra/xfwm4/top-right-active.png
+share/themes/Sassandra/xfwm4/top-right-active.xpm
+share/themes/Sassandra/xfwm4/top-right-inactive.png
+share/themes/Sassandra/xfwm4/top-right-inactive.xpm
+share/themes/Stoneage/xfwm4/README
+share/themes/Stoneage/xfwm4/bottom-active.png
+share/themes/Stoneage/xfwm4/bottom-active.xpm
+share/themes/Stoneage/xfwm4/bottom-inactive.png
+share/themes/Stoneage/xfwm4/bottom-inactive.xpm
+share/themes/Stoneage/xfwm4/bottom-left-active.png
+share/themes/Stoneage/xfwm4/bottom-left-active.xpm
+share/themes/Stoneage/xfwm4/bottom-left-inactive.png
+share/themes/Stoneage/xfwm4/bottom-left-inactive.xpm
+share/themes/Stoneage/xfwm4/bottom-right-active.png
+share/themes/Stoneage/xfwm4/bottom-right-active.xpm
+share/themes/Stoneage/xfwm4/bottom-right-inactive.png
+share/themes/Stoneage/xfwm4/bottom-right-inactive.xpm
+share/themes/Stoneage/xfwm4/close-active.png
+share/themes/Stoneage/xfwm4/close-active.xpm
+share/themes/Stoneage/xfwm4/close-inactive.png
+share/themes/Stoneage/xfwm4/close-inactive.xpm
+share/themes/Stoneage/xfwm4/close-pressed.png
+share/themes/Stoneage/xfwm4/close-pressed.xpm
+share/themes/Stoneage/xfwm4/hide-active.png
+share/themes/Stoneage/xfwm4/hide-active.xpm
+share/themes/Stoneage/xfwm4/hide-inactive.png
+share/themes/Stoneage/xfwm4/hide-inactive.xpm
+share/themes/Stoneage/xfwm4/hide-pressed.png
+share/themes/Stoneage/xfwm4/hide-pressed.xpm
+share/themes/Stoneage/xfwm4/left-active.png
+share/themes/Stoneage/xfwm4/left-active.xpm
+share/themes/Stoneage/xfwm4/left-inactive.png
+share/themes/Stoneage/xfwm4/left-inactive.xpm
+share/themes/Stoneage/xfwm4/maximize-active.png
+share/themes/Stoneage/xfwm4/maximize-active.xpm
+share/themes/Stoneage/xfwm4/maximize-inactive.png
+share/themes/Stoneage/xfwm4/maximize-inactive.xpm
+share/themes/Stoneage/xfwm4/maximize-pressed.png
+share/themes/Stoneage/xfwm4/maximize-pressed.xpm
+share/themes/Stoneage/xfwm4/maximize-toggled-active.png
+share/themes/Stoneage/xfwm4/maximize-toggled-active.xpm
+share/themes/Stoneage/xfwm4/maximize-toggled-inactive.png
+share/themes/Stoneage/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Stoneage/xfwm4/maximize-toggled-pressed.png
+share/themes/Stoneage/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Stoneage/xfwm4/menu-active.png
+share/themes/Stoneage/xfwm4/menu-active.xpm
+share/themes/Stoneage/xfwm4/menu-inactive.png
+share/themes/Stoneage/xfwm4/menu-inactive.xpm
+share/themes/Stoneage/xfwm4/menu-pressed.png
+share/themes/Stoneage/xfwm4/menu-pressed.xpm
+share/themes/Stoneage/xfwm4/right-active.png
+share/themes/Stoneage/xfwm4/right-active.xpm
+share/themes/Stoneage/xfwm4/right-inactive.png
+share/themes/Stoneage/xfwm4/right-inactive.xpm
+share/themes/Stoneage/xfwm4/shade-active.png
+share/themes/Stoneage/xfwm4/shade-active.xpm
+share/themes/Stoneage/xfwm4/shade-inactive.png
+share/themes/Stoneage/xfwm4/shade-inactive.xpm
+share/themes/Stoneage/xfwm4/shade-pressed.png
+share/themes/Stoneage/xfwm4/shade-pressed.xpm
+share/themes/Stoneage/xfwm4/shade-toggled-active.png
+share/themes/Stoneage/xfwm4/shade-toggled-active.xpm
+share/themes/Stoneage/xfwm4/shade-toggled-inactive.png
+share/themes/Stoneage/xfwm4/shade-toggled-inactive.xpm
+share/themes/Stoneage/xfwm4/shade-toggled-pressed.png
+share/themes/Stoneage/xfwm4/shade-toggled-pressed.xpm
+share/themes/Stoneage/xfwm4/stick-active.png
+share/themes/Stoneage/xfwm4/stick-active.xpm
+share/themes/Stoneage/xfwm4/stick-inactive.png
+share/themes/Stoneage/xfwm4/stick-inactive.xpm
+share/themes/Stoneage/xfwm4/stick-pressed.png
+share/themes/Stoneage/xfwm4/stick-pressed.xpm
+share/themes/Stoneage/xfwm4/stick-toggled-active.png
+share/themes/Stoneage/xfwm4/stick-toggled-active.xpm
+share/themes/Stoneage/xfwm4/stick-toggled-inactive.png
+share/themes/Stoneage/xfwm4/stick-toggled-inactive.xpm
+share/themes/Stoneage/xfwm4/stick-toggled-pressed.png
+share/themes/Stoneage/xfwm4/stick-toggled-pressed.xpm
+share/themes/Stoneage/xfwm4/themerc
+share/themes/Stoneage/xfwm4/title-1-active.png
+share/themes/Stoneage/xfwm4/title-1-active.xpm
+share/themes/Stoneage/xfwm4/title-1-inactive.png
+share/themes/Stoneage/xfwm4/title-1-inactive.xpm
+share/themes/Stoneage/xfwm4/title-2-active.png
+share/themes/Stoneage/xfwm4/title-2-active.xpm
+share/themes/Stoneage/xfwm4/title-2-inactive.png
+share/themes/Stoneage/xfwm4/title-2-inactive.xpm
+share/themes/Stoneage/xfwm4/title-3-active.png
+share/themes/Stoneage/xfwm4/title-3-active.xpm
+share/themes/Stoneage/xfwm4/title-3-inactive.png
+share/themes/Stoneage/xfwm4/title-3-inactive.xpm
+share/themes/Stoneage/xfwm4/title-4-active.png
+share/themes/Stoneage/xfwm4/title-4-active.xpm
+share/themes/Stoneage/xfwm4/title-4-inactive.png
+share/themes/Stoneage/xfwm4/title-4-inactive.xpm
+share/themes/Stoneage/xfwm4/title-5-active.png
+share/themes/Stoneage/xfwm4/title-5-active.xpm
+share/themes/Stoneage/xfwm4/title-5-inactive.png
+share/themes/Stoneage/xfwm4/title-5-inactive.xpm
+share/themes/Stoneage/xfwm4/top-left-active.png
+share/themes/Stoneage/xfwm4/top-left-active.xpm
+share/themes/Stoneage/xfwm4/top-left-inactive.png
+share/themes/Stoneage/xfwm4/top-left-inactive.xpm
+share/themes/Stoneage/xfwm4/top-right-active.png
+share/themes/Stoneage/xfwm4/top-right-active.xpm
+share/themes/Stoneage/xfwm4/top-right-inactive.png
+share/themes/Stoneage/xfwm4/top-right-inactive.xpm
share/themes/Therapy/xfwm4/README
share/themes/Therapy/xfwm4/bottom-active.png
share/themes/Therapy/xfwm4/bottom-active.xpm
@@ -346,11 +941,15 @@ share/themes/Therapy/xfwm4/bottom-right-active.png
share/themes/Therapy/xfwm4/bottom-right-active.xpm
share/themes/Therapy/xfwm4/bottom-right-inactive.png
share/themes/Therapy/xfwm4/bottom-right-inactive.xpm
+share/themes/Therapy/xfwm4/close-active.png
share/themes/Therapy/xfwm4/close-active.xpm
+share/themes/Therapy/xfwm4/close-inactive.png
share/themes/Therapy/xfwm4/close-inactive.xpm
share/themes/Therapy/xfwm4/close-pressed.png
share/themes/Therapy/xfwm4/close-pressed.xpm
+share/themes/Therapy/xfwm4/hide-active.png
share/themes/Therapy/xfwm4/hide-active.xpm
+share/themes/Therapy/xfwm4/hide-inactive.png
share/themes/Therapy/xfwm4/hide-inactive.xpm
share/themes/Therapy/xfwm4/hide-pressed.png
share/themes/Therapy/xfwm4/hide-pressed.xpm
@@ -358,15 +957,21 @@ share/themes/Therapy/xfwm4/left-active.png
share/themes/Therapy/xfwm4/left-active.xpm
share/themes/Therapy/xfwm4/left-inactive.png
share/themes/Therapy/xfwm4/left-inactive.xpm
+share/themes/Therapy/xfwm4/maximize-active.png
share/themes/Therapy/xfwm4/maximize-active.xpm
+share/themes/Therapy/xfwm4/maximize-inactive.png
share/themes/Therapy/xfwm4/maximize-inactive.xpm
share/themes/Therapy/xfwm4/maximize-pressed.png
share/themes/Therapy/xfwm4/maximize-pressed.xpm
+share/themes/Therapy/xfwm4/maximize-toggled-active.png
share/themes/Therapy/xfwm4/maximize-toggled-active.xpm
+share/themes/Therapy/xfwm4/maximize-toggled-inactive.png
share/themes/Therapy/xfwm4/maximize-toggled-inactive.xpm
share/themes/Therapy/xfwm4/maximize-toggled-pressed.png
share/themes/Therapy/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Therapy/xfwm4/menu-active.png
share/themes/Therapy/xfwm4/menu-active.xpm
+share/themes/Therapy/xfwm4/menu-inactive.png
share/themes/Therapy/xfwm4/menu-inactive.xpm
share/themes/Therapy/xfwm4/menu-pressed.png
share/themes/Therapy/xfwm4/menu-pressed.xpm
@@ -374,19 +979,27 @@ share/themes/Therapy/xfwm4/right-active.png
share/themes/Therapy/xfwm4/right-active.xpm
share/themes/Therapy/xfwm4/right-inactive.png
share/themes/Therapy/xfwm4/right-inactive.xpm
+share/themes/Therapy/xfwm4/shade-active.png
share/themes/Therapy/xfwm4/shade-active.xpm
+share/themes/Therapy/xfwm4/shade-inactive.png
share/themes/Therapy/xfwm4/shade-inactive.xpm
share/themes/Therapy/xfwm4/shade-pressed.png
share/themes/Therapy/xfwm4/shade-pressed.xpm
+share/themes/Therapy/xfwm4/shade-toggled-active.png
share/themes/Therapy/xfwm4/shade-toggled-active.xpm
+share/themes/Therapy/xfwm4/shade-toggled-inactive.png
share/themes/Therapy/xfwm4/shade-toggled-inactive.xpm
share/themes/Therapy/xfwm4/shade-toggled-pressed.png
share/themes/Therapy/xfwm4/shade-toggled-pressed.xpm
+share/themes/Therapy/xfwm4/stick-active.png
share/themes/Therapy/xfwm4/stick-active.xpm
+share/themes/Therapy/xfwm4/stick-inactive.png
share/themes/Therapy/xfwm4/stick-inactive.xpm
share/themes/Therapy/xfwm4/stick-pressed.png
share/themes/Therapy/xfwm4/stick-pressed.xpm
+share/themes/Therapy/xfwm4/stick-toggled-active.png
share/themes/Therapy/xfwm4/stick-toggled-active.xpm
+share/themes/Therapy/xfwm4/stick-toggled-inactive.png
share/themes/Therapy/xfwm4/stick-toggled-inactive.xpm
share/themes/Therapy/xfwm4/stick-toggled-pressed.png
share/themes/Therapy/xfwm4/stick-toggled-pressed.xpm
@@ -523,177 +1136,110 @@ share/themes/Tyrex/xfwm4/top-right-active.png
share/themes/Tyrex/xfwm4/top-right-active.xpm
share/themes/Tyrex/xfwm4/top-right-inactive.png
share/themes/Tyrex/xfwm4/top-right-inactive.xpm
-share/themes/Waza/xfwm4/README
-share/themes/Waza/xfwm4/bottom-active.xpm
-share/themes/Waza/xfwm4/bottom-inactive.xpm
-share/themes/Waza/xfwm4/bottom-left-active.xpm
-share/themes/Waza/xfwm4/bottom-left-inactive.xpm
-share/themes/Waza/xfwm4/bottom-right-active.xpm
-share/themes/Waza/xfwm4/bottom-right-inactive.xpm
-share/themes/Waza/xfwm4/close-active.png
-share/themes/Waza/xfwm4/close-active.xpm
-share/themes/Waza/xfwm4/close-inactive.png
-share/themes/Waza/xfwm4/close-inactive.xpm
-share/themes/Waza/xfwm4/close-pressed.png
-share/themes/Waza/xfwm4/close-pressed.xpm
-share/themes/Waza/xfwm4/hide-active.png
-share/themes/Waza/xfwm4/hide-active.xpm
-share/themes/Waza/xfwm4/hide-inactive.png
-share/themes/Waza/xfwm4/hide-inactive.xpm
-share/themes/Waza/xfwm4/hide-pressed.png
-share/themes/Waza/xfwm4/hide-pressed.xpm
-share/themes/Waza/xfwm4/left-active.xpm
-share/themes/Waza/xfwm4/left-inactive.xpm
-share/themes/Waza/xfwm4/maximize-active.png
-share/themes/Waza/xfwm4/maximize-active.xpm
-share/themes/Waza/xfwm4/maximize-inactive.png
-share/themes/Waza/xfwm4/maximize-inactive.xpm
-share/themes/Waza/xfwm4/maximize-pressed.png
-share/themes/Waza/xfwm4/maximize-pressed.xpm
-share/themes/Waza/xfwm4/maximize-toggled-active.png
-share/themes/Waza/xfwm4/maximize-toggled-active.xpm
-share/themes/Waza/xfwm4/maximize-toggled-inactive.png
-share/themes/Waza/xfwm4/maximize-toggled-inactive.xpm
-share/themes/Waza/xfwm4/maximize-toggled-pressed.png
-share/themes/Waza/xfwm4/maximize-toggled-pressed.xpm
-share/themes/Waza/xfwm4/menu-active.png
-share/themes/Waza/xfwm4/menu-active.xpm
-share/themes/Waza/xfwm4/menu-inactive.png
-share/themes/Waza/xfwm4/menu-inactive.xpm
-share/themes/Waza/xfwm4/menu-pressed.png
-share/themes/Waza/xfwm4/menu-pressed.xpm
-share/themes/Waza/xfwm4/right-active.xpm
-share/themes/Waza/xfwm4/right-inactive.xpm
-share/themes/Waza/xfwm4/shade-active.png
-share/themes/Waza/xfwm4/shade-active.xpm
-share/themes/Waza/xfwm4/shade-inactive.png
-share/themes/Waza/xfwm4/shade-inactive.xpm
-share/themes/Waza/xfwm4/shade-pressed.png
-share/themes/Waza/xfwm4/shade-pressed.xpm
-share/themes/Waza/xfwm4/shade-toggled-active.png
-share/themes/Waza/xfwm4/shade-toggled-active.xpm
-share/themes/Waza/xfwm4/shade-toggled-inactive.png
-share/themes/Waza/xfwm4/shade-toggled-inactive.xpm
-share/themes/Waza/xfwm4/shade-toggled-pressed.png
-share/themes/Waza/xfwm4/shade-toggled-pressed.xpm
-share/themes/Waza/xfwm4/stick-active.png
-share/themes/Waza/xfwm4/stick-active.xpm
-share/themes/Waza/xfwm4/stick-inactive.png
-share/themes/Waza/xfwm4/stick-inactive.xpm
-share/themes/Waza/xfwm4/stick-pressed.png
-share/themes/Waza/xfwm4/stick-pressed.xpm
-share/themes/Waza/xfwm4/stick-toggled-active.png
-share/themes/Waza/xfwm4/stick-toggled-active.xpm
-share/themes/Waza/xfwm4/stick-toggled-inactive.png
-share/themes/Waza/xfwm4/stick-toggled-inactive.xpm
-share/themes/Waza/xfwm4/stick-toggled-pressed.png
-share/themes/Waza/xfwm4/stick-toggled-pressed.xpm
-share/themes/Waza/xfwm4/themerc
-share/themes/Waza/xfwm4/title-1-active.png
-share/themes/Waza/xfwm4/title-1-active.xpm
-share/themes/Waza/xfwm4/title-1-inactive.png
-share/themes/Waza/xfwm4/title-1-inactive.xpm
-share/themes/Waza/xfwm4/title-2-active.png
-share/themes/Waza/xfwm4/title-2-active.xpm
-share/themes/Waza/xfwm4/title-2-inactive.png
-share/themes/Waza/xfwm4/title-2-inactive.xpm
-share/themes/Waza/xfwm4/title-3-active.png
-share/themes/Waza/xfwm4/title-3-active.xpm
-share/themes/Waza/xfwm4/title-3-inactive.png
-share/themes/Waza/xfwm4/title-3-inactive.xpm
-share/themes/Waza/xfwm4/title-4-active.png
-share/themes/Waza/xfwm4/title-4-active.xpm
-share/themes/Waza/xfwm4/title-4-inactive.png
-share/themes/Waza/xfwm4/title-4-inactive.xpm
-share/themes/Waza/xfwm4/title-5-active.png
-share/themes/Waza/xfwm4/title-5-active.xpm
-share/themes/Waza/xfwm4/title-5-inactive.png
-share/themes/Waza/xfwm4/title-5-inactive.xpm
-share/themes/Waza/xfwm4/top-left-active.png
-share/themes/Waza/xfwm4/top-left-active.xpm
-share/themes/Waza/xfwm4/top-left-inactive.png
-share/themes/Waza/xfwm4/top-left-inactive.xpm
-share/themes/Waza/xfwm4/top-right-active.png
-share/themes/Waza/xfwm4/top-right-active.xpm
-share/themes/Waza/xfwm4/top-right-inactive.png
-share/themes/Waza/xfwm4/top-right-inactive.xpm
-share/themes/Wildbush/xfwm4/README
-share/themes/Wildbush/xfwm4/bottom-active.png
-share/themes/Wildbush/xfwm4/bottom-active.xpm
-share/themes/Wildbush/xfwm4/bottom-inactive.png
-share/themes/Wildbush/xfwm4/bottom-inactive.xpm
-share/themes/Wildbush/xfwm4/bottom-left-active.png
-share/themes/Wildbush/xfwm4/bottom-left-active.xpm
-share/themes/Wildbush/xfwm4/bottom-left-inactive.png
-share/themes/Wildbush/xfwm4/bottom-left-inactive.xpm
-share/themes/Wildbush/xfwm4/bottom-right-active.png
-share/themes/Wildbush/xfwm4/bottom-right-active.xpm
-share/themes/Wildbush/xfwm4/bottom-right-inactive.png
-share/themes/Wildbush/xfwm4/bottom-right-inactive.xpm
-share/themes/Wildbush/xfwm4/close-active.xpm
-share/themes/Wildbush/xfwm4/close-inactive.xpm
-share/themes/Wildbush/xfwm4/close-pressed.xpm
-share/themes/Wildbush/xfwm4/hide-active.xpm
-share/themes/Wildbush/xfwm4/hide-inactive.xpm
-share/themes/Wildbush/xfwm4/hide-pressed.xpm
-share/themes/Wildbush/xfwm4/left-active.png
-share/themes/Wildbush/xfwm4/left-active.xpm
-share/themes/Wildbush/xfwm4/left-inactive.png
-share/themes/Wildbush/xfwm4/left-inactive.xpm
-share/themes/Wildbush/xfwm4/maximize-active.xpm
-share/themes/Wildbush/xfwm4/maximize-inactive.xpm
-share/themes/Wildbush/xfwm4/maximize-pressed.xpm
-share/themes/Wildbush/xfwm4/maximize-toggled-active.xpm
-share/themes/Wildbush/xfwm4/maximize-toggled-inactive.xpm
-share/themes/Wildbush/xfwm4/maximize-toggled-pressed.xpm
-share/themes/Wildbush/xfwm4/menu-active.xpm
-share/themes/Wildbush/xfwm4/menu-inactive.xpm
-share/themes/Wildbush/xfwm4/menu-pressed.xpm
-share/themes/Wildbush/xfwm4/right-active.png
-share/themes/Wildbush/xfwm4/right-active.xpm
-share/themes/Wildbush/xfwm4/right-inactive.png
-share/themes/Wildbush/xfwm4/right-inactive.xpm
-share/themes/Wildbush/xfwm4/shade-active.xpm
-share/themes/Wildbush/xfwm4/shade-inactive.xpm
-share/themes/Wildbush/xfwm4/shade-pressed.xpm
-share/themes/Wildbush/xfwm4/shade-toggled-active.xpm
-share/themes/Wildbush/xfwm4/shade-toggled-inactive.xpm
-share/themes/Wildbush/xfwm4/shade-toggled-pressed.xpm
-share/themes/Wildbush/xfwm4/stick-active.xpm
-share/themes/Wildbush/xfwm4/stick-inactive.xpm
-share/themes/Wildbush/xfwm4/stick-pressed.xpm
-share/themes/Wildbush/xfwm4/stick-toggled-active.xpm
-share/themes/Wildbush/xfwm4/stick-toggled-inactive.xpm
-share/themes/Wildbush/xfwm4/stick-toggled-pressed.xpm
-share/themes/Wildbush/xfwm4/themerc
-share/themes/Wildbush/xfwm4/title-1-active.png
-share/themes/Wildbush/xfwm4/title-1-active.xpm
-share/themes/Wildbush/xfwm4/title-1-inactive.png
-share/themes/Wildbush/xfwm4/title-1-inactive.xpm
-share/themes/Wildbush/xfwm4/title-2-active.png
-share/themes/Wildbush/xfwm4/title-2-active.xpm
-share/themes/Wildbush/xfwm4/title-2-inactive.png
-share/themes/Wildbush/xfwm4/title-2-inactive.xpm
-share/themes/Wildbush/xfwm4/title-3-active.png
-share/themes/Wildbush/xfwm4/title-3-active.xpm
-share/themes/Wildbush/xfwm4/title-3-inactive.png
-share/themes/Wildbush/xfwm4/title-3-inactive.xpm
-share/themes/Wildbush/xfwm4/title-4-active.png
-share/themes/Wildbush/xfwm4/title-4-active.xpm
-share/themes/Wildbush/xfwm4/title-4-inactive.png
-share/themes/Wildbush/xfwm4/title-4-inactive.xpm
-share/themes/Wildbush/xfwm4/title-5-active.png
-share/themes/Wildbush/xfwm4/title-5-active.xpm
-share/themes/Wildbush/xfwm4/title-5-inactive.png
-share/themes/Wildbush/xfwm4/title-5-inactive.xpm
-share/themes/Wildbush/xfwm4/top-left-active.png
-share/themes/Wildbush/xfwm4/top-left-active.xpm
-share/themes/Wildbush/xfwm4/top-left-inactive.png
-share/themes/Wildbush/xfwm4/top-left-inactive.xpm
-share/themes/Wildbush/xfwm4/top-right-active.png
-share/themes/Wildbush/xfwm4/top-right-active.xpm
-share/themes/Wildbush/xfwm4/top-right-inactive.png
-share/themes/Wildbush/xfwm4/top-right-inactive.xpm
+share/themes/Wallis/xfwm4/README
+share/themes/Wallis/xfwm4/bottom-active.png
+share/themes/Wallis/xfwm4/bottom-active.xpm
+share/themes/Wallis/xfwm4/bottom-inactive.png
+share/themes/Wallis/xfwm4/bottom-inactive.xpm
+share/themes/Wallis/xfwm4/bottom-left-active.png
+share/themes/Wallis/xfwm4/bottom-left-active.xpm
+share/themes/Wallis/xfwm4/bottom-left-inactive.png
+share/themes/Wallis/xfwm4/bottom-left-inactive.xpm
+share/themes/Wallis/xfwm4/bottom-right-active.png
+share/themes/Wallis/xfwm4/bottom-right-active.xpm
+share/themes/Wallis/xfwm4/bottom-right-inactive.png
+share/themes/Wallis/xfwm4/bottom-right-inactive.xpm
+share/themes/Wallis/xfwm4/close-active.png
+share/themes/Wallis/xfwm4/close-active.xpm
+share/themes/Wallis/xfwm4/close-inactive.png
+share/themes/Wallis/xfwm4/close-inactive.xpm
+share/themes/Wallis/xfwm4/close-pressed.png
+share/themes/Wallis/xfwm4/close-pressed.xpm
+share/themes/Wallis/xfwm4/hide-active.png
+share/themes/Wallis/xfwm4/hide-active.xpm
+share/themes/Wallis/xfwm4/hide-inactive.png
+share/themes/Wallis/xfwm4/hide-inactive.xpm
+share/themes/Wallis/xfwm4/hide-pressed.png
+share/themes/Wallis/xfwm4/hide-pressed.xpm
+share/themes/Wallis/xfwm4/left-active.png
+share/themes/Wallis/xfwm4/left-active.xpm
+share/themes/Wallis/xfwm4/left-inactive.png
+share/themes/Wallis/xfwm4/left-inactive.xpm
+share/themes/Wallis/xfwm4/maximize-active.png
+share/themes/Wallis/xfwm4/maximize-active.xpm
+share/themes/Wallis/xfwm4/maximize-inactive.png
+share/themes/Wallis/xfwm4/maximize-inactive.xpm
+share/themes/Wallis/xfwm4/maximize-pressed.png
+share/themes/Wallis/xfwm4/maximize-pressed.xpm
+share/themes/Wallis/xfwm4/maximize-toggled-active.png
+share/themes/Wallis/xfwm4/maximize-toggled-active.xpm
+share/themes/Wallis/xfwm4/maximize-toggled-inactive.png
+share/themes/Wallis/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Wallis/xfwm4/maximize-toggled-pressed.png
+share/themes/Wallis/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Wallis/xfwm4/menu-active.png
+share/themes/Wallis/xfwm4/menu-active.xpm
+share/themes/Wallis/xfwm4/menu-inactive.png
+share/themes/Wallis/xfwm4/menu-inactive.xpm
+share/themes/Wallis/xfwm4/menu-pressed.png
+share/themes/Wallis/xfwm4/menu-pressed.xpm
+share/themes/Wallis/xfwm4/right-active.png
+share/themes/Wallis/xfwm4/right-active.xpm
+share/themes/Wallis/xfwm4/right-inactive.png
+share/themes/Wallis/xfwm4/right-inactive.xpm
+share/themes/Wallis/xfwm4/shade-active.png
+share/themes/Wallis/xfwm4/shade-active.xpm
+share/themes/Wallis/xfwm4/shade-inactive.png
+share/themes/Wallis/xfwm4/shade-inactive.xpm
+share/themes/Wallis/xfwm4/shade-pressed.png
+share/themes/Wallis/xfwm4/shade-pressed.xpm
+share/themes/Wallis/xfwm4/shade-toggled-active.png
+share/themes/Wallis/xfwm4/shade-toggled-active.xpm
+share/themes/Wallis/xfwm4/shade-toggled-inactive.png
+share/themes/Wallis/xfwm4/shade-toggled-inactive.xpm
+share/themes/Wallis/xfwm4/shade-toggled-pressed.png
+share/themes/Wallis/xfwm4/shade-toggled-pressed.xpm
+share/themes/Wallis/xfwm4/stick-active.png
+share/themes/Wallis/xfwm4/stick-active.xpm
+share/themes/Wallis/xfwm4/stick-inactive.png
+share/themes/Wallis/xfwm4/stick-inactive.xpm
+share/themes/Wallis/xfwm4/stick-pressed.png
+share/themes/Wallis/xfwm4/stick-pressed.xpm
+share/themes/Wallis/xfwm4/stick-toggled-active.png
+share/themes/Wallis/xfwm4/stick-toggled-active.xpm
+share/themes/Wallis/xfwm4/stick-toggled-inactive.png
+share/themes/Wallis/xfwm4/stick-toggled-inactive.xpm
+share/themes/Wallis/xfwm4/stick-toggled-pressed.png
+share/themes/Wallis/xfwm4/stick-toggled-pressed.xpm
+share/themes/Wallis/xfwm4/themerc
+share/themes/Wallis/xfwm4/title-1-active.png
+share/themes/Wallis/xfwm4/title-1-active.xpm
+share/themes/Wallis/xfwm4/title-1-inactive.png
+share/themes/Wallis/xfwm4/title-1-inactive.xpm
+share/themes/Wallis/xfwm4/title-2-active.png
+share/themes/Wallis/xfwm4/title-2-active.xpm
+share/themes/Wallis/xfwm4/title-2-inactive.png
+share/themes/Wallis/xfwm4/title-2-inactive.xpm
+share/themes/Wallis/xfwm4/title-3-active.png
+share/themes/Wallis/xfwm4/title-3-active.xpm
+share/themes/Wallis/xfwm4/title-3-inactive.png
+share/themes/Wallis/xfwm4/title-3-inactive.xpm
+share/themes/Wallis/xfwm4/title-4-active.png
+share/themes/Wallis/xfwm4/title-4-active.xpm
+share/themes/Wallis/xfwm4/title-4-inactive.png
+share/themes/Wallis/xfwm4/title-4-inactive.xpm
+share/themes/Wallis/xfwm4/title-5-active.png
+share/themes/Wallis/xfwm4/title-5-active.xpm
+share/themes/Wallis/xfwm4/title-5-inactive.png
+share/themes/Wallis/xfwm4/title-5-inactive.xpm
+share/themes/Wallis/xfwm4/top-left-active.png
+share/themes/Wallis/xfwm4/top-left-active.xpm
+share/themes/Wallis/xfwm4/top-left-inactive.png
+share/themes/Wallis/xfwm4/top-left-inactive.xpm
+share/themes/Wallis/xfwm4/top-right-active.png
+share/themes/Wallis/xfwm4/top-right-active.xpm
+share/themes/Wallis/xfwm4/top-right-inactive.png
+share/themes/Wallis/xfwm4/top-right-inactive.xpm
share/xfce4/doc/C/images/compose_shortcut.png
share/xfce4/doc/C/images/decoration_style.png
share/xfce4/doc/C/images/focus.png
@@ -713,30 +1259,39 @@ share/xfce4/doc/fr/images/titlebar.png
share/xfce4/doc/fr/images/workspace_margins.png
share/xfce4/doc/fr/images/xfwm_workspaces.png
share/xfce4/doc/fr/xfwm4.html
-share/xfce4/doc/he/images/compose_shortcut.png
-share/xfce4/doc/he/images/decoration_style.png
-share/xfce4/doc/he/images/focus.png
-share/xfce4/doc/he/images/keyboard_shortcuts.png
-share/xfce4/doc/he/images/misc_wm_prefs.png
-share/xfce4/doc/he/images/titlebar.png
-share/xfce4/doc/he/images/workspace_margins.png
-share/xfce4/doc/he/images/xfwm_workspaces.png
-share/xfce4/doc/he/xfwm4.html
+share/xfce4/doc/it/images/compose_shortcut.png
+share/xfce4/doc/it/images/decoration_style.png
+share/xfce4/doc/it/images/focus.png
+share/xfce4/doc/it/images/keyboard_and_focus.png
+share/xfce4/doc/it/images/keyboard_shortcuts.png
+share/xfce4/doc/it/images/misc_wm_prefs.png
+share/xfce4/doc/it/images/titlebar.png
+share/xfce4/doc/it/images/workspace_margins.png
+share/xfce4/doc/it/images/xfwm_workspaces.png
+share/xfce4/doc/it/xfwm4.html
share/xfwm4/defaults
@dirrm share/xfwm4
-@dirrm share/themes/Wildbush/xfwm4
-@dirrm share/themes/Wildbush
-@dirrm share/themes/Waza/xfwm4
-@dirrm share/themes/Waza
+@dirrm share/themes/Wallis/xfwm4
+@dirrm share/themes/Wallis
@dirrm share/themes/Tyrex/xfwm4
@dirrm share/themes/Tyrex
@dirrm share/themes/Therapy/xfwm4
@dirrm share/themes/Therapy
-@dirrm share/themes/Symphony/xfwm4
-@dirrm share/themes/Symphony
-@dirrm share/themes/Opta/xfwm4
-@dirrm share/themes/Opta
+@dirrm share/themes/Stoneage/xfwm4
+@dirrm share/themes/Stoneage
+@dirrm share/themes/Sassandra/xfwm4
+@dirrm share/themes/Sassandra
+@dirrm share/themes/Moheli/xfwm4
+@dirrm share/themes/Moheli
+@dirrm share/themes/Kokodi/xfwm4
+@dirrm share/themes/Kokodi
+@dirrm share/themes/Katiola/xfwm4
+@dirrm share/themes/Katiola
@dirrm share/themes/Default/xfwm4
+@dirrm share/themes/Default-4.2/xfwm4
+@dirrm share/themes/Default-4.2
@dirrm share/themes/Default-4.0/xfwm4
@dirrm share/themes/Default-4.0
+@dirrm share/themes/Daloa/xfwm4
+@dirrm share/themes/Daloa
@unexec ${RMDIR} %D/share/themes/Default 2>/dev/null || ${TRUE}
diff --git a/wm/xfce4-wm/buildlink3.mk b/wm/xfce4-wm/buildlink3.mk
index 4816d62a502..4d2e8283562 100644
--- a/wm/xfce4-wm/buildlink3.mk
+++ b/wm/xfce4-wm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2007/01/23 11:53:46 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2007/04/12 09:55:20 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_WM_BUILDLINK3_MK:= ${XFCE4_WM_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= xfce4-wm
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-wm
.if ${XFCE4_WM_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-wm+= xfce4-wm>=4.2.4
+BUILDLINK_API_DEPENDS.xfce4-wm+= xfce4-wm>=4.4.1
BUILDLINK_PKGSRCDIR.xfce4-wm?= ../../wm/xfce4-wm
.endif # XFCE4_WM_BUILDLINK3_MK
@@ -20,6 +20,7 @@ BUILDLINK_PKGSRCDIR.xfce4-wm?= ../../wm/xfce4-wm
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/wm/xfce4-wm/distinfo b/wm/xfce4-wm/distinfo
index 920eb212d31..2f3feee4d99 100644
--- a/wm/xfce4-wm/distinfo
+++ b/wm/xfce4-wm/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.15 2007/01/23 11:53:46 martti Exp $
+$NetBSD: distinfo,v 1.16 2007/04/12 09:55:20 martti Exp $
-SHA1 (xfwm4-4.2.4.tar.gz) = fd6882e800d20eb1a329b20832346deb78993408
-RMD160 (xfwm4-4.2.4.tar.gz) = f9caca43d4eac386ecbc3c18afef1ca6c46da7ae
-Size (xfwm4-4.2.4.tar.gz) = 1716160 bytes
+SHA1 (xfwm4-4.4.1.tar.bz2) = 1f1c0cb374941bce2bd59eedd8d9bd05591c65a0
+RMD160 (xfwm4-4.4.1.tar.bz2) = 6bd28775d3625b799f5443d3ba28dafb75215bb8
+Size (xfwm4-4.4.1.tar.bz2) = 1645973 bytes
+SHA1 (patch-aa) = adca693a9a740544416fb3dcf28e4aa0b24c5488
diff --git a/wm/xfce4-wm/patches/patch-aa b/wm/xfce4-wm/patches/patch-aa
new file mode 100644
index 00000000000..249cfe46994
--- /dev/null
+++ b/wm/xfce4-wm/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/04/12 09:55:20 martti Exp $
+
+--- src/frame.c.orig 2007-04-11 16:58:58.000000000 +0300
++++ src/frame.c 2007-04-11 16:59:04.000000000 +0300
+@@ -38,7 +38,7 @@
+ #include "compositor.h"
+
+ #ifndef ShapeInput
+-#define ShapeInput 2;
++#define ShapeInput 2
+ #endif
+
+ int
diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile
index 0594503487c..af6136a33f4 100644
--- a/x11/libxfce4gui/Makefile
+++ b/x11/libxfce4gui/Makefile
@@ -1,25 +1,20 @@
-# $NetBSD: Makefile,v 1.22 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: Makefile,v 1.23 2007/04/12 09:55:20 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= libxfcegui4-${XFCE4_VERSION}
PKGNAME= libxfce4gui-${XFCE4_VERSION}
-#PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce widget library
-USE_TOOLS+= msgfmt
+USE_TOOLS+= msgfmt
+CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc
PKGCONFIG_OVERRIDE= libxfcegui4/libxfcegui4-1.0.pc.in
-BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../databases/dbh/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libxfce4util/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/libxfce4gui/PLIST b/x11/libxfce4gui/PLIST
index 752beb4bc57..c2182286ab0 100644
--- a/x11/libxfce4gui/PLIST
+++ b/x11/libxfce4gui/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.16 2007/01/23 11:53:47 martti Exp $
+@comment $NetBSD: PLIST,v 1.17 2007/04/12 09:55:20 martti Exp $
include/xfce4/libxfcegui4/dialogs.h
include/xfce4/libxfcegui4/gtk_style.h
include/xfce4/libxfcegui4/gtktoxevent.h
+include/xfce4/libxfcegui4/gui-enum-types.h
include/xfce4/libxfcegui4/icons.h
include/xfce4/libxfcegui4/libnetk.h
include/xfce4/libxfcegui4/libxfcegui4-config.h
@@ -27,7 +28,11 @@ include/xfce4/libxfcegui4/xfce-exec.h
include/xfce4/libxfcegui4/xfce-filechooser.h
include/xfce4/libxfcegui4/xfce-gdk-extensions.h
include/xfce4/libxfcegui4/xfce-gtk-extensions.h
+include/xfce4/libxfcegui4/xfce-heading.h
include/xfce4/libxfcegui4/xfce-icontheme.h
+include/xfce4/libxfcegui4/xfce-startup-notification.h
+include/xfce4/libxfcegui4/xfce-titled-dialog.h
+include/xfce4/libxfcegui4/xfce-widget-helpers.h
include/xfce4/libxfcegui4/xfce_aboutdialog.h
include/xfce4/libxfcegui4/xfce_clock.h
include/xfce4/libxfcegui4/xfce_decorbutton.h
@@ -41,22 +46,55 @@ include/xfce4/libxfcegui4/xfce_scaled_image.h
include/xfce4/libxfcegui4/xfce_systemtray.h
include/xfce4/libxfcegui4/xfce_togglebutton.h
include/xfce4/libxfcegui4/xinerama.h
-include/xfce4/xfce4-modules/combo.h
-include/xfce4/xfce4-modules/constants.h
-include/xfce4/xfce4-modules/mime.h
-include/xfce4/xfce4-modules/mime_icons.h
lib/libxfcegui4.la
lib/pkgconfig/libxfcegui4-1.0.pc
-lib/xfce4/modules/libxfce4_combo.la
-lib/xfce4/modules/libxfce4_mime.la
-lib/xfce4/modules/libxfce4_mime_icons.la
-share/locale/af/LC_MESSAGES/libxfcegui4.mo
+share/doc/libxfcegui4/XfceAboutDialog.html
+share/doc/libxfcegui4/XfceAppMenuItem.html
+share/doc/libxfcegui4/XfceFramebox.html
+share/doc/libxfcegui4/XfceHeading.html
+share/doc/libxfcegui4/XfceIconTheme.html
+share/doc/libxfcegui4/XfceTitledDialog.html
+share/doc/libxfcegui4/home.png
+share/doc/libxfcegui4/index.html
+share/doc/libxfcegui4/index.sgml
+share/doc/libxfcegui4/left.png
+share/doc/libxfcegui4/libxfcegui4-Standard-Macros.html
+share/doc/libxfcegui4/libxfcegui4-Xfce-Gdk-extensions.html
+share/doc/libxfcegui4/libxfcegui4-Xfce-Gtk+-extensions.html
+share/doc/libxfcegui4/libxfcegui4-XfceFileChooser.html
+share/doc/libxfcegui4/libxfcegui4-core.html
+share/doc/libxfcegui4/libxfcegui4-dialogs.html
+share/doc/libxfcegui4/libxfcegui4-fundamentals.html
+share/doc/libxfcegui4/libxfcegui4-netk.html
+share/doc/libxfcegui4/libxfcegui4-xfce-exec.html
+share/doc/libxfcegui4/libxfcegui4.devhelp
+share/doc/libxfcegui4/libxfcegui4.devhelp2
+share/doc/libxfcegui4/reference.html
+share/doc/libxfcegui4/right.png
+share/doc/libxfcegui4/style.css
+share/doc/libxfcegui4/up.png
+share/icons/hicolor/48x48/apps/xfce-edit.png
+share/icons/hicolor/48x48/apps/xfce-filemanager.png
+share/icons/hicolor/48x48/apps/xfce-games.png
+share/icons/hicolor/48x48/apps/xfce-graphics.png
+share/icons/hicolor/48x48/apps/xfce-internet.png
+share/icons/hicolor/48x48/apps/xfce-man.png
+share/icons/hicolor/48x48/apps/xfce-multimedia.png
+share/icons/hicolor/48x48/apps/xfce-printer.png
+share/icons/hicolor/48x48/apps/xfce-schedule.png
+share/icons/hicolor/48x48/apps/xfce-sound.png
+share/icons/hicolor/48x48/apps/xfce-terminal.png
+share/icons/hicolor/48x48/apps/xfce-unknown.png
+share/icons/hicolor/48x48/apps/xfce-utils.png
+share/icons/hicolor/scalable/apps/xfce-filemanager.svg
+share/locale/ar/LC_MESSAGES/libxfcegui4.mo
share/locale/be/LC_MESSAGES/libxfcegui4.mo
share/locale/bn_IN/LC_MESSAGES/libxfcegui4.mo
share/locale/ca/LC_MESSAGES/libxfcegui4.mo
share/locale/cs/LC_MESSAGES/libxfcegui4.mo
-share/locale/da/LC_MESSAGES/libxfcegui4.mo
+share/locale/cy/LC_MESSAGES/libxfcegui4.mo
share/locale/de/LC_MESSAGES/libxfcegui4.mo
+share/locale/dz/LC_MESSAGES/libxfcegui4.mo
share/locale/el/LC_MESSAGES/libxfcegui4.mo
share/locale/en_GB/LC_MESSAGES/libxfcegui4.mo
share/locale/eo/LC_MESSAGES/libxfcegui4.mo
@@ -66,15 +104,17 @@ share/locale/eu/LC_MESSAGES/libxfcegui4.mo
share/locale/fa/LC_MESSAGES/libxfcegui4.mo
share/locale/fi/LC_MESSAGES/libxfcegui4.mo
share/locale/fr/LC_MESSAGES/libxfcegui4.mo
+share/locale/gl/LC_MESSAGES/libxfcegui4.mo
share/locale/gu/LC_MESSAGES/libxfcegui4.mo
share/locale/he/LC_MESSAGES/libxfcegui4.mo
share/locale/hu/LC_MESSAGES/libxfcegui4.mo
share/locale/hy/LC_MESSAGES/libxfcegui4.mo
share/locale/it/LC_MESSAGES/libxfcegui4.mo
share/locale/ja/LC_MESSAGES/libxfcegui4.mo
+share/locale/ka/LC_MESSAGES/libxfcegui4.mo
share/locale/ko/LC_MESSAGES/libxfcegui4.mo
-share/locale/ku/LC_MESSAGES/libxfcegui4.mo
share/locale/lt/LC_MESSAGES/libxfcegui4.mo
+share/locale/mk/LC_MESSAGES/libxfcegui4.mo
share/locale/mr/LC_MESSAGES/libxfcegui4.mo
share/locale/nl/LC_MESSAGES/libxfcegui4.mo
share/locale/pa/LC_MESSAGES/libxfcegui4.mo
@@ -83,23 +123,12 @@ share/locale/pt_BR/LC_MESSAGES/libxfcegui4.mo
share/locale/ro/LC_MESSAGES/libxfcegui4.mo
share/locale/ru/LC_MESSAGES/libxfcegui4.mo
share/locale/sk/LC_MESSAGES/libxfcegui4.mo
-share/locale/sl/LC_MESSAGES/libxfcegui4.mo
share/locale/sq/LC_MESSAGES/libxfcegui4.mo
share/locale/sv/LC_MESSAGES/libxfcegui4.mo
share/locale/ta/LC_MESSAGES/libxfcegui4.mo
+share/locale/tr/LC_MESSAGES/libxfcegui4.mo
share/locale/uk/LC_MESSAGES/libxfcegui4.mo
share/locale/zh_CN/LC_MESSAGES/libxfcegui4.mo
share/locale/zh_TW/LC_MESSAGES/libxfcegui4.mo
-share/xfce4/hicolor-index.theme
-share/xfce4/mime/applications.xml
-share/xfce4/mime/freedesktop.org.xml
-share/xfce4/mime/gnome.mime.xml
-share/xfce4/mime/hicolor.mime.xml
-share/xfce4/mime/types.xml
-share/xfce4/mime/xfce.org.xml
-share/xfce4/xfce-svg-test.svg
-@dirrm lib/xfce4/modules
-@dirrm lib/xfce4
-@dirrm include/xfce4/xfce4-modules
+@dirrm share/doc/libxfcegui4
@dirrm include/xfce4/libxfcegui4
-@unexec ${RMDIR} %D/share/xfce4/mime 2>/dev/null || ${TRUE}
diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk
index bdb00cac790..8e3a3a24093 100644
--- a/x11/libxfce4gui/buildlink3.mk
+++ b/x11/libxfce4gui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2007/04/12 09:55:20 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXFCE4GUI_BUILDLINK3_MK:= ${LIBXFCE4GUI_BUILDLINK3_MK}+
@@ -12,17 +12,15 @@ BUILDLINK_PACKAGES+= libxfce4gui
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4gui
.if ${LIBXFCE4GUI_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.2.4
+BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.4.1
BUILDLINK_PKGSRCDIR.libxfce4gui?= ../../x11/libxfce4gui
.endif # LIBXFCE4GUI_BUILDLINK3_MK
-.include "../../databases/dbh/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libxfce4util/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/libxfce4gui/distinfo b/x11/libxfce4gui/distinfo
index 8527db1b0d1..95a2ed1d984 100644
--- a/x11/libxfce4gui/distinfo
+++ b/x11/libxfce4gui/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2007/01/23 11:53:47 martti Exp $
+$NetBSD: distinfo,v 1.15 2007/04/12 09:55:20 martti Exp $
-SHA1 (libxfcegui4-4.2.4.tar.gz) = fa92b33e756bee9f77ec4bf5b2a3fdfd1fbc349b
-RMD160 (libxfcegui4-4.2.4.tar.gz) = 381c661822836a4a7be1989f63cde56c0e1a6866
-Size (libxfcegui4-4.2.4.tar.gz) = 839024 bytes
+SHA1 (libxfcegui4-4.4.1.tar.bz2) = d0a5d59e36fb29756fb3e9a1e1f646a0980104a2
+RMD160 (libxfcegui4-4.4.1.tar.bz2) = d92a8340e006d55f910f68613d0ed6f2787952b2
+Size (libxfcegui4-4.4.1.tar.bz2) = 606608 bytes
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index 1d9a734eddd..3ebf6d666ed 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -1,19 +1,16 @@
-# $NetBSD: Makefile,v 1.13 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: Makefile,v 1.14 2007/04/12 09:55:21 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= libxfce4mcs-${XFCE4_VERSION}
-#PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce settings management library
+CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc
+
PKGCONFIG_OVERRIDE= libxfce4mcs/libxfce4mcs-client-1.0.pc.in
PKGCONFIG_OVERRIDE+= libxfce4mcs/libxfce4mcs-manager-1.0.pc.in
-BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libxfce4util/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/libxfce4mcs/PLIST b/x11/libxfce4mcs/PLIST
index a18c70453b5..1658376798a 100644
--- a/x11/libxfce4mcs/PLIST
+++ b/x11/libxfce4mcs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2007/01/23 11:53:47 martti Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/04/12 09:55:21 martti Exp $
include/xfce4/libxfce4mcs/mcs-client-enum-types.h
include/xfce4/libxfce4mcs/mcs-client.h
include/xfce4/libxfce4mcs/mcs-common.h
@@ -7,4 +7,18 @@ lib/libxfce4mcs-client.la
lib/libxfce4mcs-manager.la
lib/pkgconfig/libxfce4mcs-client-1.0.pc
lib/pkgconfig/libxfce4mcs-manager-1.0.pc
+share/doc/libxfce4mcs/ch01.html
+share/doc/libxfce4mcs/home.png
+share/doc/libxfce4mcs/index.html
+share/doc/libxfce4mcs/index.sgml
+share/doc/libxfce4mcs/left.png
+share/doc/libxfce4mcs/libxfce4mcs-mcs-client.html
+share/doc/libxfce4mcs/libxfce4mcs-mcs-common.html
+share/doc/libxfce4mcs/libxfce4mcs-mcs-manager.html
+share/doc/libxfce4mcs/libxfce4mcs.devhelp
+share/doc/libxfce4mcs/libxfce4mcs.devhelp2
+share/doc/libxfce4mcs/right.png
+share/doc/libxfce4mcs/style.css
+share/doc/libxfce4mcs/up.png
+@dirrm share/doc/libxfce4mcs
@dirrm include/xfce4/libxfce4mcs
diff --git a/x11/libxfce4mcs/buildlink3.mk b/x11/libxfce4mcs/buildlink3.mk
index cd1d33f8f10..cdf6ac78553 100644
--- a/x11/libxfce4mcs/buildlink3.mk
+++ b/x11/libxfce4mcs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2007/04/12 09:55:21 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXFCE4MCS_BUILDLINK3_MK:= ${LIBXFCE4MCS_BUILDLINK3_MK}+
@@ -12,13 +12,13 @@ BUILDLINK_PACKAGES+= libxfce4mcs
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4mcs
.if ${LIBXFCE4MCS_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libxfce4mcs+= libxfce4mcs>=4.2.4
+BUILDLINK_API_DEPENDS.libxfce4mcs+= libxfce4mcs>=4.4.1
BUILDLINK_PKGSRCDIR.libxfce4mcs?= ../../x11/libxfce4mcs
.endif # LIBXFCE4MCS_BUILDLINK3_MK
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
.include "../../x11/libxfce4util/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/libxfce4mcs/distinfo b/x11/libxfce4mcs/distinfo
index 16d947f2cb5..05441fcfcab 100644
--- a/x11/libxfce4mcs/distinfo
+++ b/x11/libxfce4mcs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2007/01/23 11:53:47 martti Exp $
+$NetBSD: distinfo,v 1.14 2007/04/12 09:55:21 martti Exp $
-SHA1 (libxfce4mcs-4.2.4.tar.gz) = 98ff8095f097654808643d57d323f13be9a3019f
-RMD160 (libxfce4mcs-4.2.4.tar.gz) = ab6b1a18440fd46b23b24b637084246335f4e020
-Size (libxfce4mcs-4.2.4.tar.gz) = 373754 bytes
+SHA1 (libxfce4mcs-4.4.1.tar.bz2) = 9a39e5227f6f574635bd5a06f023cadd4256e57c
+RMD160 (libxfce4mcs-4.4.1.tar.bz2) = c834ffb4b7ea7dc90faa3565b804c8146b2789a9
+Size (libxfce4mcs-4.4.1.tar.bz2) = 265299 bytes
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index c33a2212007..2aa576bcb19 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: Makefile,v 1.13 2007/04/12 09:55:21 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 4.2.4
-
DISTNAME= libxfce4util-${XFCE4_VERSION}
-#PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce basic library
+CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc
+
PKGCONFIG_OVERRIDE= libxfce4util/libxfce4util-1.0.pc.in
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/libxfce4util/PLIST b/x11/libxfce4util/PLIST
index becd89f163a..5885fec78a2 100644
--- a/x11/libxfce4util/PLIST
+++ b/x11/libxfce4util/PLIST
@@ -1,26 +1,73 @@
-@comment $NetBSD: PLIST,v 1.9 2007/01/23 11:53:47 martti Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/04/12 09:55:21 martti Exp $
include/xfce4/libxfce4util/debug.h
include/xfce4/libxfce4util/i18n.h
include/xfce4/libxfce4util/libxfce4util-config.h
+include/xfce4/libxfce4util/libxfce4util-enum-types.h
include/xfce4/libxfce4util/libxfce4util.h
include/xfce4/libxfce4util/utf8.h
-include/xfce4/libxfce4util/util-enum-types.h
include/xfce4/libxfce4util/util.h
include/xfce4/libxfce4util/xfce-desktopentry.h
include/xfce4/libxfce4util/xfce-fileutils.h
include/xfce4/libxfce4util/xfce-generics.h
+include/xfce4/libxfce4util/xfce-i18n.h
include/xfce4/libxfce4util/xfce-kiosk.h
+include/xfce4/libxfce4util/xfce-license.h
include/xfce4/libxfce4util/xfce-miscutils.h
include/xfce4/libxfce4util/xfce-rc.h
include/xfce4/libxfce4util/xfce-resource.h
+include/xfce4/libxfce4util/xfce-utf8.h
lib/libxfce4util.la
lib/pkgconfig/libxfce4util-1.0.pc
sbin/xfce4-kiosk-query
-share/xfce4/m4/X11.m4
-share/xfce4/m4/debug.m4
-share/xfce4/m4/depends.m4
-share/xfce4/m4/i18n.m4
-@dirrm share/xfce4/m4
+share/doc/libxfce4util/home.png
+share/doc/libxfce4util/index.html
+share/doc/libxfce4util/index.sgml
+share/doc/libxfce4util/left.png
+share/doc/libxfce4util/libxfce4util-Desktop-entries.html
+share/doc/libxfce4util/libxfce4util-File-Utilities.html
+share/doc/libxfce4util/libxfce4util-Internationalisation.html
+share/doc/libxfce4util/libxfce4util-Miscellaneous-Utilities.html
+share/doc/libxfce4util/libxfce4util-Resource-Config-File-Support.html
+share/doc/libxfce4util/libxfce4util-Resource-lookup-functions.html
+share/doc/libxfce4util/libxfce4util-Software-Licenses.html
+share/doc/libxfce4util/libxfce4util-Unicode-Support-Functions.html
+share/doc/libxfce4util/libxfce4util-Version-Information.html
+share/doc/libxfce4util/libxfce4util-Xfce-Generics.html
+share/doc/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html
+share/doc/libxfce4util/libxfce4util-core.html
+share/doc/libxfce4util/libxfce4util-datatypes.html
+share/doc/libxfce4util/libxfce4util-fundamentals.html
+share/doc/libxfce4util/libxfce4util-utilities.html
+share/doc/libxfce4util/libxfce4util.devhelp
+share/doc/libxfce4util/libxfce4util.devhelp2
+share/doc/libxfce4util/reference.html
+share/doc/libxfce4util/right.png
+share/doc/libxfce4util/style.css
+share/doc/libxfce4util/up.png
+share/locale/ar/LC_MESSAGES/libxfce4util.mo
+share/locale/ca/LC_MESSAGES/libxfce4util.mo
+share/locale/cs/LC_MESSAGES/libxfce4util.mo
+share/locale/cy/LC_MESSAGES/libxfce4util.mo
+share/locale/de/LC_MESSAGES/libxfce4util.mo
+share/locale/dz/LC_MESSAGES/libxfce4util.mo
+share/locale/en_GB/LC_MESSAGES/libxfce4util.mo
+share/locale/eu/LC_MESSAGES/libxfce4util.mo
+share/locale/fi/LC_MESSAGES/libxfce4util.mo
+share/locale/fr/LC_MESSAGES/libxfce4util.mo
+share/locale/gl/LC_MESSAGES/libxfce4util.mo
+share/locale/he/LC_MESSAGES/libxfce4util.mo
+share/locale/it/LC_MESSAGES/libxfce4util.mo
+share/locale/ja/LC_MESSAGES/libxfce4util.mo
+share/locale/ka/LC_MESSAGES/libxfce4util.mo
+share/locale/ko/LC_MESSAGES/libxfce4util.mo
+share/locale/lt/LC_MESSAGES/libxfce4util.mo
+share/locale/mk/LC_MESSAGES/libxfce4util.mo
+share/locale/nl/LC_MESSAGES/libxfce4util.mo
+share/locale/pl/LC_MESSAGES/libxfce4util.mo
+share/locale/pt_BR/LC_MESSAGES/libxfce4util.mo
+share/locale/sq/LC_MESSAGES/libxfce4util.mo
+share/locale/tr/LC_MESSAGES/libxfce4util.mo
+share/locale/uk/LC_MESSAGES/libxfce4util.mo
+@dirrm share/doc/libxfce4util
@dirrm include/xfce4/libxfce4util
@dirrm include/xfce4
-@unexec ${RMDIR} %D/share/xfce4 2>/dev/null || ${TRUE}
diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk
index 95d8d066ba6..5805bf7c982 100644
--- a/x11/libxfce4util/buildlink3.mk
+++ b/x11/libxfce4util/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2007/04/12 09:55:21 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXFCE4UTIL_BUILDLINK3_MK:= ${LIBXFCE4UTIL_BUILDLINK3_MK}+
@@ -12,10 +12,13 @@ BUILDLINK_PACKAGES+= libxfce4util
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4util
.if ${LIBXFCE4UTIL_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libxfce4util+= libxfce4util>=4.2.4
+BUILDLINK_API_DEPENDS.libxfce4util+= libxfce4util>=4.4.1
BUILDLINK_PKGSRCDIR.libxfce4util?= ../../x11/libxfce4util
.endif # LIBXFCE4UTIL_BUILDLINK3_MK
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index 41763dc0d0b..38475774c0e 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.16 2007/01/23 11:53:47 martti Exp $
+$NetBSD: distinfo,v 1.17 2007/04/12 09:55:21 martti Exp $
-SHA1 (libxfce4util-4.2.4.tar.gz) = 89cd2c9570e1f068a1a1d3ddf5e5887576d6812c
-RMD160 (libxfce4util-4.2.4.tar.gz) = 88c70b3e3cc6dd5f0a1519dc12b8e4092943e899
-Size (libxfce4util-4.2.4.tar.gz) = 428865 bytes
-SHA1 (patch-aa) = 448e78adfaa2dc0407419060dbb4d57fad8e8bf7
+SHA1 (libxfce4util-4.4.1.tar.bz2) = 20b0d8b952e780569b0d32bcf26f377867c659c8
+RMD160 (libxfce4util-4.4.1.tar.bz2) = fa05dcf9e48d96dcae8ea1368647064e10a41a87
+Size (libxfce4util-4.4.1.tar.bz2) = 372848 bytes
diff --git a/x11/libxfce4util/patches/patch-aa b/x11/libxfce4util/patches/patch-aa
deleted file mode 100644
index 750229168cc..00000000000
--- a/x11/libxfce4util/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2007/01/23 11:53:47 martti Exp $
-
-No, it's not ok. Except for GNU C.
-
---- libxfce4util/xfce-miscutils.h.orig 2007-01-13 21:41:32.000000000 +0000
-+++ libxfce4util/xfce-miscutils.h 2007-01-23 11:26:14.000000000 +0000
-@@ -32,12 +32,11 @@
-
- #include <libxfce4util/debug.h>
-
--/* This looks a bit "hacky", but its ok */
--#define _BUILTIN_LICENSE_TEXT(name) \
--({ \
-- extern const char xfce_builtin_license_##name[]; \
-- xfce_builtin_license_##name; \
--})
-+extern const char xfce_builtin_license_BSD[];
-+extern const char xfce_builtin_license_GPL[];
-+extern const char xfce_builtin_license_LGPL[];
-+
-+#define _BUILTIN_LICENSE_TEXT(name) xfce_builtin_license_##name
-
- #if defined (__sun)
- extern const char xfce_builtin_license_BSD[];
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index d86cd800b3f..dea340c96b7 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:14 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/04/12 09:55:21 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 0.4.1
+XFCE4_VERSION= 0.8.0
DISTNAME= xfce4-clipman-plugin-${XFCE4_VERSION}
-PKGREVISION= 3
+#PKGREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/xfce4-clipman-plugin/
COMMENT= Xfce clipboard plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/x11/xfce4-clipman-plugin/PLIST b/x11/xfce4-clipman-plugin/PLIST
index 360795380a6..bc45d59ebc9 100644
--- a/x11/xfce4-clipman-plugin/PLIST
+++ b/x11/xfce4-clipman-plugin/PLIST
@@ -1,2 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:10:07 jlam Exp $
-lib/xfce4/panel-plugins/libclipman.la
+@comment $NetBSD: PLIST,v 1.3 2007/04/12 09:55:21 martti Exp $
+libexec/xfce4/panel-plugins/xfce4-clipman-plugin
+share/locale/ca/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/ja/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/xfce4/panel-plugins/clipman.desktop
diff --git a/x11/xfce4-clipman-plugin/buildlink3.mk b/x11/xfce4-clipman-plugin/buildlink3.mk
index b15ac5f1174..5a57784c3ed 100644
--- a/x11/xfce4-clipman-plugin/buildlink3.mk
+++ b/x11/xfce4-clipman-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/10/12 09:24:21 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2007/04/12 09:55:21 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:= ${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK}+
@@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+= xfce4-clipman-plugin
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-clipman-plugin
.if ${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-clipman-plugin+= xfce4-clipman-plugin>=0.4.1nb3
+BUILDLINK_API_DEPENDS.xfce4-clipman-plugin+= xfce4-clipman-plugin>=0.8.0
BUILDLINK_PKGSRCDIR.xfce4-clipman-plugin?= ../../x11/xfce4-clipman-plugin
.endif # XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK
.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-clipman-plugin/distinfo b/x11/xfce4-clipman-plugin/distinfo
index cfc0173daf7..8966ed32dce 100644
--- a/x11/xfce4-clipman-plugin/distinfo
+++ b/x11/xfce4-clipman-plugin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 17:36:22 wiz Exp $
+$NetBSD: distinfo,v 1.5 2007/04/12 09:55:21 martti Exp $
-SHA1 (xfce4-clipman-plugin-0.4.1.tar.gz) = 3de3a457286471d3d873bed77bf5c8a0f125b409
-RMD160 (xfce4-clipman-plugin-0.4.1.tar.gz) = 2a474443d757b80606d5d57d1b548e02122b47f0
-Size (xfce4-clipman-plugin-0.4.1.tar.gz) = 305762 bytes
+SHA1 (xfce4-clipman-plugin-0.8.0.tar.bz2) = 575bcda816646c5fa18b1a452a7696f70842841b
+RMD160 (xfce4-clipman-plugin-0.8.0.tar.bz2) = f5b4f14b2317bcd00ba82e7be7060373b94cf3d7
+Size (xfce4-clipman-plugin-0.8.0.tar.bz2) = 193458 bytes
diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile
index a0b04587938..f54bfb3a324 100644
--- a/x11/xfce4-desktop/Makefile
+++ b/x11/xfce4-desktop/Makefile
@@ -1,25 +1,23 @@
-# $NetBSD: Makefile,v 1.25 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: Makefile,v 1.26 2007/04/12 09:55:21 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfdesktop-${XFCE4_VERSION}
PKGNAME= xfce4-desktop-${XFCE4_VERSION}
-#PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce desktop background manager
-
PKG_SYSCONFSUBDIR= xdg/xfce4/desktop
EGDIR= ${XFCE4_EGBASE}/desktop
CONF_FILES= ${EGDIR:Q}/menu.xml ${PKG_SYSCONFDIR:Q}/menu.xml
-.for l in ca cs da de el es et fi fr he hu ja ko nl pl pt_BR ro ru sk sv \
+.for l in ca cs da de el es et eu fi fr he hu ja ko nl pl pt_BR ro ru sk sv \
uk vi zh_TW
CONF_FILES+= ${EGDIR:Q}/menu.xml.${l:Q} \
${PKG_SYSCONFDIR:Q}/menu.xml.${l:Q}
.endfor
CONF_FILES+= ${EGDIR:Q}/xfce-registered-categories.xml \
${PKG_SYSCONFDIR:Q}/xfce-registered-categories.xml
-.for l in cs eu fi he hu ja nl pl pt_BR ro ru sk sv zh_CN zh_TW
+.for l in ca cs de el es eu fi he hu ja nl pl pt_BR ro ru sk sv zh_CN zh_TW
CONF_FILES+= ${EGDIR:Q}/xfce-registered-categories.xml.${l:Q} \
${PKG_SYSCONFDIR:Q}/xfce-registered-categories.xml.${l:Q}
.endfor
@@ -27,13 +25,11 @@ CONF_FILES+= ${EGDIR:Q}/xfce-registered-categories.xml.${l:Q} \
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q}
REQD_DIRS+= ${XFCE4_EGBASE:Q} ${EGDIR:Q}
-
-BUILDLINK_DEPMETHOD.libXt?= build
+BUILD_DEFS+= PKG_SYSCONFBASE
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../sysutils/xfce4-thunar/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/xfce4-panel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-desktop/PLIST b/x11/xfce4-desktop/PLIST
index 4bf5d4a99cc..99e3a83fa96 100644
--- a/x11/xfce4-desktop/PLIST
+++ b/x11/xfce4-desktop/PLIST
@@ -1,13 +1,15 @@
-@comment $NetBSD: PLIST,v 1.15 2007/01/23 11:53:47 martti Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/04/12 09:55:22 martti Exp $
bin/xfce4-menueditor
+bin/xfce4-popup-menu
bin/xfdesktop
lib/xfce4/mcs-plugins/backdrop_settings.la
lib/xfce4/modules/xfce4_desktop_menu.la
-lib/xfce4/panel-plugins/libdesktopmenu.la
+libexec/xfce4/panel-plugins/xfce4-menu-plugin
man/man1/xfdesktop.1
share/applications/xfce-backdrop-settings.desktop
share/applications/xfce-menueditor.desktop
share/examples/xfce4/desktop/menu.xml
+share/examples/xfce4/desktop/menu.xml.be
share/examples/xfce4/desktop/menu.xml.ca
share/examples/xfce4/desktop/menu.xml.cs
share/examples/xfce4/desktop/menu.xml.da
@@ -20,26 +22,33 @@ share/examples/xfce4/desktop/menu.xml.fi
share/examples/xfce4/desktop/menu.xml.fr
share/examples/xfce4/desktop/menu.xml.he
share/examples/xfce4/desktop/menu.xml.hu
+share/examples/xfce4/desktop/menu.xml.it
share/examples/xfce4/desktop/menu.xml.ja
share/examples/xfce4/desktop/menu.xml.ko
share/examples/xfce4/desktop/menu.xml.nl
+share/examples/xfce4/desktop/menu.xml.pa
share/examples/xfce4/desktop/menu.xml.pl
share/examples/xfce4/desktop/menu.xml.pt_BR
share/examples/xfce4/desktop/menu.xml.ro
share/examples/xfce4/desktop/menu.xml.ru
share/examples/xfce4/desktop/menu.xml.sk
share/examples/xfce4/desktop/menu.xml.sv
+share/examples/xfce4/desktop/menu.xml.tr
share/examples/xfce4/desktop/menu.xml.uk
share/examples/xfce4/desktop/menu.xml.vi
share/examples/xfce4/desktop/menu.xml.zh_TW
share/examples/xfce4/desktop/xfce-registered-categories.xml
+share/examples/xfce4/desktop/xfce-registered-categories.xml.ca
share/examples/xfce4/desktop/xfce-registered-categories.xml.cs
+share/examples/xfce4/desktop/xfce-registered-categories.xml.de
share/examples/xfce4/desktop/xfce-registered-categories.xml.el
share/examples/xfce4/desktop/xfce-registered-categories.xml.es
share/examples/xfce4/desktop/xfce-registered-categories.xml.eu
share/examples/xfce4/desktop/xfce-registered-categories.xml.fi
+share/examples/xfce4/desktop/xfce-registered-categories.xml.fr
share/examples/xfce4/desktop/xfce-registered-categories.xml.he
share/examples/xfce4/desktop/xfce-registered-categories.xml.hu
+share/examples/xfce4/desktop/xfce-registered-categories.xml.it
share/examples/xfce4/desktop/xfce-registered-categories.xml.ja
share/examples/xfce4/desktop/xfce-registered-categories.xml.nl
share/examples/xfce4/desktop/xfce-registered-categories.xml.pl
@@ -48,6 +57,7 @@ share/examples/xfce4/desktop/xfce-registered-categories.xml.ro
share/examples/xfce4/desktop/xfce-registered-categories.xml.ru
share/examples/xfce4/desktop/xfce-registered-categories.xml.sk
share/examples/xfce4/desktop/xfce-registered-categories.xml.sv
+share/examples/xfce4/desktop/xfce-registered-categories.xml.tr
share/examples/xfce4/desktop/xfce-registered-categories.xml.zh_CN
share/examples/xfce4/desktop/xfce-registered-categories.xml.zh_TW
share/icons/hicolor/32x32/apps/xfce4-backdrop.png
@@ -56,7 +66,6 @@ share/icons/hicolor/48x48/apps/xfce4-backdrop.png
share/icons/hicolor/48x48/apps/xfce4-menueditor.png
share/icons/hicolor/scalable/apps/xfce4-backdrop.svg
share/icons/hicolor/scalable/apps/xfce4-menueditor.svg
-share/locale/af/LC_MESSAGES/xfdesktop.mo
share/locale/ar/LC_MESSAGES/xfdesktop.mo
share/locale/az/LC_MESSAGES/xfdesktop.mo
share/locale/be/LC_MESSAGES/xfdesktop.mo
@@ -64,8 +73,8 @@ share/locale/bg/LC_MESSAGES/xfdesktop.mo
share/locale/bn_IN/LC_MESSAGES/xfdesktop.mo
share/locale/ca/LC_MESSAGES/xfdesktop.mo
share/locale/cs/LC_MESSAGES/xfdesktop.mo
-share/locale/da/LC_MESSAGES/xfdesktop.mo
share/locale/de/LC_MESSAGES/xfdesktop.mo
+share/locale/dz/LC_MESSAGES/xfdesktop.mo
share/locale/el/LC_MESSAGES/xfdesktop.mo
share/locale/en_GB/LC_MESSAGES/xfdesktop.mo
share/locale/eo/LC_MESSAGES/xfdesktop.mo
@@ -76,6 +85,7 @@ share/locale/eu/LC_MESSAGES/xfdesktop.mo
share/locale/fa/LC_MESSAGES/xfdesktop.mo
share/locale/fi/LC_MESSAGES/xfdesktop.mo
share/locale/fr/LC_MESSAGES/xfdesktop.mo
+share/locale/gl/LC_MESSAGES/xfdesktop.mo
share/locale/gu/LC_MESSAGES/xfdesktop.mo
share/locale/he/LC_MESSAGES/xfdesktop.mo
share/locale/hi/LC_MESSAGES/xfdesktop.mo
@@ -83,9 +93,10 @@ share/locale/hu/LC_MESSAGES/xfdesktop.mo
share/locale/hy/LC_MESSAGES/xfdesktop.mo
share/locale/it/LC_MESSAGES/xfdesktop.mo
share/locale/ja/LC_MESSAGES/xfdesktop.mo
+share/locale/ka/LC_MESSAGES/xfdesktop.mo
share/locale/ko/LC_MESSAGES/xfdesktop.mo
-share/locale/ku/LC_MESSAGES/xfdesktop.mo
share/locale/lt/LC_MESSAGES/xfdesktop.mo
+share/locale/mk/LC_MESSAGES/xfdesktop.mo
share/locale/mr/LC_MESSAGES/xfdesktop.mo
share/locale/ms/LC_MESSAGES/xfdesktop.mo
share/locale/nb_NO/LC_MESSAGES/xfdesktop.mo
@@ -97,8 +108,6 @@ share/locale/pt_PT/LC_MESSAGES/xfdesktop.mo
share/locale/ro/LC_MESSAGES/xfdesktop.mo
share/locale/ru/LC_MESSAGES/xfdesktop.mo
share/locale/sk/LC_MESSAGES/xfdesktop.mo
-share/locale/sl/LC_MESSAGES/xfdesktop.mo
-share/locale/sq/LC_MESSAGES/xfdesktop.mo
share/locale/sv/LC_MESSAGES/xfdesktop.mo
share/locale/ta/LC_MESSAGES/xfdesktop.mo
share/locale/tr/LC_MESSAGES/xfdesktop.mo
@@ -106,11 +115,14 @@ share/locale/uk/LC_MESSAGES/xfdesktop.mo
share/locale/vi/LC_MESSAGES/xfdesktop.mo
share/locale/zh_CN/LC_MESSAGES/xfdesktop.mo
share/locale/zh_TW/LC_MESSAGES/xfdesktop.mo
+share/pixmaps/xfce4/xfdesktop/text-selection-frame.png
share/pixmaps/xfce4_xicon.png
share/pixmaps/xfce4_xicon1.png
share/pixmaps/xfce4_xicon2.png
share/pixmaps/xfce4_xicon3.png
share/pixmaps/xfce4_xicon4.png
+share/pixmaps/xfdesktop/xfdesktop-fallback-icon.png
+share/xfce4-menueditor/xfce4-menueditor.ui
share/xfce4/backdrops/flower.png
share/xfce4/backdrops/xfce-in-a-grid.png
share/xfce4/backdrops/xfce-in-the-moon.png
@@ -123,26 +135,25 @@ share/xfce4/backdrops/xfce4logo.png
share/xfce4/doc/C/images/root_menu.png
share/xfce4/doc/C/images/root_menu2.png
share/xfce4/doc/C/images/select_bg_color.png
-share/xfce4/doc/C/images/xfdesktop-background.png
+share/xfce4/doc/C/images/xfdesktop-appearance-tab.png
+share/xfce4/doc/C/images/xfdesktop-behavior-tab.png
share/xfce4/doc/C/images/xfdesktop-editor.png
share/xfce4/doc/C/images/xfdesktop-list.png
-share/xfce4/doc/C/images/xfdesktop-menu-tab.png
share/xfce4/doc/C/xfdesktop.html
share/xfce4/doc/fr/images/root_menu.png
share/xfce4/doc/fr/images/root_menu2.png
share/xfce4/doc/fr/images/select_bg_color.png
-share/xfce4/doc/fr/images/xfdesktop-background.png
+share/xfce4/doc/fr/images/xfdesktop-appearance-tab.png
+share/xfce4/doc/fr/images/xfdesktop-behavior-tab.png
share/xfce4/doc/fr/images/xfdesktop-editor.png
share/xfce4/doc/fr/images/xfdesktop-list.png
-share/xfce4/doc/fr/images/xfdesktop-menu-tab.png
share/xfce4/doc/fr/xfdesktop.html
-share/xfce4/doc/he/images/root_menu.png
-share/xfce4/doc/he/images/root_menu2.png
-share/xfce4/doc/he/images/select_bg_color.png
-share/xfce4/doc/he/images/xfdesktop-background.png
-share/xfce4/doc/he/images/xfdesktop-editor.png
-share/xfce4/doc/he/images/xfdesktop-list.png
-share/xfce4/doc/he/images/xfdesktop-menu-tab.png
-share/xfce4/doc/he/xfdesktop.html
+share/xfce4/panel-plugins/xfce4-menu.desktop
+@dirrm share/xfce4-menueditor
+@dirrm share/pixmaps/xfdesktop
+@dirrm share/pixmaps/xfce4/xfdesktop
@dirrm share/examples/xfce4/desktop
@unexec ${RMDIR} %D/share/xfce4/backdrops 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/pixmaps/xfce4 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/libexec/xfce4/panel-plugins 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/lib/xfce4/modules 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk
index 52299f31700..c8cbabd9d48 100644
--- a/x11/xfce4-desktop/buildlink3.mk
+++ b/x11/xfce4-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2007/04/12 09:55:22 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_DESKTOP_BUILDLINK3_MK:= ${XFCE4_DESKTOP_BUILDLINK3_MK}+
@@ -12,13 +12,16 @@ BUILDLINK_PACKAGES+= xfce4-desktop
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-desktop
.if ${XFCE4_DESKTOP_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.2.4
+BUILDLINK_API_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.4.1
BUILDLINK_PKGSRCDIR.xfce4-desktop?= ../../x11/xfce4-desktop
.endif # XFCE4_DESKTOP_BUILDLINK3_MK
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../sysutils/xfce4-thunar/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-desktop/distinfo b/x11/xfce4-desktop/distinfo
index 27fa670cdcc..b9e7b462317 100644
--- a/x11/xfce4-desktop/distinfo
+++ b/x11/xfce4-desktop/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2007/01/23 11:53:47 martti Exp $
+$NetBSD: distinfo,v 1.15 2007/04/12 09:55:22 martti Exp $
-SHA1 (xfdesktop-4.2.4.tar.gz) = 9b19d900d325c5f2911de7e93f14b6be4ad07b59
-RMD160 (xfdesktop-4.2.4.tar.gz) = 99f98d9a5550ebee35bac5e3eb73d9817ae868d9
-Size (xfdesktop-4.2.4.tar.gz) = 3119654 bytes
-SHA1 (patch-aa) = 074834de74292b1542f57a3b0b94ed9ff88f8bf8
-SHA1 (patch-ab) = 133532279efddccb723e735ccc630903fbace107
+SHA1 (xfdesktop-4.4.1.tar.bz2) = 46324ad37bb782ec7a5da11c619d9e76a0f54133
+RMD160 (xfdesktop-4.4.1.tar.bz2) = 10e182f2cebd309ed7e2b18d00331861e21f4528
+Size (xfdesktop-4.4.1.tar.bz2) = 3067577 bytes
+SHA1 (patch-aa) = 22de9a53d0d87cfddecaf2374b0fce2beb50108c
+SHA1 (patch-ab) = bc96e67a327eb9e2a3dfde21ee59ac4895a67531
diff --git a/x11/xfce4-desktop/patches/patch-aa b/x11/xfce4-desktop/patches/patch-aa
index 1c06a4204df..22e1023ffe5 100644
--- a/x11/xfce4-desktop/patches/patch-aa
+++ b/x11/xfce4-desktop/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2007/01/23 11:53:47 martti Exp $
+$NetBSD: patch-aa,v 1.4 2007/04/12 09:55:22 martti Exp $
---- Makefile.in.orig 2007-01-14 21:07:41.000000000 +0000
-+++ Makefile.in 2007-01-23 12:59:39.000000000 +0000
-@@ -271,7 +271,7 @@
+--- Makefile.in.orig 2007-04-09 18:56:45.000000000 +0300
++++ Makefile.in 2007-04-11 16:04:43.000000000 +0300
+@@ -327,7 +327,7 @@
+ modules \
+ pixmaps
- SUBDIRS = backdrops common doc po settings src modules pixmaps \
- $(am__append_1) $(am__append_2)
-confdir = $(sysconfdir)/xdg/xfce4/desktop
+confdir = $(datadir)/examples/xfce4/desktop
conf_DATA = \
- menu.xml \
- menu.xml.ca \
+ menu.xml \
+ menu.xml.be \
diff --git a/x11/xfce4-desktop/patches/patch-ab b/x11/xfce4-desktop/patches/patch-ab
index e6ebefea58c..4947d60e128 100644
--- a/x11/xfce4-desktop/patches/patch-ab
+++ b/x11/xfce4-desktop/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2007/01/23 11:53:47 martti Exp $
+$NetBSD: patch-ab,v 1.4 2007/04/12 09:55:22 martti Exp $
---- modules/menu/Makefile.in.orig 2007-01-14 21:07:40.000000000 +0000
-+++ modules/menu/Makefile.in 2007-01-23 13:00:00.000000000 +0000
-@@ -288,7 +288,7 @@
- @GMODULE_LIBS@ \
- @LIBXFCEGUI4_LIBS@
+--- modules/menu/Makefile.in.orig 2007-04-09 18:56:43.000000000 +0300
++++ modules/menu/Makefile.in 2007-04-11 16:05:14.000000000 +0300
+@@ -348,7 +348,7 @@
+ $(LIBX11_LIBS) \
+ $(LIBXFCEGUI4_LIBS)
-xfceconfdir = $(sysconfdir)/xdg/xfce4/desktop
+xfceconfdir = $(datadir)/examples/xfce4/desktop
xfceconf_DATA = \
xfce-registered-categories.xml \
- xfce-registered-categories.xml.cs \
+ xfce-registered-categories.xml.ca \
diff --git a/x11/xfce4-gtk2-engine/Makefile b/x11/xfce4-gtk2-engine/Makefile
index 11bc166acbc..a5e21e2be05 100644
--- a/x11/xfce4-gtk2-engine/Makefile
+++ b/x11/xfce4-gtk2-engine/Makefile
@@ -1,19 +1,15 @@
-# $NetBSD: Makefile,v 1.6 2007/01/23 11:53:47 martti Exp $
-#
+# $NetBSD: Makefile,v 1.7 2007/04/12 09:55:22 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 2.2.9
+XFCE4_VERSION= 2.4.1
DISTNAME= gtk-xfce-engine-${XFCE4_VERSION}
PKGNAME= xfce4-gtk2-engine-${XFCE4_VERSION}
-#PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce GTK2 themes
USE_DIRS+= xdg-1.1
-BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0
-
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-gtk2-engine/PLIST b/x11/xfce4-gtk2-engine/PLIST
index 91961811e05..87cb1842463 100644
--- a/x11/xfce4-gtk2-engine/PLIST
+++ b/x11/xfce4-gtk2-engine/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2006/09/15 17:05:24 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/04/12 09:55:22 martti Exp $
lib/gtk-2.0/2.10.0/engines/libxfce.la
share/themes/Xfce-4.0/ICON.png
share/themes/Xfce-4.0/README.html
share/themes/Xfce-4.0/gtk-2.0/gtkrc
+share/themes/Xfce-4.2/ICON.png
+share/themes/Xfce-4.2/README.html
+share/themes/Xfce-4.2/gtk-2.0/gtkrc
share/themes/Xfce-b5/ICON.png
share/themes/Xfce-b5/README.html
share/themes/Xfce-b5/gtk-2.0/gtkrc
@@ -30,6 +33,9 @@ share/themes/Xfce-kolors/gtk-2.0/gtkrc
share/themes/Xfce-light/ICON.png
share/themes/Xfce-light/README.html
share/themes/Xfce-light/gtk-2.0/gtkrc
+share/themes/Xfce-orange/ICON.png
+share/themes/Xfce-orange/README.html
+share/themes/Xfce-orange/gtk-2.0/gtkrc
share/themes/Xfce-redmondxp/ICON.png
share/themes/Xfce-redmondxp/README.html
share/themes/Xfce-redmondxp/gtk-2.0/gtkrc
@@ -59,6 +65,8 @@ share/themes/Xfce/gtk-2.0/gtkrc
@dirrm share/themes/Xfce-saltlake
@dirrm share/themes/Xfce-redmondxp/gtk-2.0
@dirrm share/themes/Xfce-redmondxp
+@dirrm share/themes/Xfce-orange/gtk-2.0
+@dirrm share/themes/Xfce-orange
@dirrm share/themes/Xfce-light/gtk-2.0
@dirrm share/themes/Xfce-light
@dirrm share/themes/Xfce-kolors/gtk-2.0
@@ -77,6 +85,8 @@ share/themes/Xfce/gtk-2.0/gtkrc
@dirrm share/themes/Xfce-basic
@dirrm share/themes/Xfce-b5/gtk-2.0
@dirrm share/themes/Xfce-b5
+@dirrm share/themes/Xfce-4.2/gtk-2.0
+@dirrm share/themes/Xfce-4.2
@dirrm share/themes/Xfce-4.0/gtk-2.0
@dirrm share/themes/Xfce-4.0
@unexec ${RMDIR} %D/share/themes/Xfce 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-gtk2-engine/buildlink3.mk b/x11/xfce4-gtk2-engine/buildlink3.mk
index c319caca6e1..21d71960aa7 100644
--- a/x11/xfce4-gtk2-engine/buildlink3.mk
+++ b/x11/xfce4-gtk2-engine/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/04/12 09:55:22 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_GTK2_ENGINE_BUILDLINK3_MK:= ${XFCE4_GTK2_ENGINE_BUILDLINK3_MK}+
@@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+= xfce4-gtk2-engine
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-gtk2-engine
.if ${XFCE4_GTK2_ENGINE_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+= xfce4-gtk2-engine>=2.2.9
+BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+= xfce4-gtk2-engine>=2.4.1
BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?= ../../x11/xfce4-gtk2-engine
.endif # XFCE4_GTK2_ENGINE_BUILDLINK3_MK
.include "../../x11/gtk2/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-gtk2-engine/distinfo b/x11/xfce4-gtk2-engine/distinfo
index 2dffc8c507d..d629c1819a8 100644
--- a/x11/xfce4-gtk2-engine/distinfo
+++ b/x11/xfce4-gtk2-engine/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/01/23 11:53:47 martti Exp $
+$NetBSD: distinfo,v 1.3 2007/04/12 09:55:22 martti Exp $
-SHA1 (gtk-xfce-engine-2.2.9.tar.gz) = 91bd115ad8b269d1db50e911d96991b4391beea6
-RMD160 (gtk-xfce-engine-2.2.9.tar.gz) = 823477bdf3dee8b0cfbdc01f28ebf3314e099ff5
-Size (gtk-xfce-engine-2.2.9.tar.gz) = 397464 bytes
+SHA1 (gtk-xfce-engine-2.4.1.tar.bz2) = a28a59c704ba66aa30be2c8ed03ba1bf0eaf1ad9
+RMD160 (gtk-xfce-engine-2.4.1.tar.bz2) = 0ccb8e72ed372007fcf1f63bd3bcac0ee87d3d2b
+Size (gtk-xfce-engine-2.4.1.tar.bz2) = 271644 bytes
diff --git a/x11/xfce4-mcs-manager/Makefile b/x11/xfce4-mcs-manager/Makefile
index 3f70e6db854..99e05705ba6 100644
--- a/x11/xfce4-mcs-manager/Makefile
+++ b/x11/xfce4-mcs-manager/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: Makefile,v 1.18 2007/04/12 09:55:22 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce-mcs-manager-${XFCE4_VERSION}
PKGNAME= xfce4-mcs-manager-${XFCE4_VERSION}
-#PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce settings manager
diff --git a/x11/xfce4-mcs-manager/PLIST b/x11/xfce4-mcs-manager/PLIST
index 4fd5be218fd..1635f777393 100644
--- a/x11/xfce4-mcs-manager/PLIST
+++ b/x11/xfce4-mcs-manager/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.14 2007/01/23 11:53:47 martti Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/04/12 09:55:22 martti Exp $
bin/xfce-mcs-manager
bin/xfce-setting-show
include/xfce4/xfce-mcs-manager/manager-plugin.h
lib/pkgconfig/xfce-mcs-manager.pc
share/applications/xfce-settings-manager.desktop
share/icons/hicolor/48x48/apps/xfce4-settings.png
-share/locale/af/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ar/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/az/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/be/LC_MESSAGES/xfce-mcs-manager.mo
@@ -13,8 +12,8 @@ share/locale/bg/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/bn_IN/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ca/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/cs/LC_MESSAGES/xfce-mcs-manager.mo
-share/locale/da/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/de/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/dz/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/el/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/en_GB/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/eo/LC_MESSAGES/xfce-mcs-manager.mo
@@ -25,6 +24,7 @@ share/locale/eu/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/fa/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/fi/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/fr/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/gl/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/gu/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/he/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/hi/LC_MESSAGES/xfce-mcs-manager.mo
@@ -33,8 +33,8 @@ share/locale/it/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ja/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ka/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ko/LC_MESSAGES/xfce-mcs-manager.mo
-share/locale/ku/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/lt/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/mk/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/mr/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ms/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/nb_NO/LC_MESSAGES/xfce-mcs-manager.mo
@@ -46,8 +46,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ro/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ru/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/sk/LC_MESSAGES/xfce-mcs-manager.mo
-share/locale/sl/LC_MESSAGES/xfce-mcs-manager.mo
-share/locale/sq/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/sv/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ta/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/tr/LC_MESSAGES/xfce-mcs-manager.mo
@@ -64,13 +62,14 @@ share/xfce4/doc/fr/images/smgr_from_panel.png
share/xfce4/doc/fr/images/smgr_from_root_menu.png
share/xfce4/doc/fr/images/smgr_from_setup_button.png
share/xfce4/doc/fr/xfce-mcs-manager.html
-share/xfce4/doc/he/images/settings_manager.png
-share/xfce4/doc/he/images/smgr_from_root_menu.png
-share/xfce4/doc/he/images/smgr_from_setup_button.png
-share/xfce4/doc/he/xfce-mcs-manager.html
+share/xfce4/doc/it/images/settings_manager.png
+share/xfce4/doc/it/images/smgr_from_panel.png
+share/xfce4/doc/it/images/smgr_from_root_menu.png
+share/xfce4/doc/it/images/smgr_from_setup_button.png
+share/xfce4/doc/it/xfce-mcs-manager.html
@dirrm include/xfce4/xfce-mcs-manager
-@unexec ${RMDIR} %D/share/xfce4/doc/he/images 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/xfce4/doc/he 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/xfce4/doc/it/images 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/xfce4/doc/it 2>/dev/null || ${TRUE}
@unexec ${RMDIR} %D/share/xfce4/doc/fr/images 2>/dev/null || ${TRUE}
@unexec ${RMDIR} %D/share/xfce4/doc/fr 2>/dev/null || ${TRUE}
@unexec ${RMDIR} %D/share/xfce4/doc/C/images 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-mcs-manager/buildlink3.mk b/x11/xfce4-mcs-manager/buildlink3.mk
index b2889a34a99..2cb07b1def6 100644
--- a/x11/xfce4-mcs-manager/buildlink3.mk
+++ b/x11/xfce4-mcs-manager/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2007/04/12 09:55:22 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_MCS_MANAGER_BUILDLINK3_MK:= ${XFCE4_MCS_MANAGER_BUILDLINK3_MK}+
@@ -12,13 +12,14 @@ BUILDLINK_PACKAGES+= xfce4-mcs-manager
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mcs-manager
.if ${XFCE4_MCS_MANAGER_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-mcs-manager+= xfce4-mcs-manager>=4.2.4
+BUILDLINK_API_DEPENDS.xfce4-mcs-manager+= xfce4-mcs-manager>=4.4.1
BUILDLINK_PKGSRCDIR.xfce4-mcs-manager?= ../../x11/xfce4-mcs-manager
.endif # XFCE4_MCS_MANAGER_BUILDLINK3_MK
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../x11/libxfce4gui/buildlink3.mk"
.include "../../x11/libxfce4mcs/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-mcs-manager/distinfo b/x11/xfce4-mcs-manager/distinfo
index 7dff936686f..49db3e62437 100644
--- a/x11/xfce4-mcs-manager/distinfo
+++ b/x11/xfce4-mcs-manager/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2007/01/23 11:53:47 martti Exp $
+$NetBSD: distinfo,v 1.14 2007/04/12 09:55:22 martti Exp $
-SHA1 (xfce-mcs-manager-4.2.4.tar.gz) = 4a477d3f80d97f0980b4070ef8a1570b169d9855
-RMD160 (xfce-mcs-manager-4.2.4.tar.gz) = 6dfacde3cbfd4903e17b32a0cbc1399d713109a2
-Size (xfce-mcs-manager-4.2.4.tar.gz) = 766343 bytes
+SHA1 (xfce-mcs-manager-4.4.1.tar.bz2) = c03e83ebe5a315aa2a1333624cd2f04dafba6a15
+RMD160 (xfce-mcs-manager-4.4.1.tar.bz2) = 5c2c7259f10f51c4456e15677aef089394e61df6
+Size (xfce-mcs-manager-4.4.1.tar.bz2) = 653240 bytes
diff --git a/x11/xfce4-mcs-plugins/Makefile b/x11/xfce4-mcs-plugins/Makefile
index 2f5e1d7988b..8f8182b6b23 100644
--- a/x11/xfce4-mcs-plugins/Makefile
+++ b/x11/xfce4-mcs-plugins/Makefile
@@ -1,18 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: Makefile,v 1.16 2007/04/12 09:55:22 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce-mcs-plugins-${XFCE4_VERSION}
PKGNAME= xfce4-mcs-plugins-${XFCE4_VERSION}
-#PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce settings manager plugins
-BUILDLINK_DEPMETHOD.libXt?= build
-
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/xfce4-mcs-manager/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-mcs-plugins/PLIST b/x11/xfce4-mcs-plugins/PLIST
index e9abd89e3d4..347e8630ff1 100644
--- a/x11/xfce4-mcs-plugins/PLIST
+++ b/x11/xfce4-mcs-plugins/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.13 2007/01/23 11:53:47 martti Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/04/12 09:55:22 martti Exp $
lib/xfce4/mcs-plugins/display_plugin.la
+lib/xfce4/mcs-plugins/fm_plugin.la
lib/xfce4/mcs-plugins/keyboard_plugin.la
lib/xfce4/mcs-plugins/mouse_plugin.la
lib/xfce4/mcs-plugins/screensaver_plugin.la
@@ -16,7 +17,6 @@ share/icons/hicolor/scalable/apps/xfce4-display.svg
share/icons/hicolor/scalable/apps/xfce4-keyboard.svg
share/icons/hicolor/scalable/apps/xfce4-mouse.svg
share/icons/hicolor/scalable/apps/xfce4-ui.svg
-share/locale/af/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ar/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/az/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/be/LC_MESSAGES/xfce-mcs-plugins.mo
@@ -24,8 +24,8 @@ share/locale/bg/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/bn_IN/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ca/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/cs/LC_MESSAGES/xfce-mcs-plugins.mo
-share/locale/da/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/de/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/dz/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/el/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/en_GB/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/eo/LC_MESSAGES/xfce-mcs-plugins.mo
@@ -36,15 +36,17 @@ share/locale/eu/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/fa/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/fi/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/fr/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/gl/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/gu/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/he/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/hi/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/hu/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/it/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ja/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/ka/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ko/LC_MESSAGES/xfce-mcs-plugins.mo
-share/locale/ku/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/lt/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/mk/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/mr/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ms/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/nl/LC_MESSAGES/xfce-mcs-plugins.mo
@@ -55,8 +57,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ro/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ru/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/sk/LC_MESSAGES/xfce-mcs-plugins.mo
-share/locale/sl/LC_MESSAGES/xfce-mcs-plugins.mo
-share/locale/sq/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/sv/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ta/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/tr/LC_MESSAGES/xfce-mcs-plugins.mo
@@ -64,6 +64,7 @@ share/locale/uk/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/vi/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/zh_CN/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/zh_TW/LC_MESSAGES/xfce-mcs-plugins.mo
+share/xfce-mcs-plugins/shortcuts/default.xml
share/xfce4/doc/C/images/display_preferences.png
share/xfce4/doc/C/images/font_selection.png
share/xfce4/doc/C/images/keyboard_settings.png
@@ -77,10 +78,12 @@ share/xfce4/doc/fr/images/keyboard_settings.png
share/xfce4/doc/fr/images/mouse_settings.png
share/xfce4/doc/fr/images/user_interface_settings.png
share/xfce4/doc/fr/xfce-mcs-plugins.html
-share/xfce4/doc/he/images/display_preferences.png
-share/xfce4/doc/he/images/font_selection.png
-share/xfce4/doc/he/images/keyboard_settings.png
-share/xfce4/doc/he/images/mouse_settings.png
-share/xfce4/doc/he/images/user_interface_settings.png
-share/xfce4/doc/he/xfce-mcs-plugins.html
+share/xfce4/doc/it/images/font_selection.png
+share/xfce4/doc/it/images/keyboard_settings.png
+share/xfce4/doc/it/images/mouse_settings.png
+share/xfce4/doc/it/images/user_interface_settings.png
+share/xfce4/doc/it/xfce-mcs-plugins.html
+@dirrm share/xfce-mcs-plugins/shortcuts
+@dirrm share/xfce-mcs-plugins
@dirrm lib/xfce4/mcs-plugins
+@unexec ${RMDIR} %D/lib/xfce4 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-mcs-plugins/buildlink3.mk b/x11/xfce4-mcs-plugins/buildlink3.mk
index a5c79c25da4..d29134b9655 100644
--- a/x11/xfce4-mcs-plugins/buildlink3.mk
+++ b/x11/xfce4-mcs-plugins/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2007/04/12 09:55:22 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_MCS_PLUGINS_BUILDLINK3_MK:= ${XFCE4_MCS_PLUGINS_BUILDLINK3_MK}+
@@ -12,12 +12,13 @@ BUILDLINK_PACKAGES+= xfce4-mcs-plugins
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mcs-plugins
.if ${XFCE4_MCS_PLUGINS_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-mcs-plugins+= xfce4-mcs-plugins>=4.2.4
+BUILDLINK_API_DEPENDS.xfce4-mcs-plugins+= xfce4-mcs-plugins>=4.4.1
BUILDLINK_PKGSRCDIR.xfce4-mcs-plugins?= ../../x11/xfce4-mcs-plugins
.endif # XFCE4_MCS_PLUGINS_BUILDLINK3_MK
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../x11/xfce4-mcs-manager/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-mcs-plugins/distinfo b/x11/xfce4-mcs-plugins/distinfo
index 22a6c24ef37..1188697a339 100644
--- a/x11/xfce4-mcs-plugins/distinfo
+++ b/x11/xfce4-mcs-plugins/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2007/01/23 11:53:47 martti Exp $
+$NetBSD: distinfo,v 1.14 2007/04/12 09:55:23 martti Exp $
-SHA1 (xfce-mcs-plugins-4.2.4.tar.gz) = 98f2c28b213ecd17eff3caadf9ba091baa717321
-RMD160 (xfce-mcs-plugins-4.2.4.tar.gz) = b9f7e6e924d3d6d3bbcc1f81a48907332f9f3ba4
-Size (xfce-mcs-plugins-4.2.4.tar.gz) = 1010247 bytes
+SHA1 (xfce-mcs-plugins-4.4.1.tar.bz2) = 50b5e82e67ab76e24ed232e6302a1430a902cd08
+RMD160 (xfce-mcs-plugins-4.4.1.tar.bz2) = 45507d0a3d46a21804250e8373a77098d1e52c2b
+Size (xfce-mcs-plugins-4.4.1.tar.bz2) = 876128 bytes
diff --git a/x11/xfce4-notes-plugin/Makefile b/x11/xfce4-notes-plugin/Makefile
index f149c2c2f33..7a1f0881809 100644
--- a/x11/xfce4-notes-plugin/Makefile
+++ b/x11/xfce4-notes-plugin/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:14 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/04/12 09:55:23 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 0.11.1
+XFCE4_VERSION= 1.4.1
DISTNAME= xfce4-notes-plugin-${XFCE4_VERSION}
-PKGREVISION= 3
+#PKGREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/xfce4-notes-plugin/
COMMENT= Xfce notes plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/x11/xfce4-notes-plugin/PLIST b/x11/xfce4-notes-plugin/PLIST
index 3e23d366ec5..4eded5315aa 100644
--- a/x11/xfce4-notes-plugin/PLIST
+++ b/x11/xfce4-notes-plugin/PLIST
@@ -1,4 +1,18 @@
-@comment $NetBSD: PLIST,v 1.3 2005/10/28 07:03:31 martti Exp $
-lib/xfce4/panel-plugins/libnotes.la
-share/xfce4/notes/note_xfce.png
-@dirrm share/xfce4/notes
+@comment $NetBSD: PLIST,v 1.4 2007/04/12 09:55:23 martti Exp $
+bin/xfce4-popup-notes
+libexec/xfce4/panel-plugins/xfce4-notes-plugin
+share/icons/hicolor/16x16/apps/xfce4-notes-plugin.png
+share/icons/hicolor/22x22/apps/xfce4-notes-plugin.png
+share/icons/hicolor/24x24/apps/xfce4-notes-plugin.png
+share/icons/hicolor/32x32/apps/xfce4-notes-plugin.png
+share/icons/hicolor/scalable/apps/xfce4-notes-plugin.svg
+share/locale/ca/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/nl/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-notes-plugin.mo
+share/xfce4/panel-plugins/xfce4-notes-plugin.desktop
diff --git a/x11/xfce4-notes-plugin/buildlink3.mk b/x11/xfce4-notes-plugin/buildlink3.mk
index 6ed03fbdcec..d0d750b42bf 100644
--- a/x11/xfce4-notes-plugin/buildlink3.mk
+++ b/x11/xfce4-notes-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/10/12 09:24:21 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2007/04/12 09:55:23 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:= ${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK}+
@@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+= xfce4-notes-plugin
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-notes-plugin
.if ${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-notes-plugin+= xfce4-notes-plugin>=0.11.1nb3
+BUILDLINK_API_DEPENDS.xfce4-notes-plugin+= xfce4-notes-plugin>=1.4
BUILDLINK_PKGSRCDIR.xfce4-notes-plugin?= ../../x11/xfce4-notes-plugin
.endif # XFCE4_NOTES_PLUGIN_BUILDLINK3_MK
.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-notes-plugin/distinfo b/x11/xfce4-notes-plugin/distinfo
index 8f38382882b..8d50eda69d9 100644
--- a/x11/xfce4-notes-plugin/distinfo
+++ b/x11/xfce4-notes-plugin/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/12/18 22:56:15 rillig Exp $
+$NetBSD: distinfo,v 1.6 2007/04/12 09:55:23 martti Exp $
-SHA1 (xfce4-notes-plugin-0.11.1.tar.gz) = f0955bb680b9c7f98e86cb743d695bc5b0edd2d1
-RMD160 (xfce4-notes-plugin-0.11.1.tar.gz) = 67df2aad40cbfa7f7a544ab1a050a1b974885eed
-Size (xfce4-notes-plugin-0.11.1.tar.gz) = 339966 bytes
-SHA1 (patch-aa) = 1a1ba3c7f9f97f34046cf5fd37260d32a767899f
+SHA1 (xfce4-notes-plugin-1.4.1.tar.bz2) = 6cc99392e44e94a81731dbd585a075c195f2a9d8
+RMD160 (xfce4-notes-plugin-1.4.1.tar.bz2) = abd47c86f7235406e84c5871603afdc80f7e04c9
+Size (xfce4-notes-plugin-1.4.1.tar.bz2) = 157811 bytes
diff --git a/x11/xfce4-notes-plugin/patches/patch-aa b/x11/xfce4-notes-plugin/patches/patch-aa
deleted file mode 100644
index 94dc09abdf9..00000000000
--- a/x11/xfce4-notes-plugin/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/12/18 22:56:15 rillig Exp $
-
-Keywords: c90
-
---- panel-plugin/notes.c.orig Sat Oct 1 18:30:35 2005
-+++ panel-plugin/notes.c Sun Dec 18 23:52:08 2005
-@@ -148,9 +148,6 @@ notes_create_note (void)
-
- _note *note;
-
-- /* create or note structure */
-- note = g_new(_note, 1);
--
- GtkWidget *main_w;
- GtkWidget *table;
- GtkWidget *text_view;
-@@ -169,6 +166,9 @@ notes_create_note (void)
- GtkWidget *hbox;
-
- GtkWidget *button_close_image;
-+
-+ /* create or note structure */
-+ note = g_new(_note, 1);
-
- main_w = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title (GTK_WINDOW (main_w), _("main_w"));
diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index 52121425252..c609598f6bf 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,36 +1,31 @@
-# $NetBSD: Makefile,v 1.29 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: Makefile,v 1.30 2007/04/12 09:55:23 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
+.include "../../mk/compiler.mk"
-DISTNAME= xfce4-panel-${XFCE4_VERSION}
-#PKGREVISION= 1
-CATEGORIES= x11
-COMMENT= Xfce panel
+DISTNAME= xfce4-panel-${XFCE4_VERSION}
+#PKGREVISION= 1
+CATEGORIES= x11
+COMMENT= Xfce panel
+
+CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc
PKGCONFIG_OVERRIDE= panel/xfce4-panel-1.0.pc.in
PTHREAD_AUTO_VARS= yes
+# If using gcc-4, compile the panel launcher without GCC optimization. See
+# http://bugzilla.xfce.org/show_bug.cgi?id=2262
-PKG_SYSCONFSUBDIR= xdg/xfce4/panel
-EGDIR= ${XFCE4_EGBASE}/panel
-CONF_FILES= ${EGDIR:Q}/contents.xml ${PKG_SYSCONFDIR:Q}/contents.xml
-.for l in ar az ca da el eu fi fr he hu it ja ko lt ms nl pl ro ru sk sv \
- tr vi zh_CN zh_TW
-CONF_FILES+= ${EGDIR:Q}/contents.xml.${l} \
- ${PKG_SYSCONFDIR:Q}/contents.xml.${l}
-.endfor
-
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q}
-
-REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR}
-
-BUILDLINK_DEPMETHOD.libXt?= build
+.if (!empty(CC_VERSION:Mgcc-4.*))
+SUBST_CLASSES+= launcher
+SUBST_STAGE.launcher= post-configure
+SUBST_FILES.launcher= plugins/launcher/Makefile
+SUBST_SED.launcher= -e 's|-O |-O0 |g'
+SUBST_SED.launcher+= -e 's|-O[123s] |-O0 |g'
+.endif
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/x11/xfce4-panel/PLIST b/x11/xfce4-panel/PLIST
index 5895446b453..acdabcec2c9 100644
--- a/x11/xfce4-panel/PLIST
+++ b/x11/xfce4-panel/PLIST
@@ -1,71 +1,71 @@
-@comment $NetBSD: PLIST,v 1.15 2007/01/23 11:53:47 martti Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/04/12 09:55:23 martti Exp $
+bin/xfce4-iconbox
bin/xfce4-panel
-include/xfce4/panel/add-control-dialog.h
-include/xfce4/panel/controls.h
-include/xfce4/panel/global.h
-include/xfce4/panel/icons.h
-include/xfce4/panel/item.h
-include/xfce4/panel/item_dialog.h
-include/xfce4/panel/main.h
-include/xfce4/panel/panel.h
-include/xfce4/panel/plugins.h
-include/xfce4/panel/xfce.h
-include/xfce4/panel/xfce_support.h
-lib/pkgconfig/xfce4-panel-1.0.pc
+bin/xfce4-popup-windowlist
+bin/xftaskbar4
+etc/xdg/xfce4/panel/clock-14.rc
+etc/xdg/xfce4/panel/launcher-10.rc
+etc/xdg/xfce4/panel/launcher-7.rc
+etc/xdg/xfce4/panel/launcher-8.rc
+etc/xdg/xfce4/panel/launcher-9.rc
+etc/xdg/xfce4/panel/panels.xml
+etc/xdg/xfce4/panel/systray-4.rc
+etc/xdg/xfce4/panel/xfce4-menu-5.rc
+include/xfce4/libxfce4panel/xfce-arrow-button.h
+include/xfce4/libxfce4panel/xfce-hvbox.h
+include/xfce4/libxfce4panel/xfce-itembar.h
+include/xfce4/libxfce4panel/xfce-panel-convenience.h
+include/xfce4/libxfce4panel/xfce-panel-enum-types.h
+include/xfce4/libxfce4panel/xfce-panel-enums.h
+include/xfce4/libxfce4panel/xfce-panel-external-plugin.h
+include/xfce4/libxfce4panel/xfce-panel-internal-plugin.h
+include/xfce4/libxfce4panel/xfce-panel-macros.h
+include/xfce4/libxfce4panel/xfce-panel-plugin-iface.h
+include/xfce4/libxfce4panel/xfce-panel-plugin.h
+include/xfce4/libxfce4panel/xfce-panel-window.h
+lib/libxfce4panel.la
+lib/pkgconfig/libxfce4panel-1.0.pc
lib/xfce4/mcs-plugins/libxfce4settings.la
+lib/xfce4/panel-plugins/libactions.la
lib/xfce4/panel-plugins/libclock.la
-lib/xfce4/panel-plugins/libmailcheck.la
+lib/xfce4/panel-plugins/libiconbox.la
+lib/xfce4/panel-plugins/liblauncher.la
lib/xfce4/panel-plugins/libpager.la
lib/xfce4/panel-plugins/libseparator.la
-lib/xfce4/panel-plugins/libswitcher.la
-lib/xfce4/panel-plugins/libsystembuttons.la
-share/applications/xfce-panel-settings.desktop
-share/examples/xfce4/panel/contents.xml
-share/examples/xfce4/panel/contents.xml.ar
-share/examples/xfce4/panel/contents.xml.az
-share/examples/xfce4/panel/contents.xml.ca
-share/examples/xfce4/panel/contents.xml.da
-share/examples/xfce4/panel/contents.xml.el
-share/examples/xfce4/panel/contents.xml.eu
-share/examples/xfce4/panel/contents.xml.fi
-share/examples/xfce4/panel/contents.xml.fr
-share/examples/xfce4/panel/contents.xml.he
-share/examples/xfce4/panel/contents.xml.hu
-share/examples/xfce4/panel/contents.xml.it
-share/examples/xfce4/panel/contents.xml.ja
-share/examples/xfce4/panel/contents.xml.ko
-share/examples/xfce4/panel/contents.xml.lt
-share/examples/xfce4/panel/contents.xml.ms
-share/examples/xfce4/panel/contents.xml.nl
-share/examples/xfce4/panel/contents.xml.pl
-share/examples/xfce4/panel/contents.xml.ro
-share/examples/xfce4/panel/contents.xml.ru
-share/examples/xfce4/panel/contents.xml.sk
-share/examples/xfce4/panel/contents.xml.sv
-share/examples/xfce4/panel/contents.xml.tr
-share/examples/xfce4/panel/contents.xml.vi
-share/examples/xfce4/panel/contents.xml.zh_CN
-share/examples/xfce4/panel/contents.xml.zh_TW
+lib/xfce4/panel-plugins/libshowdesktop.la
+lib/xfce4/panel-plugins/libsystray.la
+lib/xfce4/panel-plugins/libtasklist.la
+lib/xfce4/panel-plugins/libwindowlist.la
+share/applications/xfce4-panel-manager.desktop
+share/doc/libxfce4panel/XfceArrowButton.html
+share/doc/libxfce4panel/XfceExternalPanelPlugin.html
+share/doc/libxfce4panel/XfceHVBox.html
+share/doc/libxfce4panel/XfceInternalPanelPlugin.html
+share/doc/libxfce4panel/XfceItembar.html
+share/doc/libxfce4panel/XfcePanelPlugin.html
+share/doc/libxfce4panel/XfcePanelWindow.html
+share/doc/libxfce4panel/ch01.html
+share/doc/libxfce4panel/home.png
+share/doc/libxfce4panel/index.html
+share/doc/libxfce4panel/index.sgml
+share/doc/libxfce4panel/left.png
+share/doc/libxfce4panel/libxfce4panel-Convenience-Functions.html
+share/doc/libxfce4panel/libxfce4panel-Standard-Enumerations.html
+share/doc/libxfce4panel/libxfce4panel-Writing-Plugins.html
+share/doc/libxfce4panel/libxfce4panel.devhelp
+share/doc/libxfce4panel/libxfce4panel.devhelp2
+share/doc/libxfce4panel/right.png
+share/doc/libxfce4panel/style.css
+share/doc/libxfce4panel/up.png
share/icons/hicolor/16x16/apps/xfce-system-exit.png
share/icons/hicolor/16x16/apps/xfce-system-info.png
share/icons/hicolor/16x16/apps/xfce-system-lock.png
share/icons/hicolor/16x16/apps/xfce-system-settings.png
-share/icons/hicolor/48x48/apps/xfce-edit.png
-share/icons/hicolor/48x48/apps/xfce-filemanager.png
-share/icons/hicolor/48x48/apps/xfce-games.png
-share/icons/hicolor/48x48/apps/xfce-graphics.png
-share/icons/hicolor/48x48/apps/xfce-internet.png
share/icons/hicolor/48x48/apps/xfce-mail.png
-share/icons/hicolor/48x48/apps/xfce-man.png
-share/icons/hicolor/48x48/apps/xfce-multimedia.png
-share/icons/hicolor/48x48/apps/xfce-printer.png
-share/icons/hicolor/48x48/apps/xfce-schedule.png
-share/icons/hicolor/48x48/apps/xfce-sound.png
-share/icons/hicolor/48x48/apps/xfce-terminal.png
-share/icons/hicolor/48x48/apps/xfce-unknown.png
-share/icons/hicolor/48x48/apps/xfce-utils.png
+share/icons/hicolor/48x48/apps/xfce-mouse.png
+share/icons/hicolor/48x48/apps/xfce4-iconbox.png
share/icons/hicolor/48x48/apps/xfce4-panel.png
-share/locale/af/LC_MESSAGES/xfce4-panel.mo
+share/icons/hicolor/48x48/apps/xfce4-taskbar.png
share/locale/ar/LC_MESSAGES/xfce4-panel.mo
share/locale/az/LC_MESSAGES/xfce4-panel.mo
share/locale/be/LC_MESSAGES/xfce4-panel.mo
@@ -73,8 +73,8 @@ share/locale/bg/LC_MESSAGES/xfce4-panel.mo
share/locale/bn_IN/LC_MESSAGES/xfce4-panel.mo
share/locale/ca/LC_MESSAGES/xfce4-panel.mo
share/locale/cs/LC_MESSAGES/xfce4-panel.mo
-share/locale/da/LC_MESSAGES/xfce4-panel.mo
share/locale/de/LC_MESSAGES/xfce4-panel.mo
+share/locale/dz/LC_MESSAGES/xfce4-panel.mo
share/locale/el/LC_MESSAGES/xfce4-panel.mo
share/locale/en_GB/LC_MESSAGES/xfce4-panel.mo
share/locale/eo/LC_MESSAGES/xfce4-panel.mo
@@ -85,6 +85,7 @@ share/locale/eu/LC_MESSAGES/xfce4-panel.mo
share/locale/fa/LC_MESSAGES/xfce4-panel.mo
share/locale/fi/LC_MESSAGES/xfce4-panel.mo
share/locale/fr/LC_MESSAGES/xfce4-panel.mo
+share/locale/gl/LC_MESSAGES/xfce4-panel.mo
share/locale/gu/LC_MESSAGES/xfce4-panel.mo
share/locale/he/LC_MESSAGES/xfce4-panel.mo
share/locale/hi/LC_MESSAGES/xfce4-panel.mo
@@ -92,9 +93,10 @@ share/locale/hu/LC_MESSAGES/xfce4-panel.mo
share/locale/hy/LC_MESSAGES/xfce4-panel.mo
share/locale/it/LC_MESSAGES/xfce4-panel.mo
share/locale/ja/LC_MESSAGES/xfce4-panel.mo
+share/locale/ka/LC_MESSAGES/xfce4-panel.mo
share/locale/ko/LC_MESSAGES/xfce4-panel.mo
-share/locale/ku/LC_MESSAGES/xfce4-panel.mo
share/locale/lt/LC_MESSAGES/xfce4-panel.mo
+share/locale/mk/LC_MESSAGES/xfce4-panel.mo
share/locale/mr/LC_MESSAGES/xfce4-panel.mo
share/locale/ms/LC_MESSAGES/xfce4-panel.mo
share/locale/nb_NO/LC_MESSAGES/xfce4-panel.mo
@@ -106,8 +108,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce4-panel.mo
share/locale/ro/LC_MESSAGES/xfce4-panel.mo
share/locale/ru/LC_MESSAGES/xfce4-panel.mo
share/locale/sk/LC_MESSAGES/xfce4-panel.mo
-share/locale/sl/LC_MESSAGES/xfce4-panel.mo
-share/locale/sq/LC_MESSAGES/xfce4-panel.mo
share/locale/sv/LC_MESSAGES/xfce4-panel.mo
share/locale/ta/LC_MESSAGES/xfce4-panel.mo
share/locale/tr/LC_MESSAGES/xfce4-panel.mo
@@ -115,44 +115,29 @@ share/locale/uk/LC_MESSAGES/xfce4-panel.mo
share/locale/vi/LC_MESSAGES/xfce4-panel.mo
share/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo
share/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo
-share/xfce4/doc/C/images/add-item-dialog.png
-share/xfce4/doc/C/images/clock-properties.png
-share/xfce4/doc/C/images/default_panel.png
-share/xfce4/doc/C/images/handle-popup.png
-share/xfce4/doc/C/images/item-popup.png
-share/xfce4/doc/C/images/launcher-properties.png
-share/xfce4/doc/C/images/mailcheck-properties.png
-share/xfce4/doc/C/images/menuitem-properties.png
-share/xfce4/doc/C/images/nooptions-properties.png
-share/xfce4/doc/C/images/pager-properties.png
-share/xfce4/doc/C/images/panel-settings.png
-share/xfce4/doc/C/images/systembuttons-properties.png
+share/xfce4/doc/C/images/add_item_dialog.png
+share/xfce4/doc/C/images/default_bottom_panel.png
+share/xfce4/doc/C/images/default_top_panel.png
+share/xfce4/doc/C/images/item_popup.png
+share/xfce4/doc/C/images/launcher_properties.png
+share/xfce4/doc/C/images/panel_manager.png
share/xfce4/doc/C/xfce4-panel.html
-share/xfce4/doc/fr/images/add-item-dialog.png
-share/xfce4/doc/fr/images/clock-properties.png
-share/xfce4/doc/fr/images/default_panel.png
-share/xfce4/doc/fr/images/handle-popup.png
-share/xfce4/doc/fr/images/item-popup.png
-share/xfce4/doc/fr/images/launcher-properties.png
-share/xfce4/doc/fr/images/mailcheck-properties.png
-share/xfce4/doc/fr/images/menuitem-properties.png
-share/xfce4/doc/fr/images/nooptions-properties.png
-share/xfce4/doc/fr/images/pager-properties.png
-share/xfce4/doc/fr/images/panel-settings.png
-share/xfce4/doc/fr/images/systembuttons-properties.png
-share/xfce4/doc/fr/xfce4-panel.html
-share/xfce4/doc/he/images/add-item-dialog.png
-share/xfce4/doc/he/images/clock-properties.png
-share/xfce4/doc/he/images/default_panel.png
-share/xfce4/doc/he/images/handle-popup.png
-share/xfce4/doc/he/images/item-popup.png
-share/xfce4/doc/he/images/launcher-properties.png
-share/xfce4/doc/he/images/mailcheck-properties.png
-share/xfce4/doc/he/images/menuitem-properties.png
-share/xfce4/doc/he/images/nooptions-properties.png
-share/xfce4/doc/he/images/pager-properties.png
-share/xfce4/doc/he/images/panel-settings.png
-share/xfce4/doc/he/images/systembuttons-properties.png
-share/xfce4/doc/he/xfce4-panel.html
+share/xfce4/panel-plugins/actions.desktop
+share/xfce4/panel-plugins/clock.desktop
+share/xfce4/panel-plugins/iconbox.desktop
+share/xfce4/panel-plugins/launcher.desktop
+share/xfce4/panel-plugins/pager.desktop
+share/xfce4/panel-plugins/separator.desktop
+share/xfce4/panel-plugins/showdesktop.desktop
+share/xfce4/panel-plugins/systray.desktop
+share/xfce4/panel-plugins/tasklist.desktop
+share/xfce4/panel-plugins/windowlist.desktop
+@dirrm share/xfce4/panel-plugins
+@dirrm share/doc/libxfce4panel
@dirrm lib/xfce4/panel-plugins
-@dirrm include/xfce4/panel
+@dirrm include/xfce4/libxfce4panel
+@dirrm etc/xdg/xfce4/panel
+@unexec ${RMDIR} %D/libexec/xfce4/panel-plugins 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/libexec/xfce4 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/etc/xdg/xfce4 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/etc/xdg 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
index c19710f67b9..67d2bf45c6a 100644
--- a/x11/xfce4-panel/buildlink3.mk
+++ b/x11/xfce4-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2007/04/12 09:55:23 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_PANEL_BUILDLINK3_MK:= ${XFCE4_PANEL_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= xfce4-panel
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-panel
.if ${XFCE4_PANEL_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-panel+= xfce4-panel>=4.2.4
+BUILDLINK_API_DEPENDS.xfce4-panel+= xfce4-panel>=4.4.1
BUILDLINK_PKGSRCDIR.xfce4-panel?= ../../x11/xfce4-panel
.endif # XFCE4_PANEL_BUILDLINK3_MK
@@ -20,6 +20,7 @@ BUILDLINK_PKGSRCDIR.xfce4-panel?= ../../x11/xfce4-panel
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-panel/distinfo b/x11/xfce4-panel/distinfo
index 06be96d4222..197e1fa2252 100644
--- a/x11/xfce4-panel/distinfo
+++ b/x11/xfce4-panel/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.14 2007/01/23 11:53:47 martti Exp $
+$NetBSD: distinfo,v 1.15 2007/04/12 09:55:23 martti Exp $
-SHA1 (xfce4-panel-4.2.4.tar.gz) = c3dd474066e620e79e610e03b6d2a1a0ba104356
-RMD160 (xfce4-panel-4.2.4.tar.gz) = 369816f53f041d76e87addcdf9db38025f79de3f
-Size (xfce4-panel-4.2.4.tar.gz) = 1376855 bytes
-SHA1 (patch-aa) = e0a6484138e5b103f05f1067f5b8b47af90f69d1
+SHA1 (xfce4-panel-4.4.1.tar.bz2) = 5a0ca0dee7f8d525120f65cc8fd199a3e673f60c
+RMD160 (xfce4-panel-4.4.1.tar.bz2) = 53d804b18b363e3571d065435163a6f74df6b3ed
+Size (xfce4-panel-4.4.1.tar.bz2) = 767669 bytes
diff --git a/x11/xfce4-panel/patches/patch-aa b/x11/xfce4-panel/patches/patch-aa
deleted file mode 100644
index 1fa6e8329ab..00000000000
--- a/x11/xfce4-panel/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/01/23 11:53:47 martti Exp $
-
---- Makefile.in.orig 2007-01-14 21:06:10.000000000 +0000
-+++ Makefile.in 2007-01-23 12:18:33.000000000 +0000
-@@ -238,7 +238,7 @@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--confdir = $(sysconfdir)/xdg/xfce4/panel
-+confdir = $(datadir)/examples/xfce4/panel
- conf_DATA = \
- contents.xml \
- contents.xml.ar \
diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index e626338a763..491f1a2b9c4 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,31 +1,26 @@
-# $NetBSD: Makefile,v 1.18 2007/02/03 09:27:33 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/04/12 09:55:24 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-DISTNAME= xfce4-session-${XFCE4_VERSION}
-#PKGREVISION= 1
-CATEGORIES= x11
-COMMENT= Xfce session manager
-
+DISTNAME= xfce4-session-${XFCE4_VERSION}
+CATEGORIES= x11
+COMMENT= Xfce session manager
PKG_SYSCONFSUBDIR= xdg/xfce4-session
EGDIR= ${XFCE4_EGBASE}/session
CONF_FILES= ${EGDIR:Q}/xfce4-session.rc \
${PKG_SYSCONFDIR:Q}/xfce4-session.rc
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} \
- ICEAUTH=${TOOLS_PATH.iceauth:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q}
+CONFIGURE_ARGS+= ICEAUTH=${TOOLS_PATH.iceauth:Q}
REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR}
+BUILD_DEFS+= PKG_SYSCONFBASE
-USE_DIRS+= xdg-1.4
-USE_TOOLS+= iceauth:run
-
-BUILDLINK_DEPMETHOD.libXt?= build
+USE_TOOLS+= iceauth:run
+USE_TOOLS+= intltool
+USE_DIRS+= xdg-1.4
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-session/PLIST b/x11/xfce4-session/PLIST
index d921216eaab..9d12f916286 100644
--- a/x11/xfce4-session/PLIST
+++ b/x11/xfce4-session/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.8 2007/01/23 11:53:47 martti Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/04/12 09:55:24 martti Exp $
+bin/xfce4-autostart-editor
bin/xfce4-session
bin/xfce4-session-logout
+bin/xfce4-tips
+etc/xdg/autostart/xfce4-tips-autostart.desktop
include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-engine.h
include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-rc.h
lib/libxfsm-4.2.la
@@ -17,25 +20,27 @@ man/man1/xfce4-session-logout.1
man/man1/xfce4-session.1
share/applications/xfce-session-settings.desktop
share/applications/xfce-splash-settings.desktop
+share/applications/xfce4-autostart-editor.desktop
share/examples/xfce4/session/xfce4-session.rc
share/icons/hicolor/128x128/apps/xfce4-session.png
share/icons/hicolor/48x48/apps/xfce4-session.png
share/icons/hicolor/48x48/apps/xfce4-splash.png
+share/icons/hicolor/48x48/apps/xfsm-logout.png
+share/icons/hicolor/48x48/apps/xfsm-reboot.png
share/icons/hicolor/48x48/apps/xfsm-shutdown.png
share/icons/hicolor/64x64/apps/xfsm-gnome-kde-logo.png
share/icons/hicolor/72x72/apps/xfsm-trash-hilight.png
share/icons/hicolor/72x72/apps/xfsm-trash-normal.png
share/icons/hicolor/scalable/apps/xfce4-session.svg
share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
-share/locale/af/LC_MESSAGES/xfce4-session.mo
share/locale/ar/LC_MESSAGES/xfce4-session.mo
share/locale/az/LC_MESSAGES/xfce4-session.mo
share/locale/be/LC_MESSAGES/xfce4-session.mo
share/locale/bn_IN/LC_MESSAGES/xfce4-session.mo
share/locale/ca/LC_MESSAGES/xfce4-session.mo
share/locale/cs/LC_MESSAGES/xfce4-session.mo
-share/locale/da/LC_MESSAGES/xfce4-session.mo
share/locale/de/LC_MESSAGES/xfce4-session.mo
+share/locale/dz/LC_MESSAGES/xfce4-session.mo
share/locale/el/LC_MESSAGES/xfce4-session.mo
share/locale/en_GB/LC_MESSAGES/xfce4-session.mo
share/locale/eo/LC_MESSAGES/xfce4-session.mo
@@ -46,15 +51,17 @@ share/locale/eu/LC_MESSAGES/xfce4-session.mo
share/locale/fa/LC_MESSAGES/xfce4-session.mo
share/locale/fi/LC_MESSAGES/xfce4-session.mo
share/locale/fr/LC_MESSAGES/xfce4-session.mo
+share/locale/gl/LC_MESSAGES/xfce4-session.mo
share/locale/gu/LC_MESSAGES/xfce4-session.mo
share/locale/he/LC_MESSAGES/xfce4-session.mo
share/locale/hi/LC_MESSAGES/xfce4-session.mo
share/locale/hu/LC_MESSAGES/xfce4-session.mo
share/locale/it/LC_MESSAGES/xfce4-session.mo
share/locale/ja/LC_MESSAGES/xfce4-session.mo
+share/locale/ka/LC_MESSAGES/xfce4-session.mo
share/locale/ko/LC_MESSAGES/xfce4-session.mo
-share/locale/ku/LC_MESSAGES/xfce4-session.mo
share/locale/lt/LC_MESSAGES/xfce4-session.mo
+share/locale/mk/LC_MESSAGES/xfce4-session.mo
share/locale/mr/LC_MESSAGES/xfce4-session.mo
share/locale/ms/LC_MESSAGES/xfce4-session.mo
share/locale/nb_NO/LC_MESSAGES/xfce4-session.mo
@@ -66,8 +73,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce4-session.mo
share/locale/ro/LC_MESSAGES/xfce4-session.mo
share/locale/ru/LC_MESSAGES/xfce4-session.mo
share/locale/sk/LC_MESSAGES/xfce4-session.mo
-share/locale/sl/LC_MESSAGES/xfce4-session.mo
-share/locale/sq/LC_MESSAGES/xfce4-session.mo
share/locale/sv/LC_MESSAGES/xfce4-session.mo
share/locale/ta/LC_MESSAGES/xfce4-session.mo
share/locale/tr/LC_MESSAGES/xfce4-session.mo
@@ -85,12 +90,15 @@ share/xfce4/doc/fr/images/xfsm-advanced.png
share/xfce4/doc/fr/images/xfsm-general.png
share/xfce4/doc/fr/images/xfsm-splash.png
share/xfce4/doc/fr/xfce4-session.html
-share/xfce4/doc/he/images/xfsm-advanced.png
-share/xfce4/doc/he/images/xfsm-general.png
-share/xfce4/doc/he/images/xfsm-splash.png
-share/xfce4/doc/he/xfce4-session.html
+share/xfce4/tips/tips
+share/xfce4/tips/tips.dat
+@dirrm share/xfce4/tips
@dirrm share/themes/Default/balou
+@dirrm share/examples/xfce4/session
@dirrm lib/xfce4/splash/engines
@dirrm lib/xfce4/splash
@dirrm include/xfce4/xfce4-session-4.2/libxfsm
@dirrm include/xfce4/xfce4-session-4.2
+@dirrm etc/xdg/xfce4-session
+@dirrm etc/xdg/autostart
+@unexec ${RMDIR} %D/etc/xdg 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk
index bf8510c97cc..898c06f97f1 100644
--- a/x11/xfce4-session/buildlink3.mk
+++ b/x11/xfce4-session/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2007/04/12 09:55:24 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_SESSION_BUILDLINK3_MK:= ${XFCE4_SESSION_BUILDLINK3_MK}+
@@ -12,12 +12,13 @@ BUILDLINK_PACKAGES+= xfce4-session
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-session
.if ${XFCE4_SESSION_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.2.4
+BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.4.1
BUILDLINK_PKGSRCDIR.xfce4-session?= ../../x11/xfce4-session
.endif # XFCE4_SESSION_BUILDLINK3_MK
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo
index 8ffff22458f..6e6319328d3 100644
--- a/x11/xfce4-session/distinfo
+++ b/x11/xfce4-session/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2007/01/23 11:53:48 martti Exp $
+$NetBSD: distinfo,v 1.8 2007/04/12 09:55:24 martti Exp $
-SHA1 (xfce4-session-4.2.4.tar.gz) = 61e20cbf624e74f69f65c8a338c0599c4bd44040
-RMD160 (xfce4-session-4.2.4.tar.gz) = c715e5ed4055e8689e5a0ac1d80e2e5f157b6c90
-Size (xfce4-session-4.2.4.tar.gz) = 1595909 bytes
-SHA1 (patch-aa) = acf3953b39f632423fddd799ba66eb8b4b6893bc
+SHA1 (xfce4-session-4.4.1.tar.bz2) = 05a47d55830a9f9b91498a6a3fd1bf3eb197d42a
+RMD160 (xfce4-session-4.4.1.tar.bz2) = 76450c7b53d6b81d378649d52035dcbd3d68a999
+Size (xfce4-session-4.4.1.tar.bz2) = 1289278 bytes
+SHA1 (patch-aa) = 7fcb05e5884f979b015ac7e853df66ca79190195
diff --git a/x11/xfce4-session/patches/patch-aa b/x11/xfce4-session/patches/patch-aa
index 63f9b350f8f..af69a182f1d 100644
--- a/x11/xfce4-session/patches/patch-aa
+++ b/x11/xfce4-session/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2005/06/15 09:03:28 hira Exp $
+$NetBSD: patch-aa,v 1.2 2007/04/12 09:55:24 martti Exp $
---- Makefile.in.orig 2005-06-13 18:25:08.000000000 +0900
-+++ Makefile.in 2005-06-13 18:26:18.000000000 +0900
-@@ -249,7 +249,7 @@
- xfce4-session-logout \
+--- Makefile.in.orig 2006-07-10 12:12:02.000000000 +0000
++++ Makefile.in 2006-07-14 09:28:20.000000000 +0000
+@@ -278,7 +278,7 @@
+ xfce4-tips \
xfsm-shutdown-helper
-configdir = $(sysconfdir)/xdg/xfce4-session
+configdir = $(datadir)/examples/xfce4/session
config_DATA = xfce4-session.rc
EXTRA_DIST = \
- $(config_DATA) \
+ BUGS \
diff --git a/x11/xfce4-toys/DESCR b/x11/xfce4-toys/DESCR
deleted file mode 100644
index 0639fe6d7f9..00000000000
--- a/x11/xfce4-toys/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Additional toys for Xfce.
diff --git a/x11/xfce4-toys/Makefile b/x11/xfce4-toys/Makefile
deleted file mode 100644
index 2bd909c6f0d..00000000000
--- a/x11/xfce4-toys/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2007/01/23 11:53:48 martti Exp $
-
-.include "../../meta-pkgs/xfce4/Makefile.common"
-
-DISTNAME= xfce4-toys-${XFCE4_VERSION}
-#PKGREVISION= 1
-CATEGORIES= x11
-COMMENT= Xfce toys
-
-BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-toys/PLIST b/x11/xfce4-toys/PLIST
deleted file mode 100644
index 024a63b9106..00000000000
--- a/x11/xfce4-toys/PLIST
+++ /dev/null
@@ -1,78 +0,0 @@
-@comment $NetBSD: PLIST,v 1.14 2007/01/23 11:53:48 martti Exp $
-bin/xfce4-tips
-lib/xfce4/panel-plugins/libeyes.la
-share/locale/af/LC_MESSAGES/xfce4-toys.mo
-share/locale/ar/LC_MESSAGES/xfce4-toys.mo
-share/locale/az/LC_MESSAGES/xfce4-toys.mo
-share/locale/be/LC_MESSAGES/xfce4-toys.mo
-share/locale/bg/LC_MESSAGES/xfce4-toys.mo
-share/locale/bn_IN/LC_MESSAGES/xfce4-toys.mo
-share/locale/ca/LC_MESSAGES/xfce4-toys.mo
-share/locale/cs/LC_MESSAGES/xfce4-toys.mo
-share/locale/da/LC_MESSAGES/xfce4-toys.mo
-share/locale/de/LC_MESSAGES/xfce4-toys.mo
-share/locale/el/LC_MESSAGES/xfce4-toys.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-toys.mo
-share/locale/eo/LC_MESSAGES/xfce4-toys.mo
-share/locale/es/LC_MESSAGES/xfce4-toys.mo
-share/locale/es_MX/LC_MESSAGES/xfce4-toys.mo
-share/locale/et/LC_MESSAGES/xfce4-toys.mo
-share/locale/eu/LC_MESSAGES/xfce4-toys.mo
-share/locale/fa/LC_MESSAGES/xfce4-toys.mo
-share/locale/fi/LC_MESSAGES/xfce4-toys.mo
-share/locale/fr/LC_MESSAGES/xfce4-toys.mo
-share/locale/gu/LC_MESSAGES/xfce4-toys.mo
-share/locale/he/LC_MESSAGES/xfce4-toys.mo
-share/locale/hi/LC_MESSAGES/xfce4-toys.mo
-share/locale/hu/LC_MESSAGES/xfce4-toys.mo
-share/locale/it/LC_MESSAGES/xfce4-toys.mo
-share/locale/ja/LC_MESSAGES/xfce4-toys.mo
-share/locale/ka/LC_MESSAGES/xfce4-toys.mo
-share/locale/ko/LC_MESSAGES/xfce4-toys.mo
-share/locale/ku/LC_MESSAGES/xfce4-toys.mo
-share/locale/lt/LC_MESSAGES/xfce4-toys.mo
-share/locale/mr/LC_MESSAGES/xfce4-toys.mo
-share/locale/ms/LC_MESSAGES/xfce4-toys.mo
-share/locale/nb_NO/LC_MESSAGES/xfce4-toys.mo
-share/locale/nl/LC_MESSAGES/xfce4-toys.mo
-share/locale/pa/LC_MESSAGES/xfce4-toys.mo
-share/locale/pl/LC_MESSAGES/xfce4-toys.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-toys.mo
-share/locale/pt_PT/LC_MESSAGES/xfce4-toys.mo
-share/locale/ro/LC_MESSAGES/xfce4-toys.mo
-share/locale/ru/LC_MESSAGES/xfce4-toys.mo
-share/locale/sk/LC_MESSAGES/xfce4-toys.mo
-share/locale/sl/LC_MESSAGES/xfce4-toys.mo
-share/locale/sq/LC_MESSAGES/xfce4-toys.mo
-share/locale/sv/LC_MESSAGES/xfce4-toys.mo
-share/locale/ta/LC_MESSAGES/xfce4-toys.mo
-share/locale/tr/LC_MESSAGES/xfce4-toys.mo
-share/locale/uk/LC_MESSAGES/xfce4-toys.mo
-share/locale/vi/LC_MESSAGES/xfce4-toys.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-toys.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-toys.mo
-share/xfce4/eyes/themes/Bizarre/Bizarre-eye.png
-share/xfce4/eyes/themes/Bizarre/Bizarre-pupil.png
-share/xfce4/eyes/themes/Bizarre/config
-share/xfce4/eyes/themes/Bloodshot/Bloodshot-eye.png
-share/xfce4/eyes/themes/Bloodshot/Bloodshot-pupil.png
-share/xfce4/eyes/themes/Bloodshot/config
-share/xfce4/eyes/themes/Default-tiny/Default-tiny-eye.png
-share/xfce4/eyes/themes/Default-tiny/Default-tiny-pupil.png
-share/xfce4/eyes/themes/Default-tiny/config
-share/xfce4/eyes/themes/Default/Default-eye.png
-share/xfce4/eyes/themes/Default/Default-pupil.png
-share/xfce4/eyes/themes/Default/config
-share/xfce4/eyes/themes/Horrid/Horrid-eye.png
-share/xfce4/eyes/themes/Horrid/Horrid-pupil.png
-share/xfce4/eyes/themes/Horrid/config
-share/xfce4/tips/tips
-share/xfce4/tips/tips.dat
-@dirrm share/xfce4/tips
-@dirrm share/xfce4/eyes/themes/Horrid
-@dirrm share/xfce4/eyes/themes/Default-tiny
-@dirrm share/xfce4/eyes/themes/Default
-@dirrm share/xfce4/eyes/themes/Bloodshot
-@dirrm share/xfce4/eyes/themes/Bizarre
-@dirrm share/xfce4/eyes/themes
-@dirrm share/xfce4/eyes
diff --git a/x11/xfce4-toys/buildlink3.mk b/x11/xfce4-toys/buildlink3.mk
deleted file mode 100644
index 7faf9cace43..00000000000
--- a/x11/xfce4-toys/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.18 2007/01/23 11:53:48 martti Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XFCE4_TOYS_BUILDLINK3_MK:= ${XFCE4_TOYS_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= xfce4-toys
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-toys}
-BUILDLINK_PACKAGES+= xfce4-toys
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-toys
-
-.if ${XFCE4_TOYS_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-toys+= xfce4-toys>=4.2.4
-BUILDLINK_PKGSRCDIR.xfce4-toys?= ../../x11/xfce4-toys
-.endif # XFCE4_TOYS_BUILDLINK3_MK
-
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-toys/distinfo b/x11/xfce4-toys/distinfo
deleted file mode 100644
index b4c72cbb442..00000000000
--- a/x11/xfce4-toys/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.13 2007/01/23 11:53:48 martti Exp $
-
-SHA1 (xfce4-toys-4.2.4.tar.gz) = 1cea76250afe2ce5338727f70d6b9ad9f09ee4ac
-RMD160 (xfce4-toys-4.2.4.tar.gz) = f7a80c717e6ec7faa2fc6199f6b11326475d2d36
-Size (xfce4-toys-4.2.4.tar.gz) = 442908 bytes
diff --git a/x11/xfce4-trigger-launcher/DESCR b/x11/xfce4-trigger-launcher/DESCR
deleted file mode 100644
index 56b2d8231f0..00000000000
--- a/x11/xfce4-trigger-launcher/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Trigger launcher for Xfce.
diff --git a/x11/xfce4-trigger-launcher/Makefile b/x11/xfce4-trigger-launcher/Makefile
deleted file mode 100644
index 60c21d18763..00000000000
--- a/x11/xfce4-trigger-launcher/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2007/01/23 11:53:48 martti Exp $
-
-.include "../../meta-pkgs/xfce4/Makefile.common"
-
-DISTNAME= xfce4-trigger-launcher-${XFCE4_VERSION}
-#PKGREVISION= 1
-CATEGORIES= x11
-COMMENT= Xfce trigger-launcher
-
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-trigger-launcher/PLIST b/x11/xfce4-trigger-launcher/PLIST
deleted file mode 100644
index f569d3dfbff..00000000000
--- a/x11/xfce4-trigger-launcher/PLIST
+++ /dev/null
@@ -1,51 +0,0 @@
-@comment $NetBSD: PLIST,v 1.14 2007/01/23 11:53:48 martti Exp $
-lib/xfce4/panel-plugins/libtriggerlauncher.la
-share/locale/af/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/ar/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/az/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/be/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/bg/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/bn_IN/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/ca/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/cs/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/da/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/de/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/el/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/eo/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/es/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/es_MX/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/et/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/eu/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/fa/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/fi/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/fr/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/gu/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/he/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/hi/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/hu/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/it/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/ja/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/ka/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/ko/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/ku/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/lt/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/mr/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/ms/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/nl/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/pa/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/pl/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/pt_PT/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/ro/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/ru/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/sk/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/sl/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/sq/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/sv/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/ta/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/tr/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/uk/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/vi/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-trigger-launcher.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-trigger-launcher.mo
diff --git a/x11/xfce4-trigger-launcher/buildlink3.mk b/x11/xfce4-trigger-launcher/buildlink3.mk
deleted file mode 100644
index 56e6bc81f5c..00000000000
--- a/x11/xfce4-trigger-launcher/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:48 martti Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:= ${XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= xfce4-trigger-launcher
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-trigger-launcher}
-BUILDLINK_PACKAGES+= xfce4-trigger-launcher
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-trigger-launcher
-
-.if ${XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-trigger-launcher+= xfce4-trigger-launcher>=4.2.4
-BUILDLINK_PKGSRCDIR.xfce4-trigger-launcher?= ../../x11/xfce4-trigger-launcher
-.endif # XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK
-
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-trigger-launcher/distinfo b/x11/xfce4-trigger-launcher/distinfo
deleted file mode 100644
index fe038dbeec0..00000000000
--- a/x11/xfce4-trigger-launcher/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.13 2007/01/23 11:53:48 martti Exp $
-
-SHA1 (xfce4-trigger-launcher-4.2.4.tar.gz) = 931db72a5e9d88eb6f5cfa2f45a8b5847670e11e
-RMD160 (xfce4-trigger-launcher-4.2.4.tar.gz) = 9d91ce07dd21a84671b6be196e51c61e722c7bbe
-Size (xfce4-trigger-launcher-4.2.4.tar.gz) = 384020 bytes
diff --git a/x11/xfce4-utils/MESSAGE b/x11/xfce4-utils/MESSAGE
index 47807c3d2c7..08929999385 100644
--- a/x11/xfce4-utils/MESSAGE
+++ b/x11/xfce4-utils/MESSAGE
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1 2004/10/05 09:58:52 martti Exp $
+$NetBSD: MESSAGE,v 1.2 2007/04/12 09:55:26 martti Exp $
You may want to install one of these packages:
diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile
index 763524eebf2..ef069436b29 100644
--- a/x11/xfce4-utils/Makefile
+++ b/x11/xfce4-utils/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.29 2007/01/23 17:42:27 drochner Exp $
+# $NetBSD: Makefile,v 1.30 2007/04/12 09:55:26 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce-utils-${XFCE4_VERSION}
PKGNAME= xfce4-utils-${XFCE4_VERSION}
-#PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce utilities
-
PKG_SYSCONFSUBDIR= xdg/xfce4
EGDIR= ${XFCE4_EGBASE}
CONF_FILES= ${EGDIR:Q}/xinitrc ${PKG_SYSCONFDIR:Q}/xinitrc
@@ -16,15 +14,12 @@ USE_TOOLS+= xinit:run
REQD_DIRS+= ${EGDIR}
+BUILD_DEFS+= PKG_SYSCONFBASE
+
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q}
.include "options.mk"
-BUILDLINK_DEPMETHOD.libXt?= build
-
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-utils/PLIST b/x11/xfce4-utils/PLIST
index 94fb74474fc..b2f473e4b53 100644
--- a/x11/xfce4-utils/PLIST
+++ b/x11/xfce4-utils/PLIST
@@ -1,18 +1,14 @@
-@comment $NetBSD: PLIST,v 1.15 2007/01/23 11:53:48 martti Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/04/12 09:55:26 martti Exp $
bin/startxfce4
+bin/xfbrowser4
bin/xfce4-about
bin/xfhelp4
bin/xflock4
bin/xfmountdev4
bin/xfrun4
-bin/xftaskbar4
bin/xfterm4
-lib/xfce4/mcs-plugins/xftaskbar_plugin.la
-share/applications/xfce-taskbar-settings.desktop
share/examples/xfce4/xinitrc
share/icons/hicolor/48x48/apps/xfce4-logo.png
-share/icons/hicolor/48x48/apps/xfce4-taskbar.png
-share/icons/hicolor/scalable/apps/xfce4-taskbar.svg
share/locale/af/LC_MESSAGES/xfce-utils.mo
share/locale/ar/LC_MESSAGES/xfce-utils.mo
share/locale/az/LC_MESSAGES/xfce-utils.mo
@@ -21,8 +17,8 @@ share/locale/bg/LC_MESSAGES/xfce-utils.mo
share/locale/bn_IN/LC_MESSAGES/xfce-utils.mo
share/locale/ca/LC_MESSAGES/xfce-utils.mo
share/locale/cs/LC_MESSAGES/xfce-utils.mo
-share/locale/da/LC_MESSAGES/xfce-utils.mo
share/locale/de/LC_MESSAGES/xfce-utils.mo
+share/locale/dz/LC_MESSAGES/xfce-utils.mo
share/locale/el/LC_MESSAGES/xfce-utils.mo
share/locale/en_GB/LC_MESSAGES/xfce-utils.mo
share/locale/eo/LC_MESSAGES/xfce-utils.mo
@@ -33,6 +29,7 @@ share/locale/eu/LC_MESSAGES/xfce-utils.mo
share/locale/fa/LC_MESSAGES/xfce-utils.mo
share/locale/fi/LC_MESSAGES/xfce-utils.mo
share/locale/fr/LC_MESSAGES/xfce-utils.mo
+share/locale/gl/LC_MESSAGES/xfce-utils.mo
share/locale/gu/LC_MESSAGES/xfce-utils.mo
share/locale/he/LC_MESSAGES/xfce-utils.mo
share/locale/hi/LC_MESSAGES/xfce-utils.mo
@@ -40,9 +37,10 @@ share/locale/hu/LC_MESSAGES/xfce-utils.mo
share/locale/hy/LC_MESSAGES/xfce-utils.mo
share/locale/it/LC_MESSAGES/xfce-utils.mo
share/locale/ja/LC_MESSAGES/xfce-utils.mo
+share/locale/ka/LC_MESSAGES/xfce-utils.mo
share/locale/ko/LC_MESSAGES/xfce-utils.mo
-share/locale/ku/LC_MESSAGES/xfce-utils.mo
share/locale/lt/LC_MESSAGES/xfce-utils.mo
+share/locale/mk/LC_MESSAGES/xfce-utils.mo
share/locale/mr/LC_MESSAGES/xfce-utils.mo
share/locale/ms/LC_MESSAGES/xfce-utils.mo
share/locale/nl/LC_MESSAGES/xfce-utils.mo
@@ -53,8 +51,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce-utils.mo
share/locale/ro/LC_MESSAGES/xfce-utils.mo
share/locale/ru/LC_MESSAGES/xfce-utils.mo
share/locale/sk/LC_MESSAGES/xfce-utils.mo
-share/locale/sl/LC_MESSAGES/xfce-utils.mo
-share/locale/sq/LC_MESSAGES/xfce-utils.mo
share/locale/sv/LC_MESSAGES/xfce-utils.mo
share/locale/ta/LC_MESSAGES/xfce-utils.mo
share/locale/tr/LC_MESSAGES/xfce-utils.mo
@@ -63,71 +59,20 @@ share/locale/vi/LC_MESSAGES/xfce-utils.mo
share/locale/zh_CN/LC_MESSAGES/xfce-utils.mo
share/locale/zh_TW/LC_MESSAGES/xfce-utils.mo
share/xfce4/AUTHORS
-share/xfce4/AUTHORS.az
-share/xfce4/AUTHORS.ca
-share/xfce4/AUTHORS.de
-share/xfce4/AUTHORS.es
-share/xfce4/AUTHORS.eu
-share/xfce4/AUTHORS.fi
-share/xfce4/AUTHORS.fr
-share/xfce4/AUTHORS.he
-share/xfce4/AUTHORS.html
-share/xfce4/AUTHORS.html.az
-share/xfce4/AUTHORS.html.ca
-share/xfce4/AUTHORS.html.de
-share/xfce4/AUTHORS.html.es
-share/xfce4/AUTHORS.html.eu
-share/xfce4/AUTHORS.html.fi
-share/xfce4/AUTHORS.html.fr
-share/xfce4/AUTHORS.html.it
-share/xfce4/AUTHORS.html.ja
-share/xfce4/AUTHORS.html.lt
-share/xfce4/AUTHORS.html.ro
-share/xfce4/AUTHORS.html.ru
-share/xfce4/AUTHORS.html.sk
-share/xfce4/AUTHORS.html.vi
-share/xfce4/AUTHORS.html.zh_TW
-share/xfce4/AUTHORS.it
-share/xfce4/AUTHORS.ja
-share/xfce4/AUTHORS.lt
-share/xfce4/AUTHORS.ro
-share/xfce4/AUTHORS.ru
-share/xfce4/AUTHORS.sk
-share/xfce4/AUTHORS.uk
-share/xfce4/AUTHORS.vi
-share/xfce4/AUTHORS.zh_TW
share/xfce4/BSD
-share/xfce4/BSD.html
share/xfce4/COPYING
-share/xfce4/COPYING.html
-share/xfce4/COPYING.vi
share/xfce4/GPL
-share/xfce4/GPL.html
share/xfce4/INFO
share/xfce4/INFO.ca
share/xfce4/INFO.es
share/xfce4/INFO.fi
share/xfce4/INFO.fr
-share/xfce4/INFO.html
-share/xfce4/INFO.html.ca
-share/xfce4/INFO.html.de
-share/xfce4/INFO.html.es
-share/xfce4/INFO.html.fi
-share/xfce4/INFO.html.fr
-share/xfce4/INFO.html.it
-share/xfce4/INFO.html.ja
-share/xfce4/INFO.html.lt
-share/xfce4/INFO.html.ro
-share/xfce4/INFO.html.ru
share/xfce4/INFO.it
share/xfce4/INFO.ja
-share/xfce4/INFO.lt
-share/xfce4/INFO.ro
share/xfce4/INFO.ru
share/xfce4/INFO.uk
share/xfce4/INFO.vi
share/xfce4/LGPL
-share/xfce4/LGPL.html
share/xfce4/doc/C/BSD.html
share/xfce4/doc/C/GPL.html
share/xfce4/doc/C/LGPL.html
@@ -144,38 +89,8 @@ share/xfce4/doc/C/xfce4-install.html
share/xfce4/doc/C/xfce4-intro.html
share/xfce4/doc/C/xfce4-use.html
share/xfce4/doc/C/xfce4-user-guide.html
-share/xfce4/doc/fr/BSD.html
-share/xfce4/doc/fr/GPL.html
-share/xfce4/doc/fr/LGPL.html
-share/xfce4/doc/fr/images/about-dialog.png
-share/xfce4/doc/fr/images/default-session.png
-share/xfce4/doc/fr/images/link_xfce.jpg
-share/xfce4/doc/fr/images/run-dialog.png
-share/xfce4/doc/fr/images/taskbar_settings.png
share/xfce4/doc/fr/index.html
-share/xfce4/doc/fr/xfce-utils.html
-share/xfce4/doc/fr/xfce4-components.html
-share/xfce4/doc/fr/xfce4-copyright.html
-share/xfce4/doc/fr/xfce4-install.html
-share/xfce4/doc/fr/xfce4-intro.html
-share/xfce4/doc/fr/xfce4-use.html
-share/xfce4/doc/fr/xfce4-user-guide.html
-share/xfce4/doc/he/BSD.html
-share/xfce4/doc/he/GPL.html
-share/xfce4/doc/he/LGPL.html
-share/xfce4/doc/he/images/about-dialog.png
-share/xfce4/doc/he/images/default-session.png
-share/xfce4/doc/he/images/link_xfce.jpg
-share/xfce4/doc/he/images/run-dialog.png
-share/xfce4/doc/he/images/taskbar_settings.png
-share/xfce4/doc/he/index.html
-share/xfce4/doc/he/xfce-utils.html
-share/xfce4/doc/he/xfce4-components.html
-share/xfce4/doc/he/xfce4-copyright.html
-share/xfce4/doc/he/xfce4-install.html
-share/xfce4/doc/he/xfce4-intro.html
-share/xfce4/doc/he/xfce4-use.html
-share/xfce4/doc/he/xfce4-user-guide.html
+share/xfce4/doc/it/index.html
+share/xfce4/doc/xfce-chunk.css
share/xfce4/doc/xfce-mouse.png
-share/xfce4/doc/xfce-rtl.css
share/xfce4/doc/xfce.css
diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk
index 9ecc6b0fac5..f220fbc109f 100644
--- a/x11/xfce4-utils/buildlink3.mk
+++ b/x11/xfce4-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2007/01/23 11:53:48 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2007/04/12 09:55:26 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_UTILS_BUILDLINK3_MK:= ${XFCE4_UTILS_BUILDLINK3_MK}+
@@ -12,12 +12,13 @@ BUILDLINK_PACKAGES+= xfce4-utils
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-utils
.if ${XFCE4_UTILS_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-utils+= xfce4-utils>=4.2.4
+BUILDLINK_API_DEPENDS.xfce4-utils+= xfce4-utils>=4.4.1
BUILDLINK_PKGSRCDIR.xfce4-utils?= ../../x11/xfce4-utils
.endif # XFCE4_UTILS_BUILDLINK3_MK
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-utils/distinfo b/x11/xfce4-utils/distinfo
index 52c801a3b31..867fcd7f6e2 100644
--- a/x11/xfce4-utils/distinfo
+++ b/x11/xfce4-utils/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.16 2007/01/23 11:53:48 martti Exp $
+$NetBSD: distinfo,v 1.17 2007/04/12 09:55:26 martti Exp $
-SHA1 (xfce-utils-4.2.4.tar.gz) = eebc2f5ea2de22d6afab259476feb4f0e5cc54c2
-RMD160 (xfce-utils-4.2.4.tar.gz) = e415bebb909dfcc382e9b261378eb60d7bad6f00
-Size (xfce-utils-4.2.4.tar.gz) = 1295235 bytes
-SHA1 (patch-aa) = deafbcd8b3c367d377aa25416c9d25043f907e60
-SHA1 (patch-ab) = 39c4fd41775cefc4cc2f10bc86060d9bbcc7b795
-SHA1 (patch-ac) = 5eb98ebc693c677dbd1e39efbf6016fb3fbf5f90
+SHA1 (xfce-utils-4.4.1.tar.bz2) = 69ab30d45bbe252993f783e2f4d7f184226cacbb
+RMD160 (xfce-utils-4.4.1.tar.bz2) = 65ed96acb6491829d0f97e8b1e4b5cba64a73e63
+Size (xfce-utils-4.4.1.tar.bz2) = 608154 bytes
+SHA1 (patch-aa) = 9fba43b9ee2314743b19c0b72bd1a67ecb92ee29
diff --git a/x11/xfce4-utils/patches/patch-aa b/x11/xfce4-utils/patches/patch-aa
index b57ffe0c515..a91f41fe58d 100644
--- a/x11/xfce4-utils/patches/patch-aa
+++ b/x11/xfce4-utils/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1 2005/06/15 09:04:32 hira Exp $
+$NetBSD: patch-aa,v 1.2 2007/04/12 09:55:26 martti Exp $
---- scripts/Makefile.in.orig 2005-06-13 18:05:51.000000000 +0900
-+++ scripts/Makefile.in 2005-06-13 18:07:08.000000000 +0900
-@@ -233,7 +233,7 @@
- -e 's,@sysconfdir\@,$(sysconfdir),g' \
- -e 's,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g'
+--- scripts/Makefile.in.orig 2006-11-05 11:08:43.000000000 +0000
++++ scripts/Makefile.in 2006-11-06 12:47:55.000000000 +0000
+@@ -239,7 +239,7 @@
+ -e 's,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g' \
+ -e 's,@TERMINAL_DEFAULT\@,@TERMINAL_DEFAULT@,g'
-conffilesdir = @sysconfdir@/xdg/xfce4
+conffilesdir = @datadir@/examples/xfce4
diff --git a/x11/xfce4-utils/patches/patch-ab b/x11/xfce4-utils/patches/patch-ab
deleted file mode 100644
index 31352f30591..00000000000
--- a/x11/xfce4-utils/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/03/20 06:29:09 martti Exp $
-
---- scripts/xinitrc.orig 2005-11-05 19:03:34.000000000 +0200
-+++ scripts/xinitrc 2006-03-20 06:20:23.000000000 +0200
-@@ -1,8 +1,17 @@
- #!/bin/sh
-
- # fix broken $UID on some system...
-+OPSYS=`uname -s`
-+case "$OPSYS" in
-+ *SunOS*)
-+ ID_EXEC=/usr/xpg4/bin/id
-+ ;;
-+ *)
-+ ID_EXEC=id
-+ ;;
-+esac
- if test "x$UID" = "x"; then
-- UID=`id -u`
-+ UID=`$ID_EXEC -u`
- fi
-
- # create temp file for X resources
diff --git a/x11/xfce4-utils/patches/patch-ac b/x11/xfce4-utils/patches/patch-ac
deleted file mode 100644
index c838e09147c..00000000000
--- a/x11/xfce4-utils/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/12/12 06:19:34 martti Exp $
-
---- xfce4-about/info.c.orig 2006-12-12 08:11:49.000000000 +0000
-+++ xfce4-about/info.c 2006-12-12 08:12:02.000000000 +0000
-@@ -140,7 +140,7 @@
- gchar *path;
- gchar *hfilename;
- gchar *buf;
-- int n;
-+ gsize n;
-
- err = NULL;
-