Changing all PERL5_MODULE_TYPE from Module::Install to M::I::Bundled,

Module::Install is for Authors only.

Bumping revision

67 files changed, 201 insertions, 169 deletions

diff --git a/databases/p5-Catalyst-Model-DBIC-Schema/Makefile b/databases/p5-Catalyst-Model-DBIC-Schema/Makefile
index 413a92c4728..633932eed78 100644
--- a/databases/p5-Catalyst-Model-DBIC-Schema/Makefile
+++ b/databases/p5-Catalyst-Model-DBIC-Schema/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2012/01/10 08:58:04 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.16 2012/09/03 11:16:26 sno Exp $
 
 DISTNAME=	Catalyst-Model-DBIC-Schema-0.59
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Catalyst/}
 
@@ -35,7 +36,7 @@ BUILD_DEPENDS+=	{perl>=5.12.0,p5-Test-Simple>=0.94}:../../devel/p5-Test-Simple
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Catalyst/Model/DBIC/Schema/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/databases/p5-DBIx-Class-Cursor-Cached/Makefile b/databases/p5-DBIx-Class-Cursor-Cached/Makefile
index 8ff83b28027..f5fedf3de61 100644
--- a/databases/p5-DBIx-Class-Cursor-Cached/Makefile
+++ b/databases/p5-DBIx-Class-Cursor-Cached/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2011/08/14 08:18:06 obache Exp $
+# $NetBSD: Makefile,v 1.4 2012/09/03 11:16:26 sno Exp $
 
 DISTNAME=	DBIx-Class-Cursor-Cached-1.0.1
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBIx/}
 
@@ -18,7 +18,7 @@ BUILD_DEPENDS+=	p5-Cache-Cache-[0-9]*:../../devel/p5-Cache-Cache
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/DBIx/Class/Cursor/Cached/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/databases/p5-DBIx-Class-EncodedColumn/Makefile b/databases/p5-DBIx-Class-EncodedColumn/Makefile
index 70bb2152073..6ff76f1f670 100644
--- a/databases/p5-DBIx-Class-EncodedColumn/Makefile
+++ b/databases/p5-DBIx-Class-EncodedColumn/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2011/11/12 01:22:53 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.7 2012/09/03 11:16:27 sno Exp $
 
 DISTNAME=	DBIx-Class-EncodedColumn-0.00011
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBIx/}
 
@@ -34,7 +35,7 @@ BUILD_DEPENDS+=	p5-Module-Install-ReadmeFromPod-[0-9]*:../../devel/p5-Module-Ins
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/DBIx/Class/EncodedColumn/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 PKG_DESTDIR_SUPPORT=    user-destdir
 
diff --git a/databases/p5-DBIx-Class-Fixtures/Makefile b/databases/p5-DBIx-Class-Fixtures/Makefile
index d6bf15ea67c..ac125f84dc5 100644
--- a/databases/p5-DBIx-Class-Fixtures/Makefile
+++ b/databases/p5-DBIx-Class-Fixtures/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2011/10/21 04:03:40 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/03 11:16:26 sno Exp $
 
 DISTNAME=	DBIx-Class-Fixtures-1.001013
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBIx/}
 
@@ -30,7 +31,7 @@ DEPENDS+=	p5-YAML-Syck>=0.88:../../textproc/p5-YAML-Syck
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/DBIx/Class/Fixtures/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/p5-DBIx-Class-TimeStamp/Makefile b/databases/p5-DBIx-Class-TimeStamp/Makefile
index 15b9cdabed1..19283384286 100644
--- a/databases/p5-DBIx-Class-TimeStamp/Makefile
+++ b/databases/p5-DBIx-Class-TimeStamp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2011/08/14 08:18:07 obache Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/03 11:16:26 sno Exp $
 
 DISTNAME=	DBIx-Class-TimeStamp-0.14
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBIx/}
 
@@ -13,7 +13,7 @@ LICENSE=	${PERL5_LICENSE}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/DBIx/Class/TimeStamp/.packlist
 
diff --git a/databases/p5-DBIx-Class-Validation/Makefile b/databases/p5-DBIx-Class-Validation/Makefile
index 8b3813bb30c..62163f64fb1 100644
--- a/databases/p5-DBIx-Class-Validation/Makefile
+++ b/databases/p5-DBIx-Class-Validation/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2011/08/14 08:18:07 obache Exp $
+# $NetBSD: Makefile,v 1.8 2012/09/03 11:16:26 sno Exp $
 
 DISTNAME=	DBIx-Class-Validation-0.02005
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBIx/}
 
@@ -20,7 +20,7 @@ BUILD_DEPENDS+=	p5-DateTime-Format-SQLite-[0-9]*:../../time/p5-DateTime-Format-S
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/DBIx/Class/Validation/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 PKG_DESTDIR_SUPPORT=    user-destdir
 
diff --git a/databases/p5-DBIx-SearchBuilder/Makefile b/databases/p5-DBIx-SearchBuilder/Makefile
index 325b4e73430..8c578ba70f0 100644
--- a/databases/p5-DBIx-SearchBuilder/Makefile
+++ b/databases/p5-DBIx-SearchBuilder/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2011/11/16 08:02:42 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.42 2012/09/03 11:16:27 sno Exp $
 #
 
 DISTNAME=	DBIx-SearchBuilder-1.61
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 SVR4_PKGNAME=	p5dxs
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBIx/}
@@ -29,7 +30,7 @@ DEPENDS+=	p5-Class-Accessor-[0-9]*:../../devel/p5-Class-Accessor
 DEPENDS+=	p5-DBIx-DBSchema-[0-9]*:../../databases/p5-DBIx-DBSchema
 
 PERL5_PACKLIST=		auto/DBIx/SearchBuilder/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../databases/p5-DBI/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
diff --git a/databases/p5-ORLite/Makefile b/databases/p5-ORLite/Makefile
index d1d45bac427..7b6a375a1c6 100644
--- a/databases/p5-ORLite/Makefile
+++ b/databases/p5-ORLite/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2012/01/26 15:33:31 rhaen Exp $
+# $NetBSD: Makefile,v 1.12 2012/09/03 11:16:27 sno Exp $
 
 DISTNAME=	ORLite-1.51
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../by-authors/id/A/AD/ADAMK/}
 
