Updated xfce4 to 4.2.3.1

* Lots of bug fixes
* Translation updates

Official ChangeLog is available at:

http://www.xfce.org/release_notes/4.2.3.1_changelog.html

5 files changed, 12 insertions, 24 deletions

diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 5d646c28e6d..92d5a99f125 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2005/05/27 14:22:07 martti Exp $
+# $NetBSD: Makefile,v 1.6 2005/11/09 06:42:59 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
+XFCE4_VERSION=	4.2.3.1
+
 DISTNAME=	libxfce4util-${XFCE4_VERSION}
+#PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	XFce4 basic library
 
-PKGREVISION=	1
-
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
 PKGCONFIG_OVERRIDE=	libxfce4util/libxfce4util-1.0.pc.in
diff --git a/x11/libxfce4util/PLIST b/x11/libxfce4util/PLIST
index bb6266b69a9..f0e94b4b8c9 100644
--- a/x11/libxfce4util/PLIST
+++ b/x11/libxfce4util/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2005/05/25 19:47:14 martti Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/11/09 06:42:59 martti Exp $
 include/xfce4/libxfce4util/debug.h
 include/xfce4/libxfce4util/i18n.h
 include/xfce4/libxfce4util/libxfce4util-config.h
 include/xfce4/libxfce4util/libxfce4util.h
 include/xfce4/libxfce4util/utf8.h
+include/xfce4/libxfce4util/util-enum-types.h
 include/xfce4/libxfce4util/util.h
 include/xfce4/libxfce4util/xfce-desktopentry.h
 include/xfce4/libxfce4util/xfce-fileutils.h
diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk
index 003a3bd830c..820a8be4977 100644
--- a/x11/libxfce4util/buildlink3.mk
+++ b/x11/libxfce4util/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/05/18 06:10:30 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2005/11/09 06:42:59 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4UTIL_BUILDLINK3_MK:=	${LIBXFCE4UTIL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4util}
 BUILDLINK_PACKAGES+=	libxfce4util
 
 .if !empty(LIBXFCE4UTIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxfce4util+=	libxfce4util>=4.2.2
+BUILDLINK_DEPENDS.libxfce4util+=	libxfce4util>=4.2.3.1
 BUILDLINK_PKGSRCDIR.libxfce4util?=	../../x11/libxfce4util
 .endif	# LIBXFCE4UTIL_BUILDLINK3_MK
 
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index 6693e4c720a..f057f096c1a 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.12 2005/11/06 05:29:55 martti Exp $
+$NetBSD: distinfo,v 1.13 2005/11/09 06:42:59 martti Exp $
 
-SHA1 (libxfce4util-4.2.2.tar.gz) = 49d945fb79870159deea73c98cc6e34f537cd2ab
-RMD160 (libxfce4util-4.2.2.tar.gz) = 0c8f09ced7470c0ce0d85ad5a60c5385111548e0
-Size (libxfce4util-4.2.2.tar.gz) = 458244 bytes
-SHA1 (patch-aa) = 601e0883696f47bf77a390113d80e4df332af6b5
+SHA1 (libxfce4util-4.2.3.1.tar.gz) = b1d684023fcd849fee9db769c3be6c9bb7ca812f
+RMD160 (libxfce4util-4.2.3.1.tar.gz) = 48a9c61777bf1fb0274deb031c183e69ff9dbeba
+Size (libxfce4util-4.2.3.1.tar.gz) = 469075 bytes
diff --git a/x11/libxfce4util/patches/patch-aa b/x11/libxfce4util/patches/patch-aa
deleted file mode 100644
index 5b612b0db69..00000000000
--- a/x11/libxfce4util/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/11/06 05:29:55 martti Exp $
-
---- libxfce4util/licenses-texts.c.orig	2005-11-05 18:23:41.000000000 +0100
-+++ libxfce4util/licenses-texts.c	2005-11-05 18:24:05.000000000 +0100
-@@ -1,7 +1,7 @@
- /* Auto generated file, do not edit */
- 
- /* Keep the license stuff in one section if possible */
--#if defined(__GNUC__)
-+#if defined(__GNUC__) && !defined(__APPLE__)
- #define SECTION __attribute__((section(".xfce.LICENSES")))
- #else
- #define SECTION