PR# pkg/40230: "libvolume_id" doesn't build under Mac OS X

Fix PolicyKit build on OSX.

5 files changed, 45 insertions, 5 deletions

diff --git a/security/policykit/Makefile b/security/policykit/Makefile
index 934ee6776d6..a514e372698 100644
--- a/security/policykit/Makefile
+++ b/security/policykit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/11/26 08:22:24 hasso Exp $
+# $NetBSD: Makefile,v 1.6 2008/12/20 19:44:00 jmcneill Exp $
 #
 
 POLICYKIT_VER=		0.9
@@ -52,6 +52,10 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/PolicyKit.conf.NetBSD ${DESTDIR}${EGDIR}/PolicyKit.conf
 .endif
 
+.if ${OPSYS} == "Darwin"
+BUILDLINK_TRANSFORM+=	rm:-Wl,--as-needed
+.endif
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/xmlcatmgr/buildlink3.mk"
diff --git a/security/policykit/distinfo b/security/policykit/distinfo
index 03992e6b688..a8a0c0baf95 100644
--- a/security/policykit/distinfo
+++ b/security/policykit/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2008/12/15 15:06:43 rillig Exp $
+$NetBSD: distinfo,v 1.5 2008/12/20 19:44:00 jmcneill 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) = aa47d66e3d514c56766f363ae08f222d65ad7c79
+SHA1 (patch-aa) = 31f10985b2b9105aa260fd79a684468ca345ed7d
 SHA1 (patch-ab) = 32d9ecafd84ebf1329b17d4f5df9845591865772
 SHA1 (patch-ac) = cf4b1fcfec1f079c015672235996c5331801fb48
 SHA1 (patch-ad) = 7d34235b9672680a146fe676d84ccaa09432f52c
@@ -13,4 +13,6 @@ SHA1 (patch-ag) = bfa1a32a26d80a3cbc90144ae137d4ad06832e61
 SHA1 (patch-ah) = a1ae419a77bb3c8be02706bb67476af9443af92a
 SHA1 (patch-ai) = 9ec3744b394b0f6181a8a3367f0ce93e32b7fc4f
 SHA1 (patch-aj) = 596b9eb54173e25176ba0f363e4b2c4c137dd89f
+SHA1 (patch-ak) = d31933a6bb836311837c62a2fcf43b105d5464cf
+SHA1 (patch-al) = cd87d1c39bb38c70b8fa3170e90c641cc0029dc3
 SHA1 (patch-authdb) = 449b8ac50f81cc0234e17e64bc9892ade7119028
diff --git a/security/policykit/patches/patch-aa b/security/policykit/patches/patch-aa
index 8f8d7b1bff4..d74cd70d00d 100644
--- a/security/policykit/patches/patch-aa
+++ b/security/policykit/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2008/11/23 21:21:43 hasso Exp $
+$NetBSD: patch-aa,v 1.3 2008/12/20 19:44:00 jmcneill 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.2 2008/11/23 21:21:43 hasso Exp $
  #include <sys/types.h>
  #include <sys/stat.h>
 -#ifdef HAVE_FREEBSD
-+#if defined(HAVE_FREEBSD) || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(HAVE_FREEBSD) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__APPLE__)
  #include <sys/param.h>
  #endif
  #include <security/pam_appl.h>
diff --git a/security/policykit/patches/patch-ak b/security/policykit/patches/patch-ak
new file mode 100644
index 00000000000..f7fbd034897
--- /dev/null
+++ b/security/policykit/patches/patch-ak
@@ -0,0 +1,17 @@
+$NetBSD: patch-ak,v 1.1 2008/12/20 19:44:00 jmcneill Exp $
+
+--- src/kit/kit-lib.c.orig	2008-12-20 14:29:40.000000000 -0500
++++ src/kit/kit-lib.c	2008-12-20 14:30:22.000000000 -0500
+@@ -118,7 +118,12 @@ kit_getline (char **lineptr, size_t *n, 
+ #endif
+ 
+ #ifndef HAVE_CLEARENV
++#ifdef __APPLE__
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++#else
+ extern char **environ;
++#endif
+ 
+ int
+ kit_clearenv (void)
diff --git a/security/policykit/patches/patch-al b/security/policykit/patches/patch-al
new file mode 100644
index 00000000000..e6b22025a99
--- /dev/null
+++ b/security/policykit/patches/patch-al
@@ -0,0 +1,17 @@
+$NetBSD: patch-al,v 1.1 2008/12/20 19:44:00 jmcneill Exp $
+
+--- src/polkit-dbus/polkit-simple.c.orig	2008-12-20 14:30:39.000000000 -0500
++++ src/polkit-dbus/polkit-simple.c	2008-12-20 14:30:47.000000000 -0500
+@@ -253,7 +253,12 @@ out:
+         return ret;
+ }
+ 
++#ifdef __APPLE__
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++#else
+ extern char **environ;
++#endif
+ 
+ static polkit_bool_t
+ _auth_show_dialog_text (const char *action_id, pid_t pid, DBusError *error)