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

40 files changed, 15 insertions, 77 deletions

diff --git a/mail/abook/pkg-descr b/mail/abook/pkg-descr
index 87af25e2376a..d85448b2e24f 100644
--- a/mail/abook/pkg-descr
+++ b/mail/abook/pkg-descr
@@ -2,6 +2,3 @@ Abook is a text-based addressbook program designed to use with mutt mail
 client. Abook runs on Linux, FreeBSD and some other UNIXes.
 
 WWW: http://abook.sourceforge.net/
-
---
-Yen-Ming Lee <leeym@cae.ce.ntu.edu.tw>
diff --git a/mail/antivirus-milter/pkg-descr b/mail/antivirus-milter/pkg-descr
index d665d43b4fc9..eccaa6f12eb2 100644
--- a/mail/antivirus-milter/pkg-descr
+++ b/mail/antivirus-milter/pkg-descr
@@ -16,4 +16,5 @@ completely. In specific, extenions of .scr, .vbs, .pif, and .com are
 blocked.
 
 Author gave permission to distribute it with BSD-License (2004-01-05).
+
 LICENSE: BSD
diff --git a/mail/fdm/pkg-descr b/mail/fdm/pkg-descr
index 4c64b259e900..2891925e2f9e 100644
--- a/mail/fdm/pkg-descr
+++ b/mail/fdm/pkg-descr
@@ -3,5 +3,5 @@ delivery programs such as fetchmail and procmail. It can currently
 fetch using POP3, POP3S, IMAP or from stdin, and deliver to a pipe,
 file, maildir, mbox or SMTP server, based on regexps.
 
-WWW: http://fdm.sourceforge.net/
 Author: Nicholas Marriott <nicm@users.sourceforge.net>
+WWW: http://fdm.sourceforge.net/
diff --git a/mail/ftrack/pkg-descr b/mail/ftrack/pkg-descr
index a6a0c9b4402f..3db614c8b9dc 100644
--- a/mail/ftrack/pkg-descr
+++ b/mail/ftrack/pkg-descr
@@ -15,6 +15,3 @@ to correct founded mistakes more or less regulary and to produce new
 versions.
 
 WWW: http://ufm.kgb.ru/
-
--- Sergey Samoyloff
-gonza@techline.ru
diff --git a/mail/gubby/pkg-descr b/mail/gubby/pkg-descr
index 096ca39061d4..4bca9daa836c 100644
--- a/mail/gubby/pkg-descr
+++ b/mail/gubby/pkg-descr
@@ -4,8 +4,5 @@ colors, and will update the overview in real time, while using very low
 resources. Users can launch a specified mailreader by selecting a folder 
 and pressing enter.
 
-AUTHOR:	C.S. Larsen <csl@sublevel3.org>
+Author:	C.S. Larsen <csl@sublevel3.org>
 WWW:	http://gubby.sourceforge.net
-
-	- Michael L. Hostbaek
-	mich@FreeBSD.org
diff --git a/mail/hbiff/pkg-descr b/mail/hbiff/pkg-descr
index e5f2c4bb27df..241e0c2100ca 100644
--- a/mail/hbiff/pkg-descr
+++ b/mail/hbiff/pkg-descr
@@ -5,6 +5,3 @@ traditional xbiff.  In addition, if you click on the hbiff icon, a window
 will popup showing the mail headers.  This makes hbiff better than xlbiff
 where privacy is an issue since the headers are only displayed when you
 request.  hbiff can also run the MUA for you.
-
--- David O'Brien
-   (obrien@nuxi.com)
diff --git a/mail/lbdb/pkg-descr b/mail/lbdb/pkg-descr
index ab74e9bbe835..ca5aa45334f9 100644
--- a/mail/lbdb/pkg-descr
+++ b/mail/lbdb/pkg-descr
@@ -3,6 +3,3 @@ from mails you received and then offer these addresses as well as data
 received using the finger command using mutt's external query feature.
 
 WWW: http://www.spinnaker.de/lbdb/
