diff --git a/devel/py-mccabe/Makefile b/devel/py-mccabe/Makefile
index 7ceae41bc3e..c545cbc9acd 100644
--- a/devel/py-mccabe/Makefile
+++ b/devel/py-mccabe/Makefile
@@ -1,25 +1,26 @@
-COMMENT =		McCabe complexity checker for Python
+COMMENT=	McCabe complexity checker for Python
 
-MODPY_EGG_VERSION =	0.6.1
-DISTNAME =		mccabe-${MODPY_EGG_VERSION}
-PKGNAME =		py-mccabe-${MODPY_EGG_VERSION}
-REVISION =		6
+MODPY_EGG_VERSION=	0.7.0
+DISTNAME=	mccabe-${MODPY_EGG_VERSION}
+PKGNAME=	py-mccabe-${MODPY_EGG_VERSION}
 
-CATEGORIES =		devel
+CATEGORIES=	devel
 
-HOMEPAGE =		https://github.com/flintwork/mccabe
+HOMEPAGE=	https://github.com/flintwork/mccabe
 
 # Expat
-PERMIT_PACKAGE =	Yes
+PERMIT_PACKAGE=	Yes
 
-MODULES =		lang/python
-BUILD_DEPENDS =		devel/py-test-runner${MODPY_FLAVOR}
-TEST_DEPENDS =		devel/py-test${MODPY_FLAVOR}
+MODULES=	lang/python
 
-MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+# requires Hypothesmith (not ported)
+NO_TEST=	Yes
+#TEST_DEPENDS=	devel/py-hypothesis${MODPY_FLAVOR}
 
-FLAVORS =		python3
-FLAVOR =	python3
+MODPY_PI=	Yes
+MODPY_PYBUILD=	setuptools
+
+FLAVORS=	python3
+FLAVOR=		python3
 
 .include <bsd.port.mk>
diff --git a/devel/py-mccabe/distinfo b/devel/py-mccabe/distinfo
index b964d9682fe..de9badefe56 100644
--- a/devel/py-mccabe/distinfo
+++ b/devel/py-mccabe/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mccabe-0.6.1.tar.gz) = 3Y0YIoWg/la6zn9FtefRpuvL9STo872H6w8SUnG4gx8=
-SIZE (mccabe-0.6.1.tar.gz) = 8612
+SHA256 (mccabe-0.7.0.tar.gz) = NI4CQMM7YLvfTlIxku+RnyjLLD19XHeU90AJKQ8jYyU=
+SIZE (mccabe-0.7.0.tar.gz) = 9658
diff --git a/devel/py-mccabe/pkg/PLIST b/devel/py-mccabe/pkg/PLIST
index 0aa7e922174..168272b6ccf 100644
--- a/devel/py-mccabe/pkg/PLIST
+++ b/devel/py-mccabe/pkg/PLIST
@@ -1,10 +1,12 @@
 @pkgpath devel/py-mccabe
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}mccabe.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}mccabe.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mccabe-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/mccabe-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/mccabe-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/mccabe-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/mccabe-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/mccabe-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/mccabe-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/mccabe-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/mccabe-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/mccabe-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/mccabe-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/mccabe-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/mccabe-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/mccabe-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/mccabe.py