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.

8 files changed, 21 insertions, 27 deletions

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