Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -222,12 +222,6 @@
     SUBDIR += bugzilla44
     SUBDIR += bugzilla50
     SUBDIR += build
-    SUBDIR += buildbot
-    SUBDIR += buildbot-console-view
-    SUBDIR += buildbot-pkg
-    SUBDIR += buildbot-waterfall-view
-    SUBDIR += buildbot-worker
-    SUBDIR += buildbot-www
     SUBDIR += buildtool
     SUBDIR += buildtool-doc
     SUBDIR += bullet
@@ -4260,7 +4254,13 @@
     SUBDIR += py-boto
     SUBDIR += py-botocore
     SUBDIR += py-bsd
+    SUBDIR += py-buildbot
+    SUBDIR += py-buildbot-console-view
     SUBDIR += py-buildbot-grid-view
+    SUBDIR += py-buildbot-pkg
+    SUBDIR += py-buildbot-waterfall-view
+    SUBDIR += py-buildbot-worker
+    SUBDIR += py-buildbot-www
     SUBDIR += py-cached-property
     SUBDIR += py-cachetools
     SUBDIR += py-calendar
Index: devel/buildbot-console-view/Makefile
===================================================================
--- devel/buildbot-console-view/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: Michael Gmelin <grembo@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	buildbot-console-view
-PORTVERSION=	0.9.11
-CATEGORIES=	devel python
-MASTER_SITES=	CHEESESHOP
-
-MAINTAINER=	grembo@FreeBSD.org
-COMMENT=	Continuous Integration Framework (Console View)
-
-LICENSE=	GPLv2
-
-BUILD_DEPENDS=	buildbot-pkg>=${PORTVERSION}:devel/buildbot-pkg
-RUN_DEPENDS=	buildbot-pkg>=${PORTVERSION}:devel/buildbot-pkg
-
-USES=		python:2.7
-USE_PYTHON=	autoplist distutils
-
-NO_ARCH=	yes
-
-.include <bsd.port.mk>
Index: devel/buildbot-console-view/distinfo
===================================================================
--- devel/buildbot-console-view/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1506179816
-SHA256 (buildbot-console-view-0.9.11.tar.gz) = a0467c096971178462dc18b6a652b53485d1ad0f2791c19f6026a432a07d9d9b
-SIZE (buildbot-console-view-0.9.11.tar.gz) = 640623
Index: devel/buildbot-console-view/pkg-descr
===================================================================
--- devel/buildbot-console-view/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This port is the Console View Plugin for BuildBot. For the buildmaster,
-install the devel/buildbot port.
-
-For more information, please see: https://buildbot.net/trac
-
-WWW: https://buildbot.net
Index: devel/buildbot-pkg/Makefile
===================================================================
--- devel/buildbot-pkg/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Created by: Michael Gmelin <grembo@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	buildbot-pkg
-PORTVERSION=	0.9.11
-CATEGORIES=	devel python
-MASTER_SITES=	CHEESESHOP
-
-MAINTAINER=	grembo@FreeBSD.org
-COMMENT=	Continuous Integration Framework (packaging)
-
-LICENSE=	GPLv2
-
-USES=		python:2.7
-USE_PYTHON=	autoplist distutils
-
-NO_ARCH=	yes
-
-.include <bsd.port.mk>
Index: devel/buildbot-pkg/distinfo
===================================================================
--- devel/buildbot-pkg/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1506179823
-SHA256 (buildbot-pkg-0.9.11.tar.gz) = 6328abfa68efba299d0309a88b8de40d71d1da4d7bc9148476fed8f393e407be
-SIZE (buildbot-pkg-0.9.11.tar.gz) = 4420
Index: devel/buildbot-pkg/pkg-descr
===================================================================
--- devel/buildbot-pkg/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This port is the Web UI part of BuildBot. For the buildmaster, install the
-devel/buildbot port.
-
-For more information, please see: https://buildbot.net/trac
-
-WWW: https://buildbot.net
Index: devel/buildbot-waterfall-view/Makefile
===================================================================
--- devel/buildbot-waterfall-view/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: Michael Gmelin <grembo@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	buildbot-waterfall-view
-PORTVERSION=	0.9.11
-CATEGORIES=	devel python
-MASTER_SITES=	CHEESESHOP
-
-MAINTAINER=	grembo@FreeBSD.org
-COMMENT=	Continuous Integration Framework (Waterfall View)
-
-LICENSE=	GPLv2
-
-BUILD_DEPENDS=	buildbot-pkg>=${PORTVERSION}:devel/buildbot-pkg
-RUN_DEPENDS=	buildbot-pkg>=${PORTVERSION}:devel/buildbot-pkg
-
-USES=		python:2.7
-USE_PYTHON=	autoplist distutils
-
-NO_ARCH=	yes
-
-.include <bsd.port.mk>
Index: devel/buildbot-waterfall-view/distinfo
===================================================================
--- devel/buildbot-waterfall-view/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1506179833
-SHA256 (buildbot-waterfall-view-0.9.11.tar.gz) = 54e36f8d02be7c046510173f7adb14e3eaeb912e0f41f1b7784e2ac0744799c1
-SIZE (buildbot-waterfall-view-0.9.11.tar.gz) = 713915
Index: devel/buildbot-waterfall-view/pkg-descr
===================================================================
--- devel/buildbot-waterfall-view/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This port is the Waterfall View Plugin for BuildBot. For the buildmaster,
-install the devel/buildbot port.
-
-For more information, please see: https://buildbot.net/trac
-
-WWW: https://buildbot.net
Index: devel/buildbot-worker/Makefile
===================================================================
--- devel/buildbot-worker/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Created by: Frederic Praca <frederic.praca@freebsd-fr.org>
-# $FreeBSD$
-
-PORTNAME=	buildbot-worker
-PORTVERSION=	0.9.11
-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:
-	${MKDIR} ${WRKDIR}/tmp
-	cd ${WRKDIR}/tmp && ${PYTHON_CMD} -m twisted.trial buildbot_worker.test
-
-.include <bsd.port.mk>
Index: devel/buildbot-worker/distinfo
===================================================================
--- devel/buildbot-worker/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1506179860
-SHA256 (buildbot-worker-0.9.11.tar.gz) = 4254bf964465acb6586fda36b26a424466a265b6a5259138cf4fa63a1e9f6851
-SIZE (buildbot-worker-0.9.11.tar.gz) = 100746
Index: devel/buildbot-worker/files/buildbot-worker.in
===================================================================
--- devel/buildbot-worker/files/buildbot-worker.in
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/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"
Index: devel/buildbot-worker/files/patch-setup.py
===================================================================
--- devel/buildbot-worker/files/patch-setup.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- setup.py.orig	2017-07-01 19:16:48 UTC
-+++ setup.py
-@@ -106,9 +106,6 @@ setup_args = {
-         "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
Index: devel/buildbot-worker/pkg-descr
===================================================================
--- devel/buildbot-worker/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This port is the worker part of BuildBot. For the buildmaster, install the
-devel/buildbot port.
-
-For more information, please see: https://buildbot.net/trac
-
-WWW: https://buildbot.net
Index: devel/buildbot-www/Makefile
===================================================================
--- devel/buildbot-www/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Created by: Michael Gmelin <grembo@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	buildbot-www
-PORTVERSION=	0.9.11
-CATEGORIES=	devel python
-MASTER_SITES=	CHEESESHOP
-
-MAINTAINER=	grembo@FreeBSD.org
-COMMENT=	Continuous Integration Framework (WWW)
-
-LICENSE=	GPLv2
-
-BUILD_DEPENDS=	buildbot>=${PORTVERSION}:devel/buildbot \
-		buildbot-pkg>=${PORTVERSION}:devel/buildbot-pkg \
-		${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock
-RUN_DEPENDS=	buildbot-console-view>=${PORTVERSION}:devel/buildbot-console-view \
-		buildbot-grid-view>=${PORTVERSION}:devel/py-buildbot-grid-view \
-		buildbot-waterfall-view>=${PORTVERSION}:devel/buildbot-waterfall-view \
-		${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity
-
-USES=		python:2.7
-USE_PYTHON=	autoplist distutils
-
-NO_ARCH=	yes
-
-.include <bsd.port.mk>
Index: devel/buildbot-www/distinfo
===================================================================
--- devel/buildbot-www/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1506180945
-SHA256 (buildbot-www-0.9.11.tar.gz) = af01216d543eddba0772e55a0a97a2a1d0a9b0fddc1c87dd59b449b4818893db
-SIZE (buildbot-www-0.9.11.tar.gz) = 687664
Index: devel/buildbot-www/pkg-descr
===================================================================
--- devel/buildbot-www/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This port is the Web UI part of BuildBot. For the buildmaster, install the
-devel/buildbot port.
-
-For more information, please see: https://buildbot.net/trac
-
-WWW: https://buildbot.net
Index: devel/buildbot/Makefile
===================================================================
--- devel/buildbot/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# Created by: Koop Mast <kwm@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	buildbot
-PORTVERSION=	0.9.11
-CATEGORIES=	devel python
-MASTER_SITES=	CHEESESHOP
-
-MAINTAINER=	grembo@FreeBSD.org
-COMMENT=	Continuous Integration Framework (Master)
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \
-		${PYTHON_PKGNAMEPREFIX}lz4>=0:archivers/py-lz4 \
-		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.4.0:www/py-pyjwt \
-		${PYTHON_PKGNAMEPREFIX}ramlfications>0:devel/py-ramlfications \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:databases/py-sqlalchemy-migrate \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10 \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq
-TEST_DEPENDS=	buildbot-worker>=${PORTVERSION}:devel/buildbot-worker \
-		buildbot-www>=${PORTVERSION}:devel/buildbot-www \
-		${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3
-
-USES=		python:2.7
-USE_RC_SUBR=	buildbot
-USE_PYTHON=	autoplist distutils
-
-SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
-
-NO_ARCH=	yes
-
-post-patch:
-	@${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 ${REINPLACE_CMD} -e \
-		's|/usr/bin/python|${PYTHON_CMD}|g'
-	@${FIND} ${WRKSRC} -name \*.bak -delete
-
-do-test:
-	${MKDIR} ${WRKDIR}/tmp
-	cd ${WRKDIR}/tmp && ${PYTHON_CMD} -m twisted.trial buildbot.test
-
-.include <bsd.port.mk>
Index: devel/buildbot/distinfo
===================================================================
--- devel/buildbot/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1506179805
-SHA256 (buildbot-0.9.11.tar.gz) = 9be352c0aab5d1520fedac8d6b19aadda4f48763ac7f72bb00e5f8cc51107ee8
-SIZE (buildbot-0.9.11.tar.gz) = 3096455
Index: devel/buildbot/files/buildbot.in
===================================================================
--- devel/buildbot/files/buildbot.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-# PROVIDE: buildbot
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable buildbot:
-# buildbot_enable (bool):	Set to "NO" by default
-# buildbot_basedir (path):	Must be set to the path of the buildbot directory
-#				file, e.g. /var/www/buildbot
-# buildbot_user (str):		Set to "root" by default.  Change it to run
-#				buildbot as a different user.
-
-. /etc/rc.subr
-
-export PATH=${PATH}:%%PREFIX%%/bin
-
-name="buildbot"
-rcvar=buildbot_enable
-command="%%PREFIX%%/bin/buildbot"
-load_rc_config $name
-
-check_cmd="${name}_check"
-extra_commands="check reload"
-reload_cmd="${name}_reload"
-start_precmd="${name}_prestart"
-stop_precmd="${name}_prestop"
-
-pidfile="${buildbot_basedir}/twistd.pid"
-procname="%%PYTHON_CMD%%"
-
-buildbot_check()
-{
-	echo "Checking BuildBot config"
-	rc_flags="${buildbot_basedir} ${rc_flags}"
-	${command} checkconfig ${rc_flags}
-}
-
-buildbot_prestart()
-{
-	rc_flags="start ${buildbot_basedir} ${rc_flags}"
-}
-
-buildbot_prestop()
-{
-	rc_flags="stop ${buildbot_basedir} ${rc_flags}"
-}
-
-buildbot_reload()
-{
-	rc_flags="${buildbot_basedir} ${rc_flags}"
-	${command} sighup ${rc_flags}
-}
-
-run_rc_command "$1"
Index: devel/buildbot/pkg-descr
===================================================================
--- devel/buildbot/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-The BuildBot is a system to automate the compile/test cycle required by most
-software projects to validate code changes. By automatically rebuilding and
-testing the tree each time something has changed, build problems are
-pinpointed quickly, before other developers are inconvenienced by the
-failure. The guilty developer can be identified and harassed without human
-intervention. By running the builds on a variety of platforms, developers who
-do not have the facilities to test their changes everywhere before checkin will
-at least know shortly afterwards whether they have broken the build or not.
-
-Warning counts, lint checks, image size, compile time, and other build
-parameters can be tracked over time, are more visible, and are therefore
-easier to improve.
-
-The overall goal is to reduce tree breakage and provide a platform to run tests
-or code-quality checks that are too annoying or pedantic for any human to waste
-their time with. Developers get immediate (and potentially public) feedback
-about their changes, encouraging them to be more careful about testing before
-checkin.
-
-For more information, please see: https://buildbot.net/trac
-
-WWW: https://buildbot.net
Index: devel/py-buildbot-console-view/Makefile
===================================================================
--- devel/py-buildbot-console-view/Makefile
+++ devel/py-buildbot-console-view/Makefile
@@ -3,19 +3,21 @@
 
 PORTNAME=	buildbot-console-view
 PORTVERSION=	0.9.11
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	grembo@FreeBSD.org
+MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Continuous Integration Framework (Console View)
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	buildbot-pkg>=${PORTVERSION}:devel/buildbot-pkg
-RUN_DEPENDS=	buildbot-pkg>=${PORTVERSION}:devel/buildbot-pkg
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg
 
-USES=		python:2.7
-USE_PYTHON=	autoplist distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
Index: devel/py-buildbot-grid-view/Makefile
===================================================================
--- devel/py-buildbot-grid-view/Makefile
+++ devel/py-buildbot-grid-view/Makefile
@@ -2,19 +2,21 @@
 
 PORTNAME=	buildbot-grid-view
 PORTVERSION=	0.9.11
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rodrigc@FreeBSD.org
+MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Continuous Integration Framework (Grid View)
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	buildbot-pkg>=${PORTVERSION}:devel/buildbot-pkg
-RUN_DEPENDS=	buildbot-pkg>=${PORTVERSION}:devel/buildbot-pkg
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg
 
-USES=		python:2.7
-USE_PYTHON=	autoplist distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
Index: devel/py-buildbot-pkg/Makefile
===================================================================
--- devel/py-buildbot-pkg/Makefile
+++ devel/py-buildbot-pkg/Makefile
@@ -3,16 +3,18 @@
 
 PORTNAME=	buildbot-pkg
 PORTVERSION=	0.9.11
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	grembo@FreeBSD.org
+MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Continuous Integration Framework (packaging)
 
 LICENSE=	GPLv2
 
-USES=		python:2.7
-USE_PYTHON=	autoplist distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
Index: devel/py-buildbot-waterfall-view/Makefile
===================================================================
--- devel/py-buildbot-waterfall-view/Makefile
+++ devel/py-buildbot-waterfall-view/Makefile
@@ -3,19 +3,21 @@
 
 PORTNAME=	buildbot-waterfall-view
 PORTVERSION=	0.9.11
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	grembo@FreeBSD.org
+MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Continuous Integration Framework (Waterfall View)
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	buildbot-pkg>=${PORTVERSION}:devel/buildbot-pkg
-RUN_DEPENDS=	buildbot-pkg>=${PORTVERSION}:devel/buildbot-pkg
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg
 
-USES=		python:2.7
-USE_PYTHON=	autoplist distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
Index: devel/py-buildbot-worker/Makefile
===================================================================
--- devel/py-buildbot-worker/Makefile
+++ devel/py-buildbot-worker/Makefile
@@ -3,10 +3,12 @@
 
 PORTNAME=	buildbot-worker
 PORTVERSION=	0.9.11
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	grembo@FreeBSD.org
+MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Continuous Integration Framework (Worker)
 
 LICENSE=	GPLv2
@@ -17,8 +19,8 @@
 TEST_DEPENDS=	trial:devel/py-twisted \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
-USES=		python:2.7
-USE_PYTHON=	autoplist distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
 USE_RC_SUBR=	buildbot-worker
 
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
Index: devel/py-buildbot-www/Makefile
===================================================================
--- devel/py-buildbot-www/Makefile
+++ devel/py-buildbot-www/Makefile
@@ -3,24 +3,26 @@
 
 PORTNAME=	buildbot-www
 PORTVERSION=	0.9.11
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	grembo@FreeBSD.org
+MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Continuous Integration Framework (WWW)
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	buildbot>=${PORTVERSION}:devel/buildbot \
-		buildbot-pkg>=${PORTVERSION}:devel/buildbot-pkg \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}buildbot>=${PORTVERSION}:devel/py-buildbot \
+		${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg \
 		${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock
-RUN_DEPENDS=	buildbot-console-view>=${PORTVERSION}:devel/buildbot-console-view \
-		buildbot-grid-view>=${PORTVERSION}:devel/py-buildbot-grid-view \
-		buildbot-waterfall-view>=${PORTVERSION}:devel/buildbot-waterfall-view \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}buildbot-console-view>=${PORTVERSION}:devel/py-buildbot-console-view \
+		${PYTHON_PKGNAMEPREFIX}buildbot-grid-view>=${PORTVERSION}:devel/py-buildbot-grid-view \
+		${PYTHON_PKGNAMEPREFIX}buildbot-waterfall-view>=${PORTVERSION}:devel/py-buildbot-waterfall-view \
 		${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity
 
-USES=		python:2.7
-USE_PYTHON=	autoplist distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
Index: devel/py-buildbot/Makefile
===================================================================
--- devel/py-buildbot/Makefile
+++ devel/py-buildbot/Makefile
@@ -3,10 +3,12 @@
 
 PORTNAME=	buildbot
 PORTVERSION=	0.9.11
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	grembo@FreeBSD.org
+MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Continuous Integration Framework (Master)
 
 LICENSE=	GPLv2
@@ -24,14 +26,14 @@
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq
-TEST_DEPENDS=	buildbot-worker>=${PORTVERSION}:devel/buildbot-worker \
-		buildbot-www>=${PORTVERSION}:devel/buildbot-www \
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}buildbot-worker>=${PORTVERSION}:devel/py-buildbot-worker \
+		${PYTHON_PKGNAMEPREFIX}buildbot-www>=${PORTVERSION}:devel/py-buildbot-www \
 		${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \
 		${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3
 
-USES=		python:2.7
+USES=		python
 USE_RC_SUBR=	buildbot
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
 
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}