diff --git a/devel/p5-Cache/Makefile b/devel/p5-Cache/Makefile
index f5c7fd946b01..a8affbf15e44 100644
--- a/devel/p5-Cache/Makefile
+++ b/devel/p5-Cache/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Cache
-PORTVERSION=	2.04
-PORTREVISION=	1
+PORTVERSION=	2.06
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -11,6 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	A Perl Cache interface
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 RUN_DEPENDS=	p5-Digest-SHA1>=2.01:${PORTSDIR}/security/p5-Digest-SHA1 \
 		p5-File-NFSLock>=1.2:${PORTSDIR}/devel/p5-File-NFSLock \
 		p5-Heap>=0.01:${PORTSDIR}/devel/p5-Heap \
@@ -18,24 +20,6 @@ RUN_DEPENDS=	p5-Digest-SHA1>=2.01:${PORTSDIR}/security/p5-Digest-SHA1 \
 		p5-TimeDate>=2.24:${PORTSDIR}/devel/p5-TimeDate
 
 USES=		perl5
-USE_PERL5=	configure
+USE_PERL5=	modbuild
 
-MAN3=		Cache.3 \
-		Cache::Entry.3 \
-		Cache::File.3 \
-		Cache::File::Entry.3 \
-		Cache::File::Handle.3 \
-		Cache::File::Heap.3 \
-		Cache::IOString.3 \
-		Cache::Memory.3 \
-		Cache::Memory::Entry.3 \
-		Cache::Memory::HeapElem.3 \
-		Cache::Null.3 \
-		Cache::Null::Entry.3 \
-		Cache::RemovalStrategy.3 \
-		Cache::RemovalStrategy::FIFO.3 \
-		Cache::RemovalStrategy::LRU.3 \
-		Cache::Tester.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Cache/distinfo b/devel/p5-Cache/distinfo
index e38b622fa0d9..ffc3fdd6faea 100644
--- a/devel/p5-Cache/distinfo
+++ b/devel/p5-Cache/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Cache-2.04.tar.gz) = cffbd4b80f2a43c7b9f6aebb4e92cfb0466cc4faf0b99e4ea7b6d344df55d3ff
-SIZE (Cache-2.04.tar.gz) = 34501
+SHA256 (Cache-2.06.tar.gz) = 536215e515cb236e1d7e353aee7ba950ce0b66b8214d283060c8dca5c795ba9e
+SIZE (Cache-2.06.tar.gz) = 54128
diff --git a/devel/p5-Cache/pkg-plist b/devel/p5-Cache/pkg-plist
index ee49bf99ba56..5dc26788c23e 100644
--- a/devel/p5-Cache/pkg-plist
+++ b/devel/p5-Cache/pkg-plist
@@ -14,10 +14,24 @@
 %%SITE_PERL%%/Cache/RemovalStrategy/FIFO.pm
 %%SITE_PERL%%/Cache/RemovalStrategy/LRU.pm
 %%SITE_PERL%%/Cache/Tester.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/.packlist
+%%PERL5_MAN3%%/Cache.3.gz
+%%PERL5_MAN3%%/Cache::Entry.3.gz
+%%PERL5_MAN3%%/Cache::File.3.gz
+%%PERL5_MAN3%%/Cache::File::Entry.3.gz
+%%PERL5_MAN3%%/Cache::File::Handle.3.gz
+%%PERL5_MAN3%%/Cache::File::Heap.3.gz
+%%PERL5_MAN3%%/Cache::IOString.3.gz
+%%PERL5_MAN3%%/Cache::Memory.3.gz
+%%PERL5_MAN3%%/Cache::Memory::Entry.3.gz
+%%PERL5_MAN3%%/Cache::Memory::HeapElem.3.gz
+%%PERL5_MAN3%%/Cache::Null.3.gz
+%%PERL5_MAN3%%/Cache::Null::Entry.3.gz
+%%PERL5_MAN3%%/Cache::RemovalStrategy.3.gz
+%%PERL5_MAN3%%/Cache::RemovalStrategy::FIFO.3.gz
+%%PERL5_MAN3%%/Cache::RemovalStrategy::LRU.3.gz
+%%PERL5_MAN3%%/Cache::Tester.3.gz
 @dirrmtry %%SITE_PERL%%/Cache/RemovalStrategy
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache
+@dirrmtry %%SITE_PERL%%/Cache/Null
 @dirrmtry %%SITE_PERL%%/Cache/Memory
 @dirrmtry %%SITE_PERL%%/Cache/File
-@dirrmtry %%SITE_PERL%%/Cache/Null
 @dirrmtry %%SITE_PERL%%/Cache