3 files changed, 19 insertions, 52 deletions

diff --git a/devel/p5-CPANPLUS/Makefile b/devel/p5-CPANPLUS/Makefile
index 381c0e1c8187..850fb7bc8b09 100644
--- a/devel/p5-CPANPLUS/Makefile
+++ b/devel/p5-CPANPLUS/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	CPANPLUS
-PORTVERSION=	0.053
+PORTVERSION=	0.0562
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/K/KA/KANE
@@ -20,7 +20,7 @@ CONFIGURE_ARGS=	AUTOINSTALL=1
 INSTALL_TARGET=	pure_install
 USE_REINPLACE=	yes
 
-OPTIONS=	TEST_REPORTER "Send report to cpan-testers" off \
+OPTIONS=	TEST_REPORTER "Send reports to cpan-testers" off \
 		YAML "Check reports from cpan-testers" off
 
 .include <bsd.port.pre.mk>
@@ -46,7 +46,6 @@ MAN3=		CPANPLUS.3 \
 		CPANPLUS::Config.3 \
 		CPANPLUS::Configure.3 \
 		CPANPLUS::Dist.3 \
-		CPANPLUS::Dist::Build.3 \
 		CPANPLUS::Dist::MM.3 \
 		CPANPLUS::Dist::Sample.3 \
 		CPANPLUS::Error.3 \
@@ -71,6 +70,7 @@ MAN3=		CPANPLUS.3 \
 		CPANPLUS::inc::Archive::Tar.3 \
 		CPANPLUS::inc::Archive::Tar::File.3 \
 		CPANPLUS::inc::Config::Auto.3 \
+		CPANPLUS::inc::DBIx::Simple::OO.3 \
 		CPANPLUS::inc::File::Fetch.3 \
 		CPANPLUS::inc::File::Spec.3 \
 		CPANPLUS::inc::File::Spec::Cygwin.3 \
@@ -96,6 +96,7 @@ MAN3=		CPANPLUS.3 \
 		CPANPLUS::inc::Log::Message::Config.3 \
 		CPANPLUS::inc::Log::Message::Handlers.3 \
 		CPANPLUS::inc::Log::Message::Item.3 \
+		CPANPLUS::inc::Log::Message::Simple.3 \
 		CPANPLUS::inc::Module::CoreList.3 \
 		CPANPLUS::inc::Module::Load.3 \
 		CPANPLUS::inc::Module::Load::Conditional.3 \
@@ -103,25 +104,7 @@ MAN3=		CPANPLUS.3 \
 		CPANPLUS::inc::Object::Accessor.3 \
 		CPANPLUS::inc::Params::Check.3 \
 		CPANPLUS::inc::Term::UI.3 \
-		CPANPLUS::inc::installers::Module::Build.3 \
-		CPANPLUS::inc::installers::Module::Build::Base.3 \
-		CPANPLUS::inc::installers::Module::Build::Compat.3 \
-		CPANPLUS::inc::installers::Module::Build::Cookbook.3 \
-		CPANPLUS::inc::installers::Module::Build::PPMMaker.3 \
-		CPANPLUS::inc::installers::Module::Build::Platform::Amiga.3 \
-		CPANPLUS::inc::installers::Module::Build::Platform::Default.3 \
-		CPANPLUS::inc::installers::Module::Build::Platform::EBCDIC.3 \
-		CPANPLUS::inc::installers::Module::Build::Platform::MPEiX.3 \
-		CPANPLUS::inc::installers::Module::Build::Platform::MacOS.3 \
-		CPANPLUS::inc::installers::Module::Build::Platform::RiscOS.3 \
-		CPANPLUS::inc::installers::Module::Build::Platform::Unix.3 \
-		CPANPLUS::inc::installers::Module::Build::Platform::VMS.3 \
-		CPANPLUS::inc::installers::Module::Build::Platform::VOS.3 \
-		CPANPLUS::inc::installers::Module::Build::Platform::Windows.3 \
-		CPANPLUS::inc::installers::Module::Build::Platform::aix.3 \
-		CPANPLUS::inc::installers::Module::Build::Platform::cygwin.3 \
-		CPANPLUS::inc::installers::Module::Build::Platform::darwin.3 \
-		CPANPLUS::inc::installers::Module::Build::Platform::os2.3
+		CPANPLUS::inc::Term::UI::History.3
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*\.orig" -delete
diff --git a/devel/p5-CPANPLUS/distinfo b/devel/p5-CPANPLUS/distinfo
index d9825d06dfba..97188d994dd0 100644
--- a/devel/p5-CPANPLUS/distinfo
+++ b/devel/p5-CPANPLUS/distinfo
@@ -1,2 +1,2 @@
-MD5 (CPANPLUS-0.053.tar.gz) = a56a8085b5ba2692f91492e8664cb088
-SIZE (CPANPLUS-0.053.tar.gz) = 472631
+MD5 (CPANPLUS-0.0562.tar.gz) = 79502929f29759fbd4bfea8b07fef2d9
+SIZE (CPANPLUS-0.0562.tar.gz) = 444385
diff --git a/devel/p5-CPANPLUS/pkg-plist b/devel/p5-CPANPLUS/pkg-plist
index 9287a3fae55b..01358e44f2ea 100644
--- a/devel/p5-CPANPLUS/pkg-plist
+++ b/devel/p5-CPANPLUS/pkg-plist
@@ -8,7 +8,6 @@ bin/cpanp
 %%SITE_PERL%%/CPANPLUS/Configure.pm
 %%SITE_PERL%%/CPANPLUS/Configure/Setup.pm
 %%SITE_PERL%%/CPANPLUS/Dist.pm
