CVS commit: pkgsrc/mk/scripts

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Feb 22 04:19:00 UTC 2021

Modified Files:
        pkgsrc/mk/scripts: genreadme.awk htmloptions.awk

Log Message:
genreadme: Fix printing of package options where there's more than one


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/mk/scripts/genreadme.awk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mk/scripts/htmloptions.awk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/scripts/genreadme.awk
diff -u pkgsrc/mk/scripts/genreadme.awk:1.41 pkgsrc/mk/scripts/genreadme.awk:1.42
--- pkgsrc/mk/scripts/genreadme.awk:1.41        Sun Feb 21 09:45:01 2021
+++ pkgsrc/mk/scripts/genreadme.awk     Mon Feb 22 04:19:00 2021
@@ -1,7 +1,7 @@
 #!/usr/bin/awk -f
-# $NetBSD: genreadme.awk,v 1.41 2021/02/21 09:45:01 nia Exp $
+# $NetBSD: genreadme.awk,v 1.42 2021/02/22 04:19:00 nia Exp $
 #
-# Copyright (c) 2002, 2003, 2005, 2006, 2015 The NetBSD Foundation, Inc.
+# Copyright (c) 2002-2021 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
 # This code is derived from software contributed to The NetBSD Foundation
@@ -37,11 +37,10 @@
 #
 # topdepends[]  : index=pkgdir (math/scilab)
 #                 List of explicitly listed depencencies by name.
+#                 I.e.  "xless-[0-9]* pvm-3.4.3"
 #
 # topbuilddepends[]  : index=pkgdir (math/scilab)
 #                 List of explicitly listed depencencies by name.
-#                 I.e.  "xless-[0-9]* pvm-3.4.3"
-#                 I.e.  "xless-[0-9]* pvm-3.4.3"
 #
 BEGIN {
        do_pkg_readme=1;
@@ -161,9 +160,12 @@ BEGIN {
 
 /^htmloptions / {
        htmloptions = $3;
+       origfs = FS;
+       FS = "\t";
        for (i = 4; i <= NF; i++){
                htmloptions = htmloptions " " $i;
        }
+       FS = origfs;
        options[$2] = htmloptions;
        next;
 }

Index: pkgsrc/mk/scripts/htmloptions.awk
diff -u pkgsrc/mk/scripts/htmloptions.awk:1.3 pkgsrc/mk/scripts/htmloptions.awk:1.4
--- pkgsrc/mk/scripts/htmloptions.awk:1.3       Sun May 10 07:48:10 2020
+++ pkgsrc/mk/scripts/htmloptions.awk   Mon Feb 22 04:19:00 2021
@@ -1,5 +1,5 @@
 #!/usr/bin/awk -f
-# $NetBSD: htmloptions.awk,v 1.3 2020/05/10 07:48:10 rillig Exp $
+# $NetBSD: htmloptions.awk,v 1.4 2021/02/22 04:19:00 nia Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -32,7 +32,7 @@ BEGIN {
 
 /^\t/ {
        o++;
-       printf "<dt>%s</dt><dd>%s</dd>\n", escape_html($2), escape_html($3);
+       printf "<dt>%s</dt><dd>%s</dd>\t", escape_html($2), escape_html($3);
 }
 
 /^These options are/ {