Make it so that the default Perl is always called perl5.

- Move Perl's man1 files along with its man3 files.
- Move where Perl installs its modules man1 pages.
- Convert the ports installing man1 pages.
- Make different Perl versions installable at the same time.
  Though you should note that only the default version can be used to
  install Perl modules, and the non default Perl versions cannot use the
  modules installed via ports if they contain .so as they are installed
  in a version specific directory.

Reviewed by:	bapt (the Mk bits)
Exp-run by:	antoine
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D3542

65 files changed, 107 insertions, 107 deletions

diff --git a/www/checkbot/Makefile b/www/checkbot/Makefile
index f075c23a9426..7705aa79fd88 100644
--- a/www/checkbot/Makefile
+++ b/www/checkbot/Makefile
@@ -25,6 +25,6 @@ USES=		cpe perl5
 CPE_VENDOR=	degraaff
 USE_PERL5=	configure
 
-PLIST_FILES=	bin/checkbot man/man1/checkbot.1.gz
+PLIST_FILES=	bin/checkbot ${SITE_MAN1}/checkbot.1.gz
 
 .include <bsd.port.mk>
diff --git a/www/interchange/pkg-plist b/www/interchange/pkg-plist
index 971fec249dc2..31f442edec59 100644
--- a/www/interchange/pkg-plist
+++ b/www/interchange/pkg-plist
@@ -1730,20 +1730,20 @@ interchange/subdomains.cfg
 %%SITE_PERL%%/hints.pl
 %%SITE_PERL%%/install_lsb.pl
 %%SITE_PERL%%/relocate.pl
-man/man1/compile_link.1.gz
-man/man1/config_prog.1.gz
-man/man1/configdump.1.gz
-man/man1/crontab.1.gz
-man/man1/expire.1.gz
-man/man1/expireall.1.gz
-man/man1/findtags.1.gz
-man/man1/ic_mod_perl.1.gz
-man/man1/interchange.1.gz
-man/man1/localize.1.gz
-man/man1/makecat.1.gz
-man/man1/offline.1.gz
-man/man1/restart.1.gz
-man/man1/update.1.gz
+%%PERL5_MAN1%%/compile_link.1.gz
+%%PERL5_MAN1%%/config_prog.1.gz
+%%PERL5_MAN1%%/configdump.1.gz
+%%PERL5_MAN1%%/crontab.1.gz
+%%PERL5_MAN1%%/expire.1.gz
+%%PERL5_MAN1%%/expireall.1.gz
+%%PERL5_MAN1%%/findtags.1.gz
+%%PERL5_MAN1%%/ic_mod_perl.1.gz
+%%PERL5_MAN1%%/interchange.1.gz
+%%PERL5_MAN1%%/localize.1.gz
+%%PERL5_MAN1%%/makecat.1.gz
+%%PERL5_MAN1%%/offline.1.gz
+%%PERL5_MAN1%%/restart.1.gz
+%%PERL5_MAN1%%/update.1.gz
 %%PERL5_MAN3%%/Vend::Accounting::SQL_Ledger.3.gz
 %%PERL5_MAN3%%/Vend::Cart.3.gz
 %%PERL5_MAN3%%/Vend::CounterFile.3.gz
diff --git a/www/p5-Amon2/pkg-plist b/www/p5-Amon2/pkg-plist
index 6777669eba93..184bc8e4cc00 100644
--- a/www/p5-Amon2/pkg-plist
+++ b/www/p5-Amon2/pkg-plist
@@ -25,7 +25,7 @@ bin/amon2-setup.pl
 %%PERL5_MAN3%%/auto::share::dist::Amon2::flavor::Basic::lib::__PATH__.3.gz
 %%PERL5_MAN3%%/auto::share::dist::Amon2::flavor::Basic::lib::__PATH__::Web::Plugin::Session.3.gz
 %%PERL5_MAN3%%/auto::share::dist::Amon2::flavor::Minimum::lib::__PATH__.3.gz
-man/man1/amon2-setup.pl.1.gz
+%%PERL5_MAN1%%/amon2-setup.pl.1.gz
 %%SITE_PERL%%/Amon2.pm
 %%SITE_PERL%%/Amon2/Config/Simple.pm
 %%SITE_PERL%%/Amon2/ContextGuard.pm
diff --git a/www/p5-Apache-ASP/pkg-plist b/www/p5-Apache-ASP/pkg-plist
index 8671131d6a59..b2a9a6c90ea5 100644
--- a/www/p5-Apache-ASP/pkg-plist
+++ b/www/p5-Apache-ASP/pkg-plist
@@ -29,4 +29,4 @@ bin/asp-perl
 %%SITE_PERL%%/Apache/ASP/StateManager.pm
 %%SITE_PERL%%/Bundle/Apache/ASP.pm
 %%SITE_PERL%%/Bundle/Apache/ASP/Extra.pm
-man/man1/asp-perl.1.gz
+%%PERL5_MAN1%%/asp-perl.1.gz
diff --git a/www/p5-App-Nopaste/pkg-plist b/www/p5-App-Nopaste/pkg-plist
index b8cc295a167b..c43236829567 100644
--- a/www/p5-App-Nopaste/pkg-plist
+++ b/www/p5-App-Nopaste/pkg-plist
@@ -25,4 +25,4 @@ bin/nopaste
 %%PERL5_MAN3%%/App::Nopaste::Service::Snitch.3.gz
 %%PERL5_MAN3%%/App::Nopaste::Service::Ubuntu.3.gz
 %%PERL5_MAN3%%/App::Nopaste::Service::ssh.3.gz
-man/man1/nopaste.1.gz
+%%PERL5_MAN1%%/nopaste.1.gz
diff --git a/www/p5-App-gist/pkg-plist b/www/p5-App-gist/pkg-plist
index 9541c470857d..874c6bb78875 100644
--- a/www/p5-App-gist/pkg-plist
+++ b/www/p5-App-gist/pkg-plist
@@ -1,4 +1,4 @@
 bin/gist
 %%PERL5_MAN3%%/App::gist.3.gz
 %%SITE_PERL%%/App/gist.pm
