49 files changed, 71 insertions, 52 deletions

diff --git a/www/amaya/pkg-descr b/www/amaya/pkg-descr
index 55c87af0a166..bb98b0835ef6 100644
--- a/www/amaya/pkg-descr
+++ b/www/amaya/pkg-descr
@@ -2,4 +2,4 @@ Amaya is the W3C's testbed browser/editor for new HTML and CSS
 features.  It provides a WYSIWYG editing interface while generating
 documents that adhere to a DTD.
 
-Homepage: http://www.w3.org/Amaya/
+WWW: http://www.w3.org/Amaya/
diff --git a/www/analog/pkg-descr b/www/analog/pkg-descr
index 1d8c38b15325..2e3d6b383208 100644
--- a/www/analog/pkg-descr
+++ b/www/analog/pkg-descr
@@ -3,5 +3,6 @@ old format from WWW servers. It is designed to be fast on long
 logfiles and to produce attractive statistics.
 
 It was written by Stephen Turner (sret1@cam.ac.uk). For more details,
-see http://www.statslab.cam.ac.uk/~sret1/analog/ or Readme.html in
-/usr/local/share/analog.
+see the Readme.html in /usr/local/share/analog or the website.
+
+WWW: http://www.statslab.cam.ac.uk/~sret1/analog/
diff --git a/www/aswedit/pkg-descr b/www/aswedit/pkg-descr
index 12f051842f57..07aa578158d0 100644
--- a/www/aswedit/pkg-descr
+++ b/www/aswedit/pkg-descr
@@ -1,7 +1,7 @@
 This is a port of asWedit, an HTML and text editor.  Linux emulation is
 required for this port.
 
-http://sunsite.doc.ic.ac.uk/packages/www/asWedit/  (FAQ)
+WWW: http://sunsite.doc.ic.ac.uk/packages/www/asWedit/
 
 - Brett
 brett@peloton.physics.montana.edu
diff --git a/www/boa/pkg-descr b/www/boa/pkg-descr
index 4820cdce047e..de0ce0c42669 100644
--- a/www/boa/pkg-descr
+++ b/www/boa/pkg-descr
@@ -15,4 +15,4 @@ security, robustness, and portability, are eagerly sought. Other
 features may be added if they can be achieved without hurting the
 primary goals.
    
-Homepage:  http://www.boa.org
+WWW:  http://www.boa.org
diff --git a/www/calamaris/pkg-descr b/www/calamaris/pkg-descr
index 269a94ac0793..2cfcac0d9262 100644
--- a/www/calamaris/pkg-descr
+++ b/www/calamaris/pkg-descr
@@ -3,4 +3,4 @@ about Peak-usage, Request-Methods, Status-reports of incoming
 and outgoing requests, second and Top-level destinations,
 content-types and performance.
 
-http://Calamaris.Cord.de/
+WWW: http://Calamaris.Cord.de/
diff --git a/www/cgiwrap/pkg-descr b/www/cgiwrap/pkg-descr
index f763c46b8a23..a14e5a79591b 100644
--- a/www/cgiwrap/pkg-descr
+++ b/www/cgiwrap/pkg-descr
@@ -9,7 +9,9 @@ and Communications servers, and probably any other Unix based web
 server software that supports CGI.
 
 CGIWrap was written by Nathan Neulinger <nneul@umr.edu>.  More
-information is available at:  http://wwwcgi.umr.edu/~cgiwrap
+information is available at the website
+
+WWW: http://wwwcgi.umr.edu/~cgiwrap
 
 Port to FreeBSD by
 Brent J. Nordquist <bjn@visi.com>
diff --git a/www/checkbot/pkg-descr b/www/checkbot/pkg-descr
index 592ffa5d8a87..60cee85ebc13 100644
--- a/www/checkbot/pkg-descr
+++ b/www/checkbot/pkg-descr
@@ -16,4 +16,4 @@ keep that in mind when making suggestions. Speaking of which, be sure
 to check the TODO file for things which have been suggested for
 Checkbot.
 
