From owner-svn-ports-all@freebsd.org Fri Jan 4 10:16:01 2019 Return-Path: Delivered-To: svn-ports-all@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 38B0E1424174; Fri, 4 Jan 2019 10:16:01 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D45DF899EC; Fri, 4 Jan 2019 10:16:00 +0000 (UTC) (envelope-from koobs@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 AEE582F228; Fri, 4 Jan 2019 10:16:00 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x04AG0Lb014607; Fri, 4 Jan 2019 10:16:00 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x04AG0kC014605; Fri, 4 Jan 2019 10:16:00 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201901041016.x04AG0kC014605@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Fri, 4 Jan 2019 10:16:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489253 - in head/devel/py-buildbot: . files X-SVN-Group: ports-head X-SVN-Commit-Author: koobs X-SVN-Commit-Paths: in head/devel/py-buildbot: . files X-SVN-Commit-Revision: 489253 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D45DF899EC X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jan 2019 10:16:01 -0000 Author: koobs Date: Fri Jan 4 10:16:00 2019 New Revision: 489253 URL: https://svnweb.freebsd.org/changeset/ports/489253 Log: devel/py-buildbot: Version-suffix rc script command For python ports, particularly those that use USE_PYTHON=concurrent, only the *default* python version/flavor (of the port) gets symlinks created for any script/binary filenames installed in LOCALBASE/bin. For non-default Python versions/flavors of the port or package, *only* a version-suffixed script filename is installed. The devel/buildbot-worker rc script was fixed in ports r483022 [1] to use a version-suffixed script name. This change fixes the same for devel/py-buildbot, whos rc script currently fails to run due to trying to invoke a non-existent 'buildbot' script name for the non-default (!2.7) case. Since a port/package cannot know at run time, at any point what the default Python version currently is, or whether it has changed, Python ports *must* always and only refer to version-specific variants for everything, including the Python interpreter, script shebangs, commands, paths, etc, for the Python version they are currently being built with. PR: 234565, 227675 [1] Reported by: Andreas Sommer MFH: 2019Q1 Modified: head/devel/py-buildbot/Makefile head/devel/py-buildbot/files/buildbot.in Modified: head/devel/py-buildbot/Makefile ============================================================================== --- head/devel/py-buildbot/Makefile Fri Jan 4 09:38:09 2019 (r489252) +++ head/devel/py-buildbot/Makefile Fri Jan 4 10:16:00 2019 (r489253) @@ -3,6 +3,7 @@ PORTNAME= buildbot PORTVERSION= 1.5.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -29,7 +30,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}treq>0:www/py-tre ${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} @@ -37,7 +38,7 @@ 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 Modified: head/devel/py-buildbot/files/buildbot.in ============================================================================== --- head/devel/py-buildbot/files/buildbot.in Fri Jan 4 09:38:09 2019 (r489252) +++ head/devel/py-buildbot/files/buildbot.in Fri Jan 4 10:16:00 2019 (r489253) @@ -19,7 +19,7 @@ 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"