3 files changed, 81 insertions, 74 deletions

diff --git a/devel/p5-Moose/Makefile b/devel/p5-Moose/Makefile
index ea1666aae602..2f3d2143b099 100644
--- a/devel/p5-Moose/Makefile
+++ b/devel/p5-Moose/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Moose
-PORTVERSION=	2.0403
+PORTVERSION=	2.0600
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DOY
@@ -47,6 +47,7 @@ TEST_DEPENDS=	\
 	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
 	p5-Test-Fatal>=0.001:${PORTSDIR}/devel/p5-Test-Fatal \
 	p5-Test-LeakTrace>=0:${PORTSDIR}/devel/p5-Test-LeakTrace \
+	p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
 	p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
 	p5-Test-Requires>=0.05:${PORTSDIR}/devel/p5-Test-Requires
 
@@ -69,6 +70,7 @@ MAN3=	Class::MOP.3 \
 	Class::MOP::Method::Generated.3 \
 	Class::MOP::Method::Inlined.3 \
 	Class::MOP::Method::Meta.3 \
+	Class::MOP::Method::Overload.3 \
 	Class::MOP::Method::Wrapped.3 \
 	Class::MOP::MiniTrait.3 \
 	Class::MOP::Mixin.3 \
@@ -80,31 +82,31 @@ MAN3=	Class::MOP.3 \
 	Class::MOP::Package.3 \
 	Moose.3 \
 	Moose::Cookbook.3 \
-	Moose::Cookbook::Basics::Recipe1.3 \
-	Moose::Cookbook::Basics::Recipe10.3 \
-	Moose::Cookbook::Basics::Recipe11.3 \
-	Moose::Cookbook::Basics::Recipe2.3 \
-	Moose::Cookbook::Basics::Recipe3.3 \
-	Moose::Cookbook::Basics::Recipe4.3 \
-	Moose::Cookbook::Basics::Recipe5.3 \
-	Moose::Cookbook::Basics::Recipe6.3 \
-	Moose::Cookbook::Basics::Recipe7.3 \
-	Moose::Cookbook::Basics::Recipe8.3 \
-	Moose::Cookbook::Basics::Recipe9.3 \
-	Moose::Cookbook::Extending::Recipe1.3 \
-	Moose::Cookbook::Extending::Recipe2.3 \
-	Moose::Cookbook::Extending::Recipe3.3 \
-	Moose::Cookbook::Extending::Recipe4.3 \
-	Moose::Cookbook::Meta::Recipe1.3 \
-	Moose::Cookbook::Meta::Recipe2.3 \
-	Moose::Cookbook::Meta::Recipe3.3 \
-	Moose::Cookbook::Meta::Recipe4.3 \
-	Moose::Cookbook::Meta::Recipe5.3 \
-	Moose::Cookbook::Meta::Recipe6.3 \
-	Moose::Cookbook::Meta::Recipe7.3 \
-	Moose::Cookbook::Roles::Recipe1.3 \
-	Moose::Cookbook::Roles::Recipe2.3 \
-	Moose::Cookbook::Roles::Recipe3.3 \
+	Moose::Cookbook::Basics::BankAccount_MethodModifiersAndSubclassing.3 \
+	Moose::Cookbook::Basics::BinaryTree_AttributeFeatures.3 \
+	Moose::Cookbook::Basics::BinaryTree_BuilderAndLazyBuild.3 \
+	Moose::Cookbook::Basics::Company_Subtypes.3 \
+	Moose::Cookbook::Basics::DateTime_ExtendingNonMooseParent.3 \
+	Moose::Cookbook::Basics::Document_AugmentAndInner.3 \
+	Moose::Cookbook::Basics::Genome_OverloadingSubtypesAndCoercion.3 \
+	Moose::Cookbook::Basics::HTTP_SubtypesAndCoercion.3 \
+	Moose::Cookbook::Basics::Immutable.3 \
+	Moose::Cookbook::Basics::Person_BUILDARGSAndBUILD.3 \
+	Moose::Cookbook::Basics::Point_AttributesAndSubclassing.3 \
+	Moose::Cookbook::Extending::Debugging_BaseClassRole.3 \
+	Moose::Cookbook::Extending::ExtensionOverview.3 \
+	Moose::Cookbook::Extending::Mooseish_MooseSugar.3 \
+	Moose::Cookbook::Legacy::Debugging_BaseClassReplacement.3 \
+	Moose::Cookbook::Legacy::Labeled_AttributeMetaclass.3 \
+	Moose::Cookbook::Legacy::Table_ClassMetaclass.3 \
+	Moose::Cookbook::Meta::GlobRef_InstanceMetaclass.3 \
+	Moose::Cookbook::Meta::Labeled_AttributeTrait.3 \
+	Moose::Cookbook::Meta::PrivateOrPublic_MethodMetaclass.3 \
+	Moose::Cookbook::Meta::Table_MetaclassTrait.3 \
+	Moose::Cookbook::Meta::WhyMeta.3 \
+	Moose::Cookbook::Roles::ApplicationToInstance.3 \
+	Moose::Cookbook::Roles::Comparable_CodeReuse.3 \
+	Moose::Cookbook::Roles::Restartable_AdvancedComposition.3 \
 	Moose::Cookbook::Snack::Keywords.3 \
 	Moose::Cookbook::Snack::Types.3 \
 	Moose::Cookbook::Style.3 \
