diff --git a/devel/meson/Makefile b/devel/meson/Makefile
index 768661650f96..3a02ff57e698 100644
--- a/devel/meson/Makefile
+++ b/devel/meson/Makefile
@@ -1,37 +1,37 @@
 # Created by: Ting-Wei Lan <lantw44@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	meson
-PORTVERSION=	0.56.2
+PORTVERSION=	0.57.1
 CATEGORIES=	devel python
 MASTER_SITES=	https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	High performance build system
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	ninja:devel/ninja
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR}
 
-USES=		python:3.5+ shebangfix
+USES=		python:3.6+ shebangfix
 USE_PYTHON=	autoplist distutils noflavors
 SHEBANG_FILES=	mesonbuild/rewriter.py \
 		mesonbuild/scripts/cmake_run_ctgt.py
 NO_ARCH=	yes
 
 # https://github.com/mesonbuild/meson/issues/6016
 TEST_ENV=	${MAKE_ENV:NCC=*:NCXX=*}
 
 # Hide from regular build to avoid accidental dependency on symlinks
 .if make(test)
 # helper_create_binary_wrapper, test_python_module, test cases/*.py
 BINARY_ALIAS+=	python3=${PYTHON_CMD:T} python=${PYTHON_CMD:T}
 do-test: create-binary-alias # force if run late
 .endif
 
 do-test:
 	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${WRKSRC}/run_unittests.py)
 
 .include <bsd.port.mk>
diff --git a/devel/meson/distinfo b/devel/meson/distinfo
index d2e54d051d0a..3371fab17b1c 100644
--- a/devel/meson/distinfo
+++ b/devel/meson/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1597508825
-SHA256 (meson-0.56.2.tar.gz) = 3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
-SIZE (meson-0.56.2.tar.gz) = 1794847
+TIMESTAMP = 1613827273
+SHA256 (meson-0.57.1.tar.gz) = 72e1c782ba9bda204f4a1ed57f98d027d7b6eb9414c723eebbd6ec7f1955c8a6
+SIZE (meson-0.57.1.tar.gz) = 1849222
diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile
index 202c99fe793b..e600c3699028 100644
--- a/x11-wm/i3/Makefile
+++ b/x11-wm/i3/Makefile
@@ -1,43 +1,46 @@
 # Created by: Dennis Herrmann <dhn@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	i3
 DISTVERSION=	4.19.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://i3wm.org/downloads/ \
 		http://i3wm.org/downloads/
 
+PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
+PATCHFILES+=	d0067077ed9f.patch:-p1 # https://github.com/i3/i3/pull/4264
+
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Improved dynamic tiling window manager
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libcairo.so:graphics/cairo \
 		libev.so:devel/libev \
 		libpangocairo-1.0.so:x11-toolkits/pango \
 		libpcre.so:devel/pcre \
 		libstartup-notification-1.so:x11/startup-notification \
 		libxcb-cursor.so:x11/xcb-util-cursor \
 		libxcb-icccm.so:x11/xcb-util-wm \
 		libxcb-keysyms.so:x11/xcb-util-keysyms \
 		libxcb-util.so:x11/xcb-util \
 		libxcb-xrm.so:x11/xcb-util-xrm \
 		libxkbcommon.so:x11/libxkbcommon \
 		libyajl.so:devel/yajl
 RUN_DEPENDS=	p5-AnyEvent-I3>=0:devel/p5-AnyEvent-I3 \
 		p5-IPC-Run>=0:devel/p5-IPC-Run \
 		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 
 USES=		compiler:c11 iconv localbase:ldflags meson perl5 pkgconfig tar:xz xorg
 USE_XORG=	xcb
 MESON_ARGS=	-Ddocs=false \
 		-Dmans=false
 LDFLAGS+=	${ICONV_LIB}
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
 
 CONFLICTS_INSTALL=	i3-gaps
 
 .include <bsd.port.mk>
diff --git a/x11-wm/i3/distinfo b/x11-wm/i3/distinfo
index ca025e3d115e..ce32eae89297 100644
--- a/x11-wm/i3/distinfo
+++ b/x11-wm/i3/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1612263042
 SHA256 (i3-4.19.1.tar.xz) = 2284c812fc689e0338d8fe9be0b8d1552e548fc168d165f795b26bf497c22b47
 SIZE (i3-4.19.1.tar.xz) = 1277648
+SHA256 (d0067077ed9f.patch) = 2131a32d9b96c359ce169b243c8a87e826d508a0842a373009255e2f424a7fe2
+SIZE (d0067077ed9f.patch) = 1174