-http://www.xs4all.nl/~graaff/checkbot/
+WWW: http://www.xs4all.nl/~graaff/checkbot/
diff --git a/www/chimera2/pkg-descr b/www/chimera2/pkg-descr
index 9a48ed99f94b..88228af68d01 100644
--- a/www/chimera2/pkg-descr
+++ b/www/chimera2/pkg-descr
@@ -20,4 +20,4 @@ Each user is expected to create a ~/.chimera subdirectory for
 bookmarks and personal preferences, and a ~/.chimera/cache (which may
 be a symlink to somewhere else).
 
-Ref: <URL: http://www.unlv.edu/chimera/two/ >
+WWW: http://www.unlv.edu/chimera/two/
diff --git a/www/comline/pkg-descr b/www/comline/pkg-descr
index 44a5cd36c3eb..5971117f8c8d 100644
--- a/www/comline/pkg-descr
+++ b/www/comline/pkg-descr
@@ -8,4 +8,4 @@ used in scripts, cron jobs etc.
 
 For more information on the application, please look at the page
 
-	http://www.w3.org/pub/WWW/ComLine/
+WWW: http://www.w3.org/pub/WWW/ComLine/
diff --git a/www/fxhtml/pkg-descr b/www/fxhtml/pkg-descr
index 68a7fca58410..f83eb101ffb2 100644
--- a/www/fxhtml/pkg-descr
+++ b/www/fxhtml/pkg-descr
@@ -20,5 +20,4 @@ HTML Has the following features:-
   +   Full error tracking system with formatted HTML output 
   +   Common interface to handle files, sockets, devices and pipes. (*) 
 
-See http://www.cybercities.net/fxhtml for more details.
-
+WWW: http://www.cybercities.net/fxhtml
diff --git a/www/grail/pkg-descr b/www/grail/pkg-descr
index c95f1ad30ca7..8cc9b0851c52 100644
--- a/www/grail/pkg-descr
+++ b/www/grail/pkg-descr
@@ -19,3 +19,4 @@ From http://grail.cnri.reston.va.us/grail/
 	a lot of RAM though.)
 
 Jacques Vidrine <n@nectar.com>
+WWW: http://grail.cnri.reston.va.us/grail/
diff --git a/www/harvest/pkg-descr b/www/harvest/pkg-descr
index 387030a46a77..27e9159c01a2 100644
--- a/www/harvest/pkg-descr
+++ b/www/harvest/pkg-descr
@@ -14,4 +14,6 @@ containing the message "subscribe"
 Bug reports can be mailed to harvest-bugs@tardis.ed.ac.uk
 
 Documentation: Information on this version of the Harvest software
-is available from http://www.tardis.ed.ac.uk/harvest/                                        
+is available from http://www.tardis.ed.ac.uk/harvest/
+
+WWW: http://www.tardis.ed.ac.uk/harvest/
diff --git a/www/hypermail/pkg-descr b/www/hypermail/pkg-descr
index 54ffefe16070..0cdf020926d0 100644
--- a/www/hypermail/pkg-descr
+++ b/www/hypermail/pkg-descr
@@ -6,4 +6,4 @@ number of ways by following links. Archives generated by Hypermail can be
 incrementally updated, and Hypermail is set by default to only update
 archives when changes are detected.
 
-HOMEPAGE:	http://www.landfield.com/hypermail/
+WWW: http://www.landfield.com/hypermail/
diff --git a/www/linbot/pkg-descr b/www/linbot/pkg-descr
index 672819672772..96a8ff97ea0a 100644
--- a/www/linbot/pkg-descr
+++ b/www/linbot/pkg-descr
@@ -4,6 +4,6 @@ find potentially outdated web pages list links pointing to external sites,
 view portfolio of inline images, get a run-down of problems sorted by
 author and to do all this periodically without user intervention.
 
