3 files changed, 33 insertions, 1 deletions
diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo
index 38994895f1c..2f9766fe078 100644
--- a/sysutils/dbus/distinfo
+++ b/sysutils/dbus/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2012/08/01 17:52:21 drochner Exp $
+$NetBSD: distinfo,v 1.40 2012/08/09 10:21:19 jperkin Exp $
 
 SHA1 (dbus-1.6.4.tar.gz) = 17e619f008301592b7f01a60e7cf18e2752b5270
 RMD160 (dbus-1.6.4.tar.gz) = 041ad41c26f38647f3da8d7f0cb548c979521def
@@ -9,3 +9,5 @@ SHA1 (patch-ak) = fcb0cad1b6e306db03d538d4ca65f4a18d4726ab
 SHA1 (patch-al) = 3f9f793b0c1455bf2bf079cc27b841c22f42c276
 SHA1 (patch-am) = 8c794ff8b0981e90243ee20c26ae1ecc72e68de8
 SHA1 (patch-ba) = ceb8e0c424c57410f8c3775087e4cae1b44da4c5
+SHA1 (patch-configure) = 829024482acb89fa12fa47fd42b171cc02efbb89
+SHA1 (patch-dbus_dbus-sysdeps-util-unix.c) = 79ff84b20dff597001e4e150c9ab27b05d6ff2a1
diff --git a/sysutils/dbus/patches/patch-configure b/sysutils/dbus/patches/patch-configure
new file mode 100644
index 00000000000..38d6d30153d
--- /dev/null
+++ b/sysutils/dbus/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2012/08/09 10:21:19 jperkin Exp $
+
+Require _XOPEN_SOURCE=600 on Solaris for sockaddr_in6 and sockaddr_storage.
+
+--- configure.orig	Thu Aug  9 09:32:17 2012
++++ configure	Thu Aug  9 09:36:08 2012
+@@ -21706,7 +21706,7 @@
+         # Solaris' C library apparently needs these runes to be threadsafe...
+         CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT"
+         # ... and this opt-in to get file descriptor passing support
+-        CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500"
++        CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__"
+         ;;
+ esac
+ 
diff --git a/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-util-unix.c b/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-util-unix.c
new file mode 100644
index 00000000000..d57b676505e
--- /dev/null
+++ b/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-util-unix.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-dbus_dbus-sysdeps-util-unix.c,v 1.1 2012/08/09 10:21:19 jperkin Exp $
+
+HAVE_DECL_LOG_PERROR is always defined, we care more whether it is 0 or 1.
+
+--- dbus/dbus-sysdeps-util-unix.c.orig	Thu Aug  9 10:07:27 2012
++++ dbus/dbus-sysdeps-util-unix.c	Thu Aug  9 10:07:33 2012
+@@ -424,7 +424,7 @@
+ void
+ _dbus_init_system_log (void)
+ {
+-#ifdef HAVE_DECL_LOG_PERROR
++#if HAVE_DECL_LOG_PERROR
+   openlog ("dbus", LOG_PID | LOG_PERROR, LOG_DAEMON);
+ #else
+   openlog ("dbus", LOG_PID, LOG_DAEMON);