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

26 files changed, 28 insertions, 35 deletions

diff --git a/audio/autozen/pkg-descr b/audio/autozen/pkg-descr
index fc9be17cdd37..49b18cd8b474 100644
--- a/audio/autozen/pkg-descr
+++ b/audio/autozen/pkg-descr
@@ -1,4 +1,4 @@
-adapted from the Web page:
+Adapted from the Web page:
 
 AutoZen generates sounds meant to cause the user's brain waves to
 shift to a different dominant frequency, resulting in an altered
diff --git a/audio/bmp-scrobbler/pkg-descr b/audio/bmp-scrobbler/pkg-descr
index 8fac6800b59c..512cbe3f21b5 100644
--- a/audio/bmp-scrobbler/pkg-descr
+++ b/audio/bmp-scrobbler/pkg-descr
@@ -1,5 +1,5 @@
 This is a BMP Plugin which sends the Playlist data to
 audioscrobbler.com
 
-WWW:	http://www.audioscrobbler.com
 Author:	pipian@pipian.com
+WWW:	http://www.audioscrobbler.com
diff --git a/audio/ermixer/pkg-descr b/audio/ermixer/pkg-descr
index 85892e8dc6a9..7e09c6cf111f 100644
--- a/audio/ermixer/pkg-descr
+++ b/audio/ermixer/pkg-descr
@@ -2,9 +2,7 @@ Ermixer is a command-line, ncurses, and Qt-GUI OSS audio mixer that looks
 very nice in GUI mode, and can save and restore multiple named profiles. It
 also has a command-line mode that makes it useful in scripts.
 
-WWW: http://ermixer.sourceforge.net/
-
 P.S. I have found the holy grail! Now I don't need to install kdemultimedia
-just to get a bloody mixer!
+just to get a bloody mixer!  -- AlanE (KDE-FreeBSD Team)
 
--- AlanE (KDE-FreeBSD Team)
+WWW: http://ermixer.sourceforge.net/
diff --git a/audio/exaile/pkg-descr b/audio/exaile/pkg-descr
index a7ff58551f22..622e5a2c0a30 100644
--- a/audio/exaile/pkg-descr
+++ b/audio/exaile/pkg-descr
@@ -4,5 +4,5 @@ information via Wikipedia, Last.fm scrobbling, support for many portable
 media players including iPods, internet radio such as shoutcast, and tabbed
 playlists.
 
-WWW: http://www.exaile.org/
 Author: Adam Olsen <arolsen@gmail.com>
+WWW: http://www.exaile.org/
diff --git a/audio/fdmf/pkg-descr b/audio/fdmf/pkg-descr
index 3130f53f70e1..6ed503be8cca 100644
--- a/audio/fdmf/pkg-descr
+++ b/audio/fdmf/pkg-descr
@@ -5,5 +5,5 @@ fingerprint, or perceptual hash to recognize the duplicate files. It is
 currently under heavy development, so it might be buggy, broken, or
 otherwise bad. But it works for me.
 
-WWW: http://www.w140.com/audio/
 Author: Kurt Rosenfeld <kurt at w140 dot com>
+WWW: http://www.w140.com/audio/
diff --git a/audio/gkrellmms/pkg-descr b/audio/gkrellmms/pkg-descr
index b6a79c134271..1df4dec4f1e2 100644
--- a/audio/gkrellmms/pkg-descr
+++ b/audio/gkrellmms/pkg-descr
@@ -1,5 +1,6 @@
 GKrellM XMMS Plugin
-Author: Sander Klein Lebbink <sander@cerberus.demon.nl>
-WWW: http://gkrellm.luon.net/gkrellmms.phtml
 
 A plugin for GKrellM, which allows you to control XMMS from within GKrellM.
+
+Author: Sander Klein Lebbink <sander@cerberus.demon.nl>
+WWW: http://gkrellm.luon.net/gkrellmms.phtml
diff --git a/audio/gkrellmvolume/pkg-descr b/audio/gkrellmvolume/pkg-descr
index 0d790fc5ab1c..07207745c2bd 100644
--- a/audio/gkrellmvolume/pkg-descr
+++ b/audio/gkrellmvolume/pkg-descr
@@ -1,5 +1,6 @@
 GKrellM volume plugin
