[commit-womb] gnumaint gm-read.pl gnupackages.txt pkgblurbs.txt

[karl]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     karl <karl>     13/11/19 01:18:05

Modified files:
        .              : gm-read.pl gnupackages.txt pkgblurbs.txt 

Log message:
        fix colon parsing within continued lines, plus gengen and other textual 
fixes, both per #870696

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm-read.pl?cvsroot=womb&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gnupackages.txt?cvsroot=womb&r1=1.210&r2=1.211
http://cvs.savannah.gnu.org/viewcvs/gnumaint/pkgblurbs.txt?cvsroot=womb&r1=1.24&r2=1.25

Patches:
Index: gm-read.pl
===================================================================
RCS file: /sources/womb/gnumaint/gm-read.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gm-read.pl  10 Oct 2013 23:45:23 -0000      1.12
+++ gm-read.pl  19 Nov 2013 01:18:05 -0000      1.13
@@ -1,4 +1,4 @@
-# $Id: gm-read.pl,v 1.12 2013/10/10 23:45:23 karl Exp $
+# $Id: gm-read.pl,v 1.13 2013/11/19 01:18:05 karl Exp $
 # Subroutines for gm script that read various external data file.
 # 
 # Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013
@@ -113,8 +113,7 @@
       }
       
       # keyword ANY in copyright.list is not a package name for us, etc.
-      next if $w =~ /^(ANY|UNUSED|SPECIAL|MISC|TRANSLATIONS)$/;
-      next if $w =~ /^(CCLRC|CNOC|ET|INSIGHT|L3|LINBIT|WCT|FOO)$/;
+      next if $w =~ /^(ANY|MISC|SPECIAL|TRANSLATIONS|UNUSED)$/;
       
       # Special case assignment, not a GNU package.
       next if $w =~ /^(READINGRECORD)$/;
@@ -225,7 +224,7 @@
       "objc"            => "gcc",
       "obstack"         => "libc",
       "pfe"             => "gforth",
-      "pnet"            => "dotgnu-pnet",
+#      "pnet"            => "dotgnu-pnet",
       "portable.net"    => "dotgnu-pnet",
       "ps"              => "sysutils",
       "ptx"             => "coreutils",
@@ -452,7 +451,7 @@
       } else {
         warn "$GNUPACKAGES_FILE:$.: no package name for block ending here\n";
       }
-      undef %pkg;  # clear out next
+      undef %pkg;  # clear out for next
       next;
     }
 
@@ -510,25 +509,37 @@
       } else {
         warn "$PKGBLURBS_FILE:$.: no package name for block ending here\n";
       }
-      undef %pkg;  # clear out next
+      undef %pkg;  # clear out for next
       next;
     }
-    # key is everything before the first colon.
-    # value is everything after the first colon and whitespace.
-    my ($key,$val) = split (/:\s*/, $_, 2);
-    if ($key eq $_) {
-      # multi-line blurbs are line-folded with "+ "
-      if ($key =~ /^\+ /) {
-        $pkg{blurb} = $pkg{blurb} . " " . substr($key, 2);
+    #
+    # the idea is that we have
+    #   blurb: text text text
+    #   + continued text continued text ...
+    #
+    # Let's look for the continuation lines first.
+    if (/^\+\s+/) {
+      if (exists $pkg{"blurb"}) {
+        # continued line, drop "+ " continuation and append.
+        s,^\+\s+,,;
+        $pkg{blurb} = "$pkg{blurb} $_";
       } else {
-        warn "$PKGBLURBS_FILE:$.: no colon in line\n";
-      }
+        warn "$PKGBLURBS_FILE:$.: +continuation without previous blurb:\n";
     }
+
+    } elsif (/:/) {
+      # not a continuation line, so it should be a normal
+      # key: value line.
+      my ($key,$val) = split (/:\s*/, $_, 2);
     # if key already exists, complain.
     warn "found second value $val for key $key (already have $pkg{$key})\n"
       if exists $pkg{$key};
     
     $pkg{$key} = $val;
+
+    } else {
+      warn "$PKGBLURBS_FILE:$.: no colon or plus in line\n";
+    }
   }
   close (PKGBLURBS_FILE) || warn "close($PKGBLURBS_FILE) failed: $!";
   

