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

123 files changed, 189 insertions, 189 deletions

diff --git a/devel/activitymail/Makefile b/devel/activitymail/Makefile
index 3f5ff79a31aa..45832d66abcf 100644
--- a/devel/activitymail/Makefile
+++ b/devel/activitymail/Makefile
@@ -14,6 +14,6 @@ USES=		perl5
 USE_PERL5=	modbuild
 
 PLIST_FILES=	bin/activitymail \
-		man/man1/activitymail.1.gz
+		${SITE_MAN1}/activitymail.1.gz
 
 .include <bsd.port.mk>
diff --git a/devel/autodia/pkg-plist b/devel/autodia/pkg-plist
index d1644ba6fe57..faeb43ace089 100644
--- a/devel/autodia/pkg-plist
+++ b/devel/autodia/pkg-plist
@@ -42,4 +42,4 @@ bin/autodia.pl
 %%PERL5_MAN3%%/Autodia::Handler::dia.3.gz
 %%PERL5_MAN3%%/Autodia::Handler::umbrello.3.gz
 %%PERL5_MAN3%%/autodia.3.gz
-man/man1/autodia.pl.1.gz
+%%PERL5_MAN1%%/autodia.pl.1.gz
diff --git a/devel/cpan-upload-http/pkg-plist b/devel/cpan-upload-http/pkg-plist
index 2c8d4b3b8a26..64c5d1e22ea2 100644
--- a/devel/cpan-upload-http/pkg-plist
+++ b/devel/cpan-upload-http/pkg-plist
@@ -1,2 +1,2 @@
 bin/cpan-upload-http
-man/man1/cpan-upload-http.1.gz
+%%PERL5_MAN1%%/cpan-upload-http.1.gz
diff --git a/devel/cpan-upload/pkg-plist b/devel/cpan-upload/pkg-plist
index b826d5c30dd6..fbcc06090a2e 100644
--- a/devel/cpan-upload/pkg-plist
+++ b/devel/cpan-upload/pkg-plist
@@ -1,2 +1,2 @@
 bin/cpan-upload
-man/man1/cpan-upload.1.gz
+%%PERL5_MAN1%%/cpan-upload.1.gz
diff --git a/devel/egypt/Makefile b/devel/egypt/Makefile
index 6714496dfd5e..c1e898d647b0 100644
--- a/devel/egypt/Makefile
+++ b/devel/egypt/Makefile
@@ -17,6 +17,6 @@ USES=		perl5 shebangfix
 USE_PERL5=	configure
 SHEBANG_FILES=	egypt
 
-PLIST_FILES=	bin/${PORTNAME} man/man1/egypt.1.gz
+PLIST_FILES=	bin/${PORTNAME} ${SITE_MAN1}/egypt.1.gz
 
 .include <bsd.port.mk>
diff --git a/devel/p5-AI-Prolog/pkg-plist b/devel/p5-AI-Prolog/pkg-plist
index 774ed866ba10..1dcb25a76dfe 100644
--- a/devel/p5-AI-Prolog/pkg-plist
+++ b/devel/p5-AI-Prolog/pkg-plist
@@ -37,4 +37,4 @@ bin/aiprolog
 %%PERL5_MAN3%%/AI::Prolog::TermList::Clause.3.gz
 %%PERL5_MAN3%%/AI::Prolog::TermList::Primitive.3.gz
 %%PERL5_MAN3%%/AI::Prolog::TermList::Step.3.gz
-man/man1/aiprolog.1.gz
+%%PERL5_MAN1%%/aiprolog.1.gz
diff --git a/devel/p5-Acme-MetaSyntactic/pkg-plist b/devel/p5-Acme-MetaSyntactic/pkg-plist
index 31e46f5f6e4b..abe9295a3526 100644
--- a/devel/p5-Acme-MetaSyntactic/pkg-plist
+++ b/devel/p5-Acme-MetaSyntactic/pkg-plist
@@ -22,5 +22,5 @@ bin/metafy
 %%PERL5_MAN3%%/Acme::MetaSyntactic::foo.3.gz
 %%PERL5_MAN3%%/Test::MetaSyntactic.3.gz
 %%PERL5_MAN3%%/eta.3.gz
-man/man1/meta.1.gz
-man/man1/metafy.1.gz
+%%PERL5_MAN1%%/meta.1.gz
+%%PERL5_MAN1%%/metafy.1.gz
diff --git a/devel/p5-Algorithm-Bucketizer/pkg-plist b/devel/p5-Algorithm-Bucketizer/pkg-plist
index abb702125416..b76b21d8242c 100644
--- a/devel/p5-Algorithm-Bucketizer/pkg-plist
+++ b/devel/p5-Algorithm-Bucketizer/pkg-plist
@@ -1,4 +1,4 @@
 bin/bucketize
 %%SITE_PERL%%/Algorithm/Bucketizer.pm
 %%PERL5_MAN3%%/Algorithm::Bucketizer.3.gz
-man/man1/bucketize.1.gz
+%%PERL5_MAN1%%/bucketize.1.gz
diff --git a/devel/p5-Algorithm-Evolutionary/pkg-plist b/devel/p5-Algorithm-Evolutionary/pkg-plist
index c873f8b06234..664129cb4ccc 100644
--- a/devel/p5-Algorithm-Evolutionary/pkg-plist
+++ b/devel/p5-Algorithm-Evolutionary/pkg-plist
@@ -152,7 +152,7 @@ bin/tide_float.pl
 %%PERL5_MAN3%%/Algorithm::Evolutionary::Run.3.gz
 %%PERL5_MAN3%%/Algorithm::Evolutionary::Utils.3.gz
 %%PERL5_MAN3%%/Algorithm::Evolutionary::Wheel.3.gz
-man/man1/canonical-genetic-algorithm.pl.1.gz
-man/man1/rectangle-coverage.pl.1.gz
-man/man1/tide_bitstring.pl.1.gz
-man/man1/tide_float.pl.1.gz
+%%PERL5_MAN1%%/canonical-genetic-algorithm.pl.1.gz
+%%PERL5_MAN1%%/rectangle-coverage.pl.1.gz
+%%PERL5_MAN1%%/tide_bitstring.pl.1.gz
+%%PERL5_MAN1%%/tide_float.pl.1.gz
diff --git a/devel/p5-App-FatPacker/pkg-plist b/devel/p5-App-FatPacker/pkg-plist
index c28f865a27f6..1e7858dd155d 100644
--- a/devel/p5-App-FatPacker/pkg-plist
+++ b/devel/p5-App-FatPacker/pkg-plist
@@ -1,5 +1,5 @@
 bin/fatpack
-man/man1/fatpack.1.gz
+%%PERL5_MAN1%%/fatpack.1.gz
 %%PERL5_MAN3%%/App::FatPacker.3.gz
 %%PERL5_MAN3%%/App::FatPacker::Trace.3.gz
 %%SITE_PERL%%/App/FatPacker.pm
diff --git a/devel/p5-App-GitGot/pkg-plist b/devel/p5-App-GitGot/pkg-plist
index 774eaa04a21f..10fd171bb270 100644
--- a/devel/p5-App-GitGot/pkg-plist
+++ b/devel/p5-App-GitGot/pkg-plist
@@ -56,5 +56,5 @@ bin/got-complete
 %%PERL5_MAN3%%/App::GitGot::Repo::Git.3.gz
 %%PERL5_MAN3%%/App::GitGot::Repositories.3.gz
 %%PERL5_MAN3%%/App::GitGot::Types.3.gz
-man/man1/got-complete.1.gz
-man/man1/got.1.gz
+%%PERL5_MAN1%%/got-complete.1.gz
+%%PERL5_MAN1%%/got.1.gz
diff --git a/devel/p5-App-GitHub/pkg-plist b/devel/p5-App-GitHub/pkg-plist
index af7d762e7d3f..9c1e073bca0c 100644
--- a/devel/p5-App-GitHub/pkg-plist
+++ b/devel/p5-App-GitHub/pkg-plist
@@ -1,4 +1,4 @@
 bin/github.pl
 %%PERL5_MAN3%%/App::GitHub.3.gz
 %%SITE_PERL%%/App/GitHub.pm
-man/man1/github.pl.1.gz
+%%PERL5_MAN1%%/github.pl.1.gz
diff --git a/devel/p5-App-SD/pkg-plist b/devel/p5-App-SD/pkg-plist
index cdbae8cb6e0b..d998b132d04e 100644
--- a/devel/p5-App-SD/pkg-plist
+++ b/devel/p5-App-SD/pkg-plist
@@ -113,4 +113,4 @@ bin/sd
 %%SITE_PERL%%/auto/share/dist/App-SD/web/static/css/main.css
 %%SITE_PERL%%/auto/share/dist/App-SD/web/static/images/gradient.png
 %%SITE_PERL%%/auto/share/dist/App-SD/web/static/images/sd.png
-man/man1/sd.1.gz
+%%PERL5_MAN1%%/sd.1.gz
diff --git a/devel/p5-App-SVN-Bisect/pkg-plist b/devel/p5-App-SVN-Bisect/pkg-plist
index 026852eb76e4..d852078b574a 100644
--- a/devel/p5-App-SVN-Bisect/pkg-plist
+++ b/devel/p5-App-SVN-Bisect/pkg-plist
@@ -1,4 +1,4 @@
 bin/svn-bisect
 %%PERL5_MAN3%%/App::SVN::Bisect.3.gz
 %%SITE_PERL%%/App/SVN/Bisect.pm
-man/man1/svn-bisect.1.gz
+%%PERL5_MAN1%%/svn-bisect.1.gz
diff --git a/devel/p5-App-cpanminus/pkg-plist b/devel/p5-App-cpanminus/pkg-plist
index 7ad7e9a8ba7a..4e146e8ab5ee 100644
--- a/devel/p5-App-cpanminus/pkg-plist
+++ b/devel/p5-App-cpanminus/pkg-plist
@@ -1,5 +1,5 @@
 bin/cpanm
-man/man1/cpanm.1.gz
+%%PERL5_MAN1%%/cpanm.1.gz
 %%PERL5_MAN3%%/App::cpanminus.3.gz
 %%PERL5_MAN3%%/App::cpanminus::fatscript.3.gz
 %%SITE_PERL%%/App/cpanminus.pm
diff --git a/devel/p5-App-cpanoutdated/pkg-plist b/devel/p5-App-cpanoutdated/pkg-plist
index 50e078e471ff..f01c02ec32a5 100644
--- a/devel/p5-App-cpanoutdated/pkg-plist
+++ b/devel/p5-App-cpanoutdated/pkg-plist
@@ -1,4 +1,4 @@
 bin/cpan-outdated
 %%SITE_PERL%%/App/cpanoutdated.pm
 %%PERL5_MAN3%%/App::cpanoutdated.3.gz
-man/man1/cpan-outdated.1.gz
+%%PERL5_MAN1%%/cpan-outdated.1.gz
diff --git a/devel/p5-App-local-lib-helper/pkg-plist b/devel/p5-App-local-lib-helper/pkg-plist
index 839a90bd67c6..407f7f3b2c31 100644
--- a/devel/p5-App-local-lib-helper/pkg-plist
+++ b/devel/p5-App-local-lib-helper/pkg-plist
@@ -3,4 +3,4 @@ bin/local-lib-helper
 %%PERL5_MAN3%%/App::local::lib::helper::rationale.3.gz
 %%SITE_PERL%%/App/local/lib/helper.pm
 %%SITE_PERL%%/App/local/lib/helper/rationale.pod
