Index: head/www/rtv/Makefile
===================================================================
--- head/www/rtv/Makefile
+++ head/www/rtv/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rtv
-PORTVERSION=	1.15.0
+PORTVERSION=	1.15.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
@@ -15,8 +15,7 @@
 		${PYTHON_PKGNAMEPREFIX}kitchen>=1.2.4:devel/py-kitchen \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.1:www/py-beautifulsoup \
-		${PYTHON_PKGNAMEPREFIX}decorator>=4.0.10:devel/py-decorator \
-		${PYTHON_PKGNAMEPREFIX}mailcap_fix>=0.1.3:devel/py-mailcap-fix
+		${PYTHON_PKGNAMEPREFIX}decorator>=4.0.10:devel/py-decorator
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	michael-lazar
@@ -25,4 +24,10 @@
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3600
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mailcap_fix>=0.1.3:devel/py-mailcap-fix
+.endif
+
+.include <bsd.port.post.mk>
Index: head/www/rtv/distinfo
===================================================================
--- head/www/rtv/distinfo
+++ head/www/rtv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491007947
-SHA256 (michael-lazar-rtv-v1.15.0_GH0.tar.gz) = 795ac6b253445a1a76b246432393e6e5f12babba0360ed7caac33fca57ced891
-SIZE (michael-lazar-rtv-v1.15.0_GH0.tar.gz) = 7388732
+TIMESTAMP = 1491835907
+SHA256 (michael-lazar-rtv-v1.15.1_GH0.tar.gz) = 22d824c546692833c58f95cfbf131615733af43c1e0ac2bfd7021cdbe4817818
+SIZE (michael-lazar-rtv-v1.15.1_GH0.tar.gz) = 7388912
Index: head/www/rtv/files/patch-setup.py
===================================================================
--- head/www/rtv/files/patch-setup.py
+++ head/www/rtv/files/patch-setup.py
@@ -1,11 +1,11 @@
---- setup.py.orig	2017-03-31 04:04:10 UTC
+--- setup.py.orig	2017-04-10 03:35:24 UTC
 +++ setup.py
-@@ -22,7 +22,7 @@ setuptools.setup(
+@@ -62,7 +62,7 @@ setuptools.setup(
          'rtv': ['templates/*'],
-         'rtv.packages.praw': ['praw.ini'],
-         },
+         'rtv.packages.praw': ['praw.ini']
+     },
 -    data_files=[("share/man/man1", ["rtv.1"])],
 +    data_files=[("man/man1", ["rtv.1"])],
-     install_requires=[
-         'beautifulsoup4',
-         'decorator',
+     install_requires=install_requires,
+     tests_require=tests_require,
+     extras_require=extras_require,