Make this work on FreeBSD 5.x systems, where SC_GETPW_R_SIZE_MAX

still is not implemented. This closes my own PR pkg/21909. Reviewed
by wiz@

3 files changed, 39 insertions, 1 deletions

diff --git a/devel/glib/distinfo b/devel/glib/distinfo
index 7d50459f88e..be5a7cffb6d 100644
--- a/devel/glib/distinfo
+++ b/devel/glib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/10/30 03:09:30 rh Exp $
+$NetBSD: distinfo,v 1.9 2003/09/05 16:54:49 xtraeme Exp $
 
 SHA1 (glib-1.2.10.tar.gz) = e5a9361c594608d152d5d9650154c2e3260b87fa
 Size (glib-1.2.10.tar.gz) = 421480 bytes
@@ -7,4 +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-ai) = 8c81ff9ed494a00663ce92afc889050a4eb37218
diff --git a/devel/glib/patches/patch-af b/devel/glib/patches/patch-af
new file mode 100644
index 00000000000..c6e6920f5fb
--- /dev/null
+++ b/devel/glib/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.4 2003/09/05 16:54:50 xtraeme Exp $
+
+--- gutils.c.orig	2003-09-04 22:39:55.000000000 +0200
++++ gutils.c	2003-09-04 22:41:06.000000000 +0200
+@@ -483,6 +483,9 @@
+ #    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 */
++#endif  /* __FreeBSD__ */
+ #    else /* _SC_GETPW_R_SIZE_MAX */
+         guint bufsize = 64;
+ #    endif /* _SC_GETPW_R_SIZE_MAX */
diff --git a/devel/glib/patches/patch-ag b/devel/glib/patches/patch-ag
new file mode 100644
index 00000000000..c6eb822fce6
--- /dev/null
+++ b/devel/glib/patches/patch-ag
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.4 2003/09/05 16:54:50 xtraeme 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 @@
+ static gpointer
+ _g_module_self (void)
+ {
++#ifndef __FreeBSD__
+   gpointer handle;
+   
+   /* to query symbols from the program itself, special link options
+@@ -111,6 +112,9 @@
+     g_module_set_error (fetch_dlerror ());
+   
+   return handle;
++#else
++  return RTLD_DEFAULT;
++#endif
+ }
+ 
+ static void