diff --git a/devel/p5-App-CLI-Extension/Makefile b/devel/p5-App-CLI-Extension/Makefile
index 7873761ef8e2..49bf5babb0bf 100644
--- a/devel/p5-App-CLI-Extension/Makefile
+++ b/devel/p5-App-CLI-Extension/Makefile
@@ -6,22 +6,19 @@
 #
 
 PORTNAME=	App-CLI-Extension
-PORTVERSION=	1.30
+PORTVERSION=	1.42
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:HOLLY
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/0*$//}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extension for App::CLI extension module
 
-DEPRECATED=	Depends on devel/p5-Class-Data-Accessor, which is deprecated
-EXPIRATION_DATE=	2011-09-30
-
 BUILD_DEPENDS=	p5-App-CLI>=0:${PORTSDIR}/devel/p5-App-CLI \
-		p5-Class-Data-Accessor>=0:${PORTSDIR}/devel/p5-Class-Data-Accessor \
+		p5-Class-Accessor-Grouped>=0:${PORTSDIR}/devel/p5-Class-Accessor-Grouped \
 		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
diff --git a/devel/p5-App-CLI-Extension/distinfo b/devel/p5-App-CLI-Extension/distinfo
index fab97e1c5884..02f6a3f6610f 100644
--- a/devel/p5-App-CLI-Extension/distinfo
+++ b/devel/p5-App-CLI-Extension/distinfo
@@ -1,2 +1,2 @@
-SHA256 (App-CLI-Extension-1.3.tar.gz) = b9d289bb429d23458b238674c16a576e169c349c2fa2c8eb9ceab4e5eafb1476
-SIZE (App-CLI-Extension-1.3.tar.gz) = 51421
+SHA256 (App-CLI-Extension-1.42.tar.gz) = 9672b3401e8c3d2c7827e81d89e98a16e6528fe407e87c99f660e8b94ad467db
+SIZE (App-CLI-Extension-1.42.tar.gz) = 47772