72 files changed, 72 insertions, 72 deletions

diff --git a/archivers/p5-Compress-Zlib/pkg-descr b/archivers/p5-Compress-Zlib/pkg-descr
index bdc94ddf6b1e..ce4753dc4a21 100644
--- a/archivers/p5-Compress-Zlib/pkg-descr
+++ b/archivers/p5-Compress-Zlib/pkg-descr
@@ -12,4 +12,4 @@
        WARNING: The interface defined in this document is alpha
        and is liable to change.
 
-WWW: http://search.cpan.org/author/PMQS/Compress-Zlib/
+WWW: http://search.cpan.org/dist/Compress-Zlib/
diff --git a/audio/p5-Audio-WMA/pkg-descr b/audio/p5-Audio-WMA/pkg-descr
index d619d94f0c99..9f811a0fb036 100644
--- a/audio/p5-Audio-WMA/pkg-descr
+++ b/audio/p5-Audio-WMA/pkg-descr
@@ -1,3 +1,3 @@
 Fetch info from WMA audio files.
 
-WWW: http://search.cpan.org/~daniel/Audio-WMA-0.7/WMA.pm
+WWW: http://search.cpan.org/dist/Audio-WMA/
diff --git a/audio/p5-CDDB_get/pkg-descr b/audio/p5-CDDB_get/pkg-descr
index 67e933d8f0f3..a2616cc1d285 100644
--- a/audio/p5-CDDB_get/pkg-descr
+++ b/audio/p5-CDDB_get/pkg-descr
@@ -1,6 +1,6 @@
 The CDDB_get module implements a Perl class for communicating with an
 audio compact disc database through the CDDBP protocol.
 
-WWW: http://search.cpan.org/search?module=CDDB_get
+WWW: http://search.cpan.org/dist/CDDB_get/
 
 - Oyvind Moll <oyvindmo@initio.no>
diff --git a/audio/p5-MP3-ID3v1Tag/pkg-descr b/audio/p5-MP3-ID3v1Tag/pkg-descr
index 7695021f9f91..0ea9010b45bf 100644
--- a/audio/p5-MP3-ID3v1Tag/pkg-descr
+++ b/audio/p5-MP3-ID3v1Tag/pkg-descr
@@ -1,6 +1,6 @@
 The ID3v1Tag routines are useful for setting and reading ID3 MP3 Audio Tags.
 
-WWW: http://search.cpan.org/search?module=MP3::ID3v1Tag
+WWW: http://search.cpan.org/dist/MP3-ID3v1Tag/
 
 - Leo Kim
 leo@florida.sarang.net
diff --git a/audio/p5-MP3-Info/pkg-descr b/audio/p5-MP3-Info/pkg-descr
index 2154178801d7..6e1b9f034b7a 100644
--- a/audio/p5-MP3-Info/pkg-descr
+++ b/audio/p5-MP3-Info/pkg-descr
@@ -1,6 +1,6 @@
 Manipulate / fetch info from MP3 audio files.
 
-WWW: http://search.cpan.org/search?module=MP3::Info
+WWW: http://search.cpan.org/dist/MP3-Info/
 
 - Leo Kim
 leo@florida.sarang.net
diff --git a/audio/p5-Ogg-Vorbis-Header/pkg-descr b/audio/p5-Ogg-Vorbis-Header/pkg-descr
index 279c877438f4..ce9c49403163 100644
--- a/audio/p5-Ogg-Vorbis-Header/pkg-descr
+++ b/audio/p5-Ogg-Vorbis-Header/pkg-descr
@@ -1,3 +1,3 @@
 Fetch/manipulate from Ogg-Vorbis audio files.
 
-WWW: http://search.cpan.org/~dbp/Ogg-Vorbis-Header-0.03/Header.pm
+WWW: http://search.cpan.org/dist/Ogg-Vorbis-Header/
diff --git a/converters/p5-Convert-ASN1/pkg-descr b/converters/p5-Convert-ASN1/pkg-descr
index 6903c4e682bc..effdd5335234 100644
--- a/converters/p5-Convert-ASN1/pkg-descr
+++ b/converters/p5-Convert-ASN1/pkg-descr
@@ -1,4 +1,4 @@
 Convert::ASN1 encodes and decodes ASN.1 data structures
 using BER/DER rules.
 
-WWW: http://search.cpan.org/author/GBARR/Convert-ASN1
+WWW: http://search.cpan.org/dist/Convert-ASN1/
diff --git a/databases/p5-DBD-Sybase/pkg-descr b/databases/p5-DBD-Sybase/pkg-descr
index fc19118a83c9..d48666afbc29 100644
--- a/databases/p5-DBD-Sybase/pkg-descr
+++ b/databases/p5-DBD-Sybase/pkg-descr
@@ -2,4 +2,4 @@ DBD::Sybase is DBI (Database Interface) driver for Perl, which uses the
 FreeTDS libraries to provide access to Sybase databases (including MSSQL
 7).
 
-WWW:	http://search.cpan.org/~mewp/DBD-Sybase/
+WWW:	http://search.cpan.org/dist/DBD-Sybase/
diff --git a/databases/p5-Search-InvertedIndex/pkg-descr b/databases/p5-Search-InvertedIndex/pkg-descr
index 68b4285f1495..5f625f5683b6 100644
--- a/databases/p5-Search-InvertedIndex/pkg-descr
+++ b/databases/p5-Search-InvertedIndex/pkg-descr
@@ -1,6 +1,6 @@
 A general purpose inverted indexing system suitable for medium
 scale searching.
 
-WWW:	http://search.cpan.org/~snowhare/Search-InvertedIndex-1.13/
+WWW:	http://search.cpan.org/dist/Search-InvertedIndex/
 
 Author:	Benjamin Franz
