Rename buildbot-slave to buildbot-worker, update to 0.9.4

Also take maintainership. If interested, the original maintainer
is welcome to take it back.

PR:		217700
Approved by:	maintainer timeout (2 weeks)

11 files changed, 177 insertions, 173 deletions

diff --git a/MOVED b/MOVED
index e19531a570b6..438c80bab492 100644
--- a/MOVED
+++ b/MOVED
@@ -9152,3 +9152,4 @@ net/samba-nmblookup|net/samba43|2017-03-21|Obsolete
 net/samba-smbclient|net/samba43|2017-03-21|Obsolete
 net/samba36|net/samba43|2017-03-21|Obsolete
 multimedia/mplayer2|multimedia/mpv|2017-03-25|Has expired: Development ceased in favour of mpv, last release from 2013
+devel/buildbot-slave|devel/buildbot-worker|2017-03-27|Renamed to match new upstream package name/terminology
diff --git a/devel/Makefile b/devel/Makefile
index faf0cb692661..5d82a66dc29d 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -201,7 +201,7 @@
     SUBDIR += bugzilla50
     SUBDIR += build
     SUBDIR += buildbot
-    SUBDIR += buildbot-slave
+    SUBDIR += buildbot-worker
     SUBDIR += buildtool
     SUBDIR += buildtool-doc
     SUBDIR += bullet
