40 files changed, 44 insertions, 41 deletions

diff --git a/mail/balsa/pkg-descr b/mail/balsa/pkg-descr
index 42ec36c08328..00567d7fe2d9 100644
--- a/mail/balsa/pkg-descr
+++ b/mail/balsa/pkg-descr
@@ -9,7 +9,6 @@ Balsa is probably not fully usable as one's primary mail client at this
 time.  However, it is under active development and fits with other gnome
 applications.
 
-Web site:
-  * http://www.balsa.net/
+WWW: http://www.balsa.net/
 
 The web site does not appear to be up to date.
diff --git a/mail/balsa2/pkg-descr b/mail/balsa2/pkg-descr
index 42ec36c08328..00567d7fe2d9 100644
--- a/mail/balsa2/pkg-descr
+++ b/mail/balsa2/pkg-descr
@@ -9,7 +9,6 @@ Balsa is probably not fully usable as one's primary mail client at this
 time.  However, it is under active development and fits with other gnome
 applications.
 
-Web site:
-  * http://www.balsa.net/
+WWW: http://www.balsa.net/
 
 The web site does not appear to be up to date.
diff --git a/mail/cmail/pkg-descr b/mail/cmail/pkg-descr
index 07c570aaa200..b187adced7d2 100644
--- a/mail/cmail/pkg-descr
+++ b/mail/cmail/pkg-descr
@@ -9,7 +9,8 @@ messages. Example of output -
 This may be useful if you split your mail into multiple files using something
 like procmail. I'm not sure if the new/old mail determination works with
 anything other than mutt.
-Latest versions can also be found at http://www.eboai.org/~chip/scripts.html
+
+WWW: http://www.eboai.org/~chip/scripts.html
 
 --
 Chip Marshall <chip@eboai.org>
diff --git a/mail/emil/pkg-descr b/mail/emil/pkg-descr
index 9fabbdef5c36..52652070ba1a 100644
--- a/mail/emil/pkg-descr
+++ b/mail/emil/pkg-descr
@@ -17,7 +17,7 @@ Emil is able to:
 	ISO-646 or to US-ASCII.
 - convert to and from RFC1522 format headers.
 
-http://www.uu.se/emil
+WWW: http://www.uu.se/emil
 
 -- 
 Josh Gilliam                    <josh@quick.net>
diff --git a/mail/ezmlm-idx/pkg-descr b/mail/ezmlm-idx/pkg-descr
index 0fafca645fa3..3a8939750137 100644
--- a/mail/ezmlm-idx/pkg-descr
+++ b/mail/ezmlm-idx/pkg-descr
@@ -12,7 +12,7 @@ ezmlm-idx can now be compiled with MySQL support for centrally administrated
 distributed lists with binaries that autosense use of SQL or standard ezmlm
 databases.
 
-http://www.ezmlm.org/
+WWW: http://www.ezmlm.org/
 
 - Tom
 tom@eborcom.com
diff --git a/mail/fetchmail/pkg-descr b/mail/fetchmail/pkg-descr
index 00d543871ee9..3061c6ea398d 100644
--- a/mail/fetchmail/pkg-descr
+++ b/mail/fetchmail/pkg-descr
@@ -14,4 +14,4 @@ user agent.
 Fetchmail is the lineal descendant of and replacement for the old
 popclient program.
 
-http://www.tuxedo.org/~esr/fetchmail
+WWW: http://www.tuxedo.org/~esr/fetchmail
diff --git a/mail/glbiff/pkg-descr b/mail/glbiff/pkg-descr
index bb36910ff5ce..ffccebc426ae 100644
--- a/mail/glbiff/pkg-descr
+++ b/mail/glbiff/pkg-descr
@@ -3,4 +3,4 @@ xbiff, except that it provides somewhat nicer output.  The idea
 comes from the "mailbox" program available on SGI machines, and
 hence tries to mimic some of the features present in it.
 
-http://www.eecg.utoronto.ca/~mac/projects/glbiff.html
+WWW: http://www.eecg.utoronto.ca/~mac/projects/glbiff.html
diff --git a/mail/kbiff/pkg-descr b/mail/kbiff/pkg-descr
index aacd6b26422d..8396e24a3212 100644
--- a/mail/kbiff/pkg-descr
+++ b/mail/kbiff/pkg-descr
@@ -10,4 +10,4 @@ It has several advantages over much of its competition:
 
 Home page and online handbook:
 
