diff --git a/graphics/simpleviewer/Makefile b/graphics/simpleviewer/Makefile
index 82ce2dfd6d89..668875d9fb22 100644
--- a/graphics/simpleviewer/Makefile
+++ b/graphics/simpleviewer/Makefile
@@ -1,89 +1,87 @@
 PORTNAME=	simpleviewer
-PORTVERSION=	3.1.7
-PORTREVISION=	21
+PORTVERSION=	3.1.9
 CATEGORIES=	graphics
-MASTER_SITES=	https://bitbucket.org/andreyu/simple-viewer-gl/get/
-DISTNAME=	v${PORTVERSION}	# version tag, has no embedded ${PORTNAME}
-DIST_SUBDIR=	${PORTNAME}	# and that's why we need ${DIST_SUBDIR}
+MASTER_SITES=	https://bitbucket.org/andreyu/simple-viewer-gl/get/${BB_COMMIT}.tar.bz2?dummy=/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Small and simple image viewer based on OpenGL
 WWW=		https://bitbucket.org/andreyu/simple-viewer-gl
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libglfw.so:graphics/glfw \
 		liblz4.so:archivers/liblz4 \
 		libpng.so:graphics/png
 
 USES=		cmake:insource compiler:c++11-lang gl jpeg pkgconfig \
 		tar:bzip2 xorg
 USE_GL=		gl glu
 USE_XORG=	ice sm x11 xcursor xext xinerama xrandr xxf86vm
 CMAKE_ARGS=	-DAPP_VERSION_MAJOR:STRING=${PORTVERSION:S/./ /g:[1]} \
 		-DAPP_VERSION_MINOR:STRING=${PORTVERSION:S/./ /g:[2]} \
 		-DAPP_VERSION_RELEASE:STRING=${PORTVERSION:S/./ /g:[3]}
 
