Index: head/devel/meson/Makefile
===================================================================
--- head/devel/meson/Makefile	(revision 548667)
+++ head/devel/meson/Makefile	(revision 548668)
@@ -1,36 +1,37 @@
 # Created by: Ting-Wei Lan <lantw44@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	meson
-PORTVERSION=	0.54.3
+PORTVERSION=	0.55.3
 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
 USE_PYTHON=	autoplist distutils noflavors
-SHEBANG_FILES=	mesonbuild/cmake/data/run_ctgt.py
+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>
Index: head/devel/meson/distinfo
===================================================================
--- head/devel/meson/distinfo	(revision 548667)
+++ head/devel/meson/distinfo	(revision 548668)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1453575159
-SHA256 (meson-0.54.3.tar.gz) = f2bdf4cf0694e696b48261cdd14380fb1d0fe33d24744d8b2df0c12f33ebb662
-SIZE (meson-0.54.3.tar.gz) = 1690919
+TIMESTAMP = 1597508825
+SHA256 (meson-0.55.3.tar.gz) = 6bed2a25a128bbabe97cf40f63165ebe800e4fcb46db8ab7ef5c2b5789f092a5
+SIZE (meson-0.55.3.tar.gz) = 1740465
Index: head/x11/gnome-shell/Makefile
===================================================================
--- head/x11/gnome-shell/Makefile	(revision 548667)
+++ head/x11/gnome-shell/Makefile	(revision 548668)
@@ -1,74 +1,79 @@
 # Created by: Pawel Worach <pawel.worach@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	gnome-shell
 PORTVERSION=	3.28.3
 PORTREVISION=	8
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Next generation GNOME desktop shell
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
 		sassc:textproc/sassc \
 		gnome-control-center:sysutils/gnome-control-center
 LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
 		libdrm.so:graphics/libdrm \
 		libmutter-2.so:x11-wm/mutter \
 		libatk-bridge-2.0.so:accessibility/at-spi2-atk \
 		libsoup-2.4.so:devel/libsoup \
 		libjson-glib-1.0.so:devel/json-glib \
 		libsecret-1.so:security/libsecret \
 		libpolkit-agent-1.so:sysutils/polkit \
 		libp11-kit.so:security/p11-kit \
 		libical.so:devel/libical \
 		libgcr-3.so:security/gcr \
 		libicuuc.so:devel/icu \
 		libpulse.so:audio/pulseaudio \
 		libcroco-0.6.so:textproc/libcroco \
 		libcanberra.so:audio/libcanberra \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libp11-kit.so:security/p11-kit \
 		libgjs.so:lang/gjs
 RUN_DEPENDS=	gnome-control-center:sysutils/gnome-control-center
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c11 cpe gettext gl gnome libtool localbase meson \
 		pathfix perl5 pkgconfig python:3.4+ shebangfix tar:xz \
 		webplugin:native xorg
 USE_GNOME=	cairo evolutiondataserver3 gdkpixbuf2 introspection \
 		libxslt:build libxml2
 USE_XORG=	x11 xcomposite xdamage xext xfixes xi xrandr xtst
 USE_GL=		egl gbm
 USE_GSTREAMER1=	yes
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	src/gnome-shell-perf-tool.in \
 		src/gnome-shell-extension-tool.in
 
 WEBPLUGIN_NAME=	libgnome-shell-browser-plugin.so
 WEBPLUGIN_DIR=	${PREFIX}/lib/mozilla/plugins/
 WEBPLUGIN_FILES=libgnome-shell-browser-plugin.so
 
 MESON_ARGS=	-Dsystemd=false \
 		-Dnetworkmanager=false
 CPE_VENDOR=	gnome
 
 GLIB_SCHEMAS=	org.gnome.shell.gschema.xml
 
+.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
+# Work around "New rpath must not be longer than the old one."
+LDFLAGS+=	-fuse-ld=lld
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|python3|${PYTHON_VERSION}|g' \
 		${WRKSRC}/meson.build
 	@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|g' \
 		${WRKSRC}/src/shell-app-system.c
 
 pre-build:
 	@cd ${BUILD_WRKSRC} && ninja src/st/st-scroll-view-fade-generated.c
 
 .include <bsd.port.mk>