svn commit: r427334 - head/Mk/Uses
Raphael Kubo da Costa
rakuco at FreeBSD.org
Mon Nov 28 17:22:31 UTC 2016
Author: rakuco
Date: Mon Nov 28 17:22:29 2016
New Revision: 427334
URL: https://svnweb.freebsd.org/changeset/ports/427334
Log:
Uses/php.mk: Use EGREP instead of GREP when parsing config.h
Using ${GREP} was failing when grep was built with the WITHOUT_GNU_GREP_COMPAT
knob in src.conf. According to POSIX, | only works for alternation in extended
regular expressions (grep -E), although GNU grep disregards the difference.
The new syntax with ${EGREP} and no escaping of special characters works with
both BSD grep (without WITHOUT_GNU_GREP_COMPAT) as well as GNU grep.
Approved by: mat
Differential Revision: https://reviews.freebsd.org/D8663
Modified:
head/Mk/Uses/php.mk
Modified: head/Mk/Uses/php.mk
==============================================================================
--- head/Mk/Uses/php.mk Mon Nov 28 17:03:39 2016 (r427333)
+++ head/Mk/Uses/php.mk Mon Nov 28 17:22:29 2016 (r427334)
@@ -244,7 +244,7 @@ do-install:
${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME}/${header}
. endfor
@${RM} ${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME}/config.h
- @${GREP} "#define \(COMPILE\|HAVE\|USE\)_" ${WRKSRC}/config.h \
+ @${EGREP} "#define (COMPILE|HAVE|USE)_" ${WRKSRC}/config.h \
> ${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME}/config.h
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/php
. if ${php_ARGS:Mzend}
More information about the svn-ports-all
mailing list