-http://starship.skyport.net/crew/marduk/linbot/
+WWW: http://starship.skyport.net/crew/marduk/linbot/
 
 Bill Fumerola (billf@chc-chimes.com)
diff --git a/www/linemode/pkg-descr b/www/linemode/pkg-descr
index 9277c0241d60..ed917948eb50 100644
--- a/www/linemode/pkg-descr
+++ b/www/linemode/pkg-descr
@@ -15,7 +15,7 @@ used in batch jobs.
 
 For more information on the Line Mode Browser, please look at the page
 
-	http://info.cern.ch/hypertext/WWW/LineMode/Status.html
+WWW: http://info.cern.ch/hypertext/WWW/LineMode/Status.html
 
 Have fun!
 
diff --git a/www/lynx-current/pkg-descr b/www/lynx-current/pkg-descr
index 15bb8ecd0471..135e59264be9 100644
--- a/www/lynx-current/pkg-descr
+++ b/www/lynx-current/pkg-descr
@@ -2,4 +2,4 @@ lynx is a program which allows a user to access World-Wide Web servers
 and other information servers.  It uses only ascii representation so
 that it can be used from ascii-terminals and dialin-lines.
 
-http://sol.slcc.edu/lynx/current/
+WWW: http://sol.slcc.edu/lynx/current/
diff --git a/www/lynx/pkg-descr b/www/lynx/pkg-descr
index b00835e3f430..91091ea03e18 100644
--- a/www/lynx/pkg-descr
+++ b/www/lynx/pkg-descr
@@ -2,4 +2,4 @@ lynx is a program that allows a user to access World-Wide Web servers
 and other information servers.  It uses only ascii representation so
 that it can be used from ascii-terminals and dial-in lines.
 
-http://lynx.browser.org/
+WWW: http://lynx.browser.org/
diff --git a/www/mhonarc/pkg-descr b/www/mhonarc/pkg-descr
index 2873f816da38..93a55c02f982 100644
--- a/www/mhonarc/pkg-descr
+++ b/www/mhonarc/pkg-descr
@@ -7,4 +7,6 @@ the index.  MIME attachments in mail messages are handled.  MHTML is
 also supported.
 
 The program is highly customizable and is well documented.  See URL 
-"http://www.oac.uci.edu/indiv/ehood/mhonarc.doc.html" for more information.
+for more information.
+
+WWW: http://www.oac.uci.edu/indiv/ehood/mhonarc.doc.html" 
diff --git a/www/npc/pkg-descr b/www/npc/pkg-descr
index 5837254531e0..4066ced1a942 100644
--- a/www/npc/pkg-descr
+++ b/www/npc/pkg-descr
@@ -3,7 +3,7 @@ A web access counter, with real animation and other various features.
 For more informations, please referer to the official web site
 (written in Japanese):
 
-  http://www2.biglobe.ne.jp/%7Enir/npc/
+WWW: http://www2.biglobe.ne.jp/%7Enir/npc/
 
 - Yasuhiro Fukuma
 yasuf@big.or.jp
diff --git a/www/p5-CGI-modules/pkg-descr b/www/p5-CGI-modules/pkg-descr
index 32836e6723c3..a14c2f54033b 100644
--- a/www/p5-CGI-modules/pkg-descr
+++ b/www/p5-CGI-modules/pkg-descr
@@ -3,7 +3,7 @@ These are the CGI:: modules for perl5, for use in writing CGI scripts.
 Online documentation of these modules as well as related modules (such
 as the earlier CGI.pm module)  can be found at:
 
-        http://www-genome.wi.mit.edu/ftp/pub/software/WWW/CGIperl/
+WWW: http://www-genome.wi.mit.edu/ftp/pub/software/WWW/CGIperl/
 
 Many examples of CGI scripts of various degrees of complexity can be
 found at:
