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

16 files changed, 9 insertions, 36 deletions

diff --git a/net-mgmt/bsnmp-ucd/pkg-descr b/net-mgmt/bsnmp-ucd/pkg-descr
index 139673006138..0f071ab13452 100644
--- a/net-mgmt/bsnmp-ucd/pkg-descr
+++ b/net-mgmt/bsnmp-ucd/pkg-descr
@@ -2,5 +2,5 @@ bsnmp-ucd is a module for bsnmpd which allows you to get memory, load
 average, cpu utilization and other system statistics. It implements parts
 of UCD-SNMP-MIB for this.
 
-WWW: http://bsnmp-ucd.googlecode.com/
 Author: Mikolaj Golub <to.my.trociny@gmail.com>
+WWW: http://bsnmp-ucd.googlecode.com/
diff --git a/net-mgmt/cdpr/pkg-descr b/net-mgmt/cdpr/pkg-descr
index c32c8a1aae12..539148b8caf0 100644
--- a/net-mgmt/cdpr/pkg-descr
+++ b/net-mgmt/cdpr/pkg-descr
@@ -5,8 +5,5 @@ help network/system administrators find out about the equipment that i
 a machine is connected to. This is done by capturing and decoding a 
 Cisco Discovery Protocol (CDP) packet.
 
-AUTHOR:		Lance O'Connor <lance@monkeymental.com>
-WWW:		http://www.monkeymental.com/nuke/
-
-	- Michael L. Hostbaek
-	mich@FreeBSD.org
+Author: Lance O'Connor <lance@monkeymental.com>
+WWW: http://www.monkeymental.com/nuke/
diff --git a/net-mgmt/clog/pkg-descr b/net-mgmt/clog/pkg-descr
index 294c3921f98c..c8d56788280d 100644
--- a/net-mgmt/clog/pkg-descr
+++ b/net-mgmt/clog/pkg-descr
@@ -2,7 +2,3 @@ clog is a program that logs all connections on your subnet.  It uses the
 pcap(3) packet capture library to log any SYN packets to a logfile.  The
 output format is designed to be very easily parsed by various text
 processing tools.
-
-
--- David
-   (obrien@NUXI.com)
diff --git a/net-mgmt/darkstat/pkg-descr b/net-mgmt/darkstat/pkg-descr
index d1d3be684578..d6e3af34548b 100644
--- a/net-mgmt/darkstat/pkg-descr
+++ b/net-mgmt/darkstat/pkg-descr
@@ -3,7 +3,5 @@ and smaller than ntop, it uses libpcap to capture network traffic and serves up
 Web page reports of statistics such as data transferred by host, port, and
 protocol. It also has a neat bandwidth usage graph.
 
-WWW:	http://dmr.ath.cx/net/darkstat/
 Author:	Emil Mikulic <emil@cs.rmit.edu.au>
-
--- Anders Nordby <anders@FreeBSD.org>
+WWW:	http://dmr.ath.cx/net/darkstat/
diff --git a/net-mgmt/grepcidr/pkg-descr b/net-mgmt/grepcidr/pkg-descr
index 67788d949d01..5c259b52933c 100644
--- a/net-mgmt/grepcidr/pkg-descr
+++ b/net-mgmt/grepcidr/pkg-descr
@@ -10,6 +10,5 @@ grepcidr has endless uses in network software, including: mail
 filtering and processing, network security, log analysis, and many
 custom applications.
 
-
 Author:	Jem Berkes
 WWW:	http://www.pc-tools.net/unix/grepcidr/
diff --git a/net-mgmt/hastmon/pkg-descr b/net-mgmt/hastmon/pkg-descr
index 3f2f50ad71d9..124ffda9688a 100644
--- a/net-mgmt/hastmon/pkg-descr
+++ b/net-mgmt/hastmon/pkg-descr
@@ -4,5 +4,5 @@ cluster and each machine is one cluster node. hastmon is designed for
 clusters that work in Primary-Secondary configuration, which means
 that only one of the cluster nodes can be active at any given time.
 
-WWW: http://hastmon.googlecode.com/
 Author: Mikolaj Golub <to.my.trociny@gmail.com>
+WWW: http://hastmon.googlecode.com/
diff --git a/net-mgmt/ipacctd/pkg-descr b/net-mgmt/ipacctd/pkg-descr
index 26a342ef10b7..d00258966fde 100644
--- a/net-mgmt/ipacctd/pkg-descr
+++ b/net-mgmt/ipacctd/pkg-descr
@@ -2,7 +2,4 @@ The ipacctd is intended for IP accounting.  divert(4) and corresponding
 ipfw(8) rules are used for obtaining IP packets.
 
 Author:	Roman V. Palagin <romanp@unshadow.net>
-FTP:	ftp://ftp.wuppy.net.ru/pub/FreeBSD/local/ipacctd/
-
--- Sergey Skvortsov
-skv@FreeBSD.org
+WWW:	ftp://ftp.wuppy.net.ru/pub/FreeBSD/local/ipacctd/
diff --git a/net-mgmt/ipcad/pkg-descr b/net-mgmt/ipcad/pkg-descr
index fb2598c34c0f..d9f12e376290 100644
--- a/net-mgmt/ipcad/pkg-descr
+++ b/net-mgmt/ipcad/pkg-descr
@@ -6,7 +6,3 @@ fashion, or exported via NetFlow UDP protocol.
 See README file and man pages for details.
 
 WWW: http://ipcad.sourceforge.net/
