Update devel/p5-Moose to version 2.0007

Changelog: http://cpansearch.perl.org/dist/Moose/Changes

See also UPDATING entry 20110607 about this.

20 files changed, 142 insertions, 57 deletions

diff --git a/UPDATING b/UPDATING
index 70692b0a03bb..2b4de1b5647c 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,24 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20110607:
+  AFFECTS: users of devel/p5-Moose and devel/p5-Class-MOP
+  AUTHOR: az@FreeBSD.org
+
+  p5-Moose have been updated to 2.0007. Now p5-Class-MOP is a part of the
+  p5-Moose distribution. Manual intervention into update procedure is requied:
+
+    # portmaster -o devel/p5-Moose devel/p5-Class-MOP
+    # portmaster -R -r p5-Moose-\*
+  or do the same things with portupgrade.
+
+  To check everything went fine you can run:
+    # perl -Moose\ 999
+  and
+    # perl -MClass::MOP\ 999
+  in both cases you should see output:
+  version 999 required--this is only version 2.0007
+
 20110606:
   AFFECTS: users of databases/mariadb
   AUTHOR: dougb@FreeBSD.org
diff --git a/devel/p5-Bread-Board/Makefile b/devel/p5-Bread-Board/Makefile
index 080d65d8892d..7eea022f67e7 100644
--- a/devel/p5-Bread-Board/Makefile
+++ b/devel/p5-Bread-Board/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Bread-Board
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:STEVAN
@@ -15,8 +16,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	A solderless way to wire up your application components
 
-RUN_DEPENDS=	p5-Class-MOP>=0:${PORTSDIR}/devel/p5-Class-MOP \
-		p5-Moose>=1.00:${PORTSDIR}/devel/p5-Moose \
+RUN_DEPENDS=	p5-Moose>=1.00:${PORTSDIR}/devel/p5-Moose \
 		p5-MooseX-Clone>=0.05:${PORTSDIR}/devel/p5-MooseX-Clone \
 		p5-MooseX-Params-Validate>=0.14:${PORTSDIR}/devel/p5-MooseX-Params-Validate
 TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/Test-Exception
diff --git a/devel/p5-Class-MOP/Makefile b/devel/p5-Class-MOP/Makefile
index a14a1dd59330..ad0ac01d0694 100644
--- a/devel/p5-Class-MOP/Makefile
+++ b/devel/p5-Class-MOP/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A Meta Object Protocol for Perl 5
 
+IGNORE=		distribution has been merged with devel/p5-Moose
+
 BUILD_DEPENDS=	p5-Devel-GlobalDestruction>=0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
 		p5-MRO-Compat>=0.05:${PORTSDIR}/devel/p5-MRO-Compat \
 		p5-Sub-Name>=0.04:${PORTSDIR}/devel/p5-Sub-Name \
diff --git a/devel/p5-File-ChangeNotify/Makefile b/devel/p5-File-ChangeNotify/Makefile
index f008448ed3ab..895c73572f4a 100644
--- a/devel/p5-File-ChangeNotify/Makefile
+++ b/devel/p5-File-ChangeNotify/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	File-ChangeNotify
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Watch for changes to files
 
-RUN_DEPENDS=	p5-Class-MOP>=0:${PORTSDIR}/devel/p5-Class-MOP \
+RUN_DEPENDS=	p5-Moose>=1.00:${PORTSDIR}/devel/p5-Moose \
 		p5-IO-KQueue>=0:${PORTSDIR}/devel/p5-IO-KQueue \
 		p5-MooseX-Params-Validate>=0:${PORTSDIR}/devel/p5-MooseX-Params-Validate \
 		p5-MooseX-SemiAffordanceAccessor>=0:${PORTSDIR}/devel/p5-MooseX-SemiAffordanceAccessor \
diff --git a/devel/p5-Moose/Makefile b/devel/p5-Moose/Makefile
index 14d34809bd1e..315abfe80a05 100644
--- a/devel/p5-Moose/Makefile
+++ b/devel/p5-Moose/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	Moose
-PORTVERSION=	1.25
+PORTVERSION=	2.0007
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/D/DR/DROLSKY
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:FLORA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
@@ -18,7 +19,11 @@ LICENSE_COMB=	dual
 LICENSE=	ART20 GPLv1
 
 BUILD_DEPENDS=	\