-man/man1/gist.1.gz
+%%PERL5_MAN1%%/gist.1.gz
diff --git a/www/p5-Bigtop/pkg-plist b/www/p5-Bigtop/pkg-plist
index 58d3df1e3c75..c384608db3a5 100644
--- a/www/p5-Bigtop/pkg-plist
+++ b/www/p5-Bigtop/pkg-plist
@@ -90,8 +90,8 @@ bin/tentmaker
 %%SITE_PERL%%/Bigtop/TentMaker.pm
 %%SITE_PERL%%/Bigtop/TentMakerPath.pm
 %%SITE_PERL%%/Bigtop/grammar.pod
-man/man1/bigtop.1.gz
-man/man1/tentmaker.1.gz
+%%PERL5_MAN1%%/bigtop.1.gz
+%%PERL5_MAN1%%/tentmaker.1.gz
 share/TentMaker/tenttemplates/app_body.ttc
 share/TentMaker/tenttemplates/app_body_div.ttc
 share/TentMaker/tenttemplates/app_config.ttc
diff --git a/www/p5-Blog-Spam/pkg-plist b/www/p5-Blog-Spam/pkg-plist
index 073a1ded2ae4..e27bba622570 100644
--- a/www/p5-Blog-Spam/pkg-plist
+++ b/www/p5-Blog-Spam/pkg-plist
@@ -47,4 +47,4 @@ bin/blogspam
 %%PERL5_MAN3%%/Blog::Spam::Plugin::surbl.3.gz
 %%PERL5_MAN3%%/Blog::Spam::Plugin::wordcount.3.gz
 %%PERL5_MAN3%%/Blog::Spam::Server.3.gz
-man/man1/blogspam.1.gz
+%%PERL5_MAN1%%/blogspam.1.gz
diff --git a/www/p5-CGI-Kwiki/pkg-plist b/www/p5-CGI-Kwiki/pkg-plist
index 610230ecaacf..1615110afeb0 100644
--- a/www/p5-CGI-Kwiki/pkg-plist
+++ b/www/p5-CGI-Kwiki/pkg-plist
@@ -64,4 +64,4 @@ bin/kwiki-install
 %%PERL5_MAN3%%/CGI::Kwiki::Slides.3.gz
 %%PERL5_MAN3%%/CGI::Kwiki::Style.3.gz
 %%PERL5_MAN3%%/CGI::Kwiki::Template.3.gz
-man/man1/kwiki-install.1.gz
+%%PERL5_MAN1%%/kwiki-install.1.gz
diff --git a/www/p5-Catalyst-Runtime/pkg-plist b/www/p5-Catalyst-Runtime/pkg-plist
index 0958a22f3b3f..2b26a58a4650 100644
--- a/www/p5-Catalyst-Runtime/pkg-plist
+++ b/www/p5-Catalyst-Runtime/pkg-plist
@@ -109,4 +109,4 @@ bin/catalyst.pl
 %%PERL5_MAN3%%/Catalyst::Upgrading.3.gz
 %%PERL5_MAN3%%/Catalyst::Utils.3.gz
 %%PERL5_MAN3%%/Catalyst::View.3.gz
-man/man1/catalyst.pl.1.gz
+%%PERL5_MAN1%%/catalyst.pl.1.gz
diff --git a/www/p5-Corona/pkg-plist b/www/p5-Corona/pkg-plist
index 55b1210e61c6..ae450ed2dfe2 100644
--- a/www/p5-Corona/pkg-plist
+++ b/www/p5-Corona/pkg-plist
@@ -1,5 +1,5 @@
 bin/corona
-man/man1/corona.1.gz
+%%PERL5_MAN1%%/corona.1.gz
 %%PERL5_MAN3%%/Corona.3.gz
 %%PERL5_MAN3%%/Plack::Handler::Corona.3.gz
 %%SITE_PERL%%/Corona.pm
diff --git a/www/p5-Dancer/pkg-plist b/www/p5-Dancer/pkg-plist
index 96e87113db6f..b5fb3dd2b187 100644
--- a/www/p5-Dancer/pkg-plist
+++ b/www/p5-Dancer/pkg-plist
@@ -1,4 +1,4 @@
-man/man1/dancer.1.gz
+%%PERL5_MAN1%%/dancer.1.gz
 %%PERL5_MAN3%%/Dancer.3.gz
 %%PERL5_MAN3%%/Dancer::App.3.gz
 %%PERL5_MAN3%%/Dancer::Config.3.gz
diff --git a/www/p5-Dancer2/pkg-plist b/www/p5-Dancer2/pkg-plist
index 1769dfb07335..d63604605179 100644
--- a/www/p5-Dancer2/pkg-plist
+++ b/www/p5-Dancer2/pkg-plist
@@ -153,4 +153,4 @@ bin/dancer2
 %%PERL5_MAN3%%/Dancer2::Template::Tiny.3.gz
 %%PERL5_MAN3%%/Dancer2::Test.3.gz
 %%PERL5_MAN3%%/Dancer2::Tutorial.3.gz
-man/man1/dancer2.1.gz
+%%PERL5_MAN1%%/dancer2.1.gz
diff --git a/www/p5-FCGI-Spawn/pkg-plist b/www/p5-FCGI-Spawn/pkg-plist
index 1a663185c45b..b7e9ff65c144 100644
--- a/www/p5-FCGI-Spawn/pkg-plist
+++ b/www/p5-FCGI-Spawn/pkg-plist
@@ -2,7 +2,7 @@
 %%SITE_PERL%%/FCGI/Spawn/BinUtils.pm
 %%PERL5_MAN3%%/FCGI::Spawn.3.gz
 %%PERL5_MAN3%%/FCGI::Spawn::BinUtils.3.gz
-man/man1/fcgi_spawn.1.gz
+%%PERL5_MAN1%%/fcgi_spawn.1.gz
 bin/fcgi_spawn
 etc/fcgi_spawn/fcgi_spawn.conf.sample
 share/doc/p5-FCGI-Spawn/README
diff --git a/www/p5-FEAR-API/pkg-plist b/www/p5-FEAR-API/pkg-plist
index a57382537512..56ff15812d9b 100644
--- a/www/p5-FEAR-API/pkg-plist
+++ b/www/p5-FEAR-API/pkg-plist
@@ -28,4 +28,4 @@ bin/fearperl
 %%SITE_PERL%%/FEAR/API/SourceFilter.pm
 %%SITE_PERL%%/FEAR/API/Translate.pm
 %%SITE_PERL%%/FEAR/API/Translate/Backend.pm