diff --git a/devel/p5-B-Graph/pkg-descr b/devel/p5-B-Graph/pkg-descr
index 270713f4ab8f..6c388d0e137e 100644
--- a/devel/p5-B-Graph/pkg-descr
+++ b/devel/p5-B-Graph/pkg-descr
@@ -5,7 +5,7 @@ others would be easy). It examines the internal structures that perl
 builds to represent your code (OPs and SVs), and generates
 specifications for multicolored boxes and arrows to represent them.
 
-WWW: http://search.cpan.org/search?module=B::Graph
+WWW: http://search.cpan.org/dist/B-Graph/
 
 - Leo Kim
 leo@florida.sarang.net
diff --git a/devel/p5-Class-NamedParms/pkg-descr b/devel/p5-Class-NamedParms/pkg-descr
index 214e4072c362..89205625bf56 100644
--- a/devel/p5-Class-NamedParms/pkg-descr
+++ b/devel/p5-Class-NamedParms/pkg-descr
@@ -5,6 +5,6 @@ parameter with forced lexical checking of named parameters
 for validity and initialization validation. Lightweight and simple
 to use. Designed as a base class for inheritance by other modules.
 
-WWW:	http://search.cpan.org/~snowhare/Class-NamedParms-1.04/
+WWW:	http://search.cpan.org/dist/Class-NamedParms/
 
 Author: Benjamin Franz
diff --git a/devel/p5-Class-ParmList/pkg-descr b/devel/p5-Class-ParmList/pkg-descr
index ad957bcf41b1..111237461b44 100644
--- a/devel/p5-Class-ParmList/pkg-descr
+++ b/devel/p5-Class-ParmList/pkg-descr
@@ -5,6 +5,6 @@ required vs allowed distinctions, optional name lexical checking,
 multiple retrieval, and error reporting. Works well as a complement to
 Class::NamedParms.
 
-WWW:	http://search.cpan.org/~snowhare/Class-ParmList-1.03/
+WWW:	http://search.cpan.org/dist/Class-ParmList/
 
 Author: Benjamin Franz
diff --git a/devel/p5-Config-Objective/pkg-descr b/devel/p5-Config-Objective/pkg-descr
index 88147e05bb7f..90b3cab82f04 100644
--- a/devel/p5-Config-Objective/pkg-descr
+++ b/devel/p5-Config-Objective/pkg-descr
@@ -5,4 +5,4 @@ represents config data as perl objects.  This allows for a much more
 flexible configuration language, since new classes can be easily written
 to add methods to the config syntax.
 
-WWW: http://search.cpan.org/~roth/Config-Objective/
+WWW: http://search.cpan.org/dist/Config-Objective/
diff --git a/devel/p5-Date-Roman/pkg-descr b/devel/p5-Date-Roman/pkg-descr
index 3158224291bc..537014af3ae3 100644
--- a/devel/p5-Date-Roman/pkg-descr
+++ b/devel/p5-Date-Roman/pkg-descr
@@ -2,4 +2,4 @@ This Perl module deals with Roman dates.  Very useful for generating custom
 headers for e-mail messages, or just to dazzle and confuse friends, relatives
 and complete strangers.
 
-WWW: http://search.cpan.org/author/HOBBIT/Date-Roman-1.05/lib/Date/Roman.pm
+WWW: http://search.cpan.org/dist/Date-Roman/
diff --git a/devel/p5-Filesys-Statvfs_Df/pkg-descr b/devel/p5-Filesys-Statvfs_Df/pkg-descr
index c8724db234d1..d331ca1850dd 100644
--- a/devel/p5-Filesys-Statvfs_Df/pkg-descr
+++ b/devel/p5-Filesys-Statvfs_Df/pkg-descr
@@ -12,4 +12,4 @@ The default block size output is 1024 bytes per
 block. So if you want to get the size in bytes
 just take the block size and * it by 1024.
 
-WWW: http://search.cpan.org/~iguthrie/Filesys-Statvfs_Statfs_Df/
+WWW: http://search.cpan.org/dist/Filesys-Statvfs_Statfs_Df/
diff --git a/devel/p5-IO-All/pkg-descr b/devel/p5-IO-All/pkg-descr
index af40167b8044..db071d6eb705 100644
--- a/devel/p5-IO-All/pkg-descr
+++ b/devel/p5-IO-All/pkg-descr
@@ -5,5 +5,5 @@ oriented interface to greatly simplify your everyday Perl IO idioms.
 It exports a single function called io, which returns a new IO::All object.
 And that object can do it all!
 
-WWW: http://search.cpan.org/~ingy/IO-All/
+WWW: http://search.cpan.org/dist/IO-All/
 Author: Brian Ingerson <ingy@cpan.org>
diff --git a/devel/p5-Net-LibIDN/pkg-descr b/devel/p5-Net-LibIDN/pkg-descr
index af3b2288f01c..ac954db86fe7 100644
--- a/devel/p5-Net-LibIDN/pkg-descr
+++ b/devel/p5-Net-LibIDN/pkg-descr
@@ -1,4 +1,4 @@
 This module provides Perl bindings for the GNU IDN Library (Libidn)
 (see also Port devel/libidn).
 
-WWW: http://search.cpan.org/~thor/Net-LibIDN-0.04/
+WWW: http://search.cpan.org/dist/Net-LibIDN/
diff --git a/devel/p5-OOTools/pkg-descr b/devel/p5-OOTools/pkg-descr
index 7de246cf388c..e2ca34c0b200 100644
--- a/devel/p5-OOTools/pkg-descr
+++ b/devel/p5-OOTools/pkg-descr
@@ -7,6 +7,6 @@ Class::group	Pragma to implement group of properties accessors with options
 Object::props	Pragma to implement lvalue accessors with options
 Object::group	Pragma to implement group of properties accessors with options
 
-WWW: http://search.cpan.org/~domizio/OOTools/
+WWW: http://search.cpan.org/dist/OOTools/
 
 Author: Domizio Demichelis <dd@4pro.net>
