diff -ruN --exclude=CVS /usr/ports/devel/py-mock/Makefile ./Makefile
--- /usr/ports/devel/py-mock/Makefile	2012-09-12 05:51:00.000000000 +1000
+++ ./Makefile	2012-10-11 19:53:54.000000000 +1100
@@ -1,8 +1,8 @@
+# Created by: jessekempf@gmail.com
 # $FreeBSD: ports/devel/py-mock/Makefile,v 1.3 2012/09/11 19:51:00 rm Exp $
 
 PORTNAME=	mock
-PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTVERSION=	1.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,10 +12,18 @@
 
 LICENSE=	BSD
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+OPTIONS_DEFINE=		TESTS
+TESTS_DESC=		Install tox for running unit tests
+OPTIONSFILE?=		${PORT_DBDIR}/py-${PORTNAME}/options
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MTESTS}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tox>0:${PORTSDIR}/devel/py-tox
+.endif
 
 # Python3 ready
-USE_PYTHON=	yes
+USE_PYTHON=		-3.2
 USE_PYDISTUTILS=	easy_install
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/devel/py-mock/distinfo ./distinfo
--- /usr/ports/devel/py-mock/distinfo	2012-03-14 14:58:19.000000000 +1100
+++ ./distinfo	2012-10-09 20:05:10.000000000 +1100
@@ -1,2 +1,2 @@
-SHA256 (mock-0.8.0.tar.gz) = 96fa4def4e80200be827c3f51147dd7b3fa8873b9207e3325d47ba45bf29a5c1
-SIZE (mock-0.8.0.tar.gz) = 749663
+SHA256 (mock-1.0.0.tar.gz) = 2d9fbe67001d2e8f02692075257f3c11e1b0194bd838c8ce3f49b31fc6c3f033
+SIZE (mock-1.0.0.tar.gz) = 819523
diff -ruN --exclude=CVS /usr/ports/devel/py-mock/files/patch-setup.py ./files/patch-setup.py
--- /usr/ports/devel/py-mock/files/patch-setup.py	1970-01-01 10:00:00.000000000 +1000
+++ ./files/patch-setup.py	2012-10-09 20:11:46.000000000 +1100
@@ -0,0 +1,10 @@
+--- ./setup.py.orig	2012-10-09 20:11:41.000000000 +1100
++++ ./setup.py	2012-10-09 20:11:26.000000000 +1100
+@@ -59,6 +59,7 @@
+     keywords=KEYWORDS,
+     url=URL,
+     classifiers=CLASSIFIERS,
++    zip_safe=False,
+ )
+ 
+ try:
diff -ruN --exclude=CVS /usr/ports/devel/py-mock/pkg-plist ./pkg-plist
--- /usr/ports/devel/py-mock/pkg-plist	1970-01-01 10:00:00.000000000 +1000
+++ ./pkg-plist	2012-10-09 20:14:26.000000000 +1100
@@ -0,0 +1,11 @@
+@comment $FreeBSD$
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mock.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mock.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/mock.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%