pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/templates genreadme: Add DESCR to output. Make history...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1340bae60615
branches:  trunk
changeset: 447569:1340bae60615
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Feb 22 05:32:02 2021 +0000

description:
genreadme: Add DESCR to output. Make history useful for not-CVS-fans.

diffstat:

 mk/scripts/genreadme.awk |  12 +++++++++++-
 templates/README.pkg     |  22 +++++++++++++---------
 2 files changed, 24 insertions(+), 10 deletions(-)

diffs (69 lines):

diff -r 12089577df93 -r 1340bae60615 mk/scripts/genreadme.awk
--- a/mk/scripts/genreadme.awk  Mon Feb 22 05:10:18 2021 +0000
+++ b/mk/scripts/genreadme.awk  Mon Feb 22 05:32:02 2021 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/awk -f
-# $NetBSD: genreadme.awk,v 1.44 2021/02/22 05:10:18 nia Exp $
+# $NetBSD: genreadme.awk,v 1.45 2021/02/22 05:32:02 nia Exp $
 #
 # Copyright (c) 2002-2021 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -343,6 +343,16 @@
                                    close( binpkgs_file );
                                }
 
+                               descr_file = pkgdir "/DESCR"
+
+                               if( line ~/%%DESCR%%/ ) {
+                                   gsub(/%%DESCR%%/, "", line);
+                                   while((getline < descr_file ) > 0) {
+                                     print >> readme;
+                                   }
+                                   close( descr_file );
+                               }
+
                                print line >> readme;
                        }
                        close(readme);
diff -r 12089577df93 -r 1340bae60615 templates/README.pkg
--- a/templates/README.pkg      Mon Feb 22 05:10:18 2021 +0000
+++ b/templates/README.pkg      Mon Feb 22 05:32:02 2021 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: README.pkg,v 1.32 2021/02/22 05:10:18 nia Exp $ -->
+<!-- $NetBSD: README.pkg,v 1.33 2021/02/22 05:32:02 nia Exp $ -->
 <!doctype html>
 <html lang="en">
 <head>
@@ -13,20 +13,24 @@
 </a>
 <h1><em>%%PORT%%</em> - The NetBSD Packages Collection</h1>
 
-<p>
-<em>%%COMMENT%%</em>
-</p>
-
-<p>Please read the file <a href="DESCR">DESCR</a> for a
-longer description, or browse the package's
-<a href="http://cvsweb.NetBSD.org/bsdweb.cgi/pkgsrc/%%PORT%%/";>history</a>.
-</p>
+<details>
+<summary><em>%%COMMENT%%</em></summary>
+<div>
+<pre>
+%%DESCR%%
+</pre>
+</div>
+</details>
 
 <ul class="package-data">
 <li><strong>Source version:</strong> <samp>%%PKG%%</samp></li>
 <li><strong>Maintainer:</strong> <em>%%MAINTAINER%%</em></li>
 <li><strong>Website:</strong> %%HOMEPAGE%%</li>
 <li><strong>License:</strong> %%LICENSE%%</li>
+<li><strong>Package history:</strong>
+<a href="http://cvsweb.NetBSD.org/bsdweb.cgi/pkgsrc/%%PORT%%/";>cvs</a>,
+<a href="https://anonhg.NetBSD.org/pkgsrc/file/tip/%%PORT%%/";>hg</a>,
+<a href="https://github.com/NetBSD/pkgsrc/tree/trunk/%%PORT%%/";>git</a></li>
 </ul>
 
 <section>



Home | Main Index | Thread Index | Old Index