diff --git a/devel/p5-ParseLex/pkg-descr b/devel/p5-ParseLex/pkg-descr
index 311d9147a9b3..a516f79f66c6 100644
--- a/devel/p5-ParseLex/pkg-descr
+++ b/devel/p5-ParseLex/pkg-descr
@@ -4,4 +4,4 @@ lexical analyzers.
 This distribution includes Parse::YYLex (writed by Vladimir Alexiev)
 a lexer generator that you can use with yacc parsers.
 
-WWW: http://search.cpan.org/~pverd/ParseLex/
+WWW: http://search.cpan.org/dist/ParseLex/
diff --git a/devel/p5-Path-Class/pkg-descr b/devel/p5-Path-Class/pkg-descr
index 81373c97e13e..66a6371e6866 100644
--- a/devel/p5-Path-Class/pkg-descr
+++ b/devel/p5-Path-Class/pkg-descr
@@ -1,4 +1,4 @@
 Path::Class - Cross-platform path specification manipulation
 
 Author:	Ken Williams <KWILLIAMS@cpan.org>
-WWW:	http://search.cpan.org/~kwilliams/Path-Class/
+WWW:	http://search.cpan.org/dist/Path-Class/
diff --git a/devel/p5-Perl6-Export/pkg-descr b/devel/p5-Perl6-Export/pkg-descr
index 2a047f079866..a719e157e736 100644
--- a/devel/p5-Perl6-Export/pkg-descr
+++ b/devel/p5-Perl6-Export/pkg-descr
@@ -1,4 +1,4 @@
 This module prototypes the Perl 6 'exported' and 'exportable' traits
 in Perl 5.
 
-WWW: http://search.cpan.org/~dconway/Perl6-Export-0.07/
+WWW: http://search.cpan.org/dist/Perl6-Export/
diff --git a/devel/p5-PerlIO-eol/pkg-descr b/devel/p5-PerlIO-eol/pkg-descr
index 1738f833c512..120f3c0728c3 100644
--- a/devel/p5-PerlIO-eol/pkg-descr
+++ b/devel/p5-PerlIO-eol/pkg-descr
@@ -1,4 +1,4 @@
 This layer normalizes any of CR, LF, CRLF and Native into the designated
 line ending. It works for both input and output handles.
 
-WWW: http://search.cpan.org/~autrijus/PerlIO-eol/
+WWW: http://search.cpan.org/data/PerlIO-eol/
diff --git a/devel/p5-Project-Gantt/pkg-descr b/devel/p5-Project-Gantt/pkg-descr
index acd19eadcba2..bf5e5ddc8947 100644
--- a/devel/p5-Project-Gantt/pkg-descr
+++ b/devel/p5-Project-Gantt/pkg-descr
@@ -3,4 +3,4 @@ managing the schedules of projects and many other things.
 Gantt charts provide a simple, easy to comprehend, visual 
 representation of a schedule.
 
-WWW:	http://search.cpan.org/~awestholm/Project-Gantt/
+WWW:	http://search.cpan.org/dist/Project-Gantt/
diff --git a/devel/p5-Spiffy/pkg-descr b/devel/p5-Spiffy/pkg-descr
index b30afdbfaada..17c32f2dd670 100644
--- a/devel/p5-Spiffy/pkg-descr
+++ b/devel/p5-Spiffy/pkg-descr
@@ -6,4 +6,4 @@ SUPER.pm into one magic foundation class. It attempts to fix all the nits and
 warts of traditional Perl OO, in a clean, straightforward and
 (perhaps someday) standard way.
 
-WWW: http://search.cpan.org/~ingy/Spiffy-0.18/
+WWW: http://search.cpan.org/dist/Spiffy/
diff --git a/devel/p5-Spoon/pkg-descr b/devel/p5-Spoon/pkg-descr
index 227b1c2bcb51..337b16c38a5d 100644
--- a/devel/p5-Spoon/pkg-descr
+++ b/devel/p5-Spoon/pkg-descr
@@ -10,5 +10,5 @@ Spoon.pm inherits from Spiffy.pm.
 Spoon is not an application in and of itself. (As compared to Kwiki) You
     need to build your own applications from it.
 
-WWW: http://search.cpan.org/~ingy/Spoon/
+WWW: http://search.cpan.org/dist/Spoon/
 Author:	Brian Ingerson <INGY at cpan.org>
diff --git a/devel/p5-Term-Screen/pkg-descr b/devel/p5-Term-Screen/pkg-descr
index c920795fc807..a310dc072ad3 100644
--- a/devel/p5-Term-Screen/pkg-descr
+++ b/devel/p5-Term-Screen/pkg-descr
@@ -6,4 +6,4 @@ means to get raw and unblocked input. This is not a replacement for
 Curses -- it has no memory.  This was written so that it could be easily
 changed to fit nasty systems, and to be available first thing.
 
-WWW: http://search.cpan.org/author/JSTOWE/Term-Screen/
+WWW: http://search.cpan.org/dist/Term-Screen/
diff --git a/devel/p5-Test-Builder-Tester/pkg-descr b/devel/p5-Test-Builder-Tester/pkg-descr
index bce53be45c54..a925c8f4a212 100644
--- a/devel/p5-Test-Builder-Tester/pkg-descr
+++ b/devel/p5-Test-Builder-Tester/pkg-descr
@@ -1,3 +1,3 @@
 Test testsuites that have been built with Test::Builder.
 
-WWW: http://search.cpan.org/author/MARKF/Test-Builder-Tester/
+WWW: http://search.cpan.org/dist/Test-Builder-Tester/
diff --git a/devel/p5-Test-Manifest/pkg-descr b/devel/p5-Test-Manifest/pkg-descr
index 5fc9ff79771b..730d9c4779e6 100644
--- a/devel/p5-Test-Manifest/pkg-descr
+++ b/devel/p5-Test-Manifest/pkg-descr
@@ -3,4 +3,4 @@ want to run and the order in which you want to run them. It constructs the
 right value for MakeMaker to do the right thing. 
 
 
