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

14 files changed, 4 insertions, 28 deletions

diff --git a/multimedia/camserv/pkg-descr b/multimedia/camserv/pkg-descr
index 12c959905420..b46c9cb6f5d4 100644
--- a/multimedia/camserv/pkg-descr
+++ b/multimedia/camserv/pkg-descr
@@ -8,7 +8,3 @@ Currently, the only supported BSD device is the bktr driver.
 Both tunable modes and camera inputs are supported. 
 
 WWW: http://cserv.sourceforge.net/
-
---
-chein, overholt, j.b.odonnell
-chein@freebsd.org, overholt@geekdude.com, j.b.odonnell@comcast.net
diff --git a/multimedia/kaffeine-mozilla/pkg-descr b/multimedia/kaffeine-mozilla/pkg-descr
index e1bcaec57fdd..e221f7070fe1 100644
--- a/multimedia/kaffeine-mozilla/pkg-descr
+++ b/multimedia/kaffeine-mozilla/pkg-descr
@@ -1,4 +1,4 @@
 Kaffeine Plugin for Mozilla.
 
-WWW:	http://kaffeine.sourceforge.net/
 Author:	Juergen Kofler
+WWW:	http://kaffeine.sourceforge.net/
diff --git a/multimedia/kmplayer-kde4/pkg-descr b/multimedia/kmplayer-kde4/pkg-descr
index 2e3050fc497d..ebdc5482d334 100644
--- a/multimedia/kmplayer-kde4/pkg-descr
+++ b/multimedia/kmplayer-kde4/pkg-descr
@@ -1,5 +1,3 @@
 KDE frontend to MPlayer, Xine, GStreamer
 
 WWW: http://kmplayer.kde.org/
-
--- kris@pcbsd.org
diff --git a/multimedia/kmplayer/pkg-descr b/multimedia/kmplayer/pkg-descr
index 23960becea9f..ebdc5482d334 100644
--- a/multimedia/kmplayer/pkg-descr
+++ b/multimedia/kmplayer/pkg-descr
@@ -1,5 +1,3 @@
 KDE frontend to MPlayer, Xine, GStreamer
 
 WWW: http://kmplayer.kde.org/
-
--- will@freebsd.org
diff --git a/multimedia/konverter/pkg-descr b/multimedia/konverter/pkg-descr
index 61cc3087c0c8..23ed44253cee 100644
--- a/multimedia/konverter/pkg-descr
+++ b/multimedia/konverter/pkg-descr
@@ -7,5 +7,3 @@ It also features videosplitting, videomerging and a preview mode.
 Just simple and powerful :-)
 
 WWW: http://www.kraus.tk/projects/konverter/
-
--- lioux@FreeBSD.org
diff --git a/multimedia/linux-xmovie/pkg-descr b/multimedia/linux-xmovie/pkg-descr
index 52896d5b9bec..8d0c3345111a 100644
--- a/multimedia/linux-xmovie/pkg-descr
+++ b/multimedia/linux-xmovie/pkg-descr
@@ -31,7 +31,3 @@ options		_KPOSIX_VERSION=199309L
     add below line into your /etc/fstab file.
 
 linproc		/compat/linux/proc	linprocfs	rw	0	0
-
----
-Yoshiro MIHIRA
-(sanpei@FreeBSD.org)
diff --git a/multimedia/p5-MP4-Info/pkg-descr b/multimedia/p5-MP4-Info/pkg-descr
index da0255d4f1f2..b89efbd03271 100644
--- a/multimedia/p5-MP4-Info/pkg-descr
+++ b/multimedia/p5-MP4-Info/pkg-descr
@@ -5,5 +5,5 @@ replacement for MP3::Info.
 Note that this module does not allow you to update the information
 in MPEG-4 files.
 
-WWW: http://search.cpan.org/dist/MP4-Info/
 Author: Jonathan Harris <jhar@cpan.org>