-man/man1/local-lib-helper.1.gz
+%%PERL5_MAN1%%/local-lib-helper.1.gz
diff --git a/devel/p5-App-perlbrew/pkg-plist b/devel/p5-App-perlbrew/pkg-plist
index 20647168c47c..1873e208ff8f 100644
--- a/devel/p5-App-perlbrew/pkg-plist
+++ b/devel/p5-App-perlbrew/pkg-plist
@@ -1,4 +1,4 @@
 bin/perlbrew
 %%SITE_PERL%%/App/perlbrew.pm
 %%PERL5_MAN3%%/App::perlbrew.3.gz
-man/man1/perlbrew.1.gz
+%%PERL5_MAN1%%/perlbrew.1.gz
diff --git a/devel/p5-App-scan_prereqs_cpanfile/pkg-plist b/devel/p5-App-scan_prereqs_cpanfile/pkg-plist
index 996bda423b4c..57be12f38c38 100644
--- a/devel/p5-App-scan_prereqs_cpanfile/pkg-plist
+++ b/devel/p5-App-scan_prereqs_cpanfile/pkg-plist
@@ -1,4 +1,4 @@
 bin/scan-prereqs-cpanfile
 %%SITE_PERL%%/App/scan_prereqs_cpanfile.pm
-man/man1/scan-prereqs-cpanfile.1.gz
+%%PERL5_MAN1%%/scan-prereqs-cpanfile.1.gz
 %%PERL5_MAN3%%/App::scan_prereqs_cpanfile.3.gz
diff --git a/devel/p5-B-C/pkg-plist b/devel/p5-B-C/pkg-plist
index 9afd813d637a..38ae2a1320c2 100644
--- a/devel/p5-B-C/pkg-plist
+++ b/devel/p5-B-C/pkg-plist
@@ -35,6 +35,6 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/cc_runtime.h
 %%PERL5_MAN3%%/B::perloptree.3.gz
 %%PERL5_MAN3%%/BcVersions.3.gz
 %%PERL5_MAN3%%/ByteLoader.3.gz
-man/man1/assemble.1.gz
-man/man1/disassemble.1.gz
-man/man1/perlcc.1.gz
+%%PERL5_MAN1%%/assemble.1.gz
+%%PERL5_MAN1%%/disassemble.1.gz
+%%PERL5_MAN1%%/perlcc.1.gz
diff --git a/devel/p5-CPAN-Changes/pkg-plist b/devel/p5-CPAN-Changes/pkg-plist
index e18445103edb..8dd8f10b6008 100644
--- a/devel/p5-CPAN-Changes/pkg-plist
+++ b/devel/p5-CPAN-Changes/pkg-plist
@@ -9,4 +9,4 @@ bin/tidy_changelog
 %%PERL5_MAN3%%/CPAN::Changes::Release.3.gz
 %%PERL5_MAN3%%/CPAN::Changes::Spec.3.gz
 %%PERL5_MAN3%%/Test::CPAN::Changes.3.gz
-man/man1/tidy_changelog.1.gz
+%%PERL5_MAN1%%/tidy_changelog.1.gz
diff --git a/devel/p5-CPAN-Inject/pkg-plist b/devel/p5-CPAN-Inject/pkg-plist
index fb9f271193c2..3cf31ee3aebf 100644
--- a/devel/p5-CPAN-Inject/pkg-plist
+++ b/devel/p5-CPAN-Inject/pkg-plist
@@ -1,4 +1,4 @@
 bin/cpaninject
 %%SITE_PERL%%/CPAN/Inject.pm
 %%PERL5_MAN3%%/CPAN::Inject.3.gz
-man/man1/cpaninject.1.gz
+%%PERL5_MAN1%%/cpaninject.1.gz
diff --git a/devel/p5-CPAN-Mini/pkg-plist b/devel/p5-CPAN-Mini/pkg-plist
index 89b08e2b92a0..a5e5feccc029 100644
--- a/devel/p5-CPAN-Mini/pkg-plist
+++ b/devel/p5-CPAN-Mini/pkg-plist
@@ -3,4 +3,4 @@ bin/minicpan
 %%SITE_PERL%%/CPAN/Mini/App.pm
 %%PERL5_MAN3%%/CPAN::Mini.3.gz
 %%PERL5_MAN3%%/CPAN::Mini::App.3.gz
-man/man1/minicpan.1.gz
+%%PERL5_MAN1%%/minicpan.1.gz
diff --git a/devel/p5-CPAN-SQLite/pkg-plist b/devel/p5-CPAN-SQLite/pkg-plist
index 0c7b3bffae01..0df641e7545a 100644
--- a/devel/p5-CPAN-SQLite/pkg-plist
+++ b/devel/p5-CPAN-SQLite/pkg-plist
@@ -21,4 +21,4 @@ bin/cpandb
 %%PERL5_MAN3%%/CPAN::SQLite::Search.3.gz
 %%PERL5_MAN3%%/CPAN::SQLite::State.3.gz
 %%PERL5_MAN3%%/CPAN::SQLite::Util.3.gz
-man/man1/cpandb.1.gz
+%%PERL5_MAN1%%/cpandb.1.gz
diff --git a/devel/p5-CPAN-Site/pkg-plist b/devel/p5-CPAN-Site/pkg-plist
index 6aee5086b22f..c38c33e4b9e9 100644
--- a/devel/p5-CPAN-Site/pkg-plist
+++ b/devel/p5-CPAN-Site/pkg-plist
@@ -1,4 +1,4 @@
 bin/cpansite
-man/man1/cpansite.1.gz
+%%PERL5_MAN1%%/cpansite.1.gz
 %%SITE_PERL%%/CPAN/Site.pm
 %%SITE_PERL%%/CPAN/Site/Index.pm
diff --git a/devel/p5-CPAN-Uploader/pkg-plist b/devel/p5-CPAN-Uploader/pkg-plist
index 5dc17a50775b..67c9b8c64ed4 100644
--- a/devel/p5-CPAN-Uploader/pkg-plist
+++ b/devel/p5-CPAN-Uploader/pkg-plist
@@ -1,4 +1,4 @@
 bin/cpan-upload
 %%SITE_PERL%%/CPAN/Uploader.pm
 %%PERL5_MAN3%%/CPAN::Uploader.3.gz
-man/man1/cpan-upload.1.gz
+%%PERL5_MAN1%%/cpan-upload.1.gz
diff --git a/devel/p5-Carp-Datum/pkg-plist b/devel/p5-Carp-Datum/pkg-plist
index a58a9eeb04c0..a4978d23c5b8 100644
--- a/devel/p5-Carp-Datum/pkg-plist
+++ b/devel/p5-Carp-Datum/pkg-plist
@@ -14,4 +14,4 @@ bin/datum_strip
 %%PERL5_MAN3%%/Carp::Datum::Flags.3.gz
 %%PERL5_MAN3%%/Carp::Datum::MakeMaker.3.gz
 %%PERL5_MAN3%%/Carp::Datum::Strip.3.gz
-man/man1/datum_strip.1.gz
+%%PERL5_MAN1%%/datum_strip.1.gz
diff --git a/devel/p5-Data-ClearSilver-HDF/pkg-plist b/devel/p5-Data-ClearSilver-HDF/pkg-plist
index e6690f3d0a0a..e006f79f7095 100644
--- a/devel/p5-Data-ClearSilver-HDF/pkg-plist
+++ b/devel/p5-Data-ClearSilver-HDF/pkg-plist
@@ -1,4 +1,4 @@
 %%SITE_PERL%%/Data/ClearSilver/HDF.pm
 %%PERL5_MAN3%%/Data::ClearSilver::HDF.3.gz
-man/man1/cspage.1.gz
+%%PERL5_MAN1%%/cspage.1.gz
 bin/cspage
diff --git a/devel/p5-Data-HexDump-Range/pkg-plist b/devel/p5-Data-HexDump-Range/pkg-plist
index 673def5197ee..d59907990e7b 100644
--- a/devel/p5-Data-HexDump-Range/pkg-plist
+++ b/devel/p5-Data-HexDump-Range/pkg-plist
@@ -9,4 +9,4 @@ bin/hdr
 %%PERL5_MAN3%%/Data::HexDump::Range::Gather.3.gz
 %%PERL5_MAN3%%/Data::HexDump::Range::Object.3.gz
 %%PERL5_MAN3%%/Data::HexDump::Range::Split.3.gz
-man/man1/hdr.1.gz
+%%PERL5_MAN1%%/hdr.1.gz
diff --git a/devel/p5-Data-ShowTable/pkg-plist b/devel/p5-Data-ShowTable/pkg-plist
index 86d9d995714b..2ce2a88e488b 100644
--- a/devel/p5-Data-ShowTable/pkg-plist
+++ b/devel/p5-Data-ShowTable/pkg-plist
@@ -1,4 +1,4 @@
 bin/showtable
 %%SITE_PERL%%/Data/ShowTable.pm
 %%PERL5_MAN3%%/Data::ShowTable.3.gz
-man/man1/showtable.1.gz
+%%PERL5_MAN1%%/showtable.1.gz
diff --git a/devel/p5-Data-Stag/pkg-plist b/devel/p5-Data-Stag/pkg-plist
index efef6f686f50..918c26a675fb 100644
--- a/devel/p5-Data-Stag/pkg-plist
+++ b/devel/p5-Data-Stag/pkg-plist
@@ -18,26 +18,26 @@ bin/stag-query.pl
 bin/stag-splitter.pl
 bin/stag-view.pl
 bin/stag-xml2itext.pl
-man/man1/stag-autoschema.pl.1.gz
-man/man1/stag-db.pl.1.gz
-man/man1/stag-diff.pl.1.gz
-man/man1/stag-drawtree.pl.1.gz
-man/man1/stag-filter.pl.1.gz
-man/man1/stag-findsubtree.pl.1.gz
-man/man1/stag-flatten.pl.1.gz
-man/man1/stag-grep.pl.1.gz
-man/man1/stag-handle.pl.1.gz
-man/man1/stag-itext2simple.pl.1.gz
-man/man1/stag-itext2sxpr.pl.1.gz
-man/man1/stag-itext2xml.pl.1.gz
-man/man1/stag-join.pl.1.gz
-man/man1/stag-merge.pl.1.gz
-man/man1/stag-mogrify.pl.1.gz
-man/man1/stag-parse.pl.1.gz
-man/man1/stag-query.pl.1.gz
-man/man1/stag-splitter.pl.1.gz
-man/man1/stag-view.pl.1.gz
-man/man1/stag-xml2itext.pl.1.gz
+%%PERL5_MAN1%%/stag-autoschema.pl.1.gz
+%%PERL5_MAN1%%/stag-db.pl.1.gz
+%%PERL5_MAN1%%/stag-diff.pl.1.gz
+%%PERL5_MAN1%%/stag-drawtree.pl.1.gz
+%%PERL5_MAN1%%/stag-filter.pl.1.gz
+%%PERL5_MAN1%%/stag-findsubtree.pl.1.gz
+%%PERL5_MAN1%%/stag-flatten.pl.1.gz
+%%PERL5_MAN1%%/stag-grep.pl.1.gz
+%%PERL5_MAN1%%/stag-handle.pl.1.gz
+%%PERL5_MAN1%%/stag-itext2simple.pl.1.gz
+%%PERL5_MAN1%%/stag-itext2sxpr.pl.1.gz
+%%PERL5_MAN1%%/stag-itext2xml.pl.1.gz
+%%PERL5_MAN1%%/stag-join.pl.1.gz
+%%PERL5_MAN1%%/stag-merge.pl.1.gz
+%%PERL5_MAN1%%/stag-mogrify.pl.1.gz
+%%PERL5_MAN1%%/stag-parse.pl.1.gz
+%%PERL5_MAN1%%/stag-query.pl.1.gz
+%%PERL5_MAN1%%/stag-splitter.pl.1.gz
+%%PERL5_MAN1%%/stag-view.pl.1.gz
+%%PERL5_MAN1%%/stag-xml2itext.pl.1.gz
 %%SITE_PERL%%/Data/Stag.pm
 %%SITE_PERL%%/Data/Stag/Arr2HTML.pm
 %%SITE_PERL%%/Data/Stag/Base.pm
