summaryrefslogtreecommitdiffstats
path: root/devel/dbus/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/dbus/files')
-rw-r--r--devel/dbus/files/dbus.in47
-rw-r--r--devel/dbus/files/patch-bus__session.conf.in10
-rw-r--r--devel/dbus/files/patch-bus__system.conf.in10
-rw-r--r--devel/dbus/files/patch-dbus-1.pc.in8
-rw-r--r--devel/dbus/files/patch-dbus_Makefile.in11
-rw-r--r--devel/dbus/files/patch-dbus_dbus-connection.c69
-rw-r--r--devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c10
-rw-r--r--devel/dbus/files/patch-doc_Makefile.in13
8 files changed, 0 insertions, 178 deletions
diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in
deleted file mode 100644
index 3913010d1..000000000
--- a/devel/dbus/files/dbus.in
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/devel/dbus/files/dbus.in,v 1.19 2012/01/14 08:55:34 dougb Exp $
-#
-# 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=dbus_enable
-
-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
- %%PREFIX%%/bin/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__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 997f3869b..000000000
--- a/devel/dbus/files/patch-dbus-1.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- dbus-1.pc.in.orig 2012-06-05 13:17:45.000000000 +0200
-+++ dbus-1.pc.in 2012-06-18 00:26:56.000000000 +0200
-@@ -14,4 +14,4 @@
- Version: @VERSION@
- Libs: -L${libdir} -ldbus-1
- Libs.private: @LIBDBUS_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/files/patch-doc_Makefile.in b/devel/dbus/files/patch-doc_Makefile.in
deleted file mode 100644
index 50f003930..000000000
--- a/devel/dbus/files/patch-doc_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- doc/Makefile.in.orig 2011-08-14 11:28:23.000000000 +0200
-+++ doc/Makefile.in 2011-08-14 11:28:47.000000000 +0200
-@@ -604,8 +604,8 @@ info: info-am
-
- info-am:
-
--install-data-am: install-data-local install-dist_docDATA \
-- install-dist_htmlDATA install-htmlDATA install-man
-+install-data-am: install-data-local \
-+ install-man
-
- install-dvi: install-dvi-am
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-02 09:27:16 +0800