From owner-svn-ports-head@freebsd.org  Fri Oct 26 12:40:25 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8DCB610E2A84;
 Fri, 26 Oct 2018 12:40:25 +0000 (UTC)
 (envelope-from grembo@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4112875AF8;
 Fri, 26 Oct 2018 12:40:25 +0000 (UTC)
 (envelope-from grembo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 21EDE2109B;
 Fri, 26 Oct 2018 12:40:25 +0000 (UTC)
 (envelope-from grembo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9QCePEP028277;
 Fri, 26 Oct 2018 12:40:25 GMT (envelope-from grembo@FreeBSD.org)
Received: (from grembo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9QCeOr0028275;
 Fri, 26 Oct 2018 12:40:24 GMT (envelope-from grembo@FreeBSD.org)
Message-Id: <201810261240.w9QCeOr0028275@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: grembo set sender to
 grembo@FreeBSD.org using -f
From: Michael Gmelin <grembo@FreeBSD.org>
Date: Fri, 26 Oct 2018 12:40:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r483022 - in head/devel/py-buildbot-worker: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: grembo
X-SVN-Commit-Paths: in head/devel/py-buildbot-worker: . files
X-SVN-Commit-Revision: 483022
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Oct 2018 12:40:25 -0000

Author: grembo
Date: Fri Oct 26 12:40:24 2018
New Revision: 483022
URL: https://svnweb.freebsd.org/changeset/ports/483022

Log:
  Fix twistd binary name in rc script for non-default python versions.
  
  PR:		227675
  Submitted by:	Andreas Sommer <andreas.sommer87@googlemail.com>
  Approved by:	koobs (maintainer)
  MFH:		1 week

Modified:
  head/devel/py-buildbot-worker/Makefile
  head/devel/py-buildbot-worker/files/buildbot-worker.in

Modified: head/devel/py-buildbot-worker/Makefile
==============================================================================
--- head/devel/py-buildbot-worker/Makefile	Fri Oct 26 12:18:20 2018	(r483021)
+++ head/devel/py-buildbot-worker/Makefile	Fri Oct 26 12:40:24 2018	(r483022)
@@ -3,6 +3,7 @@
 
 PORTNAME=	buildbot-worker
 PORTVERSION=	0.9.15
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -22,7 +23,7 @@ USES=		python
 USE_PYTHON=	autoplist distutils
 USE_RC_SUBR=	buildbot-worker
 
-SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
+SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD} PYTHON_VER=${PYTHON_VER}
 
 NO_ARCH=	yes
 

Modified: head/devel/py-buildbot-worker/files/buildbot-worker.in
==============================================================================
--- head/devel/py-buildbot-worker/files/buildbot-worker.in	Fri Oct 26 12:18:20 2018	(r483021)
+++ head/devel/py-buildbot-worker/files/buildbot-worker.in	Fri Oct 26 12:40:24 2018	(r483022)
@@ -57,7 +57,7 @@ eval ": \${${name}_uid:=\"buildbot\"}"
 eval ": \${${name}_gid:=\"buildbot\"}"
 eval ": \${${name}_basedir:=\"%%PREFIX%%/etc/${name}\"}"
 
-command="%%PREFIX%%/bin/twistd"
+command="%%PREFIX%%/bin/twistd-%%PYTHON_VER%%"
 command_interpreter="%%PYTHON_CMD%%"
 pidfile="${buildbot_worker_basedir}/twistd.pid"