devel/dbus: update to 1.14.4 release (+)

Changelog:	https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.14.4/NEWS
MFH:		2022q4

7 files changed, 20 insertions, 28 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index d023a099f270..dd8ef09fa988 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	dbus
-DISTVERSION=	1.14.0
+DISTVERSION=	1.14.4
 PORTEPOCH=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
@@ -34,8 +34,11 @@ PORTSCOUT=	limitw:1,even
 USERS=		messagebus
 GROUPS=		messagebus
 
+_LIBVERSION=	3.32.1
+
 PLIST_SUB=	GROUPS=${GROUPS} \
-		VERSION="1.0"
+		VERSION="1.0" \
+		LIBVERSION=${_LIBVERSION}
 
 OPTIONS_DEFINE=		EXAMPLES MANPAGES X11
 OPTIONS_DEFAULT=	MANPAGES X11
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index 282f92349830..3edcb34016f1 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1648926703
-SHA256 (dbus-1.14.0.tar.xz) = ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4
-SIZE (dbus-1.14.0.tar.xz) = 1360228
+TIMESTAMP = 1665090472
+SHA256 (dbus-1.14.4.tar.xz) = 7c0f9b8e5ec0ff2479383e62c0084a3a29af99edf1514e9f659b81b30d4e353e
+SIZE (dbus-1.14.4.tar.xz) = 1368196
diff --git a/devel/dbus/files/patch-cmake_ConfigureChecks.cmake b/devel/dbus/files/patch-cmake_ConfigureChecks.cmake
index 984ee5ad0738..41503ee27792 100644
--- a/devel/dbus/files/patch-cmake_ConfigureChecks.cmake
+++ b/devel/dbus/files/patch-cmake_ConfigureChecks.cmake
@@ -1,6 +1,6 @@
---- cmake/ConfigureChecks.cmake.orig	2018-02-23 10:25:17 UTC
+--- cmake/ConfigureChecks.cmake.orig	2022-09-14 12:12:21 UTC
 +++ cmake/ConfigureChecks.cmake
-@@ -47,6 +47,7 @@ check_symbol_exists(getpwnam_r   "errno.h pwd.h"    HA
+@@ -51,6 +51,7 @@ check_symbol_exists(clearenv     "stdlib.h"         HA
  check_symbol_exists(setenv       "stdlib.h"         HAVE_SETENV)             #  dbus-sysdeps.c
  check_symbol_exists(unsetenv     "stdlib.h"         HAVE_UNSETENV)           #  dbus-sysdeps.c
  check_symbol_exists(clearenv     "stdlib.h"         HAVE_CLEARENV)           #  dbus-sysdeps.c
diff --git a/devel/dbus/files/patch-cmake_config.h.cmake b/devel/dbus/files/patch-cmake_config.h.cmake
index 9cb0e65dfbe8..c3dc5e5b989a 100644
--- a/devel/dbus/files/patch-cmake_config.h.cmake
+++ b/devel/dbus/files/patch-cmake_config.h.cmake
@@ -1,6 +1,6 @@
---- cmake/config.h.cmake.orig	2018-02-23 10:25:17 UTC
+--- cmake/config.h.cmake.orig	2022-09-14 12:12:21 UTC
 +++ cmake/config.h.cmake
-@@ -181,6 +181,9 @@
+@@ -198,6 +198,9 @@
  /* Define to 1 if you have clearenv */
  #cmakedefine   HAVE_CLEARENV 1
  
diff --git a/devel/dbus/files/patch-configure b/devel/dbus/files/patch-configure
deleted file mode 100644
index 4c3821046452..000000000000
--- a/devel/dbus/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2022-02-28 12:24:19 UTC
-+++ configure
-@@ -22663,7 +22663,7 @@ if test "x$dbus_win" = xyes; then
- 
-     enable_x11_autolaunch=no
-     have_x11=no
--else if test "x$with_x" = xauto; then
-+else if test "x$with_x" != xno; then
- 
- pkg_failed=no
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X" >&5
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 e2e0c41ecbb1..88462759c72c 100644
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
@@ -1,14 +1,14 @@
---- dbus/dbus-sysdeps-util-unix.c.orig	2019-06-09 12:08:49 UTC
+--- dbus/dbus-sysdeps-util-unix.c.orig	2022-09-14 12:12:21 UTC
 +++ dbus/dbus-sysdeps-util-unix.c
-@@ -42,6 +42,7 @@
- #include <stdio.h>
+@@ -44,6 +44,7 @@
  #include <errno.h>
  #include <fcntl.h>
+ #include <limits.h>
 +#include <syslog.h>
  #include <sys/stat.h>
  #ifdef HAVE_SYS_RESOURCE_H
  #include <sys/resource.h>
-@@ -1367,7 +1368,7 @@ out:
+@@ -1394,7 +1395,7 @@ out:
   * On UNIX this should be the standard xdg freedesktop.org data directories:
   *
   * XDG_DATA_HOME=${XDG_DATA_HOME-$HOME/.local/share}
@@ -17,7 +17,7 @@
   *
   * and
   *
-@@ -1424,7 +1425,7 @@ _dbus_get_standard_session_servicedirs (DBusList **dir
+@@ -1451,7 +1452,7 @@ _dbus_get_standard_session_servicedirs (DBusList **dir
      }
    else
      {
@@ -26,7 +26,7 @@
          goto oom;
      }
  
-@@ -1457,7 +1458,7 @@ _dbus_get_standard_session_servicedirs (DBusList **dir
+@@ -1484,7 +1485,7 @@ _dbus_get_standard_session_servicedirs (DBusList **dir
   *
   * On UNIX this should be the standard xdg freedesktop.org data directories:
   *
@@ -35,7 +35,7 @@
   *
   * and
   *
-@@ -1482,7 +1483,7 @@ _dbus_get_standard_system_servicedirs (DBusList **dirs
+@@ -1509,7 +1510,7 @@ _dbus_get_standard_system_servicedirs (DBusList **dirs
     * be available.
     */
    static const char standard_search_path[] =
diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist
index 43ecf33b23cb..18ba55d4ff48 100644
--- a/devel/dbus/pkg-plist
+++ b/devel/dbus/pkg-plist
@@ -32,7 +32,7 @@ lib/dbus-%%VERSION%%/include/dbus/dbus-arch-deps.h
 lib/libdbus-1.a
 lib/libdbus-1.so
 lib/libdbus-1.so.3
-lib/libdbus-1.so.3.32.0
+lib/libdbus-1.so.%%LIBVERSION%%
 libdata/pkgconfig/dbus-1.pc
 @(,%%GROUPS%%,4750) libexec/dbus-daemon-launch-helper
 %%MANPAGES%%man/man1/dbus-cleanup-sockets.1.gz