diff options
| author | jperkin <jperkin> | 2016-04-11 12:29:53 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2016-04-11 12:29:53 +0000 |
| commit | 6f5a0f4aa02c69ca0b6c091a70344ad4f17299e6 (patch) | |
| tree | c815fe35d4aeba67239cb11d9d0e97b6fc93dd7e /mk/plist | |
| parent | cd83c19aa147ac8ce4fb259f8181fcb30f400838 (diff) | |
| download | pkgsrc-6f5a0f4aa02c69ca0b6c091a70344ad4f17299e6.tar.gz | |
Re-arrange parsing order to fix various combinations of PKGMANDIR, MANZ,
and MKCATPAGES.
Diffstat (limited to 'mk/plist')
| -rw-r--r-- | mk/plist/plist-man.awk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mk/plist/plist-man.awk b/mk/plist/plist-man.awk index ccd61fd7c5a..8dcd366bb6b 100644 --- a/mk/plist/plist-man.awk +++ b/mk/plist/plist-man.awk @@ -1,4 +1,4 @@ -# $NetBSD: plist-man.awk,v 1.10 2015/10/07 09:56:14 jperkin Exp $ +# $NetBSD: plist-man.awk,v 1.11 2016/04/11 12:29:53 jperkin Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -129,11 +129,12 @@ BEGIN { } ### -### Append ".gz" to the end of man page entries if compressed pages are -### requested. +### Fixup catman entries to use section suffixes if required. ### -(MANZ ~ /[yY][eE][sS]/) && /^[^@]/ && $0 ~ "^([^/]*/)+" CATORMAN_REGEX "$" { - $0 = $0 ".gz" +(CATMAN_SECTION_SUFFIX ~ /[yY][eE][sS]/)&& /^[^@]/ && $0 ~ "^man/([^/]*/)?" CATPAGE_REGEX { + n = split($0, components, "/") + sub("^cat", "", components[n-1]) + sub("0$", components[n-1], $0) } ### @@ -144,10 +145,9 @@ BEGIN { } ### -### Fixup catman entries to use section suffixes if required. +### Append ".gz" to the end of man page entries if compressed pages are +### requested. ### -(CATMAN_SECTION_SUFFIX ~ /[yY][eE][sS]/)&& /^[^@]/ && $0 ~ "^man/([^/]*/)?" CATPAGE_REGEX { - n = split($0, components, "/") - sub("^cat", "", components[n-1]) - sub("0$", components[n-1], $0) +(MANZ ~ /[yY][eE][sS]/) && /^[^@]/ && $0 ~ "^([^/]*/)+" CATORMAN_REGEX "$" { + $0 = $0 ".gz" } |