diff --git a/devel/p5-Date-Manip/pkg-plist b/devel/p5-Date-Manip/pkg-plist
index ee7442a067db..987b6a4f76ef 100644
--- a/devel/p5-Date-Manip/pkg-plist
+++ b/devel/p5-Date-Manip/pkg-plist
@@ -936,5 +936,5 @@ bin/dm_zdump
 %%SITE_PERL%%/Date/Manip/TZdata.pod
 %%SITE_PERL%%/Date/Manip/Zones.pm
 %%SITE_PERL%%/Date/Manip/Zones.pod
-man/man1/dm_date.1.gz
-man/man1/dm_zdump.1.gz
+%%PERL5_MAN1%%/dm_date.1.gz
+%%PERL5_MAN1%%/dm_zdump.1.gz
diff --git a/devel/p5-Date-Piece/pkg-plist b/devel/p5-Date-Piece/pkg-plist
index 15339f19e889..790581f2b391 100644
--- a/devel/p5-Date-Piece/pkg-plist
+++ b/devel/p5-Date-Piece/pkg-plist
@@ -1,4 +1,4 @@
 bin/day
 %%SITE_PERL%%/Date/Piece.pm
 %%PERL5_MAN3%%/Date::Piece.3.gz
-man/man1/day.1.gz
+%%PERL5_MAN1%%/day.1.gz
diff --git a/devel/p5-Date-Roman/pkg-plist b/devel/p5-Date-Roman/pkg-plist
index fbc6d3f33f4d..af3c8bdb5ca4 100644
--- a/devel/p5-Date-Roman/pkg-plist
+++ b/devel/p5-Date-Roman/pkg-plist
@@ -1,4 +1,4 @@
 bin/RomanDate
 %%SITE_PERL%%/Date/Roman.pm
-man/man1/RomanDate.1.gz
+%%PERL5_MAN1%%/RomanDate.1.gz
 %%PERL5_MAN3%%/Date::Roman.3.gz
diff --git a/devel/p5-DateTime-Format-Natural/pkg-plist b/devel/p5-DateTime-Format-Natural/pkg-plist
index 52f2caf19a2e..5e841bd51533 100644
--- a/devel/p5-DateTime-Format-Natural/pkg-plist
+++ b/devel/p5-DateTime-Format-Natural/pkg-plist
@@ -14,7 +14,7 @@ bin/dateparse
 %%SITE_PERL%%/DateTime/Format/Natural/Utils.pm
 %%SITE_PERL%%/DateTime/Format/Natural/Wrappers.pm
 %%SITE_PERL%%/DateTime/Format/Natural/Duration/Checks.pm
-man/man1/dateparse.1.gz
+%%PERL5_MAN1%%/dateparse.1.gz
 %%PERL5_MAN3%%/DateTime::Format::Natural.3.gz
 %%PERL5_MAN3%%/DateTime::Format::Natural::Calc.3.gz
 %%PERL5_MAN3%%/DateTime::Format::Natural::Compat.3.gz
diff --git a/devel/p5-Devel-CheckLib/pkg-plist b/devel/p5-Devel-CheckLib/pkg-plist
index 0a23277475a9..c7eecdd9f676 100644
--- a/devel/p5-Devel-CheckLib/pkg-plist
+++ b/devel/p5-Devel-CheckLib/pkg-plist
@@ -1,4 +1,4 @@
 bin/use-devel-checklib
 %%SITE_PERL%%/Devel/CheckLib.pm
 %%PERL5_MAN3%%/Devel::CheckLib.3.gz
-man/man1/use-devel-checklib.1.gz
+%%PERL5_MAN1%%/use-devel-checklib.1.gz
diff --git a/devel/p5-Devel-CheckOS/pkg-plist b/devel/p5-Devel-CheckOS/pkg-plist
index 7dd5a4d8dbbc..21e817ffc539 100644
--- a/devel/p5-Devel-CheckOS/pkg-plist
+++ b/devel/p5-Devel-CheckOS/pkg-plist
@@ -1,5 +1,5 @@
 bin/use-devel-assertos
-man/man1/use-devel-assertos.1.gz
+%%PERL5_MAN1%%/use-devel-assertos.1.gz
 %%PERL5_MAN3%%/Devel::AssertOS.3.gz
 %%PERL5_MAN3%%/Devel::AssertOS::AIX.3.gz
 %%PERL5_MAN3%%/Devel::AssertOS::Amiga.3.gz
diff --git a/devel/p5-Devel-Cover/pkg-plist b/devel/p5-Devel-Cover/pkg-plist
index f4f6f9477d53..6c757dc80690 100644
--- a/devel/p5-Devel-Cover/pkg-plist
+++ b/devel/p5-Devel-Cover/pkg-plist
@@ -89,6 +89,6 @@ bin/gcov2perl
 %%PERL5_MAN3%%/Devel::Cover::Tutorial.3.gz
 %%PERL5_MAN3%%/Devel::Cover::Util.3.gz
 %%PERL5_MAN3%%/Devel::Cover::Web.3.gz
-man/man1/cover.1.gz
-man/man1/cpancover.1.gz
-man/man1/gcov2perl.1.gz
+%%PERL5_MAN1%%/cover.1.gz
+%%PERL5_MAN1%%/cpancover.1.gz
+%%PERL5_MAN1%%/gcov2perl.1.gz
diff --git a/devel/p5-Devel-NYTProf/pkg-plist b/devel/p5-Devel-NYTProf/pkg-plist
index 7bef19043816..14f3a21b789c 100644
--- a/devel/p5-Devel-NYTProf/pkg-plist
+++ b/devel/p5-Devel-NYTProf/pkg-plist
@@ -46,9 +46,9 @@ bin/nytprofpf
 %%PERL5_MAN3%%/Devel::NYTProf::ReadStream.3.gz
 %%PERL5_MAN3%%/Devel::NYTProf::Run.3.gz
 %%PERL5_MAN3%%/Devel::NYTProf::Util.3.gz
-man/man1/nytprofcalls.1.gz
-man/man1/nytprofcg.1.gz
-man/man1/nytprofcsv.1.gz
-man/man1/nytprofhtml.1.gz
-man/man1/nytprofmerge.1.gz
-man/man1/nytprofpf.1.gz
+%%PERL5_MAN1%%/nytprofcalls.1.gz
+%%PERL5_MAN1%%/nytprofcg.1.gz
+%%PERL5_MAN1%%/nytprofcsv.1.gz
+%%PERL5_MAN1%%/nytprofhtml.1.gz
+%%PERL5_MAN1%%/nytprofmerge.1.gz
+%%PERL5_MAN1%%/nytprofpf.1.gz
diff --git a/devel/p5-Devel-PatchPerl/pkg-plist b/devel/p5-Devel-PatchPerl/pkg-plist
index 0a379a4bf9c3..79cc45448048 100644
--- a/devel/p5-Devel-PatchPerl/pkg-plist
+++ b/devel/p5-Devel-PatchPerl/pkg-plist
@@ -5,4 +5,4 @@ bin/patchperl
 %%PERL5_MAN3%%/Devel::PatchPerl.3.gz
 %%PERL5_MAN3%%/Devel::PatchPerl::Hints.3.gz
 %%PERL5_MAN3%%/Devel::PatchPerl::Plugin.3.gz
-man/man1/patchperl.1.gz
+%%PERL5_MAN1%%/patchperl.1.gz
diff --git a/devel/p5-Devel-ebug/pkg-plist b/devel/p5-Devel-ebug/pkg-plist
index 61265275c139..e73be067f963 100644
--- a/devel/p5-Devel-ebug/pkg-plist
+++ b/devel/p5-Devel-ebug/pkg-plist
@@ -27,6 +27,6 @@ bin/ebug_server
 %%SITE_PERL%%/Devel/ebug/Plugin/Pad.pm
 %%SITE_PERL%%/Devel/ebug/Plugin/Run.pm
 %%SITE_PERL%%/Devel/ebug/Plugin/StackTrace.pm
-man/man1/ebug.1.gz
-man/man1/ebug_client.1.gz
-man/man1/ebug_server.1.gz
+%%PERL5_MAN1%%/ebug.1.gz
+%%PERL5_MAN1%%/ebug_client.1.gz
+%%PERL5_MAN1%%/ebug_server.1.gz
diff --git a/devel/p5-Dir-Project/pkg-plist b/devel/p5-Dir-Project/pkg-plist
index fb56e5a697b2..e1c93788214a 100644
--- a/devel/p5-Dir-Project/pkg-plist
+++ b/devel/p5-Dir-Project/pkg-plist
@@ -3,5 +3,5 @@ bin/project_dir
 %%PERL5_MAN3%%/Dir::Project.3.gz
 %%SITE_PERL%%/Dir/Project.pm
 lib/project_dir.mk
-man/man1/project_bin.1.gz
-man/man1/project_dir.1.gz
+%%PERL5_MAN1%%/project_bin.1.gz
+%%PERL5_MAN1%%/project_dir.1.gz
diff --git a/devel/p5-Dist-Joseki/pkg-plist b/devel/p5-Dist-Joseki/pkg-plist
index 2b9fc0cbbe8b..a61b1f24a635 100644
--- a/devel/p5-Dist-Joseki/pkg-plist
+++ b/devel/p5-Dist-Joseki/pkg-plist
@@ -34,4 +34,4 @@ bin/distfind
 %%PERL5_MAN3%%/Dist::Joseki::DistType::ModuleBuild.3.gz
 %%PERL5_MAN3%%/Dist::Joseki::Find.3.gz
 %%PERL5_MAN3%%/Dist::Joseki::Version.3.gz
-man/man1/distfind.1.gz
+%%PERL5_MAN1%%/distfind.1.gz
diff --git a/devel/p5-Dist-Zilla/pkg-plist b/devel/p5-Dist-Zilla/pkg-plist
index f5b16082aa77..69769d54cca3 100644
--- a/devel/p5-Dist-Zilla/pkg-plist
+++ b/devel/p5-Dist-Zilla/pkg-plist
@@ -1,5 +1,5 @@
 bin/dzil
-man/man1/dzil.1.gz
+%%PERL5_MAN1%%/dzil.1.gz
 %%SITE_PERL%%/Dist/Zilla.pm
 %%SITE_PERL%%/Dist/Zilla/App.pm
 %%SITE_PERL%%/Dist/Zilla/App/Command.pm