-
---
-mwest@uct.ac.za
diff --git a/mail/libesmtp/pkg-descr b/mail/libesmtp/pkg-descr
index b464f671ad6b..625565c7f809 100644
--- a/mail/libesmtp/pkg-descr
+++ b/mail/libesmtp/pkg-descr
@@ -14,6 +14,3 @@ workstations which only need them to provide a sendmail command for a
 mail client to post its mail.
 
 WWW: http://www.stafford.uklinux.net/libesmtp/
-
--- jmc
-jmcoopr@webmail.bmi.net
diff --git a/mail/listmanager/pkg-descr b/mail/listmanager/pkg-descr
index be4d31a2167e..a2cf158416a8 100644
--- a/mail/listmanager/pkg-descr
+++ b/mail/listmanager/pkg-descr
@@ -12,5 +12,4 @@ Some features include:
 	[...]
 
 Author: Murray S. Kucherawy <msk@blackops.org>
-
 WWW: http://www.listmanager.org/
diff --git a/mail/mailfront/pkg-descr b/mail/mailfront/pkg-descr
index ff5b60765047..ca2330e9c8f9 100644
--- a/mail/mailfront/pkg-descr
+++ b/mail/mailfront/pkg-descr
@@ -8,6 +8,5 @@ support for SMTP AUTH.  The other rejects all SMTP commands if
 $SMTPREJECT is set, and execs its command line otherwise (in order to
 run the above program).
 
-
 Author:	Bruce Guenter <bruceg@em.ca>
 WWW:	http://untroubled.org/mailfront/
diff --git a/mail/majordomo/pkg-descr b/mail/majordomo/pkg-descr
index 3c852cc437c9..3e1179603d8a 100644
--- a/mail/majordomo/pkg-descr
+++ b/mail/majordomo/pkg-descr
@@ -8,11 +8,7 @@ Majordomo is a program which automates the management of Internet
      charge for another. From latin "major domus" - "master of the
      house". _
      
-
 Be sure to read /usr/local/majordomo/doc/post-install-notes for important
 configuration details after installation.
 
---
-j.
-
 WWW: http://www.greatcircle.com/majordomo/
diff --git a/mail/mavbiff/pkg-descr b/mail/mavbiff/pkg-descr
index 52ca9e08072c..21c8f7f497e0 100644
--- a/mail/mavbiff/pkg-descr
+++ b/mail/mavbiff/pkg-descr
@@ -3,5 +3,4 @@ arrives in one of them, the button of the mailbox will change colour.
 Pressing that button will popup the mailbox to the front.
 
 Author: Edwin Groothuis, edwin@mavetju.org
-
 WWW: http://www.mavetju.org/unix/general.php
diff --git a/mail/minimalist/pkg-descr b/mail/minimalist/pkg-descr
index 35bee43ca90a..734585287251 100644
--- a/mail/minimalist/pkg-descr
+++ b/mail/minimalist/pkg-descr
@@ -18,7 +18,5 @@ Minimalist has also a notion of 'trusted users'. They have full rights to
 subscribe/unsubscribe other users; get any information related to lists and
 users.
 
-author: Vladimir Litovka, doka@kiev.sovam.com
+Author: Vladimir Litovka, doka@kiev.sovam.com
 WWW: http://www.mml.org.ua/
-
-Ported to FreeBSD by Gianmarco (gmarco@giovannelli.it)
diff --git a/mail/mreport/pkg-descr b/mail/mreport/pkg-descr
index aebe54251580..c18d30dcc35c 100644
--- a/mail/mreport/pkg-descr
+++ b/mail/mreport/pkg-descr
@@ -10,5 +10,3 @@ how well their mail server configuration is
 holding up.
 
 Author: Jason Armstrong <jason@datrix.co.za>
