diff --git a/p5-Algorithm-C3/DESCR b/p5-Algorithm-C3/DESCR
deleted file mode 100644
index 5c97e0fee4..0000000000
--- a/p5-Algorithm-C3/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-This module implements the C3 algorithm. I have broken this out
-into it's own module because I found myself copying and pasting
-it way too often for various needs. Most of the uses I have for
-C3 revolve around class building and metamodels, but it could
-also be used for things like dependency resolution as well since
-it tends to do such a nice job of preserving local precendence
-orderings.
diff --git a/p5-Algorithm-C3/Makefile b/p5-Algorithm-C3/Makefile
deleted file mode 100644
index a358097fca..0000000000
--- a/p5-Algorithm-C3/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2007/03/03 08:42:09 netcap Exp $
-
-DISTNAME=	Algorithm-C3-0.06
-PKGNAME=	p5-${DISTNAME}
-CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Algorithm/}
-
-MAINTAINER=	kuli0020@umn.edu
-HOMEPAGE=	http://search.cpan.org/dist/Algorithm-C3/
-COMMENT=	Module for merging hierarchies using the C3 algorithm
-
-BUILD_DEPENDS+=       {perl>=5.7.3,p5-Test-Simple>=0.47}:../../devel/p5-Test-Simple
-
-PERL5_MODULE_TYPE=	Module::Build
-
-PERL5_REQD+=	5.8.0
-
-PERL5_PACKLIST=	auto/Algorithm/C3/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-Algorithm-C3/distinfo b/p5-Algorithm-C3/distinfo
deleted file mode 100644
index dad0596b43..0000000000
--- a/p5-Algorithm-C3/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2007/03/03 08:42:10 netcap Exp $
-
-SHA1 (Algorithm-C3-0.06.tar.gz) = 76f59410c3ee120497bb37abca1b33cddc659134
-RMD160 (Algorithm-C3-0.06.tar.gz) = 862333e0a47e4b0cb166b90aca89d870b77832e2
-Size (Algorithm-C3-0.06.tar.gz) = 9228 bytes
diff --git a/p5-CGI-Simple/DESCR b/p5-CGI-Simple/DESCR
deleted file mode 100644
index 395455972f..0000000000
--- a/p5-CGI-Simple/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-CGI::Simple provides a relatively lightweight drop in replacement
-for CGI.pm.  It shares an identical OO interface to CGI.pm for
-parameter parsing, file upload, cookie handling and header generation.
diff --git a/p5-CGI-Simple/Makefile b/p5-CGI-Simple/Makefile
deleted file mode 100644
index ef4f603293..0000000000
--- a/p5-CGI-Simple/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2005/07/26 05:58:12 jgoamakf Exp $
-
-DISTNAME=		Cgi-Simple-0.077
-PKGNAME=		p5-CGI-Simple-0.077
-SVR4_PKGNAME=		p5cgs
-CATEGORIES=		www perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=CGI/}
-
-MAINTAINER=		hiramatu@boreas.dti.ne.jp
-HOMEPAGE=		http://search.cpan.org/dist/Cgi-Simple/
-COMMENT=		Simple totally OO CGI interface that is CGI.pm compliant
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-PERL5_PACKLIST=		auto/CGI/Simple/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-CGI-Simple/distinfo b/p5-CGI-Simple/distinfo
deleted file mode 100644
index 524e25274a..0000000000
--- a/p5-CGI-Simple/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/04/06 11:06:58 jgoamakf Exp $
-
-SHA1 (Cgi-Simple-0.077.tar.gz) = a30f1613affe062b8502faa957d9f8f0be1bd254
-RMD160 (Cgi-Simple-0.077.tar.gz) = 27704907b86ff74847d6c717d90a54c99580e907
-Size (Cgi-Simple-0.077.tar.gz) = 149933 bytes
diff --git a/p5-Catalyst-Model-CDBI/Makefile b/p5-Catalyst-Model-CDBI/Makefile
index d97d274f3f..71afe869b4 100644
--- a/p5-Catalyst-Model-CDBI/Makefile
+++ b/p5-Catalyst-Model-CDBI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/10/29 08:32:49 shattered Exp $
+# $NetBSD: Makefile,v 1.4 2008/06/25 09:20:57 absd Exp $
 
 DISTNAME=	Catalyst-Model-CDBI-0.08
 PKGNAME=	p5-${DISTNAME}
@@ -10,7 +10,7 @@ MAINTAINER=	kuli0020@umn.edu
 HOMEPAGE=	http://search.cpan.org/dist/Catalyst-Model-CDBI/
 COMMENT=	CDBI model class for Catalyst
 
-DEPENDS+=	p5-Class-DBI-Loader>=0.2:../../wip/p5-Class-DBI-Loader
+DEPENDS+=	p5-Class-DBI-Loader>=0.2:../../devel/p5-Class-DBI-Loader
 DEPENDS+=	p5-Catalyst>=4:../../wip/p5-Catalyst
 DEPENDS+=	p5-Class-DBI>=0:../../databases/p5-Class-DBI
 
diff --git a/p5-Catalyst-Model-DBIC-Schema/Makefile b/p5-Catalyst-Model-DBIC-Schema/Makefile
index d141434e09..f05514c94b 100644
--- a/p5-Catalyst-Model-DBIC-Schema/Makefile
+++ b/p5-Catalyst-Model-DBIC-Schema/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/03/03 10:25:17 netcap Exp $
+# $NetBSD: Makefile,v 1.4 2008/06/25 09:20:57 absd Exp $
 
 DISTNAME=	Catalyst-Model-DBIC-Schema-0.18
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ COMMENT=	DBIx::Class::Schema Model Class
 
 DEPENDS+=	p5-Catalyst>=5.64:../../wip/p5-Catalyst
 DEPENDS+=	p5-Class-Accessor>=0.22:../../devel/p5-Class-Accessor
-DEPENDS+=	p5-Class-Data-Accessor>=0.02:../../wip/p5-Class-Data-Accessor
+DEPENDS+=	p5-Class-Data-Accessor>=0.02:../../devel/p5-Class-Data-Accessor
 DEPENDS+=	p5-DBIx-Class>=0.07:../../wip/p5-DBIx-Class
 DEPENDS+=	p5-UNIVERSAL-require>=0.10:../../devel/p5-UNIVERSAL-require
 DEPENDS+=	p5-Catalyst-Devel>=1:../../wip/p5-Catalyst-Devel
diff --git a/p5-Catalyst-Plugin-Authentication-Store-DBIC/Makefile b/p5-Catalyst-Plugin-Authentication-Store-DBIC/Makefile
index 1b41c8349d..dd80e8df45 100644
--- a/p5-Catalyst-Plugin-Authentication-Store-DBIC/Makefile
+++ b/p5-Catalyst-Plugin-Authentication-Store-DBIC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/03/03 08:04:47 netcap Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/25 09:20:57 absd Exp $
 
 DISTNAME=	Catalyst-Plugin-Authentication-Store-DBIC-0.07
 PKGNAME=	p5-${DISTNAME}
@@ -13,7 +13,7 @@ DEPENDS+=	p5-Catalyst>=5.49:../../wip/p5-Catalyst
 DEPENDS+=	p5-Catalyst-Plugin-Authentication>=0.06:../../wip/p5-Catalyst-Plugin-Authentication
 DEPENDS+=	p5-Catalyst-Plugin-Authorization-Roles>=0.03:../../wip/p5-Catalyst-Plugin-Authorization-Roles
 DEPENDS+=	p5-Catalyst-Plugin-Session-State-Cookie>=0.02:../../wip/p5-Catalyst-Plugin-Session-State-Cookie
-DEPENDS+=	p5-Set-Object>=1.14:../../wip/p5-Set-Object
+DEPENDS+=	p5-Set-Object>=1.14:../../devel/p5-Set-Object
 DEPENDS+=	p5-DBI>=0:../../databases/p5-DBI
 DEPENDS+=	p5-Class-DBI>=0:../../databases/p5-Class-DBI
 DEPENDS+=	p5-DBIx-Class>=0:../../wip/p5-DBIx-Class
diff --git a/p5-Catalyst-Plugin-Authorization-ACL/Makefile b/p5-Catalyst-Plugin-Authorization-ACL/Makefile
index 03779b5522..e2598143d5 100644
--- a/p5-Catalyst-Plugin-Authorization-ACL/Makefile
+++ b/p5-Catalyst-Plugin-Authorization-ACL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/03/03 08:14:22 netcap Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/25 09:20:57 absd Exp $
 
 DISTNAME=	Catalyst-Plugin-Authorization-ACL-0.08
 PKGNAME=	p5-${DISTNAME}
@@ -11,8 +11,8 @@ COMMENT=	ACL support for Catalyst applications
 
 DEPENDS+=	p5-Catalyst>=5.7:../../wip/p5-Catalyst
 DEPENDS+=	p5-Class-Data-Inheritable>=0:../../devel/p5-Class-Data-Inheritable
-DEPENDS+=	p5-Class-Throwable>=0:../../wip/p5-Class-Throwable
-DEPENDS+=	p5-Tree-Simple-VisitorFactory>=0:../../wip/p5-Tree-Simple-VisitorFactory
+DEPENDS+=	p5-Class-Throwable>=0:../../devel/p5-Class-Throwable
+DEPENDS+=	p5-Tree-Simple-VisitorFactory>=0:../../devel/p5-Tree-Simple-VisitorFactory
 
 PERL5_MODULE_TYPE=	Module::Build
 
diff --git a/p5-Catalyst-Plugin-Authorization-Roles/Makefile b/p5-Catalyst-Plugin-Authorization-Roles/Makefile
index 7fca465a3a..88e37f69d3 100644
--- a/p5-Catalyst-Plugin-Authorization-Roles/Makefile
+++ b/p5-Catalyst-Plugin-Authorization-Roles/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/03/03 08:21:51 netcap Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/25 09:20:57 absd Exp $
 
 DISTNAME=	Catalyst-Plugin-Authorization-Roles-0.05
 PKGNAME=	p5-${DISTNAME}
