Date: Sun, 18 Dec 2016 13:46:25 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428848 - head/security/pinentry/files Message-ID: <201612181346.uBIDkP0Y090879@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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";
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612181346.uBIDkP0Y090879>