-
---Will <andrews@technologist.com>
diff --git a/mail/normalizemime/pkg-descr b/mail/normalizemime/pkg-descr
index 2722a55daaa0..5fa5f8d46fa7 100644
--- a/mail/normalizemime/pkg-descr
+++ b/mail/normalizemime/pkg-descr
@@ -8,5 +8,3 @@ set. Also appends a copy of message body with HTML removed (IMG and
 A tags remain unaffected).
 
 WWW: http://hyvatti.iki.fi/~jaakko/spam/
-
--- lioux@FreeBSD.org
diff --git a/mail/p5-MIME-Charset/pkg-descr b/mail/p5-MIME-Charset/pkg-descr
index eaab9161c74e..8cae08551044 100644
--- a/mail/p5-MIME-Charset/pkg-descr
+++ b/mail/p5-MIME-Charset/pkg-descr
@@ -1,6 +1,5 @@
 MIME::Charset provides informations about character sets used for MIME
 messages on Internet.
 
-
 Author: <hatuka@nezumi.nu>
 WWW: http://search.cpan.org/dist/MIME-Charset/
diff --git a/mail/p5-MIME-EncWords/pkg-descr b/mail/p5-MIME-EncWords/pkg-descr
index 3c339cf3c1c3..1f3b4f666b87 100644
--- a/mail/p5-MIME-EncWords/pkg-descr
+++ b/mail/p5-MIME-EncWords/pkg-descr
@@ -4,6 +4,5 @@ MIME::EncWords is aimed to be another implimentation of MIME::Words so
     descriptions are inherited from its inspirer, with description of
     improvements and clarifications added.*
 
-
 Author: <hatuka@nezumi.nu>
 WWW: http://search.cpan.org/dist/MIME-EncWords/
diff --git a/mail/p5-Mail-Audit-Attach/pkg-descr b/mail/p5-Mail-Audit-Attach/pkg-descr
index 76fc848d8a26..dc64144de277 100644
--- a/mail/p5-Mail-Audit-Attach/pkg-descr
+++ b/mail/p5-Mail-Audit-Attach/pkg-descr
@@ -2,5 +2,5 @@ This is a Mail::Audit plugin which provides easy access to files attached
 to mail messages. Besides Mail::Audit, it requires the MIME::Entity 
 module.
 
-WWW: http://search.cpan.org/dist/Mail-Audit-Attach
 Author: Christian Renz <crenz@web42.com>
+WWW: http://search.cpan.org/dist/Mail-Audit-Attach
diff --git a/mail/p5-Mail-Box/pkg-descr b/mail/p5-Mail-Box/pkg-descr
index 82c7eb9e5f0a..27ffbf1715be 100644
--- a/mail/p5-Mail-Box/pkg-descr
+++ b/mail/p5-Mail-Box/pkg-descr
@@ -4,5 +4,3 @@ although its interface is different.
 
 Author: Mark Overmeer <mark@overmeer.net>
 WWW: http://search.cpan.org/dist/Mail-Box/
-
---will
diff --git a/mail/p5-Mail-Bulkmail/pkg-descr b/mail/p5-Mail-Bulkmail/pkg-descr
index ea4e260dcc77..ff867cad4d85 100644
--- a/mail/p5-Mail-Bulkmail/pkg-descr
+++ b/mail/p5-Mail-Bulkmail/pkg-descr
@@ -2,5 +2,3 @@ Mail::Bulkmail is a platform-independent mailing list module.
 
 Author: James A. Thompson III <jim3@psynet.net>
 WWW: http://search.cpan.org/dist/Mail-Bulkmail/
-
---will
diff --git a/mail/p5-Mail-ClamAV/pkg-descr b/mail/p5-Mail-ClamAV/pkg-descr
index 8c327359a366..dc3fd9956433 100644
--- a/mail/p5-Mail-ClamAV/pkg-descr
+++ b/mail/p5-Mail-ClamAV/pkg-descr
@@ -1,6 +1,5 @@
 Clam AntiVirus is an anti-virus toolkit for UNIX. This module provide a simple
 interface to it's C API.
 
