Standardize WWW: tags a bit more:

1. Remove white space from the beginning of lines
2. Make the canonical WWW the last line of the file
3. Remove lines to the effect of, "More information can be found at..."
   that's the stated purpose of the WWW: tags in the first place.
4. Change secondary WWW: lines to use other text to avoid confusion

While I'm here, remove some more useless Author: lines, and some
prepended white space to other lines.

Mentioned (in part) by:	Matthew Seaman <m.seaman@infracaninophile.co.uk>

25 files changed, 59 insertions, 66 deletions

diff --git a/audio/libdssialsacompat/pkg-descr b/audio/libdssialsacompat/pkg-descr
index 3dce30b13ee3..9231a7fa4cd7 100644
--- a/audio/libdssialsacompat/pkg-descr
+++ b/audio/libdssialsacompat/pkg-descr
@@ -2,8 +2,5 @@ libdssialsacompat is simply an extraction from and repackaging of
 the code from alsa-lib 1.0.8, necessary to support DSSI on non-ALSA
 systems.
 
-  WWW: http://www.smbolton.com/linux.html
-
-More information on DSSI can be found at:
-
-  WWW: http://dssi.sourceforge.net/
+WWW: http://www.smbolton.com/linux.html
+WWW: http://dssi.sourceforge.net/
diff --git a/audio/pd/pkg-descr b/audio/pd/pkg-descr
index 0965f122d61b..e75c2aea5635 100644
--- a/audio/pd/pkg-descr
+++ b/audio/pd/pkg-descr
@@ -5,5 +5,6 @@ via Mark Dank's GEM package, Pd can be used for simultaneous computer
 animation and computer audio.  Second, an experimental facility is provided
 for defining and accessing data structures.
 
+Unofficial web site: http://puredata.org/
+
 WWW: http://www-crca.ucsd.edu/~msp/software.html
-Unofficial WWW: http://puredata.org/
diff --git a/devel/elfsh/pkg-descr b/devel/elfsh/pkg-descr
index a74af3759856..74ac79b07586 100644
--- a/devel/elfsh/pkg-descr
+++ b/devel/elfsh/pkg-descr
@@ -14,4 +14,4 @@ remapping features, ET_REL injection into ET_EXEC (with bss and
 symtab merging support), disassembly (with good resolving) on 
 i386 binaries with libasm, and much more. 
 
- WWW: http://elfsh.asgardlabs.org/
+WWW: http://elfsh.asgardlabs.org/
diff --git a/devel/p5-Getopt-GUI-Long/pkg-descr b/devel/p5-Getopt-GUI-Long/pkg-descr
index 661d1c236688..8dc1e1dc3049 100644
--- a/devel/p5-Getopt-GUI-Long/pkg-descr
+++ b/devel/p5-Getopt-GUI-Long/pkg-descr
@@ -16,4 +16,4 @@ the original Getopt::Long module to:
    CGI script then it will automatically prompt the user for the same
    variables.
 
- WWW:	http://search.cpan.org/dist/Getopt-GUI-Long/
+WWW: http://search.cpan.org/dist/Getopt-GUI-Long/
diff --git a/graphics/dataplot/pkg-descr b/graphics/dataplot/pkg-descr
index 2016d060bae2..517ba63f93a8 100644
--- a/graphics/dataplot/pkg-descr
+++ b/graphics/dataplot/pkg-descr
@@ -8,7 +8,7 @@ engineering processes.
 The original version was released by James J. Filliben in 1978 with 
 continual enhancements to present.
 
-	WWW: http://www.itl.nist.gov/div898/software/dataplot.html/
-____________
 NOTE: This port only includes the command line tool, the website has an 
 experimental GUI tool that uses expect and extensive reference manuals.
+
+WWW: http://www.itl.nist.gov/div898/software/dataplot.html/
diff --git a/graphics/dynamechs/pkg-descr b/graphics/dynamechs/pkg-descr
index cc2e53756608..86c403050e95 100644
--- a/graphics/dynamechs/pkg-descr
+++ b/graphics/dynamechs/pkg-descr
@@ -18,4 +18,4 @@ Ohio State University, 2000.
 
 (c) 1994 - 2001 by Scott McMillan
 
-	WWW: http://dynamechs.sourceforge.net/
+WWW: http://dynamechs.sourceforge.net/
diff --git a/graphics/xglurbules/pkg-descr b/graphics/xglurbules/pkg-descr
index e3060de92ac6..bcbd42102acf 100644
--- a/graphics/xglurbules/pkg-descr
+++ b/graphics/xglurbules/pkg-descr
@@ -4,4 +4,4 @@ Requires X11 and shared memory helps.
 
 There's a screenshot or four at :
 