@@ -199,6 +201,9 @@ post-install:
 
 .if ${PERL_LEVEL} < 501001
 TEST_DEPENDS+=	p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
+.else
+# p5-Test-DependentModules is only available on 5.10.1+ (currently)
+TEST_DEPENDS+=	p5-Test-DependentModules>=0.13:${PORTSDIR}/devel/p5-Test-DependentModules
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Moose/distinfo b/devel/p5-Moose/distinfo
index 0776a4b4cdf4..b2ae2bcc9ade 100644
--- a/devel/p5-Moose/distinfo
+++ b/devel/p5-Moose/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Moose-2.0403.tar.gz) = b9aed181ff86d27251823572ed3cba9ee1e97af4b048ce8076d27a8cf0defd15
-SIZE (Moose-2.0403.tar.gz) = 676895
+SHA256 (Moose-2.0600.tar.gz) = e29fca8a2bea2e3e377368373cc84f0cb272351175e40640a8b85d10cb191575
+SIZE (Moose-2.0600.tar.gz) = 1302978
diff --git a/devel/p5-Moose/pkg-plist b/devel/p5-Moose/pkg-plist
index 98f37dd3f816..93e6f3bd2756 100644
--- a/devel/p5-Moose/pkg-plist
+++ b/devel/p5-Moose/pkg-plist
@@ -1,54 +1,54 @@
 bin/moose-outdated
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Attribute.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Class.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Class/Immutable/Trait.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Generated.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Deprecated.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Instance.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Accessor.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Constructor.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Generated.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Inlined.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Meta.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Overload.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Wrapped.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Inlined.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Constructor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Mixin/HasAttributes.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Mixin/AttributeCore.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Mixin/HasMethods.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/MiniTrait.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Package.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Mixin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Mixin/AttributeCore.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Mixin/HasAttributes.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Mixin/HasMethods.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Module.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Attribute.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Deprecated.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Object.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Instance.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Class.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Conflicts.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/metaclass.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Package.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Moose.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Conflicts.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Recipe1.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Recipe10.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Recipe11.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Recipe2.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Recipe3.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Recipe4.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Recipe5.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Recipe6.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Recipe7.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Recipe8.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Recipe9.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Extending/Recipe1.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Extending/Recipe2.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Extending/Recipe3.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Extending/Recipe4.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Meta/Recipe1.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Meta/Recipe2.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Meta/Recipe3.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Meta/Recipe4.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Meta/Recipe5.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Meta/Recipe6.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Meta/Recipe7.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Roles/Recipe1.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Roles/Recipe2.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Roles/Recipe3.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/BankAccount_MethodModifiersAndSubclassing.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/BinaryTree_AttributeFeatures.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/BinaryTree_BuilderAndLazyBuild.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Company_Subtypes.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/DateTime_ExtendingNonMooseParent.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Document_AugmentAndInner.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Genome_OverloadingSubtypesAndCoercion.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/HTTP_SubtypesAndCoercion.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Immutable.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Person_BUILDARGSAndBUILD.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Point_AttributesAndSubclassing.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Extending/Debugging_BaseClassRole.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Extending/ExtensionOverview.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Extending/Mooseish_MooseSugar.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Legacy/Debugging_BaseClassReplacement.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Legacy/Labeled_AttributeMetaclass.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Legacy/Table_ClassMetaclass.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Meta/GlobRef_InstanceMetaclass.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Meta/Labeled_AttributeTrait.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Meta/PrivateOrPublic_MethodMetaclass.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Meta/Table_MetaclassTrait.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Meta/WhyMeta.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Roles/ApplicationToInstance.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Roles/Comparable_CodeReuse.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Roles/Restartable_AdvancedComposition.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Snack/Keywords.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Snack/Types.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Style.pod
@@ -209,13 +209,8 @@ bin/moose-outdated
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Moose/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Moose/Moose.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Moose/Moose.so
+%%SITE_PERL%%/%%PERL_ARCH%%/metaclass.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/oose.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Mixin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Class/Immutable
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Class
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Moose
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Test
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Moose/Util/TypeConstraints
@@ -249,7 +244,14 @@ bin/moose-outdated
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Snack
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Roles
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Meta
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Legacy
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Extending
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Moose
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Mixin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Class/Immutable
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class