--- a/components/desktop/dbus-glib/libdbus-glib.p5m	Thu Nov 03 18:04:19 2016 -0700
+++ b/components/desktop/dbus-glib/libdbus-glib.p5m	Thu Nov 03 18:04:39 2016 -0700
@@ -67,6 +67,6 @@
 file path=usr/share/gtk-doc/html/dbus-glib/style.css
 file path=usr/share/gtk-doc/html/dbus-glib/up.png
 file path=usr/share/man/man1/dbus-binding-tool.1
-file files/libdbus-glib-1.3lib path=usr/share/man/man3/libdbus-glib-1.3lib
+file files/libdbus-glib-1.3lib path=usr/share/man/man3lib/libdbus-glib-1.3lib
 #
 license libdbus-glib.license license="libdbus-glib, GLPv2"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/dbus-glib/patches/dbus-glib-02-manpage.patch	Thu Nov 03 18:04:39 2016 -0700
@@ -0,0 +1,44 @@
+Fix some out of date Solarisism's that ended up in upstream man page.
+
+Need to contribute upstream.
+
+--- dbus-glib-0.102/doc/dbus-binding-tool.1
++++ dbus-glib-0.102/doc/dbus-binding-tool.1
+@@ -1,5 +1,5 @@
+ '\" te
+-.TH dbus-binding-tool 1 "26 Feb 2009" "SunOS 5.11" "User Commands"
++.TH dbus-binding-tool 1 "3 Nov 2016" "SunOS 5.12" "User Commands"
+ .SH "NAME"
+ dbus-binding-tool \- C language GLib bindings generation utility\&.
+ .SH "SYNOPSIS"
+@@ -264,20 +264,6 @@
+ .sp
+ .sp 1
+ .in -32n
+-.SH "ATTRIBUTES"
+-.PP
+-See \fBattributes\fR(5)
+-for descriptions of the following attributes:
+-.sp
+-.TS
+-tab() allbox;
+-cw(2.750000i)| cw(2.750000i)
+-lw(2.750000i)| lw(2.750000i).
+-ATTRIBUTE TYPEATTRIBUTE VALUE
+-AvailabilitySUNWdbus-bindings
+-Interface stabilityVolatile
+-.TE
+-.sp
+ .SH "SEE ALSO"
+ .PP
+ \fBdbus-cleanup-sockets\fR(1),
+@@ -286,7 +272,7 @@
+ \fBdbus-send\fR(1),
+ \fBdbus-uuidgen\fR(1),
+-\fBlibdbus-glib-1\fR(3),
+-\fBattributes\fR(5)
++\fBlibdbus-glib-1\fR(3lib),
++\fBattributes\fR(7)
+ .SH "NOTES"
+ .PP
+ Written by Brian Cameron, Sun Microsystems Inc\&., 2009\&.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/dbus/patches/dbus-05-manpage.patch	Thu Nov 03 18:04:39 2016 -0700
@@ -0,0 +1,51 @@
+Comment out Linux-specific sections on AppArmor & SELinux that do not apply on
+Solaris.   Remove comments that would be embedded inside these comments, since
+nested comments break the manpage generation.
+
+Need to figure out how to make configurable so we can submit upstream.
+
+--- dbus-1.10.0/doc/dbus-daemon.1.xml.in
++++ dbus-1.10.0/doc/dbus-daemon.1.xml.in
+@@ -765,6 +765,7 @@
+ almost certainly not what you intended.  Always use rules of
+ the form: &lt;deny send_interface="org.foo.Bar" send_destination="org.foo.Service"/&gt;</para>
+ 
++<!-- no SELinux or AppArmor support in Solaris
+ <itemizedlist remap='TP'>
+ 
+   <listitem><para><emphasis remap='I'>&lt;selinux&gt;</emphasis></para></listitem>
+@@ -786,7 +787,7 @@
+ creates a mapping. Right now only one kind of association is possible:</para>
+ <literallayout remap='.nf'>
+    &lt;associate own="org.freedesktop.Foobar" context="foo_t"/&gt;
+-</literallayout> <!-- .fi -->
++</literallayout>
+ 
+ 
+ <para>This means that if a connection asks to own the name
+@@ -803,7 +804,7 @@
+ we add this syntax it will look like:</para>
+ <literallayout remap='.nf'>
+    &lt;associate own="*" context="foo_t"/&gt;
+-</literallayout> <!-- .fi -->
++</literallayout>
+ <para>If you find a reason this is useful, let the developers know.
+ Right now the default will be the security context of the bus itself.</para>
+ 
+@@ -823,7 +824,7 @@
+ 
+ <literallayout remap='.nf'>
+    &lt;apparmor mode="(enabled|disabled|required)"/&gt;
+-</literallayout> <!-- .fi -->
++</literallayout>
+ 
+ <para>The default mode is "enabled". In "enabled" mode, AppArmor mediation
+ will be performed if AppArmor support is available in the kernel. If it is not
+@@ -931,6 +932,7 @@
+ <para>AppArmor rules for bus mediation are not stored in the bus configuration
+ files. They are stored in the application's AppArmor profile. Please see
+ <emphasis remap='I'>apparmor.d(5)</emphasis> for more details.</para>
++end SELinux / AppArmor support -->
+ 
+ </refsect1>
+