Update to 1.2.18.

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

12 files changed, 306 insertions, 0 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
new file mode 100644
index 000000000..cf8405f01
--- /dev/null
+++ b/devel/dbus/Makefile
@@ -0,0 +1,73 @@
+# New ports collection makefile for:   D-BUS
+# Date Created:			22 June 2004
+# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/devel/dbus/Makefile,v 1.77 2009/11/28 20:05:31 marcus Exp $
+#   $MCom: ports/devel/dbus/Makefile,v 1.34 2009/11/28 06:03:52 mezz Exp $
+#
+
+PORTNAME=	dbus
+PORTVERSION?=	1.2.18
+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 libxml2 ltverhack
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool:22
+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="${PTHREAD_LIBS}"
+
+.if !defined(DBUS_SLAVE)
+USE_RC_SUBR=	dbus
+USE_GNOME_SUBR=	yes
+
+USERS=		messagebus
+GROUPS=		messagebus
+
+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_XORG=	x11
+.else
+CONFIGURE_ARGS+=--without-x
+.endif
+.endif
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|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
+	@${REINPLACE_CMD} -e 's|THREAD_LIBS -lrt|THREAD_LIBS|g' \
+		${WRKSRC}/configure
+
+.if !defined(DBUS_SLAVE)
+post-install:
+.if !defined(PACKAGE_BUILDING)
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
+	${MKDIR} ${PREFIX}/share/dbus-1/interfaces
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
new file mode 100644
index 000000000..edf0228b5
--- /dev/null
+++ b/devel/dbus/distinfo
@@ -0,0 +1,3 @@
+MD5 (dbus-1.2.18.tar.gz) = 5c7e3e72e0ff0a3371eb310c6167fb87
+SHA256 (dbus-1.2.18.tar.gz) = ec52551a19a608d6af176371bc22801ca707a1d5c469a03698c2cd1f1773c539
+SIZE (dbus-1.2.18.tar.gz) = 1668410
diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in
new file mode 100644
index 000000000..e4b1d93a9
--- /dev/null
+++ b/devel/dbus/files/dbus.in
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/devel/dbus/files/dbus.in,v 1.14 2009/11/28 20:05:31 marcus 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_Makefile.in b/devel/dbus/files/patch-bus_Makefile.in
new file mode 100644
index 000000000..b55c5dc79
--- /dev/null
+++ b/devel/dbus/files/patch-bus_Makefile.in
@@ -0,0 +1,20 @@
+--- bus/Makefile.in.orig	2008-01-22 14:45:58.000000000 -0500
++++ bus/Makefile.in	2008-01-22 15:24:26.000000000 -0500
+@@ -412,7 +412,7 @@ target_vendor = @target_vendor@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ configdir = $(sysconfdir)/dbus-1
+-INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@		\
++INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS)				\
+ 	-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\"	\
+ 	-DDAEMON_NAME=\"dbus-daemon\"  -DDBUS_COMPILATION
+ 
+@@ -476,7 +476,7 @@ dbus_daemon_LDADD = \
+ 	$(DBUS_BUS_LIBS)				\
+ 	$(top_builddir)/dbus/libdbus-convenience.la
+ 
+-dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
++dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
+ LAUNCH_HELPER_SOURCES = \
+ 	$(XML_SOURCES)				\
+ 	config-parser-common.c			\
diff --git a/devel/dbus/files/patch-bus_dir-watch-kqueue.c b/devel/dbus/files/patch-bus_dir-watch-kqueue.c
new file mode 100644
index 000000000..19a03033c
--- /dev/null
+++ b/devel/dbus/files/patch-bus_dir-watch-kqueue.c
@@ -0,0 +1,33 @@
+--- bus/dir-watch-kqueue.c
++++ bus/dir-watch-kqueue.c
+@@ -139,17 +139,18 @@ out:
+ }
+ 
+ void
+-bus_set_watched_dir (BusContext *context, DBusList **directories)
++bus_set_watched_dirs (BusContext *context, DBusList **directories)
+ {
+   int new_fds[MAX_DIRS_TO_WATCH];
+   char *new_dirs[MAX_DIRS_TO_WATCH];
+   DBusList *link;
+-  int i, f, fd;
++  int i, j, f, fd;
++  struct kevent ev;
+ 
+   if (!_init_kqueue (context))
+     goto out;
+ 
+-  for (i = 0; i < MAX_DIRS_TO_WATCH; i++) {
++  for (i = 0; i < MAX_DIRS_TO_WATCH; i++)
+     {
+       new_fds[i] = -1;
+       new_dirs[i] = NULL;
+@@ -213,7 +214,7 @@ bus_set_watched_dir (BusContext *context
+                   NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, 0, 0);
+           if (kevent (kq, &ev, 1, NULL, 0, NULL) == -1)
+             {
+-              _dbus_warn ("Cannot setup a kevent for '%s'; error '%s'\n", dir, _dbus_strerror (errno));
++              _dbus_warn ("Cannot setup a kevent for '%s'; error '%s'\n", new_dirs[i], _dbus_strerror (errno));
+               close (fd);
+               goto out;
+             }
diff --git a/devel/dbus/files/patch-bus_selinux.c b/devel/dbus/files/patch-bus_selinux.c
new file mode 100644
index 000000000..024f863ef
--- /dev/null
+++ b/devel/dbus/files/patch-bus_selinux.c
@@ -0,0 +1,31 @@
+--- bus/selinux.c.orig	2010-02-13 13:50:50.000000000 -0500
++++ bus/selinux.c	2010-02-13 13:56:22.000000000 -0500
+@@ -29,7 +29,6 @@
+ #include "utils.h"
+ #include "config-parser.h"
+ 
+-#ifdef HAVE_SELINUX
+ #include <sys/types.h>
+ #include <unistd.h>
+ #ifdef HAVE_ERRNO_H
+@@ -38,10 +37,12 @@
+ #include <limits.h>
+ #include <pthread.h>
+ #include <syslog.h>
++#ifdef HAVE_SELINUX
+ #include <selinux/selinux.h>
+ #include <selinux/avc.h>
+ #include <selinux/av_permissions.h>
+ #include <selinux/flask.h>
++#endif /* HAVE_LIBAUDIT */
+ #include <signal.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -49,7 +50,6 @@
+ #ifdef HAVE_LIBAUDIT
+ #include <cap-ng.h>
+ #include <libaudit.h>
+-#endif /* HAVE_LIBAUDIT */
+ #endif /* HAVE_SELINUX */
+ 
+ #define BUS_SID_FROM_SELINUX(sid)  ((BusSELinuxID*) (sid))
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..cdf6eaf07
--- /dev/null
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
@@ -0,0 +1,10 @@
+--- dbus/dbus-sysdeps-util-unix.c.orig	2008-12-21 14:51:17.000000000 -0500
++++ dbus/dbus-sysdeps-util-unix.c	2008-12-21 14:51:37.000000000 -0500
+@@ -38,6 +38,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <syslog.h>
+ #include <sys/stat.h>
+ #include <grp.h>
+ #include <sys/socket.h>
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..5ad0a1f84
--- /dev/null
+++ b/devel/dbus/pkg-install
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+	USER=messagebus
+	GROUP=${USER}
+
+	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/dbus
+	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/db/dbus
+	/usr/bin/chgrp ${GROUP} ${PKG_PREFIX}/libexec/dbus-daemon-launch-helper
+	${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..3bbf8b3c9
--- /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/libexec/dbus-1
+@exec mkdir -p %D/etc/dbus-1/system.d
+@exec mkdir -p %D/share/dbus-1/interfaces
+@exec mkdir -p %D/share/dbus-1/services
+@exec mkdir -p %D/share/dbus-1/system-services
+@exec mkdir -p %D/etc/dbus-1/session.d
+@dirrmtry share/dbus-1/system-services
+@dirrmtry share/dbus-1/services
+@dirrmtry share/dbus-1/interfaces
+@dirrmtry share/dbus-1
+@dirrmtry libexec/dbus-1
+@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