Index: head/devel/dbus/Makefile =================================================================== --- head/devel/dbus/Makefile (revision 529236) +++ head/devel/dbus/Makefile (revision 529237) @@ -1,66 +1,65 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= dbus DISTVERSION= 1.12.16 CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ MAINTAINER= desktop@FreeBSD.org COMMENT= Message bus system for inter-application communication LICENSE= GPLv2 LIB_DEPENDS= libexpat.so:textproc/expat2 USES= cpe gmake libtool localbase pkgconfig python:build shebangfix CPE_VENDOR= d-bus_project CPE_PRODUCT= d-bus USE_LDCONFIG= yes USE_RC_SUBR= dbus SHEBANG_FILES= tools/GetAllMatchRules.py GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-apparmor \ --disable-doxygen-docs \ --disable-selinux \ --disable-systemd \ --with-test-socket-dir=${WRKDIR} INSTALL_TARGET= install-strip PORTSCOUT= limitw:1,even USERS= messagebus GROUPS= messagebus PLIST_SUB= GROUPS=${GROUPS} \ VERSION="1.0" OPTIONS_DEFINE= EXAMPLES MANPAGES X11 OPTIONS_DEFAULT= MANPAGES X11 OPTIONS_SUB= yes X11_DESC= Support X11 Desktop Environments MANPAGES_BUILD_DEPENDS= minixmlto:textproc/minixmlto MANPAGES_CONFIGURE_ENABLE= xml-docs MANPAGES_CONFIGURE_ENV= XMLTO=${LOCALBASE}/bin/minixmlto X11_USES= xorg X11_USE= XORG=ice,sm,x11 X11_CONFIGURE_WITH= x post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/dbus/dbus-sysdeps-unix.c - @${REINPLACE_CMD} '/^SUBDIRS =/s|test||' ${WRKSRC}/Makefile.in post-install: - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${MV} ${STAGEDIR}${DOCSDIR}/examples/* ${STAGEDIR}${EXAMPLESDIR} ${RM} -r ${STAGEDIR}${DOCSDIR} .for file in session.conf system.conf @cd ${STAGEDIR}${ETCDIR}-1/ && \ ${MV} ${file} ${file}.sample .endfor .include Index: head/devel/dbus/files/patch-Makefile.in =================================================================== --- head/devel/dbus/files/patch-Makefile.in (nonexistent) +++ head/devel/dbus/files/patch-Makefile.in (revision 529237) @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2020-03-27 09:19:12 UTC ++++ Makefile.in +@@ -508,7 +508,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = dbus bus tools test doc ++SUBDIRS = dbus bus tools doc + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = dbus-1.pc + cmakeconfigdir = $(libdir)/cmake/DBus1 Property changes on: head/devel/dbus/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/dbus/files/patch-dbus_dbus-connection.c =================================================================== --- head/devel/dbus/files/patch-dbus_dbus-connection.c (revision 529236) +++ head/devel/dbus/files/patch-dbus_dbus-connection.c (revision 529237) @@ -1,69 +1,69 @@ ---- 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 +--- dbus/dbus-connection.c.orig 2018-02-08 14:07:21 UTC ++++ dbus/dbus-connection.c +@@ -2385,7 +2385,7 @@ _dbus_connection_block_pending_call (DBusPendingCall * 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); +@@ -2466,7 +2466,11 @@ _dbus_connection_block_pending_call (DBusPendingCall * + _dbus_get_monotonic_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 +@@ -2494,7 +2498,7 @@ _dbus_connection_block_pending_call (DBusPendingCall * */ _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 +@@ -2503,7 +2507,7 @@ _dbus_connection_block_pending_call (DBusPendingCall * 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 +@@ -2512,7 +2516,7 @@ _dbus_connection_block_pending_call (DBusPendingCall * _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 +@@ -2522,7 +2526,7 @@ _dbus_connection_block_pending_call (DBusPendingCall * */ _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, +@@ -2531,7 +2535,7 @@ _dbus_connection_block_pending_call (DBusPendingCall * + pending, DBUS_ITERATION_DO_READING | DBUS_ITERATION_BLOCK, - timeout_milliseconds - elapsed_milliseconds); + remain_milliseconds); } goto recheck_status; Index: head/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c =================================================================== --- head/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c (revision 529236) +++ head/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c (revision 529237) @@ -1,10 +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 @@ +--- dbus/dbus-sysdeps-util-unix.c.orig 2019-06-09 12:08:49 UTC ++++ dbus/dbus-sysdeps-util-unix.c +@@ -42,6 +42,7 @@ #include #include #include +#include #include - #include - #include + #ifdef HAVE_SYS_RESOURCE_H + #include