 @@ -1,15 +1,15 @@
 #!/usr/bin/awk -f
-# $NetBSD: genreadme.awk,v 1.45 2021/02/22 05:32:02 nia Exp $
+# $NetBSD: genreadme.awk,v 1.46 2021/02/22 09:32:55 nia Exp $
+#
 # Copyright (c) 2002-2021 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Dan McMahill.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -191,30 +191,26 @@ BEGIN {
 	pkgdir2name[$2] = $3;
 	next;
+}
 /^license /{
 	license[$2] = $3;
 	next;
+}
 /^wildcard /{
 	wildcard[$2] = $3;
+}
 # Now recurse the tree to give a flattened depends list for each pkg
 END {
 	readme = TMPDIR "/" readme_name;
 	printf("Making sure binary package cache file is up to date...\n");
 	if ( quiet == "yes" ){
 		cmd = sprintf("%s AWK=%s CMP=%s FIND=%s GREP=%s GZIP_CMD=\"%s\" PKG_INFO=\"%s\" PKG_SUFX=%s SED=%s SORT=%s %s/mk/scripts/binpkg-cache %s --packages %s",
 		SETENV, AWK, CMP, FIND, GREP, GZIP_CMD, PKG_INFO, PKG_SUFX, SED, SORT, PKGSRCDIR, summary, PACKAGES);
 	} else {
 		cmd = sprintf("%s AWK=%s CMP=%s FIND=%s GREP=%s GZIP_CMD=\"%s\" PKG_INFO=\"%s\" PKG_SUFX=%s SED=%s SORT=%s %s/mk/scripts/binpkg-cache %s --packages %s --verbose",
 		SETENV, AWK, CMP, FIND, GREP, GZIP_CMD, PKG_INFO, PKG_SUFX, SED, SORT, PKGSRCDIR, summary, PACKAGES);
+	}
 	if (debug) printf("\nExecute:  %s\n",cmd);
 	rc = system(cmd);
 @@ -232,29 +228,29 @@ END {
 	  printf("* List of binary packages will not be generated\n") > "/dev/stderr";
 	  printf("**** ------- ****\n") > "/dev/stderr";
 	} else {
 		printf("Loading binary package cache file...\n");
 		load_cache_file( PACKAGES "/.pkgcache" );
        	 if(pkg_count["unknown"] > 0 ) {
 			printf("    Loaded %d binary packages with unknown PKGPATH\n", pkg_count["unknown"]);
+		}
+	}
 # extract date for vulnerabilities file
 	if (SCAN_VULNERABILITIES == 0)
-		vuldate="<TR><TD><I>(no vulnerabilities list, update pkg_install)</I>";
+		vuldate="<li><em>(no vulnerabilities list, update pkg_install)</em></li>";
 	else if (SCAN_VULNERABILITIES == 1)
-		vuldate="<TR><TD><I>(no vulnerabilities list available)</I>";
+		vuldate="<li><em>(no vulnerabilities list available)</em></li>";
 	if (SINGLEPKG != "" ) {
 		printf("Only creating README for %s\n",SINGLEPKG);
 		for( key in depends ) {
 			delete depends[key];
+		}
 		depends[SINGLEPKG] = "yes";
+	}
 	printf("Generating README.html files\n");
 	pkgcnt = 0;
 	if (do_pkg_readme) {
 		templatefile = PKGSRCDIR "/templates/README.pkg";
 @@ -282,33 +278,33 @@ END {
 			if (SCAN_VULNERABILITIES == 2) {
 				pkgbase = pkgdir2name[toppkg];
 				sub("-[^-]*$", "", pkgbase);
 				cmd = sprintf("%s audit-history %s", PKG_ADMIN, pkgbase);
 				while (cmd | getline vuln_entry) {
 					split(vuln_entry, entry, " ");
 					status_cmd = sprintf("if %s pmatch '%s' %s; then echo open; else echo fixed; fi",
 					    PKG_ADMIN, entry[1], pkgdir2name[toppkg]);
 					status_cmd | getline status
 					close(status_cmd)
 					if (status == "fixed")
 						continue
 					status = "a " status;
-					vul =  sprintf("%s<LI>%s <a href=\"%s\">%s</a> vulnerability</LI>\n",
+					vul =  sprintf("%s<li>%s <a href=\"%s\">%s</a> vulnerability</li>\n",
 					  vul, status, entry[3], entry[2]);
+				}
 				close(cmd);
 				if ( vul == "" ) {
-					vul="<I>(no vulnerabilities known)</I>";
+					vul="<em>(no vulnerabilities known)</em>";
+				}
+			}
 			if (debug) {
 			  printf("Checking for binary package with lookup_cache( %s)\n",
 				 toppkg);
+			}
 # lookup_cache( wildcard ) will produce HTML for the packages which are found
 			lookup_cache( toppkg );
 			while((getline < templatefile) > 0){
 				gsub(/%%PORT%%/, toppkg);
 				gsub(/%%PKG%%/, pkgdir2name[toppkg]);
 @@ -390,99 +386,79 @@ END {
 	tot_numpkg = 0;
 	top_make = PKGSRCDIR"/Makefile";
 	while((getline < top_make) > 0){
 		if ($0 ~ /^[ \t]*SUBDIR.*=[^\$]*$/) {
 			category = $0;
 			gsub(/^[ \t]*SUBDIR.*=[ \t]*/, "", category);
 			catdir = PKGSRCDIR"/"category;
 			readmenew = catdir"/"readme_name;
 			if (quiet != "yes") {
 				printf("Category = %s\n", category);
+			}
 			cat_make = catdir"/Makefile";
 			pkgs = "";
 			pkgs_file = TMPDIR "/pkgs_file";
 			printf("") > pkgs_file;
 			numpkg = 0;
 			print "" > readme;
 			while((getline < cat_make) > 0){
 				if ($0 ~ /^[ \t]*SUBDIR.*=[^\$]*$/) {
 					pkg = $0;
 					gsub(/^[ \t]*SUBDIR.*=[ \t]*/, "",
 					     pkg);
 					dir = category"/"pkg;
 					numpkg++;
 					tot_numpkg++;
 					if (debug) {
 					  printf("\tAdding %s (%s : %s)\n",
 						 dir,
 						 pkgdir2name[dir],
 						 comment[dir]);
+					}
-#					pkgs =  sprintf("%s<TR><TD VALIGN=TOP><a href=\"%s/%s\">%s</a>: %s<TD>\n",
+					pkgs = sprintf("%s<dt><a href=\"%s/%s\">%s</a></dt><dd>%s</dd>\n",
-#							pkgs, pkg, readme_name,
+					    pkgs,
-#							pkgdir2name[dir],
+					    pkg, readme_name,
-#							comment[dir]);
+					    pkgdir2name[dir],
-# We use a temp file to hold the list of all packages because
+					    comment[dir]);
-# this list can get very very large and
+					allpkg[tot_numpkg] = sprintf("<!-- %s (for sorting) --><tr><td><a href=\"%s/%s/%s\">%s</a></td><td><a href=\"%s/%s\">%s</a></td><td>%s</td>\n",
 # become larger than what some awk implementations can deal
 # with.  The nawk shipped with solaris 9 is an example of
 # such a limited awk.
 					printf("<TR><TD VALIGN=TOP><a href=\"%s/%s\">%s</a>: %s<TD>\n",
 							pkg, readme_name,
 							pkgdir2name[dir],
 							comment[dir]) >> pkgs_file;
 					allpkg[tot_numpkg] =  sprintf("<!-- %s (for sorting) --><TR VALIGN=TOP><TD><a href=\"%s/%s/%s\">%s</a>: <TD>(<a href=\"%s/%s\">%s</a>) <td>%s\n",
 								      pkgdir2name[dir],
 								      category, pkg,
 								      readme_name,
 								      pkgdir2name[dir],
 								      category,
 								      readme_name,
 								      category,
 								      comment[dir]);
 # we need slightly fewer escapes here since we are not gsub()-ing
 # allpkg[] into the output files but just printf()-ing it.
 					gsub(/\\&/, "\\&", allpkg[tot_numpkg]);
 				} else if ($0 ~ /^[ \t]*COMMENT/) {
 					descr = $0;
 					gsub(/^[ \t]*COMMENT.*=[ \t]*/, "",
 					     descr);
+				}
+			}
 			while ((getline < templatefile) > 0){
 				gsub(/%%CATEGORY%%/, category);
 				gsub(/%%NUMITEMS%%/, numpkg);
 				gsub(/%%DESCR%%/, descr);
 				gsub(/%%SUBDIR%%/, ""pkgs"");
-				line = $0
+				print $0 >> readme;
 				if( $0 ~/%%SUBDIR%%/ ) {
 				    gsub(/%%SUBDIR%%/, "", line);
 				    while((getline < pkgs_file) > 0) {
 				      gsub(/README.html/, readme_name);
 				      print >> readme;
 				    close( pkgs_file );
 				print line >> readme;
+			}
 			close(readme);
 			close(templatefile);
 			copy_readme(readmenew, readme);
 			gsub(/href=\"/, "href=\""category"/", pkgs);
-			allcat = sprintf("%s<TR><TD VALIGN=TOP><a href=\"%s/%s\">%s</a>: %s<TD>\n",
+			allcat = sprintf("%s<dt><a href=\"%s/%s\">%s</a></dt><dd>%s</dd>\n",
 					 allcat, category, readme_name,
 					 category, descr);
 			close(cat_make);
+		}
+	}
 	close(top_make);
 	printf("Generating toplevel readmes:\n");
 	templatefile = PKGSRCDIR "/templates/README.top";
 	fatal_check_file(templatefile);
 	readmenew = PKGSRCDIR "/"readme_name;
 	printf("\t%s\n", readmenew);
 	print "" > readme;
 @@ -546,27 +522,27 @@ function create_htmldeps(dependslist){
 		  printf("\tdpkg=%s, pat2dir[%s] = %s\n",
 			 dpkgs[i],
 			 dpkgs[i],
 			 pat2dir[dpkgs[i]]);
+		}
 		htmldeps = sprintf("%s<a href=\"../../%s/%s\">%s</a>\n",
 				 htmldeps,
 				 pat2dir[dpkgs[i]],
 				 readme_name,
 				 pat2dir[dpkgs[i]]);
 		i = i + 1;
+	}
 	if ( i == 1 ) {
-	  htmldeps = "<EM>none</EM>";
+	  htmldeps = "<em>(none)</em>";
+	}
 	return htmldeps;
+}
+#
 # take a string which has special characters like '+' in it and
 # escape them.  Also put a space before and after since that's how
 # we'll distinguish things like gnome from gnome-libs
+#
 function reg2str(reg){
 	gsub(/\./, "\\.", reg);
 	gsub(/\+/, "\\+", reg);
 	gsub(/\*/, "\\*", reg);
 @@ -740,25 +716,25 @@ function load_cache_file( file, pkgfile,
+  }
   # close the cache file
   close( file );
+}
 function lookup_cache( d, binpkgs) {
   if( debug ) printf("lookup_cache( %s ):  pkg_count = %d\n",
      d, pkg_count[d]);
   binpkgs_file = TMPDIR "/binpkgs";
   spipe = SORT " > " binpkgs_file;
   for(i=1 ; i<=pkg_count[d]; i=i+1) {
-    printf("<TR><TD>%s:<TD><a href=\"%s/%s\">%s</a><TD>(%s %s)\n",
+    printf("<tr><td>%s:<td><a href=\"%s/%s\">%s</a><td>(%s %s)\n",
       march_list[d, i], PKG_URL, pkgfile_list[d, i], pkgnm_list[d, i],
       opsys_list[d, i], osver_list[d, i]) | spipe;
+  }
   if( pkg_count[d] == 0 ) {
-	printf("<TR><TD><EM>none</EM></TD></TR>\n") | spipe;
+	printf("<tr><td><em>(none)</em></td></tr>\n") | spipe;
+  }
   close( spipe );
+}

 @@ -1,37 +1,36 @@
-<!-- $NetBSD: README.category,v 1.12 2021/02/22 05:10:18 nia Exp $ -->
+<!-- $NetBSD: README.category,v 1.13 2021/02/22 09:32:55 nia Exp $ -->
 <!doctype html>
 <html lang="en">
 <head>
 <meta charset="utf-8">
 <link href="../templates/main.css" rel="stylesheet">
-<title>The NetBSD Packages Collection: %%CATEGORY%%</title>
+<title>%%CATEGORY%% - The NetBSD Packages Collection</title>
 </head>
 <body>
 <a href="http://www.mckusick.com/beastie/mainpage/copyright.html">
 <img src="../templates/pkg-daemon.gif" alt="Daemon Power" id="logo">
 </a>
-<h1>The NetBSD Packages Collection: <i>%%CATEGORY%%</i></h1>
+<h1><em>%%CATEGORY%%</em> - The NetBSD Packages Collection</h1>
 <p>You are now in the directory "%%CATEGORY%%".
 <p>
 %%DESCR%%
 </p>
 <p>Here are the one-line descriptions for each of the
 %%NUMITEMS%%
-items in this directory:
+items in this directory:</p>
-<p><hr noshade>
+<hr noshade>
-<p><table>
+<dl>
 %%SUBDIR%%
-</table>
+</dl>
 <hr noshade>
+[
 <a href="../README.html"> Go to top of packages tree</a>
+|
 <a href="../README-all.html"> List all packages</a>
+]
 </body>
 </html>

 @@ -1,41 +1,41 @@
-<!-- $NetBSD: README.top,v 1.20 2021/02/21 10:19:53 nia Exp $ -->
+<!-- $NetBSD: README.top,v 1.21 2021/02/22 09:32:55 nia Exp $ -->
 <!doctype html>
 <html lang="en">
 <head>
 <meta charset="utf-8">
 <link href="templates/main.css" rel="stylesheet">
 <title>The NetBSD Packages Collection</title>
 </head>
 <body>
 <a href="http://www.mckusick.com/beastie/mainpage/copyright.html">
 <img src="templates/pkg-daemon.gif" alt="Daemon Power" id="logo">
 </a>
 <h1>The NetBSD Packages Collection</h1>
 <p>
 The packages collection is divided into categories of packages.
 A <a href="README-all.html">complete list of all packages</a>
 is also available.
 </p>
 <p>
 %%DESCR%%
 </p>
 <hr noshade>
-<table>
+<dl>
 %%SUBDIR%%
-</table>
+</dl>
 <hr noshade>
 Prebuilt binary packages can be installed using
 <a href="pkgtools/pkgin/README.html">pkgin</a> or pkg_add(8).
 For more information on how to build packages from pkgsrc, see the
 <a href="doc/pkgsrc.html">doc/pkgsrc.html</a> document.
 pkgsrc and binary packages for NetBSD are available on
 <a href="https://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/">the NetBSD mirrors</a>.
 </body>
 </html>