Updated Xfce to 4.4.2

Lots of bug fixes. For the official ChangeLog, please see
http://www.xfce.org/documentation/changelogs/4.4.2

4 files changed, 79 insertions, 100 deletions

diff --git a/x11/xfce4-exo/patches/patch-aa b/x11/xfce4-exo/patches/patch-aa
deleted file mode 100644
index 7ce8f9aa867..00000000000
--- a/x11/xfce4-exo/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/04/12 09:50:50 martti Exp $
-
---- configure.in	2007-01-20 14:05:43.000000000 +0000
-+++ configure.in	2007-01-22 15:43:57.000000000 +0000
-@@ -108,14 +108,14 @@
-                   locale.h math.h md5.h md5global.h mmintrin.h mntent.h \
-                   paths.h regex.h signal.h stdarg.h string.h sys/mman.h \
-                   sys/mnttab.h sys/mount.h sys/param.h sys/resource.h \
--                  sys/stat.h sys/time.h sys/types.h sys/ucred.h \
--                  sys/wait.h time.h])
-+                  sys/statvfs.h sys/stat.h sys/time.h sys/types.h \
-+                  sys/ucred.h sys/wait.h time.h])
- 
- dnl ************************************
- dnl *** Check for standard functions ***
- dnl ************************************
- AC_FUNC_MMAP()
--AC_CHECK_FUNCS([getfsstat getmntent regexec setfsent setmntent])
-+AC_CHECK_FUNCS([getvfsstat getfsstat getmntent regexec setfsent setmntent])
- 
- dnl ******************************************
- dnl *** Check for Message Digest functions ***
diff --git a/x11/xfce4-exo/patches/patch-ab b/x11/xfce4-exo/patches/patch-ab
deleted file mode 100644
index c78fd14393a..00000000000
--- a/x11/xfce4-exo/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/04/12 09:50:50 martti Exp $
-
---- configure.orig	2007-01-22 16:16:38.000000000 +0000
-+++ configure	2007-01-22 16:17:24.000000000 +0000
-@@ -21769,4 +21770,4 @@
-                   sys/mnttab.h sys/mount.h sys/param.h sys/resource.h \
--                  sys/stat.h sys/time.h sys/types.h sys/ucred.h \
--                  sys/wait.h time.h
-+                  sys/statvfs.h sys/stat.h sys/time.h sys/types.h \
-+                  sys/ucred.h sys/wait.h time.h
- do
-@@ -22346,3 +22347,4 @@
- 
--for ac_func in getfsstat getmntent regexec setfsent setmntent
-+
-+for ac_func in getvfsstat getfsstat getmntent regexec setfsent setmntent
- do
diff --git a/x11/xfce4-exo/patches/patch-ac b/x11/xfce4-exo/patches/patch-ac
deleted file mode 100644
index 7a89ac1284f..00000000000
--- a/x11/xfce4-exo/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2007/04/12 09:50:50 martti Exp $
-
---- config.h.in.orig	2007-01-22 16:22:10.000000000 +0000
-+++ config.h.in	2007-01-22 16:22:28.000000000 +0000
-@@ -30,6 +30,9 @@
- /* Define to 1 if you have the <fstab.h> header file. */
- #undef HAVE_FSTAB_H
- 
-+/* Define to 1 if you have the `getvfsstat' function. */
-+#undef HAVE_GETVFSSTAT
-+
- /* Define to 1 if you have the `getfsstat' function. */
- #undef HAVE_GETFSSTAT
- 
diff --git a/x11/xfce4-exo/patches/patch-ad b/x11/xfce4-exo/patches/patch-ad
index c2f2d3a6003..4a19df64082 100644
--- a/x11/xfce4-exo/patches/patch-ad
+++ b/x11/xfce4-exo/patches/patch-ad
@@ -1,54 +1,86 @@
---- exo/exo-mount-point.c.orig	2007-01-20 15:58:22.000000000 +0200
-+++ exo/exo-mount-point.c	2007-07-06 14:10:50.000000000 +0300
-@@ -25,6 +25,9 @@
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
-+#ifdef HAVE_SYS_STATVFS_H
-+#include <sys/statvfs.h>
-+#endif
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
- #endif
-@@ -38,6 +41,7 @@
- #include <sys/mount.h>
- #endif
- #ifdef HAVE_SYS_MNTTAB_H
-+#include <stdio.h>
- #include <sys/mnttab.h>
- #endif
- 
-@@ -250,6 +254,33 @@
+$NetBSD: patch-ad,v 1.3 2007/12/07 19:43:29 martti Exp $
+
+--- exo/exo-mount-point.c.orig	2007-12-04 11:46:28.000000000 +0000
++++ exo/exo-mount-point.c	2007-12-04 11:52:46.000000000 +0000
+@@ -253,57 +253,57 @@
  
    /* close the file handle */
    fclose (fp);
