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

30 files changed, 23 insertions, 63 deletions

diff --git a/games/braincurses/pkg-descr b/games/braincurses/pkg-descr
index 7bdf97652c2a..f98112b880af 100644
--- a/games/braincurses/pkg-descr
+++ b/games/braincurses/pkg-descr
@@ -1,7 +1,4 @@
 BrainCurses is a clone of the Mastermind game implemented in ncurses.
 
-WWW:		http://freshmeat.net/projects/braincurses/                        
-AUTHOR:		Brian Derr <bderr@myrealbox.com>
-
-	- Michael L. Hostbaek
-	mich@FreeBSD.org
+Author: Brian Derr <bderr@myrealbox.com>
+WWW: http://freshmeat.net/projects/braincurses/
diff --git a/games/dungeon/pkg-descr b/games/dungeon/pkg-descr
index 44441d96f96a..915a4f891c65 100644
--- a/games/dungeon/pkg-descr
+++ b/games/dungeon/pkg-descr
@@ -1,10 +1,6 @@
 Dungeon was the most famous text type adventure game. 
 Zork I, II, III of Infocom were based on it. 
 
-For more detailed information, visit:
-
-WWW: http://www.csd.uwo.ca/Infocom/dungeon.html
-
 You can also read the articles about the history of the Zork 
 in ``The New Zork Times'' there.
 
@@ -12,5 +8,5 @@ This port requires both Fortran and C source zipped archives,
 however the program is built only from the C source. 
 The Fortran source archive includes useful information 
 to solve the myth, which you should look at. 
---
-rmiya 
+
+WWW: http://www.csd.uwo.ca/Infocom/dungeon.html
diff --git a/games/einstein/pkg-descr b/games/einstein/pkg-descr
index 1d6158589060..fd7e178686f5 100644
--- a/games/einstein/pkg-descr
+++ b/games/einstein/pkg-descr
@@ -5,5 +5,5 @@ percentile and higher should be able to solve it.
 
 See the WWW site for the rules of the game.
 
-WWW: http://games.flowix.com/en/
 Author: Alexander Babichev <asso@babichev.info>
+WWW: http://games.flowix.com/en/
diff --git a/games/endgame-singularity-music/pkg-descr b/games/endgame-singularity-music/pkg-descr
index 9da86cee697d..4dcc5de8d0f5 100644
--- a/games/endgame-singularity-music/pkg-descr
+++ b/games/endgame-singularity-music/pkg-descr
@@ -3,5 +3,5 @@ released under the same BY-SA 3.0 license as the Psycle source files
 for the tracks, which can be found in the main Endgame: Singularity
 distribution.
 
-WWW: http://emhsoft.com/singularity/
 Author: Max McCracken
+WWW: http://emhsoft.com/singularity/
diff --git a/games/exhaust-doc/pkg-descr b/games/exhaust-doc/pkg-descr
index a1036459957b..7dea80256794 100644
--- a/games/exhaust-doc/pkg-descr
+++ b/games/exhaust-doc/pkg-descr
@@ -13,6 +13,6 @@ Redcode assembly files (.rc). The last ones can be loaded into exhaust, the
 others have to be parsed, for example with pMARS.
 
 NOTE: this documentation is only useful for developers.
-Author: M Joonas Pihlaja
 
+Author: M Joonas Pihlaja
 WWW: http://www.cs.helsinki.fi/u/jpihlaja/exhaust/exhaust.html
diff --git a/games/exhaust-ma/pkg-descr b/games/exhaust-ma/pkg-descr
index 918331d4df31..e40aff1af5e1 100644
--- a/games/exhaust-ma/pkg-descr
+++ b/games/exhaust-ma/pkg-descr
@@ -5,5 +5,4 @@ Exhaust-ma is exhaust with some of my optimizations. The interface is exactly
 the same, but the sourcecode contains heavy optimations in the simulator core.
 
 Author: Martin Ankerl
-
 WWW: http://corewar.co.uk/ankerl/exhaust-ma.htm