-	http://home.sprintmail.com/~granroth/kbiff/
+WWW: http://home.sprintmail.com/~granroth/kbiff/
diff --git a/mail/mailcrypt/pkg-descr b/mail/mailcrypt/pkg-descr
index 5d44b9914d96..590ab1651695 100644
--- a/mail/mailcrypt/pkg-descr
+++ b/mail/mailcrypt/pkg-descr
@@ -15,7 +15,7 @@ Features :
     support 
  *  An automagic interface to the PGP public key servers through HTTP 
 
-http://cag-www.lcs.mit.edu/mailcrypt/
+WWW: http://cag-www.lcs.mit.edu/mailcrypt/
 
 - Murray Stokely
 murray@cdrom.com
diff --git a/mail/maildrop/pkg-descr b/mail/maildrop/pkg-descr
index 6be0c44926c2..ee099a7547b3 100644
--- a/mail/maildrop/pkg-descr
+++ b/mail/maildrop/pkg-descr
@@ -20,5 +20,4 @@ be necessary.
 
 maildrop can be used with sendmail, Qmail, and other MTAs.
 
-
-http://www.flounder.net/~mrsam/maildrop/
+WWW: http://www.flounder.net/~mrsam/maildrop/
diff --git a/mail/majorcool/pkg-descr b/mail/majorcool/pkg-descr
index 57713236a33d..f14b552ccc7e 100644
--- a/mail/majorcool/pkg-descr
+++ b/mail/majorcool/pkg-descr
@@ -6,4 +6,4 @@ MajorCool was originally designed as an administrative front-end to the
 popular mailing list manager, allowing novice list-owners to manage
 their list configuration and subscriber base.
 
-More infos:	http://ncrinfo.ncr.com/pub/contrib/unix/MajorCool/
+WWW: http://ncrinfo.ncr.com/pub/contrib/unix/MajorCool/
diff --git a/mail/mbx2mbox/pkg-descr b/mail/mbx2mbox/pkg-descr
index 37c2f0def491..ad7ac651eea3 100644
--- a/mail/mbx2mbox/pkg-descr
+++ b/mail/mbx2mbox/pkg-descr
@@ -4,7 +4,7 @@ Netscape can parse.
 
 Usage: mbx2mbox file1.mbx file2.mbx ...
 
-http://www.cs.virginia.edu/~dwc3q/code/
+WWW: http://www.cs.virginia.edu/~dwc3q/code/
 
 -- 
 Josh Gilliam                    <josh@quick.net>
diff --git a/mail/ml/pkg-descr b/mail/ml/pkg-descr
index 1504db52e625..4384f27da39f 100644
--- a/mail/ml/pkg-descr
+++ b/mail/ml/pkg-descr
@@ -4,3 +4,5 @@ http://people.netscape.com/max/ml/index.html
 
 - Jeroen
 albast@xs4all.nl
+
+WWW: http://people.netscape.com/max/ml/index.html
diff --git a/mail/mmr/pkg-descr b/mail/mmr/pkg-descr
index fe230262a77a..1b21691db11a 100644
--- a/mail/mmr/pkg-descr
+++ b/mail/mmr/pkg-descr
@@ -18,5 +18,4 @@ then be merged with the current message listing.
 
    Searchable message listings, including search through message text
 
-
-http://www.devolution.com/~slouken/projects/mmr/index.html
+WWW: http://www.devolution.com/~slouken/projects/mmr/index.html
diff --git a/mail/mutt-devel/pkg-descr b/mail/mutt-devel/pkg-descr
index 94ec4ca062cf..29470b64deb0 100644
--- a/mail/mutt-devel/pkg-descr
+++ b/mail/mutt-devel/pkg-descr
@@ -10,7 +10,7 @@ Warning, this is beta software.  While it is farily stable and quite
 usable, core dumps do happen.  Use at your own risk.  New versions are
 usually released every Friday.
 
-Homepage:		http://www.mutt.org/
+WWW: http://www.mutt.org/
 Mutt User Information:	http://www.math.fu-berlin.de/~guckes/mutt/
 
 	-- David	(obrien@cs.ucdavis.edu)
diff --git a/mail/mutt/pkg-descr b/mail/mutt/pkg-descr
index 94ec4ca062cf..29470b64deb0 100644
--- a/mail/mutt/pkg-descr
+++ b/mail/mutt/pkg-descr
@@ -10,7 +10,7 @@ Warning, this is beta software.  While it is farily stable and quite
 usable, core dumps do happen.  Use at your own risk.  New versions are
 usually released every Friday.
 
-Homepage:		http://www.mutt.org/
+WWW: http://www.mutt.org/
 Mutt User Information:	http://www.math.fu-berlin.de/~guckes/mutt/
 
 	-- David	(obrien@cs.ucdavis.edu)
