diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-10-19 14:50:52 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-10-19 14:50:52 +0000 |
| commit | 67971bd0fb8a440f973d12606b0f496ba216d7df (patch) | |
| tree | 72fd93ae39b43490b34dc8479465e07b453d126e /lang/python-tools | |
| parent | f13c234d6c664c916b5c0d0e6f089d8ef0c93d55 (diff) | |
| download | ports-67971bd0fb8a440f973d12606b0f496ba216d7df.tar.gz ports-67971bd0fb8a440f973d12606b0f496ba216d7df.zip | |
Improve shebangfix framework
- Support multiple values in *_OLD_CMD, i.e. we can now fix both "/usr/bin/python" and "/usr/bin/env python" at the same time
- Default *_OLD_CMD values are now always appended, so you don't need to specify them in individual ports
- Add lua support (depends on USES=lua)
- Add more default values, such as "/usr/bin/env foo" for python, perl, bash, ruby and lua
- Shebangfix now matches whole words, e.g. we will no longer (erroneously) replace "/usr/bin/perl5.005" with "${perl_CMD}5.005" (but "/usr/bin/perl -tt" is still (correctly) replaced with "${perl_CMD} -tt")
Note that *_OLD_CMD items containing spaces must now be quoted (e.g. perl_OLD_CMD=/bin/perl /usr/bin/perl "/usr/bin/env perl")
Update shebangfix usage according to new rules in many ports:
- Remove *_OLD_CMD for patterns now replaced by default
- Quote custom *_OLD_CMD which contain spaces
Fix shebangfix usage in many ports (irrelevant to infrastructure change):
- Remove redundant SHEBANG_LANG (no need to duplicate default langs)
- Remove redundant *_CMD (such as python_CMD=${LOCALBASE}/bin/python${PYTHON_VER} when USES=python is present)
- Never use *_OLD_CMD in REINPLACE_CMD matchers, these should always look for exact string
Approved by: portmgr (bapt)
Differential Revision: D3756
Notes
Notes:
svn path=/head/; revision=399684
Diffstat (limited to 'lang/python-tools')
| -rw-r--r-- | lang/python-tools/Makefile | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lang/python-tools/Makefile b/lang/python-tools/Makefile index 79490306050f..027af2887b12 100644 --- a/lang/python-tools/Makefile +++ b/lang/python-tools/Makefile @@ -26,7 +26,6 @@ SCRIPT_FILES= byteyears checkpyc copytime crlf dutree \ PYLIB_FILES= tabnanny timeit PLIST_FILES= ${SCRIPT_FILES:C/^.*/bin\/&/g} ${PYLIB_FILES:C/^.*/bin\/&/g} -SHEBANG_LANG= python SHEBANG_FILES= ${SCRIPT_FILES:C/^.*/&\.py/g} \ ../../Lib/tabnanny.py ../../Lib/timeit.py @@ -38,10 +37,6 @@ UNIQUE_SUFFIX_FILES= ${SCRIPT_FILES:C/^.*/bin\/&/g} \ .if ${PYTHON_REL} < 3200 SCRIPT_FILES+= logmerge -python_OLD_CMD= /usr/bin/env python -.else -# Python 3+ uses python3 as shebang line, python2 just python -python_OLD_CMD= /usr/bin/env python3 .endif .if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} |