Index: head/sysutils/py-supervisor/Makefile
===================================================================
--- head/sysutils/py-supervisor/Makefile	(revision 449940)
+++ head/sysutils/py-supervisor/Makefile	(revision 449941)
@@ -1,51 +1,47 @@
 # Created by: Hizbulin Ildar <hizel@vyborg.ru>
 # $FreeBSD$
 
 PORTNAME=	supervisor
-PORTVERSION=	3.3.0
+PORTVERSION=	3.3.3
 PORTEPOCH=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	hizel@vyborg.ru
-COMMENT=	System to monitor and control a number of processes on UNIX-like OS
+COMMENT=	System for controlling process state under UNIX
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}meld3>=0.6.5:www/py-meld3
-TEST_DEPENDS:=	${RUN_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0.5.0:devel/py-mock
 
-OPTIONS_DEFINE=	TESTS
-TESTS_DESC=	Install mock for running unit tests
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MTESTS}
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
-.endif
-
 PORTDOCS=	*.txt *.rst
 
-USES=		python:2
+NO_ARCH=	yes
+
+USES=		python:2.7 shebangfix
 USE_PYTHON=	distutils autoplist
 PIDDIR?=	/var/run/supervisor
 
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
 		PIDDIR=${PIDDIR}
 PLIST_SUB=	PIDDIR=${PIDDIR}
 USE_RC_SUBR=	supervisord
 
+SHEBANG_FILES=	supervisor/scripts/*.py supervisor/tests/fixtures/*.py
+python_OLD_CMD=	"/usr/bin/env python"
+python_OLD_CMD+=	"<<PYTHON>>"
+
 post-patch:
 	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' ${WRKSRC}/supervisor/options.py
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/supervisord.conf.sample ${STAGEDIR}${PREFIX}/etc
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 
-regression-test: build
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
Index: head/sysutils/py-supervisor/distinfo
===================================================================
--- head/sysutils/py-supervisor/distinfo	(revision 449940)
+++ head/sysutils/py-supervisor/distinfo	(revision 449941)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465394448
-SHA256 (supervisor-3.3.0.tar.gz) = 3176fb8a78c60164020e252e4a2b50b039cfec1f410b4562a843b66186188652
-SIZE (supervisor-3.3.0.tar.gz) = 416329
+TIMESTAMP = 1505483926
+SHA256 (supervisor-3.3.3.tar.gz) = 96287ebfabf9a6923f74123b056c4da39c617fef367980f007cac02fba6527ad
+SIZE (supervisor-3.3.3.tar.gz) = 418354