[BUG FIX] As of OS version 13, the specification change of grep(1) caused "empty...

[portsreinstall/current.git] / lib / libpkgsys.sh

diff --git a/lib/libpkgsys.sh b/lib/libpkgsys.sh
index 5f4f2ec..8474c8a 100644 (file)
--- a/lib/libpkgsys.sh
+++ b/lib/libpkgsys.sh
@@ -125,7 +125,7 @@ pkgsys_is_necessary_pkgtool ()
 # ============= Get the extended regular expression pattern of ports for pkg(8) =============
 pkgsys_pkgtools_ports_filter_regexp ()
 {
-       echo '^ports-mgmt/(pkg|pkg-devel)(|@.*)$'
+       echo '^ports-mgmt/(pkg|pkg-devel|pkg@.*|pkg-devel@.*)$'
 }
 
 # ============= Get the extended regular expression pattern of package names for pkg(8) =============
@@ -761,7 +761,7 @@ pkgsys_def_pkgtools ()
                                | env LANG=C grep -m 1 '^pkg-[0-9]'` || :
                        [ -n "$pkgname" ] && pkg_inst_remote_wild "$pkgname" && return
                        message_echo "INFO: Failed by package, so installing pkgng by port."
-                       env LANG=C grep -Ev '^[[:space:]]*WITH_PKG(|NG)=' /etc/make.conf > ${TMPDIR}/make.conf 2> /dev/null || :
+                       env LANG=C grep -Ev '^[[:space:]]*(WITH_PKG|WITH_PKGNG)=' /etc/make.conf > ${TMPDIR}/make.conf 2> /dev/null || :
                        echo WITHOUT_PKG=yes >> ${TMPDIR}/make.conf
                        echo WITHOUT_PKGNG=yes >> ${TMPDIR}/make.conf
                        dev_out=/dev/stdout
@@ -1349,11 +1349,11 @@ pkgsys_eval_ports_glob ()
                                        fi
                                done
                        fi
-                       glob_regexp_allflavors=`echo "$glob_regexp" | sed 's/$$/(|@.*)$/'`
+                       glob_regexp_allflavors=`echo "$glob_regexp" | sed 's/$$/@.*$/'`
                        {
                                pkg_info_all_flavored_origins
                                cut -f 2 "${DBDIR}/installed_ports:pkg_vs_origin.tbl" 2> /dev/null
-                       } | env LANG=C grep -E "$glob_regexp_allflavors" 2>&1 || :
+                       } | env LANG=C grep -E -e "$glob_regexp" -e "$glob_regexp_allflavors" 2>&1 || :
                else
                        if expr "$glob" : '[a-z][a-zA-Z0-9_.+-]*[a-zA-Z0-9_.+]$' > /dev/null 2>&1 && \
                                [ `expr "$glob" : '.*-[0-9]' 2>&1` -eq 0 ]
@@ -1541,7 +1541,7 @@ pkgsys_eval_ports_glob_even_if_nonexistent ()
        glob_pattern=$1
        {
                pkgsys_eval_ports_glob "$glob_pattern" 2> /dev/null || :
-               echo "$glob_pattern" | env LANG=C grep -E '^[a-z]+/[a-zA-Z0-9_.+-]+(|@[a-zA-Z0-9_.+-]+)$' || :
+               echo "$glob_pattern" | env LANG=C grep -E '^[a-z]+/([a-zA-Z0-9_.+-]+|[a-zA-Z0-9_.+-]+@[a-zA-Z0-9_.+-]+)$' || :
        } | env LANG=C grep -v -e '^$' | sort -u
 }