-	p5-Class-MOP>=1.11:${PORTSDIR}/devel/p5-Class-MOP \
+	p5-Devel-GlobalDestruction>=0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
+	p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
+	p5-Package-Stash>=0:${PORTSDIR}/devel/p5-Package-Stash \
+	p5-Package-Stash-XS>=0:${PORTSDIR}/devel/p5-Package-Stash-XS \
+	p5-Eval-Closure>=0.04:${PORTSDIR}/devel/p5-Eval-Closure \
 	p5-Package-DeprecationManager>=0.10:${PORTSDIR}/devel/p5-Package-DeprecationManager \
 	p5-List-MoreUtils>=0.12:${PORTSDIR}/lang/p5-List-MoreUtils \
 	p5-Params-Util>=1.00:${PORTSDIR}/devel/p5-Params-Util \
@@ -27,14 +32,42 @@ BUILD_DEPENDS=	\
 	p5-Try-Tiny>=0.02:${PORTSDIR}/lang/p5-Try-Tiny \
 	p5-Data-OptList>=0:${PORTSDIR}/devel/p5-Data-OptList \
 	p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name
+
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple \
-		p5-Test-Fatal>=0.001:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0.05:${PORTSDIR}/devel/p5-Test-Requires
+
+TEST_DEPENDS=	\
+	p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple \
+	p5-Test-Fatal>=0.001:${PORTSDIR}/devel/p5-Test-Fatal \
+	p5-Test-Requires>=0.05:${PORTSDIR}/devel/p5-Test-Requires
 
 PERL_CONFIGURE=	5.8.4+
+CFLAGS+=	-I.	# mop.h
+
+CONFLICTS=     p5-Class-MOP*
 
-MAN3=	Moose.3 \
+MAN3=	Class::MOP::Mixin::HasAttributes.3 \
+	Class::MOP::MiniTrait.3 \
+	Class::MOP::Mixin::AttributeCore.3 \
+	Class::MOP::Method::Generated.3 \
+	Class::MOP::Mixin::HasMethods.3 \
+	Class::MOP::Package.3 \
+	Class::MOP.3 \
+	Class::MOP::Method::Accessor.3 \
+	Class::MOP::Method.3 \
+	Class::MOP::Mixin.3 \
+	Class::MOP::Module.3 \
+	Class::MOP::Method::Meta.3 \
+	Class::MOP::Attribute.3 \
+	Class::MOP::Method::Wrapped.3 \
+	Class::MOP::Deprecated.3 \
+	Class::MOP::Object.3 \
+	Class::MOP::Class::Immutable::Trait.3 \
+	Class::MOP::Method::Inlined.3 \
+	Class::MOP::Method::Constructor.3\
+	Class::MOP::Instance.3 \
+	Class::MOP::Class.3 \
+	metaclass.3 \
+	Moose.3 \
 	Moose::Cookbook.3 \
 	Moose::Cookbook::Basics::Recipe1.3 \
 	Moose::Cookbook::Basics::Recipe10.3 \
@@ -144,7 +177,7 @@ MAN3=	Moose.3 \
 	oose.3
 
 post-extract:
-	@${PERL} -i -ne 'print unless m,^(test_requires|check_conflicts),' ${WRKSRC}/Makefile.PL
+	@${PERL} -i -ne 'print unless m,^(check_conflicts),' ${WRKSRC}/Makefile.PL
 
 post-install:
 	@${CAT} ${PKGDIR}/pkg-message
diff --git a/devel/p5-Moose/distinfo b/devel/p5-Moose/distinfo
index b3cdd611f896..b720fe01f9c8 100644
--- a/devel/p5-Moose/distinfo
+++ b/devel/p5-Moose/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Moose-1.25.tar.gz) = f827070c0feae887d5c9b73f5b1c9121e7f407795a798421af1b6003e0d9d758
-SIZE (Moose-1.25.tar.gz) = 470300
+SHA256 (Moose-2.0007.tar.gz) = 352f3b81930f5843bea871adc39e200abfcda8131a64af9875a9135d0e369d83
+SIZE (Moose-2.0007.tar.gz) = 658467
diff --git a/devel/p5-Moose/pkg-message b/devel/p5-Moose/pkg-message
index bf9cf24dd537..61b0b7812ccf 100644
--- a/devel/p5-Moose/pkg-message
+++ b/devel/p5-Moose/pkg-message
@@ -1,31 +1,31 @@
 Note that this release of p5-Moose is incompatible with
 older versions of the following modules:
 
