3 files changed, 25 insertions, 20 deletions

diff --git a/devel/p5-Config-INI/Makefile b/devel/p5-Config-INI/Makefile
index 3e1804c12256..0d938ad3d168 100644
--- a/devel/p5-Config-INI/Makefile
+++ b/devel/p5-Config-INI/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	Config-INI
-PORTVERSION=	0.020
+PORTVERSION=	0.021
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -12,24 +12,18 @@ COMMENT=	Simple .ini files emitter and parser for Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS+=	p5-Mixin-Linewise>=0:${PORTSDIR}/devel/p5-Mixin-Linewise \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String
+BUILD_DEPENDS=	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
+		p5-Mixin-Linewise>=0:${PORTSDIR}/devel/p5-Mixin-Linewise
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+TEST_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Config::INI.3 \
-		Config::INI::Reader.3 \
-		Config::INI::Writer.3
-
-PLIST_FILES=	%%SITE_PERL%%/Config/INI.pm \
-		%%SITE_PERL%%/Config/INI/Reader.pm \
-		%%SITE_PERL%%/Config/INI/Writer.pm \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/INI/.packlist
-PLIST_DIRS=	%%SITE_PERL%%/Config/INI \
-		%%SITE_PERL%%/Config \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/INI \
-		%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config
-
-NO_STAGE=	yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501400
+TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Config-INI/distinfo b/devel/p5-Config-INI/distinfo
index 3c2a09888ce9..0464147845c8 100644
--- a/devel/p5-Config-INI/distinfo
+++ b/devel/p5-Config-INI/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Config-INI-0.020.tar.gz) = 0ef298da75e3a7becd1f358422cea621c5cf0420278aa6a1bdd2dd14efe07bc9
-SIZE (Config-INI-0.020.tar.gz) = 21463
+SHA256 (Config-INI-0.021.tar.gz) = be98d1ce55b5979eb957f7d08ed197559565992a0e2824d74d3c3e8c47f6b616
+SIZE (Config-INI-0.021.tar.gz) = 21221
diff --git a/devel/p5-Config-INI/pkg-plist b/devel/p5-Config-INI/pkg-plist
new file mode 100644
index 000000000000..a259ad66c1e3
--- /dev/null
+++ b/devel/p5-Config-INI/pkg-plist
@@ -0,0 +1,11 @@
+%%SITE_PERL%%/Config/INI.pm
+%%SITE_PERL%%/Config/INI/Reader.pm
+%%SITE_PERL%%/Config/INI/Writer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/INI/.packlist
+%%PERL5_MAN3%%/Config::INI.3.gz
+%%PERL5_MAN3%%/Config::INI::Reader.3.gz
+%%PERL5_MAN3%%/Config::INI::Writer.3.gz
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/INI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config
+@dirrmtry %%SITE_PERL%%/Config/INI
+@dirrmtry %%SITE_PERL%%/Config