34 files changed, 36 insertions, 46 deletions

diff --git a/archivers/rpm/pkg-descr b/archivers/rpm/pkg-descr
index d809849d87ed..a46071db8235 100644
--- a/archivers/rpm/pkg-descr
+++ b/archivers/rpm/pkg-descr
@@ -2,6 +2,6 @@ This is the Red Hat Package Manager.
 
 There is also a rpm2cpio converter written in perl. You still need GNU
 cpio and gzip, but at least you don't have to install the whole RPM
-manager to get the files in an RPM. See
-http://www.eleves.ens.fr:8080/home/espel/hacks.html
+manager to get the files in an RPM.
 
+WWW: http://www.eleves.ens.fr:8080/home/espel/hacks.html
diff --git a/misc/amanda-client/pkg-descr b/misc/amanda-client/pkg-descr
index 0ce8f8fe8b02..c9f6e12287ec 100644
--- a/misc/amanda-client/pkg-descr
+++ b/misc/amanda-client/pkg-descr
@@ -1,4 +1,3 @@
-
 ** CAUTION **
  
 THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
diff --git a/misc/amanda-server/pkg-descr b/misc/amanda-server/pkg-descr
index 0ce8f8fe8b02..c9f6e12287ec 100644
--- a/misc/amanda-server/pkg-descr
+++ b/misc/amanda-server/pkg-descr
@@ -1,4 +1,3 @@
-
 ** CAUTION **
  
 THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
diff --git a/misc/amanda24-client/pkg-descr b/misc/amanda24-client/pkg-descr
index 0ce8f8fe8b02..c9f6e12287ec 100644
--- a/misc/amanda24-client/pkg-descr
+++ b/misc/amanda24-client/pkg-descr
@@ -1,4 +1,3 @@
-
 ** CAUTION **
  
 THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
diff --git a/misc/amanda24-server/pkg-descr b/misc/amanda24-server/pkg-descr
index 0ce8f8fe8b02..c9f6e12287ec 100644
--- a/misc/amanda24-server/pkg-descr
+++ b/misc/amanda24-server/pkg-descr
@@ -1,4 +1,3 @@
-
 ** CAUTION **
  
 THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
diff --git a/misc/amanda24/pkg-descr b/misc/amanda24/pkg-descr
index 0ce8f8fe8b02..c9f6e12287ec 100644
--- a/misc/amanda24/pkg-descr
+++ b/misc/amanda24/pkg-descr
@@ -1,4 +1,3 @@
-
 ** CAUTION **
  
 THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
diff --git a/misc/amanda25-client/pkg-descr b/misc/amanda25-client/pkg-descr
index 0ce8f8fe8b02..c9f6e12287ec 100644
--- a/misc/amanda25-client/pkg-descr
+++ b/misc/amanda25-client/pkg-descr
@@ -1,4 +1,3 @@
-
 ** CAUTION **
  
 THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
diff --git a/misc/amanda25-server/pkg-descr b/misc/amanda25-server/pkg-descr
index 0ce8f8fe8b02..c9f6e12287ec 100644
--- a/misc/amanda25-server/pkg-descr
+++ b/misc/amanda25-server/pkg-descr
@@ -1,4 +1,3 @@
-
 ** CAUTION **
  
 THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
diff --git a/misc/amanda26-client/pkg-descr b/misc/amanda26-client/pkg-descr
index 0ce8f8fe8b02..c9f6e12287ec 100644
--- a/misc/amanda26-client/pkg-descr
+++ b/misc/amanda26-client/pkg-descr
@@ -1,4 +1,3 @@
-
 ** CAUTION **
  
 THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
diff --git a/misc/amanda26-server/pkg-descr b/misc/amanda26-server/pkg-descr
index 0ce8f8fe8b02..c9f6e12287ec 100644
--- a/misc/amanda26-server/pkg-descr
+++ b/misc/amanda26-server/pkg-descr
@@ -1,4 +1,3 @@
-
 ** CAUTION **
  
 THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
diff --git a/misc/amanda32-client/pkg-descr b/misc/amanda32-client/pkg-descr
index 0ce8f8fe8b02..c9f6e12287ec 100644
--- a/misc/amanda32-client/pkg-descr
+++ b/misc/amanda32-client/pkg-descr
@@ -1,4 +1,3 @@
-
 ** CAUTION **
  
 THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
diff --git a/misc/amanda32-server/pkg-descr b/misc/amanda32-server/pkg-descr
index 0ce8f8fe8b02..c9f6e12287ec 100644
--- a/misc/amanda32-server/pkg-descr
+++ b/misc/amanda32-server/pkg-descr
@@ -1,4 +1,3 @@
-
 ** CAUTION **
  
 THE RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
