diff options
| author | jlam <jlam@pkgsrc.org> | 2006-03-14 23:16:01 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-03-14 23:16:01 +0000 |
| commit | 56082f039baf38ecdb2df0d68d3b3c3d610a8771 (patch) | |
| tree | 121295b494e4060a5a72cd63ccf53de2a9b6124d /mk | |
| parent | 8488223b82349cec60608cbbc698047c0b42dab4 (diff) | |
| download | pkgsrc-56082f039baf38ecdb2df0d68d3b3c3d610a8771.tar.gz | |
Properly rename "info" to ${INFO_DIR} in any @dirrm statements. Also
add a guard so that we don't re-expand any "info" in ${INFO_DIR} again.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/plist/plist-info.awk | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/mk/plist/plist-info.awk b/mk/plist/plist-info.awk index 2d54549629d..f6c4c593b0c 100644 --- a/mk/plist/plist-info.awk +++ b/mk/plist/plist-info.awk @@ -1,4 +1,4 @@ -# $NetBSD: plist-info.awk,v 1.8 2006/03/14 17:14:47 jlam Exp $ +# $NetBSD: plist-info.awk,v 1.9 2006/03/14 23:16:01 jlam Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -65,13 +65,13 @@ BEGIN { IGNORE_INFO_REGEXP = ENVIRON["IGNORE_INFO_PATH"] ? ENVIRON["IGNORE_INFO_PATH"] : "" gsub(":", "|", IGNORE_INFO_REGEXP) - IGNORE_INFO_REGEXP = "^(" IGNORE_INFO_REGEXP ")/" + IGNORE_INFO_REGEXP = "(" IGNORE_INFO_REGEXP ")" } ### ### Canonicalize info page entries by stripping any ".gz" suffixes. ### -/^[^@]/ && ($0 !~ IGNORE_INFO_REGEXP) && \ +/^[^@]/ && ($0 !~ "^" IGNORE_INFO_REGEXP "/") && \ /^([^\/]*\/)*info\/[^\/]*(\.info)?-[0-9]+\.gz$/ { sub("\\.gz$", "") } @@ -80,7 +80,7 @@ BEGIN { ### Ignore *-1, *-2, etc. files in the PLIST as we get the list of ### installed split files below. ### -/^[^@]/ && ($0 !~ IGNORE_INFO_REGEXP) && \ +/^[^@]/ && ($0 !~ "^" IGNORE_INFO_REGEXP "/") && \ /^([^\/]*\/)*info\/[^\/]*(\.info)?-[0-9]+$/ { next } @@ -88,7 +88,8 @@ BEGIN { ### ### Convert info/ to ${INFO_DIR}/ for all info page entries. ### -/^[^@]/ && ($0 !~ IGNORE_INFO_REGEXP) && \ +/^[^@]/ && ($0 !~ "^" IGNORE_INFO_REGEXP "/") && \ +($0 !~ "^([^\/]*\/)*" INFO_DIR "\/[^\/]*(\.info)?$") && \ /^([^\/]*\/)*info\/[^\/]*(\.info)?$/ { if ($0 ~ "^info/") { sub("^info/", INFO_DIR "/") @@ -96,12 +97,17 @@ BEGIN { sub("/info/", "/" INFO_DIR "/") } } +($0 !~ "^@dirrm " IGNORE_INFO_REGEXP "$") && \ +($0 !~ "^@dirrm " INFO_DIR "$") && \ +/^@dirrm ([^\/]*\/)*info$/ { + sub("info$", INFO_DIR) +} ### ### For each info page entry, print all of the installed info sub-pages ### associated with that entry. ### -/^[^@]/ && ($0 !~ IGNORE_INFO_REGEXP) && \ +/^[^@]/ && ($0 !~ "^" IGNORE_INFO_REGEXP "/") && \ ($0 ~ "^([^\/]*\/)*" INFO_DIR "\/[^\/]*(\.info)?$") { cmd = TEST " -f " PREFIX "/" $0 " -o -f " PREFIX "/" $0 ".gz" if (system(cmd) == 0) { |