diff --git a/textproc/p5-Makefile-DOM/Makefile b/textproc/p5-Makefile-DOM/Makefile
index 62c791648710..abdb138e4800 100644
--- a/textproc/p5-Makefile-DOM/Makefile
+++ b/textproc/p5-Makefile-DOM/Makefile
@@ -14,11 +14,12 @@ COMMENT=	Simple DOM parser for Makefiles
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Clone>=0.18:${PORTSDIR}/devel/p5-Clone \
+BUILD_DEPENDS=	p5-Clone>=0.18:${PORTSDIR}/devel/p5-Clone \
 		p5-List-MoreUtils>=0.21:${PORTSDIR}/lang/p5-List-MoreUtils \
 		p5-Params-Util>=0.22:${PORTSDIR}/devel/p5-Params-Util
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		perl5
 USE_PERL5=	configure
+USES=		perl5
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-Makefile-DOM/pkg-descr b/textproc/p5-Makefile-DOM/pkg-descr
index e87a1a5ca562..40e3230d22cd 100644
--- a/textproc/p5-Makefile-DOM/pkg-descr
+++ b/textproc/p5-Makefile-DOM/pkg-descr
@@ -1,11 +1,10 @@
-This libary can serve as an advanced lexer for (GNU) makefiles. It
-parses makefiles as "documents" and the parsing is lossless. The
-results are data structures similar to DOM trees. The DOM trees hold
-every single bit of the information in the original input files,
-including white spaces, blank lines and makefile comments. That means
-it's possible to reproduce the original makefiles from the DOM trees.
-In addition, each node of the DOM trees is modifiable and so is the
-whole tree, just like the PPI module used for Perl source parsing and
+This libary can serve as an advanced lexer for (GNU) makefiles. It parses
+makefiles as "documents" and the parsing is lossless. The results are data
+structures similar to DOM trees. The DOM trees hold every single bit of the
+information in the original input files, including white spaces, blank lines and
+makefile comments. That means it's possible to reproduce the original makefiles
+from the DOM trees.  In addition, each node of the DOM trees is modifiable and
+so is the whole tree, just like the PPI module used for Perl source parsing and
 the HTML::TreeBuilder module used for parsing HTML source.
 
-WWW:	http://search.cpan.org/dist/Makefile-DOM/
+WWW: http://search.cpan.org/dist/Makefile-DOM/
diff --git a/textproc/p5-Makefile-DOM/pkg-plist b/textproc/p5-Makefile-DOM/pkg-plist
index fa02443ab39d..d1a20e31389a 100644
--- a/textproc/p5-Makefile-DOM/pkg-plist
+++ b/textproc/p5-Makefile-DOM/pkg-plist
@@ -1,12 +1,3 @@
-%%PERL5_MAN3%%/MDOM::Dumper.3.gz
-%%PERL5_MAN3%%/MDOM::Element.3.gz
-%%PERL5_MAN3%%/MDOM::Node.3.gz
-%%PERL5_MAN3%%/MDOM::Token.3.gz
-%%PERL5_MAN3%%/MDOM::Token::Comment.3.gz
-%%PERL5_MAN3%%/MDOM::Token::Separator.3.gz
-%%PERL5_MAN3%%/MDOM::Token::Whitespace.3.gz
-%%PERL5_MAN3%%/Makefile::DOM.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Makefile/DOM/.packlist
 %%SITE_PERL%%/MDOM/Assignment.pm
 %%SITE_PERL%%/MDOM/Command.pm
 %%SITE_PERL%%/MDOM/Directive.pm
@@ -29,10 +20,19 @@
 %%SITE_PERL%%/MDOM/Unknown.pm
 %%SITE_PERL%%/MDOM/Util.pm
 %%SITE_PERL%%/Makefile/DOM.pm
-@dirrmtry %%SITE_PERL%%/Makefile
-@dirrmtry %%SITE_PERL%%/MDOM/Token
-@dirrmtry %%SITE_PERL%%/MDOM/Rule
-@dirrmtry %%SITE_PERL%%/MDOM/Document
-@dirrmtry %%SITE_PERL%%/MDOM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Makefile/DOM
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Makefile/DOM/.packlist
+%%PERL5_MAN3%%/MDOM::Dumper.3.gz
+%%PERL5_MAN3%%/MDOM::Element.3.gz
+%%PERL5_MAN3%%/MDOM::Node.3.gz
+%%PERL5_MAN3%%/MDOM::Token.3.gz
+%%PERL5_MAN3%%/MDOM::Token::Comment.3.gz
+%%PERL5_MAN3%%/MDOM::Token::Separator.3.gz
+%%PERL5_MAN3%%/MDOM::Token::Whitespace.3.gz
+%%PERL5_MAN3%%/Makefile::DOM.3.gz
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Makefile/DOM
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Makefile
+@dirrmtry %%SITE_PERL%%/Makefile
+@dirrm %%SITE_PERL%%/MDOM/Token
+@dirrm %%SITE_PERL%%/MDOM/Rule
+@dirrm %%SITE_PERL%%/MDOM/Document
+@dirrm %%SITE_PERL%%/MDOM