-WWW: http://search.cpan.org/author/PETDANCE/Test-Manifest-0.92/
+WWW: http://search.cpan.org/dist/Test-Manifest/
diff --git a/devel/p5-Tie-DB_File-SplitHash/pkg-descr b/devel/p5-Tie-DB_File-SplitHash/pkg-descr
index 5b3a65e4909b..dad5543d542f 100644
--- a/devel/p5-Tie-DB_File-SplitHash/pkg-descr
+++ b/devel/p5-Tie-DB_File-SplitHash/pkg-descr
@@ -6,6 +6,6 @@ hash entries between the files using a randomization algorithm.
 Has the effect of allowing DB_File hashes to grow to the full size 
 of the partition. Requires 'Digest::SHA1' and 'DB_File' to be installed.
 
-WWW:	http://search.cpan.org/~snowhare/Tie-DB_File-SplitHash-1.01/
+WWW:	http://search.cpan.org/dist/Tie-DB_File-SplitHash/
 
 Author: Benjamin Franz
diff --git a/devel/p5-Tie-FileLRUCache/pkg-descr b/devel/p5-Tie-FileLRUCache/pkg-descr
index d79786eacb10..032de7cb8360 100644
--- a/devel/p5-Tie-FileLRUCache/pkg-descr
+++ b/devel/p5-Tie-FileLRUCache/pkg-descr
@@ -5,6 +5,6 @@ either an object or tied interface. Keys and data are both
 allowed to be references and objects as well as scalars. Requires 
 'Digest::SHA1' to be installed.
 
-WWW:	http://search.cpan.org/~snowhare/Tie-FileLRUCache-1.01/
+WWW:	http://search.cpan.org/dist/Tie-FileLRUCache/
 
 Author: Benjamin Franz
diff --git a/devel/p5-VCP-Source-cvsbk/pkg-descr b/devel/p5-VCP-Source-cvsbk/pkg-descr
index 3b637eaf8fe6..5a3f67fa62a9 100644
--- a/devel/p5-VCP-Source-cvsbk/pkg-descr
+++ b/devel/p5-VCP-Source-cvsbk/pkg-descr
@@ -1,4 +1,4 @@
 This is a VCP source driver for bk exported cvs repository,
 which is an extension from CVS repository source driver.
 
-WWW: http://search.cpan.org/~clkao/VCP-Source-cvsbk/
+WWW: http://search.cpan.org/dist/VCP-Source-cvsbk/
diff --git a/dns/p5-BIND-Conf_Parser/pkg-descr b/dns/p5-BIND-Conf_Parser/pkg-descr
index fddab1d4bec0..afff548f5d3a 100644
--- a/dns/p5-BIND-Conf_Parser/pkg-descr
+++ b/dns/p5-BIND-Conf_Parser/pkg-descr
@@ -3,7 +3,7 @@ Internet Name Domain) server version 8 configuration files ("named.conf").
 As each meaningful semantic 'chunk' is parsed, a callback method is invoked
 with the parsed information.
 
-WWW: http://search.cpan.org/search?module=BIND::Conf_Parser
+WWW: http://search.cpan.org/dist/BIND-Conf_Parser/
 
 - Andrew Stevenson
 andrew@ugh.net.au
diff --git a/dns/p5-Net-LibIDN/pkg-descr b/dns/p5-Net-LibIDN/pkg-descr
index af3b2288f01c..ac954db86fe7 100644
--- a/dns/p5-Net-LibIDN/pkg-descr
+++ b/dns/p5-Net-LibIDN/pkg-descr
@@ -1,4 +1,4 @@
 This module provides Perl bindings for the GNU IDN Library (Libidn)
 (see also Port devel/libidn).
 
-WWW: http://search.cpan.org/~thor/Net-LibIDN-0.04/
+WWW: http://search.cpan.org/dist/Net-LibIDN/
diff --git a/graphics/p5-Color-Rgb/pkg-descr b/graphics/p5-Color-Rgb/pkg-descr
index fb2fcefd3f6f..f79e84d57df2 100644
--- a/graphics/p5-Color-Rgb/pkg-descr
+++ b/graphics/p5-Color-Rgb/pkg-descr
@@ -1,3 +1,3 @@
 Color::Rgb - simple rgb.txt parsing class.
 
-WWW: http://search.cpan.org/~sherzodr/Color-Rgb/
+WWW: http://search.cpan.org/dist/Color-Rgb/
diff --git a/graphics/p5-Graph-ReadWrite/pkg-descr b/graphics/p5-Graph-ReadWrite/pkg-descr
index 8a8a588fdb8e..4e5285cce5b9 100644
--- a/graphics/p5-Graph-ReadWrite/pkg-descr
+++ b/graphics/p5-Graph-ReadWrite/pkg-descr
@@ -3,4 +3,4 @@ directed graphs in a variety of file formats. The graphs are
 represented in Perl using Jarkko Hietaniemi's Graph classes.
 
 Author:	Neil Bowers <neil@bowers.com>
-WWW:	http://search.cpan.org/~neilb/Graph-ReadWrite/
+WWW:	http://search.cpan.org/dist/Graph-ReadWrite/
diff --git a/graphics/p5-Tk-JPEG-Lite/pkg-descr b/graphics/p5-Tk-JPEG-Lite/pkg-descr
index 0d773798a69c..72480da8fcf1 100644
--- a/graphics/p5-Tk-JPEG-Lite/pkg-descr
+++ b/graphics/p5-Tk-JPEG-Lite/pkg-descr
@@ -1,3 +1,3 @@
 Very simplistic image viewer that loads JPEG images
 
-WWW:	http://search.cpan.org/~srezic/Tk-JPEG-Lite/
+WWW:	http://search.cpan.org/dist/Tk-JPEG-Lite/
diff --git a/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-descr b/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-descr
index a6ed9b56dcb9..aa4fac4065b1 100644
--- a/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-descr
+++ b/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-descr
@@ -5,4 +5,4 @@ returned message including the Message-ID. It works best with RFC1892
 delivery reports, but will gamely attempt to understand any bounce
 message no matter what MTA generated it.
 
