Index: head/devel/py-mock/Makefile
===================================================================
--- head/devel/py-mock/Makefile	(revision 404433)
+++ head/devel/py-mock/Makefile	(revision 404434)
@@ -1,26 +1,34 @@
 # Created by: jessekempf@gmail.com
 # $FreeBSD$
 
 PORTNAME=	mock
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jessekempf@gmail.com
 COMMENT=	Mock unit tests for Python
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:${PORTSDIR}/devel/py-pbr
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:${PORTSDIR}/devel/py-pbr \
+		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:${PORTSDIR}/devel/py-pbr \
+		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:${PORTSDIR}/devel/py-six
+TESTS_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:${PORTSDIR}/devel/py-tox
 
-OPTIONS_DEFINE=	TESTS
-TESTS_DESC=	Install tox for running unit tests
-
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-TESTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:${PORTSDIR}/devel/py-tox
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+.if ${PYTHON_REL} < 3300
+RUN_DEPENDS+=  ${PYTHON_PKGNAMEPREFIX}funcsigs>=0:${PORTSDIR}/devel/py-funcsigs
+.endif
+
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+
+.include <bsd.port.post.mk>