Make FreeBSD patch for ld.so semantic differences between linux and bsd

apply for NetBSD too: this closes PR/21452 (problem with gnucash not
finding its symbols in dynamically loaded modules) for -currentish
installations (this needs RTLD_DEFAULT support in ld_elf.so).
1.6 installations still suffer unless a -current ld_elf.so and
/usr/include/dlfcn.h are installed, sorry.

Make other FreeBSD-specific patch apply too since it looks sensible
(adds error checking).

3 files changed, 14 insertions, 14 deletions

diff --git a/devel/glib/distinfo b/devel/glib/distinfo
index be5a7cffb6d..13c562962b6 100644
--- a/devel/glib/distinfo
+++ b/devel/glib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2003/09/05 16:54:49 xtraeme Exp $
+$NetBSD: distinfo,v 1.10 2004/02/08 23:22:45 mjl Exp $
 
 SHA1 (glib-1.2.10.tar.gz) = e5a9361c594608d152d5d9650154c2e3260b87fa
 Size (glib-1.2.10.tar.gz) = 421480 bytes
@@ -7,6 +7,6 @@ SHA1 (patch-ab) = 56e5035d8c144733752e38e0c1e790dfe44f87b7
 SHA1 (patch-ac) = ab176e926d9fee6d463096ad3853e06718129acc
 SHA1 (patch-ad) = a7c10916ccaef52a62415d129060a6dddbc5fbd8
 SHA1 (patch-ae) = 222a1f4c470fd1123deb3b4dd918b036b3607e59
-SHA1 (patch-af) = 3292d96121329583be5bf0ac573d2cec297b5d52
-SHA1 (patch-ag) = a0b4009a24474c1b037614f2ae0660a39c11d1b7
+SHA1 (patch-af) = 8fa1db64eb7a44e83e9e2ad483b12cf9fe50341e
+SHA1 (patch-ag) = efdff0d20a1c3280c9916405a8d89190c68b9604
 SHA1 (patch-ai) = 8c81ff9ed494a00663ce92afc889050a4eb37218
diff --git a/devel/glib/patches/patch-af b/devel/glib/patches/patch-af
index c6e6920f5fb..5dad7127fe6 100644
--- a/devel/glib/patches/patch-af
+++ b/devel/glib/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.4 2003/09/05 16:54:50 xtraeme Exp $
+$NetBSD: patch-af,v 1.5 2004/02/08 23:22:45 mjl Exp $
 
 --- gutils.c.orig	2003-09-04 22:39:55.000000000 +0200
 +++ gutils.c	2003-09-04 22:41:06.000000000 +0200
@@ -6,8 +6,8 @@ $NetBSD: patch-af,v 1.4 2003/09/05 16:54:50 xtraeme Exp $
  #    ifdef _SC_GETPW_R_SIZE_MAX  
          /* This reurns the maximum length */
          guint bufsize = sysconf (_SC_GETPW_R_SIZE_MAX);
-+#ifdef __FreeBSD__
-+	if (bufsize == UINT_MAX) bufsize = 64; /* XXX Correct for unimpelemented SC */
++#if defined(__FreeBSD__) || defined(__NetBSD__)
++	if (bufsize == (guint) -1) bufsize = 64; /* XXX Correct for unimpelemented SC */
 +#endif  /* __FreeBSD__ */
  #    else /* _SC_GETPW_R_SIZE_MAX */
          guint bufsize = 64;
diff --git a/devel/glib/patches/patch-ag b/devel/glib/patches/patch-ag
index c6eb822fce6..5751ab929ed 100644
--- a/devel/glib/patches/patch-ag
+++ b/devel/glib/patches/patch-ag
@@ -1,21 +1,21 @@
-$NetBSD: patch-ag,v 1.4 2003/09/05 16:54:50 xtraeme Exp $
+$NetBSD: patch-ag,v 1.5 2004/02/08 23:22:45 mjl Exp $
 
---- gmodule/gmodule-dl.c.orig	2003-09-04 22:41:48.000000000 +0200
-+++ gmodule/gmodule-dl.c	2003-09-04 22:42:43.000000000 +0200
-@@ -100,6 +100,7 @@
+--- gmodule/gmodule-dl.c.orig	Tue Feb 27 04:44:38 2001
++++ gmodule/gmodule-dl.c	Sun Feb  8 23:38:59 2004
+@@ -100,6 +100,9 @@
  static gpointer
  _g_module_self (void)
  {
-+#ifndef __FreeBSD__
++#if defined(__FreeBSD__) || (defined(__NetBSD__) && defined(RTLD_DEFAULT))
++  return RTLD_DEFAULT;
++#else
    gpointer handle;
    
    /* to query symbols from the program itself, special link options
-@@ -111,6 +112,9 @@
+@@ -111,6 +114,7 @@
      g_module_set_error (fetch_dlerror ());
    
    return handle;
-+#else
-+  return RTLD_DEFAULT;
 +#endif
  }