Update to 1.1.2.

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

12 files changed, 316 insertions, 0 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
new file mode 100644
index 000000000..82e62be67
--- /dev/null
+++ b/devel/dbus/Makefile
@@ -0,0 +1,69 @@
+# New ports collection makefile for:   D-BUS
+# Date Created:			22 June 2004
+# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	dbus
+PORTVERSION?=	1.1.2
+PORTREVISION?=	0
+CATEGORIES=	devel gnome
+MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A message bus system for inter-application communication
+
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
+
+USE_GNOME?=	gnomehack gnometarget libxml2 ltverhack
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool:15
+USE_LDCONFIG=	yes
+CONFIGURE_ARGS=--localstatedir=/var \
+	        --with-test-socket-dir=${WRKDIR} \
+		--with-system-pid-file=/var/run/dbus/dbus.pid \
+		--with-system-socket=/var/run/dbus/system_bus_socket \
+		--with-session-socket-dir=/var/tmp \
+		--disable-doxygen-docs \
+		--disable-xml-docs
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+.if !defined(DBUS_SLAVE)
+USE_RC_SUBR=	dbus
+USE_GNOME_SUBR=	yes
+
+PLIST_SUB=	VERSION="1.0"
+
+MAN1=		dbus-cleanup-sockets.1 dbus-daemon.1 dbus-launch.1 \
+		dbus-monitor.1 dbus-send.1 dbus-uuidgen.1
+
+.if !defined(WITHOUT_X11)
+USE_XLIB=	yes
+.endif
+.endif
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' \
+		${WRKSRC}/bus/system.conf.in
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
+	    	s|/usr/X11R6|${X11BASE}|g' \
+		${WRKSRC}/dbus/dbus-sysdeps-unix.c
+	@${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
+		${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>
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
new file mode 100644
index 000000000..cc9c6ee4c
--- /dev/null
+++ b/devel/dbus/distinfo
@@ -0,0 +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
diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in
new file mode 100644
index 000000000..b4191400d
--- /dev/null
+++ b/devel/dbus/files/dbus.in
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/devel/dbus/files/dbus.in,v 1.11 2006/10/31 09:35:00 jylefort Exp $
+#
+# PROVIDE: dbus
+# REQUIRE: DAEMON
+#
+# Add the following lines to /etc/rc.conf to enable the D-BUS messaging system:
+#
+# dbus_enable="YES"
+#
+
+. %%RC_SUBR%%
+. %%GNOME_SUBR%%
+
+dbus_enable=${dbus_enable-${gnome_enable}}
+dbus_flags=${dbus_flags-"--system"}
+
+name=dbus
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/bin/dbus-daemon"
+pidfile="/var/run/dbus/${name}.pid"
+
+start_precmd="dbus_prestart"
+stop_postcmd="dbus_poststop"
+
+dbus_prestart()
+{
+    mkdir -p $(dirname $pidfile)
+}
+
+dbus_poststop()
+{
+    rm -f $pidfile
+}
+
+
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/devel/dbus/files/patch-bus_bus.c b/devel/dbus/files/patch-bus_bus.c
new file mode 100644
index 000000000..edfd94ae7
--- /dev/null
+++ b/devel/dbus/files/patch-bus_bus.c
@@ -0,0 +1,30 @@
+--- 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-bus_system.conf.in b/devel/dbus/files/patch-bus_system.conf.in
new file mode 100644
index 000000000..cfb3f879e
--- /dev/null
+++ b/devel/dbus/files/patch-bus_system.conf.in
@@ -0,0 +1,10 @@
+--- bus/system.conf.in.orig	Wed May  3 02:08:16 2006
++++ bus/system.conf.in	Wed May  3 02:09:58 2006
+@@ -52,6 +52,7 @@
+   <!-- Config files are placed here that among other things, punch 
+        holes in the above policy for specific services. -->
+   <includedir>system.d</includedir>
++  <includedir>%%X11BASE%%/etc/dbus-1/system.d</includedir>
+ 
+   <!-- This is included last so local configuration can override what's 
+        in this standard file -->
diff --git a/devel/dbus/files/patch-dbus-1.pc.in b/devel/dbus/files/patch-dbus-1.pc.in
new file mode 100644
index 000000000..44c97a29e
--- /dev/null
+++ b/devel/dbus/files/patch-dbus-1.pc.in
@@ -0,0 +1,9 @@
+--- 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
+ Description: Free desktop message bus
+ Version: @VERSION@
+ 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_Makefile.in b/devel/dbus/files/patch-dbus_Makefile.in
new file mode 100644
index 000000000..42a58caed
--- /dev/null
+++ b/devel/dbus/files/patch-dbus_Makefile.in
@@ -0,0 +1,11 @@
+--- dbus/Makefile.in.orig	Fri Jan 21 19:43:46 2005
++++ dbus/Makefile.in	Fri Jan 21 19:44:43 2005
+@@ -360,7 +360,7 @@
+ @HAVE_GLIB_TRUE@	$(DBUS_GLIB_BUILT_INCLUDES)
+ 
+ dbusincludedir = $(includedir)/dbus-1.0/dbus
+-dbusarchincludedir = $(libdir)/dbus-1.0/include/dbus
++dbusarchincludedir = $(includedir)/dbus-1.0/include/dbus
+ lib_LTLIBRARIES = libdbus-1.la
+ dbusinclude_HEADERS = \
+ 	dbus.h					\
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
new file mode 100644
index 000000000..4d2e0c3d6
--- /dev/null
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
@@ -0,0 +1,24 @@
+--- 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
new file mode 100644
index 000000000..b7e4cadc4
--- /dev/null
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps.c
@@ -0,0 +1,18 @@
+--- 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;
+ }
+ 
+ /*
diff --git a/devel/dbus/pkg-descr b/devel/dbus/pkg-descr
new file mode 100644
index 000000000..2a1c3cc0a
--- /dev/null
+++ b/devel/dbus/pkg-descr
@@ -0,0 +1,8 @@
+D-BUS supplies both a system daemon (for events such as "new hardware device
+added" or "printer queue changed") and a per-user-login-session daemon (for
+general IPC needs among user applications). Also, the message bus is built on
+top of a general one-to-one message passing framework, which can be used by
+any two apps to communicate directly (without going through the message bus
+daemon).
+
+WWW: http://www.freedesktop.org/Software/dbus
diff --git a/devel/dbus/pkg-install b/devel/dbus/pkg-install
new file mode 100644
index 000000000..5a49ace79
--- /dev/null
+++ b/devel/dbus/pkg-install
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+	USER=messagebus
+	GROUP=${USER}
+	UID=556
+	GID=${UID}
+	PW=/usr/sbin/pw
+
+	if ${PW} group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if ${PW} groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if ${PW} user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d "/nonexistent" -s /sbin/nologin -c "D-BUS Daemon User"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/dbus
+	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/db/dbus
+	${PKG_PREFIX}/bin/dbus-uuidgen --ensure
+	exit 0
+	;;
+esac
diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist
new file mode 100644
index 000000000..ba9a666f4
--- /dev/null
+++ b/devel/dbus/pkg-plist
@@ -0,0 +1,54 @@
+bin/dbus-cleanup-sockets
+bin/dbus-daemon
+bin/dbus-launch
+bin/dbus-monitor
+bin/dbus-send
+bin/dbus-uuidgen
+etc/dbus-1/session.conf
+etc/dbus-1/system.conf
+include/dbus-%%VERSION%%/dbus/dbus-address.h
+include/dbus-%%VERSION%%/dbus/dbus-bus.h
+include/dbus-%%VERSION%%/dbus/dbus-connection.h
+include/dbus-%%VERSION%%/dbus/dbus-errors.h
+include/dbus-%%VERSION%%/dbus/dbus-macros.h
+include/dbus-%%VERSION%%/dbus/dbus-memory.h
+include/dbus-%%VERSION%%/dbus/dbus-message.h
+include/dbus-%%VERSION%%/dbus/dbus-misc.h
+include/dbus-%%VERSION%%/dbus/dbus-pending-call.h
+include/dbus-%%VERSION%%/dbus/dbus-protocol.h
+include/dbus-%%VERSION%%/dbus/dbus-server.h
+include/dbus-%%VERSION%%/dbus/dbus-shared.h
+include/dbus-%%VERSION%%/dbus/dbus-signature.h
+include/dbus-%%VERSION%%/dbus/dbus-threads.h
+include/dbus-%%VERSION%%/dbus/dbus-types.h
+include/dbus-%%VERSION%%/dbus/dbus.h
+include/dbus-%%VERSION%%/include/dbus/dbus-arch-deps.h
+lib/libdbus-1.a
+lib/libdbus-1.la
+lib/libdbus-1.so
+lib/libdbus-1.so.3
+libdata/pkgconfig/dbus-1.pc
+libexec/dbus-daemon-launch-helper
+@exec mkdir -p %D/etc/dbus-1/system.d
+@exec mkdir -p %%X11BASE%%/etc/dbus-1/system.d
+@exec mkdir -p %D/share/dbus-1/services
+@exec mkdir -p %%X11BASE%%/share/dbus-1/services
+@exec mkdir -p %D/etc/dbus-1/session.d
+@dirrmtry share/dbus-1/services
+@dirrmtry share/dbus-1
+@unexec rmdir %%X11BASE%%/share/dbus-1/services 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/share/dbus-1 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/etc/dbus-1/system.d 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/etc/dbus-1 2>/dev/null || true
+@dirrm include/dbus-%%VERSION%%/include/dbus
+@dirrm include/dbus-%%VERSION%%/include
+@dirrm include/dbus-%%VERSION%%/dbus
+@dirrm include/dbus-%%VERSION%%
+@dirrm etc/dbus-1/system.d
+@dirrm etc/dbus-1/session.d
+@dirrm etc/dbus-1
+@unexec rm -f /var/run/dbus/dbus.pid
+@unexec rm -f /var/run/dbus/dbus.pipe
+@unexec rmdir /var/run/dbus 2>/dev/null || true
+@unexec rm -f /var/db/dbus/machine-id
+@unexec rmdir /var/db/dbus 2>/dev/null || true