Update to 1.4.0.

Fix dbus launch on diskless systems [1]

PR:		ports/151331 [1], ports/132304
Submitted by:	Zane C.B. <vvelox@vvelox.net> [1]

6 files changed, 31 insertions, 34 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index e2aee1facea1..0fb9d6415216 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/dbus/Makefile,v 1.41 2010/04/04 22:03:28 marcus Exp $
+#   $MCom: ports/devel/dbus/Makefile,v 1.44 2010/09/28 15:55:46 kwm Exp $
 #
 
 PORTNAME=	dbus
-PORTVERSION?=	1.2.24
-PORTREVISION?=	2
+PORTVERSION?=	1.4.0
+PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index 09097b134e4b..6ef87e4114b5 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbus-1.2.24.tar.gz) = 565346cecd9cfecf1463540c6086cc2c
-SHA256 (dbus-1.2.24.tar.gz) = f12c748f4a703655e3d4c3db94cdf5a752a0cd0b36958c715804373bd3595c48
-SIZE (dbus-1.2.24.tar.gz) = 1673774
+MD5 (dbus-1.4.0.tar.gz) = f59618b18d2fb2bd1fce9e1c5a2a3282
+SHA256 (dbus-1.4.0.tar.gz) = c96d2f86d40e158e2bf405925a0a42cce0533a8466098e2f2238aa1614926652
+SIZE (dbus-1.4.0.tar.gz) = 1800347
diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in
index 1d06ee130079..849e5513cdc2 100644
--- a/devel/dbus/files/dbus.in
+++ b/devel/dbus/files/dbus.in
@@ -27,6 +27,13 @@ stop_postcmd="dbus_poststop"
 
 dbus_prestart()
 {
+    if [ ! -d /var/db/dbus ]; then
+        mkdir -p /var/db/dbus
+    fi
+    if [ ! -f /var/db/dbus/machine-id ]; then
+        dbus-uuidgen > /var/db/dbus/machine-id
+    fi
+
     mkdir -p $(dirname $pidfile)
 }
 
