4 files changed, 32 insertions, 27 deletions

diff --git a/mail/razor-agents/Makefile b/mail/razor-agents/Makefile
index 5108bb2d3780..b267c0083e86 100644
--- a/mail/razor-agents/Makefile
+++ b/mail/razor-agents/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	razor-agents
-PORTVERSION=    1.20
+PORTVERSION=    2.14
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	razor
@@ -16,17 +16,18 @@ MAINTAINER=	leeym@leeym.com
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/Nilsimsa.pm:${PORTSDIR}/security/p5-Digest-Nilsimsa \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN1=		razor-check.1 razor-discover.1 razor-report.1 \
-		razor-whitelist.1 razor.conf.1
+MAN1=		razor-revoke.1 razor-admin.1 razor-report.1 razor-check.1
+MAN3=		Razor2::Errorhandler.3
+MAN5=		razor-agents.5 razor-whitelist.5 razor-agent.conf.5
 
-post-build:
-	pod2man ${WRKSRC}/man/razor-whitelist.pod > ${WRKSRC}/blib/man1/razor-whitelist.1
-	pod2man ${WRKSRC}/man/razor.conf.pod > ${WRKSRC}/blib/man1/razor.conf.1
+post-install:
+	@${PREFIX}/bin/razor-client
 
 .include <bsd.port.mk>
diff --git a/mail/razor-agents/distinfo b/mail/razor-agents/distinfo
index b1af1be09f00..4ed97165d671 100644
--- a/mail/razor-agents/distinfo
+++ b/mail/razor-agents/distinfo
@@ -1 +1 @@
-MD5 (razor-agents-1.20.tar.gz) = 3612455aca8221718d2bf4b94ca67197
+MD5 (razor-agents-2.14.tar.gz) = 08c5bd4a438bf3f892a891a423056e05
diff --git a/mail/razor-agents/files/patch-bin::razor-report b/mail/razor-agents/files/patch-bin::razor-report
deleted file mode 100644
index 33d9aa2ac7ce..000000000000
--- a/mail/razor-agents/files/patch-bin::razor-report
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/razor-report.orig	Sat Dec 29 07:57:44 2001
-+++ bin/razor-report	Sat Dec 29 07:58:23 2001
-@@ -99,7 +99,7 @@
- instead of computing one from mail content. When called with C<--sig>,
- C<razor-report> will not attempt to read from STDIN. Usage:
-  
--  razor-report -d -sig a8a3d545adb73f9733675571ffeaf10cba87745b
-+  razor-report C<-d> -sig a8a3d545adb73f9733675571ffeaf10cba87745b
- 
- =item C<-conf=filename>
- 
diff --git a/mail/razor-agents/pkg-plist b/mail/razor-agents/pkg-plist
index e03f602bb96a..9bf76df34f5c 100644
--- a/mail/razor-agents/pkg-plist
+++ b/mail/razor-agents/pkg-plist
@@ -1,12 +1,27 @@
+bin/razor-admin
 bin/razor-check
-bin/razor-discover
+bin/razor-client
 bin/razor-report
-lib/perl5/site_perl/%%PERL_VER%%/Razor/Agent.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor/Client.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor/Config.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor/Errorhandler.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor/String.pm
-lib/perl5/site_perl/%%PERL_VER%%/Razor/Version.pm
+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%%/auto/razor-agents/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/razor-agents 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Razor 2>/dev/null || true
+lib/perllocal.pod
+@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