4 files changed, 41 insertions, 51 deletions

diff --git a/mail/razor-agents/Makefile b/mail/razor-agents/Makefile
index 12d2c662e65a..390848f54c2c 100644
--- a/mail/razor-agents/Makefile
+++ b/mail/razor-agents/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	razor-agents
-PORTVERSION=	2.34
+PORTVERSION=	2.36
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	razor
@@ -14,11 +14,11 @@ MASTER_SITE_SUBDIR=	razor
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	A distributed, collaborative, spam detection and filtering network
 
-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}/URI/Escape.pm:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
+		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
+		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
+		${SITE_PERL}/${PERL_ARCH}/Digest/Nilsimsa.pm:${PORTSDIR}/security/p5-Digest-Nilsimsa \
+		${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
@@ -35,7 +35,7 @@ post-install:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 580000
-BUILD_DEPENDS+=		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS+=		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/razor-agents/distinfo b/mail/razor-agents/distinfo
index d9d1fa488169..fcbf0f92708f 100644
--- a/mail/razor-agents/distinfo
+++ b/mail/razor-agents/distinfo
@@ -1 +1 @@
-MD5 (razor-agents-2.34.tar.gz) = 4f3061a5727ba724cb5d037dfda460dc
+MD5 (razor-agents-2.36.tar.gz) = 5deaae3ea2300bf480b6904f8a69a7f1
diff --git a/mail/razor-agents/files/patch-Makefile.PL b/mail/razor-agents/files/patch-Makefile.PL
deleted file mode 100644
index b9c39eeb07e9..000000000000
--- a/mail/razor-agents/files/patch-Makefile.PL
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.PL.orig	Sat Aug 17 18:15:35 2002
-+++ Makefile.PL	Sat Aug 17 18:18:22 2002
-@@ -125,6 +125,7 @@
-              '		$(INST_MAN5DIR) $(INSTALLMAN5DIR)';
-  
-   $inherited =~ s/(\$\(INSTALLMAN1DIR\))/$1$man5/gm;
-+  $inherited =~ s/(\$\(INSTALLSITEMAN1DIR\))/$1$man5/gm;
-   $inherited =~ s/install :: all pure_install doc_install/install :: all pure_install doc_install install_razor_agents/;
-   $inherited .= "\ninstall_razor_agents::\n\t " . '$(INST_SCRIPT)/razor-client'; 
-   $inherited;
diff --git a/mail/razor-agents/pkg-plist b/mail/razor-agents/pkg-plist
index 480576de0284..e72e000a6112 100644
--- a/mail/razor-agents/pkg-plist
+++ b/mail/razor-agents/pkg-plist
@@ -3,36 +3,36 @@ bin/razor-check
 bin/razor-client
 bin/razor-report
 bin/razor-revoke
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Client/Agent.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Razor2/Client/Agent.pm.orig
-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/Razor2/Preproc/deHTMLxs/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Razor2/Preproc/deHTMLxs/deHTMLxs.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Razor2/Preproc/deHTMLxs/deHTMLxs.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Razor2/Syslog/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/razor-agents/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/razor-agents
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Razor2/Syslog
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Razor2/Preproc/deHTMLxs
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Razor2/Preproc
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/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
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client/Agent.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client/Agent.pm.orig
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client/Config.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client/Core.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client/Engine.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client/Version.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Errorhandler.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Logger.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/Manager.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/VR1.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/deBase64.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/deHTML.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/deHTMLxs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/deNewline.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/deQP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc/enBase64.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Signature/Ephemeral.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/String.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Syslog.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Preproc/deHTMLxs/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Preproc/deHTMLxs/deHTMLxs.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Preproc/deHTMLxs/deHTMLxs.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Syslog/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/razor-agents/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Client
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Preproc
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Razor2/Signature
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Razor2
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Preproc/deHTMLxs
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Preproc
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2/Syslog
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Razor2
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/razor-agents