Index: head/devel/py-buildbot/Makefile
===================================================================
--- head/devel/py-buildbot/Makefile	(revision 489252)
+++ head/devel/py-buildbot/Makefile	(revision 489253)
@@ -1,56 +1,57 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	buildbot
 PORTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Continuous Integration Framework
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.1:devel/py-zope.interface@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.8.0:databases/py-sqlalchemy10@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}txaio>=2.2.2:devel/py-txaio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lz4>=0:archivers/py-lz4@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}buildbot-pkg>0:devel/py-buildbot-pkg@${PY_FLAVOR} 
+		${PYTHON_PKGNAMEPREFIX}buildbot-pkg>0:devel/py-buildbot-pkg@${PY_FLAVOR}
 # to be ported	${PYTHON_PKGNAMEPREFIX}pyjade>0:www/py-pyjade@${PY_FLAVOR}
 # to be ported  ${PYTHON_PKGNAMEPREFIX}moto>0:www/py-moto@${PY_FLAVOR}
 
 USES=		python
 USE_RC_SUBR=	buildbot
 USE_PYTHON=	autoplist concurrent distutils
 
-SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
+SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} PYTHON_VER=${PYTHON_VER}
 
 NO_ARCH=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VER} >= 3.0
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}twisted>=17.9.0:devel/py-twisted@${PY_FLAVOR}
 .else
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}twisted>=16.1.0:devel/py-twisted@${PY_FLAVOR}
 .endif
 
 do-test:
 	${MKDIR} ${WRKDIR}/tmp
 	cd ${WRKDIR}/tmp && PYTHONPATH=${WRKSRC} ${PYTHON_CMD} -m twisted.trial buildbot.test
 
 .include <bsd.port.post.mk>
Index: head/devel/py-buildbot/files/buildbot.in
===================================================================
--- head/devel/py-buildbot/files/buildbot.in	(revision 489252)
+++ head/devel/py-buildbot/files/buildbot.in	(revision 489253)
@@ -1,57 +1,57 @@
 #!/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"
+command="%%PREFIX%%/bin/buildbot-%%PYTHON_VER%%"
 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"