Index: gnupackages.txt
===================================================================
RCS file: /sources/womb/gnumaint/gnupackages.txt,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -b -r1.210 -r1.211
--- gnupackages.txt     10 Nov 2013 21:06:33 -0000      1.210
+++ gnupackages.txt     19 Nov 2013 01:18:05 -0000      1.211
@@ -1,4 +1,4 @@
-# $Id: gnupackages.txt,v 1.210 2013/11/10 21:06:33 brandon Exp $
+# $Id: gnupackages.txt,v 1.211 2013/11/19 01:18:05 karl Exp $
 # Public domain.
 #
 # This file is maintained in the CVS repository of GNU womb,
@@ -52,7 +52,7 @@
 doc-url: /software/3dldf/manual/
 logo: /software/3dldf/graphics/dhnlogo.png
 gplv3-status: in-dev-sources (gnumaint-reply 29 Aug 2007 19:26:27)
-activity-status: moribund 20040116 (1.1.5.1)
+activity-status: ok 20131110 (2.0.2)
 
 package: a2ps
 mundane-name: a2ps
@@ -263,7 +263,7 @@
 doc-shop: The Bison Manual
 doc-shop: http://shop.fsf.org/product/bison-manual/
 gplv3-status: done-in-2.4-without-exception-#502111
-activity-status: ok 20130725 (3.0)
+activity-status: ok 20131112 (3.0.1)
 
 package: bool
 copyright-holder: fsf-no-reply
@@ -368,7 +368,7 @@
 doc-summary: Full chess implementation
 doc-url: /software/chess/manual/
 gplv3-status: done-in-6.0.0
-activity-status: ok 20130310 (gnuchess-6.0.3)
+activity-status: ok 20131110 (gnuchess-6.1.0)
 
 package: cim
 doc-category: Software
@@ -395,7 +395,7 @@
 doc-summary: Classpath extensions: javax.* libraries
 doc-url: none
 gplv3-status: not-done-worry-about-classpath-first
-activity-status: ok 20131104 (servletapi-3.0) # mostly merged into classpath
+activity-status: ok 20131112 (activation-1.1.2) # mostly merged into classpath
 note: jaxp module is not copyright fsf?
 
 package: clisp
@@ -857,7 +857,7 @@
 doc-summary: A Common Lisp implementation
 doc-url: none
 gplv3-status: not-done-is-lgplv2+-has-gplv2-only-users-9nov10-asked-rms
-activity-status: ok 20130823 (2.6.9)
+activity-status: ok 20131114 (2.6.10)
 
 package: gcompris
 mundane-name: GCompris
@@ -1752,7 +1752,7 @@
 doc-summary: Health and hospital information system
 doc-url: none
 gplv3-status: done
-activity-status: ok 20131005 (2.2.1)
+activity-status: ok 20131114 (gnuhealth-2.2.2)
 
 package: hello
 copyright-holder: fsf-ok-#786611
@@ -1801,7 +1801,7 @@
 doc-summary: Emacs hypertext system via customizable buttons
 doc-url: none
 gplv3-status: done-in-5.0.3
-activity-status: ok 20130328 (5.0.4)
+activity-status: ok 20131112 (5.0.5)
 
 package: icecat
 copyright-holder: notfsf
@@ -2984,7 +2984,7 @@
 doc-summary: Managing tar archives
 doc-url: /software/tar/manual/
 gplv3-status: done-in-1.21
-activity-status: ok 20131005 (1.27)
+activity-status: ok 20131117 (1.27.1)
 
 package: termcap
 copyright-holder: fsf-ok-#786501