@@ -23,7 +24,7 @@ BUILDLINK_API_DEPENDS.p5-DBI+=	p5-DBI>=1.607
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST= auto/ORLite/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/databases/p5-SQL-Abstract/Makefile b/databases/p5-SQL-Abstract/Makefile
index 87419e778a2..7d52d28d222 100644
--- a/databases/p5-SQL-Abstract/Makefile
+++ b/databases/p5-SQL-Abstract/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2011/08/06 20:56:08 adam Exp $
+# $NetBSD: Makefile,v 1.23 2012/09/03 11:16:27 sno Exp $
 
 DISTNAME=	SQL-Abstract-1.72
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 SVR4_PKGNAME=	p5sqa
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=SQL/}
@@ -23,7 +24,7 @@ BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.92}:../../devel/p5-Test-Simple
 BUILD_DEPENDS+=	p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn
 
 PERL5_PACKLIST=		auto/SQL/Abstract/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 REPLACE_PERL=		script/format-sql
 
 .include "../../lang/perl5/module.mk"
diff --git a/databases/p5-SQL-Translator/Makefile b/databases/p5-SQL-Translator/Makefile
index 6934ec98547..de7c11954f1 100644
--- a/databases/p5-SQL-Translator/Makefile
+++ b/databases/p5-SQL-Translator/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2011/11/22 11:17:47 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.18 2012/09/03 11:16:27 sno Exp $
 
 DISTNAME=	SQL-Translator-0.11010
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	databases perl5
 #MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../by-authors/id/J/JR/JROBINSON/}
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=SQL/}
@@ -38,7 +39,7 @@ BUILD_DEPENDS+=	p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences
 BUILD_DEPENDS+=	p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
 
 USE_LANGUAGES=	# empty
-PERL5_MODULE_TYPE= Module::Install
+PERL5_MODULE_TYPE= Module::Install::Bundled
 PERL5_PACKLIST=	auto/SQL/Translator/.packlist
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/databases/p5-Search-QueryParser-SQL/Makefile b/databases/p5-Search-QueryParser-SQL/Makefile
index a9e8f45ee2f..6d068fcd5da 100644
--- a/databases/p5-Search-QueryParser-SQL/Makefile
+++ b/databases/p5-Search-QueryParser-SQL/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2011/08/06 20:41:01 adam Exp $
+# $NetBSD: Makefile,v 1.7 2012/09/03 11:16:27 sno Exp $
 
 DISTNAME=	Search-QueryParser-SQL-0.008
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Search/}
 
@@ -16,7 +16,7 @@ DEPENDS+=	p5-Data-Dump>=0:../../devel/p5-Data-Dump
 DEPENDS+=	p5-Search-QueryParser>=0.93:../../databases/p5-Search-QueryParser/
 
 PERL5_PACKLIST=	auto/Search/QueryParser/SQL/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/devel/p5-Class-Accessor-Grouped/Makefile b/devel/p5-Class-Accessor-Grouped/Makefile
index b66f5d8d102..7a68c04abff 100644
--- a/devel/p5-Class-Accessor-Grouped/Makefile
+++ b/devel/p5-Class-Accessor-Grouped/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2012/03/05 13:29:39 sno Exp $
+# $NetBSD: Makefile,v 1.18 2012/09/03 11:16:19 sno Exp $
 
 DISTNAME=	Class-Accessor-Grouped-0.10006
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Class/}
 
@@ -22,7 +23,7 @@ BUILD_DEPENDS+=	{perl>=5.12.0,p5-Test-Simple>=0.94}:../../devel/p5-Test-Simple
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Class/Accessor/Grouped/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Debug-Client/Makefile b/devel/p5-Debug-Client/Makefile
index d244c3be3d4..3c346d62314 100644
--- a/devel/p5-Debug-Client/Makefile
+++ b/devel/p5-Debug-Client/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2011/08/12 06:55:53 adam Exp $
+# $NetBSD: Makefile,v 1.4 2012/09/03 11:16:22 sno Exp $
 
 DISTNAME=	Debug-Client-0.12
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Debug/}
 
@@ -13,7 +14,7 @@ LICENSE=	${PERL5_LICENSE}
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=		auto/Debug/Client/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Devel-BeginLift/Makefile b/devel/p5-Devel-BeginLift/Makefile
index 558af67717e..49d504b395e 100644
--- a/devel/p5-Devel-BeginLift/Makefile
+++ b/devel/p5-Devel-BeginLift/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/11/15 16:45:42 sno Exp $
+# $NetBSD: Makefile,v 1.2 2012/09/03 11:16:22 sno Exp $
 
 DISTNAME=	Devel-BeginLift-0.001003
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Devel/}
 
@@ -16,7 +17,7 @@ BUILD_DEPENDS+=	p5-ExtUtils-Depends-[0-9]*:../../devel/p5-ExtUtils-Depends
 
 USE_LANGUAGES=		c
 PERL5_PACKLIST=		auto/Devel/BeginLift/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 BUILDLINK_DEPMETHOD.p5-B-Hooks-OP-Check=	full
 BUILDLINK_API_DEPENDS.p5-B-Hooks-OP-Check+=	p5-B-Hooks-OP-Check>=0.19
diff --git a/devel/p5-Devel-Declare/Makefile b/devel/p5-Devel-Declare/Makefile
index f70e9488660..d72180b85ca 100644
--- a/devel/p5-Devel-Declare/Makefile
+++ b/devel/p5-Devel-Declare/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2012/03/08 09:35:10 sno Exp $
+# $NetBSD: Makefile,v 1.20 2012/09/03 11:16:20 sno Exp $
 
 DISTNAME=	Devel-Declare-0.006011
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Devel/}
 
@@ -21,7 +22,7 @@ BUILD_DEPENDS+= p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn
 
 USE_LANGUAGES=		c
 PERL5_PACKLIST=		auto/Devel/Declare/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 BUILDLINK_DEPMETHOD.p5-B-Hooks-OP-Check=	full
 BUILDLINK_API_DEPENDS.p5-B-Hooks-OP-Check+=	p5-B-Hooks-OP-Check>=0.19
 
