svn commit: r433059 - in head/devel: subversion subversion18
Lev A. Serebryakov
lev at FreeBSD.org
Wed Feb 1 17:42:42 UTC 2017
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 at 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
More information about the svn-ports-head
mailing list