diff --git a/www/p5-CGI/pkg-descr b/www/p5-CGI/pkg-descr
index 32836e6723c3..a14c2f54033b 100644
--- a/www/p5-CGI/pkg-descr
+++ b/www/p5-CGI/pkg-descr
@@ -3,7 +3,7 @@ These are the CGI:: modules for perl5, for use in writing CGI scripts.
 Online documentation of these modules as well as related modules (such
 as the earlier CGI.pm module)  can be found at:
 
-        http://www-genome.wi.mit.edu/ftp/pub/software/WWW/CGIperl/
+WWW: http://www-genome.wi.mit.edu/ftp/pub/software/WWW/CGIperl/
 
 Many examples of CGI scripts of various degrees of complexity can be
 found at:
diff --git a/www/p5-libwww/pkg-descr b/www/p5-libwww/pkg-descr
index cfada1dbef7b..e029d82a3ef4 100644
--- a/www/p5-libwww/pkg-descr
+++ b/www/p5-libwww/pkg-descr
@@ -13,4 +13,4 @@
        interface should be easy to extend and customize for your
        needs.                               
 
-http://www.linpro.no/lwp/
+WWW: http://www.linpro.no/lwp/
diff --git a/www/ruboard/pkg-descr b/www/ruboard/pkg-descr
index f14850257233..a2348da28c3e 100644
--- a/www/ruboard/pkg-descr
+++ b/www/ruboard/pkg-descr
@@ -1,6 +1,6 @@
 Ruboard is simple and almost plug-and-play Web discussions board.
 It allows secure boards, threading, images, url's and so on..
 
-Visit ruboard homepage - http://www.amsoft.ru/ruboard/
+WWW: http://www.amsoft.ru/ruboard/
 
 - Andrew Maltsev <am@amsoft.ru>
diff --git a/www/snarf/pkg-descr b/www/snarf/pkg-descr
index 6b5b77a0ca2b..2c18d03cceeb 100644
--- a/www/snarf/pkg-descr
+++ b/www/snarf/pkg-descr
@@ -2,4 +2,4 @@ Snarf is another small command-line URL fetcher. It supports proxying,
 http redirect, http and ftp resume, http and ftp authentication, as well
 as retrieving data via gopher and finger protocols.
 
-http://www.xach.com/snarf/
+WWW: http://www.xach.com/snarf/
diff --git a/www/squid/pkg-descr b/www/squid/pkg-descr
index bf7cae7f22f6..646e01da5b32 100644
--- a/www/squid/pkg-descr
+++ b/www/squid/pkg-descr
@@ -1,7 +1,6 @@
 This is the Squid Internet Object Cache developed by the National
 Laboratory for Applied Networking Research (NLANR) and Internet
 volunteers.  This software is freely available for anyone to use.
-The Squid home page is http://squid.nlanr.net/Squid/.
 
 This software is based on the Harvest Object Cache developed by
 the University of Colorado and the University of Southern California.
@@ -14,3 +13,5 @@ FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented.
 But you aren't lost in space: there is a mailing list,
 <squid-users@nlanr.net>, where you will find some support and help.
 We also _strongly_ suggest you to examine Web pages noted above.
+
+WWW: http://squid.nlanr.net/Squid/
diff --git a/www/squid22/pkg-descr b/www/squid22/pkg-descr
index bf7cae7f22f6..646e01da5b32 100644
--- a/www/squid22/pkg-descr
+++ b/www/squid22/pkg-descr
@@ -1,7 +1,6 @@
 This is the Squid Internet Object Cache developed by the National
 Laboratory for Applied Networking Research (NLANR) and Internet
 volunteers.  This software is freely available for anyone to use.
-The Squid home page is http://squid.nlanr.net/Squid/.
 
 This software is based on the Harvest Object Cache developed by
 the University of Colorado and the University of Southern California.
@@ -14,3 +13,5 @@ FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented.
 But you aren't lost in space: there is a mailing list,
 <squid-users@nlanr.net>, where you will find some support and help.
 We also _strongly_ suggest you to examine Web pages noted above.