diff --git a/devel/p5-Devel-REPL/Makefile b/devel/p5-Devel-REPL/Makefile
index 14b0396d5bd..a50be8d8030 100644
--- a/devel/p5-Devel-REPL/Makefile
+++ b/devel/p5-Devel-REPL/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2011/08/12 11:40:55 adam Exp $
+# $NetBSD: Makefile,v 1.16 2012/09/03 11:16:20 sno Exp $
 
 DISTNAME=	Devel-REPL-1.003012
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Devel/}
 
@@ -32,7 +33,7 @@ DEPENDS+=	p5-PPI-[0-9]*:../../devel/p5-PPI
 DEPENDS+=	p5-Sys-SigAction-[0-9]*:../../sysutils/p5-Sys-SigAction
 
 USE_LANGUAGES=		# empty
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 PERL5_PACKLIST=		auto/Devel/REPL/.packlist
 REPLACE_PERL+=		script/re.pl
 
diff --git a/devel/p5-File-Find-Rule-VCS/Makefile b/devel/p5-File-Find-Rule-VCS/Makefile
index e64dc2a440b..131b8208a3a 100644
--- a/devel/p5-File-Find-Rule-VCS/Makefile
+++ b/devel/p5-File-Find-Rule-VCS/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2011/08/13 07:47:41 adam Exp $
+# $NetBSD: Makefile,v 1.7 2012/09/03 11:16:21 sno Exp $
 
 DISTNAME=	File-Find-Rule-VCS-1.08
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=File/}
 
@@ -16,7 +17,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 DEPENDS+=	p5-File-Find-Rule>=0.20:../../devel/p5-File-Find-Rule
 DEPENDS+=	p5-Text-Glob>=0.08:../../textproc/p5-Text-Glob
 
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 PERL5_PACKLIST=		auto/File/Find/Rule/VCS/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-MooseX-AttributeHelpers/Makefile b/devel/p5-MooseX-AttributeHelpers/Makefile
index 2948b76ee4c..8cae1ec903d 100644
--- a/devel/p5-MooseX-AttributeHelpers/Makefile
+++ b/devel/p5-MooseX-AttributeHelpers/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2011/08/14 12:26:20 obache Exp $
+# $NetBSD: Makefile,v 1.13 2012/09/03 11:16:20 sno Exp $
 #
 
 DISTNAME=	MooseX-AttributeHelpers-0.23
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MooseX/}
 
@@ -20,7 +20,7 @@ BUILD_DEPENDS+=	p5-Test-Exception>=0.21:../../devel/p5-Test-Exception
 DEPENDS+=	p5-Moose>=0.56:../../devel/p5-Moose
 
 PERL5_PACKLIST=	auto/MooseX/AttributeHelpers/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-MooseX-ConfigFromFile/Makefile b/devel/p5-MooseX-ConfigFromFile/Makefile
index ff3c1cc4efb..3b787f6f525 100644
--- a/devel/p5-MooseX-ConfigFromFile/Makefile
+++ b/devel/p5-MooseX-ConfigFromFile/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2011/11/08 07:57:29 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.6 2012/09/03 11:16:21 sno Exp $
 
 DISTNAME=	MooseX-ConfigFromFile-0.03
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MooseX/}
 
@@ -18,7 +19,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_LANGUAGES=	# empty
 
 PERL5_PACKLIST=	auto/MooseX/ConfigFromFile/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-MooseX-Declare/Makefile b/devel/p5-MooseX-Declare/Makefile
index 48fddaa825a..ff9e173c0a9 100644
--- a/devel/p5-MooseX-Declare/Makefile
+++ b/devel/p5-MooseX-Declare/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2011/11/11 08:33:22 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.13 2012/09/03 11:16:21 sno Exp $
 #
 
 DISTNAME=	MooseX-Declare-0.35
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MooseX/}
 
@@ -26,7 +27,7 @@ BUILD_DEPENDS+=	p5-Test-NoWarnings-[0-9]*:../../devel/p5-Test-NoWarnings
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	# empty
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 PERL5_PACKLIST=	auto/MooseX/Declare/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile b/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile
index cc303321911..d2beb3201c0 100644
--- a/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile
+++ b/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2011/08/14 12:26:21 obache Exp $
+# $NetBSD: Makefile,v 1.9 2012/09/03 11:16:21 sno Exp $
 
 DISTNAME=	MooseX-Emulate-Class-Accessor-Fast-0.00903
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MooseX/}
 
@@ -19,7 +19,7 @@ BUILD_DEPENDS+=	p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=	auto/MooseX/Emulate/Class/Accessor/Fast/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-MooseX-Method-Signatures/Makefile b/devel/p5-MooseX-Method-Signatures/Makefile
index 221861ff8c1..8f1400bab24 100644
--- a/devel/p5-MooseX-Method-Signatures/Makefile
+++ b/devel/p5-MooseX-Method-Signatures/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2011/11/15 09:10:17 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.16 2012/09/03 11:16:21 sno Exp $
 #
 
 DISTNAME=	MooseX-Method-Signatures-0.37
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MooseX/}
 #MASTER_SITES+=	${MASTER_SITE_PERL_CPAN:=../../authors/id/F/FL/FLORA/}
@@ -32,7 +33,7 @@ BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.89}:../../devel/p5-Test-Simple
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	# empty
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 PERL5_PACKLIST=	auto/MooseX/Method/Signatures/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-MooseX-Types/Makefile b/devel/p5-MooseX-Types/Makefile
index 57ead62c1d3..0e79fb1931a 100644
--- a/devel/p5-MooseX-Types/Makefile
+++ b/devel/p5-MooseX-Types/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2011/11/11 08:31:25 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.19 2012/09/03 11:16:20 sno Exp $
 #
 
 DISTNAME=	MooseX-Types-0.30
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MooseX/}
 
@@ -24,7 +25,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/MooseX/Types/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Package-Generator/Makefile b/devel/p5-Package-Generator/Makefile
index 213ba89b418..169c51073e4 100644
--- a/devel/p5-Package-Generator/Makefile
+++ b/devel/p5-Package-Generator/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2011/08/14 12:26:27 obache Exp $
+# $NetBSD: Makefile,v 1.6 2012/09/03 11:16:20 sno Exp $
 #
 
 DISTNAME=	Package-Generator-0.103
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Package/}
 
