Index: head/graphics/imv/Makefile
===================================================================
--- head/graphics/imv/Makefile	(revision 510014)
+++ head/graphics/imv/Makefile	(revision 510015)
@@ -1,65 +1,92 @@
 # Created by: Tobias Kortkamp <t@tobik.me>
 # $FreeBSD$
 
 PORTNAME=	imv
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.1.1
+DISTVERSION=	4.0.0
 CATEGORIES=	graphics
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Simple image viewer
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	a2x:textproc/asciidoc
-LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
+LIB_DEPENDS=	libxkbcommon.so:x11/libxkbcommon
 TEST_DEPENDS=	${LOCALBASE}/lib/libcmocka.so:sysutils/cmocka
 
-USES=		desktop-file-utils gmake pkgconfig sdl
+USES=		desktop-file-utils gettext-runtime gl gmake gnome pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	eXeC64
-USE_SDL=	sdl2 ttf2
+USE_GL=		gl
+USE_GNOME=	cairo glib20 pango
 
 MAKE_ARGS=	CONFIGPREFIX=${PREFIX}/etc \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_MAN="${INSTALL_MAN}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		MANPREFIX=${PREFIX}/man \
-		V=1
+		V=1 \
+		WINDOWS=${_IMV_WINDOWS}
 ALL_TARGET=	imv doc
 TEST_TARGET=	check
 
 PLIST_FILES=	bin/imv \
+		bin/imv-msg \
 		etc/imv_config \
+		man/man1/imv-msg.1.gz \
 		man/man1/imv.1.gz \
 		man/man5/imv.5.gz \
 		share/applications/imv.desktop
 
 OPTIONS_DEFINE=		FREEIMAGE JPEG PNG SVG TIFF
-OPTIONS_DEFAULT=	FREEIMAGE SVG
+OPTIONS_DEFAULT=	FREEIMAGE SVG WAYLAND X11
+OPTIONS_MULTI=		WINDOWS
+OPTIONS_MULTI_WINDOWS=	WAYLAND X11
+OPTIONS_SUB=		yes
 
 FREEIMAGE_DESC=	FreeImage backend (support for many image formats)
+WINDOWS_DESC=	Windowing system
 
 FREEIMAGE_LIB_DEPENDS=		libfreeimage.so:graphics/freeimage
 FREEIMAGE_MAKE_ARGS_OFF=	BACKEND_FREEIMAGE=no
 FREEIMAGE_MAKE_ARGS=		BACKEND_FREEIMAGE=yes
 
 JPEG_LIB_DEPENDS=	libturbojpeg.so:graphics/libjpeg-turbo
 JPEG_MAKE_ARGS_OFF=	BACKEND_LIBJPEG=no
 JPEG_MAKE_ARGS=		BACKEND_LIBJPEG=yes
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_MAKE_ARGS_OFF=	BACKEND_LIBPNG=no
 PNG_MAKE_ARGS=		BACKEND_LIBPNG=yes
 
 SVG_USES=		gnome
 SVG_USE=		GNOME=cairo,librsvg2
 SVG_MAKE_ARGS_OFF=	BACKEND_LIBRSVG=no
 SVG_MAKE_ARGS=		BACKEND_LIBRSVG=yes
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_MAKE_ARGS_OFF=	BACKEND_LIBTIFF=no
 TIFF_MAKE_ARGS=		BACKEND_LIBTIFF=yes
+
+WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
+			libwayland-egl.so:graphics/wayland
+WAYLAND_USE=		GL=egl
+WAYLAND_VARS=		_IMV_WINDOWS=wayland
+
+X11_USES=	xorg
+X11_USE=	GL=glu \
+		XORG=x11,xcb
+X11_VARS=	_IMV_WINDOWS=x11
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MWAYLAND} && ${PORT_OPTIONS:MX11}
+_IMV_WINDOWS=	all
+PLIST_FILES+=	bin/imv-wayland \
+		bin/imv-x11
+.endif
 
 .include <bsd.port.mk>
Index: head/graphics/imv/distinfo
===================================================================
--- head/graphics/imv/distinfo	(revision 510014)
+++ head/graphics/imv/distinfo	(revision 510015)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561235978
-SHA256 (eXeC64-imv-v3.1.1_GH0.tar.gz) = e6eca0c9f341ebb68444d12576291e5bcdeb31d5fb34da98fdb1e29ba16a7e15
-SIZE (eXeC64-imv-v3.1.1_GH0.tar.gz) = 45184
+TIMESTAMP = 1566916049
+SHA256 (eXeC64-imv-v4.0.0_GH0.tar.gz) = 3300418632bbb8296634a2aea2a2709e31b08d2fc8f1464ae03b3b5754474299
+SIZE (eXeC64-imv-v4.0.0_GH0.tar.gz) = 74022