summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authormartti <martti>2007-04-12 09:55:08 +0000
committermartti <martti>2007-04-12 09:55:08 +0000
commit603f377b1c032d94686b00c402ab73e9e69e87e3 (patch)
treedf1647c213d3eed2c06db3ecc7e1e4a7031720db /sysutils
parent21a6598e7a9159559ddd511702d2dca068942fbe (diff)
downloadpkgsrc-603f377b1c032d94686b00c402ab73e9e69e87e3.tar.gz
Updated to Xfce 4.4.1
See http://www.xfce.org/documentation/changelogs/4.4.1 for details.
Diffstat (limited to 'sysutils')
-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
57 files changed, 203 insertions, 893 deletions
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);
-