-man/man1/fear.1.gz
+%%PERL5_MAN1%%/fear.1.gz
diff --git a/www/p5-Feersum/pkg-plist b/www/p5-Feersum/pkg-plist
index 7f74400f59a3..9a45d2c47ba4 100644
--- a/www/p5-Feersum/pkg-plist
+++ b/www/p5-Feersum/pkg-plist
@@ -10,4 +10,4 @@ bin/feersum
 %%PERL5_MAN3%%/Feersum::Connection::Handle.3.gz
 %%PERL5_MAN3%%/Feersum::Runner.3.gz
 %%PERL5_MAN3%%/Plack::Handler::Feersum.3.gz
-man/man1/feersum.1.gz
+%%PERL5_MAN1%%/feersum.1.gz
diff --git a/www/p5-File-Mork/pkg-plist b/www/p5-File-Mork/pkg-plist
index bd56e9281957..1f96af9a6570 100644
--- a/www/p5-File-Mork/pkg-plist
+++ b/www/p5-File-Mork/pkg-plist
@@ -1,4 +1,4 @@
 bin/mork
 %%SITE_PERL%%/File/Mork.pm
 %%PERL5_MAN3%%/File::Mork.3.gz
-man/man1/mork.1.gz
+%%PERL5_MAN1%%/mork.1.gz
diff --git a/www/p5-Flickr-API/pkg-plist b/www/p5-Flickr-API/pkg-plist
index 80573515c8ba..22218d2e53f9 100644
--- a/www/p5-Flickr-API/pkg-plist
+++ b/www/p5-Flickr-API/pkg-plist
@@ -14,5 +14,5 @@ bin/flickr_make_stored_config.pl
 %%PERL5_MAN3%%/Flickr::API::Request.3.gz
 %%PERL5_MAN3%%/Flickr::API::Response.3.gz
 %%PERL5_MAN3%%/Flickr::Tools.3.gz
-man/man1/flickr_dump_stored_config.pl.1.gz
-man/man1/flickr_make_stored_config.pl.1.gz
+%%PERL5_MAN1%%/flickr_dump_stored_config.pl.1.gz
+%%PERL5_MAN1%%/flickr_make_stored_config.pl.1.gz
diff --git a/www/p5-Flickr-Upload/pkg-plist b/www/p5-Flickr-Upload/pkg-plist
index f285d8068d5a..7def8740c594 100644
--- a/www/p5-Flickr-Upload/pkg-plist
+++ b/www/p5-Flickr-Upload/pkg-plist
@@ -1,4 +1,4 @@
 bin/flickr_upload
 %%PERL5_MAN3%%/Flickr::Upload.3.gz
 %%SITE_PERL%%/Flickr/Upload.pm
-man/man1/flickr_upload.1.gz
+%%PERL5_MAN1%%/flickr_upload.1.gz
diff --git a/www/p5-Gungho/pkg-plist b/www/p5-Gungho/pkg-plist
index b8d16f3b52da..854f5a8bd7fc 100644
--- a/www/p5-Gungho/pkg-plist
+++ b/www/p5-Gungho/pkg-plist
@@ -105,4 +105,4 @@ bin/gungho
 %%SITE_PERL%%/Gungho/Request/http.pm
 %%SITE_PERL%%/Gungho/Response.pm
 %%SITE_PERL%%/Gungho/Util.pm
-man/man1/gungho.1.gz
+%%PERL5_MAN1%%/gungho.1.gz
diff --git a/www/p5-HTML-Clean/pkg-plist b/www/p5-HTML-Clean/pkg-plist
index d4243c842253..a0fa30f5070b 100644
--- a/www/p5-HTML-Clean/pkg-plist
+++ b/www/p5-HTML-Clean/pkg-plist
@@ -2,4 +2,4 @@ bin/htmlclean
 %%PERL5_MAN3%%/HTML::Clean.3.gz
 %%SITE_PERL%%/HTML/Clean.pm
 %%SITE_PERL%%/auto/HTML/Clean/autosplit.ix
-man/man1/htmlclean.1.gz
+%%PERL5_MAN1%%/htmlclean.1.gz
diff --git a/www/p5-HTML-FormFu/pkg-plist b/www/p5-HTML-FormFu/pkg-plist
index c242c0c5e158..cd77ec649b1d 100644
--- a/www/p5-HTML-FormFu/pkg-plist
+++ b/www/p5-HTML-FormFu/pkg-plist
@@ -315,5 +315,5 @@ bin/html_formfu_dumpconf.pl
 %%PERL5_MAN3%%/HTML::FormFu::UploadParam.3.gz
 %%PERL5_MAN3%%/HTML::FormFu::Validator.3.gz
 %%PERL5_MAN3%%/HTML::FormFu::Validator::Callback.3.gz
-man/man1/html_formfu_deploy.pl.1.gz
-man/man1/html_formfu_dumpconf.pl.1.gz
+%%PERL5_MAN1%%/html_formfu_deploy.pl.1.gz
+%%PERL5_MAN1%%/html_formfu_dumpconf.pl.1.gz
diff --git a/www/p5-HTML-FromANSI/pkg-plist b/www/p5-HTML-FromANSI/pkg-plist
index fa89ebbc5cd6..6111f3951f98 100644
--- a/www/p5-HTML-FromANSI/pkg-plist
+++ b/www/p5-HTML-FromANSI/pkg-plist
@@ -1,4 +1,4 @@
 bin/ansi2html
 %%PERL5_MAN3%%/HTML::FromANSI.3.gz
 %%SITE_PERL%%/HTML/FromANSI.pm
-man/man1/ansi2html.1.gz
+%%PERL5_MAN1%%/ansi2html.1.gz
diff --git a/www/p5-HTML-FromText/pkg-plist b/www/p5-HTML-FromText/pkg-plist
index e976e1100ee5..698093044e4a 100644
--- a/www/p5-HTML-FromText/pkg-plist
+++ b/www/p5-HTML-FromText/pkg-plist
@@ -1,4 +1,4 @@
 bin/text2html
 %%SITE_PERL%%/HTML/FromText.pm
-man/man1/text2html.1.gz
+%%PERL5_MAN1%%/text2html.1.gz
 %%PERL5_MAN3%%/HTML::FromText.3.gz
diff --git a/www/p5-HTML-GenToc/pkg-plist b/www/p5-HTML-GenToc/pkg-plist
index 316273e08c3d..54c733e7b2a0 100644
--- a/www/p5-HTML-GenToc/pkg-plist
+++ b/www/p5-HTML-GenToc/pkg-plist
@@ -1,4 +1,4 @@
 bin/hypertoc
 %%PERL5_MAN3%%/HTML::GenToc.3.gz
 %%SITE_PERL%%/HTML/GenToc.pm
-man/man1/hypertoc.1.gz
+%%PERL5_MAN1%%/hypertoc.1.gz
diff --git a/www/p5-HTML-Perlinfo/pkg-plist b/www/p5-HTML-Perlinfo/pkg-plist
index 772588a14360..7b19b02b4e1b 100644
--- a/www/p5-HTML-Perlinfo/pkg-plist
+++ b/www/p5-HTML-Perlinfo/pkg-plist
@@ -3,7 +3,7 @@ bin/perlinfo
 %%PERL5_MAN3%%/HTML::Perlinfo::HTML.3.gz
 %%PERL5_MAN3%%/HTML::Perlinfo::Loaded.3.gz
 %%PERL5_MAN3%%/HTML::Perlinfo::Modules.3.gz
-man/man1/perlinfo.1.gz
+%%PERL5_MAN1%%/perlinfo.1.gz
 %%SITE_PERL%%/HTML/Perlinfo.pm
 %%SITE_PERL%%/HTML/Perlinfo/Apache.pm
 %%SITE_PERL%%/HTML/Perlinfo/Base.pm
diff --git a/www/p5-HTML-Seamstress/pkg-plist b/www/p5-HTML-Seamstress/pkg-plist
index 6bd0f24b0a3a..79e8ab39a780 100644
--- a/www/p5-HTML-Seamstress/pkg-plist
+++ b/www/p5-HTML-Seamstress/pkg-plist
@@ -41,5 +41,5 @@ bin/spkg.pl
 %%SITE_PERL%%/HTML/sbase.pl
 %%SITE_PERL%%/HTML/spkg.pl
 %%SITE_PERL%%/XML/Seamstress.pm
-man/man1/sbase.pl.1.gz
-man/man1/spkg.pl.1.gz
+%%PERL5_MAN1%%/sbase.pl.1.gz
+%%PERL5_MAN1%%/spkg.pl.1.gz
diff --git a/www/p5-HTML-SimpleLinkExtor/pkg-plist b/www/p5-HTML-SimpleLinkExtor/pkg-plist
index edd9c2fda66b..a603ff02cfa5 100644
--- a/www/p5-HTML-SimpleLinkExtor/pkg-plist
+++ b/www/p5-HTML-SimpleLinkExtor/pkg-plist
@@ -2,4 +2,4 @@ bin/linktractor
 %%PERL5_MAN3%%/HTML::SimpleLinkExtor.3.gz
 %%SITE_PERL%%/HTML/SimpleLinkExtor.pm
 %%SITE_PERL%%/auto/HTML/SimpleLinkExtor/autosplit.ix
-man/man1/linktractor.1.gz
+%%PERL5_MAN1%%/linktractor.1.gz
diff --git a/www/p5-HTML-WikiConverter/pkg-plist b/www/p5-HTML-WikiConverter/pkg-plist
index 8223cd0ffc6c..503e337b0b83 100644
--- a/www/p5-HTML-WikiConverter/pkg-plist
+++ b/www/p5-HTML-WikiConverter/pkg-plist
@@ -7,4 +7,4 @@ bin/html2wiki
 %%SITE_PERL%%/HTML/WikiConverter/Dialects.pod
 %%SITE_PERL%%/HTML/WikiConverter/Normalizer.pm
 %%SITE_PERL%%/HTML/WikiConverter/WebApp.pm
-man/man1/html2wiki.1.gz
+%%PERL5_MAN1%%/html2wiki.1.gz
diff --git a/www/p5-HTTP-DAV/pkg-plist b/www/p5-HTTP-DAV/pkg-plist
index 40a7d2bb2e66..429c7ce680de 100644
--- a/www/p5-HTTP-DAV/pkg-plist
+++ b/www/p5-HTTP-DAV/pkg-plist
@@ -12,4 +12,4 @@ bin/dave
 %%PERL5_MAN3%%/HTTP::DAV::Lock.3.gz
 %%PERL5_MAN3%%/HTTP::DAV::Resource.3.gz
 %%PERL5_MAN3%%/HTTP::DAV::Response.3.gz
-man/man1/dave.1.gz
+%%PERL5_MAN1%%/dave.1.gz
diff --git a/www/p5-HTTP-Recorder/pkg-plist b/www/p5-HTTP-Recorder/pkg-plist
index 210907319a3d..e340e6364876 100644
--- a/www/p5-HTTP-Recorder/pkg-plist
+++ b/www/p5-HTTP-Recorder/pkg-plist
@@ -2,4 +2,4 @@ bin/httprecorder
 %%PERL5_MAN3%%/HTTP::Recorder.3.gz
 %%SITE_PERL%%/HTTP/Recorder.pm
 %%SITE_PERL%%/HTTP/Recorder/Logger.pm
-man/man1/httprecorder.1.gz
+%%PERL5_MAN1%%/httprecorder.1.gz
diff --git a/www/p5-HTTP-SimpleLinkChecker/pkg-plist b/www/p5-HTTP-SimpleLinkChecker/pkg-plist
index 6b2218c5030a..5af777d8d776 100644
--- a/www/p5-HTTP-SimpleLinkChecker/pkg-plist
+++ b/www/p5-HTTP-SimpleLinkChecker/pkg-plist
@@ -1,4 +1,4 @@
 bin/http_status
 %%PERL5_MAN3%%/HTTP::SimpleLinkChecker.3.gz
 %%SITE_PERL%%/HTTP/SimpleLinkChecker.pm
-man/man1/http_status.1.gz
+%%PERL5_MAN1%%/http_status.1.gz
diff --git a/www/p5-HTTP-WebTest/pkg-plist b/www/p5-HTTP-WebTest/pkg-plist
index 32cdcc615778..7d806a20b2d8 100644
--- a/www/p5-HTTP-WebTest/pkg-plist
+++ b/www/p5-HTTP-WebTest/pkg-plist
@@ -25,7 +25,7 @@ bin/wt
 %%PERL5_MAN3%%/HTTP::WebTest::Test.3.gz
 %%PERL5_MAN3%%/HTTP::WebTest::TestResult.3.gz
 %%PERL5_MAN3%%/HTTP::WebTest::Utils.3.gz
-man/man1/wt.1.gz
+%%PERL5_MAN1%%/wt.1.gz
 %%SITE_PERL%%/Bundle/HTTP/WebTest.pm
 %%SITE_PERL%%/HTTP/WebTest.pm
 %%SITE_PERL%%/HTTP/WebTest.pm.in
diff --git a/www/p5-HTTPD-Log-Filter/pkg-plist b/www/p5-HTTPD-Log-Filter/pkg-plist
index b8ae58ac8844..a3e871cc3bfb 100644
--- a/www/p5-HTTPD-Log-Filter/pkg-plist
+++ b/www/p5-HTTPD-Log-Filter/pkg-plist
@@ -1,4 +1,4 @@
 bin/exclude_robots
 %%PERL5_MAN3%%/HTTPD::Log::Filter.3.gz
-man/man1/exclude_robots.1.gz
+%%PERL5_MAN1%%/exclude_robots.1.gz
 %%SITE_PERL%%/HTTPD/Log/Filter.pm
diff --git a/www/p5-Jemplate/pkg-plist b/www/p5-Jemplate/pkg-plist
index 6cfda59561d1..a6052f21fc20 100644
--- a/www/p5-Jemplate/pkg-plist
+++ b/www/p5-Jemplate/pkg-plist
@@ -4,7 +4,7 @@ bin/jemplate
 %%PERL5_MAN3%%/Jemplate::Parser.3.gz
 %%PERL5_MAN3%%/Jemplate::Runtime.3.gz
 %%PERL5_MAN3%%/Jemplate::Runtime::Compact.3.gz
-man/man1/jemplate.1.gz
+%%PERL5_MAN1%%/jemplate.1.gz
 %%SITE_PERL%%/Jemplate.pm
 %%SITE_PERL%%/Jemplate.pod
 %%SITE_PERL%%/Jemplate/Directive.pm
diff --git a/www/p5-Mason/pkg-plist b/www/p5-Mason/pkg-plist
index ea91e26a1416..9f975f5d7a2e 100644
--- a/www/p5-Mason/pkg-plist
+++ b/www/p5-Mason/pkg-plist
@@ -33,7 +33,7 @@ bin/mason.pl
 %%PERL5_MAN3%%/Mason::PluginRole.3.gz
 %%PERL5_MAN3%%/Mason::Request.3.gz
 %%PERL5_MAN3%%/Mason::Result.3.gz
-man/man1/mason.pl.1.gz
+%%PERL5_MAN1%%/mason.pl.1.gz
 %%SITE_PERL%%/Mason.pm
 %%SITE_PERL%%/Mason/App.pm
 %%SITE_PERL%%/Mason/CodeCache.pm
diff --git a/www/p5-McBain/pkg-plist b/www/p5-McBain/pkg-plist
index 090f226cc854..1b56c2a751e0 100644
--- a/www/p5-McBain/pkg-plist
+++ b/www/p5-McBain/pkg-plist
@@ -3,4 +3,4 @@ bin/mcbain2pod
 %%SITE_PERL%%/McBain/Directly.pm
 %%PERL5_MAN3%%/McBain.3.gz
 %%PERL5_MAN3%%/McBain::Directly.3.gz
-man/man1/mcbain2pod.1.gz
+%%PERL5_MAN1%%/mcbain2pod.1.gz
diff --git a/www/p5-MojoMojo/pkg-plist b/www/p5-MojoMojo/pkg-plist
index 59d4bf438cdc..09f9d94abeee 100644
--- a/www/p5-MojoMojo/pkg-plist
+++ b/www/p5-MojoMojo/pkg-plist
@@ -510,11 +510,11 @@ bin/mojomojo_update_db.pl
 %%PERL5_MAN3%%/MojoMojo::WordDiff.3.gz
 %%PERL5_MAN3%%/Text::SmartyPants.3.gz
 %%PERL5_MAN3%%/Text::Wikispaces2Markdown.3.gz
-man/man1/mojomojo_cgi.pl.1.gz
-man/man1/mojomojo_create.pl.1.gz
-man/man1/mojomojo_fastcgi.pl.1.gz
-man/man1/mojomojo_fastcgi_manage.pl.1.gz
-man/man1/mojomojo_server.pl.1.gz
-man/man1/mojomojo_spawn_db.pl.1.gz
-man/man1/mojomojo_test.pl.1.gz
-man/man1/mojomojo_update_db.pl.1.gz
+%%PERL5_MAN1%%/mojomojo_cgi.pl.1.gz
+%%PERL5_MAN1%%/mojomojo_create.pl.1.gz
+%%PERL5_MAN1%%/mojomojo_fastcgi.pl.1.gz
+%%PERL5_MAN1%%/mojomojo_fastcgi_manage.pl.1.gz
+%%PERL5_MAN1%%/mojomojo_server.pl.1.gz
+%%PERL5_MAN1%%/mojomojo_spawn_db.pl.1.gz
+%%PERL5_MAN1%%/mojomojo_test.pl.1.gz
+%%PERL5_MAN1%%/mojomojo_update_db.pl.1.gz
diff --git a/www/p5-Mojolicious/pkg-plist b/www/p5-Mojolicious/pkg-plist
index 8b6cfea93336..f1075b95a831 100644
--- a/www/p5-Mojolicious/pkg-plist
+++ b/www/p5-Mojolicious/pkg-plist
@@ -245,6 +245,6 @@ bin/morbo
 %%PERL5_MAN3%%/Mojolicious::Validator::Validation.3.gz
 %%PERL5_MAN3%%/Test::Mojo.3.gz
 %%PERL5_MAN3%%/ojo.3.gz
-man/man1/hypnotoad.1.gz
-man/man1/mojo.1.gz
-man/man1/morbo.1.gz
+%%PERL5_MAN1%%/hypnotoad.1.gz
+%%PERL5_MAN1%%/mojo.1.gz
+%%PERL5_MAN1%%/morbo.1.gz
diff --git a/www/p5-Net-FireEagle/pkg-plist b/www/p5-Net-FireEagle/pkg-plist
index 5cb6c0031abb..8aa733d2eb3b 100644
--- a/www/p5-Net-FireEagle/pkg-plist
+++ b/www/p5-Net-FireEagle/pkg-plist
@@ -1,4 +1,4 @@
 bin/fireeagle
 %%PERL5_MAN3%%/Net::FireEagle.3.gz
-man/man1/fireeagle.1.gz
+%%PERL5_MAN1%%/fireeagle.1.gz
 %%SITE_PERL%%/Net/FireEagle.pm
diff --git a/www/p5-Perlanet/pkg-plist b/www/p5-Perlanet/pkg-plist
index 1c121db722db..a0e07616fc0a 100644
--- a/www/p5-Perlanet/pkg-plist
+++ b/www/p5-Perlanet/pkg-plist
@@ -21,4 +21,4 @@ bin/perlanet
 %%SITE_PERL%%/Perlanet/Trait/TemplateToolkit.pm
 %%SITE_PERL%%/Perlanet/Trait/Tidy.pm
 %%SITE_PERL%%/Perlanet/Trait/YAMLConfig.pm
-man/man1/perlanet.1.gz
+%%PERL5_MAN1%%/perlanet.1.gz
diff --git a/www/p5-Plack-Middleware-ServerStatus-Lite/pkg-plist b/www/p5-Plack-Middleware-ServerStatus-Lite/pkg-plist
index 779bd8416dd8..ab18dc7b6950 100644
--- a/www/p5-Plack-Middleware-ServerStatus-Lite/pkg-plist
+++ b/www/p5-Plack-Middleware-ServerStatus-Lite/pkg-plist
@@ -1,4 +1,4 @@
 bin/server-status
-man/man1/server-status.1.gz
+%%PERL5_MAN1%%/server-status.1.gz
 %%PERL5_MAN3%%/Plack::Middleware::ServerStatus::Lite.3.gz
 %%SITE_PERL%%/Plack/Middleware/ServerStatus/Lite.pm
diff --git a/www/p5-Plack/pkg-plist b/www/p5-Plack/pkg-plist
index 59d4d1a6d1fb..c3c97acc45be 100644
--- a/www/p5-Plack/pkg-plist
+++ b/www/p5-Plack/pkg-plist
@@ -1,4 +1,4 @@
-man/man1/plackup.1.gz
+%%PERL5_MAN1%%/plackup.1.gz
 %%PERL5_MAN3%%/HTTP::Message::PSGI.3.gz
 %%PERL5_MAN3%%/HTTP::Server::PSGI.3.gz
 %%PERL5_MAN3%%/Plack.3.gz
diff --git a/www/p5-Pod-Site/pkg-plist b/www/p5-Pod-Site/pkg-plist
index f44548351b30..6dfe3c7bfcf0 100644
--- a/www/p5-Pod-Site/pkg-plist
+++ b/www/p5-Pod-Site/pkg-plist
@@ -1,6 +1,6 @@
 bin/podsite
 %%PERL5_MAN3%%/Pod::Site.3.gz
-man/man1/podsite.1.gz
+%%PERL5_MAN1%%/podsite.1.gz
 %%SITE_PERL%%/Pod/Site.pm
 %%SITE_PERL%%/Pod/Site/podsite.css
 %%SITE_PERL%%/Pod/Site/podsite.js
diff --git a/www/p5-PodToHTML/pkg-plist b/www/p5-PodToHTML/pkg-plist
index 87896a5b3cef..12b3cec9492c 100644
--- a/www/p5-PodToHTML/pkg-plist
+++ b/www/p5-PodToHTML/pkg-plist
@@ -3,4 +3,4 @@ bin/podtohtml
 %%SITE_PERL%%/Pod/Links.pm
 %%PERL5_MAN3%%/Pod::HTML_Elements.3.gz
 %%PERL5_MAN3%%/Pod::Links.3.gz
-man/man1/podtohtml.1.gz
+%%PERL5_MAN1%%/podtohtml.1.gz
diff --git a/www/p5-Reaction/pkg-plist b/www/p5-Reaction/pkg-plist
index 3912c66be59a..9eb008f3e80c 100644
--- a/www/p5-Reaction/pkg-plist
+++ b/www/p5-Reaction/pkg-plist
@@ -449,8 +449,8 @@ bin/rclass_back_to_moose.pl
 %%SITE_PERL%%/auto/share/dist/Reaction/skin/default/layout/site_layout.tt
 %%SITE_PERL%%/auto/share/dist/Reaction/skin/default/skin.conf
 %%SITE_PERL%%/auto/share/dist/Reaction/skin/defaults.conf
-man/man1/componentui_cgi.pl.1.gz
-man/man1/componentui_create.pl.1.gz
-man/man1/componentui_fastcgi.pl.1.gz
-man/man1/componentui_server.pl.1.gz
-man/man1/componentui_test.pl.1.gz
+%%PERL5_MAN1%%/componentui_cgi.pl.1.gz
+%%PERL5_MAN1%%/componentui_create.pl.1.gz
+%%PERL5_MAN1%%/componentui_fastcgi.pl.1.gz
+%%PERL5_MAN1%%/componentui_server.pl.1.gz
+%%PERL5_MAN1%%/componentui_test.pl.1.gz
diff --git a/www/p5-Scrappy/pkg-plist b/www/p5-Scrappy/pkg-plist
index 847148985b07..292851ce7ffc 100644
--- a/www/p5-Scrappy/pkg-plist
+++ b/www/p5-Scrappy/pkg-plist
@@ -26,4 +26,4 @@ bin/scrappy
 %%PERL5_MAN3%%/Scrappy::Scraper::Control.3.gz
 %%PERL5_MAN3%%/Scrappy::Scraper::Parser.3.gz
 %%PERL5_MAN3%%/Scrappy::Session.3.gz
-man/man1/scrappy.1.gz
+%%PERL5_MAN1%%/scrappy.1.gz
diff --git a/www/p5-Squatting/pkg-plist b/www/p5-Squatting/pkg-plist
index 9c0e0bf978ab..3b42a1a14b3e 100644
--- a/www/p5-Squatting/pkg-plist
+++ b/www/p5-Squatting/pkg-plist
@@ -14,7 +14,7 @@ bin/squatting
 %%PERL5_MAN3%%/Squatting::With::Log.3.gz
 %%PERL5_MAN3%%/Squatting::With::MockRequest.3.gz
 %%PERL5_MAN3%%/Squatting::With::Mount.3.gz
-man/man1/squatting.1.gz
+%%PERL5_MAN1%%/squatting.1.gz
 %%SITE_PERL%%/Squatting.pm
 %%SITE_PERL%%/Squatting/Controller.pm
 %%SITE_PERL%%/Squatting/H.pm
diff --git a/www/p5-Starman/pkg-plist b/www/p5-Starman/pkg-plist
index 7676def85d77..a54051912394 100644
--- a/www/p5-Starman/pkg-plist
+++ b/www/p5-Starman/pkg-plist
@@ -1,4 +1,4 @@
-man/man1/starman.1.gz
+%%PERL5_MAN1%%/starman.1.gz
 %%PERL5_MAN3%%/HTTP::Server::PSGI::Net::Server::PreFork.3.gz
 %%PERL5_MAN3%%/Plack::Handler::Starman.3.gz
 %%PERL5_MAN3%%/Starman.3.gz
diff --git a/www/p5-Template-Toolkit/pkg-plist b/www/p5-Template-Toolkit/pkg-plist
index 539b05ea8fa8..66d670a3d1d1 100644
--- a/www/p5-Template-Toolkit/pkg-plist
+++ b/www/p5-Template-Toolkit/pkg-plist
@@ -131,5 +131,5 @@ bin/ttree
 %%SITE_ARCH%%/Template/VMethods.pm
 %%SITE_ARCH%%/Template/View.pm
 %%SITE_ARCH%%/auto/Template/Stash/XS/XS.so
-man/man1/tpage.1.gz
-man/man1/ttree.1.gz
+%%PERL5_MAN1%%/tpage.1.gz
+%%PERL5_MAN1%%/ttree.1.gz
diff --git a/www/p5-Twiggy/pkg-plist b/www/p5-Twiggy/pkg-plist
index f58c6e8836bd..f754d5f3cdd3 100644
--- a/www/p5-Twiggy/pkg-plist
+++ b/www/p5-Twiggy/pkg-plist
@@ -1,4 +1,4 @@
-man/man1/twiggy.1.gz
+%%PERL5_MAN1%%/twiggy.1.gz
 %%PERL5_MAN3%%/Plack::Handler::Twiggy.3.gz
 %%PERL5_MAN3%%/Twiggy.3.gz
 bin/twiggy
diff --git a/www/p5-W3C-LinkChecker/pkg-plist b/www/p5-W3C-LinkChecker/pkg-plist
index b38c3c8dc698..c4edd7a6859c 100644
--- a/www/p5-W3C-LinkChecker/pkg-plist
+++ b/www/p5-W3C-LinkChecker/pkg-plist
@@ -1,3 +1,3 @@
 bin/checklink
-man/man1/checklink.1.gz
+%%PERL5_MAN1%%/checklink.1.gz
 %%SITE_PERL%%/W3C/LinkChecker.pm
diff --git a/www/p5-WWW-Mechanize/pkg-plist b/www/p5-WWW-Mechanize/pkg-plist
index 6df9025cafc4..6857b5eb0c68 100644
--- a/www/p5-WWW-Mechanize/pkg-plist
+++ b/www/p5-WWW-Mechanize/pkg-plist
@@ -11,4 +11,4 @@ bin/mech-dump
 %%PERL5_MAN3%%/WWW::Mechanize::FAQ.3.gz
 %%PERL5_MAN3%%/WWW::Mechanize::Image.3.gz
 %%PERL5_MAN3%%/WWW::Mechanize::Link.3.gz
-man/man1/mech-dump.1.gz
+%%PERL5_MAN1%%/mech-dump.1.gz
diff --git a/www/p5-WWW-Mediawiki-Client/pkg-plist b/www/p5-WWW-Mediawiki-Client/pkg-plist
index 24741e832886..277baa3dec41 100644
--- a/www/p5-WWW-Mediawiki-Client/pkg-plist
+++ b/www/p5-WWW-Mediawiki-Client/pkg-plist
@@ -3,4 +3,4 @@ bin/mvs
 %%PERL5_MAN3%%/WWW::Mediawiki::Client::Exceptions.3.gz
 %%SITE_PERL%%/WWW/Mediawiki/Client.pm
 %%SITE_PERL%%/WWW/Mediawiki/Client/Exceptions.pm
-man/man1/mvs.1.gz
+%%PERL5_MAN1%%/mvs.1.gz
diff --git a/www/p5-WWW-Myspace/pkg-plist b/www/p5-WWW-Myspace/pkg-plist
index 2ec4ce69a330..a60b196dd11e 100644
--- a/www/p5-WWW-Myspace/pkg-plist
+++ b/www/p5-WWW-Myspace/pkg-plist
@@ -11,6 +11,6 @@ bin/message_group
 %%SITE_PERL%%/WWW/Myspace/FriendChanges.pm
 %%SITE_PERL%%/WWW/Myspace/Message.pm
 %%SITE_PERL%%/WWW/Myspace/MyBase.pm
-man/man1/approve_friends.1.gz
-man/man1/comment_myspace.1.gz
-man/man1/message_group.1.gz
+%%PERL5_MAN1%%/approve_friends.1.gz
+%%PERL5_MAN1%%/comment_myspace.1.gz
+%%PERL5_MAN1%%/message_group.1.gz
diff --git a/www/p5-WWW-Search/pkg-plist b/www/p5-WWW-Search/pkg-plist
index 6f24fb98274f..50615a3a7ace 100644
--- a/www/p5-WWW-Search/pkg-plist
+++ b/www/p5-WWW-Search/pkg-plist
@@ -20,5 +20,5 @@ bin/WebSearch
 %%PERL5_MAN3%%/WWW::Search::Simple.3.gz
 %%PERL5_MAN3%%/WWW::Search::Test.3.gz
 %%PERL5_MAN3%%/WWW::SearchResult.3.gz
-man/man1/AutoSearch.1.gz
-man/man1/WebSearch.1.gz
+%%PERL5_MAN1%%/AutoSearch.1.gz
+%%PERL5_MAN1%%/WebSearch.1.gz
diff --git a/www/p5-WWW-Shorten-Bitly/pkg-plist b/www/p5-WWW-Shorten-Bitly/pkg-plist
index b004296148b5..8a5532acaeb6 100644
--- a/www/p5-WWW-Shorten-Bitly/pkg-plist
+++ b/www/p5-WWW-Shorten-Bitly/pkg-plist
@@ -1,4 +1,4 @@
 bin/bitly_url
 %%PERL5_MAN3%%/WWW::Shorten::Bitly.3.gz
-man/man1/bitly_url.1.gz
+%%PERL5_MAN1%%/bitly_url.1.gz
 %%SITE_PERL%%/WWW/Shorten/Bitly.pm
diff --git a/www/p5-WWW-Shorten/pkg-plist b/www/p5-WWW-Shorten/pkg-plist
index 538211a91744..e2c2f7eb2ed6 100644
--- a/www/p5-WWW-Shorten/pkg-plist
+++ b/www/p5-WWW-Shorten/pkg-plist
@@ -10,7 +10,7 @@ bin/shorten
 %%PERL5_MAN3%%/WWW::Shorten::UserAgent.3.gz
 %%PERL5_MAN3%%/WWW::Shorten::_dead.3.gz
 %%PERL5_MAN3%%/WWW::Shorten::generic.3.gz
-man/man1/shorten.1.gz
+%%PERL5_MAN1%%/shorten.1.gz
 %%SITE_PERL%%/WWW/Shorten.pm
 %%SITE_PERL%%/WWW/Shorten/LinkToolbot.pm
 %%SITE_PERL%%/WWW/Shorten/Linkz.pm
diff --git a/www/p5-WWW-Wikipedia/pkg-plist b/www/p5-WWW-Wikipedia/pkg-plist
index d8db4dfcd010..dab4b57acde6 100644
--- a/www/p5-WWW-Wikipedia/pkg-plist
+++ b/www/p5-WWW-Wikipedia/pkg-plist
@@ -3,4 +3,4 @@ bin/wikipedia
 %%PERL5_MAN3%%/WWW::Wikipedia::Entry.3.gz
 %%SITE_PERL%%/WWW/Wikipedia.pm
 %%SITE_PERL%%/WWW/Wikipedia/Entry.pm
-man/man1/wikipedia.1.gz
+%%PERL5_MAN1%%/wikipedia.1.gz
diff --git a/www/p5-WebDAO/pkg-plist b/www/p5-WebDAO/pkg-plist
index 5faa8cbd2d22..3dbbc7e5de56 100644
--- a/www/p5-WebDAO/pkg-plist
+++ b/www/p5-WebDAO/pkg-plist
@@ -54,5 +54,5 @@ bin/webdao.psgi
 %%PERL5_MAN3%%/WebDAO::Store::Storable.3.gz
 %%PERL5_MAN3%%/WebDAO::Test.3.gz
 %%PERL5_MAN3%%/WebDAO::Util.3.gz
-man/man1/wd_fcgi.fpl.1.gz
-man/man1/wd_shell.pl.1.gz
+%%PERL5_MAN1%%/wd_fcgi.fpl.1.gz
+%%PERL5_MAN1%%/wd_shell.pl.1.gz
diff --git a/www/p5-chklinks/pkg-plist b/www/p5-chklinks/pkg-plist
index e0d647467cfb..cecc2eece432 100644
--- a/www/p5-chklinks/pkg-plist
+++ b/www/p5-chklinks/pkg-plist
@@ -1,2 +1,2 @@
 bin/chklinks
-man/man1/chklinks.1.gz
+%%PERL5_MAN1%%/chklinks.1.gz
diff --git a/www/p5-libwww/pkg-plist b/www/p5-libwww/pkg-plist
index c5b5b4d67006..db2b1faeaca0 100644
--- a/www/p5-libwww/pkg-plist
+++ b/www/p5-libwww/pkg-plist
@@ -41,10 +41,10 @@ bin/lwp-request
 %%PERL5_MAN3%%/LWP::UserAgent.3.gz
 %%PERL5_MAN3%%/lwpcook.3.gz
 %%PERL5_MAN3%%/lwptut.3.gz
-man/man1/GET.1.gz
-man/man1/HEAD.1.gz
-man/man1/POST.1.gz
-man/man1/lwp-download.1.gz
-man/man1/lwp-dump.1.gz
-man/man1/lwp-mirror.1.gz
-man/man1/lwp-request.1.gz
+%%PERL5_MAN1%%/GET.1.gz
+%%PERL5_MAN1%%/HEAD.1.gz
+%%PERL5_MAN1%%/POST.1.gz
+%%PERL5_MAN1%%/lwp-download.1.gz
+%%PERL5_MAN1%%/lwp-dump.1.gz
+%%PERL5_MAN1%%/lwp-mirror.1.gz
+%%PERL5_MAN1%%/lwp-request.1.gz
diff --git a/www/perlbal/pkg-plist b/www/perlbal/pkg-plist
index 469c509850fe..8b43a0a35ea2 100644
--- a/www/perlbal/pkg-plist
+++ b/www/perlbal/pkg-plist
@@ -90,7 +90,7 @@ bin/perlbal
 %%PERL5_MAN3%%/Perlbal::Plugin::XFFExtras.3.gz
 %%PERL5_MAN3%%/Perlbal::Test.3.gz
 %%PERL5_MAN3%%/Perlbal::Util.3.gz
-man/man1/perlbal.1.gz
+%%PERL5_MAN1%%/perlbal.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/config-guide.txt
 %%PORTDOCS%%%%DOCSDIR%%/hacking/classes.txt
diff --git a/www/w3mir/pkg-plist b/www/w3mir/pkg-plist
index 790573c9ebd0..ee8fdd81b950 100644
--- a/www/w3mir/pkg-plist
+++ b/www/w3mir/pkg-plist
@@ -3,8 +3,8 @@ bin/w3mir
 %%SITE_PERL%%/htmlop.pm
 %%SITE_PERL%%/w3http.pm
 %%SITE_PERL%%/w3pdfuri.pm
-man/man1/w3mfix.1.gz
-man/man1/w3mir.1.gz
+%%PERL5_MAN1%%/w3mfix.1.gz
+%%PERL5_MAN1%%/w3mir.1.gz
 share/doc/w3mir/Artistic
 share/doc/w3mir/README
 share/doc/w3mir/example.cfg
diff --git a/www/weblint++/pkg-plist b/www/weblint++/pkg-plist
index aa658abca744..b4179cd41684 100644
--- a/www/weblint++/pkg-plist
+++ b/www/weblint++/pkg-plist
@@ -1,2 +1,2 @@
 bin/weblint++
-man/man1/weblint++.1.gz
+%%PERL5_MAN1%%/weblint++.1.gz