- WWW:	http://stephenroome.com/xglurbules/
+WWW: http://stephenroome.com/xglurbules/
diff --git a/lang/sr/pkg-descr b/lang/sr/pkg-descr
index ec3296316bcf..dc8e8ade8626 100644
--- a/lang/sr/pkg-descr
+++ b/lang/sr/pkg-descr
@@ -1,17 +1,17 @@
-  SR is a programming language "Synchronization Resource", development
-  in the University of Arizona.
+SR is a programming language "Synchronization Resource", development
+in the University of Arizona.
 
-  It is designed for writing concurrent programs. You can run
-  SR program in you local net (by installing SR daemons on startup
-  on all your machines), and specify a number of SR processes in one 
-  machine.
+It is designed for writing concurrent programs. You can run
+SR program in you local net (by installing SR daemons on startup
+on all your machines), and specify a number of SR processes in one 
+machine.
 
-  SR has nice interface with X11 and xtango.
+SR has nice interface with X11 and xtango.
 
-  Syntax of language  is pascal-like, for all references to documentation,
-  web links and examples please look at its own README, which situated
-  in /usr/local/share/doc/sr/notes/README.
+Syntax of language  is pascal-like, for all references to documentation,
+web links and examples please look at its own README, which situated
+in /usr/local/share/doc/sr/notes/README.
 
-  Enjoy.
+Enjoy.
 
-  WWW: http://www.cs.arizona.edu/sr
+WWW: http://www.cs.arizona.edu/sr
diff --git a/mail/rbl-milter/pkg-descr b/mail/rbl-milter/pkg-descr
index f4c851dd6fb8..2782fa8adffb 100644
--- a/mail/rbl-milter/pkg-descr
+++ b/mail/rbl-milter/pkg-descr
@@ -7,7 +7,6 @@ potential spam rather than just blocking it in case you loose
 legitimate messages.  Note that the X-RBL-Warning header is only set if
 the site was found to be an open-relay.
 
-For more information, see the rbl-milter website at:
-  WWW: http://opensource.confusticate.com/rbl-milter/
-RBL-Milter was created by Jeremy Beker <gothmog@confusticate.com> and
-the port is maintained by Ned Wolpert <wolpert@codeheadsystems.com>
+RBL-Milter was created by Jeremy Beker <gothmog@confusticate.com>
+
+WWW: http://opensource.confusticate.com/rbl-milter/
diff --git a/net-im/komclean/pkg-descr b/net-im/komclean/pkg-descr
index e01cb68b4f45..5ee0f132bd40 100644
--- a/net-im/komclean/pkg-descr
+++ b/net-im/komclean/pkg-descr
@@ -1,4 +1,4 @@
- KOMclean as a LysKOM client gives you a tray icon which can be used
- to open your browser to view the UI. The UI is HTML based.
+KOMclean as a LysKOM client gives you a tray icon which can be used
+to open your browser to view the UI. The UI is HTML based.
 
- WWW: http://komclean.sourceforge.net
+WWW: http://komclean.sourceforge.net
diff --git a/net/p5-Gopher-Server/pkg-descr b/net/p5-Gopher-Server/pkg-descr
index db0c22500985..1c2c80c7ea91 100644
--- a/net/p5-Gopher-Server/pkg-descr
+++ b/net/p5-Gopher-Server/pkg-descr
@@ -1,3 +1,3 @@
 Backend for Gopher Servers
 
-    WWW: http://search.cpan.org/dist/Gopher-Server/
+WWW: http://search.cpan.org/dist/Gopher-Server/
diff --git a/net/p5-Net-Gopher/pkg-descr b/net/p5-Net-Gopher/pkg-descr
index 77d407f4d52f..21c4ee22ce01 100644
--- a/net/p5-Net-Gopher/pkg-descr
+++ b/net/p5-Net-Gopher/pkg-descr
@@ -1,4 +1,4 @@
 Net::Gopher is the Perl Gopher/Gopher+ API. This library will enable you to
 communicate with Gopher and Gopher+ servers using Perl.
 
-    WWW: http://search.cpan.org/dist/Net-Gopher/
+WWW: http://search.cpan.org/dist/Net-Gopher/
diff --git a/net/p5-Net-MAC/pkg-descr b/net/p5-Net-MAC/pkg-descr
index fd0a1fbd8304..426852460c64 100644
--- a/net/p5-Net-MAC/pkg-descr
+++ b/net/p5-Net-MAC/pkg-descr
@@ -4,4 +4,4 @@ The Perl 5 module Net::MAC allows you to
     - convert a MAC address into a specified format
     - easily compare two MAC addresses for string or numeric equality
 