diff --git a/devel/p5-Env-Path/pkg-plist b/devel/p5-Env-Path/pkg-plist
index 1ea629ec1c91..ebeaa4e6ec05 100644
--- a/devel/p5-Env-Path/pkg-plist
+++ b/devel/p5-Env-Path/pkg-plist
@@ -1,4 +1,4 @@
 bin/envpath
 %%PERL5_MAN3%%/Env::Path.3.gz
 %%SITE_PERL%%/Env/Path.pm
-man/man1/envpath.1.gz
+%%PERL5_MAN1%%/envpath.1.gz
diff --git a/devel/p5-Eval-WithLexicals/pkg-plist b/devel/p5-Eval-WithLexicals/pkg-plist
index e9fd7567f83c..4d44c50321df 100644
--- a/devel/p5-Eval-WithLexicals/pkg-plist
+++ b/devel/p5-Eval-WithLexicals/pkg-plist
@@ -1,6 +1,6 @@
 bin/tinyrepl
 %%SITE_PERL%%/Eval/WithLexicals.pm
 %%SITE_PERL%%/Eval/WithLexicals/WithHintPersistence.pm
-man/man1/tinyrepl.1.gz
+%%PERL5_MAN1%%/tinyrepl.1.gz
 %%PERL5_MAN3%%/Eval::WithLexicals.3.gz
 %%PERL5_MAN3%%/Eval::WithLexicals::WithHintPersistence.3.gz
diff --git a/devel/p5-ExtUtils-XSpp/pkg-plist b/devel/p5-ExtUtils-XSpp/pkg-plist
index 04a266cb5330..de918f578570 100644
--- a/devel/p5-ExtUtils-XSpp/pkg-plist
+++ b/devel/p5-ExtUtils-XSpp/pkg-plist
@@ -58,4 +58,4 @@ bin/xspp
 %%PERL5_MAN3%%/ExtUtils::XSpp::Parser.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Plugin.3.gz
 %%PERL5_MAN3%%/ExtUtils::XSpp::Typemap.3.gz
-man/man1/xspp.1.gz
+%%PERL5_MAN1%%/xspp.1.gz
diff --git a/devel/p5-File-Copy-Link/pkg-plist b/devel/p5-File-Copy-Link/pkg-plist
index f8b2baae8477..59da6aba853a 100644
--- a/devel/p5-File-Copy-Link/pkg-plist
+++ b/devel/p5-File-Copy-Link/pkg-plist
@@ -3,4 +3,4 @@ bin/copylink
 %%SITE_PERL%%/File/Spec/Link.pm
 %%PERL5_MAN3%%/File::Copy::Link.3.gz
 %%PERL5_MAN3%%/File::Spec::Link.3.gz
-man/man1/copylink.1.gz
+%%PERL5_MAN1%%/copylink.1.gz
diff --git a/devel/p5-File-Dir-Dumper/pkg-plist b/devel/p5-File-Dir-Dumper/pkg-plist
index 171bcaabae5e..b07046a01f59 100644
--- a/devel/p5-File-Dir-Dumper/pkg-plist
+++ b/devel/p5-File-Dir-Dumper/pkg-plist
@@ -1,5 +1,5 @@
 bin/dir-dump
-man/man1/dir-dump.1.gz
+%%PERL5_MAN1%%/dir-dump.1.gz
 %%SITE_PERL%%/File/Dir/Dumper.pm
 %%SITE_PERL%%/File/Dir/Dumper/App.pm
 %%SITE_PERL%%/File/Dir/Dumper/Base.pm
diff --git a/devel/p5-File-DirSync/pkg-plist b/devel/p5-File-DirSync/pkg-plist
index 34d1e78a4cc7..a76f2df17da5 100644
--- a/devel/p5-File-DirSync/pkg-plist
+++ b/devel/p5-File-DirSync/pkg-plist
@@ -1,4 +1,4 @@
 bin/dirsync
-man/man1/dirsync.1.gz
+%%PERL5_MAN1%%/dirsync.1.gz
 %%PERL5_MAN3%%/File::DirSync.3.gz
 %%SITE_PERL%%/File/DirSync.pm
diff --git a/devel/p5-File-Find-Rule/pkg-plist b/devel/p5-File-Find-Rule/pkg-plist
index 7db258065c7e..bcf83ecd3de5 100644
--- a/devel/p5-File-Find-Rule/pkg-plist
+++ b/devel/p5-File-Find-Rule/pkg-plist
@@ -5,4 +5,4 @@ bin/findrule
 %%SITE_PERL%%/File/Find/Rule.pm
 %%SITE_PERL%%/File/Find/Rule/Extending.pod
 %%SITE_PERL%%/File/Find/Rule/Procedural.pod
-man/man1/findrule.1.gz
+%%PERL5_MAN1%%/findrule.1.gz
diff --git a/devel/p5-File-MimeInfo/pkg-plist b/devel/p5-File-MimeInfo/pkg-plist
index 5210851a6cc8..1bdbaaa57b6f 100644
--- a/devel/p5-File-MimeInfo/pkg-plist
+++ b/devel/p5-File-MimeInfo/pkg-plist
@@ -10,5 +10,5 @@ bin/mimetype
 %%PERL5_MAN3%%/File::MimeInfo::Cookbook.3.gz
 %%PERL5_MAN3%%/File::MimeInfo::Magic.3.gz
 %%PERL5_MAN3%%/File::MimeInfo::Rox.3.gz
-man/man1/mimeopen.1.gz
-man/man1/mimetype.1.gz
+%%PERL5_MAN1%%/mimeopen.1.gz
+%%PERL5_MAN1%%/mimetype.1.gz
diff --git a/devel/p5-File-Tail-Scribe/pkg-plist b/devel/p5-File-Tail-Scribe/pkg-plist
index 743994151a61..79f795ac1ca9 100644
--- a/devel/p5-File-Tail-Scribe/pkg-plist
+++ b/devel/p5-File-Tail-Scribe/pkg-plist
@@ -1,4 +1,4 @@
 bin/tail_to_scribe.pl
 %%SITE_PERL%%/File/Tail/Scribe.pm
 %%PERL5_MAN3%%/File::Tail::Scribe.3.gz
-man/man1/tail_to_scribe.pl.1.gz
+%%PERL5_MAN1%%/tail_to_scribe.pl.1.gz
diff --git a/devel/p5-Gearman-Server/pkg-plist b/devel/p5-Gearman-Server/pkg-plist
index 39874e723960..5fe838035623 100644
--- a/devel/p5-Gearman-Server/pkg-plist
+++ b/devel/p5-Gearman-Server/pkg-plist
@@ -1,5 +1,5 @@
 bin/gearmand
-man/man1/gearmand.1.gz
+%%PERL5_MAN1%%/gearmand.1.gz
 %%SITE_PERL%%/Gearman/Server/Job.pm
 %%SITE_PERL%%/Gearman/Server/Client.pm
 %%SITE_PERL%%/Gearman/Server/Listener.pm
diff --git a/devel/p5-Goo-Canvas/pkg-plist b/devel/p5-Goo-Canvas/pkg-plist
index eed843a87650..e124169fbe36 100644
--- a/devel/p5-Goo-Canvas/pkg-plist
+++ b/devel/p5-Goo-Canvas/pkg-plist
@@ -1,7 +1,7 @@
 bin/perlmine.pl
 bin/perltetris.pl
-man/man1/perlmine.pl.1.gz
-man/man1/perltetris.pl.1.gz
+%%PERL5_MAN1%%/perlmine.pl.1.gz
+%%PERL5_MAN1%%/perltetris.pl.1.gz
 %%SITE_ARCH%%/Goo/Cairo/Matrix.pod
 %%SITE_ARCH%%/Goo/Cairo/Pattern.pod
 %%SITE_ARCH%%/Goo/Canvas.pm
diff --git a/devel/p5-IPC-DirQueue/pkg-plist b/devel/p5-IPC-DirQueue/pkg-plist
index 4a5b40bbaa0e..120cb00c0b0e 100644
--- a/devel/p5-IPC-DirQueue/pkg-plist
+++ b/devel/p5-IPC-DirQueue/pkg-plist
@@ -3,11 +3,11 @@ bin/dq-indexd
 bin/dq-list
 bin/dq-server
 bin/dq-submit
-man/man1/dq-deque.1.gz
-man/man1/dq-indexd.1.gz
-man/man1/dq-list.1.gz
-man/man1/dq-server.1.gz
-man/man1/dq-submit.1.gz
+%%PERL5_MAN1%%/dq-deque.1.gz
+%%PERL5_MAN1%%/dq-indexd.1.gz
+%%PERL5_MAN1%%/dq-list.1.gz
+%%PERL5_MAN1%%/dq-server.1.gz
+%%PERL5_MAN1%%/dq-submit.1.gz
 %%SITE_PERL%%/IPC/DirQueue.pm
 %%SITE_PERL%%/IPC/DirQueue/IndexClient.pm
 %%SITE_PERL%%/IPC/DirQueue/IndexServer.pm
diff --git a/devel/p5-IPC-Locker/pkg-plist b/devel/p5-IPC-Locker/pkg-plist
index cf847f2b9b32..91f398ba17b1 100644
--- a/devel/p5-IPC-Locker/pkg-plist
+++ b/devel/p5-IPC-Locker/pkg-plist
@@ -12,9 +12,9 @@ bin/uriexec
 %%SITE_PERL%%/IPC/Locker/Server.pm
 %%SITE_PERL%%/IPC/PidStat.pm
 %%SITE_PERL%%/IPC/PidStat/PidServer.pm
-man/man1/lockerd.1.gz
-man/man1/lockersh.1.gz
-man/man1/pidstat.1.gz
-man/man1/pidstatd.1.gz
-man/man1/pidwatch.1.gz
-man/man1/uriexec.1.gz
+%%PERL5_MAN1%%/lockerd.1.gz
+%%PERL5_MAN1%%/lockersh.1.gz
+%%PERL5_MAN1%%/pidstat.1.gz
+%%PERL5_MAN1%%/pidstatd.1.gz
+%%PERL5_MAN1%%/pidwatch.1.gz
+%%PERL5_MAN1%%/uriexec.1.gz
diff --git a/devel/p5-Lingua-Translit/pkg-plist b/devel/p5-Lingua-Translit/pkg-plist
index aabdbcd73369..8f294c131e1e 100644
--- a/devel/p5-Lingua-Translit/pkg-plist
+++ b/devel/p5-Lingua-Translit/pkg-plist
@@ -1,6 +1,6 @@
 bin/translit
 %%PERL5_MAN3%%/Lingua::Translit.3.gz
 %%PERL5_MAN3%%/Lingua::Translit::Tables.3.gz
-man/man1/translit.1.gz
+%%PERL5_MAN1%%/translit.1.gz
 %%SITE_PERL%%/Lingua/Translit/Tables.pm
 %%SITE_PERL%%/Lingua/Translit.pm
diff --git a/devel/p5-Locale-Maketext-Gettext/pkg-plist b/devel/p5-Locale-Maketext-Gettext/pkg-plist
index 1af289daca60..1a3c2c35e50c 100644
--- a/devel/p5-Locale-Maketext-Gettext/pkg-plist
+++ b/devel/p5-Locale-Maketext-Gettext/pkg-plist
@@ -3,4 +3,4 @@ bin/maketext
 %%PERL5_MAN3%%/Locale::Maketext::Gettext::Functions.3.gz
 %%SITE_PERL%%/Locale/Maketext/Gettext.pm
 %%SITE_PERL%%/Locale/Maketext/Gettext/Functions.pm
