Substitute REINPLACE_CMD with a patch

While here, mute MKDIR and regenerate patches.

Approved by:	portmgr blanket

4 files changed, 28 insertions, 18 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index e789dd56bf86..fee25eaa120c 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -52,10 +52,9 @@ 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
diff --git a/devel/dbus/files/patch-Makefile.in b/devel/dbus/files/patch-Makefile.in
new file mode 100644
index 000000000000..ab137db64f19
--- /dev/null
+++ b/devel/dbus/files/patch-Makefile.in
@@ -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
diff --git a/devel/dbus/files/patch-dbus_dbus-connection.c b/devel/dbus/files/patch-dbus_dbus-connection.c
index f372d7600520..58b587c84140 100644
--- a/devel/dbus/files/patch-dbus_dbus-connection.c
+++ b/devel/dbus/files/patch-dbus_dbus-connection.c
@@ -1,6 +1,6 @@
---- 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;
@@ -9,8 +9,8 @@
  
    _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;
 -  
@@ -22,7 +22,7 @@
    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");
  
@@ -31,7 +31,7 @@
          }
        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,
@@ -40,7 +40,7 @@
          }
  
        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)
      {
@@ -49,7 +49,7 @@
        
        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");
  
@@ -58,8 +58,8 @@
          }
        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);
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
index cdf6eaf0796d..75e1a55a3d69 100644
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
@@ -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 <stdio.h>
  #include <errno.h>
  #include <fcntl.h>
 +#include <syslog.h>
  #include <sys/stat.h>
- #include <grp.h>
- #include <sys/socket.h>
+ #ifdef HAVE_SYS_RESOURCE_H
+ #include <sys/resource.h>