Received: by mail.netbsd.org (Postfix, from userid 605)
	id 293CD84D66; Mon,  8 Mar 2021 16:38:01 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 6596584CE2
	for <pkgsrc-changes@NetBSD.org>; Mon,  8 Mar 2021 16:38:00 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([IPv6:::1])
	by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025)
	with ESMTP id jfSRNmX1_j_r for <pkgsrc-changes@netbsd.org>;
	Mon,  8 Mar 2021 16:37:59 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984])
	by mail.netbsd.org (Postfix) with ESMTP id 86CC684CD9
	for <pkgsrc-changes@NetBSD.org>; Mon,  8 Mar 2021 16:37:59 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 7FDFDFA95; Mon,  8 Mar 2021 16:37:59 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_161522147917840"
MIME-Version: 1.0
Date: Mon, 8 Mar 2021 16:37:59 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
X-Mailer: log_accum
Message-Id: <20210308163759.7FDFDFA95@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: <pkgsrc-changes.NetBSD.org>
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_161522147917840
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Mon Mar  8 16:37:59 UTC 2021

Modified Files:
	pkgsrc/mk/scripts: genreadme.awk
	pkgsrc/templates: README.all README.category README.pkg README.top
	    main.css

Log Message:
genreadme: Reorganize information for clarity.

Move the navigation to the top and reword it slightly. This makes it
more immediately visible. I'm not sure if this justifies a "Skip to content"
button yet.

Give the binary package table headers.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/mk/scripts/genreadme.awk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/templates/README.all
cvs rdiff -u -r1.15 -r1.16 pkgsrc/templates/README.category
cvs rdiff -u -r1.37 -r1.38 pkgsrc/templates/README.pkg
cvs rdiff -u -r1.23 -r1.24 pkgsrc/templates/README.top
cvs rdiff -u -r1.5 -r1.6 pkgsrc/templates/main.css

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


--_----------=_161522147917840
Content-Disposition: inline
Content-Length: 7291
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mk/scripts/genreadme.awk
diff -u pkgsrc/mk/scripts/genreadme.awk:1.47 pkgsrc/mk/scripts/genreadme.awk:1.48
--- pkgsrc/mk/scripts/genreadme.awk:1.47	Wed Feb 24 08:16:32 2021
+++ pkgsrc/mk/scripts/genreadme.awk	Mon Mar  8 16:37:59 2021
@@ -1,5 +1,5 @@
 #!/usr/bin/awk -f
-# $NetBSD: genreadme.awk,v 1.47 2021/02/24 08:16:32 nia Exp $
+# $NetBSD: genreadme.awk,v 1.48 2021/03/08 16:37:59 nia Exp $
 #
 # Copyright (c) 2002-2021 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -724,9 +724,9 @@ function lookup_cache( d, binpkgs) {
   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",