-man/man1/maketext.1.gz
+%%PERL5_MAN1%%/maketext.1.gz
diff --git a/devel/p5-Locale-Maketext-Lexicon/pkg-plist b/devel/p5-Locale-Maketext-Lexicon/pkg-plist
index ce26b3a6325a..d6adaa70b7c1 100644
--- a/devel/p5-Locale-Maketext-Lexicon/pkg-plist
+++ b/devel/p5-Locale-Maketext-Lexicon/pkg-plist
@@ -33,4 +33,4 @@ bin/xgettext.pl
 %%SITE_PERL%%/Locale/Maketext/Lexicon/Gettext.pm
 %%SITE_PERL%%/Locale/Maketext/Lexicon/Msgcat.pm
 %%SITE_PERL%%/Locale/Maketext/Lexicon/Tie.pm
-man/man1/xgettext.pl.1.gz
+%%PERL5_MAN1%%/xgettext.pl.1.gz
diff --git a/devel/p5-Locale-PGetText/pkg-plist b/devel/p5-Locale-PGetText/pkg-plist
index 5f0fdc3ba6a4..6596b44fa6b3 100644
--- a/devel/p5-Locale-PGetText/pkg-plist
+++ b/devel/p5-Locale-PGetText/pkg-plist
@@ -2,5 +2,5 @@ bin/MsgFormat
 bin/XText
 %%PERL5_MAN3%%/Locale::PGetText.3.gz
 %%SITE_PERL%%/Locale/PGetText.pm
-man/man1/MsgFormat.1.gz
-man/man1/XText.1.gz
+%%PERL5_MAN1%%/MsgFormat.1.gz
+%%PERL5_MAN1%%/XText.1.gz
diff --git a/devel/p5-Log-Accounting-SVK/pkg-plist b/devel/p5-Log-Accounting-SVK/pkg-plist
index d8518cb67817..340df2477340 100644
--- a/devel/p5-Log-Accounting-SVK/pkg-plist
+++ b/devel/p5-Log-Accounting-SVK/pkg-plist
@@ -1,7 +1,7 @@
 bin/svk-accounting.pl
 bin/svk-developer-graph.pl
-man/man1/svk-accounting.pl.1.gz
-man/man1/svk-developer-graph.pl.1.gz
+%%PERL5_MAN1%%/svk-accounting.pl.1.gz
+%%PERL5_MAN1%%/svk-developer-graph.pl.1.gz
 %%PERL5_MAN3%%/Log::Accounting::SVK.3.gz
 %%SITE_PERL%%/Log/Accounting/SVK.pm
 %%SITE_PERL%%/Log/Accounting/SVK.pod
diff --git a/devel/p5-Log-Dispatch-Scribe/pkg-plist b/devel/p5-Log-Dispatch-Scribe/pkg-plist
index a3960c2167cf..b69cb9dd17c7 100644
--- a/devel/p5-Log-Dispatch-Scribe/pkg-plist
+++ b/devel/p5-Log-Dispatch-Scribe/pkg-plist
@@ -1,4 +1,4 @@
 bin/scribe_cat.pl
 %%PERL5_MAN3%%/Log::Dispatch::Scribe.3.gz
 %%SITE_PERL%%/Log/Dispatch/Scribe.pm
-man/man1/scribe_cat.pl.1.gz
+%%PERL5_MAN1%%/scribe_cat.pl.1.gz
diff --git a/devel/p5-Log-Log4perl/pkg-plist b/devel/p5-Log-Log4perl/pkg-plist
index 16074ee0f708..da4ce84bdcd6 100644
--- a/devel/p5-Log-Log4perl/pkg-plist
+++ b/devel/p5-Log-Log4perl/pkg-plist
@@ -101,4 +101,4 @@ bin/l4p-tmpl
 %%PERL5_MAN3%%/Log::Log4perl::Util.3.gz
 %%PERL5_MAN3%%/Log::Log4perl::Util::Semaphore.3.gz
 %%PERL5_MAN3%%/Log::Log4perl::Util::TimeTracker.3.gz
-man/man1/l4p-tmpl.1.gz
+%%PERL5_MAN1%%/l4p-tmpl.1.gz
diff --git a/devel/p5-Make/pkg-plist b/devel/p5-Make/pkg-plist
index f456c200835d..f0d8cf39935b 100644
--- a/devel/p5-Make/pkg-plist
+++ b/devel/p5-Make/pkg-plist
@@ -1,4 +1,4 @@
 bin/perlmake
 %%PERL5_MAN3%%/Make.3.gz
 %%SITE_PERL%%/Make.pm
-man/man1/perlmake.1.gz
+%%PERL5_MAN1%%/perlmake.1.gz
diff --git a/devel/p5-Metabase-Fact/pkg-plist b/devel/p5-Metabase-Fact/pkg-plist
index 3a5cb91c9f44..4550ebe079aa 100644
--- a/devel/p5-Metabase-Fact/pkg-plist
+++ b/devel/p5-Metabase-Fact/pkg-plist
@@ -1,5 +1,5 @@
 bin/metabase-profile
-man/man1/metabase-profile.1.gz
+%%PERL5_MAN1%%/metabase-profile.1.gz
 %%SITE_PERL%%/Metabase/Report.pm
 %%SITE_PERL%%/Metabase/Fact.pm
 %%SITE_PERL%%/Metabase/User/Secret.pm
diff --git a/devel/p5-Module-Build-Convert/pkg-plist b/devel/p5-Module-Build-Convert/pkg-plist
index 7b7cb4f42196..b48ec24f43ca 100644
--- a/devel/p5-Module-Build-Convert/pkg-plist
+++ b/devel/p5-Module-Build-Convert/pkg-plist
@@ -1,4 +1,4 @@
 bin/make2build
 %%PERL5_MAN3%%/Module::Build::Convert.3.gz
 %%SITE_PERL%%/Module/Build/Convert.pm
-man/man1/make2build.1.gz
+%%PERL5_MAN1%%/make2build.1.gz
diff --git a/devel/p5-Module-CPANfile/pkg-plist b/devel/p5-Module-CPANfile/pkg-plist
index bd7766ca654f..832f48e037e7 100644
--- a/devel/p5-Module-CPANfile/pkg-plist
+++ b/devel/p5-Module-CPANfile/pkg-plist
@@ -1,7 +1,7 @@
 bin/mymeta-cpanfile
 bin/cpanfile-dump
-man/man1/cpanfile-dump.1.gz
-man/man1/mymeta-cpanfile.1.gz
+%%PERL5_MAN1%%/cpanfile-dump.1.gz
+%%PERL5_MAN1%%/mymeta-cpanfile.1.gz
 %%PERL5_MAN3%%/Module::CPANfile.3.gz
 %%PERL5_MAN3%%/cpanfile-faq.3.gz
 %%PERL5_MAN3%%/cpanfile.3.gz
diff --git a/devel/p5-Module-CheckDeps/pkg-plist b/devel/p5-Module-CheckDeps/pkg-plist
index bad1ac271e80..5b11252df29b 100644
--- a/devel/p5-Module-CheckDeps/pkg-plist
+++ b/devel/p5-Module-CheckDeps/pkg-plist
@@ -1,4 +1,4 @@
 bin/checkdeps
 %%SITE_PERL%%/Module/CheckDeps.pm
 %%PERL5_MAN3%%/Module::CheckDeps.3.gz
-man/man1/checkdeps.1.gz
+%%PERL5_MAN1%%/checkdeps.1.gz
diff --git a/devel/p5-Module-Dependency/pkg-plist b/devel/p5-Module-Dependency/pkg-plist
index 24e6ec630c75..353fdcec9704 100644
--- a/devel/p5-Module-Dependency/pkg-plist
+++ b/devel/p5-Module-Dependency/pkg-plist
@@ -11,6 +11,6 @@ bin/pmd_indexer.plx
 %%SITE_PERL%%/Module/Dependency/Indexer.pm
 %%SITE_PERL%%/Module/Dependency/Info.pm
 %%SITE_PERL%%/Module/pmd_dump.pl
-man/man1/pmd_dump.pl.1.gz
-man/man1/pmd_grapher.plx.1.gz
-man/man1/pmd_indexer.plx.1.gz
+%%PERL5_MAN1%%/pmd_dump.pl.1.gz
+%%PERL5_MAN1%%/pmd_grapher.plx.1.gz
+%%PERL5_MAN1%%/pmd_indexer.plx.1.gz
diff --git a/devel/p5-Module-Info/pkg-plist b/devel/p5-Module-Info/pkg-plist
index b46907a01c77..1e4518c75c76 100644
--- a/devel/p5-Module-Info/pkg-plist
+++ b/devel/p5-Module-Info/pkg-plist
@@ -1,7 +1,7 @@
 bin/module_info
 bin/pfunc
-man/man1/module_info.1.gz
-man/man1/pfunc.1.gz
+%%PERL5_MAN1%%/module_info.1.gz
+%%PERL5_MAN1%%/pfunc.1.gz
 %%PERL5_MAN3%%/B::BUtils.3.gz
 %%PERL5_MAN3%%/B::Module::Info.3.gz
 %%PERL5_MAN3%%/Module::Info.3.gz
diff --git a/devel/p5-Module-Path/pkg-plist b/devel/p5-Module-Path/pkg-plist
index f32a14b46ed2..7f1a71c6178a 100644
--- a/devel/p5-Module-Path/pkg-plist
+++ b/devel/p5-Module-Path/pkg-plist
@@ -1,4 +1,4 @@
 bin/mpath
 %%SITE_PERL%%/Module/Path.pm
-man/man1/mpath.1.gz
+%%PERL5_MAN1%%/mpath.1.gz
 %%PERL5_MAN3%%/Module::Path.3.gz
diff --git a/devel/p5-Module-Release/pkg-plist b/devel/p5-Module-Release/pkg-plist
index a14309c9b70b..9e0750463f4d 100644
--- a/devel/p5-Module-Release/pkg-plist
+++ b/devel/p5-Module-Release/pkg-plist
@@ -15,4 +15,4 @@ bin/release
 %%PERL5_MAN3%%/Module::Release::Prereq.3.gz
 %%PERL5_MAN3%%/Module::Release::SVN.3.gz
 %%PERL5_MAN3%%/Module::Release::WebUpload::Mojo.3.gz
-man/man1/release.1.gz
+%%PERL5_MAN1%%/release.1.gz
diff --git a/devel/p5-Module-ScanDeps/pkg-plist b/devel/p5-Module-ScanDeps/pkg-plist
index 719186936759..660bde48b003 100644
--- a/devel/p5-Module-ScanDeps/pkg-plist
+++ b/devel/p5-Module-ScanDeps/pkg-plist
@@ -3,4 +3,4 @@ bin/scandeps.pl
 %%SITE_PERL%%/Module/ScanDeps/Cache.pm
 %%SITE_PERL%%/Module/ScanDeps/DataFeed.pm
 %%PERL5_MAN3%%/Module::ScanDeps.3.gz
-man/man1/scandeps.pl.1.gz
+%%PERL5_MAN1%%/scandeps.pl.1.gz
diff --git a/devel/p5-Module-Setup/pkg-plist b/devel/p5-Module-Setup/pkg-plist
index 7206220c1111..5a536f7215de 100644
--- a/devel/p5-Module-Setup/pkg-plist
+++ b/devel/p5-Module-Setup/pkg-plist
@@ -51,4 +51,4 @@ bin/module-setup
 %%PERL5_MAN3%%/Module::Setup::Plugin::VC::Git.3.gz
 %%PERL5_MAN3%%/Module::Setup::Test::Flavor.3.gz
 %%PERL5_MAN3%%/Module::Setup::Test::Utils.3.gz