-	Catalyst			<= 5.80017
-	Devel::REPL			<= 1.003008
-	Fey::ORM			<= 0.23
-	File::ChangeNotify		<= 0.15
-	KiokuDB				<= 0.41
-	MooseX::Aliases			<= 0.07
-	MooseX::AttributeHelpers	<= 0.22
-	MooseX::AttributeInflate	<= 0.02
-	MooseX::Attribute::Prototype	<= 0.10
-	MooseX::ClassAttribute		<= 0.13
-	MooseX::FollowPBP		<= 0.02
-	MooseX::HasDefaults		<= 0.02
-	MooseX::InstanceTracking	<= 0.04
-	MooseX::LazyRequire		<= 0.05
-	MooseX::MethodAttributes	<= 0.22
-	MooseX::NonMoose		<= 0.13
-	MooseX::Params::Validate	<= 0.05
-	MooseX::Role::Cmd		<= 0.06
-	MooseX::Role::WithOverloading	<= 0.07
-	MooseX::SemiAffordanceAccessor	<= 0.05
-	MooseX::Singleton		<= 0.22
-	MooseX::StrictConstructor	<= 0.08
-	MooseX::Types			<= 0.19
-	MooseX::UndefTolerant		<= 0.04
-	namespace::autoclean		<= 0.08
-	Pod::Elemental			<= 0.093280
+       Catalyst                        <= 5.80017
+       Devel::REPL                     <= 1.003008
+       Fey::ORM                        <= 0.23
+       File::ChangeNotify              <= 0.15
+       KiokuDB                         <= 0.41
+       MooseX::Aliases                 <= 0.07
+       MooseX::AttributeHelpers        <= 0.22
+       MooseX::AttributeInflate        <= 0.02
+       MooseX::Attribute::Prototype    <= 0.10
+       MooseX::ClassAttribute          <= 0.13
+       MooseX::FollowPBP               <= 0.02
+       MooseX::HasDefaults             <= 0.02
+       MooseX::InstanceTracking        <= 0.04
+       MooseX::LazyRequire             <= 0.05
+       MooseX::MethodAttributes        <= 0.22
+       MooseX::NonMoose                <= 0.13
+       MooseX::Params::Validate        <= 0.05
+       MooseX::Role::Cmd               <= 0.06
+       MooseX::Role::WithOverloading   <= 0.07
+       MooseX::SemiAffordanceAccessor  <= 0.05
+       MooseX::Singleton               <= 0.22
+       MooseX::StrictConstructor       <= 0.08
+       MooseX::Types                   <= 0.19
+       MooseX::UndefTolerant           <= 0.04
+       namespace::autoclean            <= 0.08
+       Pod::Elemental                  <= 0.093280
 
 They will need to be updated.
diff --git a/devel/p5-Moose/pkg-plist b/devel/p5-Moose/pkg-plist
index 621348e078d2..61299f131555 100644
--- a/devel/p5-Moose/pkg-plist
+++ b/devel/p5-Moose/pkg-plist
@@ -1,3 +1,27 @@
+bin/moose-outdated
+%%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/Method/Accessor.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Meta.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/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%%/Moose.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Recipe1.pod
@@ -182,6 +206,12 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Moose/Moose.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Moose/Moose.so
 %%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
diff --git a/devel/p5-MooseX-InsideOut/Makefile b/devel/p5-MooseX-InsideOut/Makefile
index 91407e90c1e4..9a5c05886008 100644
--- a/devel/p5-MooseX-InsideOut/Makefile
+++ b/devel/p5-MooseX-InsideOut/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	MooseX-InsideOut
 PORTVERSION=	0.106
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -13,8 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Inside-out objects with Moose
 
-BUILD_DEPENDS=	p5-Class-MOP>=0.80:${PORTSDIR}/devel/p5-Class-MOP \
-		p5-Hash-Util-FieldHash-Compat>=0:${PORTSDIR}/devel/p5-Hash-Util-FieldHash-Compat \
+BUILD_DEPENDS=	p5-Hash-Util-FieldHash-Compat>=0:${PORTSDIR}/devel/p5-Hash-Util-FieldHash-Compat \
 		p5-Moose>=0.94:${PORTSDIR}/devel/p5-Moose \
 		p5-namespace-clean>=0.11:${PORTSDIR}/devel/p5-namespace-clean
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/devel/p5-MooseX-RelatedClassRoles/Makefile b/devel/p5-MooseX-RelatedClassRoles/Makefile
index e767c336ddfa..39d03f8ba393 100644
--- a/devel/p5-MooseX-RelatedClassRoles/Makefile
+++ b/devel/p5-MooseX-RelatedClassRoles/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	MooseX-RelatedClassRoles
 PORTVERSION=	0.004
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,7 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Apply roles to a class related to yours
 