-
--- 
-Lev Walkin
-vlm@lionet.info
diff --git a/net-mgmt/ipv6calc/pkg-descr b/net-mgmt/ipv6calc/pkg-descr
index e6fb29a8580d..7c39ca4a6d95 100644
--- a/net-mgmt/ipv6calc/pkg-descr
+++ b/net-mgmt/ipv6calc/pkg-descr
@@ -4,5 +4,5 @@ Intention:
 * This utility can be used by the IPv6 enabled initscripts for
   better duplicate address detection on setup of IPv6 addresses.
 
-WWW: http://www.deepspace6.net/projects/ipv6calc.html
 Author: Peter Bieringer <pb (at) bieringer.de>
+WWW: http://www.deepspace6.net/projects/ipv6calc.html
diff --git a/net-mgmt/ng_ipacct/pkg-descr b/net-mgmt/ng_ipacct/pkg-descr
index d56ba59a8851..3218be96168a 100644
--- a/net-mgmt/ng_ipacct/pkg-descr
+++ b/net-mgmt/ng_ipacct/pkg-descr
@@ -16,4 +16,4 @@ Also, effective user ID of relevant process and timestamp can be saved.
 CPU overhead is minimal because ng_ipacct works at kernel level.
 
 Author:	Roman V. Palagin <romanp@unshadow.net>
-FTP:	ftp://ftp.wuppy.net.ru/pub/FreeBSD/local/kernel/ng_ipacct/
+WWW:	ftp://ftp.wuppy.net.ru/pub/FreeBSD/local/kernel/ng_ipacct/
diff --git a/net-mgmt/pancho/pkg-descr b/net-mgmt/pancho/pkg-descr
index 67ef26d1762f..1a0f0f7da76f 100644
--- a/net-mgmt/pancho/pkg-descr
+++ b/net-mgmt/pancho/pkg-descr
@@ -13,5 +13,3 @@ Support is provided for Cisco, Foundry, Nortel/Alteon,
 Avaya, or Dell PowerConnect devices.
 
 WWW: http://www.pancho.org/
-
---Nicolas Jombart <ecu@ipv42.net>
diff --git a/net-mgmt/py-yapsnmp/pkg-descr b/net-mgmt/py-yapsnmp/pkg-descr
index 855239ab8f9b..4e3efe1ee8fe 100644
--- a/net-mgmt/py-yapsnmp/pkg-descr
+++ b/net-mgmt/py-yapsnmp/pkg-descr
@@ -12,5 +12,5 @@ level python module removing all the complexity out of dealing with SNMP.
 * Offers a very high level interface, allowing easy SNMP integration into
   your code.
 
-WWW:	http://yapsnmp.sourceforge.net/
 Author:	Yves Perrenoud
+WWW:	http://yapsnmp.sourceforge.net/
diff --git a/net-mgmt/rate/pkg-descr b/net-mgmt/rate/pkg-descr
index 0b8bda0ab144..bf03312df201 100644
--- a/net-mgmt/rate/pkg-descr
+++ b/net-mgmt/rate/pkg-descr
@@ -9,5 +9,4 @@ highest traffic, determining connections and flows generating the highest
 traffic and extracting strings from packets.
 
 Author:	<mtg@elsat.net.pl>
-
 WWW: http://s-tech.elsat.net.pl/
diff --git a/net-mgmt/remarp/pkg-descr b/net-mgmt/remarp/pkg-descr
index 314fa3214448..5601f4ecb267 100644
--- a/net-mgmt/remarp/pkg-descr
+++ b/net-mgmt/remarp/pkg-descr
@@ -4,5 +4,4 @@ malicious users in networks  with routers that don't support static
 ARP tables.  
 
 Author:	melnik <melnik@raccoon.kiev.ua>
-
 WWW: http://www.raccoon.kiev.ua/projects/remarp/
diff --git a/net-mgmt/smokeping/pkg-descr b/net-mgmt/smokeping/pkg-descr
index 4be1823b5287..06ac6127fbb7 100644
--- a/net-mgmt/smokeping/pkg-descr
+++ b/net-mgmt/smokeping/pkg-descr
@@ -3,6 +3,3 @@ daemon process which organizes the latency measurements and a CGI
 which presents the graphs.
 
 WWW: http://oss.oetiker.ch/smokeping/
-
---lars
-lars@thegler.dk
diff --git a/net-mgmt/yabm/pkg-descr b/net-mgmt/yabm/pkg-descr
index df4dca8bbbb4..38a1fd6bc60b 100644
--- a/net-mgmt/yabm/pkg-descr
+++ b/net-mgmt/yabm/pkg-descr
@@ -7,6 +7,3 @@ possible to run non-root and non-setuid, quite customizable (colours, geometry,
 device max speed, etc). It also includes text output to the image.
 
 WWW: http://shapeshifter.se/code/yabm/
-
--- Fredrik Lindberg
-   fli@shapeshifter.se