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.

5 files changed, 19 insertions, 18 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