diff --git a/misc/colortail/pkg-descr b/misc/colortail/pkg-descr
index e40631985778..ff4253b374b9 100644
--- a/misc/colortail/pkg-descr
+++ b/misc/colortail/pkg-descr
@@ -3,10 +3,8 @@ a color config file where it's specified expressions that results in colors.
 It can be used to quickly get an overview of interesting activity by
 ie. colorize those brightred or some other color of your choose.
 
-Webpage:
-http://www.student.hk-r.se/~pt98jan/colortail.html
-Author:
-Joakim Andersson <pt98jan@student.hk-r.se>
+WWW: http://www.student.hk-r.se/~pt98jan/colortail.html
+Author: Joakim Andersson <pt98jan@student.hk-r.se>
 
 -Chris Piazza
 cpiazza@home.net
diff --git a/misc/crosspad/pkg-descr b/misc/crosspad/pkg-descr
index 2997ff485db6..81c383783fd1 100644
--- a/misc/crosspad/pkg-descr
+++ b/misc/crosspad/pkg-descr
@@ -3,4 +3,4 @@ This package contains following two utilities:
 	crosspad2ps - crosspad -> postscript converter
 
 more information on CrossPad digitizing notepad itself:
-	http://www.cross-pcg.com/
+WWW: http://www.cross-pcg.com/
diff --git a/misc/diction/pkg-descr b/misc/diction/pkg-descr
index 8b7b518ad9d8..e3858ff69b12 100644
--- a/misc/diction/pkg-descr
+++ b/misc/diction/pkg-descr
@@ -7,7 +7,7 @@ e.g. sentence length and various readability measures.
 Both commands support English and German documents.
 
 --
-http://www.fsf.org/software/diction/diction.html 
+WWW: http://www.fsf.org/software/diction/diction.html 
 
 GNU style and diction are written by Michael Haardt
 
diff --git a/misc/ewipe/pkg-descr b/misc/ewipe/pkg-descr
index 5dbbbab4d805..549ae801d85b 100644
--- a/misc/ewipe/pkg-descr
+++ b/misc/ewipe/pkg-descr
@@ -6,3 +6,5 @@ More information can be found at:
 	http://al.ei.tuat.ac.jp/~sekisita/ewipe/ (in Japanese)
 
 The menu can be Japanese or English, so don't worry.
+
+WWW: http://al.ei.tuat.ac.jp/~sekisita/ewipe/ (in Japanese)
diff --git a/misc/figlet/pkg-descr b/misc/figlet/pkg-descr
index ae0fd7cedad3..c6f3679fd54b 100644
--- a/misc/figlet/pkg-descr
+++ b/misc/figlet/pkg-descr
@@ -12,7 +12,8 @@ Figlet can print in a variety of fonts, both left-to-right and right-to-left.
 Figlet comes with several fonts.  Also, many other fonts are avaiable,
 including Hebrew, Cyrillic (Russian), and Greek.
 
-There is also a "Figlet Home Page" on the Worldwide Web. The URL is
-http://www.math.uiuc.edu/~chappell/figlet
+There is also a "Figlet Home Page" on the Worldwide Web.
+
+WWW: http://www.math.uiuc.edu/~chappell/figlet
 
 -- David	(obrien@cs.ucdavis.edu)
diff --git a/misc/fortuneit/pkg-descr b/misc/fortuneit/pkg-descr
index 9226dbdaa28c..4f9df436f673 100644
--- a/misc/fortuneit/pkg-descr
+++ b/misc/fortuneit/pkg-descr
@@ -3,7 +3,7 @@ This package contains a very funny fortune file in Italian.
 For further informations please read the README file
 in the working directory (not installed).
 
-Original Homepage : http://www.pluto.linux.it/~zuse/fortune.it
-Distfile Size     : ~400kb
+WWW: http://www.pluto.linux.it/~zuse/fortune.it
+Distfile Size: ~400kb
 
 - ported to FreeBSD by Gianmarco (gmarco@giovannelli.it)
diff --git a/misc/iselect/pkg-descr b/misc/iselect/pkg-descr
index 81e7a729c408..82943a1e65df 100644
--- a/misc/iselect/pkg-descr
+++ b/misc/iselect/pkg-descr
@@ -12,5 +12,4 @@
   as its control script or in batch mode as a pipeline filter (usually
   between grep and the final executing command).   
 
-  The latest release can be found on
-  http://www.engelschall.com/sw/iselect/
+WWW: http://www.engelschall.com/sw/iselect/
diff --git a/misc/lv/pkg-descr b/misc/lv/pkg-descr
index c41bd9de1452..d513b27fe7f2 100644
--- a/misc/lv/pkg-descr
+++ b/misc/lv/pkg-descr
@@ -8,7 +8,6 @@ lv can recognize multi-bytes patterns as regular expressions, and lv
 also provides multilingual grep (1) functionality by giving it another
 name, lgrep.
 
