Fix most of the IRIX fam fallout mentioned in PR pkg/38639.

The gio/tests issue remains, but I couldn't reproduce it with GCC.

3 files changed, 39 insertions, 7 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 668f061ee4a..3910f9bfe45 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2008/05/10 17:13:11 jmcneill Exp $
+# $NetBSD: Makefile,v 1.137 2008/05/19 19:08:36 tnn Exp $
 
 # When updating glib2, please apply patch-ak to configure.in
 # Then run a matching version of autoconf to regen patch-aa.
@@ -81,6 +81,16 @@ SUBST_MESSAGE.thr=	Fixing libgthread.
 CONFIGURE_ENV+=		gt_cv_c_wchar_t=no
 .endif
 
+.if ${OPSYS} == "IRIX"
+SUBST_CLASSES+=			fam-linkage
+SUBST_STAGE.fam-linkage=	pre-configure
+SUBST_MESSAGE.fam-linkage=	Fixing fam linkage
+SUBST_FILES.fam-linkage=	gio/fam/Makefile.in
+SUBST_SED.fam-linkage=		-e 's,^FAM_LIBS =.*$$,FAM_LIBS = -lfam -lC,g'
+
+BUILDLINK_TRANSFORM+=		l:fam:fam:C
+.endif
+
 .if ${OPSYS} == "HPUX"
 CONFIGURE_ENV+=		ac_cv_func_mmap_fixed_mapped=yes
 .endif
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index c4b922f64a1..121637b7080 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.96 2008/05/10 17:13:11 jmcneill Exp $
+$NetBSD: distinfo,v 1.97 2008/05/19 19:08:36 tnn Exp $
 
 SHA1 (glib-2.16.3.tar.bz2) = f73fd53130a46f21ff4ee9faa69b9956787c571e
 RMD160 (glib-2.16.3.tar.bz2) = 72260f5f9022ee3f97b79b5705ad6117adc279fd
@@ -16,5 +16,5 @@ SHA1 (patch-aj) = a8c4e79113828e6dadf0b158777bb860aa44de3e
 SHA1 (patch-ak) = 4eee3ce549ba0972ab5d5d8166d37d2b61320e68
 SHA1 (patch-al) = aa2dbd63d53298aab3a30ec6d27e836717c960e3
 SHA1 (patch-ba) = 43dda2f4d89a82e645ef8f24d62f13ca9e4ddd9d
-SHA1 (patch-ca) = 8cfc2903cfb4faf42ec79da0acdc66446e0fb091
+SHA1 (patch-ca) = e6d852bd79bae271245c94f2d083671bd52af71c
 SHA1 (patch-cb) = 0a58d38bc6361f9d5f6f66f83f2f000e812f0507
diff --git a/devel/glib2/patches/patch-ca b/devel/glib2/patches/patch-ca
index 031a9b3d257..cd6ad066bde 100644
--- a/devel/glib2/patches/patch-ca
+++ b/devel/glib2/patches/patch-ca
@@ -1,8 +1,30 @@
-$NetBSD: patch-ca,v 1.1 2008/04/29 18:58:40 drochner Exp $
+$NetBSD: patch-ca,v 1.2 2008/05/19 19:08:36 tnn Exp $
 
---- gio/glocalfile.c.orig	2008-04-28 13:27:29.000000000 +0200
+--- gio/glocalfile.c.orig	2008-04-08 05:47:30.000000000 +0200
 +++ gio/glocalfile.c
-@@ -1580,7 +1580,8 @@ escape_trash_name (char *name)
+@@ -53,7 +53,7 @@
+ #if defined(HAVE_STATFS) && defined(HAVE_STATVFS)
+ /* Some systems have both statfs and statvfs, pick the
+    most "native" for these */
+-# if defined(sun) && defined(__SVR4)
++# if (defined(sun) && defined(__SVR4)) || defined(__sgi)
+    /* on solaris, statfs doesn't even have the
+       f_bavail field */
+ #  define USE_STATVFS
+@@ -1004,8 +1004,12 @@ g_local_file_query_filesystem_info (GFil
+ #if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME)
+   fstype = g_strdup(statfs_buffer.f_fstypename);
+ #else
++#if defined(__sgi)
++  fstype = get_fs_type (statfs_buffer.f_fstyp);
++#else
+   fstype = get_fs_type (statfs_buffer.f_type);
+ #endif
++#endif
+   if (fstype &&
+       g_file_attribute_matcher_matches (attribute_matcher,
+ 					G_FILE_ATTRIBUTE_FILESYSTEM_TYPE))
+@@ -1580,7 +1584,8 @@ escape_trash_name (char *name)
  gboolean
  _g_local_file_has_trash_dir (const char *dirname, dev_t dir_dev)
  {
@@ -12,7 +34,7 @@ $NetBSD: patch-ca,v 1.1 2008/04/29 18:58:40 drochner Exp $
    char *topdir, *globaldir, *trashdir, *tmpname;
    uid_t uid;
    char uid_str[32];
-@@ -1588,18 +1589,17 @@ _g_local_file_has_trash_dir (const char 
+@@ -1588,18 +1593,17 @@ _g_local_file_has_trash_dir (const char 
    gboolean res;
    int statres;