@@ -15,7 +15,7 @@ LICENSE=	${PERL5_LICENSE}
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=		auto/Package/Generator/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Parse-Method-Signatures/Makefile b/devel/p5-Parse-Method-Signatures/Makefile
index ae677f37ef0..1fb31c085b2 100644
--- a/devel/p5-Parse-Method-Signatures/Makefile
+++ b/devel/p5-Parse-Method-Signatures/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2011/11/13 06:13:12 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.10 2012/09/03 11:16:21 sno Exp $
 #
 
 DISTNAME=	Parse-Method-Signatures-1.003014
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Parse/}
 
@@ -27,7 +28,7 @@ BUILD_DEPENDS+=	p5-aliased-[0-9]*:../../devel/p5-aliased
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	# empty
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 PERL5_PACKLIST=	auto/Parse/Method/Signatures/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Task-Weaken/Makefile b/devel/p5-Task-Weaken/Makefile
index e433f1dd799..d07b82407b0 100644
--- a/devel/p5-Task-Weaken/Makefile
+++ b/devel/p5-Task-Weaken/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2012/01/26 12:47:38 rhaen Exp $
+# $NetBSD: Makefile,v 1.9 2012/09/03 11:16:20 sno Exp $
 #
 
 DISTNAME=	Task-Weaken-1.04
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Task/}
 
@@ -12,7 +13,7 @@ COMMENT=	Perl 5 module to ensure that a platform has weaken support
 LICENSE=	${PERL5_LICENSE}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 PERL5_PACKLIST=	auto/Task/Weaken/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Test-ClassAPI/Makefile b/devel/p5-Test-ClassAPI/Makefile
index a20e4e8798c..bdb924d83ec 100644
--- a/devel/p5-Test-ClassAPI/Makefile
+++ b/devel/p5-Test-ClassAPI/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2011/08/14 12:26:40 obache Exp $
+# $NetBSD: Makefile,v 1.13 2012/09/03 11:16:20 sno Exp $
 
 DISTNAME=		Test-ClassAPI-1.06
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Test/}
 
@@ -19,7 +19,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=		auto/Test/ClassAPI/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Test-Inline/Makefile b/devel/p5-Test-Inline/Makefile
index 50bfea6a9c5..40c7743cc73 100644
--- a/devel/p5-Test-Inline/Makefile
+++ b/devel/p5-Test-Inline/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2011/08/14 12:26:41 obache Exp $
+# $NetBSD: Makefile,v 1.25 2012/09/03 11:16:20 sno Exp $
 
 DISTNAME=		Test-Inline-2.212
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		1
+PKGREVISION=		2
 SVR4_PKGNAME=		p5tin
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Test/}
@@ -29,7 +29,7 @@ DEPENDS+=		p5-Params-Util>=0.21:../../devel/p5-Params-Util
 DEPENDS+=		p5-Pod-Tests>=0.18:../../textproc/p5-Pod-Tests
 
 PERL5_PACKLIST=		auto/Test/Inline/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-TryCatch/Makefile b/devel/p5-TryCatch/Makefile
index 45e3683155f..76b0e6ed36b 100644
--- a/devel/p5-TryCatch/Makefile
+++ b/devel/p5-TryCatch/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2011/09/29 09:37:16 obache Exp $
+# $NetBSD: Makefile,v 1.8 2012/09/03 11:16:21 sno Exp $
 
 DISTNAME=	TryCatch-1.003000
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 SVR4_PKGNAME=	p5sto
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/A/AS/ASH/}
@@ -29,7 +30,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=		auto/TryCatch/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../devel/p5-B-Hooks-OP-Check/buildlink3.mk"
 .include "../../devel/p5-B-Hooks-OP-PPAddr/buildlink3.mk"
diff --git a/devel/p5-lib-abs/Makefile b/devel/p5-lib-abs/Makefile
index 7166418dc66..37e2a2d8982 100644
--- a/devel/p5-lib-abs/Makefile
+++ b/devel/p5-lib-abs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2011/12/13 12:29:02 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.6 2012/09/03 11:16:21 sno Exp $
 #
 
 DISTNAME=	lib-abs-0.92
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=lib/}
 
@@ -15,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/lib/abs/.packlist
-PERL5_MODULE_TYPE=	Module::Install # to handle auto_install flags properly
+PERL5_MODULE_TYPE=	Module::Install::Bundled # to handle auto_install flags properly
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-local-lib/Makefile b/devel/p5-local-lib/Makefile
index 2059da576dc..ac3624b31b0 100644
--- a/devel/p5-local-lib/Makefile
+++ b/devel/p5-local-lib/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2011/11/05 13:30:44 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.16 2012/09/03 11:16:21 sno Exp $
 #
 
 DISTNAME=	local-lib-1.008004
 PKGNAME=	p5-${DISTNAME:S/008004/8.4/}
+PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=lib/}
 
@@ -15,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/local/lib/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/p5-PPIx-EditorTools/Makefile b/editors/p5-PPIx-EditorTools/Makefile
index c2cf7a7344c..9f86f40780a 100644
--- a/editors/p5-PPIx-EditorTools/Makefile
+++ b/editors/p5-PPIx-EditorTools/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2011/08/14 12:38:56 obache Exp $
+# $NetBSD: Makefile,v 1.4 2012/09/03 11:16:22 sno Exp $
 #
 
 DISTNAME=	PPIx-EditorTools-0.09
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors perl5
 #MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=PPIx/}
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/A/AZ/AZAWAWI/}
@@ -21,7 +21,7 @@ DEPENDS+=	p5-Class-XSAccessor>=1.02:../../devel/p5-Class-XSAccessor
 DEPENDS+=	p5-PPI>=1.203:../../devel/p5-PPI
 
 PERL5_PACKLIST=		auto/PPIx/EditorTools/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 #pre-configure:
 #	cd ${WRKSRC} && find `pwd` -name "*.orig" -type f | xargs rm
diff --git a/editors/p5-Padre-Plugin-PerlCritic/Makefile b/editors/p5-Padre-Plugin-PerlCritic/Makefile
index 7d944a57b88..79f20841ef8 100644
--- a/editors/p5-Padre-Plugin-PerlCritic/Makefile
+++ b/editors/p5-Padre-Plugin-PerlCritic/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2011/08/14 12:38:57 obache Exp $
+# $NetBSD: Makefile,v 1.6 2012/09/03 11:16:22 sno Exp $
 #
 
 DISTNAME=	Padre-Plugin-PerlCritic-0.08
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Padre/}
 
