diff options
| author | mandree <mandree@FreeBSD.org> | 2014-09-26 04:38:32 +0800 |
|---|---|---|
| committer | mandree <mandree@FreeBSD.org> | 2014-09-26 04:38:32 +0800 |
| commit | f0557aaa8ce4502840fbfa156116fe04a9aa6627 (patch) | |
| tree | c5a7314d543b556dbc01f0a97963f72d944eecb1 | |
| parent | b0a2f308e92caa1218305ee6c832bbef85a157b9 (diff) | |
| download | freebsd-ports-gnome-f0557aaa8ce4502840fbfa156116fe04a9aa6627.tar.gz freebsd-ports-gnome-f0557aaa8ce4502840fbfa156116fe04a9aa6627.tar.zst freebsd-ports-gnome-f0557aaa8ce4502840fbfa156116fe04a9aa6627.zip | |
Fix shell commands in fix-packlist,
A. avoiding a bogus *** Error code 1 (ignored) on ports that
1. set at least one of the configure, modbuildtiny, or fixpacklist options
to USES_PERL5=..., AND
2. do not create/install into
${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto
B. no longer masking ${FIND} trouble through the leading - on the
Makefile commands.
PR: 193934
Approved by: portmgr (bdrewery)
| -rw-r--r-- | Mk/Uses/perl5.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk index 80f54b34906a..f59dc8129120 100644 --- a/Mk/Uses/perl5.mk +++ b/Mk/Uses/perl5.mk @@ -261,7 +261,7 @@ do-install: .if ${USE_PERL5:Mconfigure} || ${USE_PERL5:Mmodbuildtiny} || ${USE_PERL5:Mfixpacklist} fix-packlist:: - -@[ -d ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto ] && ${FIND} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \; + @if [ -d ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto ] ; then ${FIND} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \; ; fi .endif # Starting with perl 5.20, the empty bootstrap files are not installed any more |