diff --git a/mail/mutt14/pkg-descr b/mail/mutt14/pkg-descr
index 94ec4ca062cf..29470b64deb0 100644
--- a/mail/mutt14/pkg-descr
+++ b/mail/mutt14/pkg-descr
@@ -10,7 +10,7 @@ Warning, this is beta software.  While it is farily stable and quite
 usable, core dumps do happen.  Use at your own risk.  New versions are
 usually released every Friday.
 
-Homepage:		http://www.mutt.org/
+WWW: http://www.mutt.org/
 Mutt User Information:	http://www.math.fu-berlin.de/~guckes/mutt/
 
 	-- David	(obrien@cs.ucdavis.edu)
diff --git a/mail/pine4/pkg-descr b/mail/pine4/pkg-descr
index a11790816577..4b84a87dc1a4 100644
--- a/mail/pine4/pkg-descr
+++ b/mail/pine4/pkg-descr
@@ -16,7 +16,7 @@ Also included in dot.pinerc.pgp.sample are example entries needed to
 add to your .pinerc to activate the pgp add on scripts pgpdecode,
 pgpencode, and pgpsign.
 
-Pine on WWW: http://www.washington.edu/pine/
+WWW: http://www.washington.edu/pine/
 
 Adrian Penisoara (Ady)
 pine@freebsd.ady.ro
diff --git a/mail/postfix-current/pkg-descr b/mail/postfix-current/pkg-descr
index fa5e129bf08b..f5136efff0fb 100644
--- a/mail/postfix-current/pkg-descr
+++ b/mail/postfix-current/pkg-descr
@@ -3,4 +3,4 @@ program.  Sendmail is responsible for 70% of all e-mail delivered
 on the Internet.  With an estimated 100 million users, that's an
 estimated 10 billion (10^10) messages daily. A stunning number.
 
-See http://www.postfix.org/ for details
+WWW: http://www.postfix.org/
diff --git a/mail/postfix/pkg-descr b/mail/postfix/pkg-descr
index fa5e129bf08b..f5136efff0fb 100644
--- a/mail/postfix/pkg-descr
+++ b/mail/postfix/pkg-descr
@@ -3,4 +3,4 @@ program.  Sendmail is responsible for 70% of all e-mail delivered
 on the Internet.  With an estimated 100 million users, that's an
 estimated 10 billion (10^10) messages daily. A stunning number.
 
-See http://www.postfix.org/ for details
+WWW: http://www.postfix.org/
diff --git a/mail/postfix1/pkg-descr b/mail/postfix1/pkg-descr
index fa5e129bf08b..f5136efff0fb 100644
--- a/mail/postfix1/pkg-descr
+++ b/mail/postfix1/pkg-descr
@@ -3,4 +3,4 @@ program.  Sendmail is responsible for 70% of all e-mail delivered
 on the Internet.  With an estimated 100 million users, that's an
 estimated 10 billion (10^10) messages daily. A stunning number.
 
-See http://www.postfix.org/ for details
+WWW: http://www.postfix.org/
diff --git a/mail/postfix20/pkg-descr b/mail/postfix20/pkg-descr
index fa5e129bf08b..f5136efff0fb 100644
--- a/mail/postfix20/pkg-descr
+++ b/mail/postfix20/pkg-descr
@@ -3,4 +3,4 @@ program.  Sendmail is responsible for 70% of all e-mail delivered
 on the Internet.  With an estimated 100 million users, that's an
 estimated 10 billion (10^10) messages daily. A stunning number.
 
-See http://www.postfix.org/ for details
+WWW: http://www.postfix.org/
diff --git a/mail/postfix21/pkg-descr b/mail/postfix21/pkg-descr
index fa5e129bf08b..f5136efff0fb 100644
--- a/mail/postfix21/pkg-descr
+++ b/mail/postfix21/pkg-descr
@@ -3,4 +3,4 @@ program.  Sendmail is responsible for 70% of all e-mail delivered
 on the Internet.  With an estimated 100 million users, that's an
 estimated 10 billion (10^10) messages daily. A stunning number.
 
-See http://www.postfix.org/ for details
+WWW: http://www.postfix.org/
diff --git a/mail/postfix22/pkg-descr b/mail/postfix22/pkg-descr
index fa5e129bf08b..f5136efff0fb 100644
--- a/mail/postfix22/pkg-descr
+++ b/mail/postfix22/pkg-descr
@@ -3,4 +3,4 @@ program.  Sendmail is responsible for 70% of all e-mail delivered
 on the Internet.  With an estimated 100 million users, that's an
 estimated 10 billion (10^10) messages daily. A stunning number.
 