diff --git a/devel/dbus/files/patch-bus_dir-watch-kqueue.c b/devel/dbus/files/patch-bus_dir-watch-kqueue.c
deleted file mode 100644
index b65d9ab84bdf..000000000000
--- a/devel/dbus/files/patch-bus_dir-watch-kqueue.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- bus/dir-watch-kqueue.c.orig	2010-04-04 17:59:18.000000000 -0400
-+++ bus/dir-watch-kqueue.c	2010-04-04 17:59:55.000000000 -0400
-@@ -169,7 +169,7 @@ bus_set_watched_dirs (BusContext *contex
-    */
-   for (i = 0; new_dirs[i]; i++)
-     {
--      for (j = 0; i < num_fds; j++)
-+      for (j = 0; j < num_fds; j++)
-         {
-           if (dirs[j] && strcmp (new_dirs[i], dirs[j]) == 0)
-             {
diff --git a/devel/dbus/files/patch-dbus-1.pc.in b/devel/dbus/files/patch-dbus-1.pc.in
index 44c97a29ef4f..4563a473b27f 100644
--- a/devel/dbus/files/patch-dbus-1.pc.in
+++ b/devel/dbus/files/patch-dbus-1.pc.in
@@ -1,9 +1,8 @@
---- dbus-1.pc.in.orig	Mon Nov  6 02:55:38 2006
-+++ dbus-1.pc.in	Mon Nov  6 02:55:57 2006
-@@ -10,5 +10,5 @@ Name: dbus
+--- dbus-1.pc.in.orig	2010-08-31 21:44:19.000000000 +0000
++++ dbus-1.pc.in	2010-09-18 17:52:00.000000000 +0000
+@@ -13,4 +13,4 @@ Name: dbus
  Description: Free desktop message bus
  Version: @VERSION@
- Libs: -L${libdir} -ldbus-1 @DBUS_CLIENT_LIBS@ 
+ Libs: -L${libdir} -ldbus-1 @DBUS_CLIENT_LIBS@
 -Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include
 +Cflags: -I${includedir}/dbus-1.0 -I${includedir}/dbus-1.0/include
- 
diff --git a/devel/dbus/files/patch-dbus_dbus-connection.c b/devel/dbus/files/patch-dbus_dbus-connection.c
index b992b9e5e83f..f372d7600520 100644
--- a/devel/dbus/files/patch-dbus_dbus-connection.c
+++ b/devel/dbus/files/patch-dbus_dbus-connection.c
@@ -1,6 +1,6 @@
---- dbus/dbus-connection.c.orig	2010-03-13 17:21:40.000000000 -0500
-+++ dbus/dbus-connection.c	2010-03-13 17:25:28.000000000 -0500
-@@ -2280,7 +2280,7 @@ _dbus_connection_block_pending_call (DBu
+--- dbus/dbus-connection.c.orig	2010-08-31 21:44:19.000000000 +0000
++++ dbus/dbus-connection.c	2010-09-18 18:01:19.000000000 +0000
+@@ -2364,7 +2364,7 @@ _dbus_connection_block_pending_call (DBu
    DBusConnection *connection;
    dbus_uint32_t client_serial;
    DBusTimeout *timeout;
@@ -9,18 +9,20 @@
  
    _dbus_assert (pending != NULL);
  
-@@ -2360,6 +2360,10 @@ _dbus_connection_block_pending_call (DBu
+@@ -2445,7 +2445,11 @@ _dbus_connection_block_pending_call (DBu
    _dbus_get_current_time (&tv_sec, &tv_usec);
    elapsed_milliseconds = (tv_sec - start_tv_sec) * 1000 +
  	  (tv_usec - start_tv_usec) / 1000;
+-  
 +  if (timeout_milliseconds != -1)
 +    remain_milliseconds = timeout_milliseconds - elapsed_milliseconds;
 +  else
 +    remain_milliseconds = -1;
-   
++
    if (!_dbus_connection_get_is_connected_unlocked (connection))
      {
-@@ -2386,7 +2390,7 @@ _dbus_connection_block_pending_call (DBu
+       DBusMessage *error_msg;
+@@ -2471,7 +2475,7 @@ _dbus_connection_block_pending_call (DBu
             */
            _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
  
@@ -29,8 +31,8 @@
          }
        else
          {          
-@@ -2394,7 +2398,7 @@ _dbus_connection_block_pending_call (DBu
-           _dbus_connection_do_iteration_unlocked (connection,
+@@ -2480,7 +2484,7 @@ _dbus_connection_block_pending_call (DBu
+                                                   pending,
                                                    DBUS_ITERATION_DO_READING |
                                                    DBUS_ITERATION_BLOCK,
 -                                                  timeout_milliseconds - elapsed_milliseconds);
@@ -38,7 +40,7 @@
          }
  
        goto recheck_status;
-@@ -2403,7 +2407,7 @@ _dbus_connection_block_pending_call (DBu
+@@ -2489,7 +2493,7 @@ _dbus_connection_block_pending_call (DBu
      _dbus_verbose ("dbus_connection_send_with_reply_and_block(): clock set backward\n");
    else if (elapsed_milliseconds < timeout_milliseconds)
      {
@@ -47,7 +49,7 @@
        
        if (status == DBUS_DISPATCH_NEED_MEMORY)
          {
-@@ -2413,7 +2417,7 @@ _dbus_connection_block_pending_call (DBu
+@@ -2499,7 +2503,7 @@ _dbus_connection_block_pending_call (DBu
             */
            _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
  
@@ -56,8 +58,8 @@
          }
        else
          {          
-@@ -2421,7 +2425,7 @@ _dbus_connection_block_pending_call (DBu
-           _dbus_connection_do_iteration_unlocked (connection,
+@@ -2508,7 +2512,7 @@ _dbus_connection_block_pending_call (DBu
+                                                   NULL,
                                                    DBUS_ITERATION_DO_READING |
                                                    DBUS_ITERATION_BLOCK,
 -                                                  timeout_milliseconds - elapsed_milliseconds);