Add #ifdef __OpenBSD__ to some of the patches, to fix compilation on

OpenBSD and MirBSD.

Freeze exception granted by wiz.

5 files changed, 14 insertions, 14 deletions

diff --git a/security/policykit/distinfo b/security/policykit/distinfo
index ba4c4005d42..25ccf376625 100644
--- a/security/policykit/distinfo
+++ b/security/policykit/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.7 2009/01/20 10:08:17 sketch Exp $
+$NetBSD: distinfo,v 1.8 2012/12/27 21:04:11 bsiegert Exp $
 
 SHA1 (PolicyKit-0.9.tar.gz) = ac99c580eff72f6d5df261c155fb047306439f85
 RMD160 (PolicyKit-0.9.tar.gz) = 197262d1c48e55558dd4bd57d7bbd8734666129c
 Size (PolicyKit-0.9.tar.gz) = 1254318 bytes
-SHA1 (patch-aa) = 31f10985b2b9105aa260fd79a684468ca345ed7d
-SHA1 (patch-ab) = 32d9ecafd84ebf1329b17d4f5df9845591865772
+SHA1 (patch-aa) = ca43b0c66a2b4370b25aeed8c8ce19f2df6fd1cb
+SHA1 (patch-ab) = f79b7d55e8b414d0bd04680dceb7d5b0b6ab074c
 SHA1 (patch-ac) = cf4b1fcfec1f079c015672235996c5331801fb48
 SHA1 (patch-ad) = 7d34235b9672680a146fe676d84ccaa09432f52c
 SHA1 (patch-ae) = b6a8c945de5cd7e605494d8575075e74c58da6a1
-SHA1 (patch-af) = c15988b60a99443469a0399935bc51f99da4b454
-SHA1 (patch-ag) = bfa1a32a26d80a3cbc90144ae137d4ad06832e61
+SHA1 (patch-af) = 93c5cc1ca06a2fc4b1b21ee743978e972dd57594
+SHA1 (patch-ag) = 763d1c93986a19b04fbd84f19e22a3095db7f834
 SHA1 (patch-ah) = a1ae419a77bb3c8be02706bb67476af9443af92a
 SHA1 (patch-ai) = 9ec3744b394b0f6181a8a3367f0ce93e32b7fc4f
 SHA1 (patch-aj) = 596b9eb54173e25176ba0f363e4b2c4c137dd89f
diff --git a/security/policykit/patches/patch-aa b/security/policykit/patches/patch-aa
index d74cd70d00d..d7af6be5b4e 100644
--- a/security/policykit/patches/patch-aa
+++ b/security/policykit/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2008/12/20 19:44:00 jmcneill Exp $
+$NetBSD: patch-aa,v 1.4 2012/12/27 21:04:11 bsiegert Exp $
 
 --- src/polkit-dbus/polkit-resolve-exe-helper.c.orig	2008-05-30 17:24:44.000000000 -0400
 +++ src/polkit-dbus/polkit-resolve-exe-helper.c
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.3 2008/12/20 19:44:00 jmcneill Exp $
  #include <sys/types.h>
  #include <sys/stat.h>
 -#ifdef HAVE_FREEBSD
-+#if defined(HAVE_FREEBSD) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__APPLE__)
++#if defined(HAVE_FREEBSD) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__APPLE__) || defined(__OpenBSD__)
  #include <sys/param.h>
  #endif
  #include <security/pam_appl.h>
diff --git a/security/policykit/patches/patch-ab b/security/policykit/patches/patch-ab
index fd6a8c43320..46212f2b93a 100644
--- a/security/policykit/patches/patch-ab
+++ b/security/policykit/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2008/11/23 21:21:43 hasso Exp $
+$NetBSD: patch-ab,v 1.3 2012/12/27 21:04:11 bsiegert Exp $
 
 --- tools/polkit-auth.c.orig	2008-05-30 17:24:44.000000000 -0400
 +++ tools/polkit-auth.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.2 2008/11/23 21:21:43 hasso Exp $
  #include <string.h>
  #include <sys/types.h>
 -#if defined(HAVE_SOLARIS) || defined(HAVE_FREEBSD)
-+#if defined(HAVE_SOLARIS) || defined(HAVE_FREEBSD) || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(HAVE_SOLARIS) || defined(HAVE_FREEBSD) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
  #include <sys/wait.h>
  #endif
  #include <pwd.h>
diff --git a/security/policykit/patches/patch-af b/security/policykit/patches/patch-af
index e0de72c766c..07dc7d2b5bb 100644
--- a/security/policykit/patches/patch-af
+++ b/security/policykit/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2008/11/23 21:21:43 hasso Exp $
+$NetBSD: patch-af,v 1.3 2012/12/27 21:04:11 bsiegert Exp $
 
 --- src/polkit/polkit-sysdeps.c.orig	2008-11-21 22:17:08.000000000 -0500
 +++ src/polkit/polkit-sysdeps.c
@@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.2 2008/11/23 21:21:43 hasso Exp $
          start_time = (unsigned long long) (info.pr_start.tv_sec);
  #else
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
  	filename = kit_strdup_printf ("/proc/%d/status", pid);
  #else
          filename = kit_strdup_printf ("/proc/%d/stat", pid);
@@ -16,7 +16,7 @@ $NetBSD: patch-af,v 1.2 2008/11/23 21:21:43 hasso Exp $
          }
  
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
          tokens = kit_strsplit (contents, ' ', &num_tokens);
          if (tokens == NULL)
                  goto out;
diff --git a/security/policykit/patches/patch-ag b/security/policykit/patches/patch-ag
index e3abac857a2..aee9ffa0a32 100644
--- a/security/policykit/patches/patch-ag
+++ b/security/policykit/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1 2008/11/23 21:21:43 hasso Exp $
+$NetBSD: patch-ag,v 1.2 2012/12/27 21:04:11 bsiegert Exp $
 
 --- src/polkit/polkit-config.c.orig	2008-11-23 22:37:33 +0200
 +++ src/polkit/polkit-config.c	2008-11-23 22:44:41 +0200
@@ -6,7 +6,7 @@ $NetBSD: patch-ag,v 1.1 2008/11/23 21:21:43 hasso Exp $
                  
                  str1 = kit_strdup_printf ("%d", uid);
                  {
-+#ifndef __DragonFly__
++#if !defined(__DragonFly__) && !defined(__OpenBSD__)
                          struct passwd pd;
                          struct passwd* pwdptr=&pd;
                          struct passwd* tempPwdPtr;