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, 17 insertions, 40 deletions

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[];