@@ -11,10 +11,10 @@ COMMENT=	Role based authorization for Catalyst
 
 DEPENDS+=	p5-Catalyst>=5.49:../../wip/p5-Catalyst
 DEPENDS+=	p5-Catalyst-Plugin-Authentication>=0.03:../../wip/p5-Catalyst-Plugin-Authentication
-DEPENDS+=	p5-Set-Object>=1.14:../../wip/p5-Set-Object
-DEPENDS+=	p5-Test-MockObject>=1.01:../../wip/p5-Test-MockObject
+DEPENDS+=	p5-Set-Object>=1.14:../../devel/p5-Set-Object
+DEPENDS+=	p5-Test-MockObject>=1.01:../../devel/p5-Test-MockObject
 DEPENDS+=	p5-Test-Exception>=0:../../devel/p5-Test-Exception
-DEPENDS+=	p5-UNIVERSAL-isa>=0.05:../../wip/p5-UNIVERSAL-isa
+DEPENDS+=	p5-UNIVERSAL-isa>=0.05:../../devel/p5-UNIVERSAL-isa
 
 # PERL5_MODULE_TYPE=	Module::Build
 
diff --git a/p5-Catalyst-Plugin-Session-State-URI/Makefile b/p5-Catalyst-Plugin-Session-State-URI/Makefile
index 998d34bb35..765eb17436 100644
--- a/p5-Catalyst-Plugin-Session-State-URI/Makefile
+++ b/p5-Catalyst-Plugin-Session-State-URI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/03/03 06:59:19 netcap Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/25 09:20:57 absd Exp $
 
 DISTNAME=	Catalyst-Plugin-Session-State-URI-0.07
 PKGNAME=	p5-${DISTNAME}
@@ -13,7 +13,7 @@ DEPENDS+=	p5-Catalyst-Plugin-Session>=0.06:../../wip/p5-Catalyst-Plugin-Session
 DEPENDS+=	p5-URI>=0:../../www/p5-URI
 DEPENDS+=	p5-HTML-TokeParser-Simple>=0:../../wip/p5-HTML-TokeParser-Simple
 DEPENDS+=	p5-MIME-Types>=0:../../mail/p5-MIME-Types
-DEPENDS+=	p5-Test-MockObject>=1.01:../../wip/p5-Test-MockObject
+DEPENDS+=	p5-Test-MockObject>=1.01:../../devel/p5-Test-MockObject
 DEPENDS+=	p5-URI>=0:../../www/p5-URI
 DEPENDS+=	p5-URI-Find>=0:../../wip/p5-URI-Find
 
diff --git a/p5-Catalyst-Plugin-Session/Makefile b/p5-Catalyst-Plugin-Session/Makefile
index 9e2ab09857..7470c52cb4 100644
--- a/p5-Catalyst-Plugin-Session/Makefile
+++ b/p5-Catalyst-Plugin-Session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/03/03 06:26:17 netcap Exp $
+# $NetBSD: Makefile,v 1.4 2008/06/25 09:20:57 absd Exp $
 
 DISTNAME=	Catalyst-Plugin-Session-0.14
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ COMMENT=	Generic Catalyst Session plugin
 PERL5_REQD+=	5.8.1
 
 DEPENDS+=	p5-Catalyst>=5.49:../../wip/p5-Catalyst
-DEPENDS+=	p5-Test-MockObject>=1.01:../../wip/p5-Test-MockObject
+DEPENDS+=	p5-Test-MockObject>=1.01:../../devel/p5-Test-MockObject
 DEPENDS+=	p5-Digest>=0:../../security/p5-Digest
 DEPENDS+=	p5-Object-Signature>=0:../../wip/p5-Object-Signature
 DEPENDS+=	p5-File-Temp>=0:../../devel/p5-File-Temp
diff --git a/p5-Catalyst-View-TT/Makefile b/p5-Catalyst-View-TT/Makefile
index a4e2a7e5fa..5961871fb7 100644
--- a/p5-Catalyst-View-TT/Makefile
+++ b/p5-Catalyst-View-TT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/07/13 17:14:43 absd Exp $
+# $NetBSD: Makefile,v 1.7 2008/06/25 09:20:57 absd Exp $
 
 DISTNAME=	Catalyst-View-TT-0.25
 PKGNAME=	p5-${DISTNAME}
@@ -13,7 +13,7 @@ PERL5_REQD+=	5.8.1
 DEPENDS+=	p5-Catalyst>=5.50:../../wip/p5-Catalyst
 DEPENDS+=	p5-Path-Class>=0:../../devel/p5-Path-Class
 DEPENDS+=	p5-Template-Toolkit>=0:../../www/p5-Template-Toolkit
-DEPENDS+=	p5-Template-Timer>=0:../../wip/p5-Template-Timer
+DEPENDS+=	p5-Template-Timer>=0:../../www/p5-Template-Timer
 DEPENDS+=	p5-Class-Accessor>=0:../../devel/p5-Class-Accessor
 
 PERL5_PACKLIST= auto/Catalyst/View/TT/.packlist
diff --git a/p5-Catalyst/Makefile b/p5-Catalyst/Makefile
index c9344ca22a..efdb7273c7 100644
--- a/p5-Catalyst/Makefile
+++ b/p5-Catalyst/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/05/30 12:19:58 absd Exp $
+# $NetBSD: Makefile,v 1.23 2008/06/25 09:20:57 absd Exp $
 
 PKGVERSION=	5.7011
 DISTNAME=	Catalyst-Runtime-${PKGVERSION}
@@ -14,7 +14,7 @@ PERL5_REQD+=	5.8.1
 CONFLICTS+=	p5-Catalyst-Runtime
 
 DEPENDS+=	p5-Data-Dump>=0:../../devel/p5-Data-Dump
-DEPENDS+=	p5-CGI-Simple>=0:../../wip/p5-CGI-Simple
+DEPENDS+=	p5-CGI-Simple>=0:../../www/p5-CGI-Simple
 DEPENDS+=	p5-UNIVERSAL-require>=0.10:../../devel/p5-UNIVERSAL-require
 DEPENDS+=	p5-Class-Accessor>=0:../../devel/p5-Class-Accessor
 DEPENDS+=	p5-Class-Data-Inheritable>=0:../../devel/p5-Class-Data-Inheritable
@@ -23,9 +23,9 @@ DEPENDS+=	p5-Data-Visitor>=0.02:../../wip/p5-Data-Visitor
 DEPENDS+=	{perl>=5.4.0,p5-CGI>=3.06}:../../www/p5-CGI
 DEPENDS+=	p5-File-Modified>=0:../../devel/p5-File-Modified
 DEPENDS+=	p5-HTML-Parser>=0:../../www/p5-HTML-Parser
-DEPENDS+=	p5-HTTP-Body>=0.9:../../wip/p5-HTTP-Body
+DEPENDS+=	p5-HTTP-Body>=0.9:../../www/p5-HTTP-Body
 DEPENDS+=	p5-libwww>=5.805:../../www/p5-libwww
-DEPENDS+=	p5-HTTP-Request-AsCGI>=0.5:../../wip/p5-HTTP-Request-AsCGI
+DEPENDS+=	p5-HTTP-Request-AsCGI>=0.5:../../www/p5-HTTP-Request-AsCGI
 DEPENDS+=	p5-MIME-Types>=0:../../mail/p5-MIME-Types
 DEPENDS+=	p5-Module-Pluggable>=3.01:../../devel/p5-Module-Pluggable
 DEPENDS+=	p5-NEXT>=0:../../devel/p5-NEXT
@@ -35,12 +35,12 @@ DEPENDS+=	p5-Template-Toolkit>=0:../../www/p5-Template-Toolkit
 DEPENDS+=	p5-Text-SimpleTable>=0.03:../../textproc/p5-Text-SimpleTable
 DEPENDS+=	p5-Time-HiRes>=0:../../time/p5-Time-HiRes
 DEPENDS+=	p5-Tree-Simple>=1.15:../../devel/p5-Tree-Simple
-DEPENDS+=	p5-Tree-Simple-VisitorFactory>=0:../../wip/p5-Tree-Simple-VisitorFactory
+DEPENDS+=	p5-Tree-Simple-VisitorFactory>=0:../../devel/p5-Tree-Simple-VisitorFactory
 DEPENDS+=	p5-URI>=1.35:../../www/p5-URI
 DEPENDS+=	p5-File-Copy-Recursive>=0:../../sysutils/p5-File-Copy-Recursive
 DEPENDS+=	p5-Module-Install>=0.54:../../devel/p5-Module-Install
 DEPENDS+=	p5-YAML>=0.55:../../textproc/p5-YAML
-BUILD_DEPENDS+=	p5-Test-MockObject>=0:../../wip/p5-Test-MockObject
+BUILD_DEPENDS+=	p5-Test-MockObject>=0:../../devel/p5-Test-MockObject
 BUILD_DEPENDS+=	p5-Test-NoWarnings>=0.082:../../devel/p5-Test-NoWarnings
 
 PERL5_PACKLIST= auto/Catalyst/Runtime/.packlist
