8 files changed, 10 insertions, 123 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index d9f965b39304..44c6ef874df5 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dbus
-PORTVERSION=	0.35.2
+PORTVERSION=	0.36.1
 PORTREVISION?=	0
 CATEGORIES?=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index 6094dcd539e0..6bee7a3796aa 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,2 +1,2 @@
-MD5 (dbus-0.35.2.tar.gz) = 414680dddd3dec84cc3b0c45cdfaafbc
-SIZE (dbus-0.35.2.tar.gz) = 1583871
+MD5 (dbus-0.36.1.tar.gz) = 48bcfc0806bb7bc914cc5cd2f7d40d69
+SIZE (dbus-0.36.1.tar.gz) = 1596804
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps.c b/devel/dbus/files/patch-dbus_dbus-sysdeps.c
index 87b667d46573..66c5480d7908 100644
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps.c
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps.c
@@ -1,12 +1,12 @@
---- dbus/dbus-sysdeps.c.orig	Thu Jun 16 01:51:46 2005
-+++ dbus/dbus-sysdeps.c	Sat Jul 16 02:55:41 2005
+--- dbus/dbus-sysdeps.c.orig	Wed Aug  3 13:42:56 2005
++++ dbus/dbus-sysdeps.c	Wed Aug 24 00:36:20 2005
 @@ -742,16 +742,16 @@ write_credentials_byte (int             
  {
    int bytes_written;
    char buf[1] = { '\0' };
 -#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
 -  struct {
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
++#if defined(HAVE_CMSGCRED)
 +  union {
  	  struct cmsghdr hdr;
 -	  struct cmsgcred cred;
@@ -17,7 +17,7 @@
  #endif
  
 -#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
++#if defined(HAVE_CMSGCRED)
    iov.iov_base = buf;
    iov.iov_len = 1;
  
@@ -40,7 +40,7 @@
   again:
  
 -#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
++#if defined(HAVE_CMSGCRED)
    bytes_written = sendmsg (server_fd, &msg, 0);
  #else
    bytes_written = write (server_fd, buf, 1);
@@ -62,7 +62,7 @@
    _dbus_credentials_clear (credentials);
  
 -#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED)
-+#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED) && !defined(__FreeBSD__)
++#if defined(LOCAL_CREDS) && !defined(HAVE_CMSGCRED)
    /* Set the socket to receive credentials on the next message */
    {
      int on = 1;
@@ -81,7 +81,7 @@
      }
  
  #ifdef HAVE_CMSGCRED
--  if (cmsg->hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS)
+-  if (cmsg.hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS)
 +  if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred))
 +		  || cmsg.hdr.cmsg_type != SCM_CREDS)
      {
diff --git a/devel/dbus/files/patch-glib_dbus-gidl.c b/devel/dbus/files/patch-glib_dbus-gidl.c
deleted file mode 100644
index f09505e83325..000000000000
--- a/devel/dbus/files/patch-glib_dbus-gidl.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- glib/dbus-gidl.c.orig	Sat Jul  9 13:52:52 2005
-+++ glib/dbus-gidl.c	Sat Jul 16 02:13:02 2005
-@@ -662,8 +662,8 @@ property_info_unref (PropertyInfo *info)
-   info->base.refcount -= 1;
-   if (info->base.refcount == 0)
-     {
--      base_info_free (info);
-       g_free (info->type);
-+      base_info_free (info);
-     }
- }
- 
-@@ -722,8 +722,8 @@ arg_info_unref (ArgInfo *info)
-   if (info->base.refcount == 0)
-     {
-       g_hash_table_destroy (info->annotations);
--      base_info_free (info);
-       g_free (info->type);
-+      base_info_free (info);
-     }
- }
- 
diff --git a/devel/dbus/files/patch-glib_dbus-gobject.c b/devel/dbus/files/patch-glib_dbus-gobject.c
deleted file mode 100644
index 858958d80ef9..000000000000
--- a/devel/dbus/files/patch-glib_dbus-gobject.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- glib/dbus-gobject.c.orig	Mon Apr  4 01:17:05 2005
-+++ glib/dbus-gobject.c	Mon Apr  4 01:17:17 2005
-@@ -396,8 +396,8 @@ write_interface (gpointer key, gpointer 
-   for (; methods; methods = methods->next)
-     {
-       DBusGMethodInfo *method;
--      method = methods->data;
-       const char *args;
-+      method = methods->data;
- 
-       g_string_append_printf (xml, "    <method name=\"%s\">\n",
- 			      method_name_from_object_info (object_info, method));
diff --git a/devel/dbus/files/patch-glib_dbus-gvalue-utils.c b/devel/dbus/files/patch-glib_dbus-gvalue-utils.c
deleted file mode 100644
index b8a14967865b..000000000000
--- a/devel/dbus/files/patch-glib_dbus-gvalue-utils.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- glib/dbus-gvalue-utils.c.orig	Mon Jul 11 00:54:18 2005
-+++ glib/dbus-gvalue-utils.c	Sat Jul 16 17:27:30 2005
-@@ -855,7 +855,6 @@
-     NULL
-   };
- 
--  dbus_g_type_register_collection ("GArray", &array_vtable, 0);
- 
-   static const DBusGTypeSpecializedCollectionVtable ptrarray_vtable = {
-     {
-@@ -869,7 +868,6 @@
-     NULL,
-   };
- 
--  dbus_g_type_register_collection ("GPtrArray", &ptrarray_vtable, 0);
- 
-   static const DBusGTypeSpecializedCollectionVtable slist_vtable = {
-     {
-@@ -883,8 +881,6 @@
-     slist_end_append,
-   };
- 
--  dbus_g_type_register_collection ("GSList", &slist_vtable, 0);
--
-   static const DBusGTypeSpecializedMapVtable hashtable_vtable = {
-     {
-       hashtable_constructor,
-@@ -898,6 +894,9 @@
-     hashtable_append
-   };
- 
-+  dbus_g_type_register_collection ("GSList", &slist_vtable, 0);
-+  dbus_g_type_register_collection ("GArray", &array_vtable, 0);
-+  dbus_g_type_register_collection ("GPtrArray", &ptrarray_vtable, 0);
-   dbus_g_type_register_map ("GHashTable", &hashtable_vtable, 0);
- }
- 
diff --git a/devel/dbus/files/patch-glib_dbus-gvalue.c b/devel/dbus/files/patch-glib_dbus-gvalue.c
deleted file mode 100644
index ef0bfc32dd36..000000000000
--- a/devel/dbus/files/patch-glib_dbus-gvalue.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- glib/dbus-gvalue.c.orig	Mon Jul 11 12:12:49 2005
-+++ glib/dbus-gvalue.c	Sat Jul 16 02:15:19 2005
-@@ -189,6 +189,10 @@ dbus_g_value_types_init (void)
- {
-   static gboolean types_initialized;
- 
-+  static const DBusGTypeMarshalVtable basic_vtable = {
-+    marshal_basic,
-+    demarshal_basic
-+  };
- 
-   if (types_initialized)
-     return;
-@@ -196,10 +200,6 @@ dbus_g_value_types_init (void)
-   dbus_g_type_specialized_init ();
-   dbus_g_type_specialized_builtins_init ();
-   
--  static const DBusGTypeMarshalVtable basic_vtable = {
--    marshal_basic,
--    demarshal_basic
--  };
- 
-   /* Register basic types */
-   {
diff --git a/devel/dbus/files/patch-tools_dbus-send.c b/devel/dbus/files/patch-tools_dbus-send.c
deleted file mode 100644
index e0d86da0dede..000000000000
--- a/devel/dbus/files/patch-tools_dbus-send.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- tools/dbus-send.c.orig	Sat Jul 16 17:31:11 2005
-+++ tools/dbus-send.c	Sat Jul 16 17:31:30 2005
-@@ -401,6 +401,7 @@
- 
-       if (container_type == DBUS_TYPE_DICT_ENTRY)
- 	{
-+	  char sig[5];
- 	  arg = c;
- 	  c = strchr (c, ':');
- 	  if (c == NULL)
-@@ -410,7 +411,6 @@
- 	    }
- 	  *(c++) = 0;
- 	  secondary_type = type_from_name (arg);
--	  char sig[5];
- 	  sig[0] = DBUS_DICT_ENTRY_BEGIN_CHAR;
- 	  sig[1] = type;
- 	  sig[2] = secondary_type;