dbus: switch from pkgsrc-only var/db/dbus to default var/lib/dbus

This path is what other code, notably glib2, expects.

While here, remove a compatibility patch for NetBSD 5/6.

Bump PKGREVISION.

5 files changed, 4 insertions, 64 deletions

diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index e279a98d764..1f800609aba 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.123 2021/03/14 08:31:17 nia Exp $
+# $NetBSD: Makefile,v 1.124 2021/03/29 21:00:17 wiz Exp $
 
 DISTNAME=	dbus-1.12.20
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
@@ -108,6 +109,6 @@ post-install:
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_ABI_DEPENDS.expat+=	expat>=2.1.0
+BUILDLINK_API_DEPENDS.expat+=	expat>=2.1.0
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo
index 9bb9dd34dd4..a92e1ec8ca9 100644
--- a/sysutils/dbus/distinfo
+++ b/sysutils/dbus/distinfo
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.94 2020/07/17 23:38:56 wiz Exp $
+$NetBSD: distinfo,v 1.95 2021/03/29 21:00:17 wiz Exp $
 
 SHA1 (dbus-1.12.20.tar.gz) = f7fe130511aeeac40270af38d6892ed63392c7f6
 RMD160 (dbus-1.12.20.tar.gz) = a41d7941c58da66dc5ca13927a14d0561ddb4a12
 SHA512 (dbus-1.12.20.tar.gz) = 0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056
 Size (dbus-1.12.20.tar.gz) = 2095511 bytes
-SHA1 (patch-ak) = 4535584537a22a2e42824fe45e2d75253b484147
-SHA1 (patch-al) = ffaa8f224c3dd6a97ffa42fe2e9ca924160fa68c
 SHA1 (patch-am) = ed334bc76911c9db9f5472c58fb762c56255c5b4
 SHA1 (patch-configure) = 9dee6306aa07b60449a0f9f0f1ea3dccbc70dcb4
 SHA1 (patch-dbus_dbus-sysdeps-unix.c) = 3dfc60eba7ab9d5a29d2a842ce0baa1b109df716
 SHA1 (patch-dbus_dbus-sysdeps-util-unix.c) = 1a25e53514064e452a207ad8b2a0057c11d5c190
-SHA1 (patch-tools_dbus-print-message.c) = 96267d3cff2c5207911615735748ef81604a69ec
diff --git a/sysutils/dbus/patches/patch-ak b/sysutils/dbus/patches/patch-ak
deleted file mode 100644
index 9573a903f7e..00000000000
--- a/sysutils/dbus/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.6 2017/11/23 14:43:23 wiz Exp $
-
-Adapt path for pkgsrc.
-
---- dbus/Makefile.in.orig	2017-11-13 13:36:10.000000000 +0000
-+++ dbus/Makefile.in
-@@ -619,7 +619,7 @@ dbusdatadir = $(datadir)/dbus-1
- AM_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) -I$(top_builddir) \
- 	-I$(top_srcdir) $(DBUS_STATIC_BUILD_CPPFLAGS) \
- 	$(SYSTEMD_CFLAGS) $(VALGRIND_CFLAGS) -DDBUS_COMPILATION \
--	-DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \
-+	-DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/db/dbus/machine-id"\" \
- 	-DDBUS_SYSTEM_CONFIG_FILE=\""$(dbusdatadir)/system.conf"\" \
- 	-DDBUS_SESSION_CONFIG_FILE=\""$(dbusdatadir)/session.conf"\" \
- 	-DDBUS_RUNSTATEDIR=\""$(runstatedir)"\" $(NULL) \
diff --git a/sysutils/dbus/patches/patch-al b/sysutils/dbus/patches/patch-al
deleted file mode 100644
index bd7bdfa83f1..00000000000
--- a/sysutils/dbus/patches/patch-al
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-al,v 1.6 2017/11/23 14:43:23 wiz Exp $
-
-Adapt path for pkgsrc.
-
---- tools/Makefile.in.orig	2017-11-13 13:36:10.000000000 +0000
-+++ tools/Makefile.in
-@@ -515,7 +515,7 @@ AM_CPPFLAGS = \
- 	$(DBUS_STATIC_BUILD_CPPFLAGS) \
- 	$(DBUS_X_CFLAGS) \
- 	-DDBUS_COMPILATION \
--	-DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \
-+	-DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/db/dbus/machine-id"\" \
- 	$(NULL)
- 
- AM_CFLAGS = \
-@@ -1092,9 +1092,9 @@ uninstall-am: uninstall-binPROGRAMS unin
- @DBUS_WIN_TRUE@disable-uac.rc: Win32.Manifest
- @DBUS_WIN_TRUE@	echo '1 24 "$<"' > $@
- 
--# create the /var/lib/dbus directory for dbus-uuidgen
-+# create the /var/db/dbus directory for dbus-uuidgen
- install-data-local:
--	$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/dbus
-+	$(MKDIR_P) $(DESTDIR)$(localstatedir)/db/dbus
- 
- installcheck-local:
- 	test -d $(DESTDIR)$(localstatedir)/lib/dbus
diff --git a/sysutils/dbus/patches/patch-tools_dbus-print-message.c b/sysutils/dbus/patches/patch-tools_dbus-print-message.c
deleted file mode 100644
index 14ac515e57d..00000000000
--- a/sysutils/dbus/patches/patch-tools_dbus-print-message.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-tools_dbus-print-message.c,v 1.2 2015/12/06 11:35:55 wiz Exp $
-
-Fix build on NetBSD 5.x and 6.x.
-
---- tools/dbus-print-message.c.orig	2015-10-07 20:10:37.000000000 +0000
-+++ tools/dbus-print-message.c
-@@ -30,6 +30,9 @@
- #include <sys/un.h>
- #include <unistd.h>
- #include <netinet/in.h>
-+#ifdef __NetBSD__
-+#include <netinet/in_systm.h>
-+#endif
- #include <netinet/ip.h>
- #include <arpa/inet.h>
- #endif