From owner-svn-ports-head@freebsd.org  Mon Nov 28 17:22:31 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0A7EBC5A101;
 Mon, 28 Nov 2016 17:22:31 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 CE1171298;
 Mon, 28 Nov 2016 17:22:30 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uASHMUIA081608;
 Mon, 28 Nov 2016 17:22:30 GMT (envelope-from rakuco@FreeBSD.org)
Received: (from rakuco@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uASHMUEr081607;
 Mon, 28 Nov 2016 17:22:30 GMT (envelope-from rakuco@FreeBSD.org)
Message-Id: <201611281722.uASHMUEr081607@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rakuco set sender to
 rakuco@FreeBSD.org using -f
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Mon, 28 Nov 2016 17:22:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r427334 - 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-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2016 17:22:31 -0000

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}