diff options
author | amdmi3 <amdmi3@FreeBSD.org> | 2015-10-19 22:50:52 +0800 |
---|---|---|
committer | amdmi3 <amdmi3@FreeBSD.org> | 2015-10-19 22:50:52 +0800 |
commit | 6a98fceb0a6004a4c5a1fd86d54347f6a29f74c4 (patch) | |
tree | 72fd93ae39b43490b34dc8479465e07b453d126e /security | |
parent | e18413661fadcae47bb20ec0de548623410227ad (diff) | |
download | freebsd-ports-gnome-6a98fceb0a6004a4c5a1fd86d54347f6a29f74c4.tar.gz freebsd-ports-gnome-6a98fceb0a6004a4c5a1fd86d54347f6a29f74c4.tar.zst freebsd-ports-gnome-6a98fceb0a6004a4c5a1fd86d54347f6a29f74c4.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
Diffstat (limited to 'security')
-rw-r--r-- | security/cops/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/cops/Makefile b/security/cops/Makefile index 2dfc5de21d59..ebfed09e5aa3 100644 --- a/security/cops/Makefile +++ b/security/cops/Makefile @@ -28,7 +28,7 @@ C_SRC= home.chk.c user.chk.c is_able.c is_something.c \ crc.c crc_check.c post-patch: - @${REINPLACE_CMD} -i '' -e 's|${perl_OLD_CMD}|${perl_CMD}|' \ + @${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${perl_CMD}|' \ ${WRKSRC}/perl/cops pre-build: |