-man/man1/module-setup.1.gz
+%%PERL5_MAN1%%/module-setup.1.gz
diff --git a/devel/p5-Module-Starter/pkg-plist b/devel/p5-Module-Starter/pkg-plist
index 0de73195e97c..9293a2288db7 100644
--- a/devel/p5-Module-Starter/pkg-plist
+++ b/devel/p5-Module-Starter/pkg-plist
@@ -11,4 +11,4 @@ bin/module-starter
 %%SITE_PERL%%/Module/Starter/Plugin.pod
 %%SITE_PERL%%/Module/Starter/Plugin/Template.pm
 %%SITE_PERL%%/Module/Starter/Simple.pm
-man/man1/module-starter.1.gz
+%%PERL5_MAN1%%/module-starter.1.gz
diff --git a/devel/p5-Module-Used/pkg-plist b/devel/p5-Module-Used/pkg-plist
index 8dc0951f7897..2587d7c7f42b 100644
--- a/devel/p5-Module-Used/pkg-plist
+++ b/devel/p5-Module-Used/pkg-plist
@@ -1,4 +1,4 @@
 bin/modules-used
-man/man1/modules-used.1.gz
+%%PERL5_MAN1%%/modules-used.1.gz
 %%PERL5_MAN3%%/Module::Used.3.gz
 %%SITE_PERL%%/Module/Used.pm
diff --git a/devel/p5-Module-Util/pkg-plist b/devel/p5-Module-Util/pkg-plist
index 416abb9399eb..cd490e21ea64 100644
--- a/devel/p5-Module-Util/pkg-plist
+++ b/devel/p5-Module-Util/pkg-plist
@@ -1,4 +1,4 @@
 bin/pm_which
 %%SITE_PERL%%/Module/Util.pm
 %%PERL5_MAN3%%/Module::Util.3.gz
-man/man1/pm_which.1.gz
+%%PERL5_MAN1%%/pm_which.1.gz
diff --git a/devel/p5-Module-Version/pkg-plist b/devel/p5-Module-Version/pkg-plist
index 3965b7c6da04..de62134dbab0 100644
--- a/devel/p5-Module-Version/pkg-plist
+++ b/devel/p5-Module-Version/pkg-plist
@@ -3,4 +3,4 @@ bin/mversion
 %%SITE_PERL%%/Module/Version/App.pm
 %%PERL5_MAN3%%/Module::Version.3.gz
 %%PERL5_MAN3%%/Module::Version::App.3.gz
-man/man1/mversion.1.gz
+%%PERL5_MAN1%%/mversion.1.gz
diff --git a/devel/p5-Moos/pkg-plist b/devel/p5-Moos/pkg-plist
index 703e11873839..4a07e9aa064f 100644
--- a/devel/p5-Moos/pkg-plist
+++ b/devel/p5-Moos/pkg-plist
@@ -8,4 +8,4 @@ bin/remoos
 %%PERL5_MAN3%%/Moos.3.gz
 %%PERL5_MAN3%%/Moos::Role.3.gz
 %%PERL5_MAN3%%/oos.3.gz
-man/man1/remoos.1.gz
+%%PERL5_MAN1%%/remoos.1.gz
diff --git a/devel/p5-MooseX-Runnable/pkg-plist b/devel/p5-MooseX-Runnable/pkg-plist
index a6dc0c53aee1..9e828de7ed3f 100644
--- a/devel/p5-MooseX-Runnable/pkg-plist
+++ b/devel/p5-MooseX-Runnable/pkg-plist
@@ -27,4 +27,4 @@ bin/mx-run
 %%PERL5_MAN3%%/MooseX::Runnable::Invocation::Scheme::MooseX::Getopt.3.gz
 %%PERL5_MAN3%%/MooseX::Runnable::Run.3.gz
 %%PERL5_MAN3%%/MooseX::Runnable::Util::ArgParser.3.gz
-man/man1/mx-run.1.gz
+%%PERL5_MAN1%%/mx-run.1.gz
diff --git a/devel/p5-OrePAN2/pkg-plist b/devel/p5-OrePAN2/pkg-plist
index e1d4ae5a4959..e5c0fe4bf92d 100644
--- a/devel/p5-OrePAN2/pkg-plist
+++ b/devel/p5-OrePAN2/pkg-plist
@@ -21,8 +21,8 @@ bin/orepan2-merge-index
 %%PERL5_MAN3%%/OrePAN2::Injector.3.gz
 %%PERL5_MAN3%%/OrePAN2::Repository.3.gz
 %%PERL5_MAN3%%/OrePAN2::Repository::Cache.3.gz
-man/man1/orepan2-audit.1.gz
-man/man1/orepan2-gc.1.gz
-man/man1/orepan2-indexer.1.gz
-man/man1/orepan2-inject.1.gz
-man/man1/orepan2-merge-index.1.gz
+%%PERL5_MAN1%%/orepan2-audit.1.gz
+%%PERL5_MAN1%%/orepan2-gc.1.gz
+%%PERL5_MAN1%%/orepan2-indexer.1.gz
+%%PERL5_MAN1%%/orepan2-inject.1.gz
+%%PERL5_MAN1%%/orepan2-merge-index.1.gz
diff --git a/devel/p5-PAR-Packer/pkg-plist b/devel/p5-PAR-Packer/pkg-plist
index 0b33f0db32b7..ff2672a38d9e 100644
--- a/devel/p5-PAR-Packer/pkg-plist
+++ b/devel/p5-PAR-Packer/pkg-plist
@@ -27,7 +27,7 @@ bin/tkpp
 %%PERL5_MAN3%%/PAR::StrippedPARL::Base.3.gz
 %%PERL5_MAN3%%/Static.3.gz
 %%PERL5_MAN3%%/pp.3.gz
-man/man1/par.pl.1.gz
-man/man1/parl.1.gz
-man/man1/pp.1.gz
-man/man1/tkpp.1.gz
+%%PERL5_MAN1%%/par.pl.1.gz
+%%PERL5_MAN1%%/parl.1.gz
+%%PERL5_MAN1%%/pp.1.gz
+%%PERL5_MAN1%%/tkpp.1.gz
diff --git a/devel/p5-POE-Devel-Profiler/pkg-plist b/devel/p5-POE-Devel-Profiler/pkg-plist
index 58b4523da3c0..ac13c35dbb35 100644
--- a/devel/p5-POE-Devel-Profiler/pkg-plist
+++ b/devel/p5-POE-Devel-Profiler/pkg-plist
@@ -4,4 +4,4 @@ bin/poepp
 %%SITE_PERL%%/POE/Devel/Profiler/Parser.pm
 %%SITE_PERL%%/POE/Devel/Profiler/Visualizer/BasicGraphViz.pm
 %%SITE_PERL%%/POE/Devel/Profiler/Visualizer/BasicSummary.pm
-man/man1/poepp.1.gz
+%%PERL5_MAN1%%/poepp.1.gz
diff --git a/devel/p5-POE-Test-Loops/pkg-plist b/devel/p5-POE-Test-Loops/pkg-plist
index 4cc8ce6bfb57..ac0bab9be75f 100644
--- a/devel/p5-POE-Test-Loops/pkg-plist
+++ b/devel/p5-POE-Test-Loops/pkg-plist
@@ -37,4 +37,4 @@ bin/poe-gen-tests
 %%SITE_PERL%%/POE/Test/Loops/z_rt54319_bazerka_followtail.pm
 %%SITE_PERL%%/POE/Test/Loops/z_steinert_signal_integrity.pm
 %%PERL5_MAN3%%/POE::Test::Loops.3.gz
-man/man1/poe-gen-tests.1.gz
+%%PERL5_MAN1%%/poe-gen-tests.1.gz
diff --git a/devel/p5-PPerl/pkg-plist b/devel/p5-PPerl/pkg-plist
index 0177b85c9105..e2d804699a66 100644
--- a/devel/p5-PPerl/pkg-plist
+++ b/devel/p5-PPerl/pkg-plist
@@ -1,5 +1,5 @@
 bin/pperl
-man/man1/pperl.1.gz
+%%PERL5_MAN1%%/pperl.1.gz
 %%PERL5_MAN3%%/PPerl.3.gz
 %%SITE_ARCH%%/auto/PPerl/PPerl.so
 %%SITE_ARCH%%/PPerl.pm
diff --git a/devel/p5-Package-Stash/pkg-plist b/devel/p5-Package-Stash/pkg-plist
index 5b3ebd39c511..5d0c8500ced3 100644
--- a/devel/p5-Package-Stash/pkg-plist
+++ b/devel/p5-Package-Stash/pkg-plist
@@ -4,4 +4,4 @@ bin/package-stash-conflicts
 %%SITE_PERL%%/Package/Stash.pm
 %%SITE_PERL%%/Package/Stash/Conflicts.pm
 %%SITE_PERL%%/Package/Stash/PP.pm
-man/man1/package-stash-conflicts.1.gz
+%%PERL5_MAN1%%/package-stash-conflicts.1.gz
diff --git a/devel/p5-Parse-ErrorString-Perl/pkg-plist b/devel/p5-Parse-ErrorString-Perl/pkg-plist
index 388252a85641..fb38069fbf42 100644
--- a/devel/p5-Parse-ErrorString-Perl/pkg-plist
+++ b/devel/p5-Parse-ErrorString-Perl/pkg-plist
@@ -1,5 +1,5 @@
 bin/check_perldiag
-man/man1/check_perldiag.1.gz
+%%PERL5_MAN1%%/check_perldiag.1.gz
 %%SITE_PERL%%/Parse/ErrorString/Perl/ErrorItem.pm
 %%SITE_PERL%%/Parse/ErrorString/Perl/StackItem.pm
 %%SITE_PERL%%/Parse/ErrorString/Perl.pm
diff --git a/devel/p5-Parse-Pidl/pkg-plist b/devel/p5-Parse-Pidl/pkg-plist
index 48ed2dfcac59..69010171b32f 100644
--- a/devel/p5-Parse-Pidl/pkg-plist
+++ b/devel/p5-Parse-Pidl/pkg-plist
@@ -29,4 +29,4 @@ bin/pidl
 %%PERL5_MAN3%%/Parse::Pidl::Util.3.gz
 %%PERL5_MAN3%%/Parse::Pidl::Wireshark::Conformance.3.gz
 %%PERL5_MAN3%%/Parse::Pidl::Wireshark::NDR.3.gz
-man/man1/pidl.1.gz
+%%PERL5_MAN1%%/pidl.1.gz
diff --git a/devel/p5-Parse-Yapp/pkg-plist b/devel/p5-Parse-Yapp/pkg-plist
index b61b757e0a4b..012bba584e06 100644
--- a/devel/p5-Parse-Yapp/pkg-plist
+++ b/devel/p5-Parse-Yapp/pkg-plist
@@ -7,4 +7,4 @@ bin/yapp
 %%SITE_PERL%%/Parse/Yapp/Parse.pm
 %%SITE_PERL%%/Parse/Yapp.pm
 %%PERL5_MAN3%%/Parse::Yapp.3.gz