-WWW: http://search.cpan.org/~freeside/Mail-DeliveryStatus-BounceParser-1.4/
+WWW: http://search.cpan.org/dist/Mail-DeliveryStatus-BounceParser/
diff --git a/math/p5-Geo-Distance/pkg-descr b/math/p5-Geo-Distance/pkg-descr
index 0a63065cd3ab..88f91c304652 100644
--- a/math/p5-Geo-Distance/pkg-descr
+++ b/math/p5-Geo-Distance/pkg-descr
@@ -4,4 +4,4 @@ derived from that. Currently there is support for finding the closest locations
 within a specified distance, to find the closest number of points to a specified
 point, and to do basic point-to-point distance calculations.
 
-WWW: http://search.cpan.org/~bluefeet/Geo-Distance/
+WWW: http://search.cpan.org/dist/Geo-Distance/
diff --git a/math/p5-Roman/pkg-descr b/math/p5-Roman/pkg-descr
index 6745d345fe88..6de76d8a6d38 100644
--- a/math/p5-Roman/pkg-descr
+++ b/math/p5-Roman/pkg-descr
@@ -1,4 +1,4 @@
 A Perl package providing the functionality to convert between 
 Arabic and Roman numerals.
 
-WWW: http://search.cpan.org/author/OZAWA/Roman-1.1/Roman.pm
+WWW: http://search.cpan.org/dist/Roman/
diff --git a/net-mgmt/p5-Telnet-Cisco/pkg-descr b/net-mgmt/p5-Telnet-Cisco/pkg-descr
index f4fdcb3ca62b..cb3240eb61a3 100644
--- a/net-mgmt/p5-Telnet-Cisco/pkg-descr
+++ b/net-mgmt/p5-Telnet-Cisco/pkg-descr
@@ -1,7 +1,7 @@
 Net::Telnet::Cisco provides additional functionality to Net::Telnet for
 dealing with Cisco routers.
 
-WWW: http://search.cpan.org/search?module=Net::Telnet::Cisco
+WWW: http://search.cpan.org/dist/Net-Telnet-Cisco/
 
 - Michael Lyngbol
 lyngbol@wheel.dk
diff --git a/net/p5-Net-Rendezvous/pkg-descr b/net/p5-Net-Rendezvous/pkg-descr
index 4f05e654bb86..b5995e91445e 100644
--- a/net/p5-Net-Rendezvous/pkg-descr
+++ b/net/p5-Net-Rendezvous/pkg-descr
@@ -10,4 +10,4 @@ the same terms as Perl itself.
 
 Rendezvous (in this context) is a trademark of Apple Computer, Inc.
 
-WWW: http://search.cpan.org/~chlige/Net-Rendezvous/
+WWW: http://search.cpan.org/dist/Net-Rendezvous/
diff --git a/net/p5-Net-Services/pkg-descr b/net/p5-Net-Services/pkg-descr
index 568f7dae7878..c5188b72f754 100644
--- a/net/p5-Net-Services/pkg-descr
+++ b/net/p5-Net-Services/pkg-descr
@@ -1,4 +1,4 @@
 Constructs a hash from the /etc/services file and provides a tied interface 
 to it that takes care of things like the protocol name. 
 
-WWW: http://search.cpan.org/search?module=Net::Services
+WWW: http://search.cpan.org/dist/Net-Services/
diff --git a/net/p5-Net-Whois-Raw/pkg-descr b/net/p5-Net-Whois-Raw/pkg-descr
index fe372d490f1f..e425fb6e2555 100644
--- a/net/p5-Net-Whois-Raw/pkg-descr
+++ b/net/p5-Net-Whois-Raw/pkg-descr
@@ -15,4 +15,4 @@ Usage:
 
 -- Alex Kapranoff <kappa@freebsd.org.ua>
 
-WWW: http://search.cpan.org/~despair/Net-Whois-Raw-0.34/lib/Net/Whois/Raw.pm
+WWW: http://search.cpan.org/dist/Net-Whois-Raw/
diff --git a/security/p5-Authen-Captcha/pkg-descr b/security/p5-Authen-Captcha/pkg-descr
index 532bf8fb00b2..2195dba5551d 100644
--- a/security/p5-Authen-Captcha/pkg-descr
+++ b/security/p5-Authen-Captcha/pkg-descr
@@ -10,4 +10,4 @@ The most common form is an image file containing distorted text, which
 humans are adept at reading, and co mputers (generally) do a poor job.
 This module currently implements that method.
 
-WWW:	http://search.cpan.org/search?module=Authen::Captcha
+WWW:	http://search.cpan.org/dist/Authen-Captcha/
diff --git a/security/p5-Authen-Krb5/pkg-descr b/security/p5-Authen-Krb5/pkg-descr
index d59f98ab10ee..c2c4206cf8ea 100644
--- a/security/p5-Authen-Krb5/pkg-descr
+++ b/security/p5-Authen-Krb5/pkg-descr
@@ -4,6 +4,6 @@ and may require previous experience with Kerberos 5 programming.  Most
 of the functions here are documented in detail in the Kerberos 5 API
 documentation.
 
-WWW:	http://search.cpan.org/search?module=Authen::Krb5
+WWW:	http://search.cpan.org/dist/Authen-Krb5/
 
 FreeBSD port by Andrew J. Korty <ajk@iu.edu>
diff --git a/security/p5-Authen-Smb/pkg-descr b/security/p5-Authen-Smb/pkg-descr
index 121e43469e46..d81fbd25f529 100644
--- a/security/p5-Authen-Smb/pkg-descr
+++ b/security/p5-Authen-Smb/pkg-descr
@@ -1,4 +1,4 @@
 Authen::Smb allows you to authenticate users against an NT server.  See
 Smb.pm POD documentation for details.
 
