diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-14 18:33:48 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-14 18:33:48 +0800 |
commit | 1b3327761c8bcb98d89b529daeae9600844b4361 (patch) | |
tree | 0be1cd4eb5fec6661da4798906b0d9bd522e794f /devel/dbus/files | |
parent | a65aedbb59fd9dfb33a4633611777da99ec4dcd5 (diff) | |
download | marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.gz marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.bz2 marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.lz marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.xz marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.zst marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.zip |
Clean out MarcusCom after the big import into ports.
Next stop, GNOME 2.17.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7799 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/dbus/files')
-rw-r--r-- | devel/dbus/files/dbus.in | 39 | ||||
-rw-r--r-- | devel/dbus/files/patch-bus_bus.c | 11 | ||||
-rw-r--r-- | devel/dbus/files/patch-bus_session.conf.in | 10 | ||||
-rw-r--r-- | devel/dbus/files/patch-bus_system.conf.in | 10 | ||||
-rw-r--r-- | devel/dbus/files/patch-configure | 28 | ||||
-rw-r--r-- | devel/dbus/files/patch-dbus-1.pc.in | 11 | ||||
-rw-r--r-- | devel/dbus/files/patch-dbus_Makefile.in | 11 | ||||
-rw-r--r-- | devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c | 94 | ||||
-rw-r--r-- | devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c | 11 | ||||
-rw-r--r-- | devel/dbus/files/patch-tools_Makefile.in | 32 |
10 files changed, 0 insertions, 257 deletions
diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in deleted file mode 100644 index 61638229f..000000000 --- a/devel/dbus/files/dbus.in +++ /dev/null @@ -1,39 +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" -# - -dbus_enable=${dbus_enable-"NO"} -dbus_flags=${dbus_flags-"--system"} - -. %%RC_SUBR%% - -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 deleted file mode 100644 index 857d6379f..000000000 --- a/devel/dbus/files/patch-bus_bus.c +++ /dev/null @@ -1,11 +0,0 @@ ---- bus/bus.c.orig Thu Jun 30 23:55:41 2005 -+++ bus/bus.c Thu Jun 30 23:56:04 2005 -@@ -486,7 +486,7 @@ process_config_every_time (BusContext - - _dbus_list_foreach (bus_config_parser_get_conf_dirs (parser), - (DBusForeachFunction) bus_watch_directory, -- NULL); -+ bus_context_get_loop (context)); - - _DBUS_ASSERT_ERROR_IS_CLEAR (error); - retval = TRUE; 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 955de7132..000000000 --- a/devel/dbus/files/patch-bus_session.conf.in +++ /dev/null @@ -1,10 +0,0 @@ ---- bus/session.conf.in.orig Mon Jun 6 22:18:31 2005 -+++ bus/session.conf.in Mon Jun 6 22:31:35 2005 -@@ -11,6 +11,7 @@ - <listen>unix:tmpdir=@DBUS_SESSION_SOCKET_DIR@</listen> - - <servicedir>@EXPANDED_DATADIR@/dbus-1/services</servicedir> -+ <servicedir>%%X11BASE%%/share/dbus-1/services</servicedir> - - <policy context="default"> - <!-- Allow everything to be sent --> 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 cfb3f879e..000000000 --- a/devel/dbus/files/patch-bus_system.conf.in +++ /dev/null @@ -1,10 +0,0 @@ ---- 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-configure b/devel/dbus/files/patch-configure deleted file mode 100644 index 0f19547d7..000000000 --- a/devel/dbus/files/patch-configure +++ /dev/null @@ -1,28 +0,0 @@ ---- configure.orig Sun Oct 8 02:48:06 2006 -+++ configure Sun Oct 8 02:50:34 2006 -@@ -463,7 +463,7 @@ ac_includes_default="\ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar GETTEXT_PACKAGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LT_CURRENT LT_REVISION LT_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP DBUS_BUILD_TESTS_TRUE DBUS_BUILD_TESTS_FALSE SED LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DBUS_GCOV_ENABLED_TRUE DBUS_GCOV_ENABLED_FALSE DBUS_INT64_TYPE DBUS_INT64_CONSTANT DBUS_UINT64_CONSTANT DBUS_HAVE_INT64 DBUS_INT32_TYPE DBUS_INT16_TYPE DBUS_PATH_OR_ABSTRACT PKG_CONFIG LIBXML_CFLAGS LIBXML_LIBS DBUS_USE_EXPAT_TRUE DBUS_USE_EXPAT_FALSE DBUS_USE_LIBXML_TRUE DBUS_USE_LIBXML_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_TRUE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_FALSE DBUS_BUS_ENABLE_KQUEUE_TRUE DBUS_BUS_ENABLE_KQUEUE_FALSE HAVE_CONSOLE_OWNER_FILE_TRUE HAVE_CONSOLE_OWNER_FILE_FALSE DBUS_CLIENT_CFLAGS DBUS_CLIENT_LIBS DBUS_BUS_CFLAGS DBUS_BUS_LIBS DBUS_TEST_CFLAGS DBUS_TEST_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DBUS_X_CFLAGS DBUS_X_LIBS DOXYGEN DBUS_DOXYGEN_DOCS_ENABLED_TRUE DBUS_DOXYGEN_DOCS_ENABLED_FALSE XMLTO DBUS_XML_DOCS_ENABLED_TRUE DBUS_XML_DOCS_ENABLED_FALSE EXPANDED_LOCALSTATEDIR EXPANDED_SYSCONFDIR EXPANDED_BINDIR EXPANDED_LIBDIR EXPANDED_DATADIR DBUS_INIT_SCRIPTS_RED_HAT_TRUE DBUS_INIT_SCRIPTS_RED_HAT_FALSE DBUS_INIT_SCRIPTS_SLACKWARE_TRUE DBUS_INIT_SCRIPTS_SLACKWARE_FALSE DBUS_SYSTEM_SOCKET DBUS_SYSTEM_BUS_DEFAULT_ADDRESS DBUS_SYSTEM_PID_FILE DBUS_CONSOLE_AUTH_DIR DBUS_CONSOLE_OWNER_FILE DBUS_USER DBUS_DAEMONDIR TEST_SERVICE_DIR TEST_SERVICE_BINARY TEST_SHELL_SERVICE_BINARY TEST_EXIT_BINARY TEST_SEGFAULT_BINARY TEST_SLEEP_FOREVER_BINARY TEST_SOCKET_DIR DBUS_SESSION_SOCKET_DIR LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar GETTEXT_PACKAGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LT_CURRENT LT_REVISION LT_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP DBUS_BUILD_TESTS_TRUE DBUS_BUILD_TESTS_FALSE SED LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DBUS_GCOV_ENABLED_TRUE DBUS_GCOV_ENABLED_FALSE DBUS_INT64_TYPE DBUS_INT64_CONSTANT DBUS_UINT64_CONSTANT DBUS_HAVE_INT64 DBUS_INT32_TYPE DBUS_INT16_TYPE DBUS_PATH_OR_ABSTRACT PKG_CONFIG LIBXML_CFLAGS LIBXML_LIBS DBUS_USE_EXPAT_TRUE DBUS_USE_EXPAT_FALSE DBUS_USE_LIBXML_TRUE DBUS_USE_LIBXML_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_TRUE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_FALSE DBUS_BUS_ENABLE_KQUEUE_TRUE DBUS_BUS_ENABLE_KQUEUE_FALSE HAVE_CONSOLE_OWNER_FILE_TRUE HAVE_CONSOLE_OWNER_FILE_FALSE DBUS_CLIENT_CFLAGS DBUS_CLIENT_LIBS DBUS_BUS_CFLAGS DBUS_BUS_LIBS DBUS_TEST_CFLAGS DBUS_TEST_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DBUS_X_CFLAGS DBUS_X_LIBS DOXYGEN DBUS_DOXYGEN_DOCS_ENABLED_TRUE DBUS_DOXYGEN_DOCS_ENABLED_FALSE XMLTO DBUS_XML_DOCS_ENABLED_TRUE DBUS_XML_DOCS_ENABLED_FALSE EXPANDED_LOCALSTATEDIR EXPANDED_SYSCONFDIR EXPANDED_BINDIR EXPANDED_LIBDIR EXPANDED_DATADIR DBUS_INIT_SCRIPTS_RED_HAT_TRUE DBUS_INIT_SCRIPTS_RED_HAT_FALSE DBUS_INIT_SCRIPTS_SLACKWARE_TRUE DBUS_INIT_SCRIPTS_SLACKWARE_FALSE DBUS_SYSTEM_SOCKET DBUS_SYSTEM_BUS_DEFAULT_ADDRESS DBUS_SYSTEM_PID_FILE DBUS_CONSOLE_AUTH_DIR DBUS_CONSOLE_OWNER_FILE DBUS_USER DBUS_DAEMONDIR TEST_SERVICE_DIR TEST_SERVICE_BINARY TEST_SHELL_SERVICE_BINARY TEST_EXIT_BINARY TEST_SEGFAULT_BINARY TEST_SLEEP_FOREVER_BINARY TEST_SOCKET_DIR DBUS_SESSION_SOCKET_DIR LIBOBJS LTLIBOBJS PTHREAD_LIBS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -25187,7 +25187,7 @@ DBUS_CLIENT_LIBS= - - - DBUS_BUS_CFLAGS=$XML_CFLAGS --DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $INTLLIBS" -+DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $INTLLIBS $PTHREAD_LIBS" - - - -@@ -27929,6 +27929,7 @@ s,@X_LIBS@,$X_LIBS,;t t - s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t - s,@DBUS_X_CFLAGS@,$DBUS_X_CFLAGS,;t t - s,@DBUS_X_LIBS@,$DBUS_X_LIBS,;t t -+s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t - s,@DOXYGEN@,$DOXYGEN,;t t - s,@DBUS_DOXYGEN_DOCS_ENABLED_TRUE@,$DBUS_DOXYGEN_DOCS_ENABLED_TRUE,;t t - s,@DBUS_DOXYGEN_DOCS_ENABLED_FALSE@,$DBUS_DOXYGEN_DOCS_ENABLED_FALSE,;t t 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 b9c5fdcc2..000000000 --- a/devel/dbus/files/patch-dbus-1.pc.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ./dbus-1.pc.in.orig Thu Mar 16 22:20:14 2006 -+++ ./dbus-1.pc.in Sun Oct 8 02:02:33 2006 -@@ -9,6 +9,6 @@ session_bus_services_dir=@EXPANDED_DATAD - Name: dbus - Description: Free desktop message bus - Version: @VERSION@ --Libs: -L${libdir} -ldbus-1 --Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include -+Libs: -L${libdir} -ldbus-1 @PTHREAD_LIBS@ -+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-sysdeps-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c deleted file mode 100644 index 42a750966..000000000 --- a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c +++ /dev/null @@ -1,94 +0,0 @@ ---- dbus/dbus-sysdeps-unix.c.orig Thu Sep 14 01:07:11 2006 -+++ dbus/dbus-sysdeps-unix.c Sat Oct 7 12:23:40 2006 -@@ -719,16 +719,16 @@ write_credentials_byte (int - { - int bytes_written; - char buf[1] = { '\0' }; --#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -- struct { -+#if defined(HAVE_CMSGCRED) -+ union { - struct cmsghdr hdr; -- struct cmsgcred cred; -+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))]; - } cmsg; - struct iovec iov; - struct msghdr msg; - #endif - --#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+#if defined(HAVE_CMSGCRED) - iov.iov_base = buf; - iov.iov_len = 1; - -@@ -736,10 +736,10 @@ write_credentials_byte (int - msg.msg_iov = &iov; - msg.msg_iovlen = 1; - -- msg.msg_control = &cmsg; -- msg.msg_controllen = sizeof (cmsg); -+ msg.msg_control = (caddr_t) &cmsg; -+ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred)); - memset (&cmsg, 0, sizeof (cmsg)); -- cmsg.hdr.cmsg_len = sizeof (cmsg); -+ cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred)); - cmsg.hdr.cmsg_level = SOL_SOCKET; - cmsg.hdr.cmsg_type = SCM_CREDS; - #endif -@@ -748,7 +748,7 @@ write_credentials_byte (int - - again: - --#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS) -+#if defined(HAVE_CMSGCRED) - bytes_written = sendmsg (server_fd, &msg, 0); - #else - bytes_written = write (server_fd, buf, 1); -@@ -806,9 +806,10 @@ _dbus_read_credentials_unix_socket (int - char buf; - - #ifdef HAVE_CMSGCRED -- struct { -+ struct cmsgcred *cred; -+ union { - struct cmsghdr hdr; -- struct cmsgcred cred; -+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))]; - } cmsg; - - #elif defined(LOCAL_CREDS) -@@ -845,8 +846,8 @@ _dbus_read_credentials_unix_socket (int - - #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS) - memset (&cmsg, 0, sizeof (cmsg)); -- msg.msg_control = &cmsg; -- msg.msg_controllen = sizeof (cmsg); -+ msg.msg_control = (caddr_t) &cmsg; -+ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred)); - #endif - - again: -@@ -869,7 +870,8 @@ _dbus_read_credentials_unix_socket (int - } - - #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS) -- if (cmsg.hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS) -+ if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred)) -+ || cmsg.hdr.cmsg_type != SCM_CREDS) - { - dbus_set_error (error, DBUS_ERROR_FAILED, - "Message from recvmsg() was not SCM_CREDS"); -@@ -897,9 +899,10 @@ _dbus_read_credentials_unix_socket (int - cr_len, (int) sizeof (cr), _dbus_strerror (errno)); - } - #elif defined(HAVE_CMSGCRED) -- credentials->pid = cmsg.cred.cmcred_pid; -- credentials->uid = cmsg.cred.cmcred_euid; -- credentials->gid = cmsg.cred.cmcred_groups[0]; -+ cred = (struct cmsgcred *) CMSG_DATA (&cmsg); -+ credentials->pid = cred->cmcred_pid; -+ credentials->uid = cred->cmcred_euid; -+ credentials->gid = cred->cmcred_groups[0]; - #elif defined(LOCAL_CREDS) - credentials->pid = DBUS_PID_UNSET; - credentials->uid = cmsg.cred.sc_uid; 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 28701094b..000000000 --- a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c +++ /dev/null @@ -1,11 +0,0 @@ ---- dbus/dbus-sysdeps-util-unix.c.orig Sat Oct 7 12:33:47 2006 -+++ dbus/dbus-sysdeps-util-unix.c Sat Oct 7 12:34:13 2006 -@@ -502,7 +502,7 @@ static dbus_bool_t - dirent_buf_size(DIR * dirp, size_t *size) - { - long name_max; --# if defined(HAVE_FPATHCONF) && defined(HAVE_DIRFD) \ -+# if defined(HAVE_FPATHCONF) && ( defined(HAVE_DIRFD) || defined(dirfd) )\ - && defined(_PC_NAME_MAX) - name_max = fpathconf(dirfd(dirp), _PC_NAME_MAX); - if (name_max == -1) diff --git a/devel/dbus/files/patch-tools_Makefile.in b/devel/dbus/files/patch-tools_Makefile.in deleted file mode 100644 index 41a417ecf..000000000 --- a/devel/dbus/files/patch-tools_Makefile.in +++ /dev/null @@ -1,32 +0,0 @@ ---- tools/Makefile.in.orig Sun Oct 8 02:49:22 2006 -+++ tools/Makefile.in Sun Oct 8 02:51:10 2006 -@@ -150,6 +150,7 @@ DBUS_XML_DOCS_ENABLED_FALSE = @DBUS_XML_ - DBUS_XML_DOCS_ENABLED_TRUE = @DBUS_XML_DOCS_ENABLED_TRUE@ - DBUS_X_CFLAGS = @DBUS_X_CFLAGS@ - DBUS_X_LIBS = @DBUS_X_LIBS@ -+PTHREAD_LIBS = @PTHREAD_LIBS@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DOXYGEN = @DOXYGEN@ -@@ -264,7 +265,7 @@ target_alias = @target_alias@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ --INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -+INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/share/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" - dbus_send_SOURCES = \ - dbus-print-message.c \ - dbus-print-message.h \ -@@ -281,9 +282,9 @@ dbus_launch_SOURCES = \ - dbus_cleanup_sockets_SOURCES = \ - dbus-cleanup-sockets.c - --dbus_send_LDADD = $(top_builddir)/dbus/libdbus-1.la --dbus_monitor_LDADD = $(top_builddir)/dbus/libdbus-1.la --dbus_launch_LDADD = $(DBUS_X_LIBS) -+dbus_send_LDADD = $(top_builddir)/dbus/libdbus-1.la $(PTHREAD_LIBS) -+dbus_monitor_LDADD = $(top_builddir)/dbus/libdbus-1.la $(PTHREAD_LIBS) -+dbus_launch_LDADD = $(DBUS_X_LIBS) $(PTHREAD_LIBS) - man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1 - EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh - CLEANFILES = \ |