From owner-svn-ports-all@freebsd.org  Sun Dec 18 13:46:26 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 DDEE0C86D08;
 Sun, 18 Dec 2016 13:46:26 +0000 (UTC)
 (envelope-from jhale@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 9397F14B4;
 Sun, 18 Dec 2016 13:46:26 +0000 (UTC)
 (envelope-from jhale@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBIDkPa1090880;
 Sun, 18 Dec 2016 13:46:25 GMT (envelope-from jhale@FreeBSD.org)
Received: (from jhale@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBIDkP0Y090879;
 Sun, 18 Dec 2016 13:46:25 GMT (envelope-from jhale@FreeBSD.org)
Message-Id: <201612181346.uBIDkP0Y090879@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhale set sender to
 jhale@FreeBSD.org using -f
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Sun, 18 Dec 2016 13:46:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r428848 - head/security/pinentry/files
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Dec 2016 13:46:27 -0000

Author: jhale
Date: Sun Dec 18 13:46:25 2016
New Revision: 428848
URL: https://svnweb.freebsd.org/changeset/ports/428848

Log:
  Fix configure for users that have 'WITHOUT_GNU_GREP_COMPAT=yes' set
  
  Reported by:	rakuco

Added:
  head/security/pinentry/files/patch-configure   (contents, props changed)

Added: head/security/pinentry/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/pinentry/files/patch-configure	Sun Dec 18 13:46:25 2016	(r428848)
@@ -0,0 +1,29 @@
+--- configure.orig	2016-11-22 08:01:14 UTC
++++ configure
+@@ -9948,7 +9948,7 @@ fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking moc version" >&5
+ $as_echo_n "checking moc version... " >&6; }
+     mocversion=`$MOC -v 2>&1`
+-    mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
++    mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
+     if test x"$mocversiongrep" != x"$mocversion"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -10046,7 +10046,7 @@ else
+ fi
+ 
+       mocversion=`$MOC2 -v 2>&1`
+-      mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
++      mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"`
+       if test x"$mocversiongrep" != x"$mocversion"; then
+         if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}qtchooser", so it can be a program name with args.
+@@ -10142,7 +10142,7 @@ fi
+ 
+         qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
+         mocversion=`$qt5tooldir/moc -v 2>&1`
+-        mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
++        mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
+         if test x"$mocversiongrep" != x"$mocversion"; then
+           # no valid moc found
+           have_qt5_libs="no";