devel/buildbot devel/buildbot-slave: Update to 0.8.8

- Update to 0.8.8
- Update pkg-plist
- Add extract target to regression-test:
- Tweak TESTS option description
- master: Update RUN and BUILD DEPENDS versions
- slave: Remove patch that is now upstream

Changes:

https://github.com/buildbot/buildbot/blob/master/master/docs/relnotes/0.8.8.rst

4 files changed, 17 insertions, 18 deletions

diff --git a/devel/buildbot-slave/Makefile b/devel/buildbot-slave/Makefile
index 0d41cce0d9ef..b1a62fd72b1a 100644
--- a/devel/buildbot-slave/Makefile
+++ b/devel/buildbot-slave/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	buildbot-slave
-PORTVERSION=	0.8.7p1
+PORTVERSION=	0.8.8
 CATEGORIES=	devel python
 MASTER_SITES=	GOOGLE_CODE
 
@@ -23,8 +23,7 @@ USE_TWISTED_RUN=	runner
 MAKE_ENV+=		NO_INSTALL_REQS=1
 
 OPTIONS_DEFINE=		TESTS
-TESTS_DESC=		Install py-mock for unit tests
-# Ports infrastructure bug
+TESTS_DESC=		Install py-mock for test suite
 OPTIONSFILE?=		${PORT_DBDIR}/py-${PORTNAME}/options
 
 .include <bsd.port.options.mk>
@@ -38,7 +37,7 @@ MAN1=	buildslave.1
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/buildslave.1 ${MANPREFIX}/man/man1
 
-regression-test:
+regression-test: extract
 	@cd ${WRKSRC} && trial buildslave.test
 
 .include <bsd.port.mk>
diff --git a/devel/buildbot-slave/distinfo b/devel/buildbot-slave/distinfo
index 13ba4c097721..d571499ab4c0 100644
--- a/devel/buildbot-slave/distinfo
+++ b/devel/buildbot-slave/distinfo
@@ -1,2 +1,2 @@
-SHA256 (buildbot-slave-0.8.7p1.tar.gz) = bbdb07a3847efa186f942142a09394b467d7375745c49da0a42e9aa5b206eadc
-SIZE (buildbot-slave-0.8.7p1.tar.gz) = 104575
+SHA256 (buildbot-slave-0.8.8.tar.gz) = 8b7532d4d34527aea41e353d1bc3c35291ec335d3224c27800d2cc0cfc9837cc
+SIZE (buildbot-slave-0.8.8.tar.gz) = 107470
diff --git a/devel/buildbot-slave/files/patch-buildslave__test____init__.py b/devel/buildbot-slave/files/patch-buildslave__test____init__.py
deleted file mode 100644
index 79f601ca7317..000000000000
--- a/devel/buildbot-slave/files/patch-buildslave__test____init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./buildslave/test/__init__.py.orig	2012-12-07 22:20:33.655375165 +1100
-+++ ./buildslave/test/__init__.py	2012-12-07 22:21:11.070790866 +1100
-@@ -58,6 +58,6 @@
-     import mock
-     mock = mock
- except ImportError:
--    print >>sys.stderr, ("\nBuildbot tests require the 'mock' module; "
--                         "try 'pip install mock'")
--    os._exit(1)
-+    raise ImportError("Buildbot tests require the 'mock' module; "
-+                      "try 'pip install mock'")
-+
diff --git a/devel/buildbot-slave/pkg-plist b/devel/buildbot-slave/pkg-plist
index e83880859838..bf02a8848987 100644
--- a/devel/buildbot-slave/pkg-plist
+++ b/devel/buildbot-slave/pkg-plist
@@ -78,6 +78,9 @@ bin/buildslave
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/monkeypatches/bug5079.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/monkeypatches/bug5079.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/monkeypatches/bug5079.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/monkeypatches/testcase_assert.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/monkeypatches/testcase_assert.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/monkeypatches/testcase_assert.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/pbutil.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/pbutil.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/pbutil.pyo
@@ -87,6 +90,9 @@ bin/buildslave
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/scripts/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/scripts/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/scripts/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/scripts/base.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/scripts/base.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/scripts/base.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/scripts/logwatcher.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/scripts/logwatcher.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/scripts/logwatcher.pyo
@@ -174,6 +180,12 @@ bin/buildslave
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_runprocess.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_runprocess.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_runprocess.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_scripts_base.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_scripts_base.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_scripts_base.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_scripts_runner.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_scripts_runner.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_scripts_runner.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_util.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_util.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/buildslave/test/unit/test_util.pyo