-+#elif defined(HAVE_GETVFSSTAT)
+-#elif defined(HAVE_GETFSSTAT) /* FreeBSD, OpenBSD, DragonFly, older NetBSD */
+-  struct statfs *mntbuf = NULL;
+-  glong          bufsize = 0;
+-  gint           mntsize;
+-  gint           n;
++#elif defined(HAVE_GETVFSSTAT) /* Newer NetBSD */
 +  struct statvfs *mntbuf = NULL;
 +  glong           bufsize = 0;
 +  gint            mntsize;
 +  gint            n;
-+
-+  /* determine the number of active mount points */
-+  mntsize = getvfsstat(NULL, 0, MNT_NOWAIT);
-+  if (G_LIKELY(mntsize > 0)) {
-+    /* allocate a new buffer */
-+    bufsize = (mntsize + 4) * sizeof(*mntbuf);
-+    mntbuf = (struct statvfs *)malloc(bufsize);
-+
-+    /* determine the mount point for the device file */
-+    mntsize = getvfsstat(mntbuf, bufsize, ST_NOWAIT);
-+    for (n = 0; n < mntsize; ++n) {
-+      /* check if we have a match here */
-+      exo_mount_point_add_if_matches(mask, device, folder, fstype,
-+                                     mntbuf[n].f_mntfromname,
-+                                     mntbuf[n].f_mntonname,
-+                                     mntbuf[n].f_fstypename,
-+                                     ((mntbuf[n].f_flag & MNT_RDONLY) != 0),
-+                                     &mount_points);
-+    }
-+    /* release the buffer */
-+    free(mntbuf);
-+  }
- #elif defined(HAVE_GETFSSTAT) /* BSD */
-   struct statfs *mntbuf = NULL;
-   glong          bufsize = 0;
+ 
+   /* determine the number of active mount points */
+-  mntsize = getfsstat (NULL, 0, MNT_NOWAIT);
++  mntsize = getvfsstat (NULL, 0, MNT_NOWAIT);
+   if (G_LIKELY (mntsize > 0))
+     {
+       /* allocate a new buffer */
+       bufsize = (mntsize + 4) * sizeof (*mntbuf);
+-      mntbuf = (struct statfs *) malloc (bufsize);
++      mntbuf = (struct statvfs *) malloc (bufsize);
+ 
+       /* determine the mount point for the device file */
+-      mntsize = getfsstat (mntbuf, bufsize, MNT_NOWAIT);
++      mntsize = getvfsstat (mntbuf, bufsize, ST_NOWAIT);
+       for (n = 0; n < mntsize; ++n)
+         {
+           /* check if we have a match here */
+-          exo_mount_point_add_if_matches (mask, device, folder, fstype, mntbuf[n].f_mntfromname, mntbuf[n].f_mntonname,
+-                                          mntbuf[n].f_fstypename, ((mntbuf[n].f_flags & MNT_RDONLY) != 0), &mount_points);
++          exo_mount_point_add_if_matches (mask, device, folder, fstype,
++                                          mntbuf[n].f_mntfromname,
++                                          mntbuf[n].f_mntonname,
++                                          mntbuf[n].f_fstypename,
++                                          ((mntbuf[n].f_flag & MNT_RDONLY) != 0),
++                                          &mount_points);
+         }
+ 
+       /* release the buffer */
+       free (mntbuf);
+     }
+-#elif defined(HAVE_GETVFSSTAT) /* Newer NetBSD */
+-  struct statvfs *mntbuf = NULL;
+-  glong           bufsize = 0;
+-  gint            mntsize;
+-  gint            n;
++#elif defined(HAVE_GETFSSTAT) /* FreeBSD, OpenBSD, DragonFly, older NetBSD */
++  struct statfs *mntbuf = NULL;
++  glong          bufsize = 0;
++  gint           mntsize;
++  gint           n;
+ 
+   /* determine the number of active mount points */
+-  mntsize = getvfsstat (NULL, 0, MNT_NOWAIT);
++  mntsize = getfsstat (NULL, 0, MNT_NOWAIT);
+   if (G_LIKELY (mntsize > 0))
+     {
+       /* allocate a new buffer */
+       bufsize = (mntsize + 4) * sizeof (*mntbuf);
+-      mntbuf = (struct statvfs *) malloc (bufsize);
++      mntbuf = (struct statfs *) malloc (bufsize);
+ 
+       /* determine the mount point for the device file */
+-      mntsize = getvfsstat (mntbuf, bufsize, ST_NOWAIT);
++      mntsize = getfsstat (mntbuf, bufsize, MNT_NOWAIT);
+       for (n = 0; n < mntsize; ++n)
+         {
+           /* check if we have a match here */
+-          exo_mount_point_add_if_matches (mask, device, folder, fstype,
+-                                          mntbuf[n].f_mntfromname,
+-                                          mntbuf[n].f_mntonname,
+-                                          mntbuf[n].f_fstypename,
+-                                          ((mntbuf[n].f_flag & MNT_RDONLY) != 0),
+-                                          &mount_points);
++          exo_mount_point_add_if_matches (mask, device, folder, fstype, mntbuf[n].f_mntfromname, mntbuf[n].f_mntonname,
++                                          mntbuf[n].f_fstypename, ((mntbuf[n].f_flags & MNT_RDONLY) != 0), &mount_points);
+         }
+ 
+       /* release the buffer */