Add some patches for MirBSD support. More to come, but these are at least

sufficient to make glib2 build successfully.

4 files changed, 55 insertions, 25 deletions

diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index f7c88bf642b..ce4cb950798 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.166 2012/04/06 11:08:55 wiz Exp $
+$NetBSD: distinfo,v 1.167 2012/04/10 19:48:17 bsiegert Exp $
 
 SHA1 (glib-2.30.3.tar.xz) = ec97dd659862dca05d18093a6ea6c309dcff0cdd
 RMD160 (glib-2.30.3.tar.xz) = 0887b08e2fff75c325ed1fb1123baaf42dc9779b
@@ -20,8 +20,8 @@ SHA1 (patch-ak) = 5190e6d3b2a333ac83968a044755e1a139bf4460
 SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e
 SHA1 (patch-am) = 062d3d295f00485ac3c3839dd4697957ebc66772
 SHA1 (patch-an) = 9384dca0b98bde4e2d64dbca6584a3aefa0c352c
-SHA1 (patch-ap) = 38a805f95e8f7ca35c73984be9142336c6a3ec4c
-SHA1 (patch-aq) = aa7087b91c7d0eca9f9895feb6924df95eccb372
+SHA1 (patch-ap) = eeabf999a65cc51bc792798e4d81fef2ad35837b
+SHA1 (patch-aq) = dd816807ccbce20ef4ad959d5ee3bc7750491890
 SHA1 (patch-ar) = 93bf22a9debef8deb97918adeeaee5830280038b
 SHA1 (patch-as) = 0d9b461d5bf6d267b50eac892d8ad8a82f90be18
 SHA1 (patch-at) = f4c4a2fbe84eb8b361fb342f3c3b0b5a226d1794
@@ -39,3 +39,4 @@ SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2
 SHA1 (patch-cl) = 42eb60fc66b881368f6f5f71d1fc5869f82db1b1
 SHA1 (patch-cm) = 7f14ab327d021537714f876fbfbd4b0350d98a6e
 SHA1 (patch-cn) = b930dc95d44eacc9448f2a3a799a95db2880bfd4
+SHA1 (patch-glib_goption.c) = 323297aa328b85493f156792b4baa0cb04fa82ad
diff --git a/devel/glib2/patches/patch-ap b/devel/glib2/patches/patch-ap
index 480f554e1ce..c0385cb97c0 100644
--- a/devel/glib2/patches/patch-ap
+++ b/devel/glib2/patches/patch-ap
@@ -1,6 +1,6 @@
-$NetBSD: patch-ap,v 1.2 2012/01/29 10:46:54 drochner Exp $
+$NetBSD: patch-ap,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
 
---- gio/gcredentials.c.orig	2011-08-16 00:51:30.000000000 +0000
+--- gio/gcredentials.c.orig	Tue Aug 16 00:51:06 2011
 +++ gio/gcredentials.c
 @@ -32,6 +32,9 @@
  #include <sys/socket.h>
@@ -12,11 +12,14 @@ $NetBSD: patch-ap,v 1.2 2012/01/29 10:46:54 drochner Exp $
  #include <stdlib.h>
  
  #include <gobject/gvaluecollector.h>
-@@ -92,6 +95,12 @@ struct _GCredentials
+@@ -90,8 +93,14 @@ struct _GCredentials
+   struct ucred native;
+ #elif defined(__FreeBSD__)
    struct cmsgcred native;
- #elif defined(__OpenBSD__)
+-#elif defined(__OpenBSD__)
++#elif defined(__OpenBSD__) && !defined(__MirBSD__)
    struct sockpeercred native;