@@ -18,7 +18,7 @@ DEPENDS+=	p5-Padre>=0.54:../../editors/p5-Padre
 DEPENDS+=	p5-Perl-Critic-[0-9]*:../../devel/p5-Perl-Critic
 
 PERL5_PACKLIST=		auto/Padre/Plugin/PerlCritic/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 #pre-configure:
 #	cd ${WRKSRC} && find `pwd` -name "*.orig" -type f | xargs rm
diff --git a/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile b/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
index 8c64abbd55c..b044eba34bc 100644
--- a/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
+++ b/finance/p5-Finance-Currency-Convert-WebserviceX/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2011/08/14 12:41:40 obache Exp $
+# $NetBSD: Makefile,v 1.6 2012/09/03 11:16:22 sno Exp $
 
 DISTNAME=	Finance-Currency-Convert-WebserviceX-0.07001
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	finance perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/C/CL/CLACO/}
 
@@ -17,7 +17,7 @@ USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/Finance/Currency/Convert/WebserviceX/.packlist
 
 PKG_DESTDIR_SUPPORT=	user-destdir
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/p5-Image-Info/Makefile b/graphics/p5-Image-Info/Makefile
index b4378a43555..5b60dd8c2c3 100644
--- a/graphics/p5-Image-Info/Makefile
+++ b/graphics/p5-Image-Info/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2012/04/22 10:56:30 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2012/09/03 11:16:22 sno Exp $
 #
 
 DISTNAME=	Image-Info-1.32
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 SVR4_PKGNAME=	p5iin
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Image/}
@@ -19,7 +20,7 @@ DEPENDS+=	p5-XML-LibXML-[0-9]*:../../textproc/p5-XML-LibXML
 #DEPENDS+=	p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 PERL5_PACKLIST=		auto/Image/Info/.packlist
 
diff --git a/mail/p5-MIME-Charset/Makefile b/mail/p5-MIME-Charset/Makefile
index 0796339907a..0577422457a 100644
--- a/mail/p5-MIME-Charset/Makefile
+++ b/mail/p5-MIME-Charset/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2011/10/16 16:22:41 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.9 2012/09/03 11:16:22 sno Exp $
 #
 
 DISTNAME=	MIME-Charset-1.009.1
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MIME/}
 
@@ -23,7 +24,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/MIME/Charset/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/p5-Math-BigInt-Pari/Makefile b/math/p5-Math-BigInt-Pari/Makefile
index 81a57ec6ed0..afc5847ed5c 100644
--- a/math/p5-Math-BigInt-Pari/Makefile
+++ b/math/p5-Math-BigInt-Pari/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2011/08/16 22:22:56 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2012/09/03 11:16:22 sno Exp $
 
 DISTNAME=		Math-BigInt-Pari-1.16
 PKGNAME=		p5-${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		math perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Math/}
 
@@ -16,7 +17,7 @@ DEPENDS+=		p5-Math-Pari>=2.010709:../../math/p5-Math-Pari
 PERL5_REQD+=		5.12.2nb1
 
 PERL5_PACKLIST=		auto/Math/BigInt/Pari/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
diff --git a/misc/p5-Locale-Maketext-Simple/Makefile b/misc/p5-Locale-Maketext-Simple/Makefile
index acef6ae1940..e0047a4a571 100644
--- a/misc/p5-Locale-Maketext-Simple/Makefile
+++ b/misc/p5-Locale-Maketext-Simple/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2011/08/14 13:45:16 obache Exp $
+# $NetBSD: Makefile,v 1.14 2012/09/03 11:16:22 sno Exp $
 
 DISTNAME=		Locale-Maketext-Simple-0.21
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		misc perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Locale/}
 
@@ -16,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Locale/Maketext/Simple/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-Net-Jifty/Makefile b/net/p5-Net-Jifty/Makefile
index 51460cee8d8..56ad4cc36ce 100644
--- a/net/p5-Net-Jifty/Makefile
+++ b/net/p5-Net-Jifty/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2011/12/16 06:11:42 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.10 2012/09/03 11:16:23 sno Exp $
 #
 
 DISTNAME=	Net-Jifty-0.14
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
 
@@ -26,7 +27,7 @@ DEPENDS+=	p5-DateTime-[0-9]*:../../time/p5-DateTime
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 PERL5_PACKLIST=	auto/Net/Jifty/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-Net-Server-SS-PreFork/Makefile b/net/p5-Net-Server-SS-PreFork/Makefile
index 1ab0d56107e..8d667b5452f 100644
--- a/net/p5-Net-Server-SS-PreFork/Makefile
+++ b/net/p5-Net-Server-SS-PreFork/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2011/08/14 14:14:46 obache Exp $
+# $NetBSD: Makefile,v 1.4 2012/09/03 11:16:23 sno Exp $
 #
 
 DISTNAME=	Net-Server-SS-PreFork-0.05
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
 
@@ -13,7 +13,7 @@ COMMENT=	Hot-deployable variant of Perl 5 module Net::Server::PreFork
 LICENSE=	${PERL5_LICENSE}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Net/Server/SS/PreFork/.packlist
diff --git a/security/p5-Authen-CAS-Client/Makefile b/security/p5-Authen-CAS-Client/Makefile
index 28d131c0122..ed38eadf630 100644
--- a/security/p5-Authen-CAS-Client/Makefile
+++ b/security/p5-Authen-CAS-Client/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2011/08/14 14:42:46 obache Exp $
+# $NetBSD: Makefile,v 1.8 2012/09/03 11:16:23 sno Exp $
 #
 
 DISTNAME=	Authen-CAS-Client-0.05
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Authen/}
 
@@ -16,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/Authen/CAS/Client/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 BUILD_DEPENDS+=	p5-Test-MockObject-[0-9]*:../../devel/p5-Test-MockObject
 DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
