diff options
| author | seb <seb> | 2004-02-16 11:28:13 +0000 |
|---|---|---|
| committer | seb <seb> | 2004-02-16 11:28:13 +0000 |
| commit | ffff6963e8726ce4dbbdd6cf932097b416870216 (patch) | |
| tree | 036e28bee0d45cdfd0224d1a936004e57a8f73f0 /mk | |
| parent | dd14b578a6227a98f34e2d794f86fb3503492e22 (diff) | |
| download | pkgsrc-ffff6963e8726ce4dbbdd6cf932097b416870216.tar.gz | |
Quote '+' in awk regexp related to PLIST and INFO_FILES.
As seen in devel/libg++ with its libg++.info file...
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 5793363acad..218d5a6ef1a 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1405 2004/02/14 18:29:17 seb Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1406 2004/02/16 11:28:13 seb Exp $ # # This file is in the public domain. # @@ -4565,7 +4565,7 @@ _PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^${INFO_DIR:S|/|\\/|g}\/dir$$/) .endif .if !empty(INFO_FILES) . for _f_ in ${INFO_FILES} -_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^${INFO_DIR:S|/|\\/|g}\/${_f_}(-[0-9]+)?$$/) +_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^${INFO_DIR:S|/|\\/|g}\/${_f_:S|+|\+|g}(-[0-9]+)?$$/) . endfor .endif @@ -5018,7 +5018,7 @@ BEGIN { \ sub("^", "${LS} '\''${PREFIX}/${INFO_DIR}/", cmd); \ sub("$$", "'\''*", cmd); \ while ((cmd | getline l) > 0) { \ - if (match(l, ".*/${_f_}(-[0-9]+)?$$")) { \ + if (match(l, ".*/${_f_:S|+|\\\+|g}(-[0-9]+)?$$")) { \ sub("^${PREFIX}/", "", l); \ print l; \ } \ |