-+#elif defined(__NetBSD__)
++#elif defined(__NetBSD__) || defined(__MirBSD__)
 +  struct {
 +    pid_t pid;
 +    uid_t uid;
@@ -30,7 +33,7 @@ $NetBSD: patch-ap,v 1.2 2012/01/29 10:46:54 drochner Exp $
  g_credentials_init (GCredentials *credentials)
  {
 -#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__)
++#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
    credentials->native.pid = getpid ();
    credentials->native.uid = geteuid ();
    credentials->native.gid = getegid ();
@@ -39,7 +42,7 @@ $NetBSD: patch-ap,v 1.2 2012/01/29 10:46:54 drochner Exp $
  
    ret = g_string_new ("GCredentials:");
 -#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__)
++#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
    g_string_append (ret, "linux-ucred:");
    if (credentials->native.pid != -1)
      g_string_append_printf (ret, "pid=%" G_GINT64_FORMAT ",", (gint64) credentials->native.pid);
@@ -48,7 +51,7 @@ $NetBSD: patch-ap,v 1.2 2012/01/29 10:46:54 drochner Exp $
  
    ret = FALSE;
 -#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__)
++#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
    if (credentials->native.uid == other_credentials->native.uid)
      ret = TRUE;
  #elif defined(__FreeBSD__)
@@ -57,7 +60,7 @@ $NetBSD: patch-ap,v 1.2 2012/01/29 10:46:54 drochner Exp $
    ret = NULL;
  
 -#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__)
++#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
    if (native_type != G_CREDENTIALS_TYPE_LINUX_UCRED)
      {
        g_warning ("g_credentials_get_native: Trying to get credentials of type %d but only "
@@ -66,7 +69,7 @@ $NetBSD: patch-ap,v 1.2 2012/01/29 10:46:54 drochner Exp $
                            gpointer          native)
  {
 -#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__)
++#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
    if (native_type != G_CREDENTIALS_TYPE_LINUX_UCRED)
      {
        g_warning ("g_credentials_set_native: Trying to set credentials of type %d "
@@ -84,7 +87,7 @@ $NetBSD: patch-ap,v 1.2 2012/01/29 10:46:54 drochner Exp $
    g_return_val_if_fail (error == NULL || *error == NULL, -1);
  
 -#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__)
++#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
    ret = credentials->native.uid;
  #elif defined(__FreeBSD__)
    ret = credentials->native.cmcred_euid;
@@ -93,7 +96,7 @@ $NetBSD: patch-ap,v 1.2 2012/01/29 10:46:54 drochner Exp $
  
    ret = FALSE;
 -#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__)
++#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
    credentials->native.uid = uid;
    ret = TRUE;
  #elif defined(__FreeBSD__)
diff --git a/devel/glib2/patches/patch-aq b/devel/glib2/patches/patch-aq
index c8dd98c25c1..0afd22501ea 100644
--- a/devel/glib2/patches/patch-aq
+++ b/devel/glib2/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.2 2011/03/13 11:31:57 drochner Exp $
+$NetBSD: patch-aq,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
 
---- gio/gsocket.c.orig	2011-02-11 15:23:12.000000000 +0000
+--- gio/gsocket.c.orig	Sun Mar 11 21:43:04 2012
 +++ gio/gsocket.c
-@@ -33,6 +33,9 @@
+@@ -37,6 +37,9 @@
  #include <signal.h>
  #include <string.h>
  #include <stdlib.h>
@@ -12,10 +12,21 @@ $NetBSD: patch-aq,v 1.2 2011/03/13 11:31:57 drochner Exp $
  
  #ifndef G_OS_WIN32
  # include <fcntl.h>
-@@ -3540,6 +3543,35 @@ g_socket_get_credentials (GSocket   *soc
+@@ -3556,7 +3559,7 @@ g_socket_get_credentials (GSocket   *soc
+ 
+   ret = NULL;
+ 
+-#if defined(__linux__) || defined(__OpenBSD__)
++#if defined(__linux__) || (defined(__OpenBSD__) && !defined(__MirBSD__))
+   {
+     socklen_t optlen;
+ #if defined(__linux__)
+@@ -3589,6 +3592,35 @@ g_socket_get_credentials (GSocket   *soc
+                                   G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED,
+ #endif
                                    &native_creds);
-       }
-   }
++      }
++  }
 +#elif defined(__NetBSD__) && defined(LOCAL_PEEREID)
 +  {
 +    struct unpcbid cred;
@@ -43,8 +54,6 @@ $NetBSD: patch-aq,v 1.2 2011/03/13 11:31:57 drochner Exp $
 +	g_credentials_set_native (ret,
 +				  G_CREDENTIALS_TYPE_LINUX_UCRED,
 +				  &native_creds);
-+      }
-+  }
+       }
+   }
  #else
-   g_set_error_literal (error,
-                        G_IO_ERROR,
diff --git a/devel/glib2/patches/patch-glib_goption.c b/devel/glib2/patches/patch-glib_goption.c
new file mode 100644
index 00000000000..17ce5c9cc70
--- /dev/null
+++ b/devel/glib2/patches/patch-glib_goption.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-glib_goption.c,v 1.1 2012/04/10 19:48:17 bsiegert Exp $
+
+This is needed on MirBSD, which does not have nitems
+in sys/param.h, contrary to OpenBSD.
+--- glib/goption.c.orig	Sun Mar 11 22:19:05 2012
++++ glib/goption.c
+@@ -146,6 +146,10 @@
+ #include <sys/sysctl.h>
+ #endif
+ 
++#ifndef nitems
++#define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
++#endif
++
+ #include "goption.h"
+ 
+ #include "gprintf.h"