diff options
| author | salo <salo> | 2006-04-14 14:38:49 +0000 |
|---|---|---|
| committer | salo <salo> | 2006-04-14 14:38:49 +0000 |
| commit | e10061f784479110eb06323d72c3144bede2edd0 (patch) | |
| tree | ee064d235c9667cfaa4d43a0a25a5888da7f0ef2 | |
| parent | 14d555c93c5040ed611263a15d388d81c59052c7 (diff) | |
| download | pkgsrc-e10061f784479110eb06323d72c3144bede2edd0.tar.gz | |
Pullup ticket 1375 - requested by jlam
bugfixes for the PLIST generation infrastructure
Revisions pulled up:
- pkgsrc/mk/plist/plist-info.awk 1.11, 1.12
Module Name: pkgsrc
Committed By: jlam
Date: Wed Apr 12 20:49:12 UTC 2006
Modified Files:
pkgsrc/mk/plist: plist-info.awk
Log Message:
If the info file doesn't exist on the disk, we should still output an
entry for it in the final PLIST. This allows us to locate info files
in the PLIST that aren't on the system during the CHECK_FILES stage.
---
Module Name: pkgsrc
Committed By: jlam
Date: Fri Apr 14 13:23:42 UTC 2006
Modified Files:
pkgsrc/mk/plist: plist-info.awk
Log Message:
Avoid () as a regular expression as the interpretation seems to be
implementation-defined by various awks.
| -rw-r--r-- | mk/plist/plist-info.awk | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/mk/plist/plist-info.awk b/mk/plist/plist-info.awk index bf298d62185..9b96aaa8de1 100644 --- a/mk/plist/plist-info.awk +++ b/mk/plist/plist-info.awk @@ -1,4 +1,4 @@ -# $NetBSD: plist-info.awk,v 1.10 2006/03/20 01:48:58 jlam Exp $ +# $NetBSD: plist-info.awk,v 1.10.2.1 2006/04/14 14:38:49 salo Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -64,8 +64,10 @@ BEGIN { TEST = ENVIRON["TEST"] ? ENVIRON["TEST"] : "test" IGNORE_INFO_REGEXP = ENVIRON["IGNORE_INFO_PATH"] ? ENVIRON["IGNORE_INFO_PATH"] : "" - gsub(":", "|", IGNORE_INFO_REGEXP) - IGNORE_INFO_REGEXP = "(" IGNORE_INFO_REGEXP ")" + if (IGNORE_INFO_REGEXP != "") { + gsub(":", "|", IGNORE_INFO_REGEXP) + IGNORE_INFO_REGEXP = "(" IGNORE_INFO_REGEXP ")" + } } ### @@ -121,6 +123,13 @@ BEGIN { print_entry($0) } close(cmd) + } else { + #if ((MANZ ~ /[yY][eE][sS]/) && ($0 !~ /\.gz$/)) { + # $0 = $0 ".gz" + #} else if ((MANZ !~ /[yY][eE][sS]/) && ($0 ~ /\.gz$/)) { + # sub("\\.gz$", "") + #} + print_entry($0) } next } |