Update to 1.1.4 (aka 1.2.0 RC 2).

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10173 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 5 insertions, 77 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 7ea7c3d89..1213329c6 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	dbus
-PORTVERSION?=	1.1.2
-PORTREVISION?=	2
+PORTVERSION?=	1.1.4
+PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index cc9c6ee4c..7f539f782 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbus-1.1.2.tar.gz) = e33d96a4c4605536127835a70b14d5b9
-SHA256 (dbus-1.1.2.tar.gz) = eb46371f6a51696965d31a8f908807379fb4c6be789854ad0e7a02965fd83fde
-SIZE (dbus-1.1.2.tar.gz) = 1380562
+MD5 (dbus-1.1.4.tar.gz) = e08fdf702cae648acd9780eca0ce4df6
+SHA256 (dbus-1.1.4.tar.gz) = 4f8ff9324a5d363833833333193a3e83c074a51ce82d8c66c2e304b0378c714d
+SIZE (dbus-1.1.4.tar.gz) = 1400585
diff --git a/devel/dbus/files/patch-bus_bus.c b/devel/dbus/files/patch-bus_bus.c
deleted file mode 100644
index edfd94ae7..000000000
--- a/devel/dbus/files/patch-bus_bus.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- bus/bus.c.orig	2007-07-24 14:39:55.000000000 -0400
-+++ bus/bus.c	2008-01-10 17:26:49.000000000 -0500
-@@ -21,6 +21,8 @@
-  *
-  */
- 
-+#include <errno.h>
-+#include <signal.h>
- #include "bus.h"
- #include "activation.h"
- #include "connection.h"
-@@ -749,7 +751,9 @@ bus_context_new (const DBusString *confi
-         }
- 
-       bytes = _dbus_string_get_length (&pid);
--      if (_dbus_pipe_write (print_pid_pipe, &pid, 0, bytes, error) != bytes)
-+      signal (SIGPIPE, SIG_IGN);
-+      if (_dbus_pipe_write (print_pid_pipe, &pid, 0, bytes, error) != bytes &&
-+	  errno != EPIPE)
-         {
-           /* pipe_write sets error on failure but not short write */
-           if (error != NULL && !dbus_error_is_set (error))
-@@ -758,6 +762,7 @@ bus_context_new (const DBusString *confi
-                               "Printing message bus PID: did not write enough bytes\n");
-             }
-           _dbus_string_free (&pid);
-+          signal (SIGPIPE, SIG_DFL);
-           goto failed;
-         }
- 
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
deleted file mode 100644
index 4d2e0c3d6..000000000
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- dbus/dbus-sysdeps-util-unix.c.orig	2007-07-24 11:39:09.000000000 -0400
-+++ dbus/dbus-sysdeps-util-unix.c	2008-01-10 17:20:38.000000000 -0500
-@@ -162,7 +162,9 @@ _dbus_become_daemon (const DBusString *p
- 	    }
- 	  
- 	  bytes = _dbus_string_get_length (&pid);
--	  if (_dbus_pipe_write (print_pid_pipe, &pid, 0, bytes, error) != bytes)
-+	  signal (SIGPIPE, SIG_IGN);
-+	  if (_dbus_pipe_write (print_pid_pipe, &pid, 0, bytes, error) != bytes &&
-+	      errno != EPIPE)
- 	    {
-               /* _dbus_pipe_write sets error only on failure, not short write */
-               if (error != NULL && !dbus_error_is_set(error))
-@@ -172,8 +174,10 @@ _dbus_become_daemon (const DBusString *p
-                 }
- 	      _dbus_string_free (&pid);
-               kill (child_pid, SIGTERM);
-+	      signal (SIGPIPE, SIG_DFL);
- 	      return FALSE;
- 	    }
-+	  signal (SIGPIPE, SIG_DFL);
- 	  
- 	  _dbus_string_free (&pid);
- 	}
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps.c b/devel/dbus/files/patch-dbus_dbus-sysdeps.c
deleted file mode 100644
index b7e4cadc4..000000000
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- dbus/dbus-sysdeps.c.orig	2008-01-10 17:23:24.000000000 -0500
-+++ dbus/dbus-sysdeps.c	2008-01-10 17:24:28.000000000 -0500
-@@ -182,10 +182,14 @@ _dbus_getenv (const char *varname)
-  *
-  * @returns #TRUE on success.
-  */
-+extern char **environ;
- dbus_bool_t
- _dbus_clearenv (void)
- {
--  return (clearenv () == 0);
-+  if (environ != NULL)
-+    environ[0] = NULL;
-+
-+ return TRUE;
- }
- 
- /*