Date: Thu, 25 Sep 2014 20:38:33 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369293 - head/Mk/Uses Message-ID: <201409252038.s8PKcXQW083189@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Thu Sep 25 20:38:32 2014 New Revision: 369293 URL: http://svnweb.freebsd.org/changeset/ports/369293 QAT: https://qat.redports.org/buildarchive/r369293/ Log: 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) Modified: head/Mk/Uses/perl5.mk Modified: head/Mk/Uses/perl5.mk ============================================================================== --- head/Mk/Uses/perl5.mk Thu Sep 25 20:24:41 2014 (r369292) +++ head/Mk/Uses/perl5.mk Thu Sep 25 20:38:32 2014 (r369293) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409252038.s8PKcXQW083189>