Import of pkgsrc-2016Q3

mk/scripts/genreadme.awk

@@ -1,7 +1,7 @@
 #!/usr/bin/awk -f
-# $NetBSD: genreadme.awk,v 1.35 2013/05/09 23:37:27 riastradh Exp $
+# $NetBSD: genreadme.awk,v 1.37 2016/07/07 12:01:22 wiz Exp $
 #
-# Copyright (c) 2002, 2003, 2005, 2006 The NetBSD Foundation, Inc.
+# Copyright (c) 2002, 2003, 2005, 2006, 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
 # This code is derived from software contributed to The NetBSD Foundation
@@ -165,6 +165,15 @@ BEGIN {
 	next;
 }
 
+/^htmloptions / {
+	htmloptions = $3;
+	for (i = 4; i <= NF; i++){
+		htmloptions = htmloptions " " $i;
+	}
+	options[$2] = htmloptions;
+	next;
+}
+
 /^index / {
 #
 # read lines like:
@@ -395,6 +404,7 @@ END {
 				gsub(/%%VULNERABILITIES%%/, ""vul"");
 				gsub(/%%VULDATE%%/, ""vuldate"");
 				gsub(/%%RUN_DEPENDS%%/, ""rundeps"");
+				gsub(/%%OPTIONS%%/, ""options[toppkg]"");
 
 				line = $0;
 
@@ -458,7 +468,9 @@ END {
 			gsub(/^[ \t]*SUBDIR.*=[ \t]*/, "", category);
 			catdir = PKGSRCDIR"/"category;
 			readmenew = catdir"/"readme_name;
-			printf("Category = %s\n", category);
+			if (quiet != "yes") {
+				printf("Category = %s\n", category);
+			}
 			cat_make = catdir"/Makefile";
 			pkgs = "";
 			pkgs_file = TMPDIR "/pkgs_file";