+Author: Scott Beck <sbeck@gossamer-threads.com>
 WWW: http://search.cpan.org/dist/Mail-ClamAV/
-
-Author Scott Beck <sbeck@gossamer-threads.com>
diff --git a/mail/p5-Mail-FilterXML/pkg-descr b/mail/p5-Mail-FilterXML/pkg-descr
index 43491d00b9a9..cffaf412a0d3 100644
--- a/mail/p5-Mail-FilterXML/pkg-descr
+++ b/mail/p5-Mail-FilterXML/pkg-descr
@@ -3,5 +3,3 @@ manner that filter rules can be written in XML form.
 
 Author: Matthew MacKenzie <mattmk@cpan.org>
 WWW: http://search.cpan.org/dist/Mail-FilterXML/
-
---will
diff --git a/mail/p5-Mail-Freshmeat/pkg-descr b/mail/p5-Mail-Freshmeat/pkg-descr
index 2e6963bab50f..70ca7c0037c3 100644
--- a/mail/p5-Mail-Freshmeat/pkg-descr
+++ b/mail/p5-Mail-Freshmeat/pkg-descr
@@ -9,5 +9,3 @@ procmail filter.)
 
 Author: Adam Spiers <adam@spiers.net>
 WWW: http://search.cpan.org/dist/Mail-Freshmeat/
-
---will
diff --git a/mail/p5-Mail-GnuPG/pkg-descr b/mail/p5-Mail-GnuPG/pkg-descr
index 4a29e9ba0755..a9a50675293e 100644
--- a/mail/p5-Mail-GnuPG/pkg-descr
+++ b/mail/p5-Mail-GnuPG/pkg-descr
@@ -3,6 +3,5 @@ email.
 
 Please send all bugs/issues/patches to bug-Mail-GnuPG@rt.cpan.org
 
-WWW: http://search.cpan.org/dist/Mail-GnuPG/
-
 Author: Robert Spier <rspier@cpan.org>
+WWW: http://search.cpan.org/dist/Mail-GnuPG/
diff --git a/mail/p5-Mail-Graph/pkg-descr b/mail/p5-Mail-Graph/pkg-descr
index cf744039292e..7caefa745966 100644
--- a/mail/p5-Mail-Graph/pkg-descr
+++ b/mail/p5-Mail-Graph/pkg-descr
@@ -3,6 +3,5 @@ Mail::Graph - visualize mails via graphs (spams, bug reports etc)
 In the directory samples/ is a short example. For a real-life example
 please visit <http://bloodgate.com/spams/>.
 
-WWW: http://search.cpan.org/dist/Mail-Graph/
-
 Author: TELS <tels@cpan.org>
+WWW: http://search.cpan.org/dist/Mail-Graph/
diff --git a/mail/p5-Mail-IMAPTalk/pkg-descr b/mail/p5-Mail-IMAPTalk/pkg-descr
index b7904cdbad19..543f3349b258 100644
--- a/mail/p5-Mail-IMAPTalk/pkg-descr
+++ b/mail/p5-Mail-IMAPTalk/pkg-descr
@@ -25,5 +25,5 @@ issue a command by calling a method, and the command will block until the
 appropriate response is returned. The method will then return the parsed 
 results from the given command.
 
-WWW: http://search.cpan.org/dist/Mail-IMAPTalk
 Author: Rob Mueller <cpan@robm.fastmail.fm>
+WWW: http://search.cpan.org/dist/Mail-IMAPTalk
diff --git a/mail/p5-Mail-MailStats/pkg-descr b/mail/p5-Mail-MailStats/pkg-descr
index 37facd3970f4..4f06634aad5e 100644
--- a/mail/p5-Mail-MailStats/pkg-descr
+++ b/mail/p5-Mail-MailStats/pkg-descr
@@ -2,5 +2,3 @@ Mail::Stats is a perl module that tells how many new mail messages
 are in procmail-generated mailboxes.
 
 Author: Sean Dague <sean@dague.net>