-%%SITE_PERL%%/CPANPLUS/Dist/Build.pm
 %%SITE_PERL%%/CPANPLUS/Dist/MM.pm
 %%SITE_PERL%%/CPANPLUS/Dist/Sample.pm
 %%SITE_PERL%%/CPANPLUS/Error.pm
@@ -23,6 +22,7 @@ bin/cpanp
 %%SITE_PERL%%/CPANPLUS/Internals/Search.pm
 %%SITE_PERL%%/CPANPLUS/Internals/Source.pm
 %%SITE_PERL%%/CPANPLUS/Internals/Utils.pm
+%%SITE_PERL%%/CPANPLUS/Internals/Utils/Autoflush.pm
 %%SITE_PERL%%/CPANPLUS/Module.pm
 %%SITE_PERL%%/CPANPLUS/Module/Author.pm
 %%SITE_PERL%%/CPANPLUS/Module/Author/Fake.pm
@@ -39,6 +39,7 @@ bin/cpanp
 %%SITE_PERL%%/CPANPLUS/inc/Archive/Tar/Constant.pm
 %%SITE_PERL%%/CPANPLUS/inc/Archive/Tar/File.pm
 %%SITE_PERL%%/CPANPLUS/inc/Config/Auto.pm
+%%SITE_PERL%%/CPANPLUS/inc/DBIx/Simple/OO.pm
 %%SITE_PERL%%/CPANPLUS/inc/File/Fetch.pm
 %%SITE_PERL%%/CPANPLUS/inc/File/Fetch/Item.pm
 %%SITE_PERL%%/CPANPLUS/inc/File/Spec.pm
@@ -65,6 +66,7 @@ bin/cpanp
 %%SITE_PERL%%/CPANPLUS/inc/Log/Message/Config.pm
 %%SITE_PERL%%/CPANPLUS/inc/Log/Message/Handlers.pm
 %%SITE_PERL%%/CPANPLUS/inc/Log/Message/Item.pm
+%%SITE_PERL%%/CPANPLUS/inc/Log/Message/Simple.pm
 %%SITE_PERL%%/CPANPLUS/inc/Module/CoreList.pm
 %%SITE_PERL%%/CPANPLUS/inc/Module/Load.pm
 %%SITE_PERL%%/CPANPLUS/inc/Module/Load/Conditional.pm
@@ -72,32 +74,12 @@ bin/cpanp
 %%SITE_PERL%%/CPANPLUS/inc/Object/Accessor.pm
 %%SITE_PERL%%/CPANPLUS/inc/Params/Check.pm
 %%SITE_PERL%%/CPANPLUS/inc/Term/UI.pm
+%%SITE_PERL%%/CPANPLUS/inc/Term/UI/History.pm
 %%SITE_PERL%%/CPANPLUS/inc/installers/.installers
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/Base.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/Compat.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/Cookbook.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/PPMMaker.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/Platform/Amiga.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/Platform/Default.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/Platform/EBCDIC.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/Platform/MPEiX.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/Platform/MacOS.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/Platform/RiscOS.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/Platform/Unix.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/Platform/VMS.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/Platform/VOS.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/Platform/Windows.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/Platform/aix.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/Platform/cygwin.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/Platform/darwin.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/Platform/os2.pm
-%%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/PodParser.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CPANPLUS/.packlist
-@dirrm %%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build/Platform
-@dirrm %%SITE_PERL%%/CPANPLUS/inc/installers/Module/Build
-@dirrm %%SITE_PERL%%/CPANPLUS/inc/installers/Module
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CPANPLUS
 @dirrm %%SITE_PERL%%/CPANPLUS/inc/installers
+@dirrm %%SITE_PERL%%/CPANPLUS/inc/Term/UI
 @dirrm %%SITE_PERL%%/CPANPLUS/inc/Term
 @dirrm %%SITE_PERL%%/CPANPLUS/inc/Params
 @dirrm %%SITE_PERL%%/CPANPLUS/inc/Object
@@ -113,17 +95,19 @@ bin/cpanp
 @dirrm %%SITE_PERL%%/CPANPLUS/inc/File/Spec
 @dirrm %%SITE_PERL%%/CPANPLUS/inc/File/Fetch
 @dirrm %%SITE_PERL%%/CPANPLUS/inc/File
+@dirrm %%SITE_PERL%%/CPANPLUS/inc/DBIx/Simple
+@dirrm %%SITE_PERL%%/CPANPLUS/inc/DBIx
 @dirrm %%SITE_PERL%%/CPANPLUS/inc/Config
 @dirrm %%SITE_PERL%%/CPANPLUS/inc/Archive/Tar
 @dirrm %%SITE_PERL%%/CPANPLUS/inc/Archive
 @dirrm %%SITE_PERL%%/CPANPLUS/inc
+@dirrm %%SITE_PERL%%/CPANPLUS/Shell
 @dirrm %%SITE_PERL%%/CPANPLUS/Module/Author
 @dirrm %%SITE_PERL%%/CPANPLUS/Module
+@dirrm %%SITE_PERL%%/CPANPLUS/Internals/Utils
 @dirrm %%SITE_PERL%%/CPANPLUS/Internals/Constants
 @dirrm %%SITE_PERL%%/CPANPLUS/Internals
+@dirrm %%SITE_PERL%%/CPANPLUS/Dist
 @dirrm %%SITE_PERL%%/CPANPLUS/Configure
 @dirrm %%SITE_PERL%%/CPANPLUS/Backend
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CPANPLUS
-@unexec rmdir %D/%%SITE_PERL%%/CPANPLUS/Dist 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/CPANPLUS/Shell 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/CPANPLUS 2>/dev/null || true
+@dirrm %%SITE_PERL%%/CPANPLUS