Xfce 4.2.4 released

A new bug fix release of Xfce 4.2 is available. This release is supposed to
be the last release for the 4.2 branch. It includes several fixes ported from
the current developpment branch. This release should not be confused with the
upcoming Xfce 4.4 release [1], it's a bug fix release of the previous stable
branch.

[1] Xfce 4.4.0 is already in pkgsrc-wip.

11 files changed, 31 insertions, 29 deletions

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