diff --git devel/ninja/Makefile devel/ninja/Makefile
index 8a50947b896a..e6bf855e85a4 100644
--- devel/ninja/Makefile
+++ devel/ninja/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	ninja
-PORTVERSION=	1.8.2
+PORTVERSION=	1.9.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	devel
 
diff --git devel/ninja/distinfo devel/ninja/distinfo
index 73c3886104f5..9f364e1eee4c 100644
--- devel/ninja/distinfo
+++ devel/ninja/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1505991412
-SHA256 (ninja-build-ninja-v1.8.2_GH0.tar.gz) = 86b8700c3d0880c2b44c2ff67ce42774aaf8c28cbf57725cb881569288c1c6f4
-SIZE (ninja-build-ninja-v1.8.2_GH0.tar.gz) = 185226
+TIMESTAMP = 1548892741
+SHA256 (ninja-build-ninja-v1.9.0_GH0.tar.gz) = 5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9
+SIZE (ninja-build-ninja-v1.9.0_GH0.tar.gz) = 190860
diff --git multimedia/totem/Makefile multimedia/totem/Makefile
index 6169cdbfc4f9..4f27ade696da 100644
--- multimedia/totem/Makefile
+++ multimedia/totem/Makefile
@@ -53,19 +53,16 @@ GLIB_SCHEMAS=	org.gnome.totem.enums.xml \
 		org.gnome.totem.plugins.opensubtitles.gschema.xml \
 		org.gnome.totem.plugins.pythonconsole.gschema.xml
 
+# There is an upstream issue in meson which makes the build of totem
+# fail when using vala, due to badly created targets.
+# https://gitlab.gnome.org/GNOME/totem/issues/272
 # https://bugzilla.gnome.org/show_bug.cgi?id=786248
 # https://github.com/mesonbuild/meson/issues/1994
-MAKE_JOBS_UNSAFE=yes
-
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == i386
+# Until upstream fixes this, remove vala support from totem.
 MESON_ARGS=	-Denable-vala=no
 PLIST_SUB+=	VALA="@comment "
-.else
-BUILD_DEPENDS+=	valac:lang/vala
-PLIST_SUB+=	VALA=""
-.endif
+
+.include <bsd.port.options.mk>
 
 .if defined(WITH_DVD_DEVICE)
 DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}