14 files changed, 23 insertions, 23 deletions
diff --git a/converters/p5-Convert-BinHex/pkg-plist b/converters/p5-Convert-BinHex/pkg-plist
index 9840743b9c7a..f5d13f61bde0 100644
--- a/converters/p5-Convert-BinHex/pkg-plist
+++ b/converters/p5-Convert-BinHex/pkg-plist
@@ -2,5 +2,5 @@ bin/binhex.pl
 bin/debinhex.pl
 %%SITE_PERL%%/Convert/BinHex.pm
 %%PERL5_MAN3%%/Convert::BinHex.3.gz
-man/man1/binhex.pl.1.gz
-man/man1/debinhex.pl.1.gz
+%%PERL5_MAN1%%/binhex.pl.1.gz
+%%PERL5_MAN1%%/debinhex.pl.1.gz
diff --git a/converters/p5-Convert-Binary-C/pkg-plist b/converters/p5-Convert-Binary-C/pkg-plist
index 7a5a485ca07a..7c38ad9389b6 100644
--- a/converters/p5-Convert-Binary-C/pkg-plist
+++ b/converters/p5-Convert-Binary-C/pkg-plist
@@ -4,4 +4,4 @@ bin/ccconfig
 %%SITE_ARCH%%/auto/Convert/Binary/C/C.so
 %%PERL5_MAN3%%/Convert::Binary::C.3.gz
 %%PERL5_MAN3%%/Convert::Binary::C::Cached.3.gz
-man/man1/ccconfig.1.gz
+%%PERL5_MAN1%%/ccconfig.1.gz
diff --git a/converters/p5-Convert-UU/pkg-plist b/converters/p5-Convert-UU/pkg-plist
index d08e03d069ac..3fd84b35d1c9 100644
--- a/converters/p5-Convert-UU/pkg-plist
+++ b/converters/p5-Convert-UU/pkg-plist
@@ -1,6 +1,6 @@
 bin/puudecode
 bin/puuencode
-man/man1/puudecode.1.gz
-man/man1/puuencode.1.gz
+%%PERL5_MAN1%%/puudecode.1.gz
+%%PERL5_MAN1%%/puuencode.1.gz
 %%PERL5_MAN3%%/Convert::UU.3.gz
 %%SITE_PERL%%/Convert/UU.pm
diff --git a/converters/p5-Cpanel-JSON-XS/pkg-plist b/converters/p5-Cpanel-JSON-XS/pkg-plist
index 1b30bb2eeb6d..4f59d50e402d 100644
--- a/converters/p5-Cpanel-JSON-XS/pkg-plist
+++ b/converters/p5-Cpanel-JSON-XS/pkg-plist
@@ -4,4 +4,4 @@ bin/cpanel_json_xs
 %%SITE_ARCH%%/auto/Cpanel/JSON/XS/XS.so
 %%PERL5_MAN3%%/Cpanel::JSON::XS.3.gz
 %%PERL5_MAN3%%/Cpanel::JSON::XS::Boolean.3.gz
-man/man1/cpanel_json_xs.1.gz
+%%PERL5_MAN1%%/cpanel_json_xs.1.gz
diff --git a/converters/p5-Cstools/pkg-plist b/converters/p5-Cstools/pkg-plist
index 943a5542391e..2efea6395c24 100644
--- a/converters/p5-Cstools/pkg-plist
+++ b/converters/p5-Cstools/pkg-plist
@@ -25,6 +25,6 @@ bin/dbfcstocs
 %%PERL5_MAN3%%/Cz::Cstocs.3.gz
 %%PERL5_MAN3%%/Cz::Sort.3.gz
 %%PERL5_MAN3%%/Cz::Time.3.gz
-man/man1/cssort.1.gz
-man/man1/cstocs.1.gz
-man/man1/dbfcstocs.1.gz
+%%PERL5_MAN1%%/cssort.1.gz
+%%PERL5_MAN1%%/cstocs.1.gz
+%%PERL5_MAN1%%/dbfcstocs.1.gz
diff --git a/converters/p5-Encode/pkg-plist b/converters/p5-Encode/pkg-plist
index cbe2d93e962b..1b0fae80b480 100644
--- a/converters/p5-Encode/pkg-plist
+++ b/converters/p5-Encode/pkg-plist
@@ -60,4 +60,4 @@
 %%PERL5_MAN3%%/Encode::Supported.3.gz
 %%PERL5_MAN3%%/Encode::Unicode::UTF7.3.gz
 %%PERL5_MAN3%%/encoding.3.gz
-%%OLD_PERL%%man/man1/encguess.1.gz
+%%OLD_PERL%%%%PERL5_MAN1%%/encguess.1.gz
diff --git a/converters/p5-Encoding-FixLatin/pkg-plist b/converters/p5-Encoding-FixLatin/pkg-plist
index 3c7577da2618..718164238098 100644
--- a/converters/p5-Encoding-FixLatin/pkg-plist
+++ b/converters/p5-Encoding-FixLatin/pkg-plist
@@ -1,4 +1,4 @@
 bin/fix_latin
-man/man1/fix_latin.1.gz
+%%PERL5_MAN1%%/fix_latin.1.gz
 %%SITE_PERL%%/Encoding/FixLatin.pm
 %%PERL5_MAN3%%/Encoding::FixLatin.3.gz