-
---will
diff --git a/mail/p5-Mail-Mbox-MessageParser/pkg-descr b/mail/p5-Mail-Mbox-MessageParser/pkg-descr
index daf214464f8b..16b02e7d3a4f 100644
--- a/mail/p5-Mail-Mbox-MessageParser/pkg-descr
+++ b/mail/p5-Mail-Mbox-MessageParser/pkg-descr
@@ -2,6 +2,5 @@ Mail::Mbox::MessageParser is a feature-poor but very fast mbox parser. It uses
 the best of three strategies for parsing a mailbox: either using cached folder
 information, GNU grep, or highly optimized Perl.
 
-WWW: http://m-m-msgparser.sourceforge.net/
-
 Author: David Coppit <david@coppit.org>
+WWW: http://m-m-msgparser.sourceforge.net/
diff --git a/mail/p5-Mail-RBL/pkg-descr b/mail/p5-Mail-RBL/pkg-descr
index 0ccdc597a15e..b89dcb525b3f 100644
--- a/mail/p5-Mail-RBL/pkg-descr
+++ b/mail/p5-Mail-RBL/pkg-descr
@@ -13,5 +13,5 @@ The methods available are described below:
     addresses is in the list, the host will be considered in the list as
     a whole.
 
-AUTHOR: Luis E. Munoz <lem@cantv.net>
+Author: Luis E. Munoz <lem@cantv.net>
 WWW: http://search.cpan.org/dist/Mail-RBL/
diff --git a/mail/popa3d/pkg-descr b/mail/popa3d/pkg-descr
index 811ace934acd..f87aa298f3fc 100644
--- a/mail/popa3d/pkg-descr
+++ b/mail/popa3d/pkg-descr
@@ -17,6 +17,3 @@ for normal usage. However, it is possible to build a stand-alone
 version, should you need better performance. 
 
 WWW: http://www.openwall.com/popa3d/
-
--- Sergey Samoyloff
-gonza@techline.ru
diff --git a/mail/py-libgmail/pkg-descr b/mail/py-libgmail/pkg-descr
index 928a2b55b780..505a517d6ae6 100644
--- a/mail/py-libgmail/pkg-descr
+++ b/mail/py-libgmail/pkg-descr
@@ -1,5 +1,5 @@
 The libgmail project is a pure Python binding to provide access to Google's
 Gmail web-mail service.
 
-WWW: http://libgmail.sourceforge.net/
 Author:	Ying-Chieh Liao <ijliao@csie.nctu.edu.tw>
+WWW: http://libgmail.sourceforge.net/
diff --git a/mail/qmqtool/pkg-descr b/mail/qmqtool/pkg-descr
index 5579fa39ed7a..195fd43e05dc 100644
--- a/mail/qmqtool/pkg-descr
+++ b/mail/qmqtool/pkg-descr
@@ -6,5 +6,4 @@ showing stats, requeue messages, queue consistency check, queue
 backup/restore, and others.
 
 Author: Jeremy Kister
-
 WWW: http://jeremy.kister.net/code/qmqtool/
diff --git a/mail/rss2email/pkg-descr b/mail/rss2email/pkg-descr
index c9f02c42269f..f718b6776836 100644
--- a/mail/rss2email/pkg-descr
+++ b/mail/rss2email/pkg-descr
@@ -1,5 +1,5 @@
 rss2email is a simple Python script that lets you subscribe to a
 list of XML newsfeeds and get new items sent to you by email.
 
-WWW: http://rss2email.infogami.com/
 Author: Aaron Swartz <me@aaronsw.com>
