Date: Mon, 4 Dec 2017 15:27:29 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455518 - in head: Mk/Uses biology/bcftools biology/samtools security/metasploit Message-ID: <201712041527.vB4FRTtn053705@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Dec 4 15:27:29 2017 New Revision: 455518 URL: https://svnweb.freebsd.org/changeset/ports/455518 Log: Add a USES=python:env, that will not add a dependency on Python. It has the same effect than setting PYTHON_NO_DEPENDS, but in a more compact way. Sponsored by: Absolight Modified: head/Mk/Uses/python.mk head/biology/bcftools/Makefile (contents, props changed) head/biology/samtools/Makefile (contents, props changed) head/security/metasploit/Makefile (contents, props changed) Modified: head/Mk/Uses/python.mk ============================================================================== --- head/Mk/Uses/python.mk Mon Dec 4 14:20:44 2017 (r455517) +++ head/Mk/Uses/python.mk Mon Dec 4 15:27:29 2017 (r455518) @@ -28,6 +28,11 @@ # it to RUN_DEPENDS. # test Indicates that Python is needed at test time and adds # it to TEST_DEPENDS. +# env Indicates that the port does not require a dependency on Python +# itself but needs the environment set up. This is mainly used +# when depending on flavored python ports, or when a correct +# PYTHON_CMD is required. It has the same effect than setting +# PYTHON_NO_DEPENDS. # # If build, run and test are omitted, Python will be added as BUILD_DEPENDS, # RUN_DEPENDS and TEST_DEPENDS. PYTHON_NO_DEPENDS can be set to not add any @@ -281,6 +286,11 @@ _PYTHON_ARGS:= ${_PYTHON_ARGS:Nrun} .if ${_PYTHON_ARGS:Mtest} _PYTHON_TEST_DEP= yes _PYTHON_ARGS:= ${_PYTHON_ARGS:Ntest} +.endif +.if ${_PYTHON_ARGS:Menv} +PYTHON_NO_DEPENDS= yes +_PYTHON_ARGS:= ${_PYTHON_ARGS:Nenv} +.endif .endif # The port does not specify a build, run or test dependency, assume all are Modified: head/biology/bcftools/Makefile ============================================================================== --- head/biology/bcftools/Makefile Mon Dec 4 14:20:44 2017 (r455517) +++ head/biology/bcftools/Makefile Mon Dec 4 15:27:29 2017 (r455518) @@ -20,9 +20,8 @@ CONFLICTS_BUILD=openssl USE_GITHUB= yes GH_ACCOUNT= samtools -USES= autoreconf gmake perl5 python shebangfix +USES= autoreconf gmake perl5 python:env shebangfix USE_PERL5= test -PYTHON_NO_DEPENDS= yes GNU_CONFIGURE= yes SUB_FILES= pkg-message SHEBANG_FILES= misc/* test/test.pl Modified: head/biology/samtools/Makefile ============================================================================== --- head/biology/samtools/Makefile Mon Dec 4 14:20:44 2017 (r455517) +++ head/biology/samtools/Makefile Mon Dec 4 15:27:29 2017 (r455518) @@ -17,9 +17,8 @@ TEST_DEPENDS= bash:shells/bash USE_GITHUB= yes -USES= autoreconf gmake ncurses perl5 python shebangfix +USES= autoreconf gmake ncurses perl5 python:env shebangfix USE_PERL5= test -PYTHON_NO_DEPENDS= yes GNU_CONFIGURE= yes SUB_FILES= pkg-message SHEBANG_FILES= misc/*.pl misc/*.py misc/plot-bamstats test/test.pl Modified: head/security/metasploit/Makefile ============================================================================== --- head/security/metasploit/Makefile Mon Dec 4 14:20:44 2017 (r455517) +++ head/security/metasploit/Makefile Mon Dec 4 15:27:29 2017 (r455518) @@ -86,9 +86,8 @@ NO_ARCH= yes NO_ARCH_IGNORE= template_x64_bsd.bin template_x86_bsd.bin CVE-2013-2171.bin STRIP= -USES= python shebangfix +USES= python:env shebangfix USE_RUBY= yes -PYTHON_NO_DEPENDS= yes SHEBANG_FILES= data/exploits/CVE-2017-7494/build.sh \ data/exploits/CVE-2017-7494/install-deps.sh \ external/source/shellcode/windows/build.sh \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712041527.vB4FRTtn053705>