Index: pkgblurbs.txt
===================================================================
RCS file: /sources/womb/gnumaint/pkgblurbs.txt,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- pkgblurbs.txt       8 Nov 2013 23:50:48 -0000       1.24
+++ pkgblurbs.txt       19 Nov 2013 01:18:05 -0000      1.25
@@ -1,4 +1,4 @@
-# $Id: pkgblurbs.txt,v 1.24 2013/11/08 23:50:48 karl Exp $
+# $Id: pkgblurbs.txt,v 1.25 2013/11/19 01:18:05 karl Exp $
 # Public domain.
 #
 # This file is maintained in the CVS repository of GNU womb,
@@ -614,11 +614,13 @@
 + library and provides interfaces to the traditional file format.
 
 package: gengen
-blurb: GNU Gengen is a program to generate text-generators.  The generator is
-+ first described in a template file, from which a text-generator is
-+ created.  This text-generator can then be used to do text
-+ substitutions of the parameters from the template.  Gengen can be
-+ used to generate C and C++ code.
+blurb: GNU Gengen is a program to generate text-generators, i.e., functions
++ producing text with variable sections.  The text is first specified
++ by the user in a template file containing parameters, then processed by
++ gengen to create the text-generator.  At runtime, the variable text is
++ defined by the rest of the program and passed to the text-generator,
++ which then substitutes it into the template parameters and returns the
++ result.  Gengen can be used to generate C and C++ code.
 
 package: gengetopt
 blurb: GNU Gengetopt is a program to generate a C/C++ function for parsing
@@ -897,8 +899,8 @@
 + standard.  It is used to encrypt and sign data and communication.  It
 + features powerful key management and the ability to access public key
 + servers.  It includes several libraries: libassuan (IPC between GnuPG
-+ components), libgpg-error (centralized GnuPG error values), libskba
-+ (working with X.509 certificates and CMS data),
++ components), libgpg-error (centralized GnuPG error values), and libskba
++ (working with X.509 certificates and CMS data).
 
 package: gnupod
 blurb: GNUpod is a collection of scripts for using iPods with GNU/Linux and
@@ -967,7 +969,7 @@
 
 package: gnutls
 blurb: GnuTLS is a secure communications library implementing the SSL, TLS
-+ and DTLS protocols.  It is provided in the form of a C library to
++ and DTLS protocols.  It is provided in the form of a C library to support
 + the protocols, as well as to parse and write X.5009, PKCS 12, OpenPGP
 + and other required structures.
 
@@ -984,7 +986,7 @@
 blurb: Goptical is a library for optical design and simulation in C++.  It
 + provides model classes for optical components, surfaces and
 + materials.  With it, one can simulate building an optical system by
-+ creating and placing optical components in a 3d space and light
++ creating and placing optical components in a 3d space, and visualize light
 + propagating through the system.
 
 package: gorm
@@ -1235,15 +1237,15 @@
 package: icecat
 blurb: IceCat is the GNU version of the Firefox browser.  It is entirely
 + free software, which does not recommend non-free plugins and addons.
-+ It also features extra privacy-protecting features built in.
++ It also features built-in privacy-protecting features.
 
 package: idutils
-blurb: ID Utils provides tools to create an index if textual tokens used in
-+ a list of file names and to then query that index.  Thus, it allows
-+ the user to, for example, find all the uses of a particular function
-+ in all files of a large programming project.  In addition to handling
-+ textual tokens, it can also handle numeric constants and the contents
-+ of character strings.
+blurb: The GNU idutils package includes tools to create an index of
++ textual tokens used in a list of file names and then to query that
++ index.  Thus, it allows the user to, for example, find all the uses of
++ a particular function in a large programming project.  In addition to
++ handling textual tokens, it can also handle numeric constants and the
++ contents of character strings.
 
 package: ignuit
 blurb: Ignuit is a tool for aiding in the memorization of new information