+
+WWW: http://squid.nlanr.net/Squid/
diff --git a/www/squid23/pkg-descr b/www/squid23/pkg-descr
index bf7cae7f22f6..646e01da5b32 100644
--- a/www/squid23/pkg-descr
+++ b/www/squid23/pkg-descr
@@ -1,7 +1,6 @@
 This is the Squid Internet Object Cache developed by the National
 Laboratory for Applied Networking Research (NLANR) and Internet
 volunteers.  This software is freely available for anyone to use.
-The Squid home page is http://squid.nlanr.net/Squid/.
 
 This software is based on the Harvest Object Cache developed by
 the University of Colorado and the University of Southern California.
@@ -14,3 +13,5 @@ FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented.
 But you aren't lost in space: there is a mailing list,
 <squid-users@nlanr.net>, where you will find some support and help.
 We also _strongly_ suggest you to examine Web pages noted above.
+
+WWW: http://squid.nlanr.net/Squid/
diff --git a/www/squid24/pkg-descr b/www/squid24/pkg-descr
index bf7cae7f22f6..646e01da5b32 100644
--- a/www/squid24/pkg-descr
+++ b/www/squid24/pkg-descr
@@ -1,7 +1,6 @@
 This is the Squid Internet Object Cache developed by the National
 Laboratory for Applied Networking Research (NLANR) and Internet
 volunteers.  This software is freely available for anyone to use.
-The Squid home page is http://squid.nlanr.net/Squid/.
 
 This software is based on the Harvest Object Cache developed by
 the University of Colorado and the University of Southern California.
@@ -14,3 +13,5 @@ FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented.
 But you aren't lost in space: there is a mailing list,
 <squid-users@nlanr.net>, where you will find some support and help.
 We also _strongly_ suggest you to examine Web pages noted above.
+
+WWW: http://squid.nlanr.net/Squid/
diff --git a/www/squid25/pkg-descr b/www/squid25/pkg-descr
index bf7cae7f22f6..646e01da5b32 100644
--- a/www/squid25/pkg-descr
+++ b/www/squid25/pkg-descr
@@ -1,7 +1,6 @@
 This is the Squid Internet Object Cache developed by the National
 Laboratory for Applied Networking Research (NLANR) and Internet
 volunteers.  This software is freely available for anyone to use.
-The Squid home page is http://squid.nlanr.net/Squid/.
 
 This software is based on the Harvest Object Cache developed by
 the University of Colorado and the University of Southern California.
@@ -14,3 +13,5 @@ FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented.
 But you aren't lost in space: there is a mailing list,
 <squid-users@nlanr.net>, where you will find some support and help.
 We also _strongly_ suggest you to examine Web pages noted above.
+
+WWW: http://squid.nlanr.net/Squid/
diff --git a/www/squid26/pkg-descr b/www/squid26/pkg-descr
index bf7cae7f22f6..646e01da5b32 100644
--- a/www/squid26/pkg-descr
+++ b/www/squid26/pkg-descr
@@ -1,7 +1,6 @@
 This is the Squid Internet Object Cache developed by the National
 Laboratory for Applied Networking Research (NLANR) and Internet
 volunteers.  This software is freely available for anyone to use.
-The Squid home page is http://squid.nlanr.net/Squid/.
 
 This software is based on the Harvest Object Cache developed by
 the University of Colorado and the University of Southern California.
@@ -14,3 +13,5 @@ FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented.
 But you aren't lost in space: there is a mailing list,
 <squid-users@nlanr.net>, where you will find some support and help.
 We also _strongly_ suggest you to examine Web pages noted above.
+
+WWW: http://squid.nlanr.net/Squid/
diff --git a/www/squid27/pkg-descr b/www/squid27/pkg-descr
index bf7cae7f22f6..646e01da5b32 100644
--- a/www/squid27/pkg-descr
+++ b/www/squid27/pkg-descr
@@ -1,7 +1,6 @@
 This is the Squid Internet Object Cache developed by the National
 Laboratory for Applied Networking Research (NLANR) and Internet
 volunteers.  This software is freely available for anyone to use.
