The vast majority of pkg-descr files had the following format when they

had both lines:

Author: ...
WWW: ....

So standardize on that, and move them to the end of the file when necessary.

Also fix some more whitespace, and remove more "signature tags" of varying
forms, like -- name, etc.

s/AUTHOR/Author/

A few other various formatting issues

15 files changed, 10 insertions, 36 deletions

diff --git a/lang/TenDRA/pkg-descr b/lang/TenDRA/pkg-descr
index d64224c7ee8a..68d4896ff614 100644
--- a/lang/TenDRA/pkg-descr
+++ b/lang/TenDRA/pkg-descr
@@ -9,8 +9,8 @@ The compiler has strong static checking capabilities, including the
 ability to check programs for conformance to APIs which are not
 directly supported by system headers.
 
-WWW: http://www.ten15.org/
-
 -----
 * TenDRA is a registered trademark of the UK Defence Evaluation
 and Research Agency.
+
+WWW: http://www.ten15.org/
diff --git a/lang/asn1c/pkg-descr b/lang/asn1c/pkg-descr
index de264538ad40..f5fcc0025e6f 100644
--- a/lang/asn1c/pkg-descr
+++ b/lang/asn1c/pkg-descr
@@ -6,7 +6,3 @@ The produced C code contains the codecs for BER/DER/CER/PER/XER encoding rules.
 See asn1c-usage.pdf and asn1c(1) manual page for details.
 
 WWW: http://lionet.info/asn1c
-
--- 
-Lev Walkin
-vlm@lionet.info
diff --git a/lang/bas2tap/pkg-descr b/lang/bas2tap/pkg-descr
index bb53f25de857..dd34a352e18e 100644
--- a/lang/bas2tap/pkg-descr
+++ b/lang/bas2tap/pkg-descr
@@ -4,5 +4,5 @@ as plain text files into TAP files.
 TAP files can be used in most ZX Spectrum emulators and can be concatenated
 together using cat(1).
 
-WWW: http://www.worldofspectrum.org/utilities.html
 Author: Martijn van der Heide
+WWW: http://www.worldofspectrum.org/utilities.html
diff --git a/lang/hugs/pkg-descr b/lang/hugs/pkg-descr
index 28f9db978bf5..c18a6d7d19b8 100644
--- a/lang/hugs/pkg-descr
+++ b/lang/hugs/pkg-descr
@@ -12,6 +12,3 @@ polymorphism, existentials, scoped type variables, and restricted
 type synonyms.
 
 WWW: http://www.haskell.org/hugs/
-
--- Oliver Braun
-obraun@informatik.unibw-muenchen.de
diff --git a/lang/munger/pkg-descr b/lang/munger/pkg-descr
index e0f6aa0d960d..78b0139d8ded 100644
--- a/lang/munger/pkg-descr
+++ b/lang/munger/pkg-descr
@@ -12,7 +12,3 @@ irreversible destruction of large portions of the original item."  Laugh,
 it's a joke.
 
 WWW: http://www.mammothcheese.ca/munger.html
-
---
-James Bailie <jimmy@mammothcheese.ca>
-http://www.mammothcheese.ca
diff --git a/lang/nawk/pkg-descr b/lang/nawk/pkg-descr
index f1607b6683a8..af9cad650300 100644
--- a/lang/nawk/pkg-descr
+++ b/lang/nawk/pkg-descr
@@ -6,6 +6,3 @@ by Al Aho, Brian Kernighan, and Peter Weinberger
 (Addison-Wesley, 1988, ISBN 0-201-07981-X).
 
 WWW: http://cm.bell-labs.com/cm/cs/awkbook/index.html
-
--- David
-   obrien@NUXI.com
diff --git a/lang/nhc98/pkg-descr b/lang/nhc98/pkg-descr
index e7884c2fd9d3..57fbe8324e79 100644
--- a/lang/nhc98/pkg-descr
+++ b/lang/nhc98/pkg-descr
@@ -5,6 +5,3 @@ with extensive tool support for automatic compilation, foreign language
 interfacing, heap and time profiling, tracing, and debugging.
 
 WWW: http://www.haskell.org/nhc98/
-
--- Oliver Braun
-obraun@informatik.unibw-muenchen.de
diff --git a/lang/p5-Data-JavaScript/pkg-descr b/lang/p5-Data-JavaScript/pkg-descr
index ddc0e5c2ec79..8588c0a41b10 100644
--- a/lang/p5-Data-JavaScript/pkg-descr
+++ b/lang/p5-Data-JavaScript/pkg-descr
@@ -8,5 +8,3 @@ variables. This enables dumping big structures.
 
 Author: Ariel Brosh <schop@cpan.org>
 WWW: http://search.cpan.org/dist/Data-JavaScript/
