* Replace fgre and grep -F and egrep by grep -E as these have been

     deprecated. Patch submitted by Ville Skyttä.

7 files changed, 13 insertions, 13 deletions

diff --git a/alpine/mailtrfc.sh b/alpine/mailtrfc.sh
index 456ee817..51d6ba48 100755
--- a/alpine/mailtrfc.sh
+++ b/alpine/mailtrfc.sh
@@ -116,8 +116,8 @@ awk 'BEGIN {mailers[0] =  "Other";
 
 echo $host $org $domain | \
   awk '{printf("     %.17s %.11s %.11s  Off Campus        Total\n", $1, $2, $3)}'
-egrep -v 'TOTAL|----|^-->' /tmp/syslogx.$$ | sort +0.60rn 
-egrep  'TOTAL|----' /tmp/syslogx.$$
+grep -Ev 'TOTAL|----|^-->' /tmp/syslogx.$$ | sort +0.60rn
+grep -E  'TOTAL|----' /tmp/syslogx.$$
 grep  '^-->' /tmp/syslogx.$$ | sed -e 's/-->//' > other-traffic
 rm -f /tmp/syslogx.$$
 
diff --git a/contrib/ports/sequent_ptx_4.4.6 b/contrib/ports/sequent_ptx_4.4.6
index c631fcd3..21ff3e35 100644
--- a/contrib/ports/sequent_ptx_4.4.6
+++ b/contrib/ports/sequent_ptx_4.4.6
@@ -129,16 +129,16 @@ diff -cr pine.dist/pine/mailtrfc.sh pine4.20/pine/mailtrfc.sh
   
   echo $host $org $domain | \
 !   awk '{printf("     %.17s %.11s %.11s  Off Campus        Total\n", $1, $2, $3)}'
-  egrep -v 'TOTAL|----|^-->' /tmp/syslogx.$$ | sort +0.60rn 
-  egrep  'TOTAL|----' /tmp/syslogx.$$
+  grep -Ev 'TOTAL|----|^-->' /tmp/syslogx.$$ | sort +0.60rn
+  grep -E  'TOTAL|----' /tmp/syslogx.$$
   grep  '^-->' /tmp/syslogx.$$ | sed -e 's/-->//' > other-traffic
 --- 115,121 ----
   
   
   echo $host $org $domain | \
 !   nawk '{printf("     %.17s %.11s %.11s  Off Campus        Total\n", $1, $2, $3)}'
-  egrep -v 'TOTAL|----|^-->' /tmp/syslogx.$$ | sort +0.60rn 
-  egrep  'TOTAL|----' /tmp/syslogx.$$
+  grep -Ev 'TOTAL|----|^-->' /tmp/syslogx.$$ | sort +0.60rn
+  grep -E  'TOTAL|----' /tmp/syslogx.$$
   grep  '^-->' /tmp/syslogx.$$ | sed -e 's/-->//' > other-traffic
 diff -cr pine.dist/pine/send.c pine4.20/pine/send.c
 *** pine.dist/pine/send.c	Wed Oct  6 16:18:27 1999
diff --git a/contrib/utils/mailtrfc.sh b/contrib/utils/mailtrfc.sh
index 2ef69cdc..761df038 100755
--- a/contrib/utils/mailtrfc.sh
+++ b/contrib/utils/mailtrfc.sh
@@ -122,8 +122,8 @@ awk 'BEGIN {mailers[0] =  "Other";
 
 echo $host $org $domain | \
   awk '{printf("     %.17s %.11s %.11s  Off Campus        Total\n", $1, $2, $3)}'
-egrep -v 'TOTAL|----|^-->' /tmp/syslogx.$$ | sort +0.60rn 
-egrep  'TOTAL|----' /tmp/syslogx.$$
+grep -Ev 'TOTAL|----|^-->' /tmp/syslogx.$$ | sort +0.60rn
+grep -E  'TOTAL|----' /tmp/syslogx.$$
 grep  '^-->' /tmp/syslogx.$$ | sed -e 's/-->//' > other-traffic
 rm -f /tmp/syslogx.$$
 
diff --git a/doc/tech-notes/config.html b/doc/tech-notes/config.html
index 6a6cabc5..d448cdac 100644
--- a/doc/tech-notes/config.html
+++ b/doc/tech-notes/config.html
@@ -312,7 +312,7 @@ is somewhat related to this option.
 
 <P>
 In addition to a list of actual addresses,
-you may use regular expressions (as used with egrep with the ignore case flag)
+you may use regular expressions (as used with grep -E with the ignore case flag)
 to describe the addresses you want to match.
 <EM>Alpine</EM> will somewhat arbitrarily interpret your entry as a regular
 expression if it contains any of the characters
diff --git a/doc/tech-notes/tech-notes.txt b/doc/tech-notes/tech-notes.txt
index 58dc15fd..e4b39924 100644
--- a/doc/tech-notes/tech-notes.txt
+++ b/doc/tech-notes/tech-notes.txt
@@ -1451,7 +1451,7 @@ General Configuration Variables
           The feature copy-to-address-to-from-if-it-is-us is somewhat
           related to this option.
           In addition to a list of actual addresses, you may use regular
-          expressions (as used with egrep with the ignore case flag) to
+          expressions (as used with grep -E with the ignore case flag) to
           describe the addresses you want to match. _Alpine_ will somewhat
           arbitrarily interpret your entry as a regular expression if it
           contains any of the characters *, |, +, ?, {, [, ^, $, or \.
diff --git a/imap/src/osdep/unix/Makefile b/imap/src/osdep/unix/Makefile
index dd98eb81..b940d4ad 100644
--- a/imap/src/osdep/unix/Makefile
+++ b/imap/src/osdep/unix/Makefile
@@ -1009,7 +1009,7 @@ onceenv:
 	$(LN) sig_$(SIGTYPE).c siglocal.c
 	$(LN) crx_$(CRXTYPE).c crexcl.c
 	$(LN) ip$(IP)_unix.c ip_unix.c
-	sh -c '(test $(OS) = sc5 -o $(OS) = sco -o ! -f /usr/include/sys/statvfs.h) && echo -DNOFSTATVFS >> OSCFLAGS || fgrep statvfs64 /usr/include/sys/statvfs.h > /dev/null || echo -DNOFSTATVFS64 >> OSCFLAGS'
+	sh -c '(test $(OS) = sc5 -o $(OS) = sco -o ! -f /usr/include/sys/statvfs.h) && echo -DNOFSTATVFS >> OSCFLAGS || grep -F statvfs64 /usr/include/sys/statvfs.h > /dev/null || echo -DNOFSTATVFS64 >> OSCFLAGS'
 
 
 # Password checkers
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 1377d3c9..a3878f5f 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
 reasonable place to be called from.
 Dummy change to get revision in pine.hlp
 ============= h_revision =================
-Alpine Commit 612 2021-11-05 15:13:25
+Alpine Commit 613 2021-11-14 09:43:48
 ============= h_news =================
 <HTML>
 <HEAD>
@@ -25471,7 +25471,7 @@ is somewhat related to this option.
 
 <P>
 In addition to a list of actual addresses,
-you may use regular expressions (as used with egrep with the ignore case flag)
+you may use regular expressions (as used with grep -E with the ignore case flag)
 to describe the addresses you want to match.
 Alpine will somewhat arbitrarily interpret your entry as a regular
 expression if it contains any of the characters