CVS commit: pkgsrc/pkgtools/pkg_rolling-replace

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Sun Apr 20 22:35:47 UTC 2025

Modified Files:
        pkgsrc/pkgtools/pkg_rolling-replace: Makefile
        pkgsrc/pkgtools/pkg_rolling-replace/files: pkg_rolling-replace.sh

Log Message:
pkgtools/pkg_rolling-replace: Silence spam about using egrep

GNU grep when invoked as egrep outputs this:
  egrep: warning: egrep is obsolescent; using grep -E

pkg_rolling-replace (via egrep) printed many of those, making the output
unreadable.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/pkgtools/pkg_rolling-replace/Makefile
cvs rdiff -u -r1.47 -r1.48 \
    pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh

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

Modified files:

Index: pkgsrc/pkgtools/pkg_rolling-replace/Makefile
diff -u pkgsrc/pkgtools/pkg_rolling-replace/Makefile:1.52 pkgsrc/pkgtools/pkg_rolling-replace/Makefile:1.53
--- pkgsrc/pkgtools/pkg_rolling-replace/Makefile:1.52   Sat Jun  3 11:54:23 2023
+++ pkgsrc/pkgtools/pkg_rolling-replace/Makefile        Sun Apr 20 22:35:47 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2023/06/03 11:54:23 gdt Exp $
+# $NetBSD: Makefile,v 1.53 2025/04/20 22:35:47 js Exp $
 
-PKGNAME=       pkg_rolling-replace-0.24.14
+PKGNAME=       pkg_rolling-replace-0.24.15
 CATEGORIES=    pkgtools
 
 MAINTAINER=    gdt%NetBSD.org@localhost

Index: pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
diff -u pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.47 pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.48
--- pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.47       Wed Jan  3 12:35:22 2024
+++ pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh    Sun Apr 20 22:35:47 2025
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $NetBSD: pkg_rolling-replace.sh,v 1.47 2024/01/03 12:35:22 gdt Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.48 2025/04/20 22:35:47 js Exp $
 #<license>
 # Copyright (c) 2006 BBN Technologies Corp.  All rights reserved.
 #
@@ -154,13 +154,13 @@ check_packages_mismatched()
 {
     warned_once=""
 
-    ${PKG_CHK} -u -q $opt_B | egrep -v missing | while read line; do
+    ${PKG_CHK} -u -q $opt_B | grep -E -v missing | while read line; do
         # duplicate output of pkg_chk to stderr (bypass $(...) or `...`)
         echo "${OPC} $line" 1>&2
        # Look for the first thing that looks like pkg-version rather
        # than category/pkg and remove the version.
         for word in $line; do
-            if [ "$(echo $word | egrep '^[^/]+-[0-9][^-/]*$')" ]; then
+            if [ "$(echo $word | grep -E '^[^/]+-[0-9][^-/]*$')" ]; then
                if [ -z "$opt_F" ]; then
                    ${PKG_ADMIN} set mismatch=YES "$word" >/dev/null 2>&1 || {
                        if [ -z "$warned_once" ]; then
@@ -184,7 +184,7 @@ check_packages_w_flag()
     _flag=$1; shift
     for pkgver in $(${PKG_INFO} -e '*'); do
         if ${PKG_INFO} -Bq $pkgver \
-                | egrep "^$_flag=[Yy][Ee][Ss]" > /dev/null; then
+                | grep -E "^$_flag=[Yy][Ee][Ss]" > /dev/null; then
             echo $pkgver | sed 's/-[0-9][^-]*$//'
         fi
     done