Index: devel/py-mock/Makefile
===================================================================
--- devel/py-mock/Makefile
+++ devel/py-mock/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mock
-PORTVERSION=	2.0.0
+PORTVERSION=	3.0.5
 CATEGORIES=	devel python
-MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jessekempf@gmail.com
@@ -13,22 +12,27 @@
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-TESTS_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR}
 
-NO_ARCH=	yes
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
+NO_ARCH=	yes
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	testing-cabal
+GH_PROJECT=	mock
+GH_TAGNAME=	e0180b98d0e07e895a3f699b7e9afcac4716fc03
+
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3300
-RUN_DEPENDS+=  ${PYTHON_PKGNAMEPREFIX}funcsigs>=0:devel/py-funcsigs@${PY_FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}funcsigs>=0:devel/py-funcsigs@${PY_FLAVOR}
 .endif
 
 do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+	@cd ${WRKSRC} && pytest
 
 .include <bsd.port.post.mk>
Index: devel/py-mock/distinfo
===================================================================
--- devel/py-mock/distinfo
+++ devel/py-mock/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490606425
-SHA256 (mock-2.0.0.tar.gz) = b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba
-SIZE (mock-2.0.0.tar.gz) = 73684
+TIMESTAMP = 1568814774
+SHA256 (testing-cabal-mock-3.0.5-e0180b98d0e07e895a3f699b7e9afcac4716fc03_GH0.tar.gz) = 83a9f9ba55bc2ebe6529680ba8437bb5478dac2fbd6be90553115e55a2e42819
+SIZE (testing-cabal-mock-3.0.5-e0180b98d0e07e895a3f699b7e9afcac4716fc03_GH0.tar.gz) = 68037