diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index b8f9b271bf70..c2558176d6d5 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -1,66 +1,66 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 
 PORTNAME=	dbus
 DISTVERSION=	1.12.20
-PORTREVISION=	3
+PORTREVISION=	4
 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-session-socket-dir=/tmp \
 		--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|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/dbus/dbus-sysdeps-util-unix.c
 
 post-install:
 	@${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 <bsd.port.mk>
diff --git a/devel/dbus/files/patch-cmake_ConfigureChecks.cmake b/devel/dbus/files/patch-cmake_ConfigureChecks.cmake
new file mode 100644
index 000000000000..984ee5ad0738
--- /dev/null
+++ b/devel/dbus/files/patch-cmake_ConfigureChecks.cmake
@@ -0,0 +1,10 @@
+--- cmake/ConfigureChecks.cmake.orig	2018-02-23 10:25:17 UTC
++++ cmake/ConfigureChecks.cmake
+@@ -47,6 +47,7 @@ check_symbol_exists(getpwnam_r   "errno.h pwd.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
++check_symbol_exists(closefrom    "unistd.h"         HAVE_CLOSEFROM)          #  dbus-sysdeps-unix.c
+ check_symbol_exists(writev       "sys/uio.h"        HAVE_WRITEV)             #  dbus-sysdeps.c, dbus-sysdeps-win.c
+ check_symbol_exists(setrlimit    "sys/resource.h"   HAVE_SETRLIMIT)          #  dbus-sysdeps.c, dbus-sysdeps-win.c, test/test-segfault.c
+ check_symbol_exists(socketpair   "sys/socket.h"     HAVE_SOCKETPAIR)         #  dbus-sysdeps.c
diff --git a/devel/dbus/files/patch-cmake_config.h.cmake b/devel/dbus/files/patch-cmake_config.h.cmake
new file mode 100644
index 000000000000..9cb0e65dfbe8
--- /dev/null
+++ b/devel/dbus/files/patch-cmake_config.h.cmake
@@ -0,0 +1,12 @@
+--- cmake/config.h.cmake.orig	2018-02-23 10:25:17 UTC
++++ cmake/config.h.cmake
+@@ -181,6 +181,9 @@
+ /* Define to 1 if you have clearenv */
+ #cmakedefine   HAVE_CLEARENV 1
+ 
++/* Define to 1 if you have closefrom */
++#cmakedefine   HAVE_CLOSEFROM 1
++
+ /* Define to 1 if you have writev */
+ #cmakedefine   HAVE_WRITEV 1
+ 
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
new file mode 100644
index 000000000000..d73b90e48357
--- /dev/null
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
@@ -0,0 +1,21 @@
+--- dbus/dbus-sysdeps-unix.c.orig	2020-07-02 09:08:39 UTC
++++ dbus/dbus-sysdeps-unix.c
+@@ -4469,6 +4469,10 @@ _dbus_socket_can_pass_unix_fd (DBusSocket fd)
+ void
+ _dbus_close_all (void)
+ {
++#ifdef __FreeBSD__
++  closefrom(3);
++#else
++#error Expected to be FreeBSD with closefrom()
+   int maxfds, i;
+ 
+ #ifdef __linux__
+@@ -4525,6 +4528,7 @@ _dbus_close_all (void)
+   /* close all inherited fds */
+   for (i = 3; i < maxfds; i++)
+     close (i);
++#endif
+ }
+ 
+ /**