3 files changed, 28 insertions, 13 deletions

diff --git a/devel/p5-CHI/Makefile b/devel/p5-CHI/Makefile
index ebc48e276754..85da43f8dd76 100644
--- a/devel/p5-CHI/Makefile
+++ b/devel/p5-CHI/Makefile
@@ -6,29 +6,32 @@
 #
 
 PORTNAME=	CHI
-PORTVERSION=	0.102
+PORTVERSION=	0.250
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/J/JS/JSWARTZ
 PKGNAMEPREFIX=	p5-
+DISTNAME=	${PORTNAME}-0.25
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for unified cache interface
 
+BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	\
+	p5-Carp-Assert>=0.20:${PORTSDIR}/devel/p5-Carp-Assert \
 	p5-Data-UUID>0:${PORTSDIR}/devel/p5-Data-UUID \
 	p5-Digest-JHash>0:${PORTSDIR}/security/p5-Digest-JHash \
 	p5-Hash-MoreUtils>0:${PORTSDIR}/devel/p5-Hash-MoreUtils \
 	p5-List-MoreUtils>=0.13:${PORTSDIR}/lang/p5-List-MoreUtils \
-	p5-Mouse>=0.15:${PORTSDIR}/devel/p5-Mouse \
+	p5-Moose>=0.66:${PORTSDIR}/devel/p5-Moose \
 	p5-Time-Duration>=1.06:${PORTSDIR}/devel/p5-Time-Duration \
 	p5-Time-Duration-Parse>=0.03:${PORTSDIR}/devel/p5-Time-Duration-Parse
-BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=	CHI.3 \
 	CHI::CacheObject.3 \
+	CHI::Constants.3 \
 	CHI::Driver.3 \
 	CHI::Driver::Base::CacheContainer.3 \
 	CHI::Driver::CacheCache.3 \
@@ -36,7 +39,8 @@ MAN3=	CHI.3 \
 	CHI::Driver::FastMmap.3 \
 	CHI::Driver::File.3 \
 	CHI::Driver::Memory.3 \
-	CHI::Driver::Multilevel.3 \
-	CHI::Driver::Null.3
+	CHI::Driver::Metacache.3 \
+	CHI::Driver::Null.3 \
+	CHI::Driver::Role::Universal.3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-CHI/distinfo b/devel/p5-CHI/distinfo
index b9f2f03758ce..8ff645e9a061 100644
--- a/devel/p5-CHI/distinfo
+++ b/devel/p5-CHI/distinfo
@@ -1,3 +1,3 @@
-MD5 (CHI-0.102.tar.gz) = 8df90063de880ae856e083d9a641249f
-SHA256 (CHI-0.102.tar.gz) = b69fc4a3c1ed52ce3a38ade9c64e06e027ab6d8ac8fa7aabd795416a09397b07
-SIZE (CHI-0.102.tar.gz) = 67759
+MD5 (CHI-0.25.tar.gz) = 8115da7990f50c976d37d4f7b965d32e
+SHA256 (CHI-0.25.tar.gz) = aa3d3bd33b6f970d5adec76b6bfee2c204a423c092d6bf67e3c1017901d829b1
+SIZE (CHI-0.25.tar.gz) = 77969
diff --git a/devel/p5-CHI/pkg-plist b/devel/p5-CHI/pkg-plist
index 6333ca67f667..9a16f717742c 100644
--- a/devel/p5-CHI/pkg-plist
+++ b/devel/p5-CHI/pkg-plist
@@ -1,6 +1,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CHI/.packlist
 %%SITE_PERL%%/CHI.pm
 %%SITE_PERL%%/CHI/CacheObject.pm
+%%SITE_PERL%%/CHI/Constants.pm
 %%SITE_PERL%%/CHI/Driver.pm
 %%SITE_PERL%%/CHI/Driver/Base/CacheContainer.pm
 %%SITE_PERL%%/CHI/Driver/CacheCache.pm
@@ -8,42 +9,52 @@
 %%SITE_PERL%%/CHI/Driver/FastMmap.pm
 %%SITE_PERL%%/CHI/Driver/File.pm
 %%SITE_PERL%%/CHI/Driver/Memory.pm
