Dbus has been committed to the FreeBSD ports.

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

13 files changed, 0 insertions, 337 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
deleted file mode 100644
index 46de17709..000000000
--- a/devel/dbus/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# New ports collection makefile for:   D-BUS
-# Date Created:			22 June 2004
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/devel/dbus/Makefile,v 1.43 2010/09/19 18:27:55 kwm Exp $
-#
-
-PORTNAME=	dbus
-PORTVERSION?=	1.4.0
-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
deleted file mode 100644
index 6ef87e411..000000000
--- a/devel/dbus/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 849e5513c..000000000
--- a/devel/dbus/files/dbus.in
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: dbus
-# REQUIRE: DAEMON
-#
-# Add the following lines to /etc/rc.conf to enable the D-BUS messaging system:
-#
-# dbus_enable="YES"
-#
-
-. /etc/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()
-{
-    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)
-}
-
-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
deleted file mode 100644
index b55c5dc79..000000000
--- a/devel/dbus/files/patch-bus_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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__session.conf.in b/devel/dbus/files/patch-bus__session.conf.in
deleted file mode 100644
index 65a834d63..000000000
--- a/devel/dbus/files/patch-bus__session.conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./bus/session.conf.in.orig	2010-03-23 22:01:27.000000000 +0300
-+++ ./bus/session.conf.in	2010-09-01 19:47:37.427994122 +0400
-@@ -32,6 +32,7 @@
-   <!-- This is included last so local configuration can override what's 
-        in this standard file -->
-   <include ignore_missing="yes">session-local.conf</include>
-+  <include ignore_missing="yes">session-kde4.conf</include>
- 
-   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
- 
diff --git a/devel/dbus/files/patch-bus__system.conf.in b/devel/dbus/files/patch-bus__system.conf.in
deleted file mode 100644
index 30a18b953..000000000
--- a/devel/dbus/files/patch-bus__system.conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./bus/system.conf.in.orig	2009-07-11 02:27:40.000000000 +0400
-+++ ./bus/system.conf.in	2010-09-01 19:47:19.745313755 +0400
-@@ -77,6 +77,7 @@
-   <!-- This is included last so local configuration can override what's 
-        in this standard file -->
-   <include ignore_missing="yes">system-local.conf</include>
-+  <include ignore_missing="yes">system-kde4.conf</include>
- 
-   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
- 
diff --git a/devel/dbus/files/patch-dbus-1.pc.in b/devel/dbus/files/patch-dbus-1.pc.in
deleted file mode 100644
index 4563a473b..000000000
--- a/devel/dbus/files/patch-dbus-1.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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@
--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
deleted file mode 100644
index 42a58caed..000000000
--- a/devel/dbus/files/patch-dbus_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-connection.c b/devel/dbus/files/patch-dbus_dbus-connection.c
deleted file mode 100644
index f372d7600..000000000
--- a/devel/dbus/files/patch-dbus_dbus-connection.c
+++ /dev/null
@@ -1,69 +0,0 @@
---- 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;
--  int timeout_milliseconds, elapsed_milliseconds;
-+  int timeout_milliseconds, elapsed_milliseconds, remain_milliseconds;
- 
-   _dbus_assert (pending != NULL);
- 
-@@ -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))
-     {
-       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");
- 
--          _dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds);
-+          _dbus_memory_pause_based_on_timeout (remain_milliseconds);
-         }
-       else
-         {          
-@@ -2480,7 +2484,7 @@ _dbus_connection_block_pending_call (DBu
-                                                   pending,
-                                                   DBUS_ITERATION_DO_READING |
-                                                   DBUS_ITERATION_BLOCK,
--                                                  timeout_milliseconds - elapsed_milliseconds);
-+                                                  remain_milliseconds);
-         }
- 
-       goto recheck_status;
-@@ -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)
-     {
--      _dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", timeout_milliseconds - elapsed_milliseconds);
-+      _dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", remain_milliseconds);
-       
-       if (status == DBUS_DISPATCH_NEED_MEMORY)
-         {
-@@ -2499,7 +2503,7 @@ _dbus_connection_block_pending_call (DBu
-            */
-           _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
- 
--          _dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds);
-+          _dbus_memory_pause_based_on_timeout (remain_milliseconds);
-         }
-       else
-         {          
-@@ -2508,7 +2512,7 @@ _dbus_connection_block_pending_call (DBu
-                                                   NULL,
-                                                   DBUS_ITERATION_DO_READING |
-                                                   DBUS_ITERATION_BLOCK,
--                                                  timeout_milliseconds - elapsed_milliseconds);
-+                                                  remain_milliseconds);
-         }
- 
-       goto recheck_status;
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 cdf6eaf07..000000000
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 2a1c3cc0a..000000000
--- a/devel/dbus/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 5ad0a1f84..000000000
--- a/devel/dbus/pkg-install
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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
deleted file mode 100644
index 3bbf8b3c9..000000000
--- a/devel/dbus/pkg-plist
+++ /dev/null
@@ -1,54 +0,0 @@
-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