Index: deskutils/py-bugwarrior/Makefile
===================================================================
--- deskutils/py-bugwarrior/Makefile	(revision 446201)
+++ deskutils/py-bugwarrior/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bugwarrior
-PORTVERSION=	1.3.0
+PORTVERSION=	1.5.1
 CATEGORIES=	deskutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -22,8 +22,10 @@
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.2:devel/py-Jinja2 \
 		${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl \
+		${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future \
 		${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.5.3:devel/py-dogpile.cache \
 		${PYTHON_PKGNAMEPREFIX}lockfile>=0.9.1:devel/py-lockfile \
+		${PYTHON_PKGNAMEPREFIX}configparser>=0:devel/py-configparser \
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click \
 		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
@@ -30,7 +32,7 @@
 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 OPTIONS_DEFINE=		BUGZILLA JIRA PHABRICATOR
-OPTIONS_DEFAULT=	BUGZILLA PHABRICATOR
+OPTIONS_DEFAULT=	BUGZILLA JIRA PHABRICATOR
 
 BUGZILLA_DESC=			Enable Bugzilla support
 BUGZILLA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}python-bugzilla>0:devel/py-python-bugzilla
Index: deskutils/py-bugwarrior/distinfo
===================================================================
--- deskutils/py-bugwarrior/distinfo	(revision 446201)
+++ deskutils/py-bugwarrior/distinfo	(working copy)
@@ -1,2 +1,3 @@
-SHA256 (bugwarrior-1.3.0.tar.gz) = d4d569be76e58965190208facede67b0c83d12ad2c59e8d23b70ea332fbbf19d
-SIZE (bugwarrior-1.3.0.tar.gz) = 85003
+TIMESTAMP = 1500319709
+SHA256 (bugwarrior-1.5.1.tar.gz) = ab03c3872e8f27f954b60bb6ff4f0646a2b7e2a7fb9c12116a90cdc297b4b34f
+SIZE (bugwarrior-1.5.1.tar.gz) = 188590
Index: deskutils/py-bugwarrior/files/patch-setup.py
===================================================================
--- deskutils/py-bugwarrior/files/patch-setup.py	(revision 446201)
+++ deskutils/py-bugwarrior/files/patch-setup.py	(working copy)
@@ -1,17 +1,24 @@
---- setup.py.orig	2016-01-09 17:19:18 UTC
+--- setup.py.orig	2017-05-25 15:38:59 UTC
 +++ setup.py
-@@ -46,11 +46,13 @@ setup(name='bugwarrior',
-           "pyxdg",
+@@ -38,7 +38,7 @@ setup(name='bugwarrior',
+           "dogpile.cache>=0.5.3",
+           "lockfile>=0.9.1",
+           "click",
+-          "future!=0.16.0",
++          "future",
        ],
+       extras_require=dict(
+           keyring=["keyring", "dbus-python"],
+@@ -50,9 +50,11 @@ setup(name='bugwarrior',
+           bugzilla=["python-bugzilla"],
+       ),
        tests_require=[
 -          "Mock",
 +          "mock",
-           "unittest2",
            "nose",
-           "jira>=0.22",
-           "megaplan>=1.4",
+           "responses",
 +          "pypandoc",
 +          "pyac",
-       ],
-       test_suite='nose.collector',
-       entry_points="""
+           "bugwarrior[jira]",
+           "bugwarrior[megaplan]",
+           "bugwarrior[activecollab]",