diff options
| author | seb <seb@pkgsrc.org> | 2004-02-16 13:21:34 +0000 |
|---|---|---|
| committer | seb <seb@pkgsrc.org> | 2004-02-16 13:21:34 +0000 |
| commit | 28ddfa550feaa62089e348cf2705df02e5a375d7 (patch) | |
| tree | f9b99e0555d913fc62c276b0fb1b7583663f7ba6 /mk | |
| parent | 5fe14087be9d19c3ba4ecda81915335dcc926563 (diff) | |
| download | pkgsrc-28ddfa550feaa62089e348cf2705df02e5a375d7.tar.gz | |
Handle compressed info files in PLIST handling.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 218d5a6ef1a..917e752529b 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1406 2004/02/16 11:28:13 seb Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1407 2004/02/16 13:21:34 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_:S|+|\+|g}(-[0-9]+)?$$/) +_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^${INFO_DIR:S|/|\\/|g}\/${_f_:S|+|\+|g}(-[0-9]+)?(\.gz)?$$/) . endfor .endif @@ -4999,7 +4999,8 @@ _PLIST_AWK_IMAKE_MAN= \ } # plist awk pattern-action statement to handle info files: -# generate list of files matching ${PREFIX}/${INFO_DIR}/filename(-[0-9]+)? +# generate list of files matching +# ${PREFIX}/${INFO_DIR}/filename(-[0-9]+)?(.gz)? # for `filename' being each word of INFO_FILES in turn. # Notes: # - first the filenames matching ${PREFIX}/${INFO_DIR}/filename* @@ -5018,7 +5019,7 @@ BEGIN { \ sub("^", "${LS} '\''${PREFIX}/${INFO_DIR}/", cmd); \ sub("$$", "'\''*", cmd); \ while ((cmd | getline l) > 0) { \ - if (match(l, ".*/${_f_:S|+|\\\+|g}(-[0-9]+)?$$")) { \ + if (match(l, ".*/${_f_:S|+|\\\+|g}(-[0-9]+)?(\\.gz)?$$")) { \ sub("^${PREFIX}/", "", l); \ print l; \ } \ |