From 7649518289eb1094d32410ab9cada540c66df334 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Wed, 4 Apr 2012 06:19:01 +0000
Subject: [PATCH] Make this build with regular make.

---
 x11/dbus/Makefile                       |  3 +--
 x11/dbus/patches/patch-test_Makefile_in | 12 +++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/x11/dbus/Makefile b/x11/dbus/Makefile
index b5f494dc978..6bbe5f994ea 100644
--- a/x11/dbus/Makefile
+++ b/x11/dbus/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.78 2012/03/31 17:56:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.79 2012/04/04 06:19:01 ajacoutot Exp $
 
 COMMENT=	message bus system
 
@@ -25,7 +25,6 @@ MASTER_SITES=	${HOMEPAGE}/releases/dbus/
 SEPARATE_BUILD=	Yes
 
 USE_LIBTOOL=	Yes
-USE_GMAKE=	Yes
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/dbus/patches/patch-test_Makefile_in b/x11/dbus/patches/patch-test_Makefile_in
index db832cf0843..ddb3c5cb93c 100644
--- a/x11/dbus/patches/patch-test_Makefile_in
+++ b/x11/dbus/patches/patch-test_Makefile_in
@@ -1,9 +1,11 @@
-$OpenBSD: patch-test_Makefile_in,v 1.4 2012/03/31 18:14:39 ajacoutot Exp $
+$OpenBSD: patch-test_Makefile_in,v 1.5 2012/04/04 06:19:01 ajacoutot Exp $
 
 https://bugs.freedesktop.org/show_bug.cgi?id=48127
 
---- test/Makefile.in.orig	Sat Mar 31 18:55:08 2012
-+++ test/Makefile.in	Sat Mar 31 18:58:02 2012
+https://bugs.freedesktop.org/show_bug.cgi?id=48277
+
+--- test/Makefile.in.orig	Tue Mar 27 14:01:13 2012
++++ test/Makefile.in	Wed Apr  4 08:02:08 2012
 @@ -1418,14 +1418,14 @@ installcheck-local:
  @DBUS_ENABLE_INSTALLED_TESTS_TRUE@		$(testexec_PROGRAMS)
  
@@ -29,13 +31,13 @@ https://bugs.freedesktop.org/show_bug.cgi?id=48127
 -	$(AM_V_at)$(INSTALL) -d data/valid-config-files
 -	$(AM_V_GEN)$(INSTALL_DATA) $< $@
 +	$(AM_V_at)$(mkinstalldirs) data/valid-config-files
-+	$(AM_V_GEN)$(install_sh_DATA) $< $@
++	$(AM_V_GEN)$(install_sh_DATA) $(top_builddir)/bus/session.conf $@
  
  data/valid-config-files/system.conf: $(top_builddir)/bus/system.conf
 -	$(AM_V_at)$(INSTALL) -d data/valid-config-files
 -	$(AM_V_GEN)$(INSTALL_DATA) $< $@
 +	$(AM_V_at)$(mkinstalldirs) data/valid-config-files
-+	$(AM_V_GEN)$(install_sh_DATA) $< $@
++	$(AM_V_GEN)$(install_sh_DATA) $(top_builddir)/bus/system.conf $@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.