2 files changed, 25 insertions, 26 deletions

diff --git a/news/p5-Gateway/Makefile b/news/p5-Gateway/Makefile
index 94b3ff7690bd..8af43942872c 100644
--- a/news/p5-Gateway/Makefile
+++ b/news/p5-Gateway/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	croyle@gelemna.org
 COMMENT=	Robomoderation and mail to news gatewaying toolkit
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/News/Article.pm:${PORTSDIR}/news/p5-News-Article
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/News/Article.pm:${PORTSDIR}/news/p5-News-Article
+BUILD_DEPENDS=	${SITE_PERL}/News/Article.pm:${PORTSDIR}/news/p5-News-Article
+RUN_DEPENDS=	${SITE_PERL}/News/Article.pm:${PORTSDIR}/news/p5-News-Article
 
 PERL_CONFIGURE=	yes
 
 MAN3=		News::Gateway.3
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/news/p5-Gateway/pkg-plist b/news/p5-Gateway/pkg-plist
index 590f7541905d..3d0a8a6b5d47 100644
--- a/news/p5-Gateway/pkg-plist
+++ b/news/p5-Gateway/pkg-plist
@@ -1,26 +1,26 @@
-lib/perl5/site_perl/%%PERL_VER%%/News/Gateway.pm
-lib/perl5/site_perl/%%PERL_VER%%/News/Gateway.pod
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/anykeyword.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/bodyheaders.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/cleanbody.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/config.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/crosspost.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/hash.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/headers.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/keywords.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/mail.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/mailpath.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/mailtonews.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/moosesign.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/mungeids.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/newsgroups.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/newstomail.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/nobinaries.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/post.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/previoushop.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/News/Gateway/whitelist.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News/Gateway/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News/Gateway
+%%SITE_PERL%%/News/Gateway.pm
+%%SITE_PERL%%/News/Gateway.pod
+%%SITE_PERL%%/auto/News/Gateway/anykeyword.al
+%%SITE_PERL%%/auto/News/Gateway/bodyheaders.al
+%%SITE_PERL%%/auto/News/Gateway/cleanbody.al
+%%SITE_PERL%%/auto/News/Gateway/config.al
+%%SITE_PERL%%/auto/News/Gateway/crosspost.al
+%%SITE_PERL%%/auto/News/Gateway/hash.al
+%%SITE_PERL%%/auto/News/Gateway/headers.al
+%%SITE_PERL%%/auto/News/Gateway/keywords.al
+%%SITE_PERL%%/auto/News/Gateway/mail.al
+%%SITE_PERL%%/auto/News/Gateway/mailpath.al
+%%SITE_PERL%%/auto/News/Gateway/mailtonews.al
+%%SITE_PERL%%/auto/News/Gateway/moosesign.al
+%%SITE_PERL%%/auto/News/Gateway/mungeids.al
+%%SITE_PERL%%/auto/News/Gateway/newsgroups.al
+%%SITE_PERL%%/auto/News/Gateway/newstomail.al
+%%SITE_PERL%%/auto/News/Gateway/nobinaries.al
+%%SITE_PERL%%/auto/News/Gateway/post.al
+%%SITE_PERL%%/auto/News/Gateway/previoushop.al
+%%SITE_PERL%%/auto/News/Gateway/whitelist.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Gateway/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Gateway
 share/examples/Gateway/listgate
 share/examples/Gateway/listgate.m4
 share/examples/Gateway/listgate.readme