Update xfce to 3.5.2. Changes from version 3.3.1 include bug fixes and many

interface and usability enhancements.

3 files changed, 39 insertions, 26 deletions

diff --git a/x11/xfce/patches/patch-aa b/x11/xfce/patches/patch-aa
index 82be0c948c8..94d7509b13a 100644
--- a/x11/xfce/patches/patch-aa
+++ b/x11/xfce/patches/patch-aa
@@ -1,12 +1,24 @@
-$NetBSD: patch-aa,v 1.2 2000/03/03 17:50:28 jwise Exp $
---- configure.orig	Fri Mar  3 11:52:48 2000
-+++ configure	Fri Mar  3 11:53:02 2000
-@@ -5508,7 +5508,7 @@
-   XFCE_DIR="$datadir/xfce"
+$NetBSD: patch-aa,v 1.3 2000/10/15 02:39:01 jlam Exp $
+
+--- configure.orig	Sat Sep 30 12:16:19 2000
++++ configure
+@@ -3875,6 +3875,10 @@
+ 	< $srcdir/po/POTFILES.in > po/POTFILES
+   
+ 
++# NetBSD: set DATADIRNAME to "share"
++DATADIRNAME="share"
++INTLDEPS=
++INTLLIBS="-lintl"
+ 
+ for ac_hdr in ctype.h
+ do
+@@ -6159,7 +6163,7 @@
+   XFCE_CONFDIR="$sysconfdir/xfce"
  fi
  
 -XFCE_LOCALE_DIR="$XFCE_DIR/locale"
 +XFCE_LOCALE_DIR="$datadir/locale"
  
+ echo "$ac_t""ok" 1>&6
  echo "$ac_t""XFCE_DIR set to $XFCE_DIR" 1>&6
- echo "$ac_t""XFCE_LOCALE_DIR set to $XFCE_LOCALE_DIR" 1>&6
diff --git a/x11/xfce/patches/patch-ab b/x11/xfce/patches/patch-ab
index 86ab728b626..dfe13b569dd 100644
--- a/x11/xfce/patches/patch-ab
+++ b/x11/xfce/patches/patch-ab
@@ -1,10 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2000/03/03 17:50:28 jwise Exp $
---- other/sample.xfsoundrc.in.orig	Fri Mar  3 12:38:11 2000
-+++ other/sample.xfsoundrc.in	Fri Mar  3 12:38:28 2000
-@@ -1,5 +1,5 @@
- Play
--esdplay
-+/usr/bin/audioplay
- XFCE_DIR/sounds/beep03.wav
- XFCE_DIR/sounds/pop02.wav
+$NetBSD: patch-ab,v 1.3 2000/10/15 02:39:02 jlam Exp $
+
+--- libs/configure.h.orig	Mon Sep  4 13:26:09 2000
++++ libs/configure.h
+@@ -22,7 +22,7 @@
+ #define CLOSE_STRING4 "quit"
  
+ /* #ifdef __alpha */
+-#if defined(__alpha) && !defined(linux)
++#if defined(__alpha) && !(defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__))
+ #define NEEDS_ALPHA_HEADER
+ #undef BROKEN_SUN_HEADERS
+ #endif /* (__alpha) */
diff --git a/x11/xfce/patches/patch-ac b/x11/xfce/patches/patch-ac
index 66bfc1197a2..f243252c357 100644
--- a/x11/xfce/patches/patch-ac
+++ b/x11/xfce/patches/patch-ac
@@ -1,13 +1,11 @@
-$NetBSD: patch-ac,v 1.4 2000/10/02 07:25:19 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2000/10/15 02:39:02 jlam Exp $
 
---- libs/configure.h.orig	Tue Nov  9 21:20:00 1999
-+++ libs/configure.h
-@@ -69,7 +69,7 @@
- #define CLOSE_STRING4 "quit"
+--- other/xfsoundrc.in.orig	Mon Sep  4 13:26:09 2000
++++ other/xfsoundrc.in
+@@ -1,5 +1,5 @@
+ Play
+-xfplay
++/usr/bin/audioplay
+ XFCE_DIR/sounds/beep03.wav
+ XFCE_DIR/sounds/pop02.wav
  
- /* #ifdef __alpha */
--#if defined(__alpha) && !defined(linux)
-+#if defined(__alpha) && !(defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__))
- #define NEEDS_ALPHA_HEADER
- #undef BROKEN_SUN_HEADERS
- #endif /* (__alpha) */