-RUN_DEPENDS=	p5-Class-MOP>=0.80:${PORTSDIR}/devel/p5-Class-MOP \
+RUN_DEPENDS=	\
+	p5-Moose>=1.00:${PORTSDIR}/devel/p5-Moose \
 	p5-MooseX-Role-Parameterized>=0.04:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized
 
 PERL_CONFIGURE=	yes
diff --git a/devel/p5-MooseX-Traits-Pluggable/Makefile b/devel/p5-MooseX-Traits-Pluggable/Makefile
index 7765762c12c8..237569719cea 100644
--- a/devel/p5-MooseX-Traits-Pluggable/Makefile
+++ b/devel/p5-MooseX-Traits-Pluggable/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	MooseX-Traits-Pluggable
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,7 +16,6 @@ MAINTAINER=	bill.brinzer@gmail.com
 COMMENT=	An extension to MooseX::Traits
 
 BUILD_DEPENDS=	\
-	p5-Class-MOP>=0.84:${PORTSDIR}/devel/p5-Class-MOP \
 	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
 	p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean \
 	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
diff --git a/devel/p5-MooseX-Types-Path-Class/Makefile b/devel/p5-MooseX-Types-Path-Class/Makefile
index 0812d948cd52..05d8ba5e73dd 100644
--- a/devel/p5-MooseX-Types-Path-Class/Makefile
+++ b/devel/p5-MooseX-Types-Path-Class/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	MooseX-Types-Path-Class
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,8 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A Path::Class type library for Moose
 
-RUN_DEPENDS=	p5-Class-MOP>=0:${PORTSDIR}/devel/p5-Class-MOP \
-		p5-Moose>=0.39:${PORTSDIR}/devel/p5-Moose \
+RUN_DEPENDS=	p5-Moose>=0.39:${PORTSDIR}/devel/p5-Moose \
 		p5-MooseX-Types>=0.04:${PORTSDIR}/devel/p5-MooseX-Types \
 		p5-Path-Class>=0.16:${PORTSDIR}/devel/p5-Path-Class
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Pod-Coverage-Moose/Makefile b/devel/p5-Pod-Coverage-Moose/Makefile
index 52d383478710..27f1b6d02029 100644
--- a/devel/p5-Pod-Coverage-Moose/Makefile
+++ b/devel/p5-Pod-Coverage-Moose/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Pod-Coverage-Moose
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,8 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pod::Coverage extension for Moose
 
-BUILD_DEPENDS=	p5-Class-MOP>=0:${PORTSDIR}/devel/p5-Class-MOP \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
+BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
 		p5-Perl6-Junction>=0:${PORTSDIR}/devel/p5-Perl6-Junction \
 		p5-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Pod-Coverage \
 		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
diff --git a/devel/p5-namespace-autoclean/Makefile b/devel/p5-namespace-autoclean/Makefile
index c03868b8a7d7..de0b0de37f77 100644
--- a/devel/p5-namespace-autoclean/Makefile
+++ b/devel/p5-namespace-autoclean/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	namespace-autoclean
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/B/BO/BOBTFISH
@@ -16,7 +17,7 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Keep imports out of your namespace
 
 RUN_DEPENDS=	p5-B-Hooks-EndOfScope>=0:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-Class-MOP>=0.80:${PORTSDIR}/devel/p5-Class-MOP \
+		p5-Moose>=1.00:${PORTSDIR}/devel/p5-Moose \
 		p5-namespace-clean>=0.20:${PORTSDIR}/devel/p5-namespace-clean
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
diff --git a/graphics/p5-Google-Chart/Makefile b/graphics/p5-Google-Chart/Makefile
index ad4fdb09f6e3..c5677718b390 100644
--- a/graphics/p5-Google-Chart/Makefile
+++ b/graphics/p5-Google-Chart/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Google-Chart
 PORTVERSION=	0.05014
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,8 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Perl Interface to Google Charts API
 
-RUN_DEPENDS=	p5-Class-MOP>=0.63:${PORTSDIR}/devel/p5-Class-MOP \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
+RUN_DEPENDS=	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
 		p5-Moose>=0.54:${PORTSDIR}/devel/p5-Moose \
 		p5-URI>0:${PORTSDIR}/net/p5-URI
 
