[pkgsrc/trunk]: pkgsrc/print/poppler avoid gnu-grep presumptions in favour of...

[richard <richard%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e8e381749845
branches:  trunk
changeset: 347894:e8e381749845
user:      richard <richard%pkgsrc.org@localhost>
date:      Thu Jun 02 05:14:21 2016 +0000

description:
avoid gnu-grep presumptions in favour of portable usage for detecting qt5

reported upstream: https://bugs.freedesktop.org/show_bug.cgi?id=72744
fixes poppler-qt5 build on SunOS

diffstat:

 print/poppler/distinfo                |   3 ++-
 print/poppler/patches/patch-configure |  16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)

diffs (35 lines):

diff -r 40ce6ab13ac9 -r e8e381749845 print/poppler/distinfo
--- a/print/poppler/distinfo    Thu Jun 02 05:02:23 2016 +0000
+++ b/print/poppler/distinfo    Thu Jun 02 05:14:21 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.108 2016/05/22 18:17:17 wiz Exp $
+$NetBSD: distinfo,v 1.109 2016/06/02 05:14:21 richard Exp $
 
 SHA1 (poppler-0.44.0.tar.xz) = e299affb9180e920c977fd60a217a6c21bde23c2
 RMD160 (poppler-0.44.0.tar.xz) = 9037dd395f7e789bae96dfb3b1a5acf8cb9c0814
@@ -10,4 +10,5 @@
 SHA1 (patch-aq) = da845661ef7f7aca3072dbeebde0444b4d8f01aa
 SHA1 (patch-ar) = b064ff2dc9080ff5f1a1361e7798480ace11f3a3
 SHA1 (patch-as) = 1238357e57fa310ba9c9f00768c46074b8325739
+SHA1 (patch-configure) = 07eea448deca5a1c586376ba38070a3efe943415
 SHA1 (patch-qt5_src_Makefile.in) = c3a47fde201d61a7b7674020f5c998173a61b216
diff -r 40ce6ab13ac9 -r e8e381749845 print/poppler/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/poppler/patches/patch-configure     Thu Jun 02 05:14:21 2016 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure,v 1.3 2016/06/02 05:14:21 richard Exp $
+
+avoid gnu-grep presumptions in favour of portable usage
+reported upstream: https://bugs.freedesktop.org/show_bug.cgi?id=72744
+
+--- configure.orig     2016-05-21 16:59:37.000000000 +0000
++++ configure
+@@ -24084,7 +24084,7 @@ fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5 moc" >&5
+ $as_echo_n "checking for Qt5 moc... " >&6; }
+   mocversion=`$MOCQT5 -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; }