+WWW: http://search.cpan.org/dist/MP4-Info/
diff --git a/multimedia/subtitleeditor/pkg-descr b/multimedia/subtitleeditor/pkg-descr
index 30603714a91a..5ddb5c7fc3f5 100644
--- a/multimedia/subtitleeditor/pkg-descr
+++ b/multimedia/subtitleeditor/pkg-descr
@@ -3,5 +3,5 @@ new subtitles or as a tool to transform, edit, correct and refine
 existing subtitle. This program also shows sound waves, which makes it
 easier to synchronise subtitles to voices.
 
-WWW: http://kitone.free.fr/subtitleeditor/
 Author: IDJAAD djamel <kitone_at_free_dot_fr>
+WWW: http://kitone.free.fr/subtitleeditor/
diff --git a/multimedia/subtitleoffsetmodifier/pkg-descr b/multimedia/subtitleoffsetmodifier/pkg-descr
index 19c69921ddf5..1e40b2413450 100644
--- a/multimedia/subtitleoffsetmodifier/pkg-descr
+++ b/multimedia/subtitleoffsetmodifier/pkg-descr
@@ -1,4 +1,4 @@
 Script that allows to change the timestamp of a Subtitle file.
 
-WWW: http://thomas.enix.org/SubtitleOffsetModificator
 Author: Thomas Petazzoni <thomas.petazzoni@enix.org>
+WWW: http://thomas.enix.org/SubtitleOffsetModificator
diff --git a/multimedia/subtitleripper/pkg-descr b/multimedia/subtitleripper/pkg-descr
index 23d31b688a30..db24afa80eb4 100644
--- a/multimedia/subtitleripper/pkg-descr
+++ b/multimedia/subtitleripper/pkg-descr
@@ -14,5 +14,3 @@ by some OCR software. Currently, I work with  GOCR for this purpose.
 For VobSub output no other tools are required.
 
 WWW: http://subtitleripper.sourceforge.net/
-
--- lioux@FreeBSD.org
diff --git a/multimedia/totem/pkg-descr b/multimedia/totem/pkg-descr
index 3f33f1f5f682..f5858070d975 100644
--- a/multimedia/totem/pkg-descr
+++ b/multimedia/totem/pkg-descr
@@ -3,5 +3,3 @@ It features a simple playlist, a full-screen mode, seek and volume controls,
 as well as a pretty complete keyboard navigation.
 
 WWW: http://www.gnome.org/projects/totem/
-
--- Hendrik Scholz <hendrik@scholz.net>
diff --git a/multimedia/vamps/pkg-descr b/multimedia/vamps/pkg-descr
index 23d630274b52..4d74c814e6da 100644
--- a/multimedia/vamps/pkg-descr
+++ b/multimedia/vamps/pkg-descr
@@ -20,5 +20,3 @@ fast. The downside is, that Vamps is not capable of making DVD
 backups on its own.
 
 WWW: http://vamps.sourceforge.net/
-
--- lioux@FreeBSD.org
diff --git a/multimedia/vcdimager/pkg-descr b/multimedia/vcdimager/pkg-descr
index 30560d22b8b2..febb178ad5a6 100644
--- a/multimedia/vcdimager/pkg-descr
+++ b/multimedia/vcdimager/pkg-descr
@@ -15,6 +15,5 @@ Features
 - Use of XML for the description of Video CD's
 
 Author: Herbert Valerio Riedel <hvr@gnu.org>
-
 WWW: http://www.gnu.org/software/vcdimager/
      http://www.vcdimager.org/
diff --git a/multimedia/xmms-weasel/pkg-descr b/multimedia/xmms-weasel/pkg-descr
index a0c0d58ef6f0..a6355428eda4 100644
--- a/multimedia/xmms-weasel/pkg-descr
+++ b/multimedia/xmms-weasel/pkg-descr
@@ -4,6 +4,3 @@ XMMS at the top of the screen and it will hide
 itself once you switch to another window.
 
 WWW: http://xmms-weasel.sourceforge.net/
-
--- Narayan Newton
-	<narayan_newton@yahoo.com>