-See http://www.postfix.org/ for details
+WWW: http://www.postfix.org/
diff --git a/mail/postfix23/pkg-descr b/mail/postfix23/pkg-descr
index fa5e129bf08b..f5136efff0fb 100644
--- a/mail/postfix23/pkg-descr
+++ b/mail/postfix23/pkg-descr
@@ -3,4 +3,4 @@ program.  Sendmail is responsible for 70% of all e-mail delivered
 on the Internet.  With an estimated 100 million users, that's an
 estimated 10 billion (10^10) messages daily. A stunning number.
 
-See http://www.postfix.org/ for details
+WWW: http://www.postfix.org/
diff --git a/mail/postfix24/pkg-descr b/mail/postfix24/pkg-descr
index fa5e129bf08b..f5136efff0fb 100644
--- a/mail/postfix24/pkg-descr
+++ b/mail/postfix24/pkg-descr
@@ -3,4 +3,4 @@ program.  Sendmail is responsible for 70% of all e-mail delivered
 on the Internet.  With an estimated 100 million users, that's an
 estimated 10 billion (10^10) messages daily. A stunning number.
 
-See http://www.postfix.org/ for details
+WWW: http://www.postfix.org/
diff --git a/mail/postfix25/pkg-descr b/mail/postfix25/pkg-descr
index fa5e129bf08b..f5136efff0fb 100644
--- a/mail/postfix25/pkg-descr
+++ b/mail/postfix25/pkg-descr
@@ -3,4 +3,4 @@ program.  Sendmail is responsible for 70% of all e-mail delivered
 on the Internet.  With an estimated 100 million users, that's an
 estimated 10 billion (10^10) messages daily. A stunning number.
 
-See http://www.postfix.org/ for details
+WWW: http://www.postfix.org/
diff --git a/mail/postfix26/pkg-descr b/mail/postfix26/pkg-descr
index fa5e129bf08b..f5136efff0fb 100644
--- a/mail/postfix26/pkg-descr
+++ b/mail/postfix26/pkg-descr
@@ -3,4 +3,4 @@ program.  Sendmail is responsible for 70% of all e-mail delivered
 on the Internet.  With an estimated 100 million users, that's an
 estimated 10 billion (10^10) messages daily. A stunning number.
 
-See http://www.postfix.org/ for details
+WWW: http://www.postfix.org/
diff --git a/mail/postfix27/pkg-descr b/mail/postfix27/pkg-descr
index fa5e129bf08b..f5136efff0fb 100644
--- a/mail/postfix27/pkg-descr
+++ b/mail/postfix27/pkg-descr
@@ -3,4 +3,4 @@ program.  Sendmail is responsible for 70% of all e-mail delivered
 on the Internet.  With an estimated 100 million users, that's an
 estimated 10 billion (10^10) messages daily. A stunning number.
 
-See http://www.postfix.org/ for details
+WWW: http://www.postfix.org/
diff --git a/mail/postfix28/pkg-descr b/mail/postfix28/pkg-descr
index fa5e129bf08b..f5136efff0fb 100644
--- a/mail/postfix28/pkg-descr
+++ b/mail/postfix28/pkg-descr
@@ -3,4 +3,4 @@ program.  Sendmail is responsible for 70% of all e-mail delivered
 on the Internet.  With an estimated 100 million users, that's an
 estimated 10 billion (10^10) messages daily. A stunning number.
 
-See http://www.postfix.org/ for details
+WWW: http://www.postfix.org/
diff --git a/mail/postilion/pkg-descr b/mail/postilion/pkg-descr
index 97345a4dd9e2..6f821355250c 100644
--- a/mail/postilion/pkg-descr
+++ b/mail/postilion/pkg-descr
@@ -16,4 +16,4 @@ through a dialog box.
 
 More information about Postilion can be found at:
 
-http://www.postilion.org
+WWW: http://www.postilion.org
diff --git a/mail/qmail/pkg-descr b/mail/qmail/pkg-descr
index 19ffcfd7c2e1..469ffee55aa9 100644
--- a/mail/qmail/pkg-descr
+++ b/mail/qmail/pkg-descr
@@ -20,4 +20,4 @@ checkpointing, downed host backoffs, independent message retry
 schedules, a drop-in sendmail replacement, and more!
 
 http://pobox.com/~djb/qmail.html
