[Midnightbsd-cvs] mports: devel/dbus: This port sucks.

[laffer1 at midnightbsd.org]

Log Message:
-----------
This port sucks.  Let's hope I got it sourcing the gnome.subr now.  This has caused gnome to fail to start properly.

Modified Files:
--------------
    mports/devel/dbus:
        Makefile (r1.2 -> r1.3)
        pkg-plist (r1.1 -> r1.2)
    mports/devel/dbus/files:
        dbus.in (r1.2 -> r1.3)

Added Files:
-----------
    mports/devel/dbus/files:
        patch-bus_bus.c (r1.1)
        patch-dbus_dbus-sysdeps-util-unix.c (r1.1)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/devel/dbus/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldevel/dbus/pkg-plist -Ldevel/dbus/pkg-plist -u -r1.1 -r1.2
--- devel/dbus/pkg-plist
+++ devel/dbus/pkg-plist
@@ -1,3 +1,4 @@
+ at comment $MidnightBSD$
 bin/dbus-cleanup-sockets
 bin/dbus-daemon
 bin/dbus-launch
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/dbus/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ldevel/dbus/Makefile -Ldevel/dbus/Makefile -u -r1.2 -r1.3
--- devel/dbus/Makefile
+++ devel/dbus/Makefile
@@ -2,13 +2,13 @@
 # Date Created:			22 June 2004
 # Whom:				Joe Marcus Clarke <marcus at FreeBSD.org>
 #
-# $FreeBSD: ports/devel/dbus/Makefile,v 1.65 2006/12/14 20:33:12 marcus Exp $
 # $MidnightBSD$
+# $FreeBSD: ports/devel/dbus/Makefile,v 1.67 2007/05/19 20:02:19 flz Exp $
 #
 
 PORTNAME=	dbus
 PORTVERSION?=	1.0.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
@@ -58,4 +58,13 @@
 		${WRKSRC}/dbus/Makefile.in \
 		${WRKSRC}/tools/Makefile.in
 
+.if !defined(DBUS_SLAVE)
+post-install:
+.if !defined(PACKAGE_BUILDING)
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
+	${MKDIR} ${X11BASE}/etc/dbus-1/system.d
+	${MKDIR} ${X11BASE}/share/dbus-1/services
+.endif
+
 .include <bsd.port.post.mk>
--- /dev/null
+++ devel/dbus/files/patch-bus_bus.c
@@ -0,0 +1,30 @@
+--- bus/bus.c.orig	Wed Mar 21 16:20:57 2007
++++ bus/bus.c	Wed Mar 21 16:22:08 2007
+@@ -21,6 +21,7 @@
+  *
+  */
+ 
++#include <signal.h>
+ #include "bus.h"
+ #include "activation.h"
+ #include "connection.h"
+@@ -731,14 +732,18 @@ bus_context_new (const DBusString *confi
+         }
+ 
+       bytes = _dbus_string_get_length (&pid);
+-      if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes)
++      signal (SIGPIPE, SIG_IGN);
++      if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes &&
++          errno != EPIPE)
+         {
+           dbus_set_error (error, DBUS_ERROR_FAILED,
+                           "Printing message bus PID: %s\n",
+                           _dbus_strerror (errno));
+           _dbus_string_free (&pid);
++	  signal (SIGPIPE, SIG_DFL);
+           goto failed;
+         }
++      signal (SIGPIPE, SIG_DFL);
+ 
+       if (print_pid_fd > 2)
+         _dbus_close_socket (print_pid_fd, NULL);
--- /dev/null
+++ devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
@@ -0,0 +1,23 @@
+--- dbus/dbus-sysdeps-util-unix.c.orig	Mon Dec 11 14:21:10 2006
++++ dbus/dbus-sysdeps-util-unix.c	Wed Mar 21 16:22:45 2007
+@@ -157,15 +157,19 @@ _dbus_become_daemon (const DBusString *p
+ 	    }
+ 	  
+ 	  bytes = _dbus_string_get_length (&pid);
+-	  if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes)
++	  signal (SIGPIPE, SIG_IGN);
++	  if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes &&
++              errno != EPIPE)
+ 	    {
+ 	      dbus_set_error (error, DBUS_ERROR_FAILED,
+ 			      "Printing message bus PID: %s\n",
+ 			      _dbus_strerror (errno));
+ 	      _dbus_string_free (&pid);
+               kill (child_pid, SIGTERM);
++	      signal (SIGPIPE, SIG_DFL);
+ 	      return FALSE;
+ 	    }
++	  signal (SIGPIPE, SIG_DFL);
+ 	  
+ 	  _dbus_string_free (&pid);
+ 	}
Index: dbus.in
===================================================================
RCS file: /home/cvs/mports/devel/dbus/files/dbus.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ldevel/dbus/files/dbus.in -Ldevel/dbus/files/dbus.in -u -r1.2 -r1.3
--- devel/dbus/files/dbus.in
+++ devel/dbus/files/dbus.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 #
+# $MidnightBSD$
 # $FreeBSD: ports/devel/dbus/files/dbus.in,v 1.11 2006/10/31 09:35:00 jylefort Exp $
 #
 # PROVIDE: dbus
@@ -11,7 +12,7 @@
 #
 
 . %%RC_SUBR%%
-#. %%GNOME_SUBR%%
+. %%GNOME_SUBR%%
 
 dbus_enable=${dbus_enable-${gnome_enable}}
 dbus_flags=${dbus_flags-"--system"}