-      march_list[d, i], PKG_URL, pkgfile_list[d, i], pkgnm_list[d, i],
-      opsys_list[d, i], osver_list[d, i]) | spipe;
+    printf("<tr><td>%s %s</td><td>%s</td><td><a href=\"%s/%s\">%s</a></td></tr>\n",
+      opsys_list[d, i], osver_list[d, i], march_list[d, i],
+      PKG_URL, pkgfile_list[d, i], pkgnm_list[d, i]) | spipe;
   }
   if( pkg_count[d] == 0 ) {
 	printf("<tr><td><em>(none)</em></td></tr>\n") | spipe;

Index: pkgsrc/templates/README.all
diff -u pkgsrc/templates/README.all:1.10 pkgsrc/templates/README.all:1.11
--- pkgsrc/templates/README.all:1.10	Wed Feb 24 08:16:32 2021
+++ pkgsrc/templates/README.all	Mon Mar  8 16:37:59 2021
@@ -1,4 +1,4 @@
-<!-- $NetBSD: README.all,v 1.10 2021/02/24 08:16:32 nia Exp $ -->
+<!-- $NetBSD: README.all,v 1.11 2021/03/08 16:37:59 nia Exp $ -->
 <!-- generated by pkgsrc/mk/scripts/mkreadme -->
 <!doctype html>
 <html lang="en">
@@ -14,6 +14,15 @@
 </a>
 <h1>The NetBSD Packages Collection</h1>
 
+<nav>
+<p>
+[
+<a href="README.html"> Go to top of packages tree</a>
+]
+</p>
+<p></p> <!-- spacing hack for older browsers -->
+</nav>
+
 <p>
 The following list contains all
 %%NPKGS%%
@@ -26,10 +35,5 @@ Please select an entry for more details!
 <dl>
 %%PKGS%%
 </dl>
-
-<hr>
-[
-<a href="README.html"> Go to top of packages tree</a>
-]
 </body>
 </html>

Index: pkgsrc/templates/README.category
diff -u pkgsrc/templates/README.category:1.15 pkgsrc/templates/README.category:1.16
--- pkgsrc/templates/README.category:1.15	Mon Feb 22 09:40:48 2021
+++ pkgsrc/templates/README.category	Mon Mar  8 16:37:59 2021
@@ -1,4 +1,4 @@
-<!-- $NetBSD: README.category,v 1.15 2021/02/22 09:40:48 nia Exp $ -->
+<!-- $NetBSD: README.category,v 1.16 2021/03/08 16:37:59 nia Exp $ -->
 <!-- generated by pkgsrc/mk/scripts/mkreadme -->
 <!doctype html>
 <html lang="en">
@@ -14,24 +14,28 @@
 </a>
 <h1><em>%%CATEGORY%%</em> - The NetBSD Packages Collection</h1>
 
+<nav>
+<p>
+[
+<a href="../README.html"> Back to list of categories</a>
+|
+<a href="../README-all.html"> List all packages</a>
+]
+</p>
+<p></p> <!-- spacing hack for older browsers -->
+</nav>
+
 <p>
 %%DESCR%%
 </p>
 
-<p>Here are the one-line descriptions for each of the
+<p>There are
 %%NUMITEMS%%
-items in this directory:</p>
+packages in this category:</p>
 
 <hr>
 <dl>
 %%SUBDIR%%
 </dl>
-
-<hr>
-[
-<a href="../README.html"> Go to top of packages tree</a>
-|
-<a href="../README-all.html"> List all packages</a>
-]
 </body>
 </html>

Index: pkgsrc/templates/README.pkg
diff -u pkgsrc/templates/README.pkg:1.37 pkgsrc/templates/README.pkg:1.38
--- pkgsrc/templates/README.pkg:1.37	Mon Feb 22 09:40:48 2021
+++ pkgsrc/templates/README.pkg	Mon Mar  8 16:37:59 2021
@@ -1,10 +1,12 @@
-<!-- $NetBSD: README.pkg,v 1.37 2021/02/22 09:40:48 nia Exp $ -->
+<!-- $NetBSD: README.pkg,v 1.38 2021/03/08 16:37:59 nia Exp $ -->
 <!-- generated by pkgsrc/mk/scripts/mkreadme -->
 <!doctype html>
 <html lang="en">
 <head>
 <meta charset="utf-8">
 <link href="../../templates/main.css" rel="stylesheet">
+<!-- make tables not look terrible on mobile... -->
+<meta name="viewport" content="width=device-width, initial-scale=1">
 <title>%%PORT%% - The NetBSD Packages Collection</title>
 </head>
 <body>
@@ -14,9 +16,22 @@
 </a>
 <h1><em>%%PORT%%</em> - The NetBSD Packages Collection</h1>
 
+<nav>
+<p>
+[
+<a href="../README.html"> Back to category</a>
+|
+<a href="../../README.html"> List of categories</a>
+|
+<a href="../../README-all.html"> List all packages</a>
+]
+</p>
+<p></p> <!-- spacing hack for older browsers -->
+</nav>
+
 <details open>
 <summary><em>%%COMMENT%%</em></summary>
-<p></p> <!-- spacing hack for older browsers with no details support -->
+<p></p> <!-- spacing hack for older browsers -->
 <pre>
 %%DESCR%%
 </pre>
@@ -44,14 +59,25 @@
 </section>
 
 <section>
-<h2>Available binary packages</h2>
+<h2>Binary packages</h2>
 <table>
+<thead>
+<tr>
+<th>OS</th><th>Architecture</th><th>Version</th>
+</tr>
+</thead>
+<tbody>
 %%BIN_PKGS%%
+</tbody>
 </table>
 
 <p>
-Binary packages can be installed with
-<a href="../../pkgtools/pkgin/README.html">pkgin</a> or pkg_add(1).
+Binary packages can be installed with the high-level tool
+<a href="../../pkgtools/pkgin/README.html">pkgin</a>
+(which can be installed with pkg_add)
+or
+<a href="//man.NetBSD.org/pkg_add.1">pkg_add(1)</a>
+(installed by default).
 
 The NetBSD packages collection is also designed to permit
             easy <a href="../../doc/pkgsrc.html">installation from source</a>.
@@ -87,13 +113,5 @@ and not every bug is exploitable with ev
 reported with
 <a href="http://www.NetBSD.org/support/send-pr.html">send-pr.</a></p>
 
-<hr>
-[
-<a href="../README.html"> Go up one level</a>
-|
-<a href="../../README.html"> Go to top of packages tree</a>
-|
-<a href="../../README-all.html"> List all packages</a>
-]
 </body>
 </html>

Index: pkgsrc/templates/README.top
diff -u pkgsrc/templates/README.top:1.23 pkgsrc/templates/README.top:1.24
--- pkgsrc/templates/README.top:1.23	Mon Feb 22 09:40:48 2021
+++ pkgsrc/templates/README.top	Mon Mar  8 16:37:59 2021
@@ -1,4 +1,4 @@
-<!-- $NetBSD: README.top,v 1.23 2021/02/22 09:40:48 nia Exp $ -->
+<!-- $NetBSD: README.top,v 1.24 2021/03/08 16:37:59 nia Exp $ -->
 <!-- generated by pkgsrc/mk/scripts/mkreadme -->
 <!doctype html>
 <html lang="en">
@@ -21,6 +21,12 @@ is also available.
 </p>
 
 <p>
+Prebuilt binary packages can be installed using the high level tool
+<a href="pkgtools/pkgin/README.html">pkgin</a> or the default
+<a href="//man.NetBSD.org/pkg_add.1">pkg_add(1)</a>.
+</p>
+
+<p>
 %%DESCR%%
 </p>
 
@@ -28,15 +34,6 @@ is also available.
 <dl>
 %%SUBDIR%%
 </dl>
-<hr>
-
-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>

Index: pkgsrc/templates/main.css
diff -u pkgsrc/templates/main.css:1.5 pkgsrc/templates/main.css:1.6
--- pkgsrc/templates/main.css:1.5	Mon Feb 22 09:43:58 2021
+++ pkgsrc/templates/main.css	Mon Mar  8 16:37:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: main.css,v 1.5 2021/02/22 09:43:58 nia Exp $ */
+/* $NetBSD: main.css,v 1.6 2021/03/08 16:37:59 nia Exp $ */
 
 body {
 	font-family: sans-serif;
@@ -63,3 +63,7 @@ hr {
 	border-top: 1px solid #aaa;
 	border-bottom: 1px solid #aaa;
 }
+
+nav {
+	margin-bottom: 1em;
+}


--_----------=_161522147917840--