[commit-womb] gnumaint Makefile gm-generate.pl gnupackages.txt

[karl]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     karl <karl>     13/10/18 13:30:50

Modified files:
        .              : Makefile gm-generate.pl gnupackages.txt 

Log message:
        html tweaks

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/Makefile?cvsroot=womb&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm-generate.pl?cvsroot=womb&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gnupackages.txt?cvsroot=womb&r1=1.200&r2=1.201

Patches:
Index: Makefile
===================================================================
RCS file: /sources/womb/gnumaint/Makefile,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- Makefile    10 Oct 2013 23:30:14 -0000      1.54
+++ Makefile    18 Oct 2013 13:30:38 -0000      1.55
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.54 2013/10/10 23:30:14 karl Exp $
+# $Id: Makefile,v 1.55 2013/10/18 13:30:38 karl Exp $
 # Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013
 # Free Software Foundation, Inc.
 #
@@ -20,7 +20,7 @@
        cd $(gw) && cvs diff -u0 */allgnupkgs.html
 
 pkg-blurbs-html bhtml:
-       gm generate blurbs html
+       gm generate blurbs html | tee ~/tmp/x.html
 
 test-genlhtml ghtml:  # result included from www.gnu.org/graphics/manual.html
        gm generate logos html | tee ~/tmp/x.html

Index: gm-generate.pl
===================================================================
RCS file: /sources/womb/gnumaint/gm-generate.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gm-generate.pl      14 Oct 2013 19:17:18 -0000      1.12
+++ gm-generate.pl      18 Oct 2013 13:30:41 -0000      1.13
@@ -1,4 +1,4 @@
-# $Id: gm-generate.pl,v 1.12 2013/10/14 19:17:18 karl Exp $
+# $Id: gm-generate.pl,v 1.13 2013/10/18 13:30:41 karl Exp $
 # The generate actions for the gm script (see --help message).
 # 
 # Copyright 2007, 2008, 2009, 2010, 2012, 2013
@@ -355,16 +355,20 @@
     # we intentionally omit blurbs for some packages.
     next if $pkg{"blurb"} =~ /^null/;
     
+    # Need the anchor version of the package name for the links.
     my $xhtml_id = &xhtml_id ($pkgname);
 
+    # Need the regexp-safe version of the package name for the SSI (for gtk+).
+    my $rxsafe_id = quotemeta ($pkgname);
+
     # this ssi stuff lets the homepage extract a single blurb to display.