-The Squid home page is http://squid.nlanr.net/Squid/.
 
 This software is based on the Harvest Object Cache developed by
 the University of Colorado and the University of Southern California.
@@ -14,3 +13,5 @@ FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented.
 But you aren't lost in space: there is a mailing list,
 <squid-users@nlanr.net>, where you will find some support and help.
 We also _strongly_ suggest you to examine Web pages noted above.
+
+WWW: http://squid.nlanr.net/Squid/
diff --git a/www/squid30/pkg-descr b/www/squid30/pkg-descr
index bf7cae7f22f6..646e01da5b32 100644
--- a/www/squid30/pkg-descr
+++ b/www/squid30/pkg-descr
@@ -1,7 +1,6 @@
 This is the Squid Internet Object Cache developed by the National
 Laboratory for Applied Networking Research (NLANR) and Internet
 volunteers.  This software is freely available for anyone to use.
-The Squid home page is http://squid.nlanr.net/Squid/.
 
 This software is based on the Harvest Object Cache developed by
 the University of Colorado and the University of Southern California.
@@ -14,3 +13,5 @@ FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented.
 But you aren't lost in space: there is a mailing list,
 <squid-users@nlanr.net>, where you will find some support and help.
 We also _strongly_ suggest you to examine Web pages noted above.
+
+WWW: http://squid.nlanr.net/Squid/
diff --git a/www/squid31/pkg-descr b/www/squid31/pkg-descr
index bf7cae7f22f6..646e01da5b32 100644
--- a/www/squid31/pkg-descr
+++ b/www/squid31/pkg-descr
@@ -1,7 +1,6 @@
 This is the Squid Internet Object Cache developed by the National
 Laboratory for Applied Networking Research (NLANR) and Internet
 volunteers.  This software is freely available for anyone to use.
-The Squid home page is http://squid.nlanr.net/Squid/.
 
 This software is based on the Harvest Object Cache developed by
 the University of Colorado and the University of Southern California.
@@ -14,3 +13,5 @@ FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented.
 But you aren't lost in space: there is a mailing list,
 <squid-users@nlanr.net>, where you will find some support and help.
 We also _strongly_ suggest you to examine Web pages noted above.
+
+WWW: http://squid.nlanr.net/Squid/
diff --git a/www/squidclients/pkg-descr b/www/squidclients/pkg-descr
index 9c8b9896fafe..c7c44b701e0b 100644
--- a/www/squidclients/pkg-descr
+++ b/www/squidclients/pkg-descr
@@ -2,7 +2,7 @@ Generate a summary of client usage (grouped by domain) from a Squid native
 log. SquidClients used in conjunction with Calamaris gives a complete
 information about usage of Squid.
 
-http://www.cineca.it/~nico/squidclients.html
+WWW: http://www.cineca.it/~nico/squidclients.html
 
 --Dima
 dima@Chg.RU
diff --git a/www/squidtimes/pkg-descr b/www/squidtimes/pkg-descr
index 0e1d999c0de4..fc02143214b1 100644
--- a/www/squidtimes/pkg-descr
+++ b/www/squidtimes/pkg-descr
@@ -1,7 +1,7 @@
 Generates a report of average transfer times of Squid caching proxy. All
 results are presented in graphic form.
 
-http://www.cineca.it/~nico/squidtimes.html
+WWW: http://www.cineca.it/~nico/squidtimes.html
 
 --Dima
 dima@Chg.RU
diff --git a/www/swish-e/pkg-descr b/www/swish-e/pkg-descr
index 8987301db419..761a6df24bd0 100644
--- a/www/swish-e/pkg-descr
+++ b/www/swish-e/pkg-descr
@@ -6,4 +6,4 @@ that enable anyone who is authorized to create and maintain their own indexes
 (AutoSwish). SWISH-E is an enhanced version of SWISH, which was originally 
 written by Kevin Hughes and modified and released with his permission.
 