+WWW: http://rss2email.infogami.com/
diff --git a/mail/sccmilter/pkg-descr b/mail/sccmilter/pkg-descr
index 52a55ef5ab87..a35b77efd1ad 100644
--- a/mail/sccmilter/pkg-descr
+++ b/mail/sccmilter/pkg-descr
@@ -20,5 +20,4 @@ Any other features (content filtering, attachment checking) are
 planned, but not imlemented this release.
 
 Author: Rashid N. Achilov <shelton@granch.ru>
-
 WWW: http://granch.ru/~shelton/
diff --git a/mail/smtprc/pkg-descr b/mail/smtprc/pkg-descr
index 84e31e098519..2a7da1360ffa 100644
--- a/mail/smtprc/pkg-descr
+++ b/mail/smtprc/pkg-descr
@@ -3,8 +3,5 @@ It supports scanning of IP blocks, and can print the results to a Web
 page. It is intended for Systems Administrators to check IP blocks 
 under their control
 
-WWW:		http://smtprc.sourceforge.net
-AUTHOR:		Spencer Hardy <diceman@dircon.co.uk>
-
-       - Michael L. Hostbaek
-       mich@FreeBSD.org
+Author: Spencer Hardy <diceman@dircon.co.uk>
+WWW: http://smtprc.sourceforge.net
diff --git a/mail/t-prot/pkg-descr b/mail/t-prot/pkg-descr
index aa18211aaed2..74499bcb1259 100644
--- a/mail/t-prot/pkg-descr
+++ b/mail/t-prot/pkg-descr
@@ -11,5 +11,4 @@ support for Mutt), but it can also be used in MTA/MDA - e.g. for immediately
 bouncing "improper" messages.
 
 Author:	Jochen Striepe <t-prot@tolot.escape.de>
-
 WWW:	http://www.escape.de/~tolot/mutt/
diff --git a/mail/tmda/pkg-descr b/mail/tmda/pkg-descr
index 7abb3ebe85fa..1deaced01b4c 100644
--- a/mail/tmda/pkg-descr
+++ b/mail/tmda/pkg-descr
@@ -16,5 +16,4 @@ TMDA can also be used as a general purpose local mail delivery agent to filter,
 sort, deliver and dispose of incoming mail.
 
 Author:	Jason R. Mastaler
-
 WWW:	http://tmda.net/
diff --git a/mail/wanderlust-devel/pkg-descr b/mail/wanderlust-devel/pkg-descr
index 7cfc210da14b..e147033d2354 100644
--- a/mail/wanderlust-devel/pkg-descr
+++ b/mail/wanderlust-devel/pkg-descr
@@ -19,5 +19,3 @@ The features of Wanderlust are as follows:
  * Automatic expiration of old messages.
 
 WWW:	http://www.gohome.org/wl/
---
-MANTANI Nobutaka <nobutaka@FreeBSD.org>
diff --git a/mail/wanderlust/pkg-descr b/mail/wanderlust/pkg-descr
index d738a7892d2c..e147033d2354 100644
--- a/mail/wanderlust/pkg-descr
+++ b/mail/wanderlust/pkg-descr
@@ -19,5 +19,3 @@ The features of Wanderlust are as follows:
  * Automatic expiration of old messages.
 
 WWW:	http://www.gohome.org/wl/
---
-MANTANI Nobutaka <nobutaka@nobutaka.com>
diff --git a/mail/xlbiff/pkg-descr b/mail/xlbiff/pkg-descr
index 5bad403da2d8..8c1919f5c467 100644
--- a/mail/xlbiff/pkg-descr
+++ b/mail/xlbiff/pkg-descr
@@ -14,5 +14,3 @@ If you're a Berkeley mail person, you can set scanCommand to:
 Or use the ``frm'' utility that is part of the Elm port as your
 scanCommand.  A simular utility is the ``fromwho'' package, posted to
 comp.sources.unix volume 25.
-
--- David	(obrien@cs.ucdavis.edu)