-    push (@ret, qq,\n<!--#if expr="\$pkg_selection = /:$pkgname:/,
-                             . qq, || \$pkg_selection = /:ALL:/" -->,);
-    push (@ret, "<!-- stale -->") if $activity =~ /^stale/;
-    push (@ret, qq!<h4 id="$xhtml_id">!
-              . qq!<a href="/software/$pkgname/">$pkglabel</a></h4>!);
-    my $blurb = $pkg{"blurb"};
+    push (@ret, qq,\n<!--,
+                  . qq,#if expr="\$pkg_selection = /:($rxsafe_id|ALL):/" -->,);
+    push (@ret, qq,<!-- TRANSLATORS: stale -->,) if $activity =~ /^stale/;
+    push (@ret, qq,<h4 id="$xhtml_id">,
+                  . qq,<a href="/software/$pkgname/">$pkglabel</a></h4><p>,);
     
+    my $blurb = $pkg{"blurb"};
     # a very short blurb should be a redirect, since we already skipped null.
     if (length ($blurb) < 70) {
       my @words = split (" ", $blurb);
@@ -392,7 +396,7 @@
       $blurb =~ s/'/\&#39;/g;  # be sure we can quote text for shell
       chomp ($blurb = `echo '$blurb' | fmt`);
       $blurb =~ s/\&#39;/'/g;  # convert apostrophe back for translators
-      push (@ret, "<p>$blurb");
+      push (@ret, $blurb);
     }
 
     # let's advertise if the package is looking for a maintainer.  maybe
@@ -400,7 +404,7 @@
     push (@ret, "This package is looking for a maintainer.")
       if $activity =~ /^nomaint/;
 
-    my $doc_links = "/manual/manual.html#$pkgname";
+    my $doc_links = "/manual/manual.html#$xhtml_id";
     push (@ret, qq!<small>(<a href="$doc_links">doc</a>)!
               . qq!</small></p>!);
 

Index: gnupackages.txt
===================================================================
RCS file: /sources/womb/gnumaint/gnupackages.txt,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -b -r1.200 -r1.201
--- gnupackages.txt     14 Oct 2013 22:01:10 -0000      1.200
+++ gnupackages.txt     18 Oct 2013 13:30:43 -0000      1.201
@@ -1,4 +1,4 @@
-# $Id: gnupackages.txt,v 1.200 2013/10/14 22:01:10 karl Exp $
+# $Id: gnupackages.txt,v 1.201 2013/10/18 13:30:43 karl Exp $
 # Public domain.
 # 
 # This file is maintained in the CVS repository of GNU womb,
@@ -69,8 +69,7 @@
 doc-summary: Standard login and process accounting utilities
 doc-url: /software/acct/manual/accounting.html
 gplv3-status: done-as-of-6.5
-activity-status: ok 20130308 (6.5.5)
-last-contact: 4dec12 asked no eta
+activity-status: ok 20130308 (6.6.1)
 
 package: acm
 doc-category: Games
@@ -164,7 +163,7 @@
 doc-summary: Automated program generator
 doc-url: /software/autogen/manual/
 gplv3-status: done-in-5.9.5
-activity-status: ok 20130908 (5.18.1)
+activity-status: ok 20131016 (5.18.2)
 
 package: automake
 copyright-holder: fsf-no-reply
@@ -834,7 +833,7 @@
 doc-shop: 
http://shop.fsf.org/product/using-gcc-gnu-compiler-collection-reference-manual/
 logo: /software/gcc/img/gccegg-65.png
 gplv3-status: done
-activity-status: ok 20130531 (4.8.1)
+activity-status: ok 20131016 (4.8.2)
 
 package: gcide
 doc-category: Dictionaries
@@ -1603,6 +1602,7 @@
 #activity-status: ? # 13nov08 asked about gnu status
 
 package: gtk+
+mundane-name: GTK+
 doc-category: Libraries
 doc-summary: Cross-platform toolkit for creating graphical user interfaces
 doc-url: http://library.gnome.org/devel/gtk/stable/
@@ -1791,7 +1791,7 @@
 doc-summary: Entirely free browser derived from Mozilla Firefox
 doc-url: none
 gplv3-status: not-applicable-since-not-our-program
-activity-status: ok 20121201 (17.0.1)
+activity-status: ok 20131016 (24.0)
 
 package: idutils
 copyright-holder: fsf-no-reply
@@ -1814,7 +1814,7 @@
 doc-summary: Code reformatter
 doc-url: /software/indent/manual/
 gplv3-status: notgpl-is-bsd
-activity-status: stale 20090215 (2.2.10)
+activity-status: nomaint/20131014 20090215 (2.2.10)
 
 package: inetutils
 doc-category: Internet
@@ -2146,7 +2146,7 @@
 doc-summary: Mailing list manager
 doc-url: /software/mailman/docs.html
 gplv3-status: next-release-2.2-and-3.0
-activity-status: ok 20120615 (2.1.15)
+activity-status: ok 20131016 (2.1.16)
 
 package: mailutils
 copyright-holder: fsf-ok-with-external-libraries-#793769
@@ -3059,7 +3059,7 @@
 doc-category: Fonts
 doc-summary: Large bitmap font covering Unicode's Basic Multilingual Plane
 doc-url: none
-gplv3-status: unknown
+gplv3-status: stays-gplv2+-per-author-and-rms
 activity-status: newpkg/20131014
 
 package: units