-man/man1/yapp.1.gz
+%%PERL5_MAN1%%/yapp.1.gz
diff --git a/devel/p5-Perl-Metrics-Lite/pkg-plist b/devel/p5-Perl-Metrics-Lite/pkg-plist
index e50ce66fc8e3..b94291817709 100644
--- a/devel/p5-Perl-Metrics-Lite/pkg-plist
+++ b/devel/p5-Perl-Metrics-Lite/pkg-plist
@@ -1,7 +1,7 @@
 bin/measureperl
 bin/measureperl-checkstyle
-man/man1/measureperl-checkstyle.1.gz
-man/man1/measureperl.1.gz
+%%PERL5_MAN1%%/measureperl-checkstyle.1.gz
+%%PERL5_MAN1%%/measureperl.1.gz
 %%SITE_PERL%%/Perl/Metrics/Lite.pm
 %%SITE_PERL%%/Perl/Metrics/Lite/Analysis.pm
 %%SITE_PERL%%/Perl/Metrics/Lite/Analysis/DocumentFactory.pm
diff --git a/devel/p5-Perl-Metrics-Simple/pkg-plist b/devel/p5-Perl-Metrics-Simple/pkg-plist
index cc5e0e92f324..1a5408251231 100644
--- a/devel/p5-Perl-Metrics-Simple/pkg-plist
+++ b/devel/p5-Perl-Metrics-Simple/pkg-plist
@@ -1,5 +1,5 @@
 bin/countperl
-man/man1/countperl.1.gz
+%%PERL5_MAN1%%/countperl.1.gz
 %%PERL5_MAN3%%/Perl::Metrics::Simple.3.gz
 %%PERL5_MAN3%%/Perl::Metrics::Simple::Analysis.3.gz
 %%PERL5_MAN3%%/Perl::Metrics::Simple::Analysis::File.3.gz
diff --git a/devel/p5-Perl-PrereqScanner/pkg-plist b/devel/p5-Perl-PrereqScanner/pkg-plist
index 03045c0f74dc..4442e3631ebf 100644
--- a/devel/p5-Perl-PrereqScanner/pkg-plist
+++ b/devel/p5-Perl-PrereqScanner/pkg-plist
@@ -8,8 +8,8 @@ bin/scan-perl-prereqs
 %%SITE_PERL%%/Perl/PrereqScanner/Scanner/Perl5.pm
 %%SITE_PERL%%/Perl/PrereqScanner/Scanner/Superclass.pm
 %%SITE_PERL%%/Perl/PrereqScanner/Scanner/TestMore.pm
-man/man1/scan-perl-prereqs.1.gz
-man/man1/scan_prereqs.1.gz
+%%PERL5_MAN1%%/scan-perl-prereqs.1.gz
+%%PERL5_MAN1%%/scan_prereqs.1.gz
 %%PERL5_MAN3%%/Perl::PrereqScanner.3.gz
 %%PERL5_MAN3%%/Perl::PrereqScanner::Scanner.3.gz
 %%PERL5_MAN3%%/Perl::PrereqScanner::Scanner::Aliased.3.gz
diff --git a/devel/p5-Perl-Tidy/pkg-plist b/devel/p5-Perl-Tidy/pkg-plist
index 769d46001d1a..508e1debaf60 100644
--- a/devel/p5-Perl-Tidy/pkg-plist
+++ b/devel/p5-Perl-Tidy/pkg-plist
@@ -2,4 +2,4 @@ bin/perltidy
 %%SITE_PERL%%/Perl/Tidy.pm
 %%SITE_PERL%%/Perl/Tidy.pod
 %%PERL5_MAN3%%/Perl::Tidy.3.gz
-man/man1/perltidy.1.gz
+%%PERL5_MAN1%%/perltidy.1.gz
diff --git a/devel/p5-Perl-Version/pkg-plist b/devel/p5-Perl-Version/pkg-plist
index ae9d1244135a..cd912882d69b 100644
--- a/devel/p5-Perl-Version/pkg-plist
+++ b/devel/p5-Perl-Version/pkg-plist
@@ -1,4 +1,4 @@
 bin/perl-reversion
-man/man1/perl-reversion.1.gz
+%%PERL5_MAN1%%/perl-reversion.1.gz
 %%PERL5_MAN3%%/Perl::Version.3.gz
 %%SITE_PERL%%/Perl/Version.pm
diff --git a/devel/p5-PkgConfig/pkg-plist b/devel/p5-PkgConfig/pkg-plist
index cbe4361951e4..1b7140f39854 100644
--- a/devel/p5-PkgConfig/pkg-plist
+++ b/devel/p5-PkgConfig/pkg-plist
@@ -2,5 +2,5 @@ bin/pkg-config.pl
 bin/ppkg-config
 %%SITE_PERL%%/PkgConfig.pm
 %%PERL5_MAN3%%/PkgConfig.3.gz
-man/man1/pkg-config.pl.1.gz
-man/man1/ppkg-config.1.gz
+%%PERL5_MAN1%%/pkg-config.pl.1.gz
+%%PERL5_MAN1%%/ppkg-config.1.gz
diff --git a/devel/p5-Pod-Tests/pkg-plist b/devel/p5-Pod-Tests/pkg-plist
index faefcf8adbce..dd949e7563ad 100644
--- a/devel/p5-Pod-Tests/pkg-plist
+++ b/devel/p5-Pod-Tests/pkg-plist
@@ -1,4 +1,4 @@
 bin/pod2test
 %%PERL5_MAN3%%/Pod::Tests.3.gz
 %%SITE_PERL%%/Pod/Tests.pm
-man/man1/pod2test.1.gz
+%%PERL5_MAN1%%/pod2test.1.gz
diff --git a/devel/p5-Proc-Background/pkg-plist b/devel/p5-Proc-Background/pkg-plist
index 59efbfaa7fb7..94c8c0c76966 100644
--- a/devel/p5-Proc-Background/pkg-plist
+++ b/devel/p5-Proc-Background/pkg-plist
@@ -1,5 +1,5 @@
 bin/timed-process
-man/man1/timed-process.1.gz
+%%PERL5_MAN1%%/timed-process.1.gz
 %%SITE_PERL%%/Proc/Background.pm
 %%SITE_PERL%%/Proc/Background/Unix.pm
 %%SITE_PERL%%/Proc/Background/Win32.pm
diff --git a/devel/p5-ReadLine-Gnu/pkg-plist b/devel/p5-ReadLine-Gnu/pkg-plist
index 55e5223b6088..5ce08c4acfdb 100644
--- a/devel/p5-ReadLine-Gnu/pkg-plist
+++ b/devel/p5-ReadLine-Gnu/pkg-plist
@@ -4,4 +4,4 @@ bin/perlsh
 %%SITE_ARCH%%/auto/Term/ReadLine/Gnu/Gnu.so
 %%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/autosplit.ix
 %%PERL5_MAN3%%/Term::ReadLine::Gnu.3.gz
-man/man1/perlsh.1.gz
+%%PERL5_MAN1%%/perlsh.1.gz
diff --git a/devel/p5-Reply/pkg-plist b/devel/p5-Reply/pkg-plist
index d4b9196a92bd..0675b425c1a4 100644
--- a/devel/p5-Reply/pkg-plist
+++ b/devel/p5-Reply/pkg-plist
@@ -57,4 +57,4 @@ bin/reply
 %%PERL5_MAN3%%/Reply::Plugin::ReadLine.3.gz
 %%PERL5_MAN3%%/Reply::Plugin::ResultCache.3.gz
 %%PERL5_MAN3%%/Reply::Plugin::Timer.3.gz
-man/man1/reply.1.gz
+%%PERL5_MAN1%%/reply.1.gz
diff --git a/devel/p5-SVN-Hook/pkg-plist b/devel/p5-SVN-Hook/pkg-plist
index b2cbab76a3b2..b37df95daebe 100644
--- a/devel/p5-SVN-Hook/pkg-plist
+++ b/devel/p5-SVN-Hook/pkg-plist
@@ -1,5 +1,5 @@
 bin/svnhook
-man/man1/svnhook.1.gz
+%%PERL5_MAN1%%/svnhook.1.gz
 %%SITE_PERL%%/SVN/Hook.pm
 %%SITE_PERL%%/SVN/Hook/CLI.pm
 %%SITE_PERL%%/SVN/Hook/Redispatch.pm
diff --git a/devel/p5-SVN-Mirror/pkg-plist b/devel/p5-SVN-Mirror/pkg-plist
index 1ed3b4417592..74655d9f7501 100644
--- a/devel/p5-SVN-Mirror/pkg-plist
+++ b/devel/p5-SVN-Mirror/pkg-plist
@@ -4,4 +4,4 @@ bin/svm
 %%SITE_PERL%%/SVN/Mirror/Ra.pm
 %%SITE_PERL%%/SVN/Mirror/VCP.pm
 %%PERL5_MAN3%%/SVN::Mirror.3.gz
-man/man1/svm.1.gz
+%%PERL5_MAN1%%/svm.1.gz
diff --git a/devel/p5-SVN-Notify/pkg-plist b/devel/p5-SVN-Notify/pkg-plist
index 704fa1ca2069..aaf32f9f7a94 100644
--- a/devel/p5-SVN-Notify/pkg-plist
+++ b/devel/p5-SVN-Notify/pkg-plist
@@ -11,4 +11,4 @@ bin/svnnotify
 %%SITE_PERL%%/SVN/Notify/Filter/Trac.pm
 %%SITE_PERL%%/SVN/Notify/HTML.pm
 %%SITE_PERL%%/SVN/Notify/HTML/ColorDiff.pm
-man/man1/svnnotify.1.gz
+%%PERL5_MAN1%%/svnnotify.1.gz
diff --git a/devel/p5-SVN-S4/pkg-plist b/devel/p5-SVN-S4/pkg-plist
index bda31ee40639..0a59528eaeb7 100644
--- a/devel/p5-SVN-S4/pkg-plist
+++ b/devel/p5-SVN-S4/pkg-plist
@@ -27,4 +27,4 @@ bin/s4
 %%PERL5_MAN3%%/SVN::S4::Update.3.gz
 %%PERL5_MAN3%%/SVN::S4::ViewSpec.3.gz
 %%PERL5_MAN3%%/SVN::S4::WorkProp.3.gz
-man/man1/s4.1.gz
+%%PERL5_MAN1%%/s4.1.gz
diff --git a/devel/p5-SVN-Web/pkg-plist b/devel/p5-SVN-Web/pkg-plist
index 276268fad0ca..7b7e7ac6368f 100644
--- a/devel/p5-SVN-Web/pkg-plist
+++ b/devel/p5-SVN-Web/pkg-plist
@@ -39,7 +39,7 @@ bin/svnweb-install
 %%SITE_PERL%%/SVN/Web/View.pm
 %%SITE_PERL%%/SVN/Web/X.pm
 %%SITE_PERL%%/SVN/Web/action.pm
-man/man1/svnweb-install.1.gz
+%%PERL5_MAN1%%/svnweb-install.1.gz
 %%WWWDIR%%/SVN-Web.psgi
 %%WWWDIR%%/css/common.css
 %%WWWDIR%%/css/styles-hlb.css
diff --git a/devel/p5-Sepia/pkg-plist b/devel/p5-Sepia/pkg-plist
index 27848896501d..317a65a7aa8e 100644
--- a/devel/p5-Sepia/pkg-plist
+++ b/devel/p5-Sepia/pkg-plist
@@ -1,5 +1,5 @@
 bin/sepl