diff --git a/games/exhaust/pkg-descr b/games/exhaust/pkg-descr
index 9cbb6c07e835..2928ad190247 100644
--- a/games/exhaust/pkg-descr
+++ b/games/exhaust/pkg-descr
@@ -2,5 +2,4 @@ The `exhaust' project is a redcode simulator that is (hopefully) easy to embed
 into your applications, as an alternative to pMARS.
 
 Author: M Joonas Pihlaja
-
 WWW: http://www.cs.helsinki.fi/u/jpihlaja/exhaust/exhaust.html
diff --git a/games/exmars/pkg-descr b/games/exmars/pkg-descr
index 6f0c253df029..bba9ddad3eda 100644
--- a/games/exmars/pkg-descr
+++ b/games/exmars/pkg-descr
@@ -18,5 +18,4 @@ The resulting program has the following main features:
 * To get Ruby interface you can install games/ruby-exmars port.
 
 Author: Martin Ankerl
-
 WWW: http://corewar.co.uk/ankerl/exmars.htm
diff --git a/games/ftjava/pkg-descr b/games/ftjava/pkg-descr
index 6e8b65b7ec2a..b3826d2fd9ae 100644
--- a/games/ftjava/pkg-descr
+++ b/games/ftjava/pkg-descr
@@ -3,8 +3,8 @@ Thrust.  Full Thrust is a minatures based system designed to allow one to play
 massive science fiction style fleet battles in a reasonable amount of time.  
 It emphasizes strategy and fun over rule lawyers and micromanagement. 
 
-Authors: Jon Davis
-WWW: http://home.roadrunner.com/~davisje/ftjava/index.html (FTJava)
+Author:	Jon Davis
+	Jon Tuffley
 
-Authors: Jon Tuffley
 WWW: http://www.gzg.com (Ground Zero Games)
+WWW: http://home.roadrunner.com/~davisje/ftjava/index.html (FTJava)
diff --git a/games/garith/pkg-descr b/games/garith/pkg-descr
index 2cddff4c53e5..33c785ca599e 100644
--- a/games/garith/pkg-descr
+++ b/games/garith/pkg-descr
@@ -2,5 +2,5 @@ G Arith is a GTK+ based arithmetic quiz program for X Window System.
 It is fairly self-explanatory, so there is no documentation about
 program usage much at all.
 
-WWW: http://www.cnm-vra.com/micah/garith/
 Author: Micah Stetson
+WWW: http://www.cnm-vra.com/micah/garith/
diff --git a/games/glchess/pkg-descr b/games/glchess/pkg-descr
index 0ac9b1700f1a..210085690ad9 100644
--- a/games/glchess/pkg-descr
+++ b/games/glchess/pkg-descr
@@ -3,5 +3,5 @@ Communication Protocol (CECP) by Tim Mann. This means it can currently use
 Crafty and GNU Chess as AIs. You can also play Human vs. Human, but so far
 not over a network.
 
-WWW: http://glchess.sourceforge.net/
 Author: http://glchess.sourceforge.net/#authors
+WWW: http://glchess.sourceforge.net/
diff --git a/games/heretic/pkg-descr b/games/heretic/pkg-descr
index 151e3cf3bdce..cb9de16f31b3 100644
--- a/games/heretic/pkg-descr
+++ b/games/heretic/pkg-descr
@@ -4,5 +4,3 @@ with blood and gore that reminds people of the old
 Doom and Wolfenstein 3D games.
 
 WWW: http://heretic.linuxgames.com/
-
---Will <andrews@technologist.com>
diff --git a/games/inform7/pkg-descr b/games/inform7/pkg-descr
index a1a53182d730..bfcb9add3379 100644
--- a/games/inform7/pkg-descr
+++ b/games/inform7/pkg-descr
@@ -2,7 +2,4 @@ Inform7 for FreeBSD is a CLI implementation of the Inform 7 programming
 language and environment by Graham Nelson.  Inform is a design system
 for interactive fiction (IF) based on natural language.
 
--- Andy Kosela
-<akosela@andykosela.com>
-
 WWW: http://www.inform7.com/
diff --git a/games/klavaro/pkg-descr b/games/klavaro/pkg-descr
index ac00b4473f7e..2db117e839c2 100644
--- a/games/klavaro/pkg-descr
+++ b/games/klavaro/pkg-descr
@@ -3,5 +3,5 @@ to do it because we became frustrated with the other options, which
 relied mostly on some few specific keyboards. Klavaro intends to be
 keyboard and language independent, saving memory and time (and money).
 
-WWW: http://klavaro.sourceforge.net/
 Author: Felipe Castro <emejlo-klavaro@yahoo.com.br>
+WWW: http://klavaro.sourceforge.net/
diff --git a/games/kmastermind/pkg-descr b/games/kmastermind/pkg-descr
index 1c4b1d39522b..67fbd12edf9f 100644
--- a/games/kmastermind/pkg-descr
+++ b/games/kmastermind/pkg-descr
@@ -1,4 +1,4 @@
 KMasterMind is a mastermind game designed for KDE.
 
-WWW:	http://www.kde-apps.org/content/download.php?content=20292
 Author:	Tavarez Arnaud Bakoula <tbakoula@yahoo.fr>
+WWW:	http://www.kde-apps.org/content/download.php?content=20292
diff --git a/games/p5-Games-Tournament-RoundRobin/pkg-descr b/games/p5-Games-Tournament-RoundRobin/pkg-descr
index 236b00b49cfe..0fcb82e11ec6 100644
--- a/games/p5-Games-Tournament-RoundRobin/pkg-descr
+++ b/games/p5-Games-Tournament-RoundRobin/pkg-descr
@@ -5,7 +5,3 @@ If the league members are (Inf, 1 .. 2n-1), then in round i, i can be
 paired with Inf, and a can meet b, where a+b = 2i (mod 2n-1).
 
 WWW: http://search.cpan.org/dist/Games-Tournament-RoundRobin/
-
--- 
-Aaron Dalton
-aaron@FreeBSD.org
diff --git a/games/pysol/pkg-descr b/games/pysol/pkg-descr
index 7c1a6a05eaa9..bf212bc45485 100644
--- a/games/pysol/pkg-descr
+++ b/games/pysol/pkg-descr
@@ -15,7 +15,4 @@ Highlights:
 
 I'm awaiting your suggestions and bug reports :-)
 
-Have fun,
-Markus
-
 WWW: http://www.oberhumer.com/opensource/pysol/
diff --git a/games/qnetwalk/pkg-descr b/games/qnetwalk/pkg-descr
index 92e611dc1805..38317a6b511f 100644
--- a/games/qnetwalk/pkg-descr
+++ b/games/qnetwalk/pkg-descr
@@ -8,5 +8,5 @@ Features:
 * Highscores. 
 * Sound Support. 
 
-WWW:	http://qt.osdn.org.ua/qnetwalk.html
 Author:	Andi Peredri
+WWW:	http://qt.osdn.org.ua/qnetwalk.html
diff --git a/games/ruby-exmars/pkg-descr b/games/ruby-exmars/pkg-descr
index 7fbcbc20711f..019ebf9f62c0 100644
--- a/games/ruby-exmars/pkg-descr
+++ b/games/ruby-exmars/pkg-descr
@@ -19,5 +19,4 @@ The resulting program has the following main features:
 NOTE: This is only Ruby interface part. To install exmars use games/exmars port.
 
 Author: Martin Ankerl
-
 WWW: http://corewar.co.uk/ankerl/exmars.htm
diff --git a/games/six/pkg-descr b/games/six/pkg-descr
index ce2d85a15677..829c917d7452 100644
--- a/games/six/pkg-descr
+++ b/games/six/pkg-descr
@@ -4,5 +4,5 @@ placing marks on a rhombic board of hexagonal cells. Black's goal is to
 connect the two opposite black sides of the board with black pieces. 
 White's goal is to connect the white sides of the board with white pieces.
 
-WWW:	http://six.retes.hu/
 Author:	Gabor Melis
+WWW:	http://six.retes.hu/
diff --git a/games/tkmoo/pkg-descr b/games/tkmoo/pkg-descr
index 53a5714092c8..5bf8c50b4ff5 100644
--- a/games/tkmoo/pkg-descr
+++ b/games/tkmoo/pkg-descr
@@ -2,7 +2,5 @@ TkMOO is a Tk-based M** interface. It has support for triggers,
 gags, scripts, etc. It is a graphical alternative to using tintin++,
 tinyfugue, kmud, and others.
 
-WWW: http://www.awns.com/tkMOO-light/
 Author: Andrew Wilson <Andrew.Wilson@cm.cf.ac.uk>
-
--Adam <adam-ports@blacktabby.org>
+WWW: http://www.awns.com/tkMOO-light/
diff --git a/games/tornado/pkg-descr b/games/tornado/pkg-descr
index 29f1d28db601..3261fdea5bad 100644
--- a/games/tornado/pkg-descr
+++ b/games/tornado/pkg-descr
@@ -4,6 +4,3 @@ against the computer AI, or against another player locally or over the
 network.
 
 WWW: http://kiza.kcore.de/software/tornado/
-
---Wade
-minter@lunenburg.org
diff --git a/games/tractorgen/pkg-descr b/games/tractorgen/pkg-descr
index 4e84d6b06ef2..0fb9fd3959d5 100644
--- a/games/tractorgen/pkg-descr
+++ b/games/tractorgen/pkg-descr
@@ -11,6 +11,5 @@ theorem of ASCII tractor mechanics:
 
         "ASCII Tractors must have at least four wheels." [1]
 
-
-Author:                Conrad Parker <kbert@vergenet.net>
-WWW:           http://www.vergenet.net/~conrad/software/tractorgen/
+Author: Conrad Parker <kbert@vergenet.net>
+WWW: http://www.vergenet.net/~conrad/software/tractorgen/
diff --git a/games/traindirector/pkg-descr b/games/traindirector/pkg-descr
index a30d4c4eb91b..af7ab54b965f 100644
--- a/games/traindirector/pkg-descr
+++ b/games/traindirector/pkg-descr
@@ -7,6 +7,3 @@ switches and clearing signals. You can also create your own territories
 with the included track layout editor.
 
 WWW: http://www.backerstreet.com/traindir/trdireng.htm
-
---
-Guido Falsi <mad@madpilot.net>
diff --git a/games/vultures-eye/pkg-descr b/games/vultures-eye/pkg-descr
index 171aabdc4f41..b3672e2c5453 100644
--- a/games/vultures-eye/pkg-descr
+++ b/games/vultures-eye/pkg-descr
@@ -4,6 +4,3 @@ for NetHack.
 
 Author: Clive Crous
 WWW: http://www.darkarts.co.za/projects/vultures/
-
--- Li-Lun Wang
-llwang@infor.org
diff --git a/games/whichwayisup/pkg-descr b/games/whichwayisup/pkg-descr
index 66219fa17ebb..40d6a15723e4 100644
--- a/games/whichwayisup/pkg-descr
+++ b/games/whichwayisup/pkg-descr
@@ -2,5 +2,5 @@ Which Way Is Up is a traditional and challenging 2D platformer game
 with a slight rotational twist. Help a mysterious big-eared salaryman
 named Guy find his keys in a labyrinth of dangers and bad dialogue.
 
-WWW: http://www.hectigo.net/games/whichwayisup/
 Author: Olli "Hectigo" Etuaho <admin[at]hectigo.net>
+WWW: http://www.hectigo.net/games/whichwayisup/
diff --git a/games/xjumpx/pkg-descr b/games/xjumpx/pkg-descr
index 9d196f7fe165..048c24125dea 100644
--- a/games/xjumpx/pkg-descr
+++ b/games/xjumpx/pkg-descr
@@ -2,5 +2,3 @@ XJumpX (aka 'FallingTower KAI') is a simple action game.
 You jump higher to higher.
 
 This is improved version of xjump (aka 'FallingTower')
-
--- Tatsuya Kudoh(CDR/TK)
diff --git a/games/xmine/pkg-descr b/games/xmine/pkg-descr
index d6cf7084ea23..fe33ac1ca84c 100644
--- a/games/xmine/pkg-descr
+++ b/games/xmine/pkg-descr
@@ -5,7 +5,6 @@ them.
 xmine is freely redistributable.  It's mostly Xlib-based, but it
 requires Motif libraries for the menus.
 
-Author: Paul Falstad (pf@z-code.com)
 ===
 
 This version of xmine is based on Paul Falstad's version 1.0.3, as
@@ -15,6 +14,4 @@ without OSF/Motif.
 Since the game itself has some 3D look, linking against the famous
 Xaw3d library is highly recommended.
 
----
-enjoy,
-	Joerg Wunsch <joerg@FreeBSD.org>
+Author: Paul Falstad (pf@z-code.com)
diff --git a/games/xpacman/pkg-descr b/games/xpacman/pkg-descr
index 4079cca872d3..316bb292000a 100644
--- a/games/xpacman/pkg-descr
+++ b/games/xpacman/pkg-descr
@@ -7,4 +7,4 @@ is also bonus available, for a limited amount of time.  An
 X  gives  just  points, but a little pacman gives an extra
 life.
 
-Author of this implementation: Roar Thronaes, roart@nvg.unit.no
+Author: Roar Thronaes, roart@nvg.unit.no
diff --git a/games/xrally/pkg-descr b/games/xrally/pkg-descr
index 8b8cc5190202..25c8ffad6870 100644
--- a/games/xrally/pkg-descr
+++ b/games/xrally/pkg-descr
@@ -10,5 +10,5 @@ XRally is written in C using only the basic Xlib and Xpm libraries.
 It's a project aimed mainly at newbie X11/Game programmers like me
 (but any experienced help is appreciated! :) )
 
-WWW: http://www.linuxgames.com/xrally/
 Author: Ismael Orenstein <perdig@linuxbr.com.br>
+WWW: http://www.linuxgames.com/xrally/