diff --git a/devel/buildbot-slave/Makefile b/devel/buildbot-slave/Makefile
deleted file mode 100644
index a7ae475f82b8..000000000000
--- a/devel/buildbot-slave/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# Created by: Frederic Praca <frederic.praca@freebsd-fr.org>
-# $FreeBSD$
-
-PORTNAME=	buildbot-slave
-PORTVERSION=	0.8.12
-PORTREVISION=	3
-CATEGORIES=	devel python
-MASTER_SITES=	CHEESESHOP
-
-MAINTAINER=	koobs@FreeBSD.org
-COMMENT=	Continuous Integration Framework (Slave)
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=8.0.0:devel/py-twisted
-TEST_DEPENDS=	trial:devel/py-twisted \
-		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
-
-USES=		python:-2.7
-USE_PYTHON=	autoplist distutils
-USE_RC_SUBR=	buildslave
-
-SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
-
-NO_ARCH=	yes
-
-PLIST_FILES=	man/man1/buildslave.1.gz
-
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/docs/buildslave.1 ${STAGEDIR}${MANPREFIX}/man/man1
-
-do-test:
-	@cd ${WRKSRC} && trial buildslave.test
-
-.include <bsd.port.mk>
diff --git a/devel/buildbot-slave/distinfo b/devel/buildbot-slave/distinfo
deleted file mode 100644
index a411592a425b..000000000000
--- a/devel/buildbot-slave/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-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/buildslave.in b/devel/buildbot-slave/files/buildslave.in
deleted file mode 100644
index 1ec58fc20433..000000000000
--- a/devel/buildbot-slave/files/buildslave.in
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-# PROVIDE: buildslave
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to run buildslave:
-#
-# buildslave_enable (bool):	Set to "YES" to enable buildslave.
-#				Default: "NO"
-#
-# buildslave_flags (flags):	Set extra command flags here. See buildslave(8)
-#				Default: Empty ("").
-#
-# buildslave_uid (user):	User to run buildslave as.
-#				Default: "buildbot"
-#
-# buildslave_gid (group):	Group to run buildslave as.
-#				Default: "buildbot"
-#
-# buildslave_basedir (path):    Location for buildslave base directory
-#                               Default: %%PREFIX%%/etc/buildslave
-#
-# buildslave_profiles (str):    Define profiles names. Space-delimited.
-#                               Default: Empty ("")
-#
-# This rc.d script supports multiple "profiles". When profiles are
-# specified, the non-profile specific parameters become defaults.
-#
-# Example:
-#
-# buildslave_profiles="foo bar"
-#
-# buildslave_foo_enable="YES"
-# buildslave_foo_basedir="/usr/home/foo/buildbot"
-# buildslave_foo_uid="foo"
-# buildslave_foo_gid="foo"
-#
-# buildslave_bar_enable="YES"
-# buildslave_bar_basedir="/usr/home/buildbot/"
-
-. /etc/rc.subr
-
-export PATH=${PATH}:%%LOCALBASE%%/bin
-
-name=buildslave
-desc="Buildbot Buildslave"
-rcvar=buildslave_enable
-
-load_rc_config ${name}
-
-# These are just the defaults, they might get overriden for a specific profile.
-eval ": \${${name}_enable:=\"NO\"}"
-eval ": \${${name}_flags:=\"\"}"
-eval ": \${${name}_uid:=\"buildbot\"}"
-eval ": \${${name}_gid:=\"buildbot\"}"
-eval ": \${${name}_basedir:=\"%%PREFIX%%/etc/${name}\"}"
-
-command="%%PREFIX%%/bin/twistd"
-command_interpreter="%%PYTHON_CMD%%"
-pidfile="${buildslave_basedir}/twistd.pid"
-
-	# A specific profile is specified in the command
-	if [ -n "$2" ]; then
-		profile="$2"
-		# Override defaults with profile-specific values
-		if [ -n "${buildslave_profiles}" ]; then
-			eval buildslave_enable="\${buildslave_${profile}_enable:-${buildslave_enable}}"
-			eval buildslave_flags="\${buildslave_${profile}_flags:-${buildslave_flags}}"
-			eval buildslave_uid="\${buildslave_${profile}_uid:-${buildslave_uid}}"
-			eval buildslave_gid="\${buildslave_${profile}_gid:-${buildslave_gid}}"
-			eval buildslave_basedir="\${buildslave_${profile}_basedir:-${buildslave_basedir}}"
-			eval pidfile="\${buildslave_${profile}_basedir:-${buildslave_basedir}}/twistd.pid"
-		else
-			echo "%%PREFIX%%/etc/rc.d/${name}: extra argument ignored"
-		fi
-	# A specific profile is not in the command
-	else
-		# Check if any profiles are defined
-		if [ -n "$1" -a -n "${buildslave_profiles}" ]; then
-			# Loop through them
-			for profile in ${buildslave_profiles}; do
-				eval _enable="\${buildslave_${profile}_enable}"
-				case "${_enable:-${buildslave_enable}}" in
-				[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
-					continue
-					;;
-				[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
-					;;
-				*)
-					if test -z "$_enable"; then
-						_var=buildslave_enable
-					else
-						_var=buildslave_"${profile}"_enable
-					fi
-					warn "Bad value" \
-					    "'${_enable:-${buildslave_enable}}'" \
-					    "for ${_var}. " \
-					    "Profile ${profile} skipped."
-					continue
-					;;
-				esac
-				echo "===> ${name} profile: ${profile}"
-				if %%PREFIX%%/etc/rc.d/${name} $1 ${profile}; then
-					success="${profile} ${success:-}"
-				else
-					failed="${profile} (${retcode}) ${failed:-}"
-				fi
-			done
-			# Exit so that non-profile rc.d is not started when there are profiles
-			exit 0
-		fi
-	fi
-
-# run_rc_command would send ${name}_flags as parameters to $command (daemon)
-# This ensures they are actually passed to fcgiwrap instead.
-actual_buildslave_flags="${buildslave_flags}"
-buildslave_flags=""
-command_args="--uid=${buildslave_uid} --gid=${buildslave_gid} --pidfile=${pidfile} --python=${buildslave_basedir}/buildbot.tac ${actual_buildslave_flags}"
-run_rc_command "$1"
diff --git a/devel/buildbot-slave/files/patch-setup.py b/devel/buildbot-slave/files/patch-setup.py
deleted file mode 100644
index 3bdcd9055cb0..000000000000
--- a/devel/buildbot-slave/files/patch-setup.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- setup.py.orig	2014-04-20 08:52:42 UTC
-+++ setup.py
-@@ -99,9 +99,6 @@ setup_args = {
-         "buildslave.test.unit",
-     ],
-     'scripts': scripts,
--    # mention data_files, even if empty, so install_data is called and
--    # VERSION gets copied
--    'data_files': [("buildslave", [])],
-     'cmdclass': {
-         'install_data': our_install_data,
-         'sdist': our_sdist
diff --git a/devel/buildbot-worker/Makefile b/devel/buildbot-worker/Makefile
new file mode 100644
index 000000000000..0e3e55f55e3a
--- /dev/null
+++ b/devel/buildbot-worker/Makefile
@@ -0,0 +1,38 @@
+# Created by: Frederic Praca <frederic.praca@freebsd-fr.org>
+# $FreeBSD$
+
+PORTNAME=	buildbot-worker
+PORTVERSION=	0.9.4
+PORTREVISION=	3
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+
+MAINTAINER=	grembo@FreeBSD.org
+COMMENT=	Continuous Integration Framework (Worker)
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \
+		${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted
+		
+TEST_DEPENDS=	trial:devel/py-twisted \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+
+USES=		python:-2.7
+USE_PYTHON=	autoplist distutils
+USE_RC_SUBR=	buildbot-worker
+
+SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
+
+NO_ARCH=	yes
+
+PLIST_FILES=	man/man1/buildbot-worker.1.gz
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/docs/buildbot-worker.1 ${STAGEDIR}${MANPREFIX}/man/man1
+
+do-test:
+	@cd ${WRKSRC} && trial buildbot_worker.test
+
+.include <bsd.port.mk>
diff --git a/devel/buildbot-worker/distinfo b/devel/buildbot-worker/distinfo
new file mode 100644
index 000000000000..8067872b4669
--- /dev/null
+++ b/devel/buildbot-worker/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1488896679
+SHA256 (buildbot-worker-0.9.4.tar.gz) = 129e0d3fa9ee34f0f227487b6d1645820d2d4853099a1b0aed56587d3acab965
+SIZE (buildbot-worker-0.9.4.tar.gz) = 100889
diff --git a/devel/buildbot-worker/files/buildbot-worker.in b/devel/buildbot-worker/files/buildbot-worker.in
new file mode 100644
index 000000000000..09186bc0209b
--- /dev/null
+++ b/devel/buildbot-worker/files/buildbot-worker.in
@@ -0,0 +1,121 @@
+#!/bin/sh
+
+# $FreeBSD$
+# PROVIDE: buildbot-worker
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to run buildbot-worker:
+#
+# buildbot_worker_enable (bool):	Set to "YES" to enable buildbot-worker.
+#					Default: "NO"
+#
+# buildbot_worker_flags (flags):	Set extra command flags here. See buildbot-worker(8)
+#					Default: Empty ("").
+#
+# buildbot_worker_uid (user):		User to run buildbot-worker as.
+#					Default: "buildbot"
+#
+# buildbot_worker_gid (group):		Group to run buildbot-worker as.
+#					Default: "buildbot"
+#
+# buildbot_worker_basedir (path):    	Location for buildbot-worker base directory
+#                               	Default: %%PREFIX%%/etc/buildbot-worker
+#
+# buildbot_worker_profiles (str):    	Define profiles names. Space-delimited.
+#                               	Default: Empty ("")
+#
+# This rc.d script supports multiple "profiles". When profiles are
+# specified, the non-profile specific parameters become defaults.
+#
+# Example:
+#
+# buildbot_worker_profiles="foo bar"
+#
+# buildbot_worker_foo_enable="YES"
+# buildbot_worker_foo_basedir="/usr/home/foo/buildbot"
+# buildbot_worker_foo_uid="foo"
+# buildbot_worker_foo_gid="foo"
+#
+# buildbot_worker_bar_enable="YES"
+# buildbot_worker_bar_basedir="/usr/home/buildbot/"
+
+. /etc/rc.subr
+
+export PATH=${PATH}:%%LOCALBASE%%/bin
+
+name=buildbot-worker
+desc="Buildbot Buildworker"
+rcvar=buildbot_worker_enable
+
+load_rc_config ${name}
+
+# These are just the defaults, they might get overriden for a specific profile.
+eval ": \${${name}_enable:=\"NO\"}"
+eval ": \${${name}_flags:=\"\"}"
+eval ": \${${name}_uid:=\"buildbot\"}"
+eval ": \${${name}_gid:=\"buildbot\"}"
+eval ": \${${name}_basedir:=\"%%PREFIX%%/etc/${name}\"}"
+
+command="%%PREFIX%%/bin/twistd"
+command_interpreter="%%PYTHON_CMD%%"
+pidfile="${buildbot_worker_basedir}/twistd.pid"
+
+	# A specific profile is specified in the command
+	if [ -n "$2" ]; then
+		profile="$2"
+		# Override defaults with profile-specific values
+		if [ -n "${buildbot_worker_profiles}" ]; then
+			eval buildbot_worker_enable="\${buildbot_worker_${profile}_enable:-${buildbot_worker_enable}}"
+			eval buildbot_worker_flags="\${buildbot_worker_${profile}_flags:-${buildbot_worker_flags}}"
+			eval buildbot_worker_uid="\${buildbot_worker_${profile}_uid:-${buildbot_worker_uid}}"
+			eval buildbot_worker_gid="\${buildbot_worker_${profile}_gid:-${buildbot_worker_gid}}"
+			eval buildbot_worker_basedir="\${buildbot_worker_${profile}_basedir:-${buildbot_worker_basedir}}"
+			eval pidfile="\${buildbot_worker_${profile}_basedir:-${buildbot_worker_basedir}}/twistd.pid"
+		else
+			echo "%%PREFIX%%/etc/rc.d/${name}: extra argument ignored"
+		fi
+	# A specific profile is not in the command
+	else
+		# Check if any profiles are defined
+		if [ -n "$1" -a -n "${buildbot_worker_profiles}" ]; then
+			# Loop through them
+			for profile in ${buildbot_worker_profiles}; do
+				eval _enable="\${buildbot_worker_${profile}_enable}"
+				case "${_enable:-${buildbot_worker_enable}}" in
+				[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
+					continue
+					;;
+				[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+					;;
+				*)
+					if test -z "$_enable"; then
+						_var=buildbot_worker_enable
+					else
+						_var=buildbot_worker_"${profile}"_enable
+					fi
+					warn "Bad value" \
+					    "'${_enable:-${buildbot_worker_enable}}'" \
+					    "for ${_var}. " \
+					    "Profile ${profile} skipped."
+					continue
+					;;
+				esac
+				echo "===> ${name} profile: ${profile}"
+				if %%PREFIX%%/etc/rc.d/${name} $1 ${profile}; then
+					success="${profile} ${success:-}"
+				else
+					failed="${profile} (${retcode}) ${failed:-}"
+				fi
+			done
+			# Exit so that non-profile rc.d is not started when there are profiles
+			exit 0
+		fi
+	fi
+
+# run_rc_command would send ${name}_flags as parameters to $command (daemon)
+# This ensures they are actually passed to fcgiwrap instead.
+actual_buildbot_worker_flags="${buildbot_worker_flags}"
+buildbot_worker_flags=""
+command_args="--uid=${buildbot_worker_uid} --gid=${buildbot_worker_gid} --pidfile=${pidfile} --python=${buildbot_worker_basedir}/buildbot.tac ${actual_buildbot_worker_flags}"
+run_rc_command "$1"
diff --git a/devel/buildbot-worker/files/patch-setup.py b/devel/buildbot-worker/files/patch-setup.py
new file mode 100644
index 000000000000..8fe0b3d2be8f
--- /dev/null
+++ b/devel/buildbot-worker/files/patch-setup.py
@@ -0,0 +1,12 @@
+--- setup.py.orig	2017-02-08 10:06:13.000000000 +0100
++++ setup.py	2017-03-07 15:28:03.225761995 +0100
+@@ -104,9 +104,6 @@
+         "buildbot_worker.test.unit",
+         "buildbot_worker.test.util",
+     ],
+-    # mention data_files, even if empty, so install_data is called and
+-    # VERSION gets copied
+-    'data_files': [("buildbot_worker", [])],
+     'cmdclass': {
+         'install_data': our_install_data,
+         'sdist': our_sdist
diff --git a/devel/buildbot-slave/pkg-descr b/devel/buildbot-worker/pkg-descr
index 9f66b756da2a..07b879844954 100644
--- a/devel/buildbot-slave/pkg-descr
+++ b/devel/buildbot-worker/pkg-descr
@@ -1,4 +1,4 @@
-This port is the slave part of BuildBot. For the buildmaster, install the
+This port is the worker part of BuildBot. For the buildmaster, install the
 devel/buildbot port
 
 For more information, please see: http://buildbot.net/trac