-http://sunsite.berkeley.edu/SWISH-E/
+WWW: http://sunsite.berkeley.edu/SWISH-E/
diff --git a/www/vrweb/pkg-descr b/www/vrweb/pkg-descr
index 8ad540b1b883..00b2e2821e48 100644
--- a/www/vrweb/pkg-descr
+++ b/www/vrweb/pkg-descr
@@ -14,3 +14,5 @@ and untar them in your directory.
 
 tar xzvf 0x811b9908_0x002e3f24
 tar xzvf 0x811b9908_0x002e3c4a
+
+WWW: http://www.iicm.edu/vrweb/
diff --git a/www/w3c-httpd/pkg-descr b/www/w3c-httpd/pkg-descr
index 4597e8a8bb97..daca7da7dcaa 100644
--- a/www/w3c-httpd/pkg-descr
+++ b/www/w3c-httpd/pkg-descr
@@ -8,7 +8,7 @@ response times.
 
 For more information on the Library, please look at the page
 
-        http://www.w3.org/hypertext/WWW/Daemon/Status.html
+WWW: http://www.w3.org/hypertext/WWW/Daemon/Status.html
 
 Have fun!
 
diff --git a/www/w3mir/pkg-descr b/www/w3mir/pkg-descr
index d507a276dfac..714fb728314f 100644
--- a/www/w3mir/pkg-descr
+++ b/www/w3mir/pkg-descr
@@ -4,4 +4,4 @@ several, remote WWW site(s).  It can retrieve the contents of several
 related sites and make them browsable via a local web server or a
 filesystem.
 
-http://www.math.uio.no/~janl/w3mir/
+WWW: http://www.math.uio.no/~janl/w3mir/
diff --git a/www/wcol/pkg-descr b/www/wcol/pkg-descr
index bf194ae56af2..64724ac17db7 100644
--- a/www/wcol/pkg-descr
+++ b/www/wcol/pkg-descr
@@ -18,3 +18,4 @@ WcolE - WWW Collector 5th generation
 
 ---
 Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+WWW: http://shika.aist-nara.ac.jp/products/wcol/wcol.html
