3 files changed, 31 insertions, 23 deletions

diff --git a/mail/razor-agents/Makefile b/mail/razor-agents/Makefile
index 7b2ac870bec0..4dafd72bf427 100644
--- a/mail/razor-agents/Makefile
+++ b/mail/razor-agents/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	razor-agents
-PORTVERSION=	2.14
-PORTREVISION=	2
+PORTVERSION=	2.20
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	razor
@@ -21,6 +20,13 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDI
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI/Escape.pm:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+.if exists(/usr/local/lib/perl5/${PERL_VER}/Test/More.pm)
+# Test::Simple is default module in perl-5.8.0 or above
+.else
+TEST_MORE=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS+=	${TEST_MORE}
+.endif
+
 PERL_CONFIGURE=	yes
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/mail/razor-agents/distinfo b/mail/razor-agents/distinfo
index 4ed97165d671..6a853f1b41e0 100644
--- a/mail/razor-agents/distinfo
+++ b/mail/razor-agents/distinfo
@@ -1 +1 @@
-MD5 (razor-agents-2.14.tar.gz) = 08c5bd4a438bf3f892a891a423056e05
+MD5 (razor-agents-2.20.tar.gz) = 0c36212f0c40407ce5035d337eac0b79
diff --git a/mail/razor-agents/pkg-plist b/mail/razor-agents/pkg-plist
index e420e45ef22d..611577611301 100644
--- a/mail/razor-agents/pkg-plist
+++ b/mail/razor-agents/pkg-plist
@@ -3,24 +3,26 @@ bin/razor-check
 bin/razor-client
 bin/razor-report
 bin/razor-revoke
-lib/perl5/site_perl/%%PERL_VER%%/Razor2/Client/Agent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor2/Client/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor2/Client/Core.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor2/Client/Engine.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor2/Client/Version.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor2/Errorhandler.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor2/Logger.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor2/Preproc/Manager.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor2/Preproc/VR1.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor2/Preproc/deBase64.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor2/Preproc/deHTML.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor2/Preproc/deNewline.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor2/Preproc/deQP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor2/Preproc/enBase64.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor2/Signature/Ephemeral.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor2/String.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Client/Agent.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Client/Config.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Client/Core.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Client/Engine.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Client/Version.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Errorhandler.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Logger.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Preproc/Manager.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Preproc/VR1.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Preproc/deBase64.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Preproc/deHTML.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Preproc/deHTMLxs.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Preproc/deNewline.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Preproc/deQP.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Preproc/enBase64.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Signature/Ephemeral.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/String.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Syslog.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/razor-agents/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Razor2/Signature
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Razor2/Preproc
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Razor2/Client
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Razor2
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Signature
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Preproc
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Client
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2