-
--- Anton
diff --git a/lang/rexx-imc/pkg-descr b/lang/rexx-imc/pkg-descr
index a97625fb3ea1..bbebe9acada9 100644
--- a/lang/rexx-imc/pkg-descr
+++ b/lang/rexx-imc/pkg-descr
@@ -5,6 +5,3 @@ to call Rexx programs and to register addressing environments, Rexx
 functions, and exit handlers. 
 
 WWW: http://users.comlab.ox.ac.uk/ian.collier/Rexx/rexximc.html
-
---
-John Merryweather Cooper <jmcoopr@webmail.bmi.net>
diff --git a/lang/ruby-programmingruby/pkg-descr b/lang/ruby-programmingruby/pkg-descr
index 5d23e981c0b9..bd75fd45f126 100644
--- a/lang/ruby-programmingruby/pkg-descr
+++ b/lang/ruby-programmingruby/pkg-descr
@@ -5,5 +5,5 @@ HTML files.  The HTML files are the ones used at RubyCentral.
 
 It is released under the Open Publication License.
 
-WWW: http://www.pragmaticprogrammer.com/titles/ruby/index.html
 Authors: The Pragmatic Programmers, LLC
+WWW: http://www.pragmaticprogrammer.com/titles/ruby/index.html
diff --git a/lang/ruby-usersguide/pkg-descr b/lang/ruby-usersguide/pkg-descr
index 1f50321f02a9..f3217000f857 100644
--- a/lang/ruby-usersguide/pkg-descr
+++ b/lang/ruby-usersguide/pkg-descr
@@ -3,9 +3,9 @@ object-oriented programming.  It has many features to process text
 files and to do system management tasks.  This package contains the
 Ruby users guide in HTML format.
 
-WWW:	http://www.ruby-lang.org/
-Authors:
-	Yukihiro Matsumoto <matz@netlab.co.jp> (Japanese version)
+Author: Yukihiro Matsumoto <matz@netlab.co.jp> (Japanese version)
 	GOTO Kentaro <gotoken@notwork.org> (Initial translation)
 	Julian Fondren (ditto)
 	Mark Slagell <slagell@cs.iastate.edu> (Retranslation)
+
+WWW:	http://www.ruby-lang.org/
diff --git a/lang/tolua/pkg-descr b/lang/tolua/pkg-descr
index 0dff71b6290c..83b1a11b46fe 100644
--- a/lang/tolua/pkg-descr
+++ b/lang/tolua/pkg-descr
@@ -6,6 +6,5 @@ maps C/C++ constants, external variables, functions, namespace,
 classes, and methods to Lua. It also provides facilities to create
 Lua modules.
 
-WWW: http://www.tecgraf.puc-rio.br/~celes/tolua/
-
 Author: Waldemar Celes <celes@tecgraf.puc-rio.br>
+WWW: http://www.tecgraf.puc-rio.br/~celes/tolua/
diff --git a/lang/tolua4/pkg-descr b/lang/tolua4/pkg-descr
index 0dff71b6290c..83b1a11b46fe 100644
--- a/lang/tolua4/pkg-descr
+++ b/lang/tolua4/pkg-descr
@@ -6,6 +6,5 @@ maps C/C++ constants, external variables, functions, namespace,
 classes, and methods to Lua. It also provides facilities to create
 Lua modules.
 
-WWW: http://www.tecgraf.puc-rio.br/~celes/tolua/
-
 Author: Waldemar Celes <celes@tecgraf.puc-rio.br>
+WWW: http://www.tecgraf.puc-rio.br/~celes/tolua/
diff --git a/lang/tolua50/pkg-descr b/lang/tolua50/pkg-descr
index 0dff71b6290c..83b1a11b46fe 100644
--- a/lang/tolua50/pkg-descr
+++ b/lang/tolua50/pkg-descr
@@ -6,6 +6,5 @@ maps C/C++ constants, external variables, functions, namespace,
 classes, and methods to Lua. It also provides facilities to create
 Lua modules.
 
-WWW: http://www.tecgraf.puc-rio.br/~celes/tolua/
-
 Author: Waldemar Celes <celes@tecgraf.puc-rio.br>
+WWW: http://www.tecgraf.puc-rio.br/~celes/tolua/
diff --git a/lang/twelf/pkg-descr b/lang/twelf/pkg-descr
index 433a4a2c6183..df5296b3b088 100644
--- a/lang/twelf/pkg-descr
+++ b/lang/twelf/pkg-descr
@@ -16,4 +16,3 @@ and Hilbert's deduction theorem.
 -- the Twelf home page
 
 WWW: http://www.cs.cmu.edu/~twelf
-Maintainer: Andrew Bernard (andrewb@cs.cmu.edu)