Index: head/sysutils/py-ranger/Makefile
===================================================================
--- head/sysutils/py-ranger/Makefile	(revision 544045)
+++ head/sysutils/py-ranger/Makefile	(revision 544046)
@@ -1,40 +1,43 @@
 # Created by: Jin-Sih Lin <linpct@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	ranger
-PORTVERSION=	1.9.2
-PORTREVISION=	1
+PORTVERSION=	1.9.3
 CATEGORIES=	sysutils python
 MASTER_SITES=	https://ranger.github.io/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
+# Backport PR #1852 to fix runtime issues for environments that don't have
+# sysutils/screen installed but TERM set to "screen".
+PATCH_SITES=	https://github.com/ranger/ranger/commit/
+PATCHFILES=	081e73152a9391211770fab56676d7d974413ae6.patch:-p1
+
 MAINTAINER=	linpct@gmail.com
 COMMENT=	File manager with VI key bindings
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		desktop-file-utils python shebangfix
 USE_PYTHON=	autoplist concurrent distutils
 
 SHEBANG_FILES=	doc/tools/*.py
 
 NO_ARCH=	yes
 
 post-extract:
 	@${MV} ${WRKSRC}/doc/ranger.desktop ${WRKSRC}/doc/${PYTHON_PKGNAMEPREFIX}ranger.desktop
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|setuptools|distutils.core|; \
-	       	s|share/man/man|man/man|; \
 		s|share/doc/ranger|${DOCSDIR}|; \
 		s|ranger.desktop|${PYTHON_PKGNAMEPREFIX}ranger.desktop|' ${WRKSRC}/${PYSETUP}
 	@${REINPLACE_CMD} -Ee 's|Exec=(ranger)|Exec=\1-${PYTHON_VER}|' ${WRKSRC}/doc/${PYTHON_PKGNAMEPREFIX}ranger.desktop
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/ranger/ext/img_display.py
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v
 
 .include <bsd.port.mk>
Index: head/sysutils/py-ranger/distinfo
===================================================================
--- head/sysutils/py-ranger/distinfo	(revision 544045)
+++ head/sysutils/py-ranger/distinfo	(revision 544046)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1543550380
-SHA256 (ranger-1.9.2.tar.gz) = 0e1d1b1d3f78c227a6cfa783822e98591ca76a35c643d4814f40f73515d66b8a
-SIZE (ranger-1.9.2.tar.gz) = 265295
+TIMESTAMP = 1594637266
+SHA256 (ranger-1.9.3.tar.gz) = ce088a04c91c25263a9675dc5c43514b7ec1b38c8ea43d9a9d00923ff6cdd251
+SIZE (ranger-1.9.3.tar.gz) = 280363
+SHA256 (081e73152a9391211770fab56676d7d974413ae6.patch) = 177c37def1aa1fe8575c0863b34d31aea050f6006f969c658debaf92487fd343
+SIZE (081e73152a9391211770fab56676d7d974413ae6.patch) = 9192
Index: head/sysutils/py-ranger/files/patch-ranger_ext_img__display.py
===================================================================
--- head/sysutils/py-ranger/files/patch-ranger_ext_img__display.py	(revision 544045)
+++ head/sysutils/py-ranger/files/patch-ranger_ext_img__display.py	(revision 544046)
@@ -1,10 +1,17 @@
---- ranger/ext/img_display.py.orig	2017-02-20 16:56:49.277878000 +0800
-+++ ranger/ext/img_display.py	2017-02-20 17:00:01.700857000 +0800
-@@ -25,6 +25,7 @@
+Avoid hardcoded paths to w3mimgdisplay
+
+--- ranger/ext/img_display.py.orig	2019-12-31 15:07:45 UTC
++++ ranger/ext/img_display.py
+@@ -35,11 +35,7 @@ from ranger.core.shared import FileManagerAware
  W3MIMGDISPLAY_ENV = "W3MIMGDISPLAY_PATH"
  W3MIMGDISPLAY_OPTIONS = []
  W3MIMGDISPLAY_PATHS = [
+-    '/usr/lib/w3m/w3mimgdisplay',
+-    '/usr/libexec/w3m/w3mimgdisplay',
+-    '/usr/lib64/w3m/w3mimgdisplay',
+-    '/usr/libexec64/w3m/w3mimgdisplay',
+-    '/usr/local/libexec/w3m/w3mimgdisplay',
 +    '%%LOCALBASE%%/libexec/w3m/w3mimgdisplay',
-     '/usr/lib/w3m/w3mimgdisplay',
-     '/usr/libexec/w3m/w3mimgdisplay',
-     '/usr/lib64/w3m/w3mimgdisplay',
+ ]
+ 
+ # Helper functions shared between the previewers (make them static methods of the base class?)