Date: Wed, 1 Feb 2017 17:42:41 +0000 (UTC) From: "Lev A. Serebryakov" <lev@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433059 - in head/devel: subversion subversion18 Message-ID: <201702011742.v11Hgf2I098957@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lev Date: Wed Feb 1 17:42:40 2017 New Revision: 433059 URL: https://svnweb.freebsd.org/changeset/ports/433059 Log: Fix shebang fix for new sed(1) behavior PR: 215230 Submitted by: Xin Li <delphij@FreeBSD.org> Modified: head/devel/subversion/Makefile.common head/devel/subversion18/Makefile.common Modified: head/devel/subversion/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Wed Feb 1 17:39:40 2017 (r433058) +++ head/devel/subversion/Makefile.common Wed Feb 1 17:42:40 2017 (r433059) @@ -105,8 +105,9 @@ post-patch: @${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h .endif # shebangfix - @${GREP} -Rl -e '#!/bin/b' -e '#!/bin/env' -e '#!/usr/bin/p' ${WRKSRC}/tools/ \ - | ${XARGS} ${REINPLACE_CMD} -e '1s|#\!/bin/b|#\!/usr/local/bin/b|' \ + @${FIND} ${WRKSRC}/tools/ -type f -exec ${GREP} -l -e '#!/bin/b' -e '#!/bin/env' \ + -e '#!/usr/bin/p' {} + | ${XARGS} ${REINPLACE_CMD} -e \ + '1s|#\!/bin/b|#\!/usr/local/bin/b|' \ -e '1s|#\!/bin/env|#\!/usr/bin/env|' \ -e '1s|#\!/usr/bin/p|#\!/usr/local/bin/p|' # remove all .bak files to clean the stage Modified: head/devel/subversion18/Makefile.common ============================================================================== --- head/devel/subversion18/Makefile.common Wed Feb 1 17:39:40 2017 (r433058) +++ head/devel/subversion18/Makefile.common Wed Feb 1 17:42:40 2017 (r433059) @@ -108,8 +108,9 @@ post-patch: @${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h .endif # shebangfix - @${GREP} -Rl -e '#!/bin/b' -e '#!/bin/env' -e '#!/usr/bin/p' ${WRKSRC}/tools/ \ - | ${XARGS} ${REINPLACE_CMD} -e '1s|#\!/bin/b|#\!/usr/local/bin/b|' \ + @${FIND} ${WRKSRC}/tools/ -type f -exec ${GREP} -l -e '#!/bin/b' -e '#!/bin/env' \ + -e '#!/usr/bin/p' {} + | ${XARGS} ${REINPLACE_CMD} -e \ + '1s|#\!/bin/b|#\!/usr/local/bin/b|' \ -e '1s|#\!/bin/env|#\!/usr/bin/env|' \ -e '1s|#\!/usr/bin/p|#\!/usr/local/bin/p|' # remove all .bak files to clean the stage
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702011742.v11Hgf2I098957>