- WWW: http://search.cpan.org/dist/Net-MAC/
+WWW: http://search.cpan.org/dist/Net-MAC/
diff --git a/palm/jpilot-db/pkg-descr b/palm/jpilot-db/pkg-descr
index c18f4b945513..cccc08a3ee5a 100644
--- a/palm/jpilot-db/pkg-descr
+++ b/palm/jpilot-db/pkg-descr
@@ -3,5 +3,6 @@ application for creating and editing database files that can be read on the
 Palm with pilot-db. Together, these two applications provide a complete
 desktop <-> palm solutions for your database needs.
 
+pilot-db web site: http://pilot-db.sourceforge.net/
+
 WWW: http://www.chickenshick.com/jpilot-db/
-pilot-db WWW: http://pilot-db.sourceforge.net/
diff --git a/security/tuntun/pkg-descr b/security/tuntun/pkg-descr
index c529ce002913..ebb5dfcd7589 100644
--- a/security/tuntun/pkg-descr
+++ b/security/tuntun/pkg-descr
@@ -9,4 +9,4 @@ Main features
    daemon)
  * Support for Auth and Private-Key OpenVPN authentication methods
 
- WWW:	http://code.google.com/p/tuntun/
+WWW: http://code.google.com/p/tuntun/
diff --git a/sysutils/pciutils/pkg-descr b/sysutils/pciutils/pkg-descr
index dfe4a2dc93f8..45352b2d5987 100644
--- a/sysutils/pciutils/pkg-descr
+++ b/sysutils/pciutils/pkg-descr
@@ -5,4 +5,4 @@ all PCI devices (very useful for debugging of both kernel and
 device drivers) and `setpci' for manual configuration of PCI
 devices.
 
- WWW: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
+WWW: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
diff --git a/www/dotclear/pkg-descr b/www/dotclear/pkg-descr
index 92e05ed5a89c..ca0a56c5062f 100644
--- a/www/dotclear/pkg-descr
+++ b/www/dotclear/pkg-descr
@@ -19,4 +19,4 @@ the most comfortable experience.
 	- Multi-user with permissions
 	- Multiblog
 
-  WWW:	http://dotclear.org/
+WWW: http://dotclear.org/
diff --git a/www/mod_jail/pkg-descr b/www/mod_jail/pkg-descr
index e15cd8965abf..38bf26b8cac0 100644
--- a/www/mod_jail/pkg-descr
+++ b/www/mod_jail/pkg-descr
@@ -4,5 +4,6 @@ It is similar to mod_chroot, but uses FreeBSD's specific system call -
 jail. Also mod_jail make it possible to change securelevel into jail
 prison.
 
+Original web site: http://igorpopov.newmail.ru/mod_jail/
+
 WWW: http://code.google.com/p/mod-jail/
-ORIG WWW: http://igorpopov.newmail.ru/mod_jail/
diff --git a/www/p5-WWW-Babelfish/pkg-descr b/www/p5-WWW-Babelfish/pkg-descr
index dc9611fa985b..d72487efce88 100644
--- a/www/p5-WWW-Babelfish/pkg-descr
+++ b/www/p5-WWW-Babelfish/pkg-descr
@@ -1,5 +1,4 @@
-  WWW::Babelfish is a perl interface to obtain translations of text from
-  babelfish.altavista.digital.com.
+WWW::Babelfish is a perl interface to obtain translations of text from
+babelfish.altavista.digital.com.
 
-Author: Daniel J. Urist <durist@world.std.com>
 WWW: http://search.cpan.org/dist/WWW-Babelfish/
diff --git a/www/p5-WWW-HatenaDiary/pkg-descr b/www/p5-WWW-HatenaDiary/pkg-descr
index 97deb46165f2..84a4cb6d56ac 100644
--- a/www/p5-WWW-HatenaDiary/pkg-descr
+++ b/www/p5-WWW-HatenaDiary/pkg-descr
@@ -2,4 +2,4 @@ WWW::HatenaDiary provides a CRUD interface to Hatena::Diary,
 aiming to help you efficiently communicate with the service
 with programmatic ways.
 
-    WWW: http://search.cpan.org/dist/WWW-HatenaDiary/
+WWW: http://search.cpan.org/dist/WWW-HatenaDiary/
diff --git a/www/p5-WWW-Mechanize-DecodedContent/pkg-descr b/www/p5-WWW-Mechanize-DecodedContent/pkg-descr
index 45ca2bc43f27..7ddd36ab9d49 100644
--- a/www/p5-WWW-Mechanize-DecodedContent/pkg-descr
+++ b/www/p5-WWW-Mechanize-DecodedContent/pkg-descr
@@ -1,5 +1,4 @@
-  WWW::Mechanize::DecodedContent is a plugin to add
-  decoded_content utility method to WWW::Mechanize.
+WWW::Mechanize::DecodedContent is a plugin to add
+decoded_content utility method to WWW::Mechanize.
 
-Author:	Tatsuhiko Miyagawa <miyagawa@bulknews.net>
-WWW:	http://search.cpan.org/dist/WWW-Mechanize-DecodedContent/
+WWW: http://search.cpan.org/dist/WWW-Mechanize-DecodedContent/
diff --git a/www/p5-WWW-Mechanize-Plugin-phpBB/pkg-descr b/www/p5-WWW-Mechanize-Plugin-phpBB/pkg-descr
index 2da2241d250a..8e4e7ca538fc 100644
--- a/www/p5-WWW-Mechanize-Plugin-phpBB/pkg-descr
+++ b/www/p5-WWW-Mechanize-Plugin-phpBB/pkg-descr
@@ -1,11 +1,10 @@
-  WWW::Mechanize::Plugin::phpBB is a screen scraper for phpBB driven forum 
-  sites. It can log into the phpBB web interface, pull forum and topics 
-  names and perform administrative tasks like deleting posts.
+WWW::Mechanize::Plugin::phpBB is a screen scraper for phpBB driven forum 
+sites. It can log into the phpBB web interface, pull forum and topics 
+names and perform administrative tasks like deleting posts.
 
-  FUNCTIONALITY IS CURRENTLY LIMITED, READ ON WHAT'S AVAILABLE SO FAR.
+FUNCTIONALITY IS CURRENTLY LIMITED, READ ON WHAT'S AVAILABLE SO FAR.
 
-  WWW::Mechanize::Plugin::phpBB is implemented as a plugin to 
-  WWW::Mechanize, using Joe McMahon's WWW::Mechanize::Pluggable framework.
+WWW::Mechanize::Plugin::phpBB is implemented as a plugin to 
+WWW::Mechanize, using Joe McMahon's WWW::Mechanize::Pluggable framework.
 
-Author: Mike Schilli <m@perlmeister.com>
 WWW: http://search.cpan.org/dist/WWW-Mechanize-Plugin-phpBB/
diff --git a/www/p5-WWW-Mechanize/pkg-descr b/www/p5-WWW-Mechanize/pkg-descr
index 84ed00211aa6..1433f450a04f 100644
--- a/www/p5-WWW-Mechanize/pkg-descr
+++ b/www/p5-WWW-Mechanize/pkg-descr
@@ -1,6 +1,5 @@
-  WWW::Mechanize is a fork of Kirrily Robert's excellent WWW::Automate
-  module.  W::A works fine except for some memory-eating bugs that the
-  author of this module has fixed.
+WWW::Mechanize is a fork of Kirrily Robert's excellent WWW::Automate
+module.  W::A works fine except for some memory-eating bugs that the
+author of this module has fixed.
 
-Author: Andy Lester <andy@petdance.com>
-WWW:	http://search.cpan.org/dist/WWW-Mechanize/
+WWW: http://search.cpan.org/dist/WWW-Mechanize/
diff --git a/www/p5-WWW-Robot/pkg-descr b/www/p5-WWW-Robot/pkg-descr
index 4264d9c1bde7..17a8990dbfd8 100644
--- a/www/p5-WWW-Robot/pkg-descr
+++ b/www/p5-WWW-Robot/pkg-descr
@@ -1,5 +1,4 @@
-  WWW::Robot is a perl interface that provides a web traversal engine
-  for use in web robots.
+WWW::Robot is a perl interface that provides a web traversal engine
+for use in web robots.
 
-Author: Neil Bowers <neilb@cre.canon.co.uk>
 WWW: http://search.cpan.org/dist/WWW-Robot/
diff --git a/x11-wm/treewm/pkg-descr b/x11-wm/treewm/pkg-descr
index 29170be3b746..2380e41862b6 100644
--- a/x11-wm/treewm/pkg-descr
+++ b/x11-wm/treewm/pkg-descr
@@ -3,7 +3,6 @@ the client windows the user can create desktops which can themselves contain
 windows and desktops. By arranging the windows in such a tree the user is able
 to manage his tasks efficiently.
 
-See also the author's website about treewm:
-  WWW: http://treewm.sourceforge.net/
-and mine:
-  WWW: http://www.informatik.uni-frankfurt.de/~polzer/treewmdurchnull/
+More info: http://www.informatik.uni-frankfurt.de/~polzer/treewmdurchnull/
+
+WWW: http://treewm.sourceforge.net/