Make it build on FreeBSD and DragonFly.

3 files changed, 39 insertions, 15 deletions

diff --git a/sysutils/liboobs/distinfo b/sysutils/liboobs/distinfo
index 044da92a6eb..f794081cfe1 100644
--- a/sysutils/liboobs/distinfo
+++ b/sysutils/liboobs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2009/01/14 21:45:04 dsainty Exp $
+$NetBSD: distinfo,v 1.3 2009/07/12 10:33:12 hasso Exp $
 
 SHA1 (liboobs-2.22.0.tar.bz2) = 109282db84fc809df5ea10a4cfb8bb37863c8aca
 RMD160 (liboobs-2.22.0.tar.bz2) = 41d2149a05c779dfe8e53c77b77c41c58b927a7f
 Size (liboobs-2.22.0.tar.bz2) = 340348 bytes
-SHA1 (patch-aa) = 8cf12f4779eb68c82a7bf5880757350b32e33b38
+SHA1 (patch-aa) = 38cdd8ef252888fdfd1039ed237339b47955c736
 SHA1 (patch-ab) = 6dd631852cb10018920870189b6418ecfce3ee9e
-SHA1 (patch-ac) = adf650031c6e2f308ebd29aeed7c8c4f7edae5cb
+SHA1 (patch-ac) = 0d5ed64cfff454dab37745bf300ecb8ec5b02793
diff --git a/sysutils/liboobs/patches/patch-aa b/sysutils/liboobs/patches/patch-aa
index 19be6854722..a57a84e7021 100644
--- a/sysutils/liboobs/patches/patch-aa
+++ b/sysutils/liboobs/patches/patch-aa
@@ -1,12 +1,23 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/11/15 18:30:22 jmcneill Exp $
+$NetBSD: patch-aa,v 1.2 2009/07/12 10:33:12 hasso Exp $
 
---- oobs/oobs-group.c.orig	2008-11-15 09:06:29.000000000 -0500
-+++ oobs/oobs-group.c
-@@ -27,7 +27,11 @@
+--- oobs/oobs-group.c.orig	2008-01-02 16:07:38 +0200
++++ oobs/oobs-group.c	2009-07-12 10:43:25 +0300
+@@ -18,6 +18,10 @@
+  * Authors: Carlos Garnacho Parro  <carlosg@gnome.org>
+  */
+ 
++#if defined(HAVE_CONFIG_H)
++#include <config.h>
++#endif
++
+ #include <glib-object.h>
+ #include "oobs-session.h"
+ #include "oobs-group.h"
+@@ -27,7 +31,11 @@
  #include "oobs-usersconfig.h"
  #include "oobs-defines.h"
  #include "utils.h"
-+#ifndef __NetBSD__
++#ifdef HAVE_CRYPT_H
  #include <crypt.h>
 +#else
 +#include <unistd.h>
diff --git a/sysutils/liboobs/patches/patch-ac b/sysutils/liboobs/patches/patch-ac
index 54db8cb924c..8b16ead5bf3 100644
--- a/sysutils/liboobs/patches/patch-ac
+++ b/sysutils/liboobs/patches/patch-ac
@@ -1,13 +1,24 @@
-$NetBSD: patch-ac,v 1.2 2009/01/14 21:45:04 dsainty Exp $
+$NetBSD: patch-ac,v 1.3 2009/07/12 10:33:12 hasso Exp $
 
---- oobs/oobs-user.c.orig	2008-11-15 09:03:02.000000000 -0500
-+++ oobs/oobs-user.c
-@@ -23,8 +23,18 @@
+--- oobs/oobs-user.c.orig	2008-01-02 16:23:56 +0200
++++ oobs/oobs-user.c	2009-07-12 10:44:15 +0300
+@@ -18,13 +18,29 @@
+  * Authors: Carlos Garnacho Parro  <carlosg@gnome.org>
+  */
+ 
++#if defined(HAVE_CONFIG_H)
++#include <config.h>
++#endif
++
+ #include <glib-object.h>
+ #include <sys/types.h>
  #include <unistd.h>
  #include <stdlib.h>
  #include <string.h>
-+#ifndef __NetBSD__
++#ifdef HAVE_CRYPT_H
  #include <crypt.h>
++#endif
++#ifndef __NetBSD__
  #include <utmp.h>
 +#define UTMP utmp
 +#define GETUTENT getutent
@@ -21,7 +32,7 @@ $NetBSD: patch-ac,v 1.2 2009/01/14 21:45:04 dsainty Exp $
  
  #include "oobs-usersconfig.h"
  #include "oobs-user.h"
-@@ -804,7 +815,7 @@ oobs_user_set_other_data (OobsUser *user
+@@ -804,7 +820,7 @@ oobs_user_set_other_data (OobsUser *user
  gboolean
  oobs_user_get_active (OobsUser *user)
  {
@@ -30,11 +41,12 @@ $NetBSD: patch-ac,v 1.2 2009/01/14 21:45:04 dsainty Exp $
    const gchar *login;
    gboolean match = FALSE;
  
-@@ -812,14 +823,14 @@ oobs_user_get_active (OobsUser *user)
+@@ -812,14 +828,16 @@ oobs_user_get_active (OobsUser *user)
  
    login = oobs_user_get_login_name (user);
  
 -  while (!match && (entry = getutent ()) != NULL)
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
 +  while (!match && (entry = GETUTENT ()) != NULL)
      {
        match = (entry->ut_type == USER_PROCESS &&
@@ -46,4 +58,5 @@ $NetBSD: patch-ac,v 1.2 2009/01/14 21:45:04 dsainty Exp $
 +  ENDUTENT ();
  
    return match;
++#endif
  }