diff --git a/www/web500gw/pkg-descr b/www/web500gw/pkg-descr
index a9e157d39544..3088811eaa6f 100644
--- a/www/web500gw/pkg-descr
+++ b/www/web500gw/pkg-descr
@@ -6,7 +6,7 @@ This is an HTTP-to-LDAP gateway:
 |________|          |__________|______|          |________|(        |________|
                       web500gw                     ldapd   (
 
-Check online documentation at:  http://www.tu-chemnitz.de/web500gw/
+WWW: http://www.tu-chemnitz.de/web500gw/
 
 Author:  Frank.Richter@hrz.tu-chemnitz.de
 
diff --git a/www/webalizer-2/pkg-descr b/www/webalizer-2/pkg-descr
index 7e53f579019a..34f71ecc24ad 100644
--- a/www/webalizer-2/pkg-descr
+++ b/www/webalizer-2/pkg-descr
@@ -16,8 +16,7 @@ of these which it attempts to handle intelligently.
 Keywords:      Web Analysis, Log Analysis, Usage Statistics, Linux, Unix 
 Author:        Bradford L. Barrett 
 Maintained-by: Bradford L. Barrett 
-Primary-site:  http://www.mrunix.net/webalizer/ 
-Alternate-site:
+WWW:  http://www.mrunix.net/webalizer/ 
 Original-site: ftp://www.mrunix.net/pub/webalizer/
 Platforms:     Linux, SCO, other UNIX's 
 Copying-policy: GPL
diff --git a/www/webalizer/pkg-descr b/www/webalizer/pkg-descr
index 7e53f579019a..34f71ecc24ad 100644
--- a/www/webalizer/pkg-descr
+++ b/www/webalizer/pkg-descr
@@ -16,8 +16,7 @@ of these which it attempts to handle intelligently.
 Keywords:      Web Analysis, Log Analysis, Usage Statistics, Linux, Unix 
 Author:        Bradford L. Barrett 
 Maintained-by: Bradford L. Barrett 
-Primary-site:  http://www.mrunix.net/webalizer/ 
-Alternate-site:
+WWW:  http://www.mrunix.net/webalizer/ 
 Original-site: ftp://www.mrunix.net/pub/webalizer/
 Platforms:     Linux, SCO, other UNIX's 
 Copying-policy: GPL
diff --git a/www/webcheck/pkg-descr b/www/webcheck/pkg-descr
index 672819672772..96a8ff97ea0a 100644
--- a/www/webcheck/pkg-descr
+++ b/www/webcheck/pkg-descr
@@ -4,6 +4,6 @@ find potentially outdated web pages list links pointing to external sites,
 view portfolio of inline images, get a run-down of problems sorted by
 author and to do all this periodically without user intervention.
 
-http://starship.skyport.net/crew/marduk/linbot/
+WWW: http://starship.skyport.net/crew/marduk/linbot/
 
 Bill Fumerola (billf@chc-chimes.com)
diff --git a/www/webstone/pkg-descr b/www/webstone/pkg-descr
index 649b5c46407c..c9c4045281ef 100644
--- a/www/webstone/pkg-descr
+++ b/www/webstone/pkg-descr
@@ -18,3 +18,4 @@ entering password for each operation.
 
 - Soren Dossing
 sauber@netcom.com
+WWW: http://www.sgi.com/Products/WebFORCE/WebStone/
diff --git a/www/wml/pkg-descr b/www/wml/pkg-descr
index 6112e235dd20..2653ce8981b3 100644
--- a/www/wml/pkg-descr
+++ b/www/wml/pkg-descr
@@ -19,5 +19,6 @@
   on top of the backends core languages. While not trivial and idiot proof WML
   provides most of the core features real hackers always wanted for HTML
   generation.
-                               http://www.engelschall.com/sw/wml/
-                                ftp://ftp.engelschall.com/sw/wml/
+
+WWW: http://www.engelschall.com/sw/wml/
+     ftp://ftp.engelschall.com/sw/wml/
diff --git a/www/wmnetselect/pkg-descr b/www/wmnetselect/pkg-descr
index 74943b219442..c00d2c09ee43 100644
--- a/www/wmnetselect/pkg-descr
+++ b/www/wmnetselect/pkg-descr
@@ -12,4 +12,4 @@ simpler and more featureful.  It offers the following features:
 
    Trims whitespace from X selection.
 
-More information can be found at http://home.att.net/~apathos/wmnetsel.html
+WWW: http://home.att.net/~apathos/wmnetsel.html
diff --git a/www/wwwcount/pkg-descr b/www/wwwcount/pkg-descr
index 97b60236e8ed..02f7bf742b26 100644
--- a/www/wwwcount/pkg-descr
+++ b/www/wwwcount/pkg-descr
@@ -1,6 +1,4 @@
 The counter, clock and date, all in one program. The single program can
 be used for any number of web pages, for any number of users.
 
-The official homepage of Count is:
-
-http://www.semcor.com/~muquit/Count.html
+WWW: http://www.semcor.com/~muquit/Count.html
diff --git a/www/wwwoffle/pkg-descr b/www/wwwoffle/pkg-descr
index 2f61a67da0a3..133ac711b0d2 100644
--- a/www/wwwoffle/pkg-descr
+++ b/www/wwwoffle/pkg-descr
@@ -1,3 +1,5 @@
-See http://www.gedanken.demon.co.uk/wwwoffle/index.html for more details
+See the website for more details.
+
+WWW: http://www.gedanken.demon.co.uk/wwwoffle/index.html
 
 After installation, edit wwwoffle.conf. See 'man wwwoffle.conf'