Index: head/sysutils/py-ranger/Makefile
===================================================================
--- head/sysutils/py-ranger/Makefile	(revision 507997)
+++ head/sysutils/py-ranger/Makefile	(revision 507998)
@@ -1,25 +1,40 @@
 # Created by: Jin-Sih Lin <linpct@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	ranger
 PORTVERSION=	1.9.2
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	https://ranger.github.io/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	linpct@gmail.com
 COMMENT=	Ranger is a file manager with VI key bindings
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python shebangfix
+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
-python_OLD_CMD=	/bin/python
-USE_PYTHON=	autoplist distutils
+
 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|doc|' ${WRKSRC}/${PYSETUP}
+	@${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>