[pkgsrc/pkgsrc-2006Q1]: pkgsrc/mk/plist Pullup ticket 1375 - requested by jlam

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d7cf189223ac
branches:  pkgsrc-2006Q1
changeset: 510206:d7cf189223ac
user:      salo <salo%pkgsrc.org@localhost>
date:      Fri Apr 14 14:38:49 2006 +0000

description:
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.

diffstat:

 mk/plist/plist-info.awk |  15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 467920d63c8f -r d7cf189223ac mk/plist/plist-info.awk
--- a/mk/plist/plist-info.awk   Thu Apr 13 16:32:04 2006 +0000
+++ b/mk/plist/plist-info.awk   Fri Apr 14 14:38:49 2006 +0000
@@ -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 @@
        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 @@
                        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
 }