From 98d45c8b05de4ef04cea3454fdfe097c42c2620b Mon Sep 17 00:00:00 2001 From: abs Date: Sun, 9 May 2004 17:56:17 +0000 Subject: Update pkg_chk to 1.48 Fix awk usage for nawk in 2.0 --- pkgtools/pkg_chk/Makefile | 4 ++-- pkgtools/pkg_chk/files/pkg_chk.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgtools/pkg_chk') diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile index 19a6359c62b..c889a22a737 100644 --- a/pkgtools/pkg_chk/Makefile +++ b/pkgtools/pkg_chk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2004/04/13 14:36:23 abs Exp $ +# $NetBSD: Makefile,v 1.5 2004/05/09 17:56:17 abs Exp $ -DISTNAME= pkg_chk-1.47 +DISTNAME= pkg_chk-1.48 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh index 308a73e4f4e..9998f9d20de 100755 --- a/pkgtools/pkg_chk/files/pkg_chk.sh +++ b/pkgtools/pkg_chk/files/pkg_chk.sh @@ -1,6 +1,6 @@ #!@SH@ -e # -# $Id: pkg_chk.sh,v 1.4 2004/04/13 14:36:23 abs Exp $ +# $Id: pkg_chk.sh,v 1.5 2004/05/09 17:56:17 abs Exp $ # # TODO: Handle updates with dependencies via binary packages @@ -473,7 +473,7 @@ if [ -n "$opt_c" -o -n "$opt_l" ];then taglist["*"] = "*" } function and_expr_with_dict(expr, dict, ary, i, r) { - split(expr,ary,/\\+/); + split(expr,ary,/\+/); r = 1; for (i in ary) if (! (ary[i] in dict)) @@ -487,7 +487,7 @@ if [ -n "$opt_c" -o -n "$opt_l" ];then need = 0; for (f = 1 ; f<=NF ; ++f) { # For each word on the line if (sub("^-", "", $f)) { # If it begins with a '-' - if ($f ~ /\\+/) { # If it is a ANDed tag expression + if ($f ~ /\+/) { # If it is a ANDed tag expression if (and_expr_with_dict($f, taglist)) next; # If it is true, discard } else { # If it is a simple tag @@ -495,7 +495,7 @@ if [ -n "$opt_c" -o -n "$opt_l" ];then next; } } else { - if ($f ~ /\\+/) { # If it is a ANDed tag expression + if ($f ~ /\+/) { # If it is a ANDed tag expression if (and_expr_with_dict($f, taglist)) need = 1; # If it is true, note needed } else { # If it is a simple tag -- cgit v1.2.3