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.

6 files changed, 23 insertions, 19 deletions

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@