6 files changed, 57 insertions, 136 deletions

diff --git a/devel/p5-CPANPLUS/Makefile b/devel/p5-CPANPLUS/Makefile
index 82764e4a0eae..5fcc4fb5ca59 100644
--- a/devel/p5-CPANPLUS/Makefile
+++ b/devel/p5-CPANPLUS/Makefile
@@ -6,15 +6,29 @@
 #
 
 PORTNAME=	CPANPLUS
-PORTVERSION=	0.0562
+PORTVERSION=	0.0610
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/K/KA/KANE
 PKGNAMEPREFIX=	p5-
+DISTNAME=	${PORTNAME}-0.061
 
 MAINTAINER=	kappa@freebsd.org.ua
 COMMENT=	Ameliorated interface to the CPAN
 
+BUILD_DEPENDS=	${SITE_PERL}/IPC/Cmd.pm:${PORTSDIR}/devel/p5-IPC-Cmd \
+		${SITE_PERL}/Object/Accessor.pm:${PORTSDIR}/devel/p5-Object-Accessor \
+		${SITE_PERL}/Module/CoreList.pm:${PORTSDIR}/devel/p5-Module-CoreList \
+		${SITE_PERL}/Archive/Extract.pm:${PORTSDIR}/archivers/p5-Archive-Extract \
+		${SITE_PERL}/File/Fetch.pm:${PORTSDIR}/ftp/p5-File-Fetch \
+		${SITE_PERL}/Log/Message.pm:${PORTSDIR}/devel/p5-Log-Message \
+		${SITE_PERL}/Module/Loaded.pm:${PORTSDIR}/devel/p5-Module-Loaded \
+		${SITE_PERL}/Term/UI.pm:${PORTSDIR}/devel/p5-Term-UI \
+		${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
+		${SITE_PERL}/IO/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Zlib \
+		${SITE_PERL}/Module/Pluggable.pm:${PORTSDIR}/devel/p5-Module-Pluggable
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	AUTOINSTALL=1
 INSTALL_TARGET=	pure_install
@@ -24,8 +38,8 @@ OPTIONS=	TEST_REPORTER "Send reports to cpan-testers" off \
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500600
-IGNORE=		This port requires perl 5.6.0 or later. Install lang/perl5 then try again
+.if ${PERL_LEVEL} < 500601
+IGNORE=		requires perl 5.6.1 or later. Install lang/perl5 then try again
 .endif
 
 .if defined(WITH_TEST_REPORTER)
@@ -38,72 +52,36 @@ BUILD_DEPENDS+=	${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML
 RUN_DEPENDS+=	${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML
 .endif
 
-MAN1=		cpanp.1 cpan2dist.1
-MAN3=		CPANPLUS.3 \
-		CPANPLUS::Backend.3 \
-		CPANPLUS::Backend::RV.3 \
-		CPANPLUS::Config.3 \
-		CPANPLUS::Configure.3 \
-		CPANPLUS::Dist.3 \
-		CPANPLUS::Dist::MM.3 \
-		CPANPLUS::Dist::Sample.3 \
-		CPANPLUS::Error.3 \
-		CPANPLUS::FAQ.3 \
-		CPANPLUS::Hacking.3 \
-		CPANPLUS::Internals.3 \
-		CPANPLUS::Internals::Extract.3 \
-		CPANPLUS::Internals::Fetch.3 \
-		CPANPLUS::Internals::Search.3 \
-		CPANPLUS::Internals::Source.3 \
-		CPANPLUS::Internals::Utils.3 \
-		CPANPLUS::Module.3 \
-		CPANPLUS::Module::Author.3 \
-		CPANPLUS::Module::Author::Fake.3 \
-		CPANPLUS::Module::Checksums.3 \
-		CPANPLUS::Module::Fake.3 \
-		CPANPLUS::Shell.3 \
-		CPANPLUS::Shell::Classic.3 \
-		CPANPLUS::Shell::Default.3 \
-		CPANPLUS::inc.3 \
-		CPANPLUS::inc::Archive::Extract.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 \
-		CPANPLUS::inc::File::Spec::Epoc.3 \
-		CPANPLUS::inc::File::Spec::Functions.3 \
-		CPANPLUS::inc::File::Spec::Mac.3 \
-		CPANPLUS::inc::File::Spec::OS2.3 \
-		CPANPLUS::inc::File::Spec::Unix.3 \
-		CPANPLUS::inc::File::Spec::VMS.3 \
-		CPANPLUS::inc::File::Spec::Win32.3 \
-		CPANPLUS::inc::IO::String.3 \
-		CPANPLUS::inc::IO::Zlib.3 \
-		CPANPLUS::inc::IPC::Cmd.3 \
-		CPANPLUS::inc::IPC::Run.3 \
-		CPANPLUS::inc::IPC::Run::Debug.3 \
-		CPANPLUS::inc::IPC::Run::IO.3 \
-		CPANPLUS::inc::IPC::Run::Timer.3 \
-		CPANPLUS::inc::IPC::Run::Win32Helper.3 \
-		CPANPLUS::inc::IPC::Run::Win32IO.3 \
-		CPANPLUS::inc::IPC::Run::Win32Pump.3 \
-		CPANPLUS::inc::Locale::Maketext::Simple.3 \
-		CPANPLUS::inc::Log::Message.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 \
-		CPANPLUS::inc::Module::Pluggable.3 \
-		CPANPLUS::inc::Object::Accessor.3 \
-		CPANPLUS::inc::Params::Check.3 \
-		CPANPLUS::inc::Term::UI.3 \
-		CPANPLUS::inc::Term::UI::History.3
+MAN1=	cpanp.1 cpan2dist.1
+MAN3=	CPANPLUS.3 \
+	CPANPLUS::Backend.3 \
+	CPANPLUS::Backend::RV.3 \
+	CPANPLUS::Config.3 \
+	CPANPLUS::Configure.3 \
+	CPANPLUS::Dist.3 \
+	CPANPLUS::Dist::MM.3 \
+	CPANPLUS::Dist::Sample.3 \
+	CPANPLUS::Error.3 \
+	CPANPLUS::FAQ.3 \
+	CPANPLUS::Hacking.3 \
+	CPANPLUS::Internals.3 \
+	CPANPLUS::Internals::Extract.3 \
+	CPANPLUS::Internals::Fetch.3 \
+	CPANPLUS::Internals::Search.3 \
+	CPANPLUS::Internals::Source.3 \
+	CPANPLUS::Internals::Utils.3 \
+	CPANPLUS::Module.3 \
+	CPANPLUS::Module::Author.3 \
+	CPANPLUS::Module::Author::Fake.3 \
+	CPANPLUS::Module::Checksums.3 \
+	CPANPLUS::Module::Fake.3 \
+	CPANPLUS::Shell.3 \
+	CPANPLUS::Shell::Classic.3 \
+	CPANPLUS::Shell::Default.3 \
+	CPANPLUS::Shell::Default::Plugins::HOWTO.3 \
+	CPANPLUS::Shell::Default::Plugins::Remote.3 \
+	CPANPLUS::Shell::Default::Plugins::Source.3 \
+	CPANPLUS::inc.3
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*\.orig" -delete
diff --git a/devel/p5-CPANPLUS/distinfo b/devel/p5-CPANPLUS/distinfo
index 672ca816fb17..db9f8db423bb 100644
--- a/devel/p5-CPANPLUS/distinfo
+++ b/devel/p5-CPANPLUS/distinfo
@@ -1,3 +1,3 @@
-MD5 (CPANPLUS-0.0562.tar.gz) = 79502929f29759fbd4bfea8b07fef2d9
-SHA256 (CPANPLUS-0.0562.tar.gz) = 83832a549b87c0dab20a69264c313b3a64c2af55984d518b8197c5897b60986a
-SIZE (CPANPLUS-0.0562.tar.gz) = 444385
+MD5 (CPANPLUS-0.061.tar.gz) = c9e9831d24d69b1f690d8b4967436899
+SHA256 (CPANPLUS-0.061.tar.gz) = 697adc0d289db69567ea057e4cfab88350052c4077e16178f595c4cc89c9890e
+SIZE (CPANPLUS-0.061.tar.gz) = 450075
diff --git a/devel/p5-CPANPLUS/files/patch-lib::CPANPLUS::Config.pm-orig b/devel/p5-CPANPLUS/files/patch-lib-CPANPLUS-Config.pm-orig
index 1cf595371211..1cf595371211 100644
--- a/devel/p5-CPANPLUS/files/patch-lib::CPANPLUS::Config.pm-orig
+++ b/devel/p5-CPANPLUS/files/patch-lib-CPANPLUS-Config.pm-orig
diff --git a/devel/p5-CPANPLUS/files/patch-lib::CPANPLUS::Configure::Setup.pm b/devel/p5-CPANPLUS/files/patch-lib-CPANPLUS-Configure-Setup.pm
index f8f0ef091291..f8f0ef091291 100644
--- a/devel/p5-CPANPLUS/files/patch-lib::CPANPLUS::Configure::Setup.pm
+++ b/devel/p5-CPANPLUS/files/patch-lib-CPANPLUS-Configure-Setup.pm
diff --git a/devel/p5-CPANPLUS/pkg-descr b/devel/p5-CPANPLUS/pkg-descr
index 4e161f869472..113a4f4282a4 100644
--- a/devel/p5-CPANPLUS/pkg-descr
+++ b/devel/p5-CPANPLUS/pkg-descr
@@ -3,3 +3,4 @@ collection of interactive shells, commandline programs, daemons, etc,
 that use this API.
 
 WWW: http://cpanplus.sourceforge.net/
+Author: Jos Boumans <kane@cpan.org>
diff --git a/devel/p5-CPANPLUS/pkg-plist b/devel/p5-CPANPLUS/pkg-plist
index 01358e44f2ea..b0b35b5113b9 100644
--- a/devel/p5-CPANPLUS/pkg-plist
+++ b/devel/p5-CPANPLUS/pkg-plist
@@ -1,5 +1,6 @@
 bin/cpan2dist
 bin/cpanp
+bin/cpanp-boxed
 %%SITE_PERL%%/CPANPLUS.pm
 %%SITE_PERL%%/CPANPLUS/Backend.pm
 %%SITE_PERL%%/CPANPLUS/Backend/RV.pm
@@ -32,75 +33,16 @@ bin/cpanp
 %%SITE_PERL%%/CPANPLUS/Shell.pm
 %%SITE_PERL%%/CPANPLUS/Shell/Classic.pm
 %%SITE_PERL%%/CPANPLUS/Shell/Default.pm
+%%SITE_PERL%%/CPANPLUS/Shell/Default/Plugins/HOWTO.pod
+%%SITE_PERL%%/CPANPLUS/Shell/Default/Plugins/Remote.pm
+%%SITE_PERL%%/CPANPLUS/Shell/Default/Plugins/Source.pm
 %%SITE_PERL%%/CPANPLUS/inc.pm
 %%SITE_PERL%%/CPANPLUS/inc/.inc
-%%SITE_PERL%%/CPANPLUS/inc/Archive/Extract.pm
-%%SITE_PERL%%/CPANPLUS/inc/Archive/Tar.pm
-%%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
-%%SITE_PERL%%/CPANPLUS/inc/File/Spec/Cygwin.pm
-%%SITE_PERL%%/CPANPLUS/inc/File/Spec/Epoc.pm
-%%SITE_PERL%%/CPANPLUS/inc/File/Spec/Functions.pm
-%%SITE_PERL%%/CPANPLUS/inc/File/Spec/Mac.pm
-%%SITE_PERL%%/CPANPLUS/inc/File/Spec/OS2.pm
-%%SITE_PERL%%/CPANPLUS/inc/File/Spec/Unix.pm
-%%SITE_PERL%%/CPANPLUS/inc/File/Spec/VMS.pm
-%%SITE_PERL%%/CPANPLUS/inc/File/Spec/Win32.pm
-%%SITE_PERL%%/CPANPLUS/inc/IO/String.pm
-%%SITE_PERL%%/CPANPLUS/inc/IO/Zlib.pm
-%%SITE_PERL%%/CPANPLUS/inc/IPC/Cmd.pm
-%%SITE_PERL%%/CPANPLUS/inc/IPC/Run.pm
-%%SITE_PERL%%/CPANPLUS/inc/IPC/Run/Debug.pm
-%%SITE_PERL%%/CPANPLUS/inc/IPC/Run/IO.pm
-%%SITE_PERL%%/CPANPLUS/inc/IPC/Run/Timer.pm
-%%SITE_PERL%%/CPANPLUS/inc/IPC/Run/Win32Helper.pm
-%%SITE_PERL%%/CPANPLUS/inc/IPC/Run/Win32IO.pm
-%%SITE_PERL%%/CPANPLUS/inc/IPC/Run/Win32Pump.pm
-%%SITE_PERL%%/CPANPLUS/inc/Locale/Maketext/Simple.pm
-%%SITE_PERL%%/CPANPLUS/inc/Log/Message.pm
-%%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
-%%SITE_PERL%%/CPANPLUS/inc/Module/Pluggable.pm
-%%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%%/%%PERL_ARCH%%/auto/CPANPLUS/.packlist
 @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
-@dirrm %%SITE_PERL%%/CPANPLUS/inc/Module/Load
-@dirrm %%SITE_PERL%%/CPANPLUS/inc/Module
-@dirrm %%SITE_PERL%%/CPANPLUS/inc/Log/Message
-@dirrm %%SITE_PERL%%/CPANPLUS/inc/Log
-@dirrm %%SITE_PERL%%/CPANPLUS/inc/Locale/Maketext
-@dirrm %%SITE_PERL%%/CPANPLUS/inc/Locale
-@dirrm %%SITE_PERL%%/CPANPLUS/inc/IPC/Run
-@dirrm %%SITE_PERL%%/CPANPLUS/inc/IPC
-@dirrm %%SITE_PERL%%/CPANPLUS/inc/IO
-@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/Default/Plugins
+@dirrm %%SITE_PERL%%/CPANPLUS/Shell/Default
 @dirrm %%SITE_PERL%%/CPANPLUS/Shell
 @dirrm %%SITE_PERL%%/CPANPLUS/Module/Author
 @dirrm %%SITE_PERL%%/CPANPLUS/Module