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

11 files changed, 6 insertions, 20 deletions

diff --git a/x11/ggiterm/pkg-descr b/x11/ggiterm/pkg-descr
index 70ca8b77ff4d..226ba5ff7772 100644
--- a/x11/ggiterm/pkg-descr
+++ b/x11/ggiterm/pkg-descr
@@ -11,6 +11,3 @@ gnome-terminal or konsole yet under X, and it's only barely been
 tested on other targets. But it works.
 
 WWW: http://ggiterm.sourceforge.net/
-
---
-andi_payn@speedymail.org
diff --git a/x11/gpctool/pkg-descr b/x11/gpctool/pkg-descr
index 0ffecc4fa9c9..07405650dec8 100644
--- a/x11/gpctool/pkg-descr
+++ b/x11/gpctool/pkg-descr
@@ -1,8 +1,6 @@
 gpctool - a graphical user interface and development
 environment for the gpc generic polygon clipper library.
 
-Author:    Alan Murta (email: gpc@cs.man.ac.uk)
-
 Copyright: (C) 1997-1999, Advanced Interfaces Group,
 	University of Manchester.
 
@@ -16,4 +14,5 @@ Copyright: (C) 1997-1999, Advanced Interfaces Group,
 	of any commercial product without the express consent of the
 	author.
 
-WWW:	http://www.cs.man.ac.uk/~toby/alan/software/
+Author: Alan Murta (email: gpc@cs.man.ac.uk)
+WWW: http://www.cs.man.ac.uk/~toby/alan/software/
diff --git a/x11/ipager/pkg-descr b/x11/ipager/pkg-descr
index b16a648848d1..e0812037e2de 100644
--- a/x11/ipager/pkg-descr
+++ b/x11/ipager/pkg-descr
@@ -14,5 +14,4 @@ Features:
 	* Color themes.
 
 Author: vad@useperl.ru
-
 WWW: http://useperl.ru/ipager/index.en.html
diff --git a/x11/kdebase3/pkg-descr b/x11/kdebase3/pkg-descr
index 754e2ffeae40..e425d2bfcaac 100644
--- a/x11/kdebase3/pkg-descr
+++ b/x11/kdebase3/pkg-descr
@@ -4,5 +4,3 @@ for a minimal, functional KDE desktop (but note that you still may need to
 install and configure an X server, for example XFree86).
 
 WWW: http://www.kde.org/
-
---AlanE <kde@freebsd.org>
diff --git a/x11/kdelibs3/pkg-descr b/x11/kdelibs3/pkg-descr
index 80b768174841..1813dd4f9d16 100644
--- a/x11/kdelibs3/pkg-descr
+++ b/x11/kdelibs3/pkg-descr
@@ -1,5 +1,3 @@
 This is the base set of libraries needed by KDE programs.
 
 WWW: http://www.kde.org/
-
---AlanE <kde@freebsd.org>
diff --git a/x11/wmcliphist/pkg-descr b/x11/wmcliphist/pkg-descr
index 767b5427bedc..ad1eb0259a44 100644
--- a/x11/wmcliphist/pkg-descr
+++ b/x11/wmcliphist/pkg-descr
@@ -3,5 +3,5 @@ keeps history of clipboard operations and allows
 you to put previously copied items back to the
 clipboard for pasting to other applications.
 
-WWW: http://linux.nawebu.cz/wmcliphist/
 Author: Michal Krause <michal@krause.cz>
+WWW: http://linux.nawebu.cz/wmcliphist/
diff --git a/x11/wmmsg/pkg-descr b/x11/wmmsg/pkg-descr
index 8136cec9e60c..a1799a6ac985 100644
--- a/x11/wmmsg/pkg-descr
+++ b/x11/wmmsg/pkg-descr
@@ -2,5 +2,5 @@ Informs you of new events, such as incoming chat messages,
 by displaying related icons and arrival times. Works with Gaim, X-Chat, etc. 
 Can be used to alert you of various other system events.
 
-WWW: http://taxiway.swapspace.net/~matt/wmmsg/
 Author: Michael Foley <mike@swapspace.net>, Matthew Elder <matt@swapspace.net>
+WWW: http://taxiway.swapspace.net/~matt/wmmsg/
diff --git a/x11/xclick/pkg-descr b/x11/xclick/pkg-descr
index 4ada98db2fc0..9d91a7bfcd9d 100644
--- a/x11/xclick/pkg-descr
+++ b/x11/xclick/pkg-descr
@@ -5,5 +5,3 @@ events. Perfect for xbindkeys(1).
 
 Author: Jeremy Nickurak
 WWW: http://members.shaw.ca/gehrehmee/
-
--- lioux@FreeBSD.org
diff --git a/x11/xdialog/pkg-descr b/x11/xdialog/pkg-descr
index 0721a6dae062..0bf367fc7cba 100644
--- a/x11/xdialog/pkg-descr
+++ b/x11/xdialog/pkg-descr
@@ -3,5 +3,5 @@ Xdialog is designed to be a drop in replacement for the "dialog" or
 program with an X-windows interface. The dialogs are easier to see
 and use while adding even more functionalities.
 
-WWW: http://xdialog.dyns.net/
 Author: Thierry Godefroy <xdialog@free.fr>
+WWW: http://xdialog.dyns.net/
diff --git a/x11/xfishtank/pkg-descr b/x11/xfishtank/pkg-descr
index f253cb44c07c..a7aff571c900 100644
--- a/x11/xfishtank/pkg-descr
+++ b/x11/xfishtank/pkg-descr
@@ -3,6 +3,3 @@ background of your screen.  This is a modification of an old one called
 xfish (also called Xaquarium), that I have added more features to.
 
 This version now works on true colour displays.
-
---Chris
-jacs@gnome.co.uk
diff --git a/x11/xvkbd/pkg-descr b/x11/xvkbd/pkg-descr
index c71c44b00728..0a05ef1fe1c4 100644
--- a/x11/xvkbd/pkg-descr
+++ b/x11/xvkbd/pkg-descr
@@ -7,5 +7,5 @@ From the xvkbd README:
  This program also has facility to send characters specified as the command
  line option to another client."
 
-WWW:		http://homepage3.nifty.com/tsato/xvkbd/
 Author:		Tom Sato <VEF00200@nifty.ne.jp>
+WWW:		http://homepage3.nifty.com/tsato/xvkbd/