diff -ruN --exclude=CVS /usr/ports/sysutils/py-supervisor/Makefile ./Makefile
--- /usr/ports/sysutils/py-supervisor/Makefile	2012-01-10 22:07:57.000000000 +1100
+++ ./Makefile	2012-10-18 21:34:17.000000000 +1100
@@ -1,25 +1,32 @@
-# New ports collection makefile for:	supervisor
-# Date created:		30 Dec, 2009
-# Whom:			Hizbulin Ildar <hizel@vyborg.ru>
-#
+# Created by: Hizbulin Ildar <hizel@vyborg.ru>
 # $FreeBSD: ports/sysutils/py-supervisor/Makefile,v 1.6 2012/01/10 11:07:57 rm Exp $
-#
 
 PORTNAME=	supervisor
-PORTVERSION=	3.0a12
+PORTVERSION=	3.0b1
 CATEGORIES=	sysutils python
-MASTER_SITES=	http://dist.supervisord.org/ \
-		CHEESESHOP
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	hizel@vyborg.ru
 COMMENT=	System to monitor and control a number of processes on UNIX-like OS
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}meld3>=0.6.4:${PORTSDIR}/www/py-meld3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}meld3>=0.6.5:${PORTSDIR}/www/py-meld3
+TEST_DEPENDS:=	${RUN_DEPENDS} \
+		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+
+OPTIONS_DEFINE=	TESTS
+TESTS_DESC=	Install mock for running unit tests
+OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MTESTS}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+.endif
 
 PORTDOCS=	*.txt *.rst
 
-USE_PYTHON=	2.5-2.7
+USE_PYTHON=	-2.7
 USE_PYDISTUTILS=	easy_install
 PIDDIR?=	/var/run/supervisor
 
@@ -42,4 +49,7 @@
 .endfor
 .endif
 
+regression-test: build
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
+
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/sysutils/py-supervisor/distinfo ./distinfo
--- /usr/ports/sysutils/py-supervisor/distinfo	2012-01-10 22:07:57.000000000 +1100
+++ ./distinfo	2012-10-18 18:53:24.000000000 +1100
@@ -1,2 +1,2 @@
-SHA256 (supervisor-3.0a12.tar.gz) = de60eee3c460b379aa8493083b59d31b29f2c4267730db29b6f9dea22642b3b4
-SIZE (supervisor-3.0a12.tar.gz) = 438901
+SHA256 (supervisor-3.0b1.tar.gz) = 7361e224871257534cac3bc035e90571c35b9fa9245ec46207de9d89191a7d0c
+SIZE (supervisor-3.0b1.tar.gz) = 452676