Date: Tue, 20 Dec 2016 07:47:38 +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: r428979 - head/security/gpgme/files Message-ID: <201612200747.uBK7lcBH039745@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Tue Dec 20 07:47:38 2016 New Revision: 428979 URL: https://svnweb.freebsd.org/changeset/ports/428979 Log: Fix configure of security/gpgme-qt5 for users that have 'WITHOUT_GNU_GREP_COMPAT=yes' set Obtained from: based on upstream patch of m4/qt.m4 Added: head/security/gpgme/files/patch-configure (contents, props changed) Added: head/security/gpgme/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/gpgme/files/patch-configure Tue Dec 20 07:47:38 2016 (r428979) @@ -0,0 +1,32 @@ +Fix configure for users that have 'WITHOUT_GNU_GREP_COMPAT=yes' set +m4/qt.m4 fixed upstream in git 211844f. + +--- configure.orig 2016-12-20 07:27:31 UTC ++++ configure +@@ -18746,7 +18746,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; } +@@ -18844,7 +18844,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. +@@ -18940,7 +18940,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?201612200747.uBK7lcBH039745>