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 /japanese | |
| parent | Add a few patches to lang/perl5.* to make tests pass. (diff) | |
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 'japanese')
| -rw-r--r-- | japanese/kcode/Makefile | 1 | ||||
| -rw-r--r-- | japanese/man/Makefile | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/japanese/kcode/Makefile b/japanese/kcode/Makefile index a9c13ee318af..4aecb4235459 100644 --- a/japanese/kcode/Makefile +++ b/japanese/kcode/Makefile @@ -15,7 +15,6 @@ USE_PERL5= extract run NO_WRKSUBDIR= yes NO_BUILD= yes SHEBANG_FILES= kcode -perl_OLD_CMD= /usr/bin/env perl PLIST_FILES= bin/kcode man/ja/man1/kcode.1.gz diff --git a/japanese/man/Makefile b/japanese/man/Makefile index 6506d1b71760..16e208ec7e35 100644 --- a/japanese/man/Makefile +++ b/japanese/man/Makefile @@ -22,9 +22,8 @@ RUN_DEPENDS= ${LOCALBASE}/bin/groff:${PORTSDIR}/japanese/groff \ jless:${PORTSDIR}/japanese/less MAKE_ENV= GZCAT=${GZCAT} GZIP_CMD="${GZIP_CMD}" -USES+= shebangfix +USES= shebangfix SHEBANG_FILES= catman/catman.perl makewhatis/makewhatis.perl -SHEBANG_LANG= perl post-patch: .for file in apropos/apropos.sh catman/catman.perl \ |