diff --git a/devel/p5-Class-Accessor-Complex/Makefile b/devel/p5-Class-Accessor-Complex/Makefile
index f779637b5f59..ed075b84e48f 100644
--- a/devel/p5-Class-Accessor-Complex/Makefile
+++ b/devel/p5-Class-Accessor-Complex/Makefile
@@ -11,13 +11,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Arrays, hashes, booleans, integers, sets, and more
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
+		p5-Class-Accessor-Installer>=0:${PORTSDIR}/devel/p5-Class-Accessor-Installer \
 		p5-Data-Miscellany>=0:${PORTSDIR}/devel/p5-Data-Miscellany \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Class-Accessor-Installer>=0:${PORTSDIR}/devel/p5-Class-Accessor-Installer
+		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		perl5
 USE_PERL5=	configure
+USES=		perl5
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Class-Accessor-Complex/pkg-descr b/devel/p5-Class-Accessor-Complex/pkg-descr
index 068448dbd8a4..52fef1d7ff53 100644
--- a/devel/p5-Class-Accessor-Complex/pkg-descr
+++ b/devel/p5-Class-Accessor-Complex/pkg-descr
@@ -1,13 +1,13 @@
 This module generates accessors for your class in the same spirit as
-Class::Accessor does. While the latter deals with accessors for
-scalar values, this module provides accessor makers for arrays,
-hashes, integers, booleans, sets and more.
+Class::Accessor does. While the latter deals with accessors for scalar values,
+this module provides accessor makers for arrays, hashes, integers, booleans,
+sets and more.
 
-As seen in the synopsis, you can chain calls to the accessor makers.
-Also, because this module inherits from Class::Accessor, you can put
-a call to one of its accessor makers at the end of the chain.
+As seen in the synopsis, you can chain calls to the accessor makers. Also,
+because this module inherits from Class::Accessor, you can put a call to one of
+its accessor makers at the end of the chain.
 
-The accessor generators also generate documentation ready to be used
-with Sub::Documentation.
+The accessor generators also generate documentation ready to be used with
+Sub::Documentation.
 
 WWW: http://search.cpan.org/dist/Class-Accessor-Complex/
diff --git a/devel/p5-Class-Accessor-Complex/pkg-plist b/devel/p5-Class-Accessor-Complex/pkg-plist
index 684f689834b0..be64a375e301 100644
--- a/devel/p5-Class-Accessor-Complex/pkg-plist
+++ b/devel/p5-Class-Accessor-Complex/pkg-plist
@@ -1,8 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Accessor/Complex/.packlist
 %%SITE_PERL%%/Class/Accessor/Complex.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Accessor/Complex/.packlist
 %%PERL5_MAN3%%/Class::Accessor::Complex.3.gz
-@dirrmtry %%SITE_PERL%%/Class/Accessor
-@dirrmtry %%SITE_PERL%%/Class
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Accessor/Complex
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Accessor/Complex
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Accessor
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/Accessor
+@dirrmtry %%SITE_PERL%%/Class