diff --git a/p5-Class-Accessor-Grouped/DESCR b/p5-Class-Accessor-Grouped/DESCR
deleted file mode 100644
index 823ca18f2d..0000000000
--- a/p5-Class-Accessor-Grouped/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Class::Accessor::Grouped   	 Lets you build groups of accessors
diff --git a/p5-Class-Accessor-Grouped/Makefile b/p5-Class-Accessor-Grouped/Makefile
deleted file mode 100644
index 999a950203..0000000000
--- a/p5-Class-Accessor-Grouped/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/11/22 01:48:51 geeohgeegeeoh Exp $
-
-PKGVERSION=	0.07000
-DISTNAME=	Class-Accessor-Grouped-${PKGVERSION}
-PKGNAME=	p5-Class-Accessor-Grouped-${PKGVERSION}
-CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/C/CL/CLACO/}
-
-MAINTAINER=	ggm@apnic.net
-COMMENT=	Class::Accessor::Grouped
-
-DEPENDS+=	p5-Class-C3>=0:../../wip/p5-Class-C3
-DEPENDS+=	p5-Class-Inspector>=0:../../devel/p5-Class-Inspector
-DEPENDS+=	p5-MRO-Compat>=0:../../wip/p5-MRO-Compat
-
-PERL5_PACKLIST=	auto/Class/Accessor/Grouped/.packlist
-
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-Class-Accessor-Grouped/distinfo b/p5-Class-Accessor-Grouped/distinfo
deleted file mode 100644
index 6e64c39a22..0000000000
--- a/p5-Class-Accessor-Grouped/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/11/22 01:48:51 geeohgeegeeoh Exp $
-
-SHA1 (Class-Accessor-Grouped-0.07000.tar.gz) = 6d1a1cfda168aa5aa5f77081b422c31b0e6484d7
-RMD160 (Class-Accessor-Grouped-0.07000.tar.gz) = 689c72ae8318f88a8d59dfab915ce66945fd4b01
-Size (Class-Accessor-Grouped-0.07000.tar.gz) = 22643 bytes
diff --git a/p5-Class-C3-Componentised/Makefile b/p5-Class-C3-Componentised/Makefile
index 562701169e..17119303fb 100644
--- a/p5-Class-C3-Componentised/Makefile
+++ b/p5-Class-C3-Componentised/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/01/12 23:32:52 thomasklausner Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/25 09:20:57 absd Exp $
 
 PKGVERSION=	1.0001
 DISTNAME=	Class-C3-Componentised-${PKGVERSION}
@@ -9,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/A/AS/ASH/}
 MAINTAINER=	ggm@apnic.net
 COMMENT=	Class::C3::Componentised
 
-DEPENDS+=	p5-Class-C3>=0:../../wip/p5-Class-C3
+DEPENDS+=	p5-Class-C3>=0:../../devel/p5-Class-C3
 DEPENDS+=	p5-Class-Inspector>=0:../../devel/p5-Class-Inspector
 
 PERL5_PACKLIST=	auto/Class/C3/Componentised/.packlist
diff --git a/p5-Class-C3-XS/DESCR b/p5-Class-C3-XS/DESCR
deleted file mode 100644
index 2608fc14f0..0000000000
--- a/p5-Class-C3-XS/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-This package contains XS performance enhancers for Class::C3.
diff --git a/p5-Class-C3-XS/Makefile b/p5-Class-C3-XS/Makefile
deleted file mode 100644
index c2c7f6b513..0000000000
--- a/p5-Class-C3-XS/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/11/07 03:12:51 jgoamakf Exp $
-
-DISTNAME=		Class-C3-XS-0.08
-PKGNAME=		p5-${DISTNAME}
-CATEGORIES=		devel perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Class/}
-
-MAINTAINER=		hiramatu@boreas.dti.ne.jp
-HOMEPAGE=		http://search.cpan.org/dist/Class-C3-XS/
-COMMENT=		XS speedups for Class::C3
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-USE_LANGUAGES=		c
-PERL5_PACKLIST=		auto/Class/C3/XS/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-Class-C3-XS/distinfo b/p5-Class-C3-XS/distinfo
deleted file mode 100644
index eb07ac64dc..0000000000
--- a/p5-Class-C3-XS/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/11/07 03:12:51 jgoamakf Exp $
-
-SHA1 (Class-C3-XS-0.08.tar.gz) = 8fa1a01ff3bb90499327f378048e103722b5c59c
-RMD160 (Class-C3-XS-0.08.tar.gz) = 3b035744b0fc06ab59ab5ce6885531ad3303e189
-Size (Class-C3-XS-0.08.tar.gz) = 28241 bytes
diff --git a/p5-Class-C3/DESCR b/p5-Class-C3/DESCR
deleted file mode 100644
index 1cd55367cb..0000000000
--- a/p5-Class-C3/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This is currently an experimental pragma to change Perl 5's standard
-method resolution order from depth-first left-to-right (a.k.a -
-pre-order) to the more sophisticated C3 method resolution order.
diff --git a/p5-Class-C3/Makefile b/p5-Class-C3/Makefile
deleted file mode 100644
index 734aea32ce..0000000000
--- a/p5-Class-C3/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2007/11/07 03:17:05 jgoamakf Exp $
-
-DISTNAME=		Class-C3-0.19
-PKGNAME=		p5-${DISTNAME}
-CATEGORIES=		devel perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Class/}
-
-MAINTAINER=		hiramatu@boreas.dti.ne.jp
-HOMEPAGE=		http://search.cpan.org/dist/Class-C3/
-COMMENT=		Pragma to use the C3 method resolution order algortihm
-PERL5_REQD+=		5.8.0
-
-BUILD_DEPENDS+=	{perl>=5.7.3,p5-Test-Simple>=0.47}:../../devel/p5-Test-Simple
-DEPENDS+=		p5-Test-Exception>=0.15:../../devel/p5-Test-Exception
-DEPENDS+=		p5-Scalar-List-Utils>=1.10:../../devel/p5-Scalar-List-Utils
-DEPENDS+=		p5-Algorithm-C3>=0.05:../../wip/p5-Algorithm-C3
-DEPENDS+=		p5-Class-C3-XS>=0.08:../../wip/p5-Class-C3-XS
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-PERL5_PACKLIST=		auto/Class/C3/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-Class-C3/distinfo b/p5-Class-C3/distinfo
deleted file mode 100644
index a221bb1559..0000000000
--- a/p5-Class-C3/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2007/11/07 03:17:05 jgoamakf Exp $
-
-SHA1 (Class-C3-0.19.tar.gz) = f482a35290d8bfd8d7ad68b1ac63abefaa4e1dad
-RMD160 (Class-C3-0.19.tar.gz) = 9f3e346c0d34c6e599e957477fa048a6e008ee59
-Size (Class-C3-0.19.tar.gz) = 33899 bytes
diff --git a/p5-Class-DBI-AsForm/Makefile b/p5-Class-DBI-AsForm/Makefile
index b1930e188c..dc8d8f858d 100644
--- a/p5-Class-DBI-AsForm/Makefile
+++ b/p5-Class-DBI-AsForm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/01/26 07:55:49 jgoamakf Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/25 09:20:57 absd Exp $
 #
 
 DISTNAME=	Class-DBI-AsForm-2.42
@@ -13,7 +13,7 @@ COMMENT=	Produce HTML form elements for database columns
 
 DEPENDS+=	p5-DBI>=1.30:../../databases/p5-DBI
 DEPENDS+=	p5-Class-DBI>=0.89:../../databases/p5-Class-DBI
-DEPENDS+=	p5-Class-DBI-Plugin-Type>=0.02:../../wip/p5-Class-DBI-Plugin-Type
+DEPENDS+=	p5-Class-DBI-Plugin-Type>=0.02:../../devel/p5-Class-DBI-Plugin-Type
 DEPENDS+=	p5-HTML-Tree>=1.88:../../www/p5-HTML-Tree
 
 PERL5_PACKLIST=	auto/Class/DBI/AsForm/.packlist
diff --git a/p5-Class-DBI-Loader-Relationship/Makefile b/p5-Class-DBI-Loader-Relationship/Makefile
index dd82b66ded..294605673a 100644
--- a/p5-Class-DBI-Loader-Relationship/Makefile
+++ b/p5-Class-DBI-Loader-Relationship/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/05/30 12:19:58 absd Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/25 09:20:57 absd Exp $
 #
 
 DISTNAME=	Class-DBI-Loader-Relationship-1.2
@@ -10,7 +10,7 @@ MAINTAINER=	ficovh@yahoo.com
 HOMEPAGE=	http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/
 COMMENT=	Easier relationship specification in CDBI::L
 
-DEPENDS+=	p5-Class-DBI-Loader>=0:../../wip/p5-Class-DBI-Loader
+DEPENDS+=	p5-Class-DBI-Loader>=0:../../devel/p5-Class-DBI-Loader
 DEPENDS+=	p5-Lingua-EN-Inflect-Number>=1:../../textproc/p5-Lingua-EN-Inflect-Number
 
 PERL5_PACKLIST=	auto/Class/DBI/Loader/Relationship/.packlist
diff --git a/p5-Class-Virtual/Makefile b/p5-Class-Virtual/Makefile
index 162e5d5cf5..a0a6701967 100644
--- a/p5-Class-Virtual/Makefile
+++ b/p5-Class-Virtual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/08/05 19:06:03 kuli0020 Exp $
+# $NetBSD: Makefile,v 1.5 2008/06/25 09:20:58 absd Exp $
 
 DISTNAME=	Class-Virtual-0.05
 PKGNAME=	p5-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=	http://search.cpan.org/dist/Class-Virtual/
 COMMENT=	Base class for virtual base classes in Perl
 
 DEPENDS+=	p5-Class-Data-Inheritable>=0.02:../../devel/p5-Class-Data-Inheritable
-DEPENDS+=	p5-Class-ISA>=0.31:../../wip/p5-Class-ISA
+DEPENDS+=	p5-Class-ISA>=0.31:../../devel/p5-Class-ISA
 DEPENDS+=	p5-Carp-Assert>=0.10:../../devel/p5-Carp-Assert
 BUILD_DEPENDS+=	p5-Test-Simple>=0.50:../../devel/p5-Test-Simple
 
diff --git a/p5-DBIx-Class-Schema-Loader/Makefile b/p5-DBIx-Class-Schema-Loader/Makefile
index 5b41f2b874..7d1cceed98 100644
--- a/p5-DBIx-Class-Schema-Loader/Makefile
+++ b/p5-DBIx-Class-Schema-Loader/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/05/30 12:19:58 absd Exp $
+# $NetBSD: Makefile,v 1.4 2008/06/25 09:20:58 absd Exp $
 
 DISTNAME=	DBIx-Class-Schema-Loader-0.03009
 PKGNAME=	p5-${DISTNAME}