diff --git a/net/p5-Net-Amazon-S3/Makefile b/net/p5-Net-Amazon-S3/Makefile
index 4ef430f2c883..e25533a58104 100644
--- a/net/p5-Net-Amazon-S3/Makefile
+++ b/net/p5-Net-Amazon-S3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Net-Amazon-S3
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,7 +16,6 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Use the Amazon S3 - Simple Storage Service
 
 RUN_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-MOP>=0.88:${PORTSDIR}/devel/p5-Class-MOP \
 		p5-Data-Stream-Bulk>=0.06:${PORTSDIR}/devel/p5-Data-Stream-Bulk \
 		p5-DateTime-Format-HTTP>=0:${PORTSDIR}/devel/p5-DateTime-Format-HTTP \
 		p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
diff --git a/www/p5-Catalyst-Controller-ActionRole/Makefile b/www/p5-Catalyst-Controller-ActionRole/Makefile
index 69403733e821..70ce1c116854 100644
--- a/www/p5-Catalyst-Controller-ActionRole/Makefile
+++ b/www/p5-Catalyst-Controller-ActionRole/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	Catalyst-Controller-ActionRole
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,7 +15,6 @@ MAINTAINER=	mons@cpan.org
 COMMENT=	Apply roles to action instances
 
 BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.71001:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Class-MOP>=0.80:${PORTSDIR}/devel/p5-Class-MOP \
 		p5-Moose>=0.70:${PORTSDIR}/devel/p5-Moose \
 		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
 		p5-String-RewritePrefix>=0.004:${PORTSDIR}/textproc/p5-String-RewritePrefix \
diff --git a/www/p5-Catalyst-Plugin-Authentication/Makefile b/www/p5-Catalyst-Plugin-Authentication/Makefile
index 3f0c1f3b65f1..b2b44a351346 100644
--- a/www/p5-Catalyst-Plugin-Authentication/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Catalyst-Plugin-Authentication
 PORTVERSION=	0.10017
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
@@ -19,7 +20,6 @@ COMMENT=	Infrastructure plugin for the Catalyst authentication framework
 RUN_DEPENDS=	p5-Catalyst-Plugin-Session>=0.10:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
 		p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-Class-MOP>=0:${PORTSDIR}/devel/p5-Class-MOP \
 		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
 		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Catalyst-Runtime/Makefile b/www/p5-Catalyst-Runtime/Makefile
index 2c333f978926..377ad82e8f6d 100644
--- a/www/p5-Catalyst-Runtime/Makefile
+++ b/www/p5-Catalyst-Runtime/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Catalyst-Runtime
 PORTVERSION=	5.80032
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/B/BO/BOBTFISH/
@@ -18,7 +19,6 @@ COMMENT=	The Elegant MVC Web Application Framework (Runtime)
 RUN_DEPENDS=	p5-B-Hooks-EndOfScope>=0.08:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
 		p5-CGI-Simple>=1.109:${PORTSDIR}/www/p5-CGI-Simple \
 		p5-Class-C3-Adopt-NEXT>=0.07:${PORTSDIR}/devel/p5-Class-C3-Adopt-NEXT \
-		p5-Class-MOP>=0.95:${PORTSDIR}/devel/p5-Class-MOP \
 		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
 		p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
 		p5-Data-OptList>=0:${PORTSDIR}/devel/p5-Data-OptList \
diff --git a/www/p5-HTML-FormFu/Makefile b/www/p5-HTML-FormFu/Makefile
index 7b3f8bc74fe9..bbc962fa2504 100644
--- a/www/p5-HTML-FormFu/Makefile
+++ b/www/p5-HTML-FormFu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	HTML-FormFu
 PORTVERSION=	0.09003
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -16,7 +17,6 @@ COMMENT=	HTML Form Creation, Rendering and Validation Framework
 
 RUN_DEPENDS=	p5-Captcha-reCAPTCHA>=0.93:${PORTSDIR}/graphics/p5-Captcha-reCAPTCHA \
 		p5-Class-Accessor-Chained>=0:${PORTSDIR}/devel/p5-Class-Accessor-Chained \
-		p5-Class-MOP>=0:${PORTSDIR}/devel/p5-Class-MOP \
 		p5-Clone>=0.31:${PORTSDIR}/devel/p5-Clone \
 		p5-Config-Any>=0.18:${PORTSDIR}/devel/p5-Config-Any \
 		p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC \