2 files changed, 14 insertions, 13 deletions

diff --git a/news/p5-Gateway/Makefile b/news/p5-Gateway/Makefile
index d2e91f66cb20..5ec2eaa75f86 100644
--- a/news/p5-Gateway/Makefile
+++ b/news/p5-Gateway/Makefile
@@ -23,10 +23,10 @@ PERL_CONFIGURE=	yes
 MAN3=		News::Gateway.3
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/Gateway
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${PREFIX} ${EXAMPLESDIR}
 .for file in listgate listgate.m4 listgate.readme raccmod raccpost racrmod
-	${INSTALL_DATA} ${WRKSRC}/examples/${file} ${PREFIX}/share/examples/Gateway
+	${INSTALL_DATA} ${WRKSRC}/examples/${file} ${EXAMPLESDIR}
 .endfor
 .endif
 
diff --git a/news/p5-Gateway/pkg-plist b/news/p5-Gateway/pkg-plist
index bb8b15d85c12..58625c907cee 100644
--- a/news/p5-Gateway/pkg-plist
+++ b/news/p5-Gateway/pkg-plist
@@ -1,6 +1,5 @@
 %%SITE_PERL%%/News/Gateway.pm
 %%SITE_PERL%%/News/Gateway.pod
-@dirrmtry %%SITE_PERL%%/News
 %%SITE_PERL%%/auto/News/Gateway/anykeyword.al
 %%SITE_PERL%%/auto/News/Gateway/bodyheaders.al
 %%SITE_PERL%%/auto/News/Gateway/cleanbody.al
@@ -20,14 +19,16 @@
 %%SITE_PERL%%/auto/News/Gateway/post.al
 %%SITE_PERL%%/auto/News/Gateway/previoushop.al
 %%SITE_PERL%%/auto/News/Gateway/whitelist.al
-@dirrmtry %%SITE_PERL%%/auto/News/Gateway
-@dirrmtry %%SITE_PERL%%/auto/News
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Gateway/.packlist
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/listgate
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/listgate.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/listgate.readme
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/raccmod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/raccpost
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/racrmod
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Gateway
-share/examples/Gateway/listgate
-share/examples/Gateway/listgate.m4
-share/examples/Gateway/listgate.readme
-share/examples/Gateway/raccmod
-share/examples/Gateway/raccpost
-share/examples/Gateway/racrmod
-@dirrm share/examples/Gateway
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News
+@dirrm %%SITE_PERL%%/auto/News/Gateway
+@dirrm %%SITE_PERL%%/auto/News
+@dirrm %%SITE_PERL%%/News