CVS commit: pkgsrc/www/emacs-w3m-snapshot

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Oct 31 14:56:40 UTC 2018

Modified Files:
        pkgsrc/www/emacs-w3m-snapshot: distinfo
Added Files:
        pkgsrc/www/emacs-w3m-snapshot/patches: patch-aclocal.m4

Log Message:
emacs-w3m-snapshot: Don't quote ${EGREP}, it might be "grep -E".


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/emacs-w3m-snapshot/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/emacs-w3m-snapshot/patches/patch-aclocal.m4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/emacs-w3m-snapshot/distinfo
diff -u pkgsrc/www/emacs-w3m-snapshot/distinfo:1.10 pkgsrc/www/emacs-w3m-snapshot/distinfo:1.11
--- pkgsrc/www/emacs-w3m-snapshot/distinfo:1.10 Mon Jun 25 13:39:14 2018
+++ pkgsrc/www/emacs-w3m-snapshot/distinfo      Wed Oct 31 14:56:40 2018
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.10 2018/06/25 13:39:14 ryoon Exp $
+$NetBSD: distinfo,v 1.11 2018/10/31 14:56:40 jperkin Exp $
 
 SHA1 (w3m-el-snapshot_1.4.625+0.20180518.orig.tar.gz) = 0480c9ed27d5a7868620e974e0ad45aed2ce5f70
 RMD160 (w3m-el-snapshot_1.4.625+0.20180518.orig.tar.gz) = 1e1b5e432363cdb0936a5e5bdc9be3f469c2d3b4
 SHA512 (w3m-el-snapshot_1.4.625+0.20180518.orig.tar.gz) = 096af0ba934759cf45ab6003c23efc6e94965c445de15315bdaa83850c62f1a2073dfa81d63f6c313d945350e9451a11002b19d20686f34502bac81526b9dd1f
 Size (w3m-el-snapshot_1.4.625+0.20180518.orig.tar.gz) = 1090189 bytes
 SHA1 (patch-Makefile.in) = 32cb48754433fc10ad598352c697b3df31d7d11c
+SHA1 (patch-aclocal.m4) = b89d7c2457a0190f4e4439b3dc2fe8832dfde21b
 SHA1 (patch-w3m.el) = a4c14deed274e984f854255513ce49dbd320eb83
 SHA1 (patch-w3mhack.el) = ecb7448d7f79b37e2b3229e11f9079062728ebf7

Added files:

Index: pkgsrc/www/emacs-w3m-snapshot/patches/patch-aclocal.m4
diff -u /dev/null pkgsrc/www/emacs-w3m-snapshot/patches/patch-aclocal.m4:1.1
--- /dev/null   Wed Oct 31 14:56:40 2018
+++ pkgsrc/www/emacs-w3m-snapshot/patches/patch-aclocal.m4      Wed Oct 31 14:56:40 2018
@@ -0,0 +1,35 @@
+$NetBSD: patch-aclocal.m4,v 1.1 2018/10/31 14:56:40 jperkin Exp $
+
+Don't quote ${EGREP}, it may be set to "grep -E".
+
+--- aclocal.m4.orig    2018-06-01 09:42:18.000000000 +0000
++++ aclocal.m4
+@@ -1,6 +1,6 @@
+ AC_DEFUN(AC_SET_VANILLA_FLAG,
+  [dnl Determine arguments to run Emacs as vanilla.
+-  retval=`echo "${EMACS}"| "${EGREP}" xemacs| "${EGREP}" -v '^$'`
++  retval=`echo "${EMACS}"| ${EGREP} xemacs| ${EGREP} -v '^$'`
+   if test -z "${retval}"; then
+       VANILLA_FLAG="-q -no-site-file"
+   else
+@@ -248,9 +248,9 @@ AC_DEFUN(AC_ADD_LOAD_PATH,
+       ADDITIONAL_LOAD_PATH="${withval}"
+       else
+       if test x"$USER" != xroot -a x"$HOME" != x -a -f "$HOME"/.emacs; then
+-          ADDITIONAL_LOAD_PATH=`${XEMACSDEBUG} \'${EMACS}\' -batch -l \'$HOME/.emacs\' -l w3mhack.el NONE -f w3mhack-load-path 2>/dev/null | \'${EGREP}\' -v \'^$\'`
++          ADDITIONAL_LOAD_PATH=`${XEMACSDEBUG} \'${EMACS}\' -batch -l \'$HOME/.emacs\' -l w3mhack.el NONE -f w3mhack-load-path 2>/dev/null | ${EGREP} -v \'^$\'`
+         else
+-          ADDITIONAL_LOAD_PATH=`${XEMACSDEBUG} \'${EMACS}\' -batch -l w3mhack.el NONE -f w3mhack-load-path 2>/dev/null | \'${EGREP}\' -v \'^$\'`
++          ADDITIONAL_LOAD_PATH=`${XEMACSDEBUG} \'${EMACS}\' -batch -l w3mhack.el NONE -f w3mhack-load-path 2>/dev/null | ${EGREP} -v \'^$\'`
+         fi
+       fi
+       AC_MSG_RESULT(${ADDITIONAL_LOAD_PATH})],
+@@ -265,7 +265,7 @@ AC_DEFUN(AC_ADD_LOAD_PATH,
+         ADDITIONAL_LOAD_PATH="${ADDITIONAL_LOAD_PATH}:`pwd`/attic"
+       fi
+     fi])
+-  retval=`eval "${XEMACSDEBUG} '${EMACS}' ${VANILLA_FLAG} -batch -l w3mhack.el '${ADDITIONAL_LOAD_PATH}' -f w3mhack-print-status 2>/dev/null | '${EGREP}' -v '^$'"`
++  retval=`eval "${XEMACSDEBUG} '${EMACS}' ${VANILLA_FLAG} -batch -l w3mhack.el '${ADDITIONAL_LOAD_PATH}' -f w3mhack-print-status 2>/dev/null | ${EGREP} -v '^$'"`
+   if test x"$retval" != xOK; then
+     AC_MSG_ERROR([Process couldn't proceed.  See the above messages.])
+   fi