-WWW: http://search.cpan.org/author/PMKANE/Authen-Smb-0.91/
+WWW: http://search.cpan.org/dist/Authen-Smb/
diff --git a/security/p5-Crypt-Anubis/pkg-descr b/security/p5-Crypt-Anubis/pkg-descr
index f68283da3850..6c5d04dd81dc 100644
--- a/security/p5-Crypt-Anubis/pkg-descr
+++ b/security/p5-Crypt-Anubis/pkg-descr
@@ -5,4 +5,4 @@ or 320 bits.
 
 The default key length in this implementation is 128 bits.
 
-WWW: http://search.cpan.org/perldoc?Crypt::Anubis
+WWW: http://search.cpan.org/dist/Crypt-Anubis/
diff --git a/security/p5-Crypt-xDBM_File/pkg-descr b/security/p5-Crypt-xDBM_File/pkg-descr
index c289f6eeafe1..75e1bc3dafb4 100644
--- a/security/p5-Crypt-xDBM_File/pkg-descr
+++ b/security/p5-Crypt-xDBM_File/pkg-descr
@@ -13,6 +13,6 @@ need to worry about it (except truncated keys). Read the doc that comes
 with crypt function to get an idea of what these sizes are. If keysize 
 or blocksize returns a zero the default is set to 8 bytes (64 bits).
 
-WWW:	http://search.cpan.org/~eestabroo/Crypt-xDBM_File/
+WWW:	http://search.cpan.org/dist/Crypt-xDBM_File/
 
 Author:	Eric Estabrooks <eric@urbanrage.com>
diff --git a/sysutils/savelogs/pkg-descr b/sysutils/savelogs/pkg-descr
index 804d1764665e..60ea9b6bc99d 100644
--- a/sysutils/savelogs/pkg-descr
+++ b/sysutils/savelogs/pkg-descr
@@ -12,4 +12,4 @@ file but leave the tar file uncompressed, etc. You pick ;o)
 savelogs has many options yet retains a high degree of dwimitude.
 
 Author: Scott Wiersdorf <scott@perlcode.org>	
-WWW:	http://search.cpan.org/~scottw/
+WWW:	http://search.cpan.org/dist/savelogs/
diff --git a/textproc/p5-Lingua-Stem-Snowball-Da/pkg-descr b/textproc/p5-Lingua-Stem-Snowball-Da/pkg-descr
index 6fb3bbb8895d..e84dc4e055fb 100644
--- a/textproc/p5-Lingua-Stem-Snowball-Da/pkg-descr
+++ b/textproc/p5-Lingua-Stem-Snowball-Da/pkg-descr
@@ -1,4 +1,4 @@
 Lingua::Stem::Snowball::Da is a perl port of the danish
 stemmer at http://snowball.sourceforge.net.
 
-WWW: http://search.cpan.org/~cine/Lingua-Stem-Snowball-Da-1.01/Da.pm
+WWW: http://search.cpan.org/dist/Lingua-Stem-Snowball-Da/
diff --git a/textproc/p5-Lingua-Stem-Snowball-No/pkg-descr b/textproc/p5-Lingua-Stem-Snowball-No/pkg-descr
index d2eeb9e26c3d..1f73cac57908 100644
--- a/textproc/p5-Lingua-Stem-Snowball-No/pkg-descr
+++ b/textproc/p5-Lingua-Stem-Snowball-No/pkg-descr
@@ -1,4 +1,4 @@
 Lingua::Stem::Snowball::No is a perl port of the norwegian
 stemmer at http://snowball.sourceforge.net.
 
-WWW: http://search.cpan.org/~asksh/Snowball-Norwegian-1.0/No.pm
+WWW: http://search.cpan.org/dist/Snowball-Norwegian/
diff --git a/textproc/p5-Lingua-Stem-Snowball-Se/pkg-descr b/textproc/p5-Lingua-Stem-Snowball-Se/pkg-descr
index 6570f4afcf94..2a7972383f97 100644
--- a/textproc/p5-Lingua-Stem-Snowball-Se/pkg-descr
+++ b/textproc/p5-Lingua-Stem-Snowball-Se/pkg-descr
@@ -1,4 +1,4 @@
 Lingua::Stem::Snowball::Se is a perl port of the swedish
 stemmer at http://snowball.sourceforge.net.
 
-WWW: http://search.cpan.org/~asksh/Snowball-Swedish-1.01/Se.pm
+WWW: http://search.cpan.org/dist/Snowball-Swedish/
diff --git a/textproc/p5-Lingua-Stem/pkg-descr b/textproc/p5-Lingua-Stem/pkg-descr
index 72666aee6122..172c507e8455 100644
--- a/textproc/p5-Lingua-Stem/pkg-descr
+++ b/textproc/p5-Lingua-Stem/pkg-descr
@@ -14,4 +14,4 @@ Currently supported locales are:
       PT          - Portuguese
       SV          - Swedish
 
-WWW: http://search.cpan.org/~snowhare/Lingua-Stem/
+WWW: http://search.cpan.org/dist/Lingua-Stem/
diff --git a/textproc/p5-Spork/pkg-descr b/textproc/p5-Spork/pkg-descr
index 7b8b4db06ae8..12839c7a8077 100644
--- a/textproc/p5-Spork/pkg-descr
+++ b/textproc/p5-Spork/pkg-descr
@@ -1,4 +1,4 @@
 Spork - a Perl module for creating standalone HTML slideshows from Kwiki markup
 
 Author:	Brian Ingerson <INGY@cpan.org>
-WWW:	http://search.cpan.org/~ingy/
+WWW:	http://search.cpan.org/dist/Spork/
diff --git a/textproc/p5-TeX-Hyphen/pkg-descr b/textproc/p5-TeX-Hyphen/pkg-descr
index c88568687a8b..f7f152978fdc 100644
--- a/textproc/p5-TeX-Hyphen/pkg-descr
+++ b/textproc/p5-TeX-Hyphen/pkg-descr
@@ -1,3 +1,3 @@
 Hyphenate words using TeX's patterns.
 