-man/man1/sepl.1.gz
+%%PERL5_MAN1%%/sepl.1.gz
 %%PERL5_MAN3%%/Sepia.3.gz
 %%PERL5_MAN3%%/Sepia::Xref.3.gz
 %%SITE_PERL%%/Sepia/Debug.pm
diff --git a/devel/p5-Set-CrossProduct/pkg-plist b/devel/p5-Set-CrossProduct/pkg-plist
index 7d6eb570c8cc..df3f480d750b 100644
--- a/devel/p5-Set-CrossProduct/pkg-plist
+++ b/devel/p5-Set-CrossProduct/pkg-plist
@@ -1,4 +1,4 @@
 bin/cross
-man/man1/cross.1.gz
+%%PERL5_MAN1%%/cross.1.gz
 %%PERL5_MAN3%%/Set::CrossProduct.3.gz
 %%SITE_PERL%%/Set/CrossProduct.pm
diff --git a/devel/p5-ShipIt/pkg-plist b/devel/p5-ShipIt/pkg-plist
index 15e1735941c9..cbd4f916e3e6 100644
--- a/devel/p5-ShipIt/pkg-plist
+++ b/devel/p5-ShipIt/pkg-plist
@@ -35,4 +35,4 @@ bin/shipit
 %%SITE_PERL%%/ShipIt/VC/Mercurial.pm
 %%SITE_PERL%%/ShipIt/VC/SVK.pm
 %%SITE_PERL%%/ShipIt/VC/SVN.pm
-man/man1/shipit.1.gz
+%%PERL5_MAN1%%/shipit.1.gz
diff --git a/devel/p5-String-Dump/pkg-plist b/devel/p5-String-Dump/pkg-plist
index ef81555eb246..f90668c65ee0 100644
--- a/devel/p5-String-Dump/pkg-plist
+++ b/devel/p5-String-Dump/pkg-plist
@@ -1,5 +1,5 @@
 bin/dumpstr
-man/man1/dumpstr.1.gz
+%%PERL5_MAN1%%/dumpstr.1.gz
 %%PERL5_MAN3%%/String::Dump.3.gz
 %%PERL5_MAN3%%/String::Dump::Debugging.3.gz
 %%SITE_PERL%%/String/Dump.pm
diff --git a/devel/p5-TAP-Formatter-JUnit/pkg-plist b/devel/p5-TAP-Formatter-JUnit/pkg-plist
index b858d9f5b6f5..e12aae72b13e 100644
--- a/devel/p5-TAP-Formatter-JUnit/pkg-plist
+++ b/devel/p5-TAP-Formatter-JUnit/pkg-plist
@@ -1,5 +1,5 @@
 bin/tap2junit
-man/man1/tap2junit.1.gz
+%%PERL5_MAN1%%/tap2junit.1.gz
 %%SITE_PERL%%/TAP/Formatter/JUnit.pm
 %%SITE_PERL%%/TAP/Formatter/JUnit/Result.pm
 %%SITE_PERL%%/TAP/Formatter/JUnit/Session.pm
diff --git a/devel/p5-Tee/pkg-plist b/devel/p5-Tee/pkg-plist
index 53d654e657fa..ead909068183 100644
--- a/devel/p5-Tee/pkg-plist
+++ b/devel/p5-Tee/pkg-plist
@@ -1,5 +1,5 @@
 bin/ptee
-man/man1/ptee.1.gz
+%%PERL5_MAN1%%/ptee.1.gz
 %%PERL5_MAN3%%/Tee.3.gz
 %%PERL5_MAN3%%/Tee::App.3.gz
 %%SITE_PERL%%/Tee.pm
diff --git a/devel/p5-Test-Harness/pkg-plist b/devel/p5-Test-Harness/pkg-plist
index 0a3ddea7a025..3c333e280395 100644
--- a/devel/p5-Test-Harness/pkg-plist
+++ b/devel/p5-Test-Harness/pkg-plist
@@ -99,4 +99,4 @@ bin/p5prove
 %%PERL5_MAN3%%/TAP::Parser::YAMLish::Writer.3.gz
 %%PERL5_MAN3%%/Test::HACKING.3.gz
 %%PERL5_MAN3%%/Test::Harness.3.gz
-man/man1/p5prove.1.gz
+%%PERL5_MAN1%%/p5prove.1.gz
diff --git a/devel/p5-Test-Inline/pkg-plist b/devel/p5-Test-Inline/pkg-plist
index 0704f217c27a..935c30e42a1a 100644
--- a/devel/p5-Test-Inline/pkg-plist
+++ b/devel/p5-Test-Inline/pkg-plist
@@ -18,4 +18,4 @@ bin/inline2test
 %%SITE_PERL%%/Test/Inline/Script.pm
 %%SITE_PERL%%/Test/Inline/Section.pm
 %%SITE_PERL%%/Test/Inline/Util.pm
-man/man1/inline2test.1.gz
+%%PERL5_MAN1%%/inline2test.1.gz
diff --git a/devel/p5-Test-Parser/pkg-plist b/devel/p5-Test-Parser/pkg-plist
index d98aef5bf252..9e40101fe3b0 100644
--- a/devel/p5-Test-Parser/pkg-plist
+++ b/devel/p5-Test-Parser/pkg-plist
@@ -42,8 +42,8 @@
 %%PERL5_MAN3%%/Test::Parser::lhcs_regression.3.gz
 %%PERL5_MAN3%%/Test::Parser::ltp.3.gz
 %%PERL5_MAN3%%/Test::Parser::newpynfs.3.gz
-man/man1/parse_iozone.1.gz
-man/man1/parse_test.1.gz
+%%PERL5_MAN1%%/parse_iozone.1.gz
+%%PERL5_MAN1%%/parse_test.1.gz
 bin/kernel2trpi
 bin/parse_build_kernel
 bin/parse_iozone
diff --git a/devel/p5-TheSchwartz/pkg-plist b/devel/p5-TheSchwartz/pkg-plist
index 88b2ab309031..8558d3172101 100644
--- a/devel/p5-TheSchwartz/pkg-plist
+++ b/devel/p5-TheSchwartz/pkg-plist
@@ -11,7 +11,7 @@ bin/thetop
 %%SITE_PERL%%/TheSchwartz/Job.pm
 %%SITE_PERL%%/TheSchwartz/JobHandle.pm
 %%SITE_PERL%%/TheSchwartz/Worker.pm
-man/man1/schwartzmon.1.gz
+%%PERL5_MAN1%%/schwartzmon.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/http-mappings.txt
 %%PORTDOCS%%%%DOCSDIR%%/notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/schema-postgres.sql
diff --git a/devel/p5-VCP-autrijus/pkg-plist b/devel/p5-VCP-autrijus/pkg-plist
index 4799ae630834..51004284304f 100644
--- a/devel/p5-VCP-autrijus/pkg-plist
+++ b/devel/p5-VCP-autrijus/pkg-plist
@@ -143,4 +143,4 @@ bin/vcp
 %%SITE_PERL%%/VCP/Utils/p4.pm
 %%SITE_PERL%%/VCP/Utils/revml.pm
 %%SITE_PERL%%/VCP/Utils/vss.pm
-man/man1/vcp.1.gz
+%%PERL5_MAN1%%/vcp.1.gz
diff --git a/devel/p5-XML-Pastor/pkg-plist b/devel/p5-XML-Pastor/pkg-plist
index 60ae95079723..a7c659e7a6a5 100644
--- a/devel/p5-XML-Pastor/pkg-plist
+++ b/devel/p5-XML-Pastor/pkg-plist
@@ -1,5 +1,5 @@
 bin/pastorize
-man/man1/pastorize.1.gz
+%%PERL5_MAN1%%/pastorize.1.gz
 %%PERL5_MAN3%%/XML::Pastor.3.gz
 %%PERL5_MAN3%%/XML::Pastor::Builtin.3.gz
 %%PERL5_MAN3%%/XML::Pastor::Builtin::List.3.gz
diff --git a/devel/p5-carton/pkg-plist b/devel/p5-carton/pkg-plist
index 36fccb4ee5a9..20313898a8c3 100644
--- a/devel/p5-carton/pkg-plist
+++ b/devel/p5-carton/pkg-plist
@@ -1,4 +1,4 @@
-man/man1/carton.1.gz
+%%PERL5_MAN1%%/carton.1.gz
 %%PERL5_MAN3%%/Carton.3.gz
 %%PERL5_MAN3%%/Carton::Doc::Bundle.3.gz
 %%PERL5_MAN3%%/Carton::Doc::Check.3.gz
diff --git a/devel/p5-cpan-listchanges/pkg-plist b/devel/p5-cpan-listchanges/pkg-plist
index 1837081839fe..339621e4f86f 100644
--- a/devel/p5-cpan-listchanges/pkg-plist
+++ b/devel/p5-cpan-listchanges/pkg-plist
@@ -1,4 +1,4 @@
 bin/cpan-listchanges
 %%PERL5_MAN3%%/App::cpanlistchanges.3.gz
-man/man1/cpan-listchanges.1.gz
+%%PERL5_MAN1%%/cpan-listchanges.1.gz
 %%SITE_PERL%%/App/cpanlistchanges.pm
diff --git a/devel/p5-github_creator/pkg-plist b/devel/p5-github_creator/pkg-plist
index 48cc1e3b2797..1939bd9cd5ab 100644
--- a/devel/p5-github_creator/pkg-plist
+++ b/devel/p5-github_creator/pkg-plist
@@ -1,2 +1,2 @@
 bin/github_creator
-man/man1/github_creator.1.gz
+%%PERL5_MAN1%%/github_creator.1.gz
diff --git a/devel/p5-rpm-build-perl/pkg-plist b/devel/p5-rpm-build-perl/pkg-plist
index 92e8126f873e..e27537502668 100644
--- a/devel/p5-rpm-build-perl/pkg-plist
+++ b/devel/p5-rpm-build-perl/pkg-plist
@@ -14,5 +14,5 @@ bin/perl.req.files
 %%SITE_ARCH%%/PerlReq/Utils.pm
 %%SITE_ARCH%%/auto/B/ConstOptree/ConstOptree.so
 %%SITE_ARCH%%/fake.pm
-man/man1/perl.prov.1.gz
-man/man1/perl.req.1.gz
+%%PERL5_MAN1%%/perl.prov.1.gz
+%%PERL5_MAN1%%/perl.req.1.gz
diff --git a/devel/p5-subatom/Makefile b/devel/p5-subatom/Makefile
index cec33ef4d04b..58a96baf6858 100644
--- a/devel/p5-subatom/Makefile
+++ b/devel/p5-subatom/Makefile
@@ -20,6 +20,6 @@ USE_PERL5=	modbuild
 USES=		perl5
 
 PLIST_FILES=	bin/subatom \
-		man/man1/subatom.1.gz
+		${SITE_MAN1}/subatom.1.gz
 
 .include <bsd.port.mk>
diff --git a/devel/svk/pkg-plist b/devel/svk/pkg-plist
index d9c941bc0a18..9a2a913b4682 100644
--- a/devel/svk/pkg-plist
+++ b/devel/svk/pkg-plist
@@ -239,4 +239,4 @@ bin/svk
 %%PERL5_MAN3%%/SVK::Util.3.gz
 %%PERL5_MAN3%%/SVK::Version.3.gz
 %%PERL5_MAN3%%/SVK::XD.3.gz
-man/man1/svk.1.gz
+%%PERL5_MAN1%%/svk.1.gz