-lv HomePage is
-http://edie.office.web.ad.jp/~nrt/lv/
+WWW: http://edie.office.web.ad.jp/~nrt/lv/
 
 port made by: sumikawa@kame.net
diff --git a/misc/magicpoint/pkg-descr b/misc/magicpoint/pkg-descr
index 07dad2048beb..df832fbb5d34 100644
--- a/misc/magicpoint/pkg-descr
+++ b/misc/magicpoint/pkg-descr
@@ -11,4 +11,4 @@ Sample files are located in /usr/X11R6/share/doc/mgp/sample.
 It's a good idea to preview a sample file before installation.
 	% ./mgp tutorial.mgp
 
-see http://www.mew.org/mgp/ for upcoming information.
+WWW: http://www.mew.org/mgp/
diff --git a/misc/most/pkg-descr b/misc/most/pkg-descr
index bb4cbc93acbc..f42f3bbfdd94 100644
--- a/misc/most/pkg-descr
+++ b/misc/most/pkg-descr
@@ -10,6 +10,6 @@ option, autosensing of binary files can be disabled (via the -k
 option), thereby allowing one to browse files encoded in a different
 language (Japanese, Korean, Chinese, etc).
 
-  web site: http://space.mit.edu/%7Edavis/most.html
-  ftp site: ftp://space.mit.edu/pub/davis/most
+WWW: http://space.mit.edu/%7Edavis/most.html
+FTP: ftp://space.mit.edu/pub/davis/most
 maintainer: Richard Hwang <rhwang@bigpanda.com>
diff --git a/misc/quotes/pkg-descr b/misc/quotes/pkg-descr
index ff89e6832e0a..4343d35714f1 100644
--- a/misc/quotes/pkg-descr
+++ b/misc/quotes/pkg-descr
@@ -3,7 +3,7 @@ headlines and financial news. Use it to keep track of Linux headlines,
 monitor your interests in foreign currency and monitor your portafolio of
 company stocks. All of this from a simple command line interface.
 
-http://www.iae.nl/users/grimaldo/OpenSoft/quotes.shtml
+WWW: http://www.iae.nl/users/grimaldo/OpenSoft/quotes.shtml
 
 --Dima
 dima@chg.ru
diff --git a/misc/rpm/pkg-descr b/misc/rpm/pkg-descr
index d809849d87ed..a46071db8235 100644
--- a/misc/rpm/pkg-descr
+++ b/misc/rpm/pkg-descr
@@ -2,6 +2,6 @@ This is the Red Hat Package Manager.
 
 There is also a rpm2cpio converter written in perl. You still need GNU
 cpio and gzip, but at least you don't have to install the whole RPM
-manager to get the files in an RPM. See
-http://www.eleves.ens.fr:8080/home/espel/hacks.html
+manager to get the files in an RPM.
 
+WWW: http://www.eleves.ens.fr:8080/home/espel/hacks.html
diff --git a/misc/sma/pkg-descr b/misc/sma/pkg-descr
index f79c2c18cf2c..e27a7b779e91 100644
--- a/misc/sma/pkg-descr
+++ b/misc/sma/pkg-descr
@@ -15,6 +15,6 @@ the file type.
 This free service started out as a dorm room project by a couple of Computer
 Science students at UCLA.
 
-Check it out at http://www.scour.net/.
+WWW: http://www.scour.net/
 
 [ This port is maintained by Donald Burr <dburr@FreeBSD.ORG>. ]
diff --git a/misc/tcb/pkg-descr b/misc/tcb/pkg-descr
index 5eae704085b7..42492634e6bd 100644
--- a/misc/tcb/pkg-descr
+++ b/misc/tcb/pkg-descr
@@ -1,4 +1,4 @@
 Tcb is a file viewer that works on a terminal. It allows
 view file in ASCII or HEX format.
 
-http://www.osk.3web.ne.jp/~moody/tcbj
+WWW: http://www.osk.3web.ne.jp/~moody/tcbj
diff --git a/misc/tet/pkg-descr b/misc/tet/pkg-descr
index 80bcc791f411..1b68c73173d2 100644
--- a/misc/tet/pkg-descr
+++ b/misc/tet/pkg-descr
@@ -16,4 +16,4 @@ It allows facilities to execute test cases in several ways:
 	- Sequences of the above elements executing a specified number of 
 	  times or until some time period has expired.
 