-%%SITE_PERL%%/CHI/Driver/Multilevel.pm
+%%SITE_PERL%%/CHI/Driver/Metacache.pm
 %%SITE_PERL%%/CHI/Driver/Null.pm
+%%SITE_PERL%%/CHI/Driver/Role/HasSubcaches.pm
+%%SITE_PERL%%/CHI/Driver/Role/IsSizeAware.pm
+%%SITE_PERL%%/CHI/Driver/Role/IsSubcache.pm
+%%SITE_PERL%%/CHI/Driver/Role/Universal.pm
 %%SITE_PERL%%/CHI/NullLogger.pm
 %%SITE_PERL%%/CHI/Serializer/Storable.pm
 %%SITE_PERL%%/CHI/Test.pm
 %%SITE_PERL%%/CHI/Test/Class.pm
+%%SITE_PERL%%/CHI/Test/Driver/NonMoose.pm
 %%SITE_PERL%%/CHI/Test/Driver/Readonly.pm
 %%SITE_PERL%%/CHI/Test/Driver/Writeonly.pm
 %%SITE_PERL%%/CHI/Test/InternalOnly.pm
 %%SITE_PERL%%/CHI/Test/Logger.pm
 %%SITE_PERL%%/CHI/Test/Util.pm
+%%SITE_PERL%%/CHI/Types.pm
 %%SITE_PERL%%/CHI/Util.pm
+%%SITE_PERL%%/CHI/t/Constants.pm
 %%SITE_PERL%%/CHI/t/Driver.pm
 %%SITE_PERL%%/CHI/t/Driver/CacheCache.pm
 %%SITE_PERL%%/CHI/t/Driver/FastMmap.pm
 %%SITE_PERL%%/CHI/t/Driver/File.pm
 %%SITE_PERL%%/CHI/t/Driver/File/DepthZero.pm
 %%SITE_PERL%%/CHI/t/Driver/Memory.pm
-%%SITE_PERL%%/CHI/t/Driver/Multilevel.pm
-%%SITE_PERL%%/CHI/t/Driver/Multilevel/Single.pm
+%%SITE_PERL%%/CHI/t/Driver/NonMoose.pm
 %%SITE_PERL%%/CHI/t/Driver/Null.pm
+%%SITE_PERL%%/CHI/t/Driver/Subcache.pm
+%%SITE_PERL%%/CHI/t/Driver/Subcache/l1_cache.pm
+%%SITE_PERL%%/CHI/t/Driver/Subcache/mirror_cache.pm
 %%SITE_PERL%%/CHI/t/GetError.pm
 %%SITE_PERL%%/CHI/t/Initialize.pm
-%%SITE_PERL%%/CHI/t/Multilevel.pm
 %%SITE_PERL%%/CHI/t/RequiredModules.pm
 %%SITE_PERL%%/CHI/t/Sanity.pm
 %%SITE_PERL%%/CHI/t/SetError.pm
+%%SITE_PERL%%/CHI/t/Subcache.pm
 %%SITE_PERL%%/CHI/t/Subclass.pm
 %%SITE_PERL%%/CHI/t/Util.pm
-@dirrmtry %%SITE_PERL%%/CHI/t/Driver/Multilevel
+@dirrmtry %%SITE_PERL%%/CHI/t/Driver/Subcache
 @dirrmtry %%SITE_PERL%%/CHI/t/Driver/File
 @dirrmtry %%SITE_PERL%%/CHI/t/Driver
 @dirrmtry %%SITE_PERL%%/CHI/t
 @dirrmtry %%SITE_PERL%%/CHI/Test/Driver
 @dirrmtry %%SITE_PERL%%/CHI/Test
 @dirrmtry %%SITE_PERL%%/CHI/Serializer
+@dirrmtry %%SITE_PERL%%/CHI/Driver/Role
 @dirrmtry %%SITE_PERL%%/CHI/Driver/Base
 @dirrmtry %%SITE_PERL%%/CHI/Driver
 @dirrmtry %%SITE_PERL%%/CHI