@@ -15,8 +15,8 @@ DEPENDS+=	p5-Lingua-EN-Inflect>=1.89:../../textproc/p5-Lingua-EN-Inflect
 DEPENDS+=   p5-Lingua-EN-Inflect-Number>=1.1:../../textproc/p5-Lingua-EN-Inflect-Number
 DEPENDS+=	p5-Text-Balanced>=0:../../textproc/p5-Text-Balanced
 DEPENDS+=	p5-Class-Accessor>=0.22:../../devel/p5-Class-Accessor
-DEPENDS+=	p5-Class-Data-Accessor>=0.02:../../wip/p5-Class-Data-Accessor
-DEPENDS+=	p5-Class-C3>=0.11:../../wip/p5-Class-C3
+DEPENDS+=	p5-Class-Data-Accessor>=0.02:../../devel/p5-Class-Data-Accessor
+DEPENDS+=	p5-Class-C3>=0.11:../../devel/p5-Class-C3
 DEPENDS+=	p5-DBI>=1.50:../../databases/p5-DBI
 DEPENDS+=	p5-DBD-SQLite>=1.12:../../databases/p5-DBD-SQLite
 DEPENDS+=	p5-Carp-Clan>=0:../../devel/p5-Carp-Clan
diff --git a/p5-DBIx-Class/Makefile b/p5-DBIx-Class/Makefile
index 56ff747232..fcdc5218d7 100644
--- a/p5-DBIx-Class/Makefile
+++ b/p5-DBIx-Class/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/03/03 09:03:17 netcap Exp $
+# $NetBSD: Makefile,v 1.5 2008/06/25 09:20:58 absd Exp $
 
 DISTNAME=	DBIx-Class-0.07005
 PKGNAME=	p5-${DISTNAME}
@@ -12,10 +12,10 @@ COMMENT=	Extensible and flexible object <-> relational mapper
 DEPENDS+=	p5-Data-Page>=2.00:../../wip/p5-Data-Page
 DEPENDS+=	p5-Scalar-List-Utils>=0:../../devel/p5-Scalar-List-Utils
 DEPENDS+=	p5-SQL-Abstract>=1.20:../../databases/p5-SQL-Abstract
-DEPENDS+=	p5-SQL-Abstract-Limit>=0.11:../../wip/p5-SQL-Abstract-Limit
-DEPENDS+=	p5-Class-C3>=0.13:../../wip/p5-Class-C3
+DEPENDS+=	p5-SQL-Abstract-Limit>=0.11:../../databases/p5-SQL-Abstract-Limit
+DEPENDS+=	p5-Class-C3>=0.13:../../devel/p5-Class-C3
 DEPENDS+=	p5-Storable>=0:../../devel/p5-Storable
-DEPENDS+=	p5-Class-Data-Accessor>=0.01:../../wip/p5-Class-Data-Accessor
+DEPENDS+=	p5-Class-Data-Accessor>=0.01:../../devel/p5-Class-Data-Accessor
 DEPENDS+=	p5-Carp-Clan>=0:../../devel/p5-Carp-Clan
 DEPENDS+=	p5-DBI>=1.40:../../databases/p5-DBI
 BUILD_DEPENDS+=	p5-DBD-SQLite>=1.11:../../databases/p5-DBD-SQLite
diff --git a/p5-Data-Visitor/Makefile b/p5-Data-Visitor/Makefile
index 4e1ae07b7a..358007b9db 100644
--- a/p5-Data-Visitor/Makefile
+++ b/p5-Data-Visitor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/05/05 16:58:03 absd Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/25 09:20:58 absd Exp $
 
 DISTNAME=	Data-Visitor-0.05
 PKGNAME=	p5-${DISTNAME}
@@ -10,8 +10,8 @@ HOMEPAGE=	http://search.cpan.org/dist/Data-Visitor/
 COMMENT=	Visitor style traversal of Perl data structures
 
 BUILD_DEPENDS+= {perl>=5.7.1,p5-Test-Simple-[0-9]*}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=	p5-Test-use-ok>=0:../../wip/p5-Test-use-ok
-BUILD_DEPENDS+=	p5-Test-MockObject>=1.04:../../wip/p5-Test-MockObject
+BUILD_DEPENDS+=	p5-Test-use-ok>=0:../../devel/p5-Test-use-ok
+BUILD_DEPENDS+=	p5-Test-MockObject>=1.04:../../devel/p5-Test-MockObject
 DEPENDS+=	p5-Class-Accessor>=0:../../devel/p5-Class-Accessor
 
 PERL5_MODULE_TYPE=	Module::Build
diff --git a/p5-Geo-Distance/DESCR b/p5-Geo-Distance/DESCR
deleted file mode 100644
index 1a77f76f25..0000000000
--- a/p5-Geo-Distance/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Geo::Distance is a Perl module to calculate the distance between
-two geograpical coordinates. 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.
diff --git a/p5-Geo-Distance/Makefile b/p5-Geo-Distance/Makefile
deleted file mode 100644
index 68f568f56c..0000000000
--- a/p5-Geo-Distance/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/11/25 11:51:00 shattered Exp $
-
-DISTNAME=	Geo-Distance-0.11
-PKGNAME=	p5-${DISTNAME}
-CATEGORIES=	perl5 geography
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../by-authors/id/B/BL/BLUEFEET/}
-MAINTAINER=	uli@habel.name
-HOMEPAGE=	http://search.cpan.org/dist/Geo-Distance/
-COMMENT=	Geo::Distance implementation for Perl
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-PERL5_PACKLIST=		auto/Geo/Distance/.packlist
-BUILDLINK_API_DEPENDS.p5-DBI+=	p5-DBI>=1.37
-
-.include "../../databases/p5-DBI/buildlink3.mk"
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-Geo-Distance/distinfo b/p5-Geo-Distance/distinfo
deleted file mode 100644
index e66ece90aa..0000000000
--- a/p5-Geo-Distance/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/11/06 20:38:10 uhabel Exp $
-
-SHA1 (Geo-Distance-0.11.tar.gz) = c5b97565bdd8b5e22d4f3a11eb13c1a04e2544d1
-RMD160 (Geo-Distance-0.11.tar.gz) = 2638fa2c4e2a654434bcc88a79156a6530e3ccd8
-Size (Geo-Distance-0.11.tar.gz) = 9684 bytes
diff --git a/p5-HTML-Widget/Makefile b/p5-HTML-Widget/Makefile
index d7be37715f..c438de0053 100644
--- a/p5-HTML-Widget/Makefile
+++ b/p5-HTML-Widget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/05/22 21:23:00 tnn2 Exp $
+# $NetBSD: Makefile,v 1.5 2008/06/25 09:20:58 absd Exp $
 
 DISTNAME=		HTML-Widget-1.11
 PKGNAME=		p5-${DISTNAME}
@@ -12,13 +12,13 @@ COMMENT=		HTML Widget And Validation Framework
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 DEPENDS+=		p5-Module-Pluggable-Fast>=0.18:../../wip/p5-Module-Pluggable-Fast
-DEPENDS+=		p5-Class-Data-Accessor>=0.04001:../../wip/p5-Class-Data-Accessor
+DEPENDS+=		p5-Class-Data-Accessor>=0.04001:../../devel/p5-Class-Data-Accessor
 DEPENDS+=		p5-Test-NoWarnings>=0.084:../../devel/p5-Test-NoWarnings
 DEPENDS+=		p5-HTML-Tree>=3.19.01:../../www/p5-HTML-Tree
 DEPENDS+=		p5-Class-Accessor>=0.22:../../devel/p5-Class-Accessor
 DEPENDS+=		p5-Class-Accessor-Chained>=0.01:../../devel/p5-Class-Accessor-Chained
 DEPENDS+=		p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber
-DEPENDS+=		p5-Test-MockObject>=1.02:../../wip/p5-Test-MockObject
+DEPENDS+=		p5-Test-MockObject>=1.02:../../devel/p5-Test-MockObject
 DEPENDS+=		p5-Email-Valid>=0.15:../../mail/p5-Email-Valid
 DEPENDS+=		p5-Date-Calc>=5.4:../../devel/p5-Date-Calc
 
diff --git a/p5-HTTP-Body/DESCR b/p5-HTTP-Body/DESCR
deleted file mode 100644
index ec138e26f3..0000000000
--- a/p5-HTTP-Body/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-HTTP Body Parser.
diff --git a/p5-HTTP-Body/Makefile b/p5-HTTP-Body/Makefile
deleted file mode 100644
index e8f580b58e..0000000000
--- a/p5-HTTP-Body/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2007/10/26 07:48:48 jgoamakf Exp $
-
-DISTNAME=	HTTP-Body-0.9
-PKGNAME=	p5-${DISTNAME}
-CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../by-authors/id/A/AG/AGRUNDMA/}
-
-MAINTAINER=	kuli0020@umn.edu
-HOMEPAGE=	http://search.cpan.org/dist/HTTP-Body/
-COMMENT=	HTTP Body Parser
-PERL5_REQD+=	5.6.1
-
-BUILD_DEPENDS+=	p5-File-Temp>=0.14:../../devel/p5-File-Temp
-BUILD_DEPENDS+=	p5-YAML>=0.39:../../textproc/p5-YAML
-
-PERL5_PACKLIST= auto/HTTP/Body/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-HTTP-Body/distinfo b/p5-HTTP-Body/distinfo
deleted file mode 100644
index efa55d812e..0000000000
--- a/p5-HTTP-Body/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2007/10/26 07:48:48 jgoamakf Exp $
-
-SHA1 (HTTP-Body-0.9.tar.gz) = 0a253a912a9bdd077400931a459cf612612559a2
-RMD160 (HTTP-Body-0.9.tar.gz) = 6921221e2a6b2f127c87473191aa884144824af1
-Size (HTTP-Body-0.9.tar.gz) = 9440 bytes
diff --git a/p5-HTTP-Request-AsCGI/DESCR b/p5-HTTP-Request-AsCGI/DESCR
deleted file mode 100644
index 0888c1e36d..0000000000
--- a/p5-HTTP-Request-AsCGI/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Provides a convinient way of setting up an CGI enviroment from a HTTP::Request.
diff --git a/p5-HTTP-Request-AsCGI/Makefile b/p5-HTTP-Request-AsCGI/Makefile
deleted file mode 100644
index 217d721e22..0000000000
--- a/p5-HTTP-Request-AsCGI/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/04/13 18:58:42 kuli0020 Exp $
-
-DISTNAME=	HTTP-Request-AsCGI-0.5
-PKGNAME=	p5-${DISTNAME}
-CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../by-authors/id/C/CH/CHANSEN/}
-
-MAINTAINER=	kuli0020@umn.edu
-HOMEPAGE=	http://search.cpan.org/dist/HTTP-Request-AsCGI/
-COMMENT=	Setup a CGI enviroment from a HTTP::Request
-PERL5_REQD+=	5.8.0
-
-DEPENDS+=	p5-Class-Accessor>=0:../../devel/p5-Class-Accessor
-DEPENDS+=	p5-libwww>=5.805:../../www/p5-libwww
-BUILD_DEPENDS+=	{perl>=5.8.1,p5-Test-Simple-[0-9]*}:../../devel/p5-Test-Simple
-
-PERL5_PACKLIST=	auto/HTTP/Request/AsCGI/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-HTTP-Request-AsCGI/distinfo b/p5-HTTP-Request-AsCGI/distinfo
deleted file mode 100644
index c5b88e1c4b..0000000000
--- a/p5-HTTP-Request-AsCGI/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/02/02 21:22:43 absd Exp $
-
-SHA1 (HTTP-Request-AsCGI-0.5.tar.gz) = edc93570bc0571dcd02fd3fd7b42c2b1bdad0ec9
-RMD160 (HTTP-Request-AsCGI-0.5.tar.gz) = 00ff7e71777f6225c7303e07a11642d0171c2c66
-Size (HTTP-Request-AsCGI-0.5.tar.gz) = 6145 bytes
diff --git a/p5-MRO-Compat/DESCR b/p5-MRO-Compat/DESCR
deleted file mode 100644
index 0845d2b365..0000000000
--- a/p5-MRO-Compat/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-MRO::Compat - mro::* interface compatibility for Perls < 5.9.5
diff --git a/p5-MRO-Compat/Makefile b/p5-MRO-Compat/Makefile
deleted file mode 100644
index c3b2334180..0000000000
--- a/p5-MRO-Compat/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/11/22 01:38:39 geeohgeegeeoh Exp $
-
-PKGVERSION=	0.05
-DISTNAME=	MRO-Compat-${PKGVERSION}
-PKGNAME=	p5-MRO-Compat-${PKGVERSION}
-CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/B/BL/BLBLACK/}
-
-MAINTAINER=	ggm@apnic.net
-COMMENT=	MRO::Compat
-
-DEPENDS+=	p5-Class-C3>=0:../../wip/p5-Class-C3
-DEPENDS+=	p5-Class-C3-XS>=0:../../wip/p5-Class-C3-XS
-
-PERL5_PACKLIST=	auto/MRO/Compat/.packlist
-
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-MRO-Compat/distinfo b/p5-MRO-Compat/distinfo
deleted file mode 100644
index 3eb227df07..0000000000
--- a/p5-MRO-Compat/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/11/22 01:38:39 geeohgeegeeoh Exp $
-
-SHA1 (MRO-Compat-0.05.tar.gz) = a3c817ae58a20c70f45cedc551cc9443f7276570
-RMD160 (MRO-Compat-0.05.tar.gz) = c507cb02c122bdc49964c6aeab6dc7fdab4f4006
-Size (MRO-Compat-0.05.tar.gz) = 23528 bytes
diff --git a/p5-Maypole/Makefile b/p5-Maypole/Makefile
index 0c29150310..f5959926ad 100644
--- a/p5-Maypole/Makefile
+++ b/p5-Maypole/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/02/27 03:18:02 ficovh Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/25 09:20:58 absd Exp $
 #
 
 DISTNAME=	Maypole-2.121
@@ -10,20 +10,20 @@ MAINTAINER=	ficovh@yahoo.com
 HOMEPAGE=	http://search.cpan.org/CPAN/authors/id/T/TE/TEEJAY/
 COMMENT=	Maypole - MVC web application framework
 
-DEPENDS+=	p5-CGI-Simple>=0:../../wip/p5-CGI-Simple
+DEPENDS+=	p5-CGI-Simple>=0:../../www/p5-CGI-Simple
 DEPENDS+=	p5-CGI-Untaint>=1.26:../../wip/p5-CGI-Untaint
 DEPENDS+=	p5-Class-DBI>=0.96:../../databases/p5-Class-DBI
 DEPENDS+=	p5-Class-DBI-AbstractSearch>=0:../../databases/p5-Class-DBI-AbstractSearch
-DEPENDS+=	p5-Class-DBI-Loader>=0.02:../../wip/p5-Class-DBI-Loader
-DEPENDS+=	p5-Class-DBI-Loader-Relationship>=0:../../wip/p5-Class-DBI-Loader-Relationship
-DEPENDS+=	p5-Class-DBI-Pager>=0:../../wip/p5-Class-DBI-Pager
-DEPENDS+=	p5-Class-DBI-Plugin-RetrieveAll>=0:../../wip/p5-Class-DBI-Plugin-RetrieveAll
-DEPENDS+=	p5-Class-DBI-Plugin-Type>=0:../../wip/p5-Class-DBI-Plugin-Type
-DEPENDS+=	p5-Class-DBI-SQLite>=0.08:../../wip/p5-Class-DBI-SQLite
+DEPENDS+=	p5-Class-DBI-Loader>=0.02:../../devel/p5-Class-DBI-Loader
+DEPENDS+=	p5-Class-DBI-Loader-Relationship>=0:../../devel/p5-Class-DBI-Loader-Relationship
+DEPENDS+=	p5-Class-DBI-Pager>=0:../../devel/p5-Class-DBI-Pager
+DEPENDS+=	p5-Class-DBI-Plugin-RetrieveAll>=0:../../devel/p5-Class-DBI-Plugin-RetrieveAll
+DEPENDS+=	p5-Class-DBI-Plugin-Type>=0:../../devel/p5-Class-DBI-Plugin-Type
+DEPENDS+=	p5-Class-DBI-SQLite>=0.08:../../devel/p5-Class-DBI-SQLite
 DEPENDS+=	p5-Digest-MD5>=0:../../security/p5-Digest-MD5
 DEPENDS+=	p5-File-MMagic-XS>=0.08:../../wip/p5-File-MMagic-XS
 DEPENDS+=	p5-HTML-Tree>=0:../../www/p5-HTML-Tree
-DEPENDS+=	p5-HTTP-Body>=0.5:../../wip/p5-HTTP-Body
+DEPENDS+=	p5-HTTP-Body>=0.5:../../www/p5-HTTP-Body
 DEPENDS+=	p5-Template-Plugin-Class>=0:../../wip/p5-Template-Plugin-Class
 DEPENDS+=	p5-Test-MockModule>=0:../../wip/p5-Test-MockModule
 DEPENDS+=	p5-UNIVERSAL-moniker>=0:../../devel/p5-UNIVERSAL-moniker
diff --git a/p5-PAR/DESCR b/p5-PAR/DESCR
deleted file mode 100644
index a8fa5da840..0000000000
--- a/p5-PAR/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-The PAR Toolkit is a cross between Java's JAR and Perl2EXE; It makes
-cross-platform packaging and deployment a breeze for Perl programmers.
-
-Notable features include:
-
-* Turn your Perl programs into ready-to-run executables
-* Pack scripts and requered libraries with a binary loader
-* Put PAR files into @INC to avoid version conflicts
-* Works with remote URL as well as local files
-* Supports XS modules and DATA sections
-* Turns CPAN module distributions into PAR distributions
-* Install, uninstall, signs and verifies PAR distributions
-* Runs scripts inside PAR files, generated by "pp -p"
diff --git a/p5-PAR/Makefile b/p5-PAR/Makefile
deleted file mode 100644
index ff642438e8..0000000000
--- a/p5-PAR/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/03/23 19:21:22 kuli0020 Exp $
-
-DISTNAME=	PAR-0.90
-PKGNAME=	p5-${DISTNAME}
-CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/A/AU/AUTRIJUS/}
-
-MAINTAINER=	kuli0020@umn.edu
-COMMENT=	Perl Archive Toolkit
-
-DEPENDS+=	p5-Archive-Zip>=1.00:../../archivers/p5-Archive-Zip
-DEPENDS+=	p5-Compress-Zlib>=1.16:../../devel/p5-Compress-Zlib
-DEPENDS+=	p5-Module-ScanDeps>=0.45:../../devel/p5-Module-ScanDeps
-DEPENDS+=	p5-Module-Signature>=0.35:../../security/p5-Module-Signature
-DEPENDS+=	p5-PAR-Dist>=0.06:../../devel/p5-PAR-Dist
-DEPENDS+=	p5-B-Deobfuscate>=0.00:../../wip/p5-B-Deobfuscate
-DEPENDS+=	{perl>=5.8.0,p5-File-Temp>=0.05}:../../devel/p5-File-Temp
-
-PERL5_REQD+=	5.6.0
-
-PERL5_PACKLIST=	auto/PAR/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-PAR/distinfo b/p5-PAR/distinfo
deleted file mode 100644
index bbad7f6344..0000000000
--- a/p5-PAR/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/03/23 19:21:22 kuli0020 Exp $
-
-SHA1 (PAR-0.90.tar.gz) = 6069d1712c940889bad092467baa27ca5e0692b4
-RMD160 (PAR-0.90.tar.gz) = 5509798090c914a37b180f51b452956f16fe7c5c
-Size (PAR-0.90.tar.gz) = 183435 bytes
diff --git a/p5-Plucene/Makefile b/p5-Plucene/Makefile
index 1846e7b284..37653f33f7 100644
--- a/p5-Plucene/Makefile
+++ b/p5-Plucene/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/10/29 08:32:52 shattered Exp $
+# $NetBSD: Makefile,v 1.10 2008/06/25 09:20:58 absd Exp $
 
 DISTNAME=	Plucene-1.24
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ PERL5_REQD+=	5.6.0
 
 DEPENDS+=	p5-Bit-Vector-Minimal>=1.0:../../wip/p5-Bit-Vector-Minimal
 DEPENDS+=	p5-Class-Accessor>=0.18:../../devel/p5-Class-Accessor
-DEPENDS+=	p5-Class-Virtual>=0.03:../../wip/p5-Class-Virtual
+DEPENDS+=	p5-Class-Virtual>=0.03:../../devel/p5-Class-Virtual
 DEPENDS+=	p5-PathTools>=1.1:../../devel/p5-PathTools
 DEPENDS+=	p5-IO-stringy>=2.104:../../devel/p5-IO-stringy
 DEPENDS+=	p5-Lingua-Stem>=0.81:../../wip/p5-Lingua-Stem
diff --git a/p5-RRDTool-OO/DESCR b/p5-RRDTool-OO/DESCR
deleted file mode 100644
index 5a595367c9..0000000000
--- a/p5-RRDTool-OO/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-RRDTool::OO is an object-oriented interface to Tobi Oetiker's
-round robin database tool rrdtool. It uses rrdtool's RRDs module
-to get access to rrdtool's shared library.
-
-RRDTool::OO tries to marry rrdtool's database engine with the
-dwimminess and whipuptitude Perl programmers take for granted.
-Using RRDTool::OO abstracts away implementation details of the
-RRD engine, uses easy to memorize named parameters and sets
-meaningful defaults for parameters not needed in simple cases.
diff --git a/p5-RRDTool-OO/Makefile b/p5-RRDTool-OO/Makefile
deleted file mode 100644
index a18091343d..0000000000
--- a/p5-RRDTool-OO/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2007/12/10 00:32:40 uhabel Exp $
-
-DISTNAME=	RRDTool-OO-0.19
-PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
-CATEGORIES=	perl5 databases
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../by-authors/id/M/MS/MSCHILLI/}
-MAINTAINER=	rhaen@NetBSD.org
-HOMEPAGE=	http://search.cpan.org/dist/RRDTool-OO/
-COMMENT=	RRDTool::OO implementation for Perl
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-PERL5_PACKLIST=		auto/RRDTool/OO/.packlist
-
-DEPENDS+= p5-Log-Log4perl>=1.01:../../wip/p5-Log-Log4perl
-
-.include "../../databases/rrdtool/buildlink3.mk"
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-RRDTool-OO/distinfo b/p5-RRDTool-OO/distinfo
deleted file mode 100644
index e34e6b8168..0000000000
--- a/p5-RRDTool-OO/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2007/12/10 00:32:40 uhabel Exp $
-
-SHA1 (RRDTool-OO-0.19.tar.gz) = 8d1a057fe66e85b8facd30a8eaddfdc6bd1c2238
-RMD160 (RRDTool-OO-0.19.tar.gz) = a3d9904c9a8a42e9550a0e6ac7aa1de860602e83
-Size (RRDTool-OO-0.19.tar.gz) = 31999 bytes
diff --git a/p5-SQL-Abstract-Limit/DESCR b/p5-SQL-Abstract-Limit/DESCR
deleted file mode 100644
index 6eea3004cc..0000000000
--- a/p5-SQL-Abstract-Limit/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-SQL portability layer for LIMIT emulation.
diff --git a/p5-SQL-Abstract-Limit/Makefile b/p5-SQL-Abstract-Limit/Makefile
deleted file mode 100644
index 6849ee989f..0000000000
--- a/p5-SQL-Abstract-Limit/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/04/13 20:08:57 kuli0020 Exp $
-
-DISTNAME=	SQL-Abstract-Limit-0.12
-PKGNAME=	p5-${DISTNAME}
-CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../by-authors/id/D/DA/DAVEBAIRD/}
-
-MAINTAINER=	kuli0020@umn.edu
-HOMEPAGE=	http://search.cpan.org/dist/SQL-Abstract-Limit/
-COMMENT=	SQL Portability layer for LIMIT emulation
-
-DEPENDS+=	p5-DBI>=0:../../databases/p5-DBI
-DEPENDS+=	p5-SQL-Abstract>=1.2:../../databases/p5-SQL-Abstract
-DEPENDS+=	p5-Test-Exception>=0:../../devel/p5-Test-Exception
-BUILD_DEPENDS+=	{perl>=5.7.3,p5-Test-Simple>=0}:../../devel/p5-Test-Simple
-
-PERL5_MODULE_TYPE=	Module::Build
-
-PERL5_REQD+=	5.6.0
-
-PERL5_PACKLIST=	auto/SQL/Abstract/Limit/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-SQL-Abstract-Limit/TODO b/p5-SQL-Abstract-Limit/TODO
deleted file mode 100644
index 8b248d1c8a..0000000000
--- a/p5-SQL-Abstract-Limit/TODO
+++ /dev/null
@@ -1 +0,0 @@
-This package depends on databases/p5-SQL-Abstract >= 1.2, make sure pkgsrc has version 1.2 or higher of that package.
diff --git a/p5-SQL-Abstract-Limit/distinfo b/p5-SQL-Abstract-Limit/distinfo
deleted file mode 100644
index a32804ac0d..0000000000
--- a/p5-SQL-Abstract-Limit/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/03/10 17:46:13 kuli0020 Exp $
-
-SHA1 (SQL-Abstract-Limit-0.12.tar.gz) = c7334aed594b5bf20ebea6d9ce28cad227682ec0
-RMD160 (SQL-Abstract-Limit-0.12.tar.gz) = dfa5cd70a9988fc2af83633e1b0f654ea0c40a1f
-Size (SQL-Abstract-Limit-0.12.tar.gz) = 14295 bytes
diff --git a/p5-Set-Object/DESCR b/p5-Set-Object/DESCR
deleted file mode 100644
index d5139b671b..0000000000
--- a/p5-Set-Object/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This module implements a Set of objects, that is, a collection of
-objects without duplications. It is similar to a Smalltalk IdentitySet.
diff --git a/p5-Set-Object/Makefile b/p5-Set-Object/Makefile
deleted file mode 100644
index af754b0e2a..0000000000
--- a/p5-Set-Object/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/10/29 08:32:52 shattered Exp $
-
-DISTNAME=	Set-Object-1.14
-PKGNAME=	p5-${DISTNAME}
-CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Set/}
-
-MAINTAINER=	kuli0020@umn.edu
-HOMEPAGE=	http://search.cpan.org/dist/Set-Object/
-COMMENT=	Perl module to manage sets of objects
-
-PERL5_REQD+=	5.6.0
-
-PERL5_PACKLIST=	auto/Set/Object/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-Set-Object/distinfo b/p5-Set-Object/distinfo
deleted file mode 100644
index 0def041d4d..0000000000
--- a/p5-Set-Object/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/03/09 18:36:09 kuli0020 Exp $
-
-SHA1 (Set-Object-1.14.tar.gz) = 4c312e498a3ee662cee2a500391bd81bcfa04d22
-RMD160 (Set-Object-1.14.tar.gz) = 9d19fde68822c8a2c5e2cf25298c6b891442fc4a
-Size (Set-Object-1.14.tar.gz) = 52104 bytes
diff --git a/p5-Template-Timer/DESCR b/p5-Template-Timer/DESCR
deleted file mode 100644
index 569ff4a72b..0000000000
--- a/p5-Template-Timer/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Template::Timer provides inline timings of the template processing
-througout your code. It's an overridden version of Template::Context
-that wraps the process() and include() methods.
diff --git a/p5-Template-Timer/Makefile b/p5-Template-Timer/Makefile
deleted file mode 100644
index 858dcbb941..0000000000
--- a/p5-Template-Timer/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/08/05 02:57:22 jgoamakf Exp $
-
-DISTNAME=		Template-Timer-0.02
-PKGNAME=		p5-${DISTNAME}
-SVR4_PKGNAME=		p5ttm
-CATEGORIES=		www perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Template/}
-
-MAINTAINER=		hiramatu@boreas.dti.ne.jp
-HOMEPAGE=		http://search.cpan.org/dist/Template-Timer/
-COMMENT=		Rudimentary profiling for Template Toolkit
-
-DEPENDS+=	p5-Template-Toolkit>=2.0:../../www/p5-Template-Toolkit
-
-PERL5_PACKLIST=		auto/Template/Timer/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-Template-Timer/distinfo b/p5-Template-Timer/distinfo
deleted file mode 100644
index 1071475b15..0000000000
--- a/p5-Template-Timer/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/08/05 02:57:22 jgoamakf Exp $
-
-SHA1 (Template-Timer-0.02.tar.gz) = 1efa295393be2cacbdfe11bc910d6d4aacb6416d
-RMD160 (Template-Timer-0.02.tar.gz) = 35544095dc2543e7cbfcfdcf562f62224226c805
-Size (Template-Timer-0.02.tar.gz) = 2506 bytes
diff --git a/p5-Test-Class/Makefile b/p5-Test-Class/Makefile
index a20f356239..9de99e06da 100644
--- a/p5-Test-Class/Makefile
+++ b/p5-Test-Class/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/12/01 20:23:52 thomasklausner Exp $
+# $NetBSD: Makefile,v 1.5 2008/06/25 09:20:59 absd Exp $
 
 DISTNAME=	Test-Class-0.11
 PKGNAME=	p5-${DISTNAME}
@@ -12,10 +12,10 @@ COMMENT=	Test::Class - Easily create test classes in an xUnit style
 BUILD_DEPENDS+=	p5-Test-Simple>=0.62:../../devel/p5-Test-Simple
 DEPENDS+=	p5-Test-Exception>=0.10:../../devel/p5-Test-Exception
 DEPENDS+=	p5-Devel-Symdump>=2.03:../../devel/p5-Devel-Symdump
-DEPENDS+=	p5-Test-Differences>=0.43:../../wip/p5-Test-Differences
+DEPENDS+=	p5-Test-Differences>=0.43:../../devel/p5-Test-Differences
 DEPENDS+=	p5-Test-Simple>=0.44:../../devel/p5-Test-Simple
 DEPENDS+=	p5-Storable>=2.04:../../devel/p5-Storable
-DEPENDS+=	p5-Class-ISA>=0.32:../../wip/p5-Class-ISA
+DEPENDS+=	p5-Class-ISA>=0.32:../../devel/p5-Class-ISA
 DEPENDS+=	p5-Attribute-Handlers>=0.77:../../devel/p5-Attribute-Handlers
 
 PERL5_PACKLIST= auto/Test/Class/.packlist
diff --git a/p5-Test-Differences/DESCR b/p5-Test-Differences/DESCR
deleted file mode 100644
index 4f64751c23..0000000000
--- a/p5-Test-Differences/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-When the code you're testing returns multiple lines, records
-or data structures and they're just plain wrong, an equivalent
-to the Unix diff utility may be just what's needed.
diff --git a/p5-Test-Differences/Makefile b/p5-Test-Differences/Makefile
deleted file mode 100644
index f0a4d7e22c..0000000000
--- a/p5-Test-Differences/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/10/30 22:45:31 shattered Exp $
-
-DISTNAME=	Test-Differences-0.47
-PKGNAME=	p5-${DISTNAME}
-CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Test/}
-
-MAINTAINER=	kuli0020@umn.edu
-HOMEPAGE=	http://search.cpan.org/dist/Test-Differences/
-COMMENT=	Test::Differences - Test strings and data structures for differences
-
-BUILD_DEPENDS+=	p5-Text-Diff>=0.34:../../textproc/p5-Text-Diff
-DEPENDS+=	p5-Test-Simple>=0:../../devel/p5-Test-Simple
-
-PERL5_PACKLIST= auto/Test/Differences/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-Test-Differences/distinfo b/p5-Test-Differences/distinfo
deleted file mode 100644
index bbe8ea0310..0000000000
--- a/p5-Test-Differences/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/08/01 19:38:52 kuli0020 Exp $
-
-SHA1 (Test-Differences-0.47.tar.gz) = fd8dc23e5efdf4a2a043b911953fd06697d33e1a
-RMD160 (Test-Differences-0.47.tar.gz) = c53566d36b2407a31cf91a61dad52d96dc3deaa9
-Size (Test-Differences-0.47.tar.gz) = 8322 bytes
diff --git a/p5-Test-MockObject/DESCR b/p5-Test-MockObject/DESCR
deleted file mode 100644
index 906c4514d5..0000000000
--- a/p5-Test-MockObject/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Perl extension for emulating troublesome interfaces.
-
-WWW: http://search.cpan.org/dist/Test-MockObject/
diff --git a/p5-Test-MockObject/Makefile b/p5-Test-MockObject/Makefile
deleted file mode 100644
index 3c69a74e9b..0000000000
--- a/p5-Test-MockObject/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2006/05/02 08:11:30 absd Exp $
-
-DISTNAME=	Test-MockObject-1.06
-PKGNAME=	p5-${DISTNAME}
-CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Test/}
-
-MAINTAINER=	kuli0020@umn.edu
-HOMEPAGE=	http://search.cpan.org/dist/Test-MockObject/
-COMMENT=	Tests remote URLs or local web files
-PERL5_REQD+=	5.6.0
-
-BUILD_DEPENDS+=	{perl>=5.8.0,p5-Test-Simple>=0.47}:../../devel/p5-Test-Simple
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=0:../../devel/p5-Scalar-List-Utils
-BUILD_DEPENDS+=	p5-UNIVERSAL-can>=1.00:../../wip/p5-UNIVERSAL-can
-BUILD_DEPENDS+=	p5-UNIVERSAL-isa>=0.02:../../wip/p5-UNIVERSAL-isa
-BUILD_DEPENDS+=	p5-Test-Exception>=0:../../devel/p5-Test-Exception
-BUILD_DEPENDS+=	p5-Test-Warn>=0:../../devel/p5-Test-Warn
-
-INSTALL_TARGET=	pure_install
-
-PERL5_MODULE_TYPE=	Module::Build
-PERL5_PACKLIST= auto/Test/MockObject/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-Test-MockObject/distinfo b/p5-Test-MockObject/distinfo
deleted file mode 100644
index 9f7ee3340d..0000000000
--- a/p5-Test-MockObject/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2006/05/02 08:11:30 absd Exp $
-
-SHA1 (Test-MockObject-1.06.tar.gz) = cfc0d2bd77551df89589bafeb9da7bef7a382449
-RMD160 (Test-MockObject-1.06.tar.gz) = 783c8ceada6bb655ef6946c958c3d4cb7c5d87bc
-Size (Test-MockObject-1.06.tar.gz) = 21783 bytes
diff --git a/p5-Test-use-ok/DESCR b/p5-Test-use-ok/DESCR
deleted file mode 100644
index 326542572f..0000000000
--- a/p5-Test-use-ok/DESCR
+++ /dev/null
@@ -1,21 +0,0 @@
-According to the Test::More documentation, it is recommended to run
-use_ok() inside a BEGIN block, so functions are exported at
-compile-time and prototypes are properly honored.
-
-That is, instead of writing this:
-
-    use_ok( 'Some::Module' );
-    use_ok( 'Other::Module' );
-
-One should write this:
-
-    BEGIN { use_ok( 'Some::Module' ); }
-    BEGIN { use_ok( 'Other::Module' ); }
-
-However, people often either forget to add BEGIN, or mistakenly group
-use_ok with other tests in a single BEGIN block, which can create subtle
-differences in execution order.
-
-With this module, simply change all use_ok in test scripts to use ok,
-and they will be executed at BEGIN time.  The explicit space after use
-makes it clear that this is a single compile-time action.
diff --git a/p5-Test-use-ok/Makefile b/p5-Test-use-ok/Makefile
deleted file mode 100644
index 39890ba4cc..0000000000
--- a/p5-Test-use-ok/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/10/29 08:32:52 shattered Exp $
-
-DISTNAME=	Test-use-ok-0.01
-PKGNAME=	p5-${DISTNAME}
-CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Test/}
-
-MAINTAINER=	kuli0020@umn.edu
-HOMEPAGE=	http://search.cpan.org/dist/Test-use-ok/
-COMMENT=	Alternative to Test::More::use_ok
-
-DEPENDS+=	{perl>=5.7.3,p5-Test-Simple-[0-9]*}:../../devel/p5-Test-Simple
-
-PERL5_REQD+=	5.8.0
-
-PERL5_PACKLIST=	auto/Test/use/ok/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-Test-use-ok/distinfo b/p5-Test-use-ok/distinfo
deleted file mode 100644
index db4d295bb9..0000000000
--- a/p5-Test-use-ok/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/04/07 18:18:01 kuli0020 Exp $
-
-SHA1 (Test-use-ok-0.01.tar.gz) = b329a46b493e5f516001b0ff19329a6dd77f0be3
-RMD160 (Test-use-ok-0.01.tar.gz) = eacf699f10ed3ad6562c9862611be41f5e46091e
-Size (Test-use-ok-0.01.tar.gz) = 8862 bytes
diff --git a/p5-Tree-Simple-VisitorFactory/DESCR b/p5-Tree-Simple-VisitorFactory/DESCR
deleted file mode 100644
index 7a4c489335..0000000000
--- a/p5-Tree-Simple-VisitorFactory/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Set of visitor objects for traversing Tree::Simple hierarchies.
diff --git a/p5-Tree-Simple-VisitorFactory/Makefile b/p5-Tree-Simple-VisitorFactory/Makefile
deleted file mode 100644
index 90c03c323f..0000000000
--- a/p5-Tree-Simple-VisitorFactory/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2006/01/25 06:53:51 jgoamakf Exp $
-
-DISTNAME=		Tree-Simple-VisitorFactory-0.10
-PKGNAME=		p5-${DISTNAME}
-SVR4_PKGNAME=		p5trs
-CATEGORIES=		devel perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Tree/}
-
-MAINTAINER=		hiramatu@boreas.dti.ne.jp
-HOMEPAGE=		http://search.cpan.org/dist/Tree-Simple-VisitorFactory/
-COMMENT=		Collection of visitor objects for use with Tree::Simple
-
-DEPENDS+=		p5-Test-Exception>=0.20:../../devel/p5-Test-Exception
-DEPENDS+=		p5-Tree-Simple>=1.00:../../devel/p5-Tree-Simple
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-PERL5_PACKLIST=		auto/Tree/Simple/VisitorFactory/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-Tree-Simple-VisitorFactory/distinfo b/p5-Tree-Simple-VisitorFactory/distinfo
deleted file mode 100644
index 0ef823bdb9..0000000000
--- a/p5-Tree-Simple-VisitorFactory/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/01/25 06:53:51 jgoamakf Exp $
-
-SHA1 (Tree-Simple-VisitorFactory-0.10.tar.gz) = f0b9f4cb3231dc9c0a75112a9d4e1fec5e569b81
-RMD160 (Tree-Simple-VisitorFactory-0.10.tar.gz) = 51862755ea5f53c5b2e48ce63777974ecf51287d
-Size (Tree-Simple-VisitorFactory-0.10.tar.gz) = 27970 bytes
diff --git a/p5-UNIVERSAL-can/DESCR b/p5-UNIVERSAL-can/DESCR
deleted file mode 100644
index 863548543f..0000000000
--- a/p5-UNIVERSAL-can/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-This module attempts to work around people calling UNIVERSAL::can() as a
-function, which it is not.
-
-WWW: http://search.cpan.org/dist/UNIVERSAL-can/
diff --git a/p5-UNIVERSAL-can/Makefile b/p5-UNIVERSAL-can/Makefile
deleted file mode 100644
index a2b10be55f..0000000000
--- a/p5-UNIVERSAL-can/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2006/04/13 21:36:04 kuli0020 Exp $
-
-DISTNAME=	UNIVERSAL-can-1.12
-PKGNAME=	p5-${DISTNAME}
-CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/C/CH/CHROMATIC/}
-
-MAINTAINER=	kuli0020@umn.edu
-HOMEPAGE=	http://search.cpan.org/dist/UNIVERSAL-can/
-COMMENT=	Hack around people calling UNIVERSAL::can() as a function
-PERL5_REQD+=	5.6.0
-
-DEPENDS+=	p5-Scalar-List-Utils>=0:../../devel/p5-Scalar-List-Utils
-BUILD_DEPENDS+=	p5-Test-Simple>=0.60:../../devel/p5-Test-Simple
-
-PERL5_PACKLIST= auto/UNIVERSAL/can/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-UNIVERSAL-can/distinfo b/p5-UNIVERSAL-can/distinfo
deleted file mode 100644
index e127139f9a..0000000000
--- a/p5-UNIVERSAL-can/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/04/13 20:52:51 kuli0020 Exp $
-
-SHA1 (UNIVERSAL-can-1.12.tar.gz) = bd59fca2f15a826423eb2acf3b04d30ec9fbc0ea
-RMD160 (UNIVERSAL-can-1.12.tar.gz) = b41cefef85157630a9dbbf7db63afd8802511dc7
-Size (UNIVERSAL-can-1.12.tar.gz) = 8230 bytes
diff --git a/p5-UNIVERSAL-isa/DESCR b/p5-UNIVERSAL-isa/DESCR
deleted file mode 100644
index 09cf844481..0000000000
--- a/p5-UNIVERSAL-isa/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-Whenever you use UNIVERSAL::isa as a function, a kitten using
-Test::MockObject dies. Normally, the kittens would be helpless, but if they
-use UNIVERSAL::isa (the module whose docs you are reading), the kittens can
-live long and prosper.
-
-This module replaces UNIVERSAL::isa with a version that makes sure that if
-it's called as a function on objects which override isa, isa will be
-called on those objects as a method.
-
-In all other cases the real UNIVERSAL::isa is just called directly.
-
-WWW: http://search.cpan.org/dist/UNIVERSAL-isa/
diff --git a/p5-UNIVERSAL-isa/Makefile b/p5-UNIVERSAL-isa/Makefile
deleted file mode 100644
index b729f2dbc5..0000000000
--- a/p5-UNIVERSAL-isa/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2006/04/13 21:01:57 kuli0020 Exp $
-
-DISTNAME=	UNIVERSAL-isa-0.06
-PKGNAME=	p5-${DISTNAME}
-CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/C/CH/CHROMATIC/}
-
-MAINTAINER=	kuli0020@umn.edu
-HOMEPAGE=	http://search.cpan.org/dist/UNIVERSAL-isa/
-COMMENT=	Hack around people calling UNIVERSAL::isa() as a function
-PERL5_REQD+=	5.6.0
-
-DEPENDS+=	p5-Scalar-List-Utils>=0:../../devel/p5-Scalar-List-Utils
-
-PERL5_MODULE_TYPE=	Module::Build
-PERL5_PACKLIST=	auto/UNIVERSAL/isa/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-UNIVERSAL-isa/distinfo b/p5-UNIVERSAL-isa/distinfo
deleted file mode 100644
index 2b70b9be32..0000000000
--- a/p5-UNIVERSAL-isa/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/04/13 21:01:57 kuli0020 Exp $
-
-SHA1 (UNIVERSAL-isa-0.06.tar.gz) = 18157acb7d765f8f25930950de9d2f3c4945cf79
-RMD160 (UNIVERSAL-isa-0.06.tar.gz) = 1645cfc7b389a4ba0ccf0b32444c62b3d2d951d1
-Size (UNIVERSAL-isa-0.06.tar.gz) = 4443 bytes
diff --git a/p5-Unicode-Map/DESCR b/p5-Unicode-Map/DESCR
deleted file mode 100644
index 7e909bb932..0000000000
--- a/p5-Unicode-Map/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-This module converts strings from and to 2-byte Unicode UCS2 format. All
-mappings happen via 2 byte UTF16 encodings, not via 1 byte UTF8 encoding.
-To transform these use Unicode::String.
-This module can't deal directly with utf8. Use Unicode::String to convert
-utf8 to utf16 and vice versa.
-Character mapping is according to the data of binary mapfiles in
-Unicode::Map hierarchy. Binary mapfiles can also be created with this module,
-enabling you to install own specific character sets.
diff --git a/p5-Unicode-Map/Makefile b/p5-Unicode-Map/Makefile
deleted file mode 100644
index c573024eeb..0000000000
--- a/p5-Unicode-Map/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2007/03/01 19:12:19 shattered Exp $
-
-DISTNAME=	Unicode-Map-0.112
-PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	# not defined
-CATEGORIES=	converters perl5 wip
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Unicode/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://search.cpan.org/dist/Unicode-Map8/
-COMMENT=	Perl5 module that maps charsets from and to utf16 unicode
-
-PERL5_PACKLIST=		auto/Unicode/Map/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-Unicode-Map/distinfo b/p5-Unicode-Map/distinfo
deleted file mode 100644
index d75929586f..0000000000
--- a/p5-Unicode-Map/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/01/31 13:25:04 marmfield Exp $
-
-SHA1 (Unicode-Map-0.112.tar.gz) = 896bcbfe370b939b4c5fb5866df9059fbdc5b683
-RMD160 (Unicode-Map-0.112.tar.gz) = 4b05b6ed2e27dbe2c1ee69a668b71b45b0d47530
-Size (Unicode-Map-0.112.tar.gz) = 476116 bytes
diff --git a/p5-Unicode-MapUTF8/DESCR b/p5-Unicode-MapUTF8/DESCR
deleted file mode 100644
index 5480742d86..0000000000
--- a/p5-Unicode-MapUTF8/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Provides an adapter layer between core routines for converting to and from
-UTF8 and other encodings. In essence, a way to give multiple existing Unicode
-modules a single common interface so you don't have to know the underlaying
-implementations to do simple UTF8 to-from other character set encoding
-conversions. As such, it wraps the Unicode::String, Unicode::Map8, Unicode::Map
-and Jcode modules in a standardized and simple API.
-This also provides general character set conversion operation based on UTF8 -
-it is possible to convert between any two compatible and supported character
-sets via a simple two step chaining of conversions.
diff --git a/p5-Unicode-MapUTF8/Makefile b/p5-Unicode-MapUTF8/Makefile
deleted file mode 100644
index a1f11d3346..0000000000
--- a/p5-Unicode-MapUTF8/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2008/05/22 21:23:01 tnn2 Exp $
-
-DISTNAME=	Unicode-MapUTF8-1.11
-PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	# not defined
-CATEGORIES=	converters perl5 wip
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Unicode/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://search.cpan.org/dist/Unicode-Map8/
-COMMENT=	Provides conversions for arbitrary character sets and UTF8
-
-DEPENDS+=	p5-Unicode-String-[0-9]*:../../converters/p5-Unicode-String
-DEPENDS+=	p5-Unicode-Map8-[0-9]*:../../converters/p5-Unicode-Map8
-DEPENDS+=	p5-Unicode-Map-[0-9]*:../../wip/p5-Unicode-Map
-DEPENDS+=	p5-Jcode-[0-9]*:../../converters/p5-Jcode
-
-PERL5_PACKLIST=		auto/Unicode/MapUTF8/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/p5-Unicode-MapUTF8/distinfo b/p5-Unicode-MapUTF8/distinfo
deleted file mode 100644
index ad49b5c198..0000000000
--- a/p5-Unicode-MapUTF8/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/01/31 13:25:59 marmfield Exp $
-
-SHA1 (Unicode-MapUTF8-1.11.tar.gz) = c72397ab7f7117e1a0f5821cfa9fabcc9b58b3e0
-RMD160 (Unicode-MapUTF8-1.11.tar.gz) = ffe35b451a06ed99452e30b28208728da0be3f59
-Size (Unicode-MapUTF8-1.11.tar.gz) = 16402 bytes
diff --git a/p5-WebService-Audioscrobbler/Makefile b/p5-WebService-Audioscrobbler/Makefile
index d84367ae4c..f1ba7aa2e5 100644
--- a/p5-WebService-Audioscrobbler/Makefile
+++ b/p5-WebService-Audioscrobbler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/05/24 15:34:14 tnn2 Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/25 09:20:59 absd Exp $
 #
 
 DISTNAME=	WebService-Audioscrobbler-0.07
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.audioscrobbler.net/data/webservices/
 COMMENT=	Interface to the Audioscrobbler WebService API (aka Last.FM)
 
 DEPENDS+=	p5-CLASS>=0:../../wip/p5-CLASS
-DEPENDS+=	p5-Class-Data-Accessor>=0:../../wip/p5-Class-Data-Accessor
+DEPENDS+=	p5-Class-Data-Accessor>=0:../../devel/p5-Class-Data-Accessor
 DEPENDS+=	p5-Cache-Cache>=0:../../devel/p5-Cache-Cache
 DEPENDS+=	p5-UNIVERSAL-require>=0:../../devel/p5-UNIVERSAL-require
 
diff --git a/smbldap-tools/Makefile b/smbldap-tools/Makefile
index f60acaeaa5..d7284e93e0 100644
--- a/smbldap-tools/Makefile
+++ b/smbldap-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/01/31 13:52:40 marmfield Exp $
+# $NetBSD: Makefile,v 1.11 2008/06/25 09:21:00 absd Exp $
 
 DISTNAME=	smbldap-tools-0.9.2a
 CATEGORIES=	sysutils net databases
@@ -13,7 +13,7 @@ DEPENDS+=	samba>=3.0.22:../../net/samba
 DEPENDS+=	p5-perl-ldap>=0.33:../../databases/p5-perl-ldap
 DEPENDS+=	p5-Crypt-SmbHash>=0.12:../../security/p5-Crypt-SmbHash
 DEPENDS+=	p5-Digest-SHA1>=2.11:../../security/p5-Digest-SHA1
-DEPENDS+=	p5-Unicode-MapUTF8-[0-9]*:../../wip/p5-Unicode-MapUTF8
+DEPENDS+=	p5-Unicode-MapUTF8-[0-9]*:../../converters/p5-Unicode-MapUTF8
 
 WRKSRC=		${WRKDIR}/smbldap-tools-0.9.2