-WWW: http://search.cpan.org/author/JANPAZ/TeX-Hyphen/
+WWW: http://search.cpan.org/dist/TeX-Hyphen/
diff --git a/textproc/p5-Template-Magic/pkg-descr b/textproc/p5-Template-Magic/pkg-descr
index f6b6793b9ee7..bb7eb5800b02 100644
--- a/textproc/p5-Template-Magic/pkg-descr
+++ b/textproc/p5-Template-Magic/pkg-descr
@@ -3,6 +3,6 @@ Template-Magic is a "magic" interface between programming and design. It makes
 returned by your subroutines - inside a static template file. Usually no need 
 to assign values to the object.
 
-WWW: http://search.cpan.org/~domizio/Template-Magic/
+WWW: http://search.cpan.org/dist/Template-Magic/
 
 Author: Domizio Demichelis <dd@4pro.net>
diff --git a/textproc/p5-Text-MagicTemplate/pkg-descr b/textproc/p5-Text-MagicTemplate/pkg-descr
index b7040385443e..1a893afea704 100644
--- a/textproc/p5-Text-MagicTemplate/pkg-descr
+++ b/textproc/p5-Text-MagicTemplate/pkg-descr
@@ -3,6 +3,6 @@ MagicTemplate is a "magic" interface between programming and design. It makes
 returned by your subroutines - inside a static template file. Usually no 
 need to assign values to the object.
 
-WWW: http://search.cpan.org/~domizio/Text-MagicTemplate/
+WWW: http://search.cpan.org/dist/Text-MagicTemplate/
 
 Author: Domizio Demichelis <dd@4pro.net>
diff --git a/textproc/p5-Text-ParagraphDiff/pkg-descr b/textproc/p5-Text-ParagraphDiff/pkg-descr
index 34294cacc7e6..a4d45aec344b 100644
--- a/textproc/p5-Text-ParagraphDiff/pkg-descr
+++ b/textproc/p5-Text-ParagraphDiff/pkg-descr
@@ -1,5 +1,5 @@
 Text::ParagraphDiff - Visual Difference for paragraphed text
 
-WWW:	http://search.cpan.org/~jryan/Text-ParagraphDiff/
+WWW:	http://search.cpan.org/dist/Text-ParagraphDiff/
 
 Author:	Joseph F. Ryan <ryan.311@osu.edu>
diff --git a/textproc/p5-Text-VimColor/pkg-descr b/textproc/p5-Text-VimColor/pkg-descr
index c2a84d49a593..a9783f895f15 100644
--- a/textproc/p5-Text-VimColor/pkg-descr
+++ b/textproc/p5-Text-VimColor/pkg-descr
@@ -1,4 +1,4 @@
 Text::VimColor - syntax color text in HTML or XML using Vim
 
 Author:	Geoff Richards <qef@laxan.com>
-WWW:	http://search.cpan.org/~geoffr/Text-VimColor/
+WWW:	http://search.cpan.org/dist/Text-VimColor/
diff --git a/textproc/p5-XML-Clean/pkg-descr b/textproc/p5-XML-Clean/pkg-descr
index a7078937c5a8..34b9addfd36d 100644
--- a/textproc/p5-XML-Clean/pkg-descr
+++ b/textproc/p5-XML-Clean/pkg-descr
@@ -9,4 +9,4 @@ When you add some extra parameters, you will receive complete XML
 text, including XML head and root element (if none were defined in
 text, then some will be added).
 
-WWW: http://search.cpan.org/~pkubanek/XML-Clean/
+WWW: http://search.cpan.org/dist/XML-Clean/
diff --git a/textproc/p5-XML-Elemental/pkg-descr b/textproc/p5-XML-Elemental/pkg-descr
index b7b07b78337d..234a25ac41b0 100644
--- a/textproc/p5-XML-Elemental/pkg-descr
+++ b/textproc/p5-XML-Elemental/pkg-descr
@@ -1,5 +1,5 @@
 XML::Elemental is an XML::Parser style and generic classes package
 for simplistic and perlish handling of XML data.
 
-WWW:	http://search.cpan.org/~tima/XML-Elemental/
+WWW:	http://search.cpan.org/dist/XML-Elemental/
 Author:	Timothy Appnel
diff --git a/textproc/p5-XML-RSS-JavaScript/pkg-descr b/textproc/p5-XML-RSS-JavaScript/pkg-descr
index 521f386a112f..a03295f46417 100644
--- a/textproc/p5-XML-RSS-JavaScript/pkg-descr
+++ b/textproc/p5-XML-RSS-JavaScript/pkg-descr
@@ -14,4 +14,4 @@ include it like so:
 What's more the javascript emits HTML that can be fully styled with 
 CSS. See the CSS examples included with the distribution in the css directory.
 
-WWW: http://search.cpan.org/perldoc?XML::RSS::JavaScript
+WWW: http://search.cpan.org/dist/XML-RSS-JavaScript/
diff --git a/textproc/p5-XML-SimpleObject-LibXML/pkg-descr b/textproc/p5-XML-SimpleObject-LibXML/pkg-descr
index 25b9b06a27e0..805945b7e7f6 100644
--- a/textproc/p5-XML-SimpleObject-LibXML/pkg-descr
+++ b/textproc/p5-XML-SimpleObject-LibXML/pkg-descr
@@ -3,4 +3,4 @@ XML::LibXML tree, with methods for fetching children and attributes in as
 clean a manner as possible. My apologies for further polluting the XML:: 
 space; this is a small and quick module, with easy and compact usage. 
 
-WWW: http://search.cpan.org/perldoc?XML::SimpleObject::LibXML
+WWW: http://search.cpan.org/dist/XML-SimpleObject-LibXML/
diff --git a/textproc/p5-XML-SimpleObject/pkg-descr b/textproc/p5-XML-SimpleObject/pkg-descr
index e994aefde904..64b03938ae72 100644
--- a/textproc/p5-XML-SimpleObject/pkg-descr
+++ b/textproc/p5-XML-SimpleObject/pkg-descr
@@ -4,4 +4,4 @@ document. It is very lightweight, but provides the simplest access to an XML
 document possible. It does not subclass XML::Parser; rather, it is meant to 
 serve purely as an object struct for an outgoing tree.
 
