diff --git a/devel/py-click/Makefile b/devel/py-click/Makefile
index a18e5042d26..38af5563367 100644
--- a/devel/py-click/Makefile
+++ b/devel/py-click/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2016/06/03 12:20:32 sebastia Exp $
+# $OpenBSD: Makefile,v 1.3 2016/06/08 17:16:46 danj Exp $
 
 COMMENT=	command line library for Python
 
 MODPY_EGG_VERSION=6.6
 DISTNAME=	click-${MODPY_EGG_VERSION}
 PKGNAME=	py-click-${MODPY_EGG_VERSION}
+REVISION=	0
 
 CATEGORIES=	devel
 
@@ -21,4 +22,12 @@ MODULES=	lang/python
 
 MODPY_SETUPTOOLS= Yes
 
+FLAVORS=	python3
+FLAVOR?=
+
+TEST_DEPENDS=	devel/py-test${MODPY_FLAVOR}
+
+do-test:
+	@cd ${WRKSRC} && ${MODPY_BIN} -m pytest
+
 .include <bsd.port.mk>
diff --git a/devel/py-click/pkg/PLIST b/devel/py-click/pkg/PLIST
index 86f172a0f43..b820a1c4128 100644
--- a/devel/py-click/pkg/PLIST
+++ b/devel/py-click/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2016/01/07 11:35:16 sebastia Exp $
+@comment $OpenBSD: PLIST,v 1.2 2016/06/08 17:16:46 danj Exp $
 lib/python${MODPY_VERSION}/site-packages/click/
 lib/python${MODPY_VERSION}/site-packages/click-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/click-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -6,36 +6,37 @@ lib/python${MODPY_VERSION}/site-packages/click-${MODPY_EGG_VERSION}-py${MODPY_VE
 lib/python${MODPY_VERSION}/site-packages/click-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
 lib/python${MODPY_VERSION}/site-packages/click-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/click/__init__.py
-lib/python${MODPY_VERSION}/site-packages/click/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/click/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/click/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/click/${MODPY_PYCACHE}_bashcomplete.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/click/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/click/${MODPY_PYCACHE}_termui_impl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/click/${MODPY_PYCACHE}_textwrap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/click/${MODPY_PYCACHE}_unicodefun.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/click/${MODPY_PYCACHE}_winconsole.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/click/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/click/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/click/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/click/${MODPY_PYCACHE}formatting.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/click/${MODPY_PYCACHE}globals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/click/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/click/${MODPY_PYCACHE}termui.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/click/${MODPY_PYCACHE}testing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/click/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/click/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/click/_bashcomplete.py
-lib/python${MODPY_VERSION}/site-packages/click/_bashcomplete.pyc
 lib/python${MODPY_VERSION}/site-packages/click/_compat.py
-lib/python${MODPY_VERSION}/site-packages/click/_compat.pyc
 lib/python${MODPY_VERSION}/site-packages/click/_termui_impl.py
-lib/python${MODPY_VERSION}/site-packages/click/_termui_impl.pyc
 lib/python${MODPY_VERSION}/site-packages/click/_textwrap.py
-lib/python${MODPY_VERSION}/site-packages/click/_textwrap.pyc
 lib/python${MODPY_VERSION}/site-packages/click/_unicodefun.py
-lib/python${MODPY_VERSION}/site-packages/click/_unicodefun.pyc
 lib/python${MODPY_VERSION}/site-packages/click/_winconsole.py
-lib/python${MODPY_VERSION}/site-packages/click/_winconsole.pyc
 lib/python${MODPY_VERSION}/site-packages/click/core.py
-lib/python${MODPY_VERSION}/site-packages/click/core.pyc
 lib/python${MODPY_VERSION}/site-packages/click/decorators.py
-lib/python${MODPY_VERSION}/site-packages/click/decorators.pyc
 lib/python${MODPY_VERSION}/site-packages/click/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/click/exceptions.pyc
 lib/python${MODPY_VERSION}/site-packages/click/formatting.py
-lib/python${MODPY_VERSION}/site-packages/click/formatting.pyc
 lib/python${MODPY_VERSION}/site-packages/click/globals.py
-lib/python${MODPY_VERSION}/site-packages/click/globals.pyc
 lib/python${MODPY_VERSION}/site-packages/click/parser.py
-lib/python${MODPY_VERSION}/site-packages/click/parser.pyc
 lib/python${MODPY_VERSION}/site-packages/click/termui.py
-lib/python${MODPY_VERSION}/site-packages/click/termui.pyc
 lib/python${MODPY_VERSION}/site-packages/click/testing.py
-lib/python${MODPY_VERSION}/site-packages/click/testing.pyc
 lib/python${MODPY_VERSION}/site-packages/click/types.py
-lib/python${MODPY_VERSION}/site-packages/click/types.pyc
 lib/python${MODPY_VERSION}/site-packages/click/utils.py
-lib/python${MODPY_VERSION}/site-packages/click/utils.pyc