diff --git a/security/p5-Text-Password-Pronounceable/Makefile b/security/p5-Text-Password-Pronounceable/Makefile
index 2456b09dd36..7aa4e3e5a3c 100644
--- a/security/p5-Text-Password-Pronounceable/Makefile
+++ b/security/p5-Text-Password-Pronounceable/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2011/08/14 14:42:51 obache Exp $
+# $NetBSD: Makefile,v 1.5 2012/09/03 11:16:23 sno Exp $
 
 DISTNAME=	Text-Password-Pronounceable-0.30
 PKGNAME=	p5-${DISTNAME}
 #PKGREVISION=	1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	perl5 textproc security
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Text/}
 
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=		auto/Text/Password/Pronounceable/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/p5-SSH-Batch/Makefile b/sysutils/p5-SSH-Batch/Makefile
index 23215206528..b9ce5ec11c6 100644
--- a/sysutils/p5-SSH-Batch/Makefile
+++ b/sysutils/p5-SSH-Batch/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2011/10/20 01:03:47 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.8 2012/09/03 11:16:23 sno Exp $
 
 DISTNAME=	SSH-Batch-0.028
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	sysutils net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/A/AG/AGENT/}
 
@@ -14,7 +15,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST= auto/SSH/Batch/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 REPLACE_PERL+=	bin/atnodes
 REPLACE_PERL+=	bin/fornodes
diff --git a/textproc/p5-FormValidator-Simple/Makefile b/textproc/p5-FormValidator-Simple/Makefile
index a2a4d090665..64b95d3f89b 100644
--- a/textproc/p5-FormValidator-Simple/Makefile
+++ b/textproc/p5-FormValidator-Simple/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2011/08/14 15:14:04 obache Exp $
+# $NetBSD: Makefile,v 1.8 2012/09/03 11:16:23 sno Exp $
 
 DISTNAME=	FormValidator-Simple-0.28
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../by-authors/id/L/LY/LYOKATO/}
 
@@ -28,7 +28,7 @@ DEPENDS+=	p5-YAML>=0.39:../../textproc/p5-YAML
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/FormValidator/Simple/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 PKG_DESTDIR_SUPPORT=    user-destdir
 
diff --git a/textproc/p5-PDF-API2-Simple/Makefile b/textproc/p5-PDF-API2-Simple/Makefile
index cfa3f16a04d..9768866cc02 100644
--- a/textproc/p5-PDF-API2-Simple/Makefile
+++ b/textproc/p5-PDF-API2-Simple/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2011/08/14 15:14:06 obache Exp $
+# $NetBSD: Makefile,v 1.5 2012/09/03 11:16:24 sno Exp $
 
 DISTNAME=	PDF-API2-Simple-1.1.4u
 WRKSRC=		${WRKDIR}/${DISTNAME:S/u$//}
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=PDF/}
 
@@ -17,7 +17,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 DEPENDS+=	p5-PDF-API2>=2.019:../../textproc/p5-PDF-API2
 
 PERL5_PACKLIST=	auto/PDF/API2/Simple/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Template-Declare/Makefile b/textproc/p5-Template-Declare/Makefile
index 98718b99ba6..7cec647bf90 100644
--- a/textproc/p5-Template-Declare/Makefile
+++ b/textproc/p5-Template-Declare/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2011/10/14 02:13:31 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.13 2012/09/03 11:16:23 sno Exp $
 
 DISTNAME=	Template-Declare-0.45
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Template/}
 
@@ -14,7 +15,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Template/Declare/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 DEPENDS+=	p5-Class-Accessor-[0-9]*:../../devel/p5-Class-Accessor
 DEPENDS+=	p5-Class-Data-Inheritable-[0-9]*:../../devel/p5-Class-Data-Inheritable
diff --git a/textproc/p5-Template-Plugin-CSV/Makefile b/textproc/p5-Template-Plugin-CSV/Makefile
index 6f05abbf989..c63a59d46aa 100644
--- a/textproc/p5-Template-Plugin-CSV/Makefile
+++ b/textproc/p5-Template-Plugin-CSV/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2011/08/14 15:14:10 obache Exp $
+# $NetBSD: Makefile,v 1.4 2012/09/03 11:16:24 sno Exp $
 #
 
 DISTNAME=	Template-Plugin-CSV-0.04
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Template/}
 
@@ -18,7 +18,7 @@ DEPENDS+=	p5-Template-Toolkit>=2:../../www/p5-Template-Toolkit
 DEPENDS+=	p5-Text-CSV-[0-9]*:../../textproc/p5-Text-CSV
 
 PERL5_PACKLIST=		auto/Template/Plugin/CSV/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-FindIndent/Makefile b/textproc/p5-Text-FindIndent/Makefile
index 0d47ad40f09..042a486d8e6 100644
--- a/textproc/p5-Text-FindIndent/Makefile
+++ b/textproc/p5-Text-FindIndent/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2011/10/16 09:18:28 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.7 2012/09/03 11:16:24 sno Exp $
 
 DISTNAME=	Text-FindIndent-0.10
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Text/}
 
@@ -16,7 +17,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Text/FindIndent/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Text-Trac/Makefile b/textproc/p5-Text-Trac/Makefile
index a7818146723..b1124ea01a4 100644
--- a/textproc/p5-Text-Trac/Makefile
+++ b/textproc/p5-Text-Trac/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2011/08/14 15:14:15 obache Exp $
+# $NetBSD: Makefile,v 1.4 2012/09/03 11:16:23 sno Exp $
 
 DISTNAME=	Text-Trac-0.15
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	perl5 textproc
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Text/}
 
@@ -25,7 +25,7 @@ BUILD_DEPENDS+=	p5-Test-Base-[0-9]*:../../devel/p5-Test-Base
 USE_LANGUAGES=		# empty
 
 PERL5_PACKLIST=		auto/Text/Trac/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/p5-Data-ICal/Makefile b/time/p5-Data-ICal/Makefile
index ed507175b90..db8a6fb881f 100644
--- a/time/p5-Data-ICal/Makefile
+++ b/time/p5-Data-ICal/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2011/08/14 15:28:44 obache Exp $
+# $NetBSD: Makefile,v 1.8 2012/09/03 11:16:24 sno Exp $
 
 DISTNAME=		Data-ICal-0.16
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		time perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Data/}
 
