Fix build on DragonFly.

Confirmed by marino@ and Justin Sherrill.

2 files changed, 33 insertions, 8 deletions

diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index acb7931ff10..3f3a348eced 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.161 2012/02/16 15:09:54 drochner Exp $
+$NetBSD: distinfo,v 1.162 2012/03/01 15:06:19 ryoon Exp $
 
 SHA1 (glib-2.30.2.tar.bz2) = 70208757905037fa1f8b89797db0097c5e82a140
 RMD160 (glib-2.30.2.tar.bz2) = efe0d8ae945dd3b20ca4835dcb45696fd0914c06
 Size (glib-2.30.2.tar.bz2) = 7782266 bytes
-SHA1 (glib-gio-kqueue-2.28.8-v3.patch) = d50bee14ce72201c3ec2b82d0e498c8828fbd8c2
-RMD160 (glib-gio-kqueue-2.28.8-v3.patch) = ba4859d4336db50bacb6bdaace995ee761306a85
-Size (glib-gio-kqueue-2.28.8-v3.patch) = 89920 bytes
 SHA1 (patch-aa) = 44a3cc4b457ea75a3516d5c49155a3720bde515f
 SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
@@ -25,7 +22,7 @@ SHA1 (patch-aq) = aa7087b91c7d0eca9f9895feb6924df95eccb372
 SHA1 (patch-ar) = 27679e663399ffa1ca1ad95876084f05930bece3
 SHA1 (patch-as) = 0d9b461d5bf6d267b50eac892d8ad8a82f90be18
 SHA1 (patch-at) = f4c4a2fbe84eb8b361fb342f3c3b0b5a226d1794
-SHA1 (patch-ba) = 8d50fcbe3e9238bbf7bafee4c0ce627e34c3d9d2
+SHA1 (patch-ba) = 832c85a53565d323100da91ad514afd4960b38ca
 SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff
 SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54
 SHA1 (patch-cd) = d1c6fa921be58469adb6b860f4e91f0a7eff067e
diff --git a/devel/glib2/patches/patch-ba b/devel/glib2/patches/patch-ba
index 40309271fb8..d553cf643c3 100644
--- a/devel/glib2/patches/patch-ba
+++ b/devel/glib2/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.8 2012/01/29 10:46:54 drochner Exp $
+$NetBSD: patch-ba,v 1.9 2012/03/01 15:06:20 ryoon Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=583330
 
---- gio/gunixmounts.c.orig	2011-10-14 03:47:57.000000000 +0000
+--- gio/gunixmounts.c.orig	2011-11-11 17:56:52.000000000 +0000
 +++ gio/gunixmounts.c
 @@ -153,6 +153,9 @@ struct _GUnixMountMonitor {
  
@@ -62,6 +62,33 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
      "/var",
      "/var/crash",
      "/var/local",
+@@ -595,7 +609,7 @@ get_mtab_monitor_file (void)
+ static GList *
+ _g_get_unix_mounts (void)
+ {
+-#if defined(HAVE_GETVFSSTAT)
++#if defined(HAVE_GETVFSSTAT) && !defined(__DragonFly__)
+   struct statvfs *mntent = NULL;
+ #elif defined(HAVE_GETFSSTAT)
+   struct statfs *mntent = NULL;
+@@ -608,7 +622,7 @@ _g_get_unix_mounts (void)
+   GList *return_list;
+   
+   /* Pass NOWAIT to avoid blocking trying to update NFS mounts. */
+-#if defined(HAVE_GETVFSSTAT)
++#if defined(HAVE_GETVFSSTAT) && !defined(__DragonFly__)
+   num_mounts = getvfsstat (NULL, 0, ST_NOWAIT);
+ #elif defined(HAVE_GETFSSTAT)
+   num_mounts = getfsstat (NULL, 0, MNT_NOWAIT);
+@@ -618,7 +632,7 @@ _g_get_unix_mounts (void)
+ 
+   bufsize = num_mounts * sizeof (*mntent);
+   mntent = g_malloc (bufsize);
+-#if defined(HAVE_GETVFSSTAT)
++#if defined(HAVE_GETVFSSTAT) && !defined(__DragonFly__)
+   num_mounts = getvfsstat (mntent, bufsize, ST_NOWAIT);
+ #elif defined(HAVE_GETFSSTAT)
+   num_mounts = getfsstat (mntent, bufsize, MNT_NOWAIT);
 @@ -634,9 +648,15 @@ _g_get_unix_mounts (void)
        
        mount_entry->mount_path = g_strdup (mntent[i].f_mntonname);
@@ -70,8 +97,9 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
 +      mount_entry->filesystem_type = g_strdup ("unknown");
 +#else
        mount_entry->filesystem_type = g_strdup (mntent[i].f_fstypename);
+-#if defined(HAVE_GETVFSSTAT)
 +#endif
- #if defined(HAVE_GETVFSSTAT)
++#if defined(HAVE_GETVFSSTAT) && !defined(__DragonFly__)
        if (mntent[i].f_flag & ST_RDONLY)
 +#elif defined(__digital__)
 +      if (mntent[i].f_flags & M_RDONLY)