-WWW: http://search.cpan.org/perldoc?XML::SimpleObject
+WWW: http://search.cpan.org/dist/XML-SimpleObject/
diff --git a/www/p5-HTML-CalendarMonthSimple/pkg-descr b/www/p5-HTML-CalendarMonthSimple/pkg-descr
index 6bc26456e537..01129840f6b3 100644
--- a/www/p5-HTML-CalendarMonthSimple/pkg-descr
+++ b/www/p5-HTML-CalendarMonthSimple/pkg-descr
@@ -2,4 +2,4 @@ HTML::CalendarMonthSimple is a Perl module for generating, manipulating,
 and printing a HTML calendar grid for a specified month. It is intended
 as a faster and easier-to-use alternative to HTML::CalendarMonth.
 
-WWW: http://search.cpan.org/search?mode=module&;query=CalendarMonthSimple
+WWW: http://search.cpan.org/dist/HTML-CalendarMonthSimple/
diff --git a/www/p5-HTML-FromText/pkg-descr b/www/p5-HTML-FromText/pkg-descr
index 2ae971b5c070..889f27d186cb 100644
--- a/www/p5-HTML-FromText/pkg-descr
+++ b/www/p5-HTML-FromText/pkg-descr
@@ -5,6 +5,6 @@ such as splitting the text into paragraphs or marking up
 bulleted lists, can be carried out by setting the
 appropriate options.
 
-WWW: http://search.cpan.org/author/GDR/HTML-FromText/
+WWW: http://search.cpan.org/dist/HTML-FromText/
 
 Seamus Venasse <svenasse@polaris.ca>
diff --git a/www/p5-HTML-Scrubber/pkg-descr b/www/p5-HTML-Scrubber/pkg-descr
index e163c68d2d5b..1242990a14c3 100644
--- a/www/p5-HTML-Scrubber/pkg-descr
+++ b/www/p5-HTML-Scrubber/pkg-descr
@@ -7,4 +7,4 @@ explicit rule if one exists. If no explicit rule exists, Scrubber applies
 the default rule. If an explicit rule exists, but it's a simple rule(1), 
 the default attribute rule is applied.
 
-WWW: http://search.cpan.org/perldoc?HTML::Scrubber
+WWW: http://search.cpan.org/dist/HTML-Scrubber/
diff --git a/www/p5-HTML-TableTiler/pkg-descr b/www/p5-HTML-TableTiler/pkg-descr
index 8b155797682d..fe31a2134191 100644
--- a/www/p5-HTML-TableTiler/pkg-descr
+++ b/www/p5-HTML-TableTiler/pkg-descr
@@ -15,6 +15,6 @@ The main advantages to use it are:
 
 * simple to maintain
 
-WWW: http://search.cpan.org/~domizio/HTML-TableTiler/
+WWW: http://search.cpan.org/dist/HTML-TableTiler/
 
 Author: Domizio Demichelis <dd@4pro.net>
diff --git a/www/p5-HTML-Template-Associate/pkg-descr b/www/p5-HTML-Template-Associate/pkg-descr
index 20b5bb3ab9c7..4898727ac5f6 100644
--- a/www/p5-HTML-Template-Associate/pkg-descr
+++ b/www/p5-HTML-Template-Associate/pkg-descr
@@ -6,7 +6,7 @@ inputs.
 The primary reason I wrote this is that I needed something to bridge those
 two and the thought of creating something more expandable came to mind.   
 
-WWW: http://search.cpan.org/author/ALEXP/HTML-Template-Associate-1.10/
+WWW: http://search.cpan.org/dist/HTML-Template-Associate/
 
 - Manuel Rodrigo Rabade Garcia
 mig@mig-29.net
diff --git a/www/p5-HTML-TokeParser-Simple/pkg-descr b/www/p5-HTML-TokeParser-Simple/pkg-descr
index 6259bdba42f1..e446b7002613 100644
--- a/www/p5-HTML-TokeParser-Simple/pkg-descr
+++ b/www/p5-HTML-TokeParser-Simple/pkg-descr
@@ -9,4 +9,4 @@ Instead of
 
  $token->[0] eq 'S' and $token->[1] eq 'form'
 
-WWW: http://search.cpan.org/~ovid/HTML-TokeParser-Simple/
+WWW: http://search.cpan.org/dist/HTML-TokeParser-Simple/
diff --git a/www/p5-Kwiki-GDGraphGenerator/pkg-descr b/www/p5-Kwiki-GDGraphGenerator/pkg-descr
index f280bf22ad61..75677cce544e 100644
--- a/www/p5-Kwiki-GDGraphGenerator/pkg-descr
+++ b/www/p5-Kwiki-GDGraphGenerator/pkg-descr
@@ -4,4 +4,4 @@ Kwiki::GDGraphGenerator turns graph WAFL blocks into pretty graph
 (bars/lines/pie graph) using GD::Graph
 
 Author:	Ian Langworth <langworth.com>
-WWW:	http://search.cpan.org/~ian/Kwiki-GDGraphGenerator/
+WWW:	http://search.cpan.org/dist/Kwiki-GDGraphGenerator/
diff --git a/www/p5-Kwiki-NewPage/pkg-descr b/www/p5-Kwiki-NewPage/pkg-descr
index 496cd71ac9dc..42619e40d4f9 100644
--- a/www/p5-Kwiki-NewPage/pkg-descr
+++ b/www/p5-Kwiki-NewPage/pkg-descr
@@ -3,4 +3,4 @@ Kwiki::NewPage - Kwiki NewPage plugin
 Kwiki::NewPage enables a "NewPage" button on Kwiki's toolbar.
 
 Author:	Brian Ingerson <ingy@cpan.org>
-WWW:	http://search.cpan.org/~ingy/
+WWW:	http://search.cpan.org/dist/Kwiki-NewPage/