pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Handle compressed info files in PLIST handling.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8cd4d51901ed
branches:  trunk
changeset: 468727:8cd4d51901ed
user:      seb <seb%pkgsrc.org@localhost>
date:      Mon Feb 16 13:21:34 2004 +0000

description:
Handle compressed info files in PLIST handling.

diffstat:

 mk/bsd.pkg.mk |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r c404e7a5281d -r 8cd4d51901ed mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Mon Feb 16 12:53:30 2004 +0000
+++ b/mk/bsd.pkg.mk     Mon Feb 16 13:21:34 2004 +0000
@@ -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 @@
 .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 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 @@
        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;                                        \
                }                                                       \



Home | Main Index | Thread Index | Old Index