-WRKSRC=		${WRKDIR}/andreyu-simple-viewer-gl-d8928067922d
+BB_COMMIT=	cded7dfe23c4
+WRKSRC=		${WRKDIR}/andreyu-simple-viewer-gl-${BB_COMMIT}
 
 PLIST_FILES=	bin/sviewgl ${DATADIR_REL}/Icon-1024.png \
 		${DATADIR_REL}/Icon-16.png ${DATADIR_REL}/Icon-32.png
 PORTDOCS=	README.md
 PORTEXAMPLES=	config.example
 SUB_FILES=	pkg-message
 
 EXTRA_FEATURES=	CURL GIF IMLIB2 JPEG2000 LCMS2 LIBEXIF OPENEXR TIFF WEBP
 OPTIONS_DEFINE=	DOCS EXAMPLES ${EXTRA_FEATURES}
 OPTIONS_DEFAULT=	${EXTRA_FEATURES}
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CMAKE_OFF=		-DDISABLE_CURL_SUPPORT:STRING=1
 
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_CMAKE_OFF=		-DDISABLE_GIF_SUPPORT:STRING=1
 
 IMLIB2_LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 IMLIB2_CMAKE_OFF=	-DDISABLE_IMLIB2_SUPPORT:STRING=1
 
 JPEG2000_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 JPEG2000_CMAKE_OFF=	-DDISABLE_JPEG2000_SUPPORT:STRING=1
 
 LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 LCMS2_CMAKE_OFF=	-DDISABLE_LCMS2_SUPPORT:STRING=1
 
 LIBEXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 LIBEXIF_CMAKE_OFF=	-DDISABLE_EXIF_SUPPORT:STRING=1
 
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr \
 			libImath.so:math/Imath
 OPENEXR_CMAKE_OFF=	-DDISABLE_OPENEXR_SUPPORT:STRING=1
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CMAKE_OFF=		-DDISABLE_TIFF_SUPPORT:STRING=1
 
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CMAKE_OFF=		-DDISABLE_WEBP_SUPPORT:STRING=1
 
 post-patch:
 	@${REINPLACE_CMD} -e '/#include/s,lz4/,,' \
 		${WRKSRC}/src/formats/formatage.cpp
 	@${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \
 		${WRKSRC}/src/main.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sviewgl ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/res/Icon-*.png ${STAGEDIR}${DATADIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/config.example ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
 
 JPEG2000_DESC+=	via OpenJPEG
diff --git a/graphics/simpleviewer/distinfo b/graphics/simpleviewer/distinfo
index dcfe156f42b1..96fdff89baa5 100644
--- a/graphics/simpleviewer/distinfo
+++ b/graphics/simpleviewer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1573635164
-SHA256 (simpleviewer/v3.1.7.tar.bz2) = 7ac309f080d7095f824b580fb02b066914c81b0bef1daa82cd474d06e23bf7f7
-SIZE (simpleviewer/v3.1.7.tar.bz2) = 893495
+TIMESTAMP = 1671715617
+SHA256 (simpleviewer-3.1.9.tar.bz2) = be6ee4b6ffbd5b486168584cf8d9e9c28fd754469236764ce30cf7bd456a9c1c
+SIZE (simpleviewer-3.1.9.tar.bz2) = 1385056
diff --git a/graphics/simpleviewer/files/patch-CMakeLists.txt b/graphics/simpleviewer/files/patch-CMakeLists.txt
index 24b62436eeaf..1a2cb795ef7a 100644
--- a/graphics/simpleviewer/files/patch-CMakeLists.txt
+++ b/graphics/simpleviewer/files/patch-CMakeLists.txt
@@ -1,48 +1,48 @@
 --- CMakeLists.txt.orig	2019-11-13 08:52:44 UTC
 +++ CMakeLists.txt
 @@ -27,7 +27,7 @@ message(STATUS "***************************")
  if(CMAKE_BUILD_TYPE STREQUAL "Release")
      message(STATUS "*      Release Build      *")
      add_definitions("-DNDEBUG" )
--    add_definitions("-Wall -Wextra -pedantic -pedantic-errors -O2")
+-    add_definitions("-Wall -Wextra -pedantic -pedantic-errors -Wno-unused-function -Wno-deprecated-register -O2")
 +    add_definitions("-Wall -Wextra")
  else()
      message(STATUS "*       Debug Build       *")
      add_definitions("-DDEBUG" )
 @@ -250,7 +250,7 @@ set(DISABLE_OPENEXR_SUPPORT "0" CACHE STRING "Disable 
  if (DISABLE_OPENEXR_SUPPORT EQUAL 0)
      pkg_check_modules(OPENEXR QUIET OpenEXR)
      if(OPENEXR_FOUND)
--        pkg_check_modules(ILMBASE REQUIRED IlmBase)
-+        pkg_check_modules(ILMBASE REQUIRED Imath)
+-        pkg_check_modules(ILMBASE QUIET IlmBase)
++        pkg_check_modules(ILMBASE QUIET Imath)
          if(ILMBASE_FOUND)
              message(STATUS "(+) OpenEXR support enabled")
              if(VERBOSE_PATHS)
 @@ -261,7 +261,7 @@ if (DISABLE_OPENEXR_SUPPORT EQUAL 0)
              link_directories(${ILMBASE_LIBRARY_DIRS} ${OPENEXR_LIBRARY_DIRS})
              include_directories(${ILMBASE_INCLUDE_DIRS} ${OPENEXR_INCLUDE_DIRS})
          else()
 -            message(STATUS "(-) ILMBase not found")
 +            message(STATUS "(-) Imath not found")
          endif()
      else()
          message(STATUS "(-) OpenEXR support dropped")
 @@ -316,7 +316,6 @@ endif()
  message(STATUS "***************************")
  
  add_subdirectory(third-party/imgui)
 -add_subdirectory(third-party/lz4)
  
  include_directories("src")
  
 @@ -349,8 +348,8 @@ else()
      add_executable(sviewgl ${SVIEW_SOURCES})
  endif()
  
 -add_dependencies(sviewgl ImGui LZ4)
 -target_link_libraries(sviewgl ImGui LZ4)
 +add_dependencies(sviewgl ImGui)
 +target_link_libraries(sviewgl ImGui lz4)
  
  if(OPENGL_FOUND)
      target_link_libraries(sviewgl ${OPENGL_LIBRARY})