5 files changed, 15 insertions, 19 deletions

diff --git a/devel/buildbot-slave/Makefile b/devel/buildbot-slave/Makefile
index 649039c6818b..d95dc991c4eb 100644
--- a/devel/buildbot-slave/Makefile
+++ b/devel/buildbot-slave/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	buildbot-slave
-PORTVERSION=	0.8.9
+PORTVERSION=	0.8.12
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 
@@ -14,17 +14,15 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 TEST_DEPENDS:=	${RUN_DEPENDS} \
 		trial:${PORTSDIR}/devel/py-twistedCore \
-		${PYTHON_PKGNAMEPREFIX}mock>=0.8.0:${PORTSDIR}/devel/py-mock
+		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
 
 OPTIONS_DEFINE=	TESTS
-TESTS_DESC=	Install py-mock for test suite
 
+TESTS_DESC=		Install test suite requirements
 TESTS_BUILD_DEPENDS=	${TEST_DEPENDS}
 
 USES=		python twisted:run,runner
-USE_PYTHON=	distutils autoplist
-
-MAKE_ENV+=		NO_INSTALL_REQS=1
+USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/buildbot-slave/distinfo b/devel/buildbot-slave/distinfo
index 171bbe46ad70..a411592a425b 100644
--- a/devel/buildbot-slave/distinfo
+++ b/devel/buildbot-slave/distinfo
@@ -1,2 +1,2 @@
-SHA256 (buildbot-slave-0.8.9.tar.gz) = 864ca4a975bdbe3e973812a7d4ac7ffaf6f9ea5b6364e9ddb2fc92bccacf93af
-SIZE (buildbot-slave-0.8.9.tar.gz) = 120831
+SHA256 (buildbot-slave-0.8.12.tar.gz) = 905eab122dcfc9425d51f0ed0c7682e7f933e140a7203637aa12a84498bd7461
+SIZE (buildbot-slave-0.8.12.tar.gz) = 118339
diff --git a/devel/buildbot-slave/files/patch-setup.py b/devel/buildbot-slave/files/patch-setup.py
index e22b01c01ecd..3bdcd9055cb0 100644
--- a/devel/buildbot-slave/files/patch-setup.py
+++ b/devel/buildbot-slave/files/patch-setup.py
@@ -1,6 +1,6 @@
---- ./setup.py.orig	2014-01-28 19:18:29.885753132 +1100
-+++ ./setup.py	2014-01-28 19:18:53.182782954 +1100
-@@ -96,9 +96,6 @@
+--- setup.py.orig	2014-04-20 08:52:42 UTC
++++ setup.py
+@@ -99,9 +99,6 @@ setup_args = {
          "buildslave.test.unit",
      ],
      'scripts': scripts,
diff --git a/devel/buildbot/Makefile b/devel/buildbot/Makefile
index 527e05a8d207..1381649b7409 100644
--- a/devel/buildbot/Makefile
+++ b/devel/buildbot/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	buildbot
-PORTVERSION=	0.8.9
+PORTVERSION=	0.8.12
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 
@@ -17,7 +17,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:${PORTSDIR}/devel/py-Jinja2 \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:${PORTSDIR}/databases/py-sqlalchemy-migrate \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.6:${PORTSDIR}/databases/py-sqlalchemy \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-
 TEST_DEPENDS:=	${RUN_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}mock>0.8.0:${PORTSDIR}/devel/py-mock \
 		trial:${PORTSDIR}/devel/py-twistedCore \
@@ -25,13 +24,12 @@ TEST_DEPENDS:=	${RUN_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}twistedWords>=11.0.0:${PORTSDIR}/net-im/py-twistedWords
 
 OPTIONS_DEFINE=		TESTS
-TESTS_DESC=		Install py-mock for test suite
+
+TESTS_DESC=		Install test suite requirements
 TESTS_BUILD_DEPENDS=	${TEST_DEPENDS}
 
 USES=		python twisted:run,conch,mail,web,words
-USE_PYTHON=	distutils autoplist
-
-MAKE_ENV+=		NO_INSTALL_REQS=1
+USE_PYTHON=	autoplist distutils
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 ${REINPLACE_CMD} -e \
diff --git a/devel/buildbot/distinfo b/devel/buildbot/distinfo
index 8639d38a0936..ea88bc78094f 100644
--- a/devel/buildbot/distinfo
+++ b/devel/buildbot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (buildbot-0.8.9.tar.gz) = 6b9e465e6d4825fe1f09d28505318fdb1a75b283c80a140af0f2e2a5039cfa8a
-SIZE (buildbot-0.8.9.tar.gz) = 4798654
+SHA256 (buildbot-0.8.12.tar.gz) = c6b66976dff712268566574d57131ec15e5682f6d4390cd5c8559bab0980c4d6
+SIZE (buildbot-0.8.12.tar.gz) = 4834352