-http://www.qmail.org/
+WWW: http://www.qmail.org/
diff --git a/mail/rblcheck/pkg-descr b/mail/rblcheck/pkg-descr
index 9932a8ee34ca..1572328a7831 100644
--- a/mail/rblcheck/pkg-descr
+++ b/mail/rblcheck/pkg-descr
@@ -15,3 +15,5 @@ http://www.xnet.com/~emarshal/rblcheck/ .
 Any ideas, bugfixes, or porting notes should be sent to me at
 "emarshal@logic.net". Don't bug the MAPS people about this; they didn't
 write it, and probably woudn't like getting a bunch of mail about it.
+
+WWW: http://www.xnet.com/~emarshal/rblcheck/
diff --git a/mail/rblsmtpd/pkg-descr b/mail/rblsmtpd/pkg-descr
index dfe43b9bc5b3..b17aa74a9b4b 100644
--- a/mail/rblsmtpd/pkg-descr
+++ b/mail/rblsmtpd/pkg-descr
@@ -13,3 +13,5 @@ See http://pobox.com/~djb/rblsmtpd.html for info and updates.
 See http://maps.vix.com/rbl/ for more information about the RBL. 
 
 -John Saunders <john@nlc.net.au>
+
+WWW: http://pobox.com/~djb/rblsmtpd.html
diff --git a/mail/rftp/pkg-descr b/mail/rftp/pkg-descr
index 19ef925d6e31..81aa218a8d5c 100644
--- a/mail/rftp/pkg-descr
+++ b/mail/rftp/pkg-descr
@@ -1,4 +1,3 @@
-
         This program is for any user who retrieves ftp files via
         ftpmail or bitftp servers.  It runs quietly in the background
         and watches the user's mail directory.  When the mail-    
diff --git a/mail/rlytest/pkg-descr b/mail/rlytest/pkg-descr
index 5c1b28f38f10..c018ac2c8bb0 100644
--- a/mail/rlytest/pkg-descr
+++ b/mail/rlytest/pkg-descr
@@ -12,3 +12,5 @@ rlytest was written by Chip Rosenthal, and is featured at
 http://maps.vix.com/tsi/ and http://www.badrelay.org/.
 
 - Paul Chvostek <paul@it.ca>
+
+WWW: http://www.unicom.com/sw/#rlytest
diff --git a/mail/serialmail/pkg-descr b/mail/serialmail/pkg-descr
index f68386617c8a..966a29c6304a 100644
--- a/mail/serialmail/pkg-descr
+++ b/mail/serialmail/pkg-descr
@@ -13,4 +13,4 @@ maildirsmtp without pestering the sysadmin. The user can also decide
 whether undeliverable messages should be left for POP retrieval or
 bounced back to the sender.
 
-http://pobox.com/~djb/serialmail.html
+WWW: http://pobox.com/~djb/serialmail.html
diff --git a/mail/smtpd/pkg-descr b/mail/smtpd/pkg-descr
index ddec966fcfe7..6bfff6456db4 100644
--- a/mail/smtpd/pkg-descr
+++ b/mail/smtpd/pkg-descr
@@ -17,4 +17,4 @@ Access control rules based on the connecting host, and the smtp envelope are
 supported.  It contains some powerful features for stopping inbound or
 outbound SPAM. 
 
-Source: http://www.obtuse.com/smtpd.html
+WWW: http://www.obtuse.com/smtpd.html
diff --git a/mail/wmmail/pkg-descr b/mail/wmmail/pkg-descr
index b4d63ba03007..a7de58167c7c 100644
--- a/mail/wmmail/pkg-descr
+++ b/mail/wmmail/pkg-descr
@@ -10,7 +10,6 @@ Wharf of the AfterStep window manager.  However, WMMail.app has been
 re-written to be compatible with the Window Maker Dock, i.e. WMMail.app
 can be dragged and dropped on to (and off from) the Dock dynamically. 
 
-The latest and greatest version can be found at
-http://www.eecg.utoronto.ca/~chanb/wmmail.html
+WWW: http://www.eecg.utoronto.ca/~chanb/wmmail.html
 
 - Jim <jim@phrantic.phear.net>
diff --git a/mail/wmpop3/pkg-descr b/mail/wmpop3/pkg-descr
index 1475cfc208c8..2306f218bfeb 100644
--- a/mail/wmpop3/pkg-descr
+++ b/mail/wmpop3/pkg-descr
@@ -2,6 +2,6 @@ WMPop3 is a POP3 mail box checker.  It will connect to a POP3 server
 to check if you have mail, if you do then it will alert you of new
 mail and how many messages are currently in your mail box.
 
-WWW homepage:	http://www.cs.mun.ca/~scotth/
+WWW:	http://www.cs.mun.ca/~scotth/
 
 - Jim <jim@phrantic.phear.net>