@@ -25,7 +25,7 @@ BUILD_DEPENDS+=		p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 PERL5_PACKLIST=		auto/Data/ICal/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/p5-MooseX-Types-DateTime-ButMaintained/Makefile b/time/p5-MooseX-Types-DateTime-ButMaintained/Makefile
index 3344f7a77ea..fe36a112bfb 100644
--- a/time/p5-MooseX-Types-DateTime-ButMaintained/Makefile
+++ b/time/p5-MooseX-Types-DateTime-ButMaintained/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2011/08/14 15:28:47 obache Exp $
+# $NetBSD: Makefile,v 1.6 2012/09/03 11:16:24 sno Exp $
 #
 
 DISTNAME=	MooseX-Types-DateTime-ButMaintained-0.11
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MooseX/}
 
@@ -27,7 +27,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/MooseX/Types/DateTime/ButMaintained/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/p5-MooseX-Types-DateTimeX/Makefile b/time/p5-MooseX-Types-DateTimeX/Makefile
index 459e6c78d9e..d19ac01e85f 100644
--- a/time/p5-MooseX-Types-DateTimeX/Makefile
+++ b/time/p5-MooseX-Types-DateTimeX/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2011/08/14 15:28:47 obache Exp $
+# $NetBSD: Makefile,v 1.6 2012/09/03 11:16:24 sno Exp $
 #
 
 DISTNAME=	MooseX-Types-DateTimeX-0.10
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MooseX/}
 
@@ -26,7 +26,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/MooseX/Types/DateTimeX/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/p5-Olson-Abbreviations/Makefile b/time/p5-Olson-Abbreviations/Makefile
index bc11839e6c2..a4333f0a392 100644
--- a/time/p5-Olson-Abbreviations/Makefile
+++ b/time/p5-Olson-Abbreviations/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2011/08/14 15:28:47 obache Exp $
+# $NetBSD: Makefile,v 1.5 2012/09/03 11:16:24 sno Exp $
 #
 
 DISTNAME=	Olson-Abbreviations-0.02
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/E/EC/ECARROLL/}
 
@@ -20,7 +20,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Olson/Abbreviations/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/p5-Template-Plugin-DateTime/Makefile b/time/p5-Template-Plugin-DateTime/Makefile
index 3dca955ba73..0f7c1be2b0a 100644
--- a/time/p5-Template-Plugin-DateTime/Makefile
+++ b/time/p5-Template-Plugin-DateTime/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2011/08/14 15:28:48 obache Exp $
+# $NetBSD: Makefile,v 1.4 2012/09/03 11:16:24 sno Exp $
 #
 
 DISTNAME=	Template-Plugin-DateTime-0.06001
 PKGNAME=	p5-${DISTNAME:S/06001/06.001/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Template/}
 
@@ -19,7 +19,7 @@ DEPENDS+=	p5-DateTime-Format-Strptime-[0-9]*:../../time/p5-DateTime-Format-Strpt
 DEPENDS+=	p5-Template-Toolkit>=2:../../www/p5-Template-Toolkit
 
 PERL5_PACKLIST=		auto/Template/Plugin/DateTime/.packlist
-PERL5_BUILD_TYPE=	Module::Install
+PERL5_BUILD_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-AnyEvent-SCGI/Makefile b/www/p5-AnyEvent-SCGI/Makefile
index f999d11a2d1..8a517095f70 100644
--- a/www/p5-AnyEvent-SCGI/Makefile
+++ b/www/p5-AnyEvent-SCGI/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2011/08/14 16:05:41 obache Exp $
+# $NetBSD: Makefile,v 1.4 2012/09/03 11:16:26 sno Exp $
 
 DISTNAME=	AnyEvent-SCGI-1.1
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=AnyEvent/}
 
@@ -15,7 +15,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/AnyEvent/SCGI/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 DEPENDS+=	p5-AnyEvent>=5.2:../../devel/p5-AnyEvent
 # Recommended
diff --git a/www/p5-Apache2-AuthCASSimple/Makefile b/www/p5-Apache2-AuthCASSimple/Makefile
index 7fd6237b770..fceb3e60c10 100644
--- a/www/p5-Apache2-AuthCASSimple/Makefile
+++ b/www/p5-Apache2-AuthCASSimple/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2011/08/14 16:05:42 obache Exp $
+# $NetBSD: Makefile,v 1.5 2012/09/03 11:16:26 sno Exp $
 #
 
 DISTNAME=	Apache2-AuthCASSimple-0.10
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache2/}
 
@@ -16,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/Apache2/AuthCASSimple/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 DEPENDS+=	p5-Apache-Session-Wrapper-[0-9]*:../../www/p5-Apache-Session-Wrapper
 DEPENDS+=	p5-Authen-CAS-Client-[0-9]*:../../security/p5-Authen-CAS-Client
diff --git a/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile b/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile
index aa53011d957..8e80f18c799 100644
--- a/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile
+++ b/www/p5-Catalyst-Authentication-Store-DBIx-Class/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2011/12/13 12:30:07 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/03 11:16:24 sno Exp $
 
 DISTNAME=	Catalyst-Authentication-Store-DBIx-Class-0.1503
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Catalyst/}
 
@@ -20,7 +21,7 @@ DEPENDS+=	p5-Try-Tiny-[0-9]*:../../devel/p5-Try-Tiny
 DEPENDS+=	p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
 
 PERL5_PACKLIST= 	auto/Catalyst/Authentication/Store/DBIx/Class/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-Catalyst-Authentication-Store-Htpasswd/Makefile b/www/p5-Catalyst-Authentication-Store-Htpasswd/Makefile
index 61a4d34b8a5..caffd920066 100644
--- a/www/p5-Catalyst-Authentication-Store-Htpasswd/Makefile
+++ b/www/p5-Catalyst-Authentication-Store-Htpasswd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2011/08/14 16:05:47 obache Exp $
+# $NetBSD: Makefile,v 1.4 2012/09/03 11:16:25 sno Exp $
 
 DISTNAME=	Catalyst-Authentication-Store-Htpasswd-1.003
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Catalyst/}
 
