summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/xfce4-mixer/Makefile4
-rw-r--r--audio/xfce4-mixer/PLIST3
-rw-r--r--audio/xfce4-mixer/buildlink3.mk4
-rw-r--r--audio/xfce4-mixer/distinfo10
-rw-r--r--audio/xfce4-mixer/patches/patch-ab16
-rw-r--r--graphics/xfce4-artwork/PLIST3
-rw-r--r--graphics/xfce4-icon-theme/Makefile4
-rw-r--r--graphics/xfce4-icon-theme/buildlink3.mk4
-rw-r--r--graphics/xfce4-icon-theme/distinfo8
-rw-r--r--graphics/xfce4-iconbox/Makefile4
-rw-r--r--graphics/xfce4-iconbox/PLIST3
-rw-r--r--graphics/xfce4-iconbox/buildlink3.mk4
-rw-r--r--graphics/xfce4-iconbox/distinfo8
-rw-r--r--meta-pkgs/xfce4-extras/Makefile4
-rw-r--r--meta-pkgs/xfce4/Makefile6
-rw-r--r--meta-pkgs/xfce4/Makefile.common8
-rw-r--r--meta-pkgs/xfce4/buildlink3.mk4
-rw-r--r--print/xfce4-print/Makefile4
-rw-r--r--print/xfce4-print/PLIST5
-rw-r--r--print/xfce4-print/buildlink3.mk4
-rw-r--r--print/xfce4-print/distinfo8
-rw-r--r--sysutils/xfce4-appfinder/Makefile4
-rw-r--r--sysutils/xfce4-appfinder/PLIST7
-rw-r--r--sysutils/xfce4-appfinder/buildlink3.mk4
-rw-r--r--sysutils/xfce4-appfinder/distinfo8
-rw-r--r--sysutils/xfce4-fm/Makefile4
-rw-r--r--sysutils/xfce4-fm/PLIST5
-rw-r--r--sysutils/xfce4-fm/buildlink3.mk4
-rw-r--r--sysutils/xfce4-fm/distinfo8
-rw-r--r--sysutils/xfce4-systray/Makefile4
-rw-r--r--sysutils/xfce4-systray/buildlink3.mk4
-rw-r--r--sysutils/xfce4-systray/distinfo8
-rw-r--r--time/xfce4-calendar/Makefile4
-rw-r--r--time/xfce4-calendar/PLIST3
-rw-r--r--time/xfce4-calendar/buildlink3.mk4
-rw-r--r--time/xfce4-calendar/distinfo8
-rw-r--r--wm/xfce4-wm-themes/Makefile4
-rw-r--r--wm/xfce4-wm-themes/PLIST7
-rw-r--r--wm/xfce4-wm-themes/buildlink3.mk4
-rw-r--r--wm/xfce4-wm-themes/distinfo8
-rw-r--r--wm/xfce4-wm/Makefile6
-rw-r--r--wm/xfce4-wm/PLIST7
-rw-r--r--wm/xfce4-wm/buildlink3.mk4
-rw-r--r--wm/xfce4-wm/distinfo8
-rw-r--r--x11/libxfce4gui/Makefile4
-rw-r--r--x11/libxfce4gui/PLIST29
-rw-r--r--x11/libxfce4gui/buildlink3.mk4
-rw-r--r--x11/libxfce4gui/distinfo8
-rw-r--r--x11/libxfce4mcs/Makefile4
-rw-r--r--x11/libxfce4mcs/PLIST14
-rw-r--r--x11/libxfce4mcs/buildlink3.mk4
-rw-r--r--x11/libxfce4mcs/distinfo8
-rw-r--r--x11/libxfce4util/Makefile6
-rw-r--r--x11/libxfce4util/PLIST27
-rw-r--r--x11/libxfce4util/buildlink3.mk4
-rw-r--r--x11/libxfce4util/distinfo10
-rw-r--r--x11/libxfce4util/patches/patch-aa10
-rw-r--r--x11/xfce3/PLIST5
-rw-r--r--x11/xfce4-desktop/Makefile3
-rw-r--r--x11/xfce4-desktop/PLIST7
-rw-r--r--x11/xfce4-desktop/buildlink3.mk4
-rw-r--r--x11/xfce4-desktop/distinfo12
-rw-r--r--x11/xfce4-desktop/patches/patch-aa8
-rw-r--r--x11/xfce4-desktop/patches/patch-ab8
-rw-r--r--x11/xfce4-gtk2-engine/Makefile6
-rw-r--r--x11/xfce4-gtk2-engine/buildlink3.mk4
-rw-r--r--x11/xfce4-gtk2-engine/distinfo8
-rw-r--r--x11/xfce4-mcs-manager/Makefile4
-rw-r--r--x11/xfce4-mcs-manager/PLIST8
-rw-r--r--x11/xfce4-mcs-manager/buildlink3.mk4
-rw-r--r--x11/xfce4-mcs-manager/distinfo8
-rw-r--r--x11/xfce4-mcs-plugins/Makefile4
-rw-r--r--x11/xfce4-mcs-plugins/PLIST3
-rw-r--r--x11/xfce4-mcs-plugins/buildlink3.mk4
-rw-r--r--x11/xfce4-mcs-plugins/distinfo8
-rw-r--r--x11/xfce4-panel/Makefile3
-rw-r--r--x11/xfce4-panel/PLIST3
-rw-r--r--x11/xfce4-panel/buildlink3.mk4
-rw-r--r--x11/xfce4-panel/distinfo10
-rw-r--r--x11/xfce4-panel/patches/patch-aa12
-rw-r--r--x11/xfce4-session/Makefile3
-rw-r--r--x11/xfce4-session/PLIST3
-rw-r--r--x11/xfce4-session/buildlink3.mk4
-rw-r--r--x11/xfce4-session/distinfo8
-rw-r--r--x11/xfce4-toys/Makefile4
-rw-r--r--x11/xfce4-toys/PLIST4
-rw-r--r--x11/xfce4-toys/buildlink3.mk4
-rw-r--r--x11/xfce4-toys/distinfo8
-rw-r--r--x11/xfce4-trigger-launcher/Makefile4
-rw-r--r--x11/xfce4-trigger-launcher/PLIST4
-rw-r--r--x11/xfce4-trigger-launcher/buildlink3.mk4
-rw-r--r--x11/xfce4-trigger-launcher/distinfo8
-rw-r--r--x11/xfce4-utils/Makefile4
-rw-r--r--x11/xfce4-utils/PLIST3
-rw-r--r--x11/xfce4-utils/buildlink3.mk4
-rw-r--r--x11/xfce4-utils/distinfo8
96 files changed, 273 insertions, 321 deletions
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 11ec68bff3a..44fa5cc9118 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2006/04/17 13:46:13 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/01/23 11:53:46 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-mixer-${XFCE4_VERSION}
-PKGREVISION= 4
+#PKGREVISION= 1
CATEGORIES= audio
COMMENT= Xfce mixer plugin
diff --git a/audio/xfce4-mixer/PLIST b/audio/xfce4-mixer/PLIST
index 31e33b06586..a5da2074e79 100644
--- a/audio/xfce4-mixer/PLIST
+++ b/audio/xfce4-mixer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/04/17 07:07:12 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/01/23 11:53:46 martti Exp $
bin/xfce4-mixer
lib/xfce4/mcs-plugins/sound_settings.la
lib/xfce4/modules/libxfce4mixer.la
@@ -46,6 +46,7 @@ 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
diff --git a/audio/xfce4-mixer/buildlink3.mk b/audio/xfce4-mixer/buildlink3.mk
index 84c9b6b5d53..c90895070f9 100644
--- a/audio/xfce4-mixer/buildlink3.mk
+++ b/audio/xfce4-mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/10/12 09:24:19 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:46 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_MIXER_BUILDLINK3_MK:= ${XFCE4_MIXER_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ 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.3nb4
+BUILDLINK_API_DEPENDS.xfce4-mixer+= xfce4-mixer>=4.2.4
BUILDLINK_PKGSRCDIR.xfce4-mixer?= ../../audio/xfce4-mixer
.endif # XFCE4_MIXER_BUILDLINK3_MK
diff --git a/audio/xfce4-mixer/distinfo b/audio/xfce4-mixer/distinfo
index 6a3c34944f6..5ad62f7bf22 100644
--- a/audio/xfce4-mixer/distinfo
+++ b/audio/xfce4-mixer/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2006/11/28 18:57:25 rillig Exp $
+$NetBSD: distinfo,v 1.14 2007/01/23 11:53:46 martti Exp $
-SHA1 (xfce4-mixer-4.2.3.tar.gz) = 80e0da399bf7cb9617f914b285f87266e9b1428f
-RMD160 (xfce4-mixer-4.2.3.tar.gz) = 00a98e28e6cdba183f860b453745097f73fe6c87
-Size (xfce4-mixer-4.2.3.tar.gz) = 614377 bytes
+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) = 37ab3665b42e64723f5b40b2a5e26f4d12b5f1a6
+SHA1 (patch-ab) = 52d3d875c335a55e00870385cc114af7265748dc
diff --git a/audio/xfce4-mixer/patches/patch-ab b/audio/xfce4-mixer/patches/patch-ab
index 49f04d35b9c..abb62294577 100644
--- a/audio/xfce4-mixer/patches/patch-ab
+++ b/audio/xfce4-mixer/patches/patch-ab
@@ -1,18 +1,18 @@
-$NetBSD: patch-ab,v 1.1 2006/11/28 18:57:25 rillig Exp $
+$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 2005-11-05 19:16:48.000000000 +0100
-+++ configure 2006-11-28 19:28:51.822140712 +0100
-@@ -23898,13 +23898,9 @@ echo $ECHO_N "checking whether the Xfce
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
+--- 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
+ { 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
diff --git a/graphics/xfce4-artwork/PLIST b/graphics/xfce4-artwork/PLIST
index b99a0504172..3876596fddf 100644
--- a/graphics/xfce4-artwork/PLIST
+++ b/graphics/xfce4-artwork/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2006/09/07 06:57:39 martti Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/01/23 11:53:46 martti Exp $
share/xfce4/backdrops/paltanen.jpg
share/xfce4/backdrops/xfce-evil.jpg
share/xfce4/backdrops/xfce-gradiented.png
share/xfce4/backdrops/xfce-rio.png
share/xfce4/backdrops/xfce-transparent.png
-@comment in xfce4-desktop: @dirrm share/xfce4/backdrops
diff --git a/graphics/xfce4-icon-theme/Makefile b/graphics/xfce4-icon-theme/Makefile
index 5d42e845794..5798b6d5091 100644
--- a/graphics/xfce4-icon-theme/Makefile
+++ b/graphics/xfce4-icon-theme/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:40 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/01/23 11:53:46 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-icon-theme-${XFCE4_VERSION}
-PKGREVISION= 1
+#PKGREVISION= 1
CATEGORIES= graphics
COMMENT= Xfce icon themes
diff --git a/graphics/xfce4-icon-theme/buildlink3.mk b/graphics/xfce4-icon-theme/buildlink3.mk
index b6333b277df..587fe8c9af6 100644
--- a/graphics/xfce4-icon-theme/buildlink3.mk
+++ b/graphics/xfce4-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/10/12 09:24:19 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/01/23 11:53:46 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_ICON_THEME_BUILDLINK3_MK:= ${XFCE4_ICON_THEME_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ 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.3nb1
+BUILDLINK_API_DEPENDS.xfce4-icon-theme+= xfce4-icon-theme>=4.2.4
BUILDLINK_PKGSRCDIR.xfce4-icon-theme?= ../../graphics/xfce4-icon-theme
.endif # XFCE4_ICON_THEME_BUILDLINK3_MK
diff --git a/graphics/xfce4-icon-theme/distinfo b/graphics/xfce4-icon-theme/distinfo
index b6abdaed4e0..8218d7719c3 100644
--- a/graphics/xfce4-icon-theme/distinfo
+++ b/graphics/xfce4-icon-theme/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/11/09 06:42:58 martti Exp $
+$NetBSD: distinfo,v 1.6 2007/01/23 11:53:46 martti Exp $
-SHA1 (xfce4-icon-theme-4.2.3.tar.gz) = 85e0abb949b3674478e5cac245f928c0d195695d
-RMD160 (xfce4-icon-theme-4.2.3.tar.gz) = c24cdfca8d0de5b431a42cd0669f94ba35a84b91
-Size (xfce4-icon-theme-4.2.3.tar.gz) = 1560798 bytes
+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
diff --git a/graphics/xfce4-iconbox/Makefile b/graphics/xfce4-iconbox/Makefile
index 8bb32bfbb24..e1219ecae98 100644
--- a/graphics/xfce4-iconbox/Makefile
+++ b/graphics/xfce4-iconbox/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2007/01/18 15:20:51 joerg Exp $
+# $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= 4
+#PKGREVISION= 1
CATEGORIES= graphics
COMMENT= Xfce icon displayer
diff --git a/graphics/xfce4-iconbox/PLIST b/graphics/xfce4-iconbox/PLIST
index 7a6ad15487b..e6d6319fc85 100644
--- a/graphics/xfce4-iconbox/PLIST
+++ b/graphics/xfce4-iconbox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/04/17 07:07:22 jlam Exp $
+@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
@@ -42,6 +42,7 @@ 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
diff --git a/graphics/xfce4-iconbox/buildlink3.mk b/graphics/xfce4-iconbox/buildlink3.mk
index 111afbed0ac..a9b93317c9f 100644
--- a/graphics/xfce4-iconbox/buildlink3.mk
+++ b/graphics/xfce4-iconbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/10/12 09:24:19 martti Exp $
+# $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}+
@@ -12,7 +12,7 @@ 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.3nb4
+BUILDLINK_API_DEPENDS.xfce4-iconbox+= xfce4-iconbox>=4.2.4
BUILDLINK_PKGSRCDIR.xfce4-iconbox?= ../../graphics/xfce4-iconbox
.endif # XFCE4_ICONBOX_BUILDLINK3_MK
diff --git a/graphics/xfce4-iconbox/distinfo b/graphics/xfce4-iconbox/distinfo
index ca832cd0a65..64d1da8f54c 100644
--- a/graphics/xfce4-iconbox/distinfo
+++ b/graphics/xfce4-iconbox/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2005/11/09 06:42:58 martti Exp $
+$NetBSD: distinfo,v 1.13 2007/01/23 11:53:46 martti Exp $
-SHA1 (xfce4-iconbox-4.2.3.tar.gz) = fb4a76a4b565c2e4a8b07612b7a3313e6175494b
-RMD160 (xfce4-iconbox-4.2.3.tar.gz) = 43dfe64ca5ee56c80e533273f69dd9de241e6b2b
-Size (xfce4-iconbox-4.2.3.tar.gz) = 424341 bytes
+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 8e9485fda4f..0bc0f723e45 100644
--- a/meta-pkgs/xfce4-extras/Makefile
+++ b/meta-pkgs/xfce4-extras/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2006/04/17 13:46:39 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/01/23 11:53:46 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-extras-${XFCE4_VERSION}
DISTFILES= # empty
-PKGREVISION= 3
+#PKGREVISION= 1
CATEGORIES= meta-pkgs
COMMENT= Xfce extras
diff --git a/meta-pkgs/xfce4/Makefile b/meta-pkgs/xfce4/Makefile
index 63a0f67447b..db2463060d1 100644
--- a/meta-pkgs/xfce4/Makefile
+++ b/meta-pkgs/xfce4/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.24 2006/04/17 13:46:07 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2007/01/23 11:53:46 martti Exp $
.include "Makefile.common"
-XFCE4_VERSION= 4.2.3.2
+XFCE4_VERSION= 4.2.4
DISTNAME= xfce4-${XFCE4_VERSION}
DISTFILES= # empty
-PKGREVISION= 3
+#PKGREVISION= 1
CATEGORIES= meta-pkgs
COMMENT= Xfce
diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common
index 2213e19a88e..884caa7b97c 100644
--- a/meta-pkgs/xfce4/Makefile.common
+++ b/meta-pkgs/xfce4/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.31 2006/06/20 12:25:51 joerg Exp $
+# $NetBSD: Makefile.common,v 1.32 2007/01/23 11:53:46 martti Exp $
-MASTER_SITES= http://www.xfce.org/archive/xfce-4.2.3.2/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.2.3.2/src/
+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/
MAINTAINER= martti@NetBSD.org
HOMEPAGE= http://www.xfce.org/
-XFCE4_VERSION= 4.2.3
+XFCE4_VERSION= 4.2.4
# Do NOT put a PKGREVISION statement in this file!
diff --git a/meta-pkgs/xfce4/buildlink3.mk b/meta-pkgs/xfce4/buildlink3.mk
index d8ec66e8d62..cd3b6d9735f 100644
--- a/meta-pkgs/xfce4/buildlink3.mk
+++ b/meta-pkgs/xfce4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/10/12 09:24:19 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2007/01/23 11:53:46 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_BUILDLINK3_MK:= ${XFCE4_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= xfce4
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4
.if ${XFCE4_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4+= xfce4>=4.2.3.2nb3
+BUILDLINK_API_DEPENDS.xfce4+= xfce4>=4.2.4
BUILDLINK_PKGSRCDIR.xfce4?= ../../meta-pkgs/xfce4
.endif # XFCE4_BUILDLINK3_MK
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 6bc4f7d4774..f5c1d9a569f 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2006/04/17 13:46:07 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/01/23 11:53:46 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
PKGNAME= xfce4-print-${XFCE4_VERSION}
DISTNAME= xfprint-${XFCE4_VERSION}
-PKGREVISION= 4
+#PKGREVISION= 1
CATEGORIES= print
COMMENT= Xfce print dialog
diff --git a/print/xfce4-print/PLIST b/print/xfce4-print/PLIST
index ef98c3ae578..20452773f3c 100644
--- a/print/xfce4-print/PLIST
+++ b/print/xfce4-print/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.14 2006/04/17 07:07:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/01/23 11:53:46 martti Exp $
+${SOLARIS}lib/xfce4/xfprint-plugins/bsdlpr_plugin.la
bin/xfprint-manager
bin/xfprint4
lib/xfce4/mcs-plugins/xfprint_plugin.la
-${SOLARIS}lib/xfce4/xfprint-plugins/bsdlpr_plugin.la
share/applications/xfce-xfprint-settings.desktop
share/applications/xfprint-manager.desktop
share/applications/xfprint.desktop
@@ -46,6 +46,7 @@ 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
diff --git a/print/xfce4-print/buildlink3.mk b/print/xfce4-print/buildlink3.mk
index f059609bcd5..ca3154d8714 100644
--- a/print/xfce4-print/buildlink3.mk
+++ b/print/xfce4-print/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/10/12 09:24:19 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:46 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_PRINT_BUILDLINK3_MK:= ${XFCE4_PRINT_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ 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.3nb4
+BUILDLINK_API_DEPENDS.xfce4-print+= xfce4-print>=4.2.4
BUILDLINK_PKGSRCDIR.xfce4-print?= ../../print/xfce4-print
.endif # XFCE4_PRINT_BUILDLINK3_MK
diff --git a/print/xfce4-print/distinfo b/print/xfce4-print/distinfo
index 018877ffdbb..98ec8dda9e0 100644
--- a/print/xfce4-print/distinfo
+++ b/print/xfce4-print/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2005/11/09 06:42:58 martti Exp $
+$NetBSD: distinfo,v 1.14 2007/01/23 11:53:46 martti Exp $
-SHA1 (xfprint-4.2.3.tar.gz) = c4f0c16904bdc8ca179e221094d0466b03b5fa29
-RMD160 (xfprint-4.2.3.tar.gz) = f180d68148b989fcda6252053c9a277dbe78d01b
-Size (xfprint-4.2.3.tar.gz) = 1169874 bytes
+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
diff --git a/sysutils/xfce4-appfinder/Makefile b/sysutils/xfce4-appfinder/Makefile
index 17e762c0937..e3f4ec66c68 100644
--- a/sysutils/xfce4-appfinder/Makefile
+++ b/sysutils/xfce4-appfinder/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2006/04/17 13:46:12 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/01/23 11:53:46 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-appfinder-${XFCE4_VERSION}
-PKGREVISION= 3
+#PKGREVISION= 1
CATEGORIES= sysutils
COMMENT= Xfce application finder
diff --git a/sysutils/xfce4-appfinder/PLIST b/sysutils/xfce4-appfinder/PLIST
index 45482dee27e..fb567969dee 100644
--- a/sysutils/xfce4-appfinder/PLIST
+++ b/sysutils/xfce4-appfinder/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/04/17 07:07:35 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/01/23 11:53:46 martti Exp $
bin/xfce4-appfinder
share/applications/xfce4-appfinder.desktop
share/locale/af/LC_MESSAGES/xfce4-appfinder.mo
@@ -35,6 +35,7 @@ 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
@@ -53,10 +54,10 @@ 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/C/images 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/xfce4/doc/C 2>/dev/null || ${TRUE}
@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 eb04b245f72..2ba135dfb48 100644
--- a/sysutils/xfce4-appfinder/buildlink3.mk
+++ b/sysutils/xfce4-appfinder/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/01/23 11:53:46 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_APPFINDER_BUILDLINK3_MK:= ${XFCE4_APPFINDER_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ 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.3nb3
+BUILDLINK_API_DEPENDS.xfce4-appfinder+= xfce4-appfinder>=4.2.4
BUILDLINK_PKGSRCDIR.xfce4-appfinder?= ../../sysutils/xfce4-appfinder
.endif # XFCE4_APPFINDER_BUILDLINK3_MK
diff --git a/sysutils/xfce4-appfinder/distinfo b/sysutils/xfce4-appfinder/distinfo
index c839caf0380..74f1bed1913 100644
--- a/sysutils/xfce4-appfinder/distinfo
+++ b/sysutils/xfce4-appfinder/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/11/09 06:42:58 martti Exp $
+$NetBSD: distinfo,v 1.6 2007/01/23 11:53:46 martti Exp $
-SHA1 (xfce4-appfinder-4.2.3.tar.gz) = 327e657a06d2fa2ecd62f8407dd6b4cc3dab2878
-RMD160 (xfce4-appfinder-4.2.3.tar.gz) = 3508de451d0559b45ff0610302ee6d02a4f44012
-Size (xfce4-appfinder-4.2.3.tar.gz) = 691872 bytes
+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
diff --git a/sysutils/xfce4-fm/Makefile b/sysutils/xfce4-fm/Makefile
index 09ce99eda56..edb5869897a 100644
--- a/sysutils/xfce4-fm/Makefile
+++ b/sysutils/xfce4-fm/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2007/01/18 15:20:45 joerg Exp $
+# $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= 4
+#PKGREVISION= 1
CATEGORIES= sysutils
COMMENT= Xfce filemanager
diff --git a/sysutils/xfce4-fm/PLIST b/sysutils/xfce4-fm/PLIST
index 39fe2fe12fd..6b681053f46 100644
--- a/sysutils/xfce4-fm/PLIST
+++ b/sysutils/xfce4-fm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/04/17 07:07:35 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/01/23 11:53:46 martti Exp $
bin/fgr
bin/scramble
bin/xfbook
@@ -175,6 +175,7 @@ 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
@@ -289,6 +290,6 @@ 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}
@unexec ${RMDIR} %D/share/icons/hicolor/48x48/stock 2>/dev/null || ${TRUE}
-@dirrm lib/xfce4/xffm
diff --git a/sysutils/xfce4-fm/buildlink3.mk b/sysutils/xfce4-fm/buildlink3.mk
index 7148b65e61b..c144b55b11a 100644
--- a/sysutils/xfce4-fm/buildlink3.mk
+++ b/sysutils/xfce4-fm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/10/12 09:24:19 martti Exp $
+# $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}+
@@ -12,7 +12,7 @@ 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.3nb4
+BUILDLINK_API_DEPENDS.xfce4-fm+= xfce4-fm>=4.2.4
BUILDLINK_PKGSRCDIR.xfce4-fm?= ../../sysutils/xfce4-fm
.endif # XFCE4_FM_BUILDLINK3_MK
diff --git a/sysutils/xfce4-fm/distinfo b/sysutils/xfce4-fm/distinfo
index bc81bc57c75..f6caf6b09a6 100644
--- a/sysutils/xfce4-fm/distinfo
+++ b/sysutils/xfce4-fm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2006/11/28 20:11:07 rillig Exp $
+$NetBSD: distinfo,v 1.15 2007/01/23 11:53:46 martti Exp $
-SHA1 (xffm-4.2.3.tar.gz) = f1d4ddd9377c241ee94bc373d7f9b8ef58a79ca2
-RMD160 (xffm-4.2.3.tar.gz) = 6de5cca2375c364b86d82ec3701db61248d72c66
-Size (xffm-4.2.3.tar.gz) = 5117799 bytes
+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-systray/Makefile b/sysutils/xfce4-systray/Makefile
index 4ff0a6b2aee..b463474602a 100644
--- a/sysutils/xfce4-systray/Makefile
+++ b/sysutils/xfce4-systray/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2006/04/17 13:46:13 wiz Exp $
+# $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= 3
+#PKGREVISION= 1
CATEGORIES= sysutils
COMMENT= Xfce systray plugin
diff --git a/sysutils/xfce4-systray/buildlink3.mk b/sysutils/xfce4-systray/buildlink3.mk
index 91d1fdd5f55..e6e257c441f 100644
--- a/sysutils/xfce4-systray/buildlink3.mk
+++ b/sysutils/xfce4-systray/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/10/12 09:24:20 martti Exp $
+# $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}+
@@ -12,7 +12,7 @@ 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.3nb3
+BUILDLINK_API_DEPENDS.xfce4-systray+= xfce4-systray>=4.2.4
BUILDLINK_PKGSRCDIR.xfce4-systray?= ../../sysutils/xfce4-systray
.endif # XFCE4_SYSTRAY_BUILDLINK3_MK
diff --git a/sysutils/xfce4-systray/distinfo b/sysutils/xfce4-systray/distinfo
index b375fd56908..5e5ee78b474 100644
--- a/sysutils/xfce4-systray/distinfo
+++ b/sysutils/xfce4-systray/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2005/11/09 06:42:58 martti Exp $
+$NetBSD: distinfo,v 1.13 2007/01/23 11:53:46 martti Exp $
-SHA1 (xfce4-systray-4.2.3.tar.gz) = 497fb0c2610951338d7d1a9d28ac7ca6eb6a82c2
-RMD160 (xfce4-systray-4.2.3.tar.gz) = 8726092716ddf76d2e79c107ca13f4e9aeafb90c
-Size (xfce4-systray-4.2.3.tar.gz) = 320138 bytes
+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/time/xfce4-calendar/Makefile b/time/xfce4-calendar/Makefile
index 20f39e841fb..5414cac2232 100644
--- a/time/xfce4-calendar/Makefile
+++ b/time/xfce4-calendar/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2006/04/17 13:46:12 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/01/23 11:53:46 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfcalendar-${XFCE4_VERSION}
PKGNAME= xfce4-calendar-${XFCE4_VERSION}
-PKGREVISION= 4
+#PKGREVISION= 1
CATEGORIES= time
COMMENT= Xfce calendar
diff --git a/time/xfce4-calendar/PLIST b/time/xfce4-calendar/PLIST
index c1d8058cf20..d8662ea6cca 100644
--- a/time/xfce4-calendar/PLIST
+++ b/time/xfce4-calendar/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/17 07:07:36 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/01/23 11:53:46 martti Exp $
bin/xfcalendar
lib/xfce4/mcs-plugins/xfcalendar_plugin.la
share/applications/xfcalendar.desktop
@@ -46,6 +46,7 @@ share/locale/ro/LC_MESSAGES/xfcalendar.mo
share/locale/ru/LC_MESSAGES/xfcalendar.mo
share/locale/sk/LC_MESSAGES/xfcalendar.mo
share/locale/sl/LC_MESSAGES/xfcalendar.mo
+share/locale/sq/LC_MESSAGES/xfcalendar.mo
share/locale/sv/LC_MESSAGES/xfcalendar.mo
share/locale/ta/LC_MESSAGES/xfcalendar.mo
share/locale/tr/LC_MESSAGES/xfcalendar.mo
diff --git a/time/xfce4-calendar/buildlink3.mk b/time/xfce4-calendar/buildlink3.mk
index e82ccd6f437..7efd53b5f39 100644
--- a/time/xfce4-calendar/buildlink3.mk
+++ b/time/xfce4-calendar/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/01/23 11:53:46 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_CALENDAR_BUILDLINK3_MK:= ${XFCE4_CALENDAR_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= xfce4-calendar
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-calendar
.if ${XFCE4_CALENDAR_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-calendar+= xfce4-calendar>=4.2.3nb4
+BUILDLINK_API_DEPENDS.xfce4-calendar+= xfce4-calendar>=4.2.4
BUILDLINK_PKGSRCDIR.xfce4-calendar?= ../../time/xfce4-calendar
.endif # XFCE4_CALENDAR_BUILDLINK3_MK
diff --git a/time/xfce4-calendar/distinfo b/time/xfce4-calendar/distinfo
index ea40558ab2a..210eecc2ffa 100644
--- a/time/xfce4-calendar/distinfo
+++ b/time/xfce4-calendar/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/11/09 06:42:58 martti Exp $
+$NetBSD: distinfo,v 1.6 2007/01/23 11:53:46 martti Exp $
-SHA1 (xfcalendar-4.2.3.tar.gz) = 1bded81eb8370aaf36ed97b8119672936a514a16
-RMD160 (xfcalendar-4.2.3.tar.gz) = fefc30b9d9f3dbfd0852a4b0f9166b563e300d52
-Size (xfcalendar-4.2.3.tar.gz) = 470490 bytes
+SHA1 (xfcalendar-4.2.4.tar.gz) = a5137ea65f142c07bdb9a3af0de62b2171230480
+RMD160 (xfcalendar-4.2.4.tar.gz) = 329004035122debd947c1ea591ed65338b6ab810
+Size (xfcalendar-4.2.4.tar.gz) = 481712 bytes
diff --git a/wm/xfce4-wm-themes/Makefile b/wm/xfce4-wm-themes/Makefile
index 32f24907e27..465cde5762c 100644
--- a/wm/xfce4-wm-themes/Makefile
+++ b/wm/xfce4-wm-themes/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2006/05/02 10:42:33 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2007/01/23 11:53:47 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfwm4-themes-${XFCE4_VERSION}
PKGNAME= xfce4-wm-themes-${XFCE4_VERSION}
-PKGREVISION= 3
+#PKGREVISION= 1
CATEGORIES= wm
COMMENT= Xfce window manager themes
diff --git a/wm/xfce4-wm-themes/PLIST b/wm/xfce4-wm-themes/PLIST
index 1dc2dc21e6d..01bae4981c7 100644
--- a/wm/xfce4-wm-themes/PLIST
+++ b/wm/xfce4-wm-themes/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/05/02 10:42:34 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/01/23 11:53:47 martti Exp $
share/themes/Adept/xfwm4/README
share/themes/Adept/xfwm4/bottom-active.xpm
share/themes/Adept/xfwm4/bottom-inactive.xpm
@@ -3670,7 +3670,6 @@ 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
@@ -3706,7 +3705,6 @@ 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
@@ -3756,7 +3754,6 @@ 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
@@ -3780,7 +3777,6 @@ 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
@@ -3789,5 +3785,4 @@ share/themes/Xfce/xfwm4/top-right-inactive.xpm
@dirrm share/themes/Agua
@dirrm share/themes/Adept/xfwm4
@dirrm share/themes/Adept
-@comment in xdg-dirs: @dirrm share/themes
@unexec ${RMDIR} %D/share/themes/Xfce 2>/dev/null || ${TRUE}
diff --git a/wm/xfce4-wm-themes/buildlink3.mk b/wm/xfce4-wm-themes/buildlink3.mk
index 7b63c124290..c67686a0b3b 100644
--- a/wm/xfce4-wm-themes/buildlink3.mk
+++ b/wm/xfce4-wm-themes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/10/12 09:24:20 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2007/01/23 11:53:47 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_WM_THEMES_BUILDLINK3_MK:= ${XFCE4_WM_THEMES_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ 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.3nb3
+BUILDLINK_API_DEPENDS.xfce4-wm-themes+= xfce4-wm-themes>=4.2.4
BUILDLINK_PKGSRCDIR.xfce4-wm-themes?= ../../wm/xfce4-wm-themes
.endif # XFCE4_WM_THEMES_BUILDLINK3_MK
diff --git a/wm/xfce4-wm-themes/distinfo b/wm/xfce4-wm-themes/distinfo
index a7d4c001bab..167f3c43e48 100644
--- a/wm/xfce4-wm-themes/distinfo
+++ b/wm/xfce4-wm-themes/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2005/11/09 06:42:58 martti Exp $
+$NetBSD: distinfo,v 1.12 2007/01/23 11:53:47 martti Exp $
-SHA1 (xfwm4-themes-4.2.3.tar.gz) = cf943450209ba5a86e6cc4504441483a1feeec5e
-RMD160 (xfwm4-themes-4.2.3.tar.gz) = 4357b811d03d82f19c7e6a1f854d2335f062bc0e
-Size (xfwm4-themes-4.2.3.tar.gz) = 880645 bytes
+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
diff --git a/wm/xfce4-wm/Makefile b/wm/xfce4-wm/Makefile
index 2a2f0966bf3..20f13ce3c55 100644
--- a/wm/xfce4-wm/Makefile
+++ b/wm/xfce4-wm/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2007/01/18 15:53:58 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2007/01/23 11:53:46 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 4.2.3.2
-
DISTNAME= xfwm4-${XFCE4_VERSION}
PKGNAME= xfce4-wm-${XFCE4_VERSION}
-PKGREVISION= 4
+#PKGREVISION= 1
CATEGORIES= wm
COMMENT= Xfce window manager
diff --git a/wm/xfce4-wm/PLIST b/wm/xfce4-wm/PLIST
index 87b7e91227e..a675fcc5e6e 100644
--- a/wm/xfce4-wm/PLIST
+++ b/wm/xfce4-wm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/04/17 07:07:37 jlam Exp $
+@comment $NetBSD: PLIST,v 1.13 2007/01/23 11:53:46 martti Exp $
bin/xfwm4
lib/xfce4/mcs-plugins/workspaces_plugin.la
lib/xfce4/mcs-plugins/xfwm4_plugin.la
@@ -49,6 +49,7 @@ 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
@@ -722,6 +723,7 @@ share/xfce4/doc/he/images/workspace_margins.png
share/xfce4/doc/he/images/xfwm_workspaces.png
share/xfce4/doc/he/xfwm4.html
share/xfwm4/defaults
+@dirrm share/xfwm4
@dirrm share/themes/Wildbush/xfwm4
@dirrm share/themes/Wildbush
@dirrm share/themes/Waza/xfwm4
@@ -734,8 +736,7 @@ share/xfwm4/defaults
@dirrm share/themes/Symphony
@dirrm share/themes/Opta/xfwm4
@dirrm share/themes/Opta
+@dirrm share/themes/Default/xfwm4
@dirrm share/themes/Default-4.0/xfwm4
@dirrm share/themes/Default-4.0
-@dirrm share/themes/Default/xfwm4
-@dirrm share/xfwm4
@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 b8dd18bda65..4816d62a502 100644
--- a/wm/xfce4-wm/buildlink3.mk
+++ b/wm/xfce4-wm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2006/12/15 20:33:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2007/01/23 11:53:46 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.3.2nb4
+BUILDLINK_API_DEPENDS.xfce4-wm+= xfce4-wm>=4.2.4
BUILDLINK_PKGSRCDIR.xfce4-wm?= ../../wm/xfce4-wm
.endif # XFCE4_WM_BUILDLINK3_MK
diff --git a/wm/xfce4-wm/distinfo b/wm/xfce4-wm/distinfo
index 21eed01b907..920eb212d31 100644
--- a/wm/xfce4-wm/distinfo
+++ b/wm/xfce4-wm/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2005/11/17 08:16:19 martti Exp $
+$NetBSD: distinfo,v 1.15 2007/01/23 11:53:46 martti Exp $
-SHA1 (xfwm4-4.2.3.2.tar.gz) = 7bea1f749077c7aa902da69c8711dff16933dae2
-RMD160 (xfwm4-4.2.3.2.tar.gz) = ed47f8800d400a521d65c2a6c9828071eea72f71
-Size (xfwm4-4.2.3.2.tar.gz) = 1759179 bytes
+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
diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile
index 7a9111ad825..0594503487c 100644
--- a/x11/libxfce4gui/Makefile
+++ b/x11/libxfce4gui/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2007/01/15 21:35:47 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2007/01/23 11:53:47 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= libxfcegui4-${XFCE4_VERSION}
PKGNAME= libxfce4gui-${XFCE4_VERSION}
-PKGREVISION= 4
+#PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce widget library
diff --git a/x11/libxfce4gui/PLIST b/x11/libxfce4gui/PLIST
index de596bc8f8a..752beb4bc57 100644
--- a/x11/libxfce4gui/PLIST
+++ b/x11/libxfce4gui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2006/08/11 09:43:09 drochner Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/01/23 11:53:47 martti Exp $
include/xfce4/libxfcegui4/dialogs.h
include/xfce4/libxfcegui4/gtk_style.h
include/xfce4/libxfcegui4/gtktoxevent.h
@@ -50,27 +50,6 @@ 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/gtk-doc/html/libxfcegui4/XfceAboutDialog.html
-share/gtk-doc/html/libxfcegui4/XfceAppMenuItem.html
-share/gtk-doc/html/libxfcegui4/XfceFramebox.html
-share/gtk-doc/html/libxfcegui4/XfceIconTheme.html
-share/gtk-doc/html/libxfcegui4/home.png
-share/gtk-doc/html/libxfcegui4/index.html
-share/gtk-doc/html/libxfcegui4/index.sgml
-share/gtk-doc/html/libxfcegui4/left.png
-share/gtk-doc/html/libxfcegui4/libxfcegui4-Standard-Macros.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gdk-extensions.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gtk+-extensions.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4-XfceFileChooser.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4-core.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4-dialogs.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4-fundamentals.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4-netk.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4-xfce-exec.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp
-share/gtk-doc/html/libxfcegui4/reference.html
-share/gtk-doc/html/libxfcegui4/right.png
-share/gtk-doc/html/libxfcegui4/up.png
share/locale/af/LC_MESSAGES/libxfcegui4.mo
share/locale/be/LC_MESSAGES/libxfcegui4.mo
share/locale/bn_IN/LC_MESSAGES/libxfcegui4.mo
@@ -105,6 +84,7 @@ 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/uk/LC_MESSAGES/libxfcegui4.mo
@@ -118,9 +98,8 @@ share/xfce4/mime/hicolor.mime.xml
share/xfce4/mime/types.xml
share/xfce4/mime/xfce.org.xml
share/xfce4/xfce-svg-test.svg
-@dirrm include/xfce4/xfce4-modules
-@dirrm include/xfce4/libxfcegui4
@dirrm lib/xfce4/modules
@dirrm lib/xfce4
-@dirrm share/gtk-doc/html/libxfcegui4
+@dirrm include/xfce4/xfce4-modules
+@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 e6e9361dc68..bdb00cac790 100644
--- a/x11/libxfce4gui/buildlink3.mk
+++ b/x11/libxfce4gui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2007/01/16 20:19:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2007/01/23 11:53:47 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXFCE4GUI_BUILDLINK3_MK:= ${LIBXFCE4GUI_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= libxfce4gui
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4gui
.if ${LIBXFCE4GUI_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.2.3nb4
+BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.2.4
BUILDLINK_PKGSRCDIR.libxfce4gui?= ../../x11/libxfce4gui
.endif # LIBXFCE4GUI_BUILDLINK3_MK
diff --git a/x11/libxfce4gui/distinfo b/x11/libxfce4gui/distinfo
index 43a831ce02e..8527db1b0d1 100644
--- a/x11/libxfce4gui/distinfo
+++ b/x11/libxfce4gui/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2005/11/09 06:42:58 martti Exp $
+$NetBSD: distinfo,v 1.14 2007/01/23 11:53:47 martti Exp $
-SHA1 (libxfcegui4-4.2.3.tar.gz) = 17d14bd1d63cfc46e4571b6e1b7f2c42c9367984
-RMD160 (libxfcegui4-4.2.3.tar.gz) = 933de62c849ab9836dd5170440919fa2aa3a01f0
-Size (libxfcegui4-4.2.3.tar.gz) = 883443 bytes
+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
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index ba034aebfdb..1d9a734eddd 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2007/01/15 21:32:40 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/23 11:53:47 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= libxfce4mcs-${XFCE4_VERSION}
-PKGREVISION= 2
+#PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce settings management library
diff --git a/x11/libxfce4mcs/PLIST b/x11/libxfce4mcs/PLIST
index 5e3319cb9a0..a18c70453b5 100644
--- a/x11/libxfce4mcs/PLIST
+++ b/x11/libxfce4mcs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/08/11 09:43:09 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/01/23 11:53:47 martti Exp $
include/xfce4/libxfce4mcs/mcs-client-enum-types.h
include/xfce4/libxfce4mcs/mcs-client.h
include/xfce4/libxfce4mcs/mcs-common.h
@@ -7,16 +7,4 @@ lib/libxfce4mcs-client.la
lib/libxfce4mcs-manager.la
lib/pkgconfig/libxfce4mcs-client-1.0.pc
lib/pkgconfig/libxfce4mcs-manager-1.0.pc
-share/gtk-doc/html/libxfce4mcs/ch01.html
-share/gtk-doc/html/libxfce4mcs/home.png
-share/gtk-doc/html/libxfce4mcs/index.html
-share/gtk-doc/html/libxfce4mcs/index.sgml
-share/gtk-doc/html/libxfce4mcs/left.png
-share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-client.html
-share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-common.html
-share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-manager.html
-share/gtk-doc/html/libxfce4mcs/libxfce4mcs.devhelp
-share/gtk-doc/html/libxfce4mcs/right.png
-share/gtk-doc/html/libxfce4mcs/up.png
-@dirrm share/gtk-doc/html/libxfce4mcs
@dirrm include/xfce4/libxfce4mcs
diff --git a/x11/libxfce4mcs/buildlink3.mk b/x11/libxfce4mcs/buildlink3.mk
index a81364f8d3b..cd1d33f8f10 100644
--- a/x11/libxfce4mcs/buildlink3.mk
+++ b/x11/libxfce4mcs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2007/01/16 20:19:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:47 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXFCE4MCS_BUILDLINK3_MK:= ${LIBXFCE4MCS_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= libxfce4mcs
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4mcs
.if ${LIBXFCE4MCS_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libxfce4mcs+= libxfce4mcs>=4.2.3nb2
+BUILDLINK_API_DEPENDS.libxfce4mcs+= libxfce4mcs>=4.2.4
BUILDLINK_PKGSRCDIR.libxfce4mcs?= ../../x11/libxfce4mcs
.endif # LIBXFCE4MCS_BUILDLINK3_MK
diff --git a/x11/libxfce4mcs/distinfo b/x11/libxfce4mcs/distinfo
index 445e9e89a65..16d947f2cb5 100644
--- a/x11/libxfce4mcs/distinfo
+++ b/x11/libxfce4mcs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2005/11/09 06:42:59 martti Exp $
+$NetBSD: distinfo,v 1.13 2007/01/23 11:53:47 martti Exp $
-SHA1 (libxfce4mcs-4.2.3.tar.gz) = e7e926cbc319a893d53c5dabed5f0651acb20f6e
-RMD160 (libxfce4mcs-4.2.3.tar.gz) = 874477982f4715079aace775b178e76352198443
-Size (libxfce4mcs-4.2.3.tar.gz) = 384594 bytes
+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
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index e819973bb85..c33a2212007 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2006/08/11 09:43:09 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/23 11:53:47 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 4.2.3.2
+XFCE4_VERSION= 4.2.4
DISTNAME= libxfce4util-${XFCE4_VERSION}
-PKGREVISION= 2
+#PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce basic library
diff --git a/x11/libxfce4util/PLIST b/x11/libxfce4util/PLIST
index c55ab719df6..becd89f163a 100644
--- a/x11/libxfce4util/PLIST
+++ b/x11/libxfce4util/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/08/11 09:43:09 drochner Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/01/23 11:53:47 martti Exp $
include/xfce4/libxfce4util/debug.h
include/xfce4/libxfce4util/i18n.h
include/xfce4/libxfce4util/libxfce4util-config.h
@@ -16,34 +16,11 @@ include/xfce4/libxfce4util/xfce-resource.h
lib/libxfce4util.la
lib/pkgconfig/libxfce4util-1.0.pc
sbin/xfce4-kiosk-query
-share/gtk-doc/html/libxfce4util/home.png
-share/gtk-doc/html/libxfce4util/index.html
-share/gtk-doc/html/libxfce4util/index.sgml
-share/gtk-doc/html/libxfce4util/left.png
-share/gtk-doc/html/libxfce4util/libxfce4util-Desktop-entries.html
-share/gtk-doc/html/libxfce4util/libxfce4util-File-Utilities.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Internationalisation.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Resource-Config-File-Support.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Standard-Macros.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Generics.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html
-share/gtk-doc/html/libxfce4util/libxfce4util-core.html
-share/gtk-doc/html/libxfce4util/libxfce4util-datatypes.html
-share/gtk-doc/html/libxfce4util/libxfce4util-fundamentals.html
-share/gtk-doc/html/libxfce4util/libxfce4util-utilities.html
-share/gtk-doc/html/libxfce4util/libxfce4util.devhelp
-share/gtk-doc/html/libxfce4util/reference.html
-share/gtk-doc/html/libxfce4util/right.png
-share/gtk-doc/html/libxfce4util/up.png
share/xfce4/m4/X11.m4
share/xfce4/m4/debug.m4
share/xfce4/m4/depends.m4
share/xfce4/m4/i18n.m4
+@dirrm share/xfce4/m4
@dirrm include/xfce4/libxfce4util
@dirrm include/xfce4
-@dirrm share/xfce4/m4
-@dirrm share/gtk-doc/html/libxfce4util
@unexec ${RMDIR} %D/share/xfce4 2>/dev/null || ${TRUE}
diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk
index 1e70f72b71f..95d8d066ba6 100644
--- a/x11/libxfce4util/buildlink3.mk
+++ b/x11/libxfce4util/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/10/12 09:24:20 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2007/01/23 11:53:47 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXFCE4UTIL_BUILDLINK3_MK:= ${LIBXFCE4UTIL_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= libxfce4util
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4util
.if ${LIBXFCE4UTIL_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libxfce4util+= libxfce4util>=4.2.3.2nb2
+BUILDLINK_API_DEPENDS.libxfce4util+= libxfce4util>=4.2.4
BUILDLINK_PKGSRCDIR.libxfce4util?= ../../x11/libxfce4util
.endif # LIBXFCE4UTIL_BUILDLINK3_MK
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index 70bf6624e91..41763dc0d0b 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2006/11/28 19:20:34 rillig Exp $
+$NetBSD: distinfo,v 1.16 2007/01/23 11:53:47 martti Exp $
-SHA1 (libxfce4util-4.2.3.2.tar.gz) = b214a3fe7c2f65fd95874202fee59dae942fb60f
-RMD160 (libxfce4util-4.2.3.2.tar.gz) = 911f30b2bc7ea03fca324a1b3a88cf68da062acd
-Size (libxfce4util-4.2.3.2.tar.gz) = 469106 bytes
-SHA1 (patch-aa) = 3d2614faf06aef7885c335a78310561c67592326
+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
diff --git a/x11/libxfce4util/patches/patch-aa b/x11/libxfce4util/patches/patch-aa
index 985734272b9..750229168cc 100644
--- a/x11/libxfce4util/patches/patch-aa
+++ b/x11/libxfce4util/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.3 2006/11/28 19:20:34 rillig Exp $
+$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 2005-11-15 12:59:47.000000000 +0100
-+++ libxfce4util/xfce-miscutils.h 2006-11-28 20:11:55.609975108 +0100
+--- 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>
@@ -20,5 +20,5 @@ No, it's not ok. Except for GNU C.
+
+#define _BUILTIN_LICENSE_TEXT(name) xfce_builtin_license_##name
- #define XFCE_LICENSE_BSD _BUILTIN_LICENSE_TEXT(BSD)
-
+ #if defined (__sun)
+ extern const char xfce_builtin_license_BSD[];
diff --git a/x11/xfce3/PLIST b/x11/xfce3/PLIST
index 72ca0dbb687..6f99126a60e 100644
--- a/x11/xfce3/PLIST
+++ b/x11/xfce3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/17 07:07:49 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/01/23 11:53:47 martti Exp $
bin/CDE2Xfcepal
bin/glob
bin/startxfce
@@ -673,10 +673,7 @@ share/xfce/textures/stripe.xpm
@dirrm share/xfce/help/html/stylesheet-images
@dirrm share/xfce/help/html
@dirrm share/xfce/help
-@comment in REQD_DIRS: @dirrm share/xfce/fonts
-@comment in REQD_DIRS: @dirrm share/xfce/cursors
@dirrm share/xfce/backdrops
-@comment in REQD_DIRS: @dirrm share/xfce
@dirrm lib/gtk/themes/engines
@dirrm lib/gtk/themes
@dirrm lib/gtk
diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile
index 72e0a0a7050..a0b04587938 100644
--- a/x11/xfce4-desktop/Makefile
+++ b/x11/xfce4-desktop/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2007/01/18 15:16:02 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2007/01/23 11:53:47 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfdesktop-${XFCE4_VERSION}
PKGNAME= xfce4-desktop-${XFCE4_VERSION}
#PKGREVISION= 1
-PKGREVISION= 4
CATEGORIES= x11
COMMENT= Xfce desktop background manager
diff --git a/x11/xfce4-desktop/PLIST b/x11/xfce4-desktop/PLIST
index 84d337f4396..4bf5d4a99cc 100644
--- a/x11/xfce4-desktop/PLIST
+++ b/x11/xfce4-desktop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2006/04/17 07:07:49 jlam Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/01/23 11:53:47 martti Exp $
bin/xfce4-menueditor
bin/xfdesktop
lib/xfce4/mcs-plugins/backdrop_settings.la
@@ -15,6 +15,7 @@ share/examples/xfce4/desktop/menu.xml.de
share/examples/xfce4/desktop/menu.xml.el
share/examples/xfce4/desktop/menu.xml.es
share/examples/xfce4/desktop/menu.xml.et
+share/examples/xfce4/desktop/menu.xml.eu
share/examples/xfce4/desktop/menu.xml.fi
share/examples/xfce4/desktop/menu.xml.fr
share/examples/xfce4/desktop/menu.xml.he
@@ -33,6 +34,8 @@ 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.cs
+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.he
@@ -95,6 +98,7 @@ 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
@@ -140,4 +144,5 @@ 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
+@dirrm share/examples/xfce4/desktop
@unexec ${RMDIR} %D/share/xfce4/backdrops 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk
index bbf3cc33921..52299f31700 100644
--- a/x11/xfce4-desktop/buildlink3.mk
+++ b/x11/xfce4-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/10/12 09:24:21 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:47 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_DESKTOP_BUILDLINK3_MK:= ${XFCE4_DESKTOP_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ 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.3nb4
+BUILDLINK_API_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.2.4
BUILDLINK_PKGSRCDIR.xfce4-desktop?= ../../x11/xfce4-desktop
.endif # XFCE4_DESKTOP_BUILDLINK3_MK
diff --git a/x11/xfce4-desktop/distinfo b/x11/xfce4-desktop/distinfo
index 86bec337152..27fa670cdcc 100644
--- a/x11/xfce4-desktop/distinfo
+++ b/x11/xfce4-desktop/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2005/11/09 06:42:59 martti Exp $
+$NetBSD: distinfo,v 1.14 2007/01/23 11:53:47 martti Exp $
-SHA1 (xfdesktop-4.2.3.tar.gz) = d4b1285947e6f42e6aa1b95a9e7bed645a1f596d
-RMD160 (xfdesktop-4.2.3.tar.gz) = da0adb637503f85d38651953560916ebc141b3ec
-Size (xfdesktop-4.2.3.tar.gz) = 3169283 bytes
-SHA1 (patch-aa) = a04e68bd3c504925a938dab1d97f7ab582f91e5c
-SHA1 (patch-ab) = 8c93b5e45a9d1d74e385c1402057d059b428f035
+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
diff --git a/x11/xfce4-desktop/patches/patch-aa b/x11/xfce4-desktop/patches/patch-aa
index 725d6e4e3b6..1c06a4204df 100644
--- a/x11/xfce4-desktop/patches/patch-aa
+++ b/x11/xfce4-desktop/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2005/11/09 06:42:59 martti Exp $
+$NetBSD: patch-aa,v 1.3 2007/01/23 11:53:47 martti Exp $
---- Makefile.in.orig 2005-11-06 12:38:13.000000000 +0200
-+++ Makefile.in 2005-11-07 08:54:08.000000000 +0200
-@@ -275,7 +275,7 @@
+--- 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 @@
SUBDIRS = backdrops common doc po settings src modules pixmaps \
$(am__append_1) $(am__append_2)
diff --git a/x11/xfce4-desktop/patches/patch-ab b/x11/xfce4-desktop/patches/patch-ab
index 354529bdb49..e6ebefea58c 100644
--- a/x11/xfce4-desktop/patches/patch-ab
+++ b/x11/xfce4-desktop/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2005/11/09 06:42:59 martti Exp $
+$NetBSD: patch-ab,v 1.3 2007/01/23 11:53:47 martti Exp $
---- modules/menu/Makefile.in.orig 2005-11-06 12:38:12.000000000 +0200
-+++ modules/menu/Makefile.in 2005-11-07 08:54:34.000000000 +0200
-@@ -290,7 +290,7 @@
+--- 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@
diff --git a/x11/xfce4-gtk2-engine/Makefile b/x11/xfce4-gtk2-engine/Makefile
index 531a993199b..11bc166acbc 100644
--- a/x11/xfce4-gtk2-engine/Makefile
+++ b/x11/xfce4-gtk2-engine/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2006/09/15 17:05:24 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2007/01/23 11:53:47 martti Exp $
#
.include "../../meta-pkgs/xfce4/Makefile.common"
-XFCE4_VERSION= 2.2.8
+XFCE4_VERSION= 2.2.9
DISTNAME= gtk-xfce-engine-${XFCE4_VERSION}
PKGNAME= xfce4-gtk2-engine-${XFCE4_VERSION}
-PKGREVISION= 4
+#PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce GTK2 themes
diff --git a/x11/xfce4-gtk2-engine/buildlink3.mk b/x11/xfce4-gtk2-engine/buildlink3.mk
index 072086bb375..c319caca6e1 100644
--- a/x11/xfce4-gtk2-engine/buildlink3.mk
+++ b/x11/xfce4-gtk2-engine/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/10/12 09:24:21 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2007/01/23 11:53:47 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_GTK2_ENGINE_BUILDLINK3_MK:= ${XFCE4_GTK2_ENGINE_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ 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.8nb4
+BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+= xfce4-gtk2-engine>=2.2.9
BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?= ../../x11/xfce4-gtk2-engine
.endif # XFCE4_GTK2_ENGINE_BUILDLINK3_MK
diff --git a/x11/xfce4-gtk2-engine/distinfo b/x11/xfce4-gtk2-engine/distinfo
index e978a33c2e2..2dffc8c507d 100644
--- a/x11/xfce4-gtk2-engine/distinfo
+++ b/x11/xfce4-gtk2-engine/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/11/09 08:50:31 martti Exp $
+$NetBSD: distinfo,v 1.2 2007/01/23 11:53:47 martti Exp $
-SHA1 (gtk-xfce-engine-2.2.8.tar.gz) = b9458b5639a81dfb5be675921fd4a2d2f4cb4305
-RMD160 (gtk-xfce-engine-2.2.8.tar.gz) = 7ca5285a98f059c525ee6a661d6896194fed1f18
-Size (gtk-xfce-engine-2.2.8.tar.gz) = 391386 bytes
+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
diff --git a/x11/xfce4-mcs-manager/Makefile b/x11/xfce4-mcs-manager/Makefile
index d228a4e4038..3f70e6db854 100644
--- a/x11/xfce4-mcs-manager/Makefile
+++ b/x11/xfce4-mcs-manager/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2006/04/17 13:46:12 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/01/23 11:53:47 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce-mcs-manager-${XFCE4_VERSION}
PKGNAME= xfce4-mcs-manager-${XFCE4_VERSION}
-PKGREVISION= 4
+#PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce settings manager
diff --git a/x11/xfce4-mcs-manager/PLIST b/x11/xfce4-mcs-manager/PLIST
index 2b9cf548566..4fd5be218fd 100644
--- a/x11/xfce4-mcs-manager/PLIST
+++ b/x11/xfce4-mcs-manager/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/04/17 07:07:49 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/01/23 11:53:47 martti Exp $
bin/xfce-mcs-manager
bin/xfce-setting-show
include/xfce4/xfce-mcs-manager/manager-plugin.h
@@ -31,6 +31,7 @@ share/locale/hi/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/hu/LC_MESSAGES/xfce-mcs-manager.mo
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
@@ -46,6 +47,7 @@ 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
@@ -67,10 +69,10 @@ 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
@dirrm include/xfce4/xfce-mcs-manager
-@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/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/x11/xfce4-mcs-manager/buildlink3.mk b/x11/xfce4-mcs-manager/buildlink3.mk
index 3c0c93eabad..b2889a34a99 100644
--- a/x11/xfce4-mcs-manager/buildlink3.mk
+++ b/x11/xfce4-mcs-manager/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/10/12 09:24:21 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2007/01/23 11:53:47 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_MCS_MANAGER_BUILDLINK3_MK:= ${XFCE4_MCS_MANAGER_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ 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.3nb4
+BUILDLINK_API_DEPENDS.xfce4-mcs-manager+= xfce4-mcs-manager>=4.2.4
BUILDLINK_PKGSRCDIR.xfce4-mcs-manager?= ../../x11/xfce4-mcs-manager
.endif # XFCE4_MCS_MANAGER_BUILDLINK3_MK
diff --git a/x11/xfce4-mcs-manager/distinfo b/x11/xfce4-mcs-manager/distinfo
index 9b7849d902b..7dff936686f 100644
--- a/x11/xfce4-mcs-manager/distinfo
+++ b/x11/xfce4-mcs-manager/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2005/11/09 06:42:59 martti Exp $
+$NetBSD: distinfo,v 1.13 2007/01/23 11:53:47 martti Exp $
-SHA1 (xfce-mcs-manager-4.2.3.tar.gz) = be517073e756ce15f430d8e9435e21e28fbc122e
-RMD160 (xfce-mcs-manager-4.2.3.tar.gz) = e0839ac4fc8cbb4969d7e0b14196b2d867cd65af
-Size (xfce-mcs-manager-4.2.3.tar.gz) = 764330 bytes
+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
diff --git a/x11/xfce4-mcs-plugins/Makefile b/x11/xfce4-mcs-plugins/Makefile
index 8f0bab49009..2f5e1d7988b 100644
--- a/x11/xfce4-mcs-plugins/Makefile
+++ b/x11/xfce4-mcs-plugins/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2007/01/17 15:37:35 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/01/23 11:53:47 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce-mcs-plugins-${XFCE4_VERSION}
PKGNAME= xfce4-mcs-plugins-${XFCE4_VERSION}
-PKGREVISION= 4
+#PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce settings manager plugins
diff --git a/x11/xfce4-mcs-plugins/PLIST b/x11/xfce4-mcs-plugins/PLIST
index 1ee85253eec..e9abd89e3d4 100644
--- a/x11/xfce4-mcs-plugins/PLIST
+++ b/x11/xfce4-mcs-plugins/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/04/17 07:07:49 jlam Exp $
+@comment $NetBSD: PLIST,v 1.13 2007/01/23 11:53:47 martti Exp $
lib/xfce4/mcs-plugins/display_plugin.la
lib/xfce4/mcs-plugins/keyboard_plugin.la
lib/xfce4/mcs-plugins/mouse_plugin.la
@@ -56,6 +56,7 @@ 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
diff --git a/x11/xfce4-mcs-plugins/buildlink3.mk b/x11/xfce4-mcs-plugins/buildlink3.mk
index d572a791a46..a5c79c25da4 100644
--- a/x11/xfce4-mcs-plugins/buildlink3.mk
+++ b/x11/xfce4-mcs-plugins/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/10/12 09:24:21 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2007/01/23 11:53:47 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_MCS_PLUGINS_BUILDLINK3_MK:= ${XFCE4_MCS_PLUGINS_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ 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.3nb4
+BUILDLINK_API_DEPENDS.xfce4-mcs-plugins+= xfce4-mcs-plugins>=4.2.4
BUILDLINK_PKGSRCDIR.xfce4-mcs-plugins?= ../../x11/xfce4-mcs-plugins
.endif # XFCE4_MCS_PLUGINS_BUILDLINK3_MK
diff --git a/x11/xfce4-mcs-plugins/distinfo b/x11/xfce4-mcs-plugins/distinfo
index ad8227f8ddd..22a6c24ef37 100644
--- a/x11/xfce4-mcs-plugins/distinfo
+++ b/x11/xfce4-mcs-plugins/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2005/11/09 06:42:59 martti Exp $
+$NetBSD: distinfo,v 1.13 2007/01/23 11:53:47 martti Exp $
-SHA1 (xfce-mcs-plugins-4.2.3.tar.gz) = 981a3a38d9063f3b9de32f13384677bf631d135a
-RMD160 (xfce-mcs-plugins-4.2.3.tar.gz) = 0e9b69dba25ec43800a4585b6976f43f381cb2e4
-Size (xfce-mcs-plugins-4.2.3.tar.gz) = 1009785 bytes
+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
diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index d61bc41c180..52121425252 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2007/01/17 17:48:03 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2007/01/23 11:53:47 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-panel-${XFCE4_VERSION}
#PKGREVISION= 1
-PKGREVISION= 4
CATEGORIES= x11
COMMENT= Xfce panel
diff --git a/x11/xfce4-panel/PLIST b/x11/xfce4-panel/PLIST
index 625b03139a0..5895446b453 100644
--- a/x11/xfce4-panel/PLIST
+++ b/x11/xfce4-panel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2006/04/17 07:07:49 jlam Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/01/23 11:53:47 martti Exp $
bin/xfce4-panel
include/xfce4/panel/add-control-dialog.h
include/xfce4/panel/controls.h
@@ -107,6 +107,7 @@ 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
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
index a0004fcb3a8..c19710f67b9 100644
--- a/x11/xfce4-panel/buildlink3.mk
+++ b/x11/xfce4-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/10/12 09:24:21 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:47 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.3nb4
+BUILDLINK_API_DEPENDS.xfce4-panel+= xfce4-panel>=4.2.4
BUILDLINK_PKGSRCDIR.xfce4-panel?= ../../x11/xfce4-panel
.endif # XFCE4_PANEL_BUILDLINK3_MK
diff --git a/x11/xfce4-panel/distinfo b/x11/xfce4-panel/distinfo
index 2a40131f7cd..06be96d4222 100644
--- a/x11/xfce4-panel/distinfo
+++ b/x11/xfce4-panel/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2005/11/09 06:42:59 martti Exp $
+$NetBSD: distinfo,v 1.14 2007/01/23 11:53:47 martti Exp $
-SHA1 (xfce4-panel-4.2.3.tar.gz) = d42a9e3c66b49c8fd4dcb15cd0b8776a60dd43c3
-RMD160 (xfce4-panel-4.2.3.tar.gz) = 05a7c450d4ef964ac0e39107a8f891ab307649b2
-Size (xfce4-panel-4.2.3.tar.gz) = 1395852 bytes
-SHA1 (patch-aa) = 80188922f6282ffa109c639727ed86678221e36b
+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
diff --git a/x11/xfce4-panel/patches/patch-aa b/x11/xfce4-panel/patches/patch-aa
index e8d9186cae6..1fa6e8329ab 100644
--- a/x11/xfce4-panel/patches/patch-aa
+++ b/x11/xfce4-panel/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.1 2005/06/15 09:01:59 hira Exp $
+$NetBSD: patch-aa,v 1.2 2007/01/23 11:53:47 martti Exp $
---- Makefile.in.orig 2005-06-13 19:00:58.000000000 +0900
-+++ Makefile.in 2005-06-13 19:01:29.000000000 +0900
-@@ -236,7 +236,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
+--- 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 = \
diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index 6d8598d17c9..58c2af37300 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2007/01/18 15:25:15 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2007/01/23 11:53:47 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-session-${XFCE4_VERSION}
#PKGREVISION= 1
-PKGREVISION= 4
CATEGORIES= x11
COMMENT= Xfce session manager
diff --git a/x11/xfce4-session/PLIST b/x11/xfce4-session/PLIST
index 43a47f12c04..d921216eaab 100644
--- a/x11/xfce4-session/PLIST
+++ b/x11/xfce4-session/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/12/07 13:58:03 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/01/23 11:53:47 martti Exp $
bin/xfce4-session
bin/xfce4-session-logout
include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-engine.h
@@ -67,6 +67,7 @@ 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
diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk
index 053cc87b528..bf8510c97cc 100644
--- a/x11/xfce4-session/buildlink3.mk
+++ b/x11/xfce4-session/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/10/12 09:24:21 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2007/01/23 11:53:47 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_SESSION_BUILDLINK3_MK:= ${XFCE4_SESSION_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ 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.3nb4
+BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.2.4
BUILDLINK_PKGSRCDIR.xfce4-session?= ../../x11/xfce4-session
.endif # XFCE4_SESSION_BUILDLINK3_MK
diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo
index c7adb497070..8ffff22458f 100644
--- a/x11/xfce4-session/distinfo
+++ b/x11/xfce4-session/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/11/09 06:42:59 martti Exp $
+$NetBSD: distinfo,v 1.7 2007/01/23 11:53:48 martti Exp $
-SHA1 (xfce4-session-4.2.3.tar.gz) = 99e93dcfc3e1eaa403b55b46ec87d7abdc74c949
-RMD160 (xfce4-session-4.2.3.tar.gz) = e2fa608f13cfa79bfc9db2e2091100f5c145d2c7
-Size (xfce4-session-4.2.3.tar.gz) = 1629362 bytes
+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
diff --git a/x11/xfce4-toys/Makefile b/x11/xfce4-toys/Makefile
index bec14a1f2f5..2bd909c6f0d 100644
--- a/x11/xfce4-toys/Makefile
+++ b/x11/xfce4-toys/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2007/01/18 15:26:53 joerg Exp $
+# $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= 3
+#PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce toys
diff --git a/x11/xfce4-toys/PLIST b/x11/xfce4-toys/PLIST
index e90ac2dc801..024a63b9106 100644
--- a/x11/xfce4-toys/PLIST
+++ b/x11/xfce4-toys/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/04/17 07:07:49 jlam Exp $
+@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
@@ -27,6 +27,7 @@ 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
@@ -42,6 +43,7 @@ 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
diff --git a/x11/xfce4-toys/buildlink3.mk b/x11/xfce4-toys/buildlink3.mk
index 57a2d9d4569..7faf9cace43 100644
--- a/x11/xfce4-toys/buildlink3.mk
+++ b/x11/xfce4-toys/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/10/12 09:24:21 martti Exp $
+# $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}+
@@ -12,7 +12,7 @@ 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.3nb3
+BUILDLINK_API_DEPENDS.xfce4-toys+= xfce4-toys>=4.2.4
BUILDLINK_PKGSRCDIR.xfce4-toys?= ../../x11/xfce4-toys
.endif # XFCE4_TOYS_BUILDLINK3_MK
diff --git a/x11/xfce4-toys/distinfo b/x11/xfce4-toys/distinfo
index e2813cbf3b9..b4c72cbb442 100644
--- a/x11/xfce4-toys/distinfo
+++ b/x11/xfce4-toys/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2005/11/09 06:42:59 martti Exp $
+$NetBSD: distinfo,v 1.13 2007/01/23 11:53:48 martti Exp $
-SHA1 (xfce4-toys-4.2.3.tar.gz) = bbc6069d2a3762e23d48ef8617c9dafa355b7f7a
-RMD160 (xfce4-toys-4.2.3.tar.gz) = e33092afd5ce813679d44cbc103b247e1ee28271
-Size (xfce4-toys-4.2.3.tar.gz) = 431027 bytes
+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/Makefile b/x11/xfce4-trigger-launcher/Makefile
index 7cca9b41d94..60c21d18763 100644
--- a/x11/xfce4-trigger-launcher/Makefile
+++ b/x11/xfce4-trigger-launcher/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2006/04/17 13:46:14 wiz Exp $
+# $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= 3
+#PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce trigger-launcher
diff --git a/x11/xfce4-trigger-launcher/PLIST b/x11/xfce4-trigger-launcher/PLIST
index 26afe8c05f5..f569d3dfbff 100644
--- a/x11/xfce4-trigger-launcher/PLIST
+++ b/x11/xfce4-trigger-launcher/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/04/17 07:07:54 jlam Exp $
+@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
@@ -26,6 +26,7 @@ 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
@@ -40,6 +41,7 @@ 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
diff --git a/x11/xfce4-trigger-launcher/buildlink3.mk b/x11/xfce4-trigger-launcher/buildlink3.mk
index b29dc680682..56e6bc81f5c 100644
--- a/x11/xfce4-trigger-launcher/buildlink3.mk
+++ b/x11/xfce4-trigger-launcher/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/10/12 09:24:21 martti Exp $
+# $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}+
@@ -12,7 +12,7 @@ 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.3nb3
+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
diff --git a/x11/xfce4-trigger-launcher/distinfo b/x11/xfce4-trigger-launcher/distinfo
index 394ea691f06..fe038dbeec0 100644
--- a/x11/xfce4-trigger-launcher/distinfo
+++ b/x11/xfce4-trigger-launcher/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2005/11/09 06:42:59 martti Exp $
+$NetBSD: distinfo,v 1.13 2007/01/23 11:53:48 martti Exp $
-SHA1 (xfce4-trigger-launcher-4.2.3.tar.gz) = 8b68183fde3e88131563fbfdedf2d804ffcfb546
-RMD160 (xfce4-trigger-launcher-4.2.3.tar.gz) = cf906e166df7428b0e9218063fdfba553a7babe2
-Size (xfce4-trigger-launcher-4.2.3.tar.gz) = 371223 bytes
+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/Makefile b/x11/xfce4-utils/Makefile
index cce2c427bc8..5825624ff90 100644
--- a/x11/xfce4-utils/Makefile
+++ b/x11/xfce4-utils/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2007/01/18 20:55:15 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2007/01/23 11:53:48 martti Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce-utils-${XFCE4_VERSION}
PKGNAME= xfce4-utils-${XFCE4_VERSION}
-PKGREVISION= 6
+#PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce utilities
diff --git a/x11/xfce4-utils/PLIST b/x11/xfce4-utils/PLIST
index 42109bcd59a..94fb74474fc 100644
--- a/x11/xfce4-utils/PLIST
+++ b/x11/xfce4-utils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2006/04/17 07:07:54 jlam Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/01/23 11:53:48 martti Exp $
bin/startxfce4
bin/xfce4-about
bin/xfhelp4
@@ -54,6 +54,7 @@ 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
diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk
index ce5c85c9e43..9ecc6b0fac5 100644
--- a/x11/xfce4-utils/buildlink3.mk
+++ b/x11/xfce4-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2006/12/12 06:19:33 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2007/01/23 11:53:48 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_UTILS_BUILDLINK3_MK:= ${XFCE4_UTILS_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ 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.3nb6
+BUILDLINK_API_DEPENDS.xfce4-utils+= xfce4-utils>=4.2.4
BUILDLINK_PKGSRCDIR.xfce4-utils?= ../../x11/xfce4-utils
.endif # XFCE4_UTILS_BUILDLINK3_MK
diff --git a/x11/xfce4-utils/distinfo b/x11/xfce4-utils/distinfo
index fa0e00c40d7..52c801a3b31 100644
--- a/x11/xfce4-utils/distinfo
+++ b/x11/xfce4-utils/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2006/12/12 06:19:33 martti Exp $
+$NetBSD: distinfo,v 1.16 2007/01/23 11:53:48 martti Exp $
-SHA1 (xfce-utils-4.2.3.tar.gz) = a19e68dd676743636dec80d9ce2b0d6149c7a315
-RMD160 (xfce-utils-4.2.3.tar.gz) = acbe18beeac5a2b6d4866ec98343d4fc98b4dd12
-Size (xfce-utils-4.2.3.tar.gz) = 1303388 bytes
+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