-Author:  Sjoerd Simons <Sjoerd@donald-duck.ele.tue.nl>
-WWW: http://gkrellm.luon.net/volume.phtml
 
 A plugin for GKrellM, that lets you control your mixer..
+
+Author:  Sjoerd Simons <Sjoerd@donald-duck.ele.tue.nl>
+WWW: http://gkrellm.luon.net/volume.phtml
diff --git a/audio/gkrellmvolume2/pkg-descr b/audio/gkrellmvolume2/pkg-descr
index 48b9b41b15d0..0615af937aad 100644
--- a/audio/gkrellmvolume2/pkg-descr
+++ b/audio/gkrellmvolume2/pkg-descr
@@ -1,5 +1,6 @@
 GKrellM volume plugin
-Author:  Sjoerd Simons <Sjoerd@donald-duck.ele.tue.nl>
-WWW: http://gkrellm.luon.net/volume.phtml
 
 A plugin for gkrellm 2.0, that lets you control your mixer..
+
+Author:  Sjoerd Simons <Sjoerd@donald-duck.ele.tue.nl>
+WWW: http://gkrellm.luon.net/volume.phtml
diff --git a/audio/holyshout/pkg-descr b/audio/holyshout/pkg-descr
index a63cc17bf1da..e23c7fdbd68d 100644
--- a/audio/holyshout/pkg-descr
+++ b/audio/holyshout/pkg-descr
@@ -3,6 +3,3 @@ It also supports multiple bitrate streams. (re-encode using lame)
 
 WWW: http://www.icecast.org/
 WWW: http://www.shoutcast.com/
-
---
-Made by JunSeon Oh <hollywar@mail.holywar.net>
diff --git a/audio/id3mtag/pkg-descr b/audio/id3mtag/pkg-descr
index 3d9e07ecd3f6..80a60fc0baaf 100644
--- a/audio/id3mtag/pkg-descr
+++ b/audio/id3mtag/pkg-descr
@@ -2,5 +2,5 @@ Port of id3 mass tagger, a tool for manipulating id3, id3v2 and lyrics3 tags
 in multiple files. It can generate tag fields from the filename and other
 variables, and/or rename files, using an intuitive syntax.
 
-WWW: http://home.wanadoo.nl/squell/id3.html
 Author: squell <squell@alumina.nl>
+WWW: http://home.wanadoo.nl/squell/id3.html
diff --git a/audio/mcplay/pkg-descr b/audio/mcplay/pkg-descr
index 68669cfe71d2..5a00b69dc80a 100644
--- a/audio/mcplay/pkg-descr
+++ b/audio/mcplay/pkg-descr
@@ -7,5 +7,4 @@ Supported players currently include:
 - sox
 
 Author: Tobias Rapp
-
 WWW:	http://www.yahuxo.de/mcplay/
diff --git a/audio/mp3_check/pkg-descr b/audio/mp3_check/pkg-descr
index 0269d8a49ef8..0ffae81d1ad9 100644
--- a/audio/mp3_check/pkg-descr
+++ b/audio/mp3_check/pkg-descr
@@ -3,5 +3,5 @@ of mp3 audio files and prints useful statistics. This is handy
 for people who maintain libraries of mp3 files and need a way
 to verify their quality.
 
-WWW: http://mp3check.sourceforge.net/
 Author: Eric Bullen <ericb@thedeepsky.com>