@@ -23,7 +23,7 @@ REPLACE_PERL+=	lib/Catalyst/Authentication/Store/*.pm
 REPLACE_PERL+=	lib/Catalyst/Authentication/Store/Htpasswd/*.pm
 
 PERL5_PACKLIST= 	auto/Catalyst/Authentication/Store/Htpasswd/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile b/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
index 448a4016b3d..4d7523cfc2d 100644
--- a/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
+++ b/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2011/08/14 16:05:47 obache Exp $
+# $NetBSD: Makefile,v 1.8 2012/09/03 11:16:25 sno Exp $
 
 DISTNAME=	Catalyst-Component-ACCEPT_CONTEXT-0.07
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Catalyst/}
 
@@ -18,7 +18,7 @@ BUILD_DEPENDS+=	p5-Devel-Cycle-[0-9]*:../../devel/p5-Devel-Cycle
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST= auto/Catalyst/Component/ACCEPT_CONTEXT/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/www/p5-Catalyst-Controller-FormBuilder/Makefile b/www/p5-Catalyst-Controller-FormBuilder/Makefile
index c0a21b4c107..4167bc9faa5 100644
--- a/www/p5-Catalyst-Controller-FormBuilder/Makefile
+++ b/www/p5-Catalyst-Controller-FormBuilder/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2011/12/09 06:58:23 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.10 2012/09/03 11:16:25 sno Exp $
 
 DISTNAME=	Catalyst-Controller-FormBuilder-0.06
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Catalyst/}
 
@@ -24,7 +25,7 @@ DEPENDS+=	p5-Catalyst-View-TT>=0.23:../../www/p5-Catalyst-View-TT
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST= auto/Catalyst/Controller/FormBuilder/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile b/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile
index a788156e5d1..f62b3913d7c 100644
--- a/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2011/08/14 16:05:49 obache Exp $
+# $NetBSD: Makefile,v 1.15 2012/09/03 11:16:25 sno Exp $
 
 DISTNAME=	Catalyst-Plugin-Session-State-Cookie-0.17
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Catalyst/}
 
@@ -18,7 +18,7 @@ DEPENDS+=	p5-Moose-[0-9]*:../../devel/p5-Moose
 DEPENDS+=	p5-namespace-autoclean-[0-9]*:../../devel/p5-namespace-autoclean
 
 PERL5_PACKLIST= auto/Catalyst/Plugin/Session/State/Cookie/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
index 8045b37a73e..c7f9a8c5126 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2011/08/14 16:05:49 obache Exp $
+# $NetBSD: Makefile,v 1.10 2012/09/03 11:16:25 sno Exp $
 
 DISTNAME=	Catalyst-Plugin-Session-Store-Delegate-0.06
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Catalyst/}
 
@@ -21,7 +21,7 @@ BUILD_DEPENDS+=	p5-Test-use-ok>=0:../../devel/p5-Test-use-ok
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST= auto/Catalyst/Plugin/Session/Store/Delegate/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/www/p5-Catalyst-Plugin-Session-Store-File/Makefile b/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
index 9bd2e11691b..c217633bec3 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2011/08/14 16:05:50 obache Exp $
+# $NetBSD: Makefile,v 1.11 2012/09/03 11:16:25 sno Exp $
 
 DISTNAME=	Catalyst-Plugin-Session-Store-File-0.18
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Catalyst/}
 
@@ -18,7 +18,7 @@ DEPENDS+=	p5-Class-Data-Inheritable>=0.04:../../devel/p5-Class-Data-Inheritable
 DEPENDS+=	p5-MRO-Compat>=0.10:../../devel/p5-MRO-Compat
 
 PERL5_PACKLIST= 	auto/Catalyst/Plugin/Session/Store/File/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/www/p5-Catalyst-Plugin-Session/Makefile b/www/p5-Catalyst-Plugin-Session/Makefile
index 586a61c778b..5e5748c3d78 100644
--- a/www/p5-Catalyst-Plugin-Session/Makefile
+++ b/www/p5-Catalyst-Plugin-Session/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2012/01/31 14:22:59 rhaen Exp $
+# $NetBSD: Makefile,v 1.17 2012/09/03 11:16:25 sno Exp $
 
 DISTNAME=	Catalyst-Plugin-Session-0.32
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Catalyst/}
 
@@ -28,7 +29,7 @@ BUILD_DEPENDS+=	p5-Test-Exception>=0:../../devel/p5-Test-Exception
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Catalyst/Plugin/Session/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/www/p5-CatalystX-Component-Traits/Makefile b/www/p5-CatalystX-Component-Traits/Makefile
index 14f1d885b58..e4bfc929c2f 100644
--- a/www/p5-CatalystX-Component-Traits/Makefile
+++ b/www/p5-CatalystX-Component-Traits/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2011/08/14 16:05:51 obache Exp $
+# $NetBSD: Makefile,v 1.9 2012/09/03 11:16:26 sno Exp $
 
 DISTNAME=	CatalystX-Component-Traits-0.16
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel www
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=CatalystX/}
 
@@ -22,7 +22,7 @@ BUILD_DEPENDS+=	{perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/CatalystX/Component/Traits/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/www/p5-WWW-Amazon-Wishlist/Makefile b/www/p5-WWW-Amazon-Wishlist/Makefile
index 43343f315dd..aa617e3d2b1 100644
--- a/www/p5-WWW-Amazon-Wishlist/Makefile
+++ b/www/p5-WWW-Amazon-Wishlist/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2011/08/14 16:06:11 obache Exp $
+# $NetBSD: Makefile,v 1.22 2012/09/03 11:16:25 sno Exp $
 #
 
 DISTNAME=	WWW-Amazon-Wishlist-2.006
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 SVR4_PKGNAME=	p5waw
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=WWW/}
@@ -20,7 +20,7 @@ DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
 DEPENDS+=	p5-HTML-Tree>=0:../../www/p5-HTML-Tree
 
 PERL5_PACKLIST=		auto/WWW/Amazon/Wishlist/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-WWW-Curl/Makefile b/www/p5-WWW-Curl/Makefile
index 9d06000080b..656a8d7b6d6 100644
--- a/www/p5-WWW-Curl/Makefile
+++ b/www/p5-WWW-Curl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2011/08/14 16:06:11 obache Exp $
+# $NetBSD: Makefile,v 1.22 2012/09/03 11:16:25 sno Exp $
 #
 
 DISTNAME=	WWW-Curl-4.15
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=WWW/}
 
@@ -18,7 +18,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=	auto/WWW/Curl/.packlist
-PERL5_MODULE_TYPE=	Module::Install
+PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 .include "../../www/curl/buildlink3.mk"
 .include "../../lang/perl5/module.mk"