diff --git a/converters/p5-JSON-PP/pkg-plist b/converters/p5-JSON-PP/pkg-plist
index 763b49f4a817..dcdf5dac647d 100644
--- a/converters/p5-JSON-PP/pkg-plist
+++ b/converters/p5-JSON-PP/pkg-plist
@@ -3,4 +3,4 @@ bin/p5json_pp
 %%SITE_PERL%%/JSON/PP/Boolean.pm
 %%PERL5_MAN3%%/JSON::PP.3.gz
 %%PERL5_MAN3%%/JSON::PP::Boolean.3.gz
-man/man1/p5json_pp.1.gz
+%%PERL5_MAN1%%/p5json_pp.1.gz
diff --git a/converters/p5-JSON-XS/pkg-plist b/converters/p5-JSON-XS/pkg-plist
index 0c6474a5dad6..1f0cabd7e2c5 100644
--- a/converters/p5-JSON-XS/pkg-plist
+++ b/converters/p5-JSON-XS/pkg-plist
@@ -4,4 +4,4 @@ bin/json_xs
 %%SITE_ARCH%%/auto/JSON/XS/XS.so
 %%PERL5_MAN3%%/JSON::XS.3.gz
 %%PERL5_MAN3%%/JSON::XS::Boolean.3.gz
-man/man1/json_xs.1.gz
+%%PERL5_MAN1%%/json_xs.1.gz
diff --git a/converters/p5-LaTeXML/pkg-plist b/converters/p5-LaTeXML/pkg-plist
index a76a381ad42c..10e76e5a5337 100644
--- a/converters/p5-LaTeXML/pkg-plist
+++ b/converters/p5-LaTeXML/pkg-plist
@@ -547,11 +547,11 @@ bin/latexmlpost
 %%PERL5_MAN3%%/LaTeXML::Util::Pack.3.gz
 %%PERL5_MAN3%%/LaTeXML::Util::Pathname.3.gz
 %%PERL5_MAN3%%/LaTeXML::Util::WWW.3.gz
-man/man1/latexml.1.gz
-man/man1/latexmlc.1.gz
-man/man1/latexmlfind.1.gz
-man/man1/latexmlmath.1.gz
-man/man1/latexmlpost.1.gz
+%%PERL5_MAN1%%/latexml.1.gz
+%%PERL5_MAN1%%/latexmlc.1.gz
+%%PERL5_MAN1%%/latexmlfind.1.gz
+%%PERL5_MAN1%%/latexmlmath.1.gz
+%%PERL5_MAN1%%/latexmlpost.1.gz
 %%TEXMFLOCALDIR%%/tex/latex/latexml/.packlist
 %%TEXMFLOCALDIR%%/tex/latex/latexml/latexml.sty
 %%TEXMFLOCALDIR%%/tex/latex/latexml/lxRDFa.sty
diff --git a/converters/p5-Text-Bidi/pkg-plist b/converters/p5-Text-Bidi/pkg-plist
index e56634c30b0a..98763e99fdd0 100644
--- a/converters/p5-Text-Bidi/pkg-plist
+++ b/converters/p5-Text-Bidi/pkg-plist
@@ -14,4 +14,4 @@ bin/fribidi.pl
 %%PERL5_MAN3%%/Text::Bidi::Constants.3.gz
 %%PERL5_MAN3%%/Text::Bidi::Paragraph.3.gz
 %%PERL5_MAN3%%/Text::Bidi::private.3.gz
-man/man1/fribidi.pl.1.gz
+%%PERL5_MAN1%%/fribidi.pl.1.gz
diff --git a/converters/p5-Unicode-Map/pkg-plist b/converters/p5-Unicode-Map/pkg-plist
index f74f151cc603..96a8e91d12fc 100644
--- a/converters/p5-Unicode-Map/pkg-plist
+++ b/converters/p5-Unicode-Map/pkg-plist
@@ -98,5 +98,5 @@ bin/mkmapfile
 %%SITE_ARCH%%/Unicode/Map/REGISTRY
 %%SITE_ARCH%%/auto/Unicode/Map/Map.so
 %%PERL5_MAN3%%/Unicode::Map.3.gz
-man/man1/map.1.gz
-man/man1/mkmapfile.1.gz
+%%PERL5_MAN1%%/map.1.gz
+%%PERL5_MAN1%%/mkmapfile.1.gz
diff --git a/converters/p5-Unicode-Map8/pkg-plist b/converters/p5-Unicode-Map8/pkg-plist
index d8548074e6b8..76d377ec6c92 100644
--- a/converters/p5-Unicode-Map8/pkg-plist
+++ b/converters/p5-Unicode-Map8/pkg-plist
@@ -183,4 +183,4 @@ bin/umap
 %%SITE_ARCH%%/Unicode/Map8/maps/videotex-suppl.bin
 %%SITE_ARCH%%/auto/Unicode/Map8/Map8.so
 %%PERL5_MAN3%%/Unicode::Map8.3.gz
-man/man1/umap.1.gz
+%%PERL5_MAN1%%/umap.1.gz
diff --git a/converters/p5-WAP-wbxml/pkg-plist b/converters/p5-WAP-wbxml/pkg-plist
index cd8daaf39831..a5d08b0a07a4 100644
--- a/converters/p5-WAP-wbxml/pkg-plist
+++ b/converters/p5-WAP-wbxml/pkg-plist
@@ -1,5 +1,5 @@
 bin/wbxmlc
-man/man1/wbxmlc.1.gz
+%%PERL5_MAN1%%/wbxmlc.1.gz
 %%SITE_PERL%%/WAP/wbxml.pm
 %%SITE_PERL%%/WAP/wbxml/WbRules.pm
 %%SITE_PERL%%/WAP/wbxml/activesync.wbrules.pl