+WWW: http://mp3check.sourceforge.net/
diff --git a/audio/mp3plot/pkg-descr b/audio/mp3plot/pkg-descr
index 9384a3faba04..85f9a4c2f621 100644
--- a/audio/mp3plot/pkg-descr
+++ b/audio/mp3plot/pkg-descr
@@ -1,5 +1,5 @@
 mp3plot prints out a plot of the bitrate distribution of a VBR MP3 file
 (it will also do it for CBR files although it isn't very meaningful).
 
-WWW: http://p.outlyer.net/mp3plot/
 Author: Toni Corvera < outlyer at gmail dot com >
+WWW: http://p.outlyer.net/mp3plot/
diff --git a/audio/optimfrog/pkg-descr b/audio/optimfrog/pkg-descr
index d1b7663f717c..a4660583d773 100644
--- a/audio/optimfrog/pkg-descr
+++ b/audio/optimfrog/pkg-descr
@@ -15,5 +15,5 @@ time on AMD Athlon XP 1800+ (the fastest mode encodes at 28.1x real-time
 and decodes at 24.7x real-time). Self-extracting (sfx) archives can also be
 created with a small overhead of just 54 KB.
 
-WWW: http://www.losslessaudio.org/
 Author: Florin Ghido <FlorinGhido@yahoo.com>
+WWW: http://www.losslessaudio.org/
diff --git a/audio/p5-Audio-FLAC-Header/pkg-descr b/audio/p5-Audio-FLAC-Header/pkg-descr
index ecf238a4e707..d8ff74dbdbb2 100644
--- a/audio/p5-Audio-FLAC-Header/pkg-descr
+++ b/audio/p5-Audio-FLAC-Header/pkg-descr
@@ -12,5 +12,5 @@ basic set of tags used for FLAC files include:
 * TRACKNUMBER
 * COMMENT
 
-WWW: http://search.cpan.org/dist/Audio-FLAC-Header/
 Author: Dan Sully <daniel@cpan.org>
+WWW: http://search.cpan.org/dist/Audio-FLAC-Header/
diff --git a/audio/p5-Audio-Musepack/pkg-descr b/audio/p5-Audio-Musepack/pkg-descr
index 51efd67e0e93..9113d679609d 100644
--- a/audio/p5-Audio-Musepack/pkg-descr
+++ b/audio/p5-Audio-Musepack/pkg-descr
@@ -3,5 +3,5 @@ Musepack file, as well as tag information contained in the Musepack
 file's APE tags. See Audio::APETags for more information about the
 tags.
 
-WWW: http://search.cpan.org/dist/Audio-Musepack/
 Author: Dan Sully <daniel@cpan.org>
+WWW: http://search.cpan.org/dist/Audio-Musepack/
diff --git a/audio/p5-Audio-Scrobbler/pkg-descr b/audio/p5-Audio-Scrobbler/pkg-descr
index 2f2e3bfb8afb..3bf55070539c 100644
--- a/audio/p5-Audio-Scrobbler/pkg-descr
+++ b/audio/p5-Audio-Scrobbler/pkg-descr
@@ -1,5 +1,5 @@
 The Audio-Scrobbler module provides a Perl and command-line interface
 to Last.fm's AudioScrobbler - http://www.audioscrobbler.com/.
 
-WWW:		http://devel.ringlet.net/audio/Audio-Scrobbler/
 Author:		Peter Pentchev <roam@ringlet.net>
+WWW:		http://devel.ringlet.net/audio/Audio-Scrobbler/
diff --git a/audio/p5-Filesys-Virtual-DAAP/pkg-descr b/audio/p5-Filesys-Virtual-DAAP/pkg-descr
index 79e1ce04ed9e..178642a84e6f 100644
--- a/audio/p5-Filesys-Virtual-DAAP/pkg-descr
+++ b/audio/p5-Filesys-Virtual-DAAP/pkg-descr
@@ -3,5 +3,4 @@ want to use Net::DAV::Server or POE::Component::Server::FTP to
 re-export it in a browseable form.
 
 Author: Richard Clamp <richardc@unixbeard.net>
-
 WWW: http://search.cpan.org/dist/Filesys-Virtual-DAAP/
diff --git a/audio/pacpl/pkg-descr b/audio/pacpl/pkg-descr
index 02f57fc17103..2806ef65932e 100644
--- a/audio/pacpl/pkg-descr
+++ b/audio/pacpl/pkg-descr
@@ -9,5 +9,5 @@ CD ripping function with CDDB support, batch and playlist conversion,
 tag preservation for most supported formats, independent tag reading/
 writing, and extensions for Konqueror and Amarok are also provided.
 
-WWW: http://pacpl.sourceforge.net/
 Author: Philip Lyons <viiron@gmail.com>
+WWW: http://pacpl.sourceforge.net/
diff --git a/audio/scrobbler/pkg-descr b/audio/scrobbler/pkg-descr
index 6633f904276f..77c3cd90b358 100644
--- a/audio/scrobbler/pkg-descr
+++ b/audio/scrobbler/pkg-descr
@@ -1,5 +1,5 @@
 This is an BMP/XMMS Plugin which sends the Playlist data to
 audioscrobbler.com
 
-WWW:	http://www.audioscrobbler.com
 Author:	pipian@pipian.com
+WWW:	http://www.audioscrobbler.com
diff --git a/audio/shntool/pkg-descr b/audio/shntool/pkg-descr
index 1e7e98b239d3..fa49de46e343 100644
--- a/audio/shntool/pkg-descr
+++ b/audio/shntool/pkg-descr
@@ -6,5 +6,5 @@ format module to handle that particular file type.
 Apart from wav shntool supports many formats through helper programs.
 Please see the manpage for more info.
 
-WWW: http://www.etree.org/shnutils/shntool/
 Author: Jason Jordan <shnutils at freeshell dot org>
+WWW: http://www.etree.org/shnutils/shntool/
diff --git a/audio/tap-plugins/pkg-descr b/audio/tap-plugins/pkg-descr
index 00a3df0d3deb..4ad00a0a9712 100644
--- a/audio/tap-plugins/pkg-descr
+++ b/audio/tap-plugins/pkg-descr
@@ -1,5 +1,5 @@
 TAP-plugins is short for Tom's Audio Processing plugins. 
 It is a bunch of LADSPA plugins for digital audio processing
 
-WWW:	http://tap-plugins.sourceforge.net/
 Author:	Tom Szilagy
+WWW:	http://tap-plugins.sourceforge.net/
diff --git a/audio/wmix/pkg-descr b/audio/wmix/pkg-descr
index cfc371cf11cf..545d18f2b302 100644
--- a/audio/wmix/pkg-descr
+++ b/audio/wmix/pkg-descr
@@ -6,5 +6,3 @@ to adjust the volume, too. Keeps a simple configuration file for user-defined
 settings.
 
 WWW: http://www.ne.jp/asahi/linux/timecop/
-
--- K. Konstantinidis <kkonstan@daemon.gr>
diff --git a/audio/xmms-arts_output/pkg-descr b/audio/xmms-arts_output/pkg-descr
index 437391976a66..d690b1418eb9 100644
--- a/audio/xmms-arts_output/pkg-descr
+++ b/audio/xmms-arts_output/pkg-descr
@@ -1,5 +1,4 @@
 aRts output plugin for XMMS (www.xmms.org).
 
 Author: Håvard Kvålen <havardk@xmms.org>
-
 WWW:	http://www.xmms.org/plugins.php?category=output
diff --git a/audio/xmms-scrobbler/pkg-descr b/audio/xmms-scrobbler/pkg-descr
index 16cb362e3dc9..9a29896e3fcd 100644
--- a/audio/xmms-scrobbler/pkg-descr
+++ b/audio/xmms-scrobbler/pkg-descr
@@ -1,5 +1,5 @@
 This is an XMMS Plugin which sends the Playlist data to
 audioscrobbler.com
 
-WWW:	http://www.audioscrobbler.com
 Author:	pipian@pipian.com
+WWW:	http://www.audioscrobbler.com
diff --git a/audio/xmms-volnorm/pkg-descr b/audio/xmms-volnorm/pkg-descr
index acb5136135e8..e78c84054a13 100644
--- a/audio/xmms-volnorm/pkg-descr
+++ b/audio/xmms-volnorm/pkg-descr
@@ -2,5 +2,5 @@ The volume normalizer plugin is intended to change the volume of
 playing songs to some level such that they all will basically sound
 pretty much the same in terms of volume.
 
-WWW: http://volnorm.sourceforge.net/
 Author: Baruch Even <baruch.even@writeme.com>
+WWW: http://volnorm.sourceforge.net/