-URL: http://tetworks.opengroup.org/datasheet.html
+WWW: http://tetworks.opengroup.org/datasheet.html
diff --git a/misc/wmcp/pkg-descr b/misc/wmcp/pkg-descr
index d87bfdd0b2ca..7b1bc879eee9 100644
--- a/misc/wmcp/pkg-descr
+++ b/misc/wmcp/pkg-descr
@@ -3,6 +3,6 @@ my be selected with buttons that send the appropriate synthetic ALT
 1..9 key code to the root window.  If you love Window Maker but can't
 live without a pager, this app may be of use to you. 
 
-WWW Homepage:	http://www.linuxbox.com/~bac/
+WWW: http://www.linuxbox.com/~bac/
 
 - Jim <jim@phrantic.phear.net>
diff --git a/misc/wmweather/pkg-descr b/misc/wmweather/pkg-descr
index 62bcff361808..b249ef55a9ee 100644
--- a/misc/wmweather/pkg-descr
+++ b/misc/wmweather/pkg-descr
@@ -1,5 +1,6 @@
 This is a windowmaker dockapp which displays meteorological data
 (temperature, dew point, barometric pressure, humidity, windspeed) for a
 city, retrieved from the net. You will need to look up the METAR code for
-your city (a standard code used in aviation) - see
-http://www.nws.noaa.gov/oso/siteloc.shtml
+your city (a standard code used in aviation)
+
+WWW: http://www.nws.noaa.gov/oso/siteloc.shtml
diff --git a/misc/xenmenu/pkg-descr b/misc/xenmenu/pkg-descr
index 6206f851c660..8188c7e8ea08 100644
--- a/misc/xenmenu/pkg-descr
+++ b/misc/xenmenu/pkg-descr
@@ -5,4 +5,4 @@ modified on the fly and reinstalled without having to recompile
 anything or halting xenmenu while reconfiguring.  Xenmenu can 
 also be used as a secure user shell.
 
-http://www.cs.purdue.edu/homes/steinkf/software/xenmenu
+WWW: http://www.cs.purdue.edu/homes/steinkf/software/xenmenu
diff --git a/misc/xpns/pkg-descr b/misc/xpns/pkg-descr
index f81cee25a9d8..545464fbcf69 100644
--- a/misc/xpns/pkg-descr
+++ b/misc/xpns/pkg-descr
@@ -3,8 +3,8 @@ PNS
 Is a public domain Petri net simulation tool
 for Unix systems.
 PNS is a graphics tool and requires the X window system.
-see also www-page:
-http://www.informatik.uni-stuttgart.de/ipvr/bv/pns/pns.html
+
+WWW: http://www.informatik.uni-stuttgart.de/ipvr/bv/pns/pns.html
 
 Examples:
 ---------
diff --git a/misc/ytree/pkg-descr b/misc/ytree/pkg-descr
index 2ec0be9dd1c9..f021e31db439 100644
--- a/misc/ytree/pkg-descr
+++ b/misc/ytree/pkg-descr
@@ -3,4 +3,5 @@ With  some  helper-applications  (zip/zoo/tar etc.)
 you can also browse archive files.
    Viewers for  "special"  files  are  configurable
 (*.wav, *.gif etc.).
-   Visit http://www.han.de/~werner/ytree.html
+
+WWW: http://www.han.de/~werner/ytree.html
diff --git a/sysutils/most/pkg-descr b/sysutils/most/pkg-descr
index bb4cbc93acbc..f42f3bbfdd94 100644
--- a/sysutils/most/pkg-descr
+++ b/sysutils/most/pkg-descr
@@ -10,6 +10,6 @@ option, autosensing of binary files can be disabled (via the -k
 option), thereby allowing one to browse files encoded in a different
 language (Japanese, Korean, Chinese, etc).
 
-  web site: http://space.mit.edu/%7Edavis/most.html
-  ftp site: ftp://space.mit.edu/pub/davis/most
+WWW: http://space.mit.edu/%7Edavis/most.html
+FTP: ftp://space.mit.edu/pub/davis/most
 maintainer: Richard Hwang <rhwang@bigpanda.com>
diff --git a/x11-wm/wmcp/pkg-descr b/x11-wm/wmcp/pkg-descr
index d87bfdd0b2ca..7b1bc879eee9 100644
--- a/x11-wm/wmcp/pkg-descr
+++ b/x11-wm/wmcp/pkg-descr
@@ -3,6 +3,6 @@ my be selected with buttons that send the appropriate synthetic ALT
 1..9 key code to the root window.  If you love Window Maker but can't
 live without a pager, this app may be of use to you. 
 
-WWW Homepage:	http://www.linuxbox.com/~bac/
+WWW: http://www.linuxbox.com/~bac/
 
 - Jim <jim@phrantic.phear.net>