From owner-svn-ports-all@FreeBSD.ORG Thu Sep 25 20:38:33 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 53429865; Thu, 25 Sep 2014 20:38:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3D995C91; Thu, 25 Sep 2014 20:38:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8PKcXL6083190; Thu, 25 Sep 2014 20:38:33 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8PKcXQW083189; Thu, 25 Sep 2014 20:38:33 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201409252038.s8PKcXQW083189@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Thu, 25 Sep 2014 20:38:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369293 - head/Mk/Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Sep 2014 20:38:33 -0000 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