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

8 files changed, 4 insertions, 19 deletions

diff --git a/emulators/cpmtools/pkg-descr b/emulators/cpmtools/pkg-descr
index f7d797e66ac4..35b8a8214662 100644
--- a/emulators/cpmtools/pkg-descr
+++ b/emulators/cpmtools/pkg-descr
@@ -1,7 +1,5 @@
 Title:		CPM
 
-Author:		Helge Skrivervik, now (1994) helge@mellvik.no
-
 Description:
 
 Cpm lets UNIX users read and write standard cp/m 8" floppy disks and
@@ -18,3 +16,5 @@ Ported & maintained by: J"org Wunsch <joerg@FreeBSD.org>, 1994
 Frequently asked question:
 
 No, FreeBSD's floppy-disk driver does not (yet) understand FM diskettes.
+
+Author: Helge Skrivervik, now (1994) helge@mellvik.no
diff --git a/emulators/cygne-sdl/pkg-descr b/emulators/cygne-sdl/pkg-descr
index 6c72f9368a68..da11df5101f2 100644
--- a/emulators/cygne-sdl/pkg-descr
+++ b/emulators/cygne-sdl/pkg-descr
@@ -3,6 +3,3 @@ version of Cygne, a free and now OpenSource (since 12-03-2002) Bandai
 Wonderswan Color handheld software based emulator.
 
 WWW:	http://icculus.org/Cygne-SDL/
-
--- Li-Lun Wang
-llwang@infor.org
diff --git a/emulators/fuse/pkg-descr b/emulators/fuse/pkg-descr
index a29ec6f2ffc3..35da1a6d2a9f 100644
--- a/emulators/fuse/pkg-descr
+++ b/emulators/fuse/pkg-descr
@@ -6,7 +6,3 @@ It supports the new RZX input recording file format.
 
 Author:	Philip Kendall <pak21-spectrum@srcf.ucam.org>
 WWW:	http://www.srcf.ucam.org/~pak21/spectrum/fuse.html
-
--- 
-Alexey V. Antipovsky
-kemm@in-line.ru
diff --git a/emulators/generator-cbiere/pkg-descr b/emulators/generator-cbiere/pkg-descr
index 2e0fb4b9bd1d..43d74040303e 100644
--- a/emulators/generator-cbiere/pkg-descr
+++ b/emulators/generator-cbiere/pkg-descr
@@ -17,5 +17,4 @@ Additional features:
 * Working support for Game Genie codes.
 
 Author: Christian Biere
-
 WWW: http://www.squish.net/generator/cbiere/generator/
diff --git a/emulators/generator/pkg-descr b/emulators/generator/pkg-descr
index 865c4fc74d30..ec920c2198a3 100644
--- a/emulators/generator/pkg-descr
+++ b/emulators/generator/pkg-descr
@@ -16,5 +16,4 @@ that calculates flags and one that doesn't, so that unnecessary flag
 computation is avoided.
 
 Author: James Ponder
-
 WWW: http://www.squish.net/generator/
diff --git a/emulators/libspectrum/pkg-descr b/emulators/libspectrum/pkg-descr
index 037bbb52b799..1687e096d831 100644
--- a/emulators/libspectrum/pkg-descr
+++ b/emulators/libspectrum/pkg-descr
@@ -13,6 +13,3 @@ for Spectrum-related utilities.
 
 Author:	Philip Kendall <pak21-spectrum@srcf.ucam.org>
 WWW:	http://www.srcf.ucam.org/~pak21/spectrum/libspectrum.html
--- 
-Alexey V. Antipovsky
-kemm@in-line.ru
diff --git a/emulators/m2000/pkg-descr b/emulators/m2000/pkg-descr
index 346763c2b0c6..627e47a425e4 100644
--- a/emulators/m2000/pkg-descr
+++ b/emulators/m2000/pkg-descr
@@ -10,5 +10,5 @@ P2000 Emulator
 
 The tape files should be writable, otherwise the emulator won't load them.
 
-WWW: http://www.komkon.org/~dekogel/m2000.html
 Author: Marcel de Kogel <dekogel@giganda.komkon.org>
+WWW: http://www.komkon.org/~dekogel/m2000.html
diff --git a/emulators/stonx/pkg-descr b/emulators/stonx/pkg-descr
index a0c6d7ae65ee..e0f5e1cbdbd1 100644
--- a/emulators/stonx/pkg-descr
+++ b/emulators/stonx/pkg-descr
@@ -35,7 +35,4 @@ TOS 2.06:  tested, should be OK
 
 Please notify me of problems not mentioned here!
 
-
-Author of STonX:
-
-	Marinos Yannikos (nino@complang.tuwien.ac.at)
+Author: Marinos Yannikos (nino@complang.tuwien.ac.at)