aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2015-09-14 12:19:48 +0000
committerMathieu Arnold <mat@FreeBSD.org>2015-09-14 12:19:48 +0000
commitafae652a2a20e0b0caa335e766dff03094773e1f (patch)
treeb5c267ca5490c7e06b5fe235a5d442d93eac880d
parent5a735b9d085e581f8b876095c25db79a9bc533dd (diff)
downloadports-afae652a2a20e0b0caa335e766dff03094773e1f.tar.gz
ports-afae652a2a20e0b0caa335e766dff03094773e1f.zip
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
Notes
Notes: svn path=/head/; revision=396892
-rw-r--r--CHANGES6
-rw-r--r--Mk/Uses/perl5.mk27
-rw-r--r--Mk/bsd.default-versions.mk10
-rw-r--r--UPDATING26
-rw-r--r--astro/p5-Astro-ADS/pkg-plist2
-rw-r--r--astro/p5-Astro-PAL/pkg-plist2
-rw-r--r--astro/p5-Astro-SIMBAD-Client/pkg-plist2
-rw-r--r--astro/p5-Astro-SpaceTrack/pkg-plist2
-rw-r--r--astro/p5-Astro-satpass/pkg-plist2
-rw-r--r--audio/mp3-archive-tools/pkg-plist18
-rw-r--r--audio/mp3lint/pkg-plist6
-rw-r--r--audio/p5-Audio-MPD/pkg-plist4
-rw-r--r--audio/p5-Audio-Scrobbler/pkg-plist2
-rw-r--r--audio/p5-MP3-Find/pkg-plist4
-rw-r--r--audio/p5-MP3-Tag/pkg-plist6
-rw-r--r--audio/p5-Music-Audioscrobbler-MPD/pkg-plist2
-rw-r--r--biology/p5-AcePerl/pkg-plist2
-rw-r--r--biology/p5-Bio-GFF3/pkg-plist2
-rw-r--r--biology/p5-Bio-Graphics/pkg-plist8
-rw-r--r--biology/p5-Bio-NEXUS/pkg-plist6
-rw-r--r--biology/p5-bioperl/pkg-plist126
-rw-r--r--cad/p5-Verilog-Perl/pkg-plist8
-rw-r--r--chinese/p5-Encode-CNMap/pkg-plist6
-rw-r--r--chinese/p5-Encode-HanConvert/pkg-plist4
-rw-r--r--comms/gscmxx/pkg-plist2
-rw-r--r--comms/o2sms/pkg-plist10
-rw-r--r--comms/p5-Device-SerialPort/pkg-plist2
-rw-r--r--comms/p5-SMS-SMS77/pkg-plist2
-rw-r--r--converters/p5-Convert-BinHex/pkg-plist4
-rw-r--r--converters/p5-Convert-Binary-C/pkg-plist2
-rw-r--r--converters/p5-Convert-UU/pkg-plist4
-rw-r--r--converters/p5-Cpanel-JSON-XS/pkg-plist2
-rw-r--r--converters/p5-Cstools/pkg-plist6
-rw-r--r--converters/p5-Encode/pkg-plist2
-rw-r--r--converters/p5-Encoding-FixLatin/pkg-plist2
-rw-r--r--converters/p5-JSON-PP/pkg-plist2
-rw-r--r--converters/p5-JSON-XS/pkg-plist2
-rw-r--r--converters/p5-LaTeXML/pkg-plist10
-rw-r--r--converters/p5-Text-Bidi/pkg-plist2
-rw-r--r--converters/p5-Unicode-Map/pkg-plist4
-rw-r--r--converters/p5-Unicode-Map8/pkg-plist2
-rw-r--r--converters/p5-WAP-wbxml/pkg-plist2
-rw-r--r--databases/innotop/pkg-plist2
-rw-r--r--databases/mtop/pkg-plist4
-rw-r--r--databases/mytop/Makefile2
-rw-r--r--databases/p5-AnyEvent-CouchDB/pkg-plist2
-rw-r--r--databases/p5-Bucardo/pkg-plist2
-rw-r--r--databases/p5-DBD-Oracle/pkg-plist2
-rw-r--r--databases/p5-DBD-XBase/pkg-plist4
-rw-r--r--databases/p5-DBI-Shell/pkg-plist2
-rw-r--r--databases/p5-DBI/pkg-plist6
-rw-r--r--databases/p5-DBICx-Deploy/pkg-plist2
-rw-r--r--databases/p5-DBIx-Class-Migration/pkg-plist2
-rw-r--r--databases/p5-DBIx-Class-Schema-Loader/pkg-plist2
-rw-r--r--databases/p5-DBIx-Class/pkg-plist2
-rw-r--r--databases/p5-DBIx-VersionedDDL/pkg-plist2
-rw-r--r--databases/p5-Genezzo/pkg-plist4
-rw-r--r--databases/p5-HTML-FormHandler-Model-DBIC/pkg-plist2
-rw-r--r--databases/p5-MySQL-Diff/pkg-plist2
-rw-r--r--databases/p5-Prophet/pkg-plist2
-rw-r--r--databases/p5-SQL-ReservedWords/pkg-plist2
-rw-r--r--databases/p5-SQL-Translator/pkg-plist12
-rw-r--r--databases/p5-SQLite-Work/pkg-plist6
-rw-r--r--databases/p5-Test-Fixture-DBI/pkg-plist4
-rw-r--r--databases/p5-mysql-genocide/pkg-plist2
-rw-r--r--databases/percona-toolkit/pkg-plist66
-rw-r--r--databases/pgbadger/pkg-plist2
-rw-r--r--databases/pgtop/pkg-plist2
-rw-r--r--deskutils/p5-Goo/pkg-plist4
-rw-r--r--devel/activitymail/Makefile2
-rw-r--r--devel/autodia/pkg-plist2
-rw-r--r--devel/cpan-upload-http/pkg-plist2
-rw-r--r--devel/cpan-upload/pkg-plist2
-rw-r--r--devel/egypt/Makefile2
-rw-r--r--devel/p5-AI-Prolog/pkg-plist2
-rw-r--r--devel/p5-Acme-MetaSyntactic/pkg-plist4
-rw-r--r--devel/p5-Algorithm-Bucketizer/pkg-plist2
-rw-r--r--devel/p5-Algorithm-Evolutionary/pkg-plist8
-rw-r--r--devel/p5-App-FatPacker/pkg-plist2
-rw-r--r--devel/p5-App-GitGot/pkg-plist4
-rw-r--r--devel/p5-App-GitHub/pkg-plist2
-rw-r--r--devel/p5-App-SD/pkg-plist2
-rw-r--r--devel/p5-App-SVN-Bisect/pkg-plist2
-rw-r--r--devel/p5-App-cpanminus/pkg-plist2
-rw-r--r--devel/p5-App-cpanoutdated/pkg-plist2
-rw-r--r--devel/p5-App-local-lib-helper/pkg-plist2
-rw-r--r--devel/p5-App-perlbrew/pkg-plist2
-rw-r--r--devel/p5-App-scan_prereqs_cpanfile/pkg-plist2
-rw-r--r--devel/p5-B-C/pkg-plist6
-rw-r--r--devel/p5-CPAN-Changes/pkg-plist2
-rw-r--r--devel/p5-CPAN-Inject/pkg-plist2
-rw-r--r--devel/p5-CPAN-Mini/pkg-plist2
-rw-r--r--devel/p5-CPAN-SQLite/pkg-plist2
-rw-r--r--devel/p5-CPAN-Site/pkg-plist2
-rw-r--r--devel/p5-CPAN-Uploader/pkg-plist2
-rw-r--r--devel/p5-Carp-Datum/pkg-plist2
-rw-r--r--devel/p5-Data-ClearSilver-HDF/pkg-plist2
-rw-r--r--devel/p5-Data-HexDump-Range/pkg-plist2
-rw-r--r--devel/p5-Data-ShowTable/pkg-plist2
-rw-r--r--devel/p5-Data-Stag/pkg-plist40
-rw-r--r--devel/p5-Date-Manip/pkg-plist4
-rw-r--r--devel/p5-Date-Piece/pkg-plist2
-rw-r--r--devel/p5-Date-Roman/pkg-plist2
-rw-r--r--devel/p5-DateTime-Format-Natural/pkg-plist2
-rw-r--r--devel/p5-Devel-CheckLib/pkg-plist2
-rw-r--r--devel/p5-Devel-CheckOS/pkg-plist2
-rw-r--r--devel/p5-Devel-Cover/pkg-plist6
-rw-r--r--devel/p5-Devel-NYTProf/pkg-plist12
-rw-r--r--devel/p5-Devel-PatchPerl/pkg-plist2
-rw-r--r--devel/p5-Devel-ebug/pkg-plist6
-rw-r--r--devel/p5-Dir-Project/pkg-plist4
-rw-r--r--devel/p5-Dist-Joseki/pkg-plist2
-rw-r--r--devel/p5-Dist-Zilla/pkg-plist2
-rw-r--r--devel/p5-Env-Path/pkg-plist2
-rw-r--r--devel/p5-Eval-WithLexicals/pkg-plist2
-rw-r--r--devel/p5-ExtUtils-XSpp/pkg-plist2
-rw-r--r--devel/p5-File-Copy-Link/pkg-plist2
-rw-r--r--devel/p5-File-Dir-Dumper/pkg-plist2
-rw-r--r--devel/p5-File-DirSync/pkg-plist2
-rw-r--r--devel/p5-File-Find-Rule/pkg-plist2
-rw-r--r--devel/p5-File-MimeInfo/pkg-plist4
-rw-r--r--devel/p5-File-Tail-Scribe/pkg-plist2
-rw-r--r--devel/p5-Gearman-Server/pkg-plist2
-rw-r--r--devel/p5-Goo-Canvas/pkg-plist4
-rw-r--r--devel/p5-IPC-DirQueue/pkg-plist10
-rw-r--r--devel/p5-IPC-Locker/pkg-plist12
-rw-r--r--devel/p5-Lingua-Translit/pkg-plist2
-rw-r--r--devel/p5-Locale-Maketext-Gettext/pkg-plist2
-rw-r--r--devel/p5-Locale-Maketext-Lexicon/pkg-plist2
-rw-r--r--devel/p5-Locale-PGetText/pkg-plist4
-rw-r--r--devel/p5-Log-Accounting-SVK/pkg-plist4
-rw-r--r--devel/p5-Log-Dispatch-Scribe/pkg-plist2
-rw-r--r--devel/p5-Log-Log4perl/pkg-plist2
-rw-r--r--devel/p5-Make/pkg-plist2
-rw-r--r--devel/p5-Metabase-Fact/pkg-plist2
-rw-r--r--devel/p5-Module-Build-Convert/pkg-plist2
-rw-r--r--devel/p5-Module-CPANfile/pkg-plist4
-rw-r--r--devel/p5-Module-CheckDeps/pkg-plist2
-rw-r--r--devel/p5-Module-Dependency/pkg-plist6
-rw-r--r--devel/p5-Module-Info/pkg-plist4
-rw-r--r--devel/p5-Module-Path/pkg-plist2
-rw-r--r--devel/p5-Module-Release/pkg-plist2
-rw-r--r--devel/p5-Module-ScanDeps/pkg-plist2
-rw-r--r--devel/p5-Module-Setup/pkg-plist2
-rw-r--r--devel/p5-Module-Starter/pkg-plist2
-rw-r--r--devel/p5-Module-Used/pkg-plist2
-rw-r--r--devel/p5-Module-Util/pkg-plist2
-rw-r--r--devel/p5-Module-Version/pkg-plist2
-rw-r--r--devel/p5-Moos/pkg-plist2
-rw-r--r--devel/p5-MooseX-Runnable/pkg-plist2
-rw-r--r--devel/p5-OrePAN2/pkg-plist10
-rw-r--r--devel/p5-PAR-Packer/pkg-plist8
-rw-r--r--devel/p5-POE-Devel-Profiler/pkg-plist2
-rw-r--r--devel/p5-POE-Test-Loops/pkg-plist2
-rw-r--r--devel/p5-PPerl/pkg-plist2
-rw-r--r--devel/p5-Package-Stash/pkg-plist2
-rw-r--r--devel/p5-Parse-ErrorString-Perl/pkg-plist2
-rw-r--r--devel/p5-Parse-Pidl/pkg-plist2
-rw-r--r--devel/p5-Parse-Yapp/pkg-plist2
-rw-r--r--devel/p5-Perl-Metrics-Lite/pkg-plist4
-rw-r--r--devel/p5-Perl-Metrics-Simple/pkg-plist2
-rw-r--r--devel/p5-Perl-PrereqScanner/pkg-plist4
-rw-r--r--devel/p5-Perl-Tidy/pkg-plist2
-rw-r--r--devel/p5-Perl-Version/pkg-plist2
-rw-r--r--devel/p5-PkgConfig/pkg-plist4
-rw-r--r--devel/p5-Pod-Tests/pkg-plist2
-rw-r--r--devel/p5-Proc-Background/pkg-plist2
-rw-r--r--devel/p5-ReadLine-Gnu/pkg-plist2
-rw-r--r--devel/p5-Reply/pkg-plist2
-rw-r--r--devel/p5-SVN-Hook/pkg-plist2
-rw-r--r--devel/p5-SVN-Mirror/pkg-plist2
-rw-r--r--devel/p5-SVN-Notify/pkg-plist2
-rw-r--r--devel/p5-SVN-S4/pkg-plist2
-rw-r--r--devel/p5-SVN-Web/pkg-plist2
-rw-r--r--devel/p5-Sepia/pkg-plist2
-rw-r--r--devel/p5-Set-CrossProduct/pkg-plist2
-rw-r--r--devel/p5-ShipIt/pkg-plist2
-rw-r--r--devel/p5-String-Dump/pkg-plist2
-rw-r--r--devel/p5-TAP-Formatter-JUnit/pkg-plist2
-rw-r--r--devel/p5-Tee/pkg-plist2
-rw-r--r--devel/p5-Test-Harness/pkg-plist2
-rw-r--r--devel/p5-Test-Inline/pkg-plist2
-rw-r--r--devel/p5-Test-Parser/pkg-plist4
-rw-r--r--devel/p5-TheSchwartz/pkg-plist2
-rw-r--r--devel/p5-VCP-autrijus/pkg-plist2
-rw-r--r--devel/p5-XML-Pastor/pkg-plist2
-rw-r--r--devel/p5-carton/pkg-plist2
-rw-r--r--devel/p5-cpan-listchanges/pkg-plist2
-rw-r--r--devel/p5-github_creator/pkg-plist2
-rw-r--r--devel/p5-rpm-build-perl/pkg-plist4
-rw-r--r--devel/p5-subatom/Makefile2
-rw-r--r--devel/svk/pkg-plist2
-rw-r--r--dns/axfr2acl/Makefile2
-rw-r--r--dns/dnscheckengine/pkg-plist12
-rw-r--r--dns/dnsdbck/Makefile2
-rw-r--r--dns/fpdns/pkg-plist2
-rw-r--r--dns/p5-Net-Amazon-Route53/pkg-plist2
-rw-r--r--dns/p5-Net-RBLClient/pkg-plist2
-rw-r--r--dns/p5-pgeodns/pkg-plist2
-rw-r--r--dns/renewck/Makefile2
-rw-r--r--dns/rpsl2acl/Makefile2
-rw-r--r--dns/vhostcname/Makefile2
-rw-r--r--dns/whoseip/pkg-plist2
-rw-r--r--editors/p5-Vimana/pkg-plist4
-rw-r--r--finance/p5-Finance-TW-TSEQuote/pkg-plist2
-rw-r--r--finance/p5-Finance-YahooQuote/pkg-plist2
-rw-r--r--ftp/paraget/pkg-plist2
-rw-r--r--games/frozen-bubble/pkg-plist4
-rw-r--r--games/lm-solve/pkg-plist2
-rw-r--r--games/p5-Games-AlphaBeta/pkg-plist2
-rw-r--r--games/p5-Games-Bingo-Print/pkg-plist2
-rw-r--r--games/p5-Games-Bingo/pkg-plist2
-rw-r--r--games/p5-Games-Dice/pkg-plist2
-rw-r--r--graphics/IPA/pkg-plist2
-rw-r--r--graphics/eps2png/pkg-plist2
-rw-r--r--graphics/p5-GD/pkg-plist4
-rw-r--r--graphics/p5-Gimp/pkg-plist8
-rw-r--r--graphics/p5-Graph-Easy/pkg-plist2
-rw-r--r--graphics/p5-Image-ExifTool-devel/pkg-plist2
-rw-r--r--graphics/p5-Image-ExifTool/pkg-plist2
-rw-r--r--graphics/p5-Image-Size/pkg-plist2
-rw-r--r--graphics/p5-SVG-Metadata/pkg-plist4
-rw-r--r--graphics/p5-SWF-Builder/pkg-plist2
-rw-r--r--graphics/p5-Tk-JPEG-Lite/pkg-plist2
-rw-r--r--graphics/p5-feedgnuplot/Makefile2
-rw-r--r--graphics/renrot/pkg-plist2
-rw-r--r--irc/nethirc/pkg-plist2
-rw-r--r--irc/p5-POE-Component-IRC-Plugin-Hailo/pkg-plist2
-rw-r--r--irc/p5-POE-Component-Server-IRC/pkg-plist2
-rw-r--r--japanese/p5-Unicode-Japanese/pkg-plist4
-rw-r--r--japanese/p5-WWW-MobileCarrierJP/pkg-plist2
-rw-r--r--lang/p5-JavaScript-Squish/pkg-plist2
-rw-r--r--lang/p5-Pugs-Compiler-Rule/pkg-plist2
-rw-r--r--lang/perl5-devel/Makefile89
-rw-r--r--lang/perl5-devel/files/perl-man.conf.in2
-rw-r--r--lang/perl5-devel/files/perl5_version.in2
-rw-r--r--lang/perl5-devel/pkg-plist508
-rw-r--r--lang/perl5-devel/version.mk1
-rw-r--r--lang/perl5.16/Makefile81
-rw-r--r--lang/perl5.16/files/perl-man.conf.in2
-rw-r--r--lang/perl5.16/files/perl5_version.in2
-rw-r--r--lang/perl5.16/pkg-plist512
-rw-r--r--lang/perl5.16/version.mk1
-rw-r--r--lang/perl5.18/Makefile84
-rw-r--r--lang/perl5.18/files/perl-man.conf.in2
-rw-r--r--lang/perl5.18/files/perl5_version.in2
-rw-r--r--lang/perl5.18/pkg-plist518
-rw-r--r--lang/perl5.18/version.mk1
-rw-r--r--lang/perl5.20/Makefile83
-rw-r--r--lang/perl5.20/files/perl-man.conf.in2
-rw-r--r--lang/perl5.20/files/perl5_version.in2
-rw-r--r--lang/perl5.20/pkg-plist514
-rw-r--r--lang/perl5.20/version.mk1
-rw-r--r--lang/perl5.22/Makefile84
-rw-r--r--lang/perl5.22/files/perl-man.conf.in2
-rw-r--r--lang/perl5.22/files/perl5_version.in2
-rw-r--r--lang/perl5.22/pkg-plist522
-rw-r--r--lang/perl5.22/version.mk1
-rw-r--r--mail/cyrus-imapd23/Makefile9
-rw-r--r--mail/cyrus-imapd24/Makefile9
-rw-r--r--mail/cyrus-imapd25/Makefile9
-rw-r--r--mail/grepmail/pkg-plist2
-rw-r--r--mail/mbx2mbox/pkg-plist2
-rw-r--r--mail/mime-construct/pkg-plist2
-rw-r--r--mail/p5-Log-Procmail/pkg-plist2
-rw-r--r--mail/p5-Mail-CheckUser/pkg-plist2
-rw-r--r--mail/p5-Mail-SPF/pkg-plist2
-rw-r--r--mail/p5-Mail-SRS/pkg-plist4
-rw-r--r--mail/p5-qpsmtpd/pkg-plist2
-rw-r--r--mail/razor-agents/Makefile2
-rw-r--r--mail/razor-agents/pkg-plist14
-rw-r--r--mail/spamassassin/pkg-plist16
-rw-r--r--math/PDL/Makefile9
-rw-r--r--math/p5-Math-Cephes/pkg-plist2
-rw-r--r--math/p5-Math-Evol/pkg-plist2
-rw-r--r--math/p5-Math-GSL/pkg-plist2
-rw-r--r--math/p5-NetCDF/Makefile6
-rw-r--r--math/p5-NetCDF/pkg-plist2
-rw-r--r--misc/p5-Bot-Training/pkg-plist2
-rw-r--r--misc/p5-Text-FIGlet/pkg-plist8
-rw-r--r--misc/pfm/pkg-plist2
-rw-r--r--multimedia/acidrip/pkg-plist2
-rw-r--r--multimedia/clive/Makefile2
-rw-r--r--multimedia/dvdrip/pkg-plist6
-rw-r--r--multimedia/gcap/Makefile2
-rw-r--r--multimedia/grake/Makefile2
-rw-r--r--multimedia/gtk-youtube-viewer/pkg-plist2
-rw-r--r--multimedia/mp3cd/pkg-plist2
-rw-r--r--multimedia/p5-FLV-Info/pkg-plist10
-rw-r--r--multimedia/p5-Subtitles/pkg-plist4
-rw-r--r--multimedia/umph/Makefile2
-rw-r--r--net-im/sendxmpp/Makefile2
-rw-r--r--net-im/twitmail/pkg-plist2
-rw-r--r--net-mgmt/2ping/Makefile2
-rw-r--r--net-mgmt/icli/pkg-plist2
-rw-r--r--net-mgmt/nagios-check_postgres/pkg-plist2
-rw-r--r--net-mgmt/netdisco/pkg-plist20
-rw-r--r--net-mgmt/netspoc/pkg-plist4
-rw-r--r--net-mgmt/ocsinventory-agent/pkg-plist2
-rw-r--r--net-mgmt/p5-Cflow/pkg-plist2
-rw-r--r--net-mgmt/p5-FusionInventory-Agent/pkg-plist4
-rw-r--r--net-mgmt/p5-Nagios-Object/pkg-plist10
-rw-r--r--net-mgmt/p5-Net-IPv4Addr/pkg-plist2
-rw-r--r--net-mgmt/p5-Net-SNMP/pkg-plist2
-rw-r--r--net-mgmt/p5-Net-SNMPTrapd/pkg-plist4
-rw-r--r--net-mgmt/p5-jmx4perl/pkg-plist10
-rw-r--r--net-mgmt/pancho/pkg-plist2
-rw-r--r--net-p2p/p5-Net-BitTorrent/pkg-plist2
-rw-r--r--net-p2p/p5-Net-DirectConnect/pkg-plist4
-rw-r--r--net/ldapsh/pkg-plist2
-rw-r--r--net/p5-Geo-IP-PurePerl/pkg-plist2
-rw-r--r--net/p5-IP-Country/pkg-plist2
-rw-r--r--net/p5-Net-Amazon-S3/pkg-plist2
-rw-r--r--net/p5-Net-Appliance-Session/pkg-plist2
-rw-r--r--net/p5-Net-FS-Flickr/pkg-plist2
-rw-r--r--net/p5-Net-FS-Gmail/pkg-plist2
-rw-r--r--net/p5-Net-Google-PicasaWeb/pkg-plist6
-rw-r--r--net/p5-Net-NIS-Listgroup/pkg-plist2
-rw-r--r--net/p5-Net-OpenStack-Attack/pkg-plist2
-rw-r--r--net/p5-Net-Pcap/pkg-plist2
-rw-r--r--net/p5-Net-Proxy/pkg-plist4
-rw-r--r--net/p5-Net-RTP/pkg-plist10
-rw-r--r--net/p5-Net-SAP/pkg-plist2
-rw-r--r--net/p5-Net-SDP/pkg-plist2
-rw-r--r--net/p5-Net-SPDY/pkg-plist4
-rw-r--r--net/p5-Net-Server/pkg-plist2
-rw-r--r--net/p5-Net-VNC/pkg-plist2
-rw-r--r--net/p5-Net-Whois-Raw/pkg-plist2
-rw-r--r--net/p5-OAI-Harvester/pkg-plist4
-rw-r--r--net/p5-OurNet-BBS/pkg-plist6
-rw-r--r--net/p5-RPC-XML/pkg-plist2
-rw-r--r--net/p5-SOAP-Lite/pkg-plist4
-rw-r--r--net/p5-Server-Starter/pkg-plist2
-rw-r--r--net/p5-Socket-GetAddrInfo/pkg-plist4
-rw-r--r--net/p5-VM-EC2/pkg-plist2
-rw-r--r--net/rdapper/Makefile2
-rw-r--r--net/wakeonlan/pkg-plist2
-rw-r--r--palm/p5-Palm/pkg-plist2
-rw-r--r--ports-mgmt/p5-FreeBSD-Portindex/pkg-plist12
-rw-r--r--print/a2pdf/pkg-plist2
-rw-r--r--print/latex-biber/pkg-plist2
-rw-r--r--science/p5-Chemistry-Mok/pkg-plist2
-rw-r--r--science/p5-Geo-BUFR/pkg-plist10
-rw-r--r--science/p5-Physics-Unit/pkg-plist2
-rw-r--r--security/clusterssh/pkg-plist8
-rw-r--r--security/log2timeline/pkg-plist6
-rw-r--r--security/p5-App-Genpass/pkg-plist2
-rw-r--r--security/p5-App-TLSMe/pkg-plist2
-rw-r--r--security/p5-Authen-PAAS/pkg-plist2
-rw-r--r--security/p5-Crypt-Primes/pkg-plist2
-rw-r--r--security/p5-Crypt-T_e_a/pkg-plist2
-rw-r--r--security/p5-Crypt-Tea_JS/pkg-plist2
-rw-r--r--security/p5-Digest-Whirlpool/pkg-plist2
-rw-r--r--security/p5-File-KeePass-Agent/pkg-plist2
-rw-r--r--security/p5-Filter-Crypto/pkg-plist2
-rw-r--r--security/p5-GnuPG/pkg-plist2
-rw-r--r--security/p5-Module-Signature/pkg-plist2
-rw-r--r--security/p5-Net-Radius-Server/pkg-plist12
-rw-r--r--security/p5-String-MkPasswd/pkg-plist2
-rw-r--r--security/p5-openxpki/pkg-plist8
-rw-r--r--security/pbnj/pkg-plist6
-rw-r--r--security/swatch/pkg-plist2
-rw-r--r--shells/p5-Bash-Completion/pkg-plist4
-rw-r--r--shells/p5-Shell-Perl/pkg-plist2
-rw-r--r--shells/p5-Term-Bash-Completion-Generator/pkg-plist2
-rw-r--r--shells/psh/pkg-plist8
-rw-r--r--sysutils/p5-Brackup/pkg-plist10
-rw-r--r--sysutils/p5-Filesys-DiskUsage/pkg-plist2
-rw-r--r--sysutils/p5-MogileFS-Server/pkg-plist6
-rw-r--r--sysutils/p5-MogileFS-Utils/pkg-plist22
-rw-r--r--sysutils/p5-Monitor-Simple/pkg-plist2
-rw-r--r--sysutils/p5-Proclet/pkg-plist2
-rw-r--r--sysutils/p5-Rex/pkg-plist4
-rw-r--r--sysutils/p5-Schedule-Load/pkg-plist12
-rw-r--r--sysutils/p5-Sys-Gamin/pkg-plist2
-rw-r--r--sysutils/p5-Tail-Stat/pkg-plist2
-rw-r--r--sysutils/p5-Ubic/pkg-plist12
-rw-r--r--sysutils/p5-arclog/pkg-plist2
-rw-r--r--sysutils/p5-reslog/pkg-plist2
-rw-r--r--sysutils/savelogs/pkg-plist4
-rw-r--r--sysutils/watchmen/Makefile2
-rw-r--r--textproc/ack/pkg-plist2
-rw-r--r--textproc/dtdparse/pkg-plist10
-rw-r--r--textproc/makepatch/pkg-plist4
-rw-r--r--textproc/p5-Algorithm-CheckDigits/pkg-plist2
-rw-r--r--textproc/p5-CAM-PDF/pkg-plist54
-rw-r--r--textproc/p5-DocSet/pkg-plist2
-rw-r--r--textproc/p5-EBook-Tools/pkg-plist2
-rw-r--r--textproc/p5-Excel-Writer-XLSX/pkg-plist2
-rw-r--r--textproc/p5-HTML-Copy/pkg-plist2
-rw-r--r--textproc/p5-Hailo/pkg-plist2
-rw-r--r--textproc/p5-Kwalify/pkg-plist2
-rw-r--r--textproc/p5-LaTeX-Driver/pkg-plist6
-rw-r--r--textproc/p5-LaTeX-Encode/pkg-plist2
-rw-r--r--textproc/p5-LaTeX-Pod/pkg-plist2
-rw-r--r--textproc/p5-LaTeX-Table/pkg-plist4
-rw-r--r--textproc/p5-Lingua-Ident/pkg-plist2
-rw-r--r--textproc/p5-Lingua-Identify/pkg-plist4
-rw-r--r--textproc/p5-Lingua-Treebank/pkg-plist12
-rw-r--r--textproc/p5-MARC-Lint/pkg-plist2
-rw-r--r--textproc/p5-MARC-Record/pkg-plist2
-rw-r--r--textproc/p5-MARC-XML/pkg-plist4
-rw-r--r--textproc/p5-Makefile-Parser/pkg-plist6
-rw-r--r--textproc/p5-Marpa-HTML/pkg-plist4
-rw-r--r--textproc/p5-Net-Snort-Parser/pkg-plist2
-rw-r--r--textproc/p5-ODF-lpOD/pkg-plist2
-rw-r--r--textproc/p5-OpenOffice-OODoc/pkg-plist26
-rw-r--r--textproc/p5-PDF-FromHTML/pkg-plist2
-rw-r--r--textproc/p5-Perl-Critic/pkg-plist2
-rw-r--r--textproc/p5-Perl-MinimumVersion/pkg-plist2
-rw-r--r--textproc/p5-PerlPoint-Converters/pkg-plist4
-rw-r--r--textproc/p5-PerlPoint-Package/pkg-plist4
-rw-r--r--textproc/p5-Pod-Abstract/pkg-plist2
-rw-r--r--textproc/p5-Pod-Autopod/pkg-plist2
-rw-r--r--textproc/p5-Pod-DocBook/pkg-plist2
-rw-r--r--textproc/p5-Pod-HtmlEasy/pkg-plist2
-rw-r--r--textproc/p5-Pod-Markdown/pkg-plist2
-rw-r--r--textproc/p5-Pod-POM/pkg-plist6
-rw-r--r--textproc/p5-Pod-ProjectDocs/pkg-plist2
-rw-r--r--textproc/p5-Pod-Readme/pkg-plist2
-rw-r--r--textproc/p5-Pod-Spell/pkg-plist2
-rw-r--r--textproc/p5-Pod-Stripper/pkg-plist2
-rw-r--r--textproc/p5-Pod-Tree/pkg-plist8
-rw-r--r--textproc/p5-Pod-WikiDoc/pkg-plist2
-rw-r--r--textproc/p5-Pod-XML/pkg-plist2
-rw-r--r--textproc/p5-Pod-Xhtml/pkg-plist2
-rw-r--r--textproc/p5-Regexp-Debugger/pkg-plist2
-rw-r--r--textproc/p5-SGML-DTDParse/pkg-plist10
-rw-r--r--textproc/p5-Spork/pkg-plist2
-rw-r--r--textproc/p5-Spreadsheet-WriteExcel/pkg-plist2
-rw-r--r--textproc/p5-String-ShellQuote/pkg-plist2
-rw-r--r--textproc/p5-Text-BibTeX/pkg-plist22
-rw-r--r--textproc/p5-Text-Colorizer/pkg-plist2
-rw-r--r--textproc/p5-Text-EtText/pkg-plist4
-rw-r--r--textproc/p5-Text-LTSV/pkg-plist2
-rw-r--r--textproc/p5-Text-Language-Guess/pkg-plist2
-rw-r--r--textproc/p5-Text-Lorem/pkg-plist2
-rw-r--r--textproc/p5-Text-Markdown/pkg-plist2
-rw-r--r--textproc/p5-Text-MultiMarkdown/pkg-plist2
-rw-r--r--textproc/p5-Text-NSP/pkg-plist24
-rw-r--r--textproc/p5-Text-Ngrams/pkg-plist2
-rw-r--r--textproc/p5-Text-RecordParser/pkg-plist6
-rw-r--r--textproc/p5-Text-Similarity/pkg-plist2
-rw-r--r--textproc/p5-Text-VimColor/pkg-plist2
-rw-r--r--textproc/p5-Text-Xslate/pkg-plist2
-rw-r--r--textproc/p5-Tk-Pod/pkg-plist4
-rw-r--r--textproc/p5-Tk-XMLViewer/pkg-plist2
-rw-r--r--textproc/p5-UML-Class-Simple/pkg-plist2
-rw-r--r--textproc/p5-UML-Sequence/pkg-plist6
-rw-r--r--textproc/p5-UML-State/pkg-plist4
-rw-r--r--textproc/p5-URI-Find/pkg-plist2
-rw-r--r--textproc/p5-WordNet-Similarity/pkg-plist22
-rw-r--r--textproc/p5-XML-Compile/pkg-plist4
-rw-r--r--textproc/p5-XML-DT/pkg-plist6
-rw-r--r--textproc/p5-XML-Driver-HTML/pkg-plist2
-rw-r--r--textproc/p5-XML-Encoding/pkg-plist4
-rw-r--r--textproc/p5-XML-Entities/pkg-plist2
-rw-r--r--textproc/p5-XML-Handler-Dtd2DocBook/pkg-plist2
-rw-r--r--textproc/p5-XML-Handler-Dtd2Html/pkg-plist2
-rw-r--r--textproc/p5-XML-Handler-YAWriter/pkg-plist2
-rw-r--r--textproc/p5-XML-LibXML-PrettyPrint/pkg-plist2
-rw-r--r--textproc/p5-XML-Rewrite/pkg-plist2
-rw-r--r--textproc/p5-XML-Twig/pkg-plist10
-rw-r--r--textproc/p5-XML-Validate/pkg-plist2
-rw-r--r--textproc/p5-XML-XSH/pkg-plist2
-rw-r--r--textproc/p5-XML-XSLT/pkg-plist2
-rw-r--r--textproc/p5-XML-XUpdate-LibXML/pkg-plist2
-rw-r--r--textproc/p5-YAML-Shell/pkg-plist2
-rw-r--r--textproc/p5-pod2pdf/pkg-plist2
-rw-r--r--textproc/p5-xmltv/pkg-plist98
-rw-r--r--textproc/po4a/files/patch-Po4aBuilder.pm11
-rw-r--r--textproc/po4a/pkg-plist538
-rw-r--r--textproc/sdf/pkg-plist2
-rw-r--r--textproc/texi2db/Makefile2
-rw-r--r--textproc/txt2html/pkg-plist2
-rw-r--r--www/checkbot/Makefile2
-rw-r--r--www/interchange/pkg-plist28
-rw-r--r--www/p5-Amon2/pkg-plist2
-rw-r--r--www/p5-Apache-ASP/pkg-plist2
-rw-r--r--www/p5-App-Nopaste/pkg-plist2
-rw-r--r--www/p5-App-gist/pkg-plist2
-rw-r--r--www/p5-Bigtop/pkg-plist4
-rw-r--r--www/p5-Blog-Spam/pkg-plist2
-rw-r--r--www/p5-CGI-Kwiki/pkg-plist2
-rw-r--r--www/p5-Catalyst-Runtime/pkg-plist2
-rw-r--r--www/p5-Corona/pkg-plist2
-rw-r--r--www/p5-Dancer/pkg-plist2
-rw-r--r--www/p5-Dancer2/pkg-plist2
-rw-r--r--www/p5-FCGI-Spawn/pkg-plist2
-rw-r--r--www/p5-FEAR-API/pkg-plist2
-rw-r--r--www/p5-Feersum/pkg-plist2
-rw-r--r--www/p5-File-Mork/pkg-plist2
-rw-r--r--www/p5-Flickr-API/pkg-plist4
-rw-r--r--www/p5-Flickr-Upload/pkg-plist2
-rw-r--r--www/p5-Gungho/pkg-plist2
-rw-r--r--www/p5-HTML-Clean/pkg-plist2
-rw-r--r--www/p5-HTML-FormFu/pkg-plist4
-rw-r--r--www/p5-HTML-FromANSI/pkg-plist2
-rw-r--r--www/p5-HTML-FromText/pkg-plist2
-rw-r--r--www/p5-HTML-GenToc/pkg-plist2
-rw-r--r--www/p5-HTML-Perlinfo/pkg-plist2
-rw-r--r--www/p5-HTML-Seamstress/pkg-plist4
-rw-r--r--www/p5-HTML-SimpleLinkExtor/pkg-plist2
-rw-r--r--www/p5-HTML-WikiConverter/pkg-plist2
-rw-r--r--www/p5-HTTP-DAV/pkg-plist2
-rw-r--r--www/p5-HTTP-Recorder/pkg-plist2
-rw-r--r--www/p5-HTTP-SimpleLinkChecker/pkg-plist2
-rw-r--r--www/p5-HTTP-WebTest/pkg-plist2
-rw-r--r--www/p5-HTTPD-Log-Filter/pkg-plist2
-rw-r--r--www/p5-Jemplate/pkg-plist2
-rw-r--r--www/p5-Mason/pkg-plist2
-rw-r--r--www/p5-McBain/pkg-plist2
-rw-r--r--www/p5-MojoMojo/pkg-plist16
-rw-r--r--www/p5-Mojolicious/pkg-plist6
-rw-r--r--www/p5-Net-FireEagle/pkg-plist2
-rw-r--r--www/p5-Perlanet/pkg-plist2
-rw-r--r--www/p5-Plack-Middleware-ServerStatus-Lite/pkg-plist2
-rw-r--r--www/p5-Plack/pkg-plist2
-rw-r--r--www/p5-Pod-Site/pkg-plist2
-rw-r--r--www/p5-PodToHTML/pkg-plist2
-rw-r--r--www/p5-Reaction/pkg-plist10
-rw-r--r--www/p5-Scrappy/pkg-plist2
-rw-r--r--www/p5-Squatting/pkg-plist2
-rw-r--r--www/p5-Starman/pkg-plist2
-rw-r--r--www/p5-Template-Toolkit/pkg-plist4
-rw-r--r--www/p5-Twiggy/pkg-plist2
-rw-r--r--www/p5-W3C-LinkChecker/pkg-plist2
-rw-r--r--www/p5-WWW-Mechanize/pkg-plist2
-rw-r--r--www/p5-WWW-Mediawiki-Client/pkg-plist2
-rw-r--r--www/p5-WWW-Myspace/pkg-plist6
-rw-r--r--www/p5-WWW-Search/pkg-plist4
-rw-r--r--www/p5-WWW-Shorten-Bitly/pkg-plist2
-rw-r--r--www/p5-WWW-Shorten/pkg-plist2
-rw-r--r--www/p5-WWW-Wikipedia/pkg-plist2
-rw-r--r--www/p5-WebDAO/pkg-plist4
-rw-r--r--www/p5-chklinks/pkg-plist2
-rw-r--r--www/p5-libwww/pkg-plist14
-rw-r--r--www/perlbal/pkg-plist2
-rw-r--r--www/w3mir/pkg-plist4
-rw-r--r--www/weblint++/pkg-plist2
-rw-r--r--x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist2
-rw-r--r--x11-toolkits/p5-Prima/pkg-plist14
-rw-r--r--x11-toolkits/p5-Tk/pkg-plist8
-rw-r--r--x11-toolkits/p5-Wx/pkg-plist2
-rw-r--r--x11/p5-Clipboard/pkg-plist10
-rw-r--r--x11/p5-XTerm-Conf/pkg-plist2
546 files changed, 3026 insertions, 2784 deletions
diff --git a/CHANGES b/CHANGES
index 60a738cab981..ef889c4e4e5e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,12 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file.
+20150914:
+AUTHOR: mat@FreeBSD.org
+
+ Introducing the %%PERL5_MAN1%% PLIST_SUB entry, as Perl now installs man1
+ pages in the same prefix as man3 pages.
+
20150828:
AUTHOR: mat@FreeBSD.org
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk
index 9d3d8e436474..818954fb2c22 100644
--- a/Mk/Uses/perl5.mk
+++ b/Mk/Uses/perl5.mk
@@ -42,12 +42,13 @@ IGNORE= Incorrect 'USES+=perl5:${perl5_ARGS}' perl5 takes no arguments
USE_PERL5?= run build
-.if exists(${LOCALBASE}/bin/perl5)
+# remove when 5.20 goes away.
.sinclude "${LOCALBASE}/etc/perl5_version"
-.if !defined(PERL_VERSION)
-PERL_VERSION!= perl -e 'printf "%vd\n", $$^V;'
-.endif
+.if defined(PERL_VERSION)
+PERL5_DEPEND= ${PERL5}
+THIS_IS_OLD_PERL= yes
.else
+# end of remove
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
.if ${PERL5_DEFAULT} == 5.16
.include "${PORTSDIR}/lang/perl5.16/version.mk"
@@ -105,6 +106,12 @@ SITE_ARCH_REL?= ${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}
SITE_ARCH?= ${LOCALBASE}/${SITE_ARCH_REL}
SITE_MAN3_REL?= ${SITE_PERL_REL}/man/man3
SITE_MAN3?= ${PREFIX}/${SITE_MAN3_REL}
+.if defined(THIS_IS_OLD_PERL)
+SITE_MAN1_REL?= share/man/man1
+.else
+SITE_MAN1_REL?= ${SITE_PERL_REL}/man/man1
+.endif
+SITE_MAN1?= ${PREFIX}/${SITE_MAN1_REL}
PERL5= ${LOCALBASE}/bin/perl${PERL_VERSION}
PERL= ${LOCALBASE}/bin/perl
@@ -165,6 +172,7 @@ _INCLUDE_USES_PERL5_POST_MK= yes
PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
PERL_VER=${PERL_VER} \
+ PERL5_MAN1=${SITE_MAN1_REL} \
PERL5_MAN3=${SITE_MAN3_REL} \
SITE_PERL=${SITE_PERL_REL} \
SITE_ARCH=${SITE_ARCH_REL}
@@ -218,19 +226,19 @@ CONFIGURE_ENV+= PERL_MM_USE_DEFAULT="YES"
.endif # configure
.if ${_USE_PERL5:Mextract}
-EXTRACT_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
+EXTRACT_DEPENDS+= ${PERL5_DEPEND}:${PORTSDIR}/lang/${PERL_PORT}
.endif
.if ${_USE_PERL5:Mpatch}
-PATCH_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
+PATCH_DEPENDS+= ${PERL5_DEPEND}:${PORTSDIR}/lang/${PERL_PORT}
.endif
.if ${_USE_PERL5:Mbuild}
-BUILD_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
+BUILD_DEPENDS+= ${PERL5_DEPEND}:${PORTSDIR}/lang/${PERL_PORT}
.endif
.if ${_USE_PERL5:Mrun}
-RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
+RUN_DEPENDS+= ${PERL5_DEPEND}:${PORTSDIR}/lang/${PERL_PORT}
.endif
.if ${_USE_PERL5:Mconfigure}
@@ -238,6 +246,9 @@ CONFIGURE_ARGS+= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"
CONFIGURE_SCRIPT?= Makefile.PL
MAN3PREFIX?= ${PREFIX}/${SITE_PERL_REL}
+.if !defined(THIS_IS_OLD_PERL)
+MAN1PREFIX?= ${PREFIX}/${SITE_PERL_REL}
+.endif
.undef HAS_CONFIGURE
.if !target(do-configure)
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 3e6c85cbc280..f335a72916de 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -23,7 +23,17 @@ FPC_DEFAULT?= 2.6.4
GCC_DEFAULT?= 4.8
LUA_DEFAULT?= 5.2
MYSQL_DEFAULT?= 5.6
+.if defined(PACKAGE_BUILDING) || !exists(${LOCALBASE}/bin/perl)
PERL5_DEFAULT?= 5.20
+.elif !defined(PERL5_DEFAULT)
+# There's no need to replace development versions, like "5.23" with "devel"
+# because 1) nobody is supposed to use it outside of poudriere, and 2) it must
+# be set manually in /etc/make.conf in the first place, and we're never getting
+# in here.
+_PERL5_FROM_BIN!= perl -e 'printf "%vd\n", $$^V;'
+PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R}
+.undef _PERL5_FROM_BIN
+.endif
PGSQL_DEFAULT?= 9.3
PHP_DEFAULT?= 5.6
PYTHON_DEFAULT?= 2.7
diff --git a/UPDATING b/UPDATING
index 040e9c10aeca..febffd25f3d7 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,32 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20150914:
+ AFFECTS: users of lang/perl5*
+ AUTHOR: mat@FreeBSD.org
+
+ Binary package users can ignore this.
+
+ The way lang/perl5* ports install themselves has changed. From now on, only
+ the default Perl version will install /usr/local/bin/perl.
+
+ If you are NOT using the default version of Perl (as of right now, it is
+ 5.20) you MUST add a line setting the version you are using to your
+ /etc/make.conf:
+
+ DEFAULT_VERSIONS+= perl5=5.xx
+
+ Especially, after this date, to migrate from one Perl version to the other,
+ you must first put the DEFAULT_VERSIONS line in your make.conf, and then, for
+ example, if you want to move from 5.20 to 5.22, do:
+
+ pkg set -o lang/perl5.20:lang/perl5.22
+ portmaster `pkg shlib -qR libperl.so.5.20`
+
+ If you do not do that, you will replace your default Perl 5.20 installation
+ (one that has /usr/local/bin/perl) to an installation that does not have
+ /usr/local/bin/perl, and it will break everything.
+
20150908:
AFFECTS: users of print/texlive-base
AUTHOR: hrs@FreeBSD.org
diff --git a/astro/p5-Astro-ADS/pkg-plist b/astro/p5-Astro-ADS/pkg-plist
index 66e8f753e695..a0b095495b7f 100644
--- a/astro/p5-Astro-ADS/pkg-plist
+++ b/astro/p5-Astro-ADS/pkg-plist
@@ -7,4 +7,4 @@ bin/adsquery
%%PERL5_MAN3%%/Astro::ADS::Query.3.gz
%%PERL5_MAN3%%/Astro::ADS::Result.3.gz
%%PERL5_MAN3%%/Astro::ADS::Result::Paper.3.gz
-man/man1/adsquery.1.gz
+%%PERL5_MAN1%%/adsquery.1.gz
diff --git a/astro/p5-Astro-PAL/pkg-plist b/astro/p5-Astro-PAL/pkg-plist
index aad5b15e524a..e566d46b536a 100644
--- a/astro/p5-Astro-PAL/pkg-plist
+++ b/astro/p5-Astro-PAL/pkg-plist
@@ -2,4 +2,4 @@ bin/stime
%%SITE_ARCH%%/Astro/PAL.pm
%%SITE_ARCH%%/auto/Astro/PAL/PAL.so
%%PERL5_MAN3%%/Astro::PAL.3.gz
-man/man1/stime.1.gz
+%%PERL5_MAN1%%/stime.1.gz
diff --git a/astro/p5-Astro-SIMBAD-Client/pkg-plist b/astro/p5-Astro-SIMBAD-Client/pkg-plist
index 7875dd16a856..98b10ed424b4 100644
--- a/astro/p5-Astro-SIMBAD-Client/pkg-plist
+++ b/astro/p5-Astro-SIMBAD-Client/pkg-plist
@@ -2,4 +2,4 @@ bin/simbadc
%%SITE_PERL%%/Astro/SIMBAD/Client.pm
%%SITE_PERL%%/Astro/SIMBAD/Client/WSQueryInterfaceService.pm
%%PERL5_MAN3%%/Astro::SIMBAD::Client.3.gz
-man/man1/simbadc.1.gz
+%%PERL5_MAN1%%/simbadc.1.gz
diff --git a/astro/p5-Astro-SpaceTrack/pkg-plist b/astro/p5-Astro-SpaceTrack/pkg-plist
index 3e913ea04dae..d8125b865d60 100644
--- a/astro/p5-Astro-SpaceTrack/pkg-plist
+++ b/astro/p5-Astro-SpaceTrack/pkg-plist
@@ -3,4 +3,4 @@ bin/SpaceTrack
%%SITE_PERL%%/Astro/SpaceTrack/BulkData.pod
%%PERL5_MAN3%%/Astro::SpaceTrack.3.gz
%%PERL5_MAN3%%/Astro::SpaceTrack::BulkData.3.gz
-man/man1/SpaceTrack.1.gz
+%%PERL5_MAN1%%/SpaceTrack.1.gz
diff --git a/astro/p5-Astro-satpass/pkg-plist b/astro/p5-Astro-satpass/pkg-plist
index 0183598f8c0f..84f189228454 100644
--- a/astro/p5-Astro-satpass/pkg-plist
+++ b/astro/p5-Astro-satpass/pkg-plist
@@ -19,4 +19,4 @@ bin/satpass
%%PERL5_MAN3%%/Astro::Coord::ECI::TLE::Iridium.3.gz
%%PERL5_MAN3%%/Astro::Coord::ECI::TLE::Set.3.gz
%%PERL5_MAN3%%/Astro::Coord::ECI::Utils.3.gz
-man/man1/satpass.1.gz
+%%PERL5_MAN1%%/satpass.1.gz
diff --git a/audio/mp3-archive-tools/pkg-plist b/audio/mp3-archive-tools/pkg-plist
index 461c765600df..d36cb294aae8 100644
--- a/audio/mp3-archive-tools/pkg-plist
+++ b/audio/mp3-archive-tools/pkg-plist
@@ -6,12 +6,12 @@ bin/movemusic
bin/mp3id
bin/pmv
bin/update-music-symlinks
-man/man1/cddbtofilename.1.gz
-man/man1/filenametoid3.1.gz
-man/man1/freedbtofilename.1.gz
-man/man1/id3tofilename.1.gz
-man/man1/movemusic.1.gz
-man/man1/mp3-archive-tools.1.gz
-man/man1/mp3id.1.gz
-man/man1/pmv.1.gz
-man/man1/update-music-symlinks.1.gz
+%%PERL5_MAN1%%/cddbtofilename.1.gz
+%%PERL5_MAN1%%/filenametoid3.1.gz
+%%PERL5_MAN1%%/freedbtofilename.1.gz
+%%PERL5_MAN1%%/id3tofilename.1.gz
+%%PERL5_MAN1%%/movemusic.1.gz
+%%PERL5_MAN1%%/mp3-archive-tools.1.gz
+%%PERL5_MAN1%%/mp3id.1.gz
+%%PERL5_MAN1%%/pmv.1.gz
+%%PERL5_MAN1%%/update-music-symlinks.1.gz
diff --git a/audio/mp3lint/pkg-plist b/audio/mp3lint/pkg-plist
index e742bd1c4bba..ab3eb1362a17 100644
--- a/audio/mp3lint/pkg-plist
+++ b/audio/mp3lint/pkg-plist
@@ -18,7 +18,7 @@ etc/mp3lintrc
%%SITE_PERL%%/MP3/Archive/Lint/Tools/Ogg.pm
%%SITE_PERL%%/MP3/Archive/Lint/Tools/Wav.pm
%%PERL5_MAN3%%/mp3lint-tools.3.gz
-man/man1/mp3lint.1.gz
-man/man1/mp3lintskip.1.gz
-man/man1/mp3lintsum.1.gz
+%%PERL5_MAN1%%/mp3lint.1.gz
+%%PERL5_MAN1%%/mp3lintskip.1.gz
+%%PERL5_MAN1%%/mp3lintsum.1.gz
man/man5/mp3lintrc.5.gz
diff --git a/audio/p5-Audio-MPD/pkg-plist b/audio/p5-Audio-MPD/pkg-plist
index e469122508f6..58be8a25a659 100644
--- a/audio/p5-Audio-MPD/pkg-plist
+++ b/audio/p5-Audio-MPD/pkg-plist
@@ -8,5 +8,5 @@ bin/mpd-rate
%%PERL5_MAN3%%/Audio::MPD::Collection.3.gz
%%PERL5_MAN3%%/Audio::MPD::Playlist.3.gz
%%PERL5_MAN3%%/Audio::MPD::Types.3.gz
-man/man1/mpd-dynamic.1.gz
-man/man1/mpd-rate.1.gz
+%%PERL5_MAN1%%/mpd-dynamic.1.gz
+%%PERL5_MAN1%%/mpd-rate.1.gz
diff --git a/audio/p5-Audio-Scrobbler/pkg-plist b/audio/p5-Audio-Scrobbler/pkg-plist
index 7888ff395b59..d7f246ed2c7f 100644
--- a/audio/p5-Audio-Scrobbler/pkg-plist
+++ b/audio/p5-Audio-Scrobbler/pkg-plist
@@ -1,4 +1,4 @@
bin/scrobbler-helper
%%SITE_PERL%%/Audio/Scrobbler.pm
%%PERL5_MAN3%%/Audio::Scrobbler.3.gz
-man/man1/scrobbler-helper.1.gz
+%%PERL5_MAN1%%/scrobbler-helper.1.gz
diff --git a/audio/p5-MP3-Find/pkg-plist b/audio/p5-MP3-Find/pkg-plist
index d52d275056bd..addfaf5bad60 100644
--- a/audio/p5-MP3-Find/pkg-plist
+++ b/audio/p5-MP3-Find/pkg-plist
@@ -9,5 +9,5 @@ bin/mp3find
%%PERL5_MAN3%%/MP3::Find::Base.3.gz
%%PERL5_MAN3%%/MP3::Find::DB.3.gz
%%PERL5_MAN3%%/MP3::Find::Filesystem.3.gz
-man/man1/mp3db.1.gz
-man/man1/mp3find.1.gz
+%%PERL5_MAN1%%/mp3db.1.gz
+%%PERL5_MAN1%%/mp3find.1.gz
diff --git a/audio/p5-MP3-Tag/pkg-plist b/audio/p5-MP3-Tag/pkg-plist
index ae70f24c8109..5b0611e617e8 100644
--- a/audio/p5-MP3-Tag/pkg-plist
+++ b/audio/p5-MP3-Tag/pkg-plist
@@ -35,6 +35,6 @@ bin/mp3info2
%%PERL5_MAN3%%/MP3::Tag::LastResort.3.gz
%%PERL5_MAN3%%/MP3::Tag::ParseData.3.gz
%%PERL5_MAN3%%/Normalize::Text::Music_Fields.3.gz
-man/man1/audio_rename.1.gz
-man/man1/mp3info2.1.gz
-man/man1/typeset_audio_dir.1.gz
+%%PERL5_MAN1%%/audio_rename.1.gz
+%%PERL5_MAN1%%/mp3info2.1.gz
+%%PERL5_MAN1%%/typeset_audio_dir.1.gz
diff --git a/audio/p5-Music-Audioscrobbler-MPD/pkg-plist b/audio/p5-Music-Audioscrobbler-MPD/pkg-plist
index d51f8be04509..b5f624419cfc 100644
--- a/audio/p5-Music-Audioscrobbler-MPD/pkg-plist
+++ b/audio/p5-Music-Audioscrobbler-MPD/pkg-plist
@@ -1,4 +1,4 @@
bin/musicmpdscrobble
%%SITE_PERL%%/Music/Audioscrobbler/MPD.pm
%%PERL5_MAN3%%/Music::Audioscrobbler::MPD.3.gz
-man/man1/musicmpdscrobble.1.gz
+%%PERL5_MAN1%%/musicmpdscrobble.1.gz
diff --git a/biology/p5-AcePerl/pkg-plist b/biology/p5-AcePerl/pkg-plist
index 8b3ea9e627b5..ac1cc6daecc5 100644
--- a/biology/p5-AcePerl/pkg-plist
+++ b/biology/p5-AcePerl/pkg-plist
@@ -142,4 +142,4 @@ bin/ace.pl
%%PERL5_MAN3%%/Ace::Sequence::Homol.3.gz
%%PERL5_MAN3%%/Ace::Sequence::Multi.3.gz
%%PERL5_MAN3%%/Ace::Sequence::Transcript.3.gz
-man/man1/ace.pl.1.gz
+%%PERL5_MAN1%%/ace.pl.1.gz
diff --git a/biology/p5-Bio-GFF3/pkg-plist b/biology/p5-Bio-GFF3/pkg-plist
index 5aac13a355e5..584d93f3d2d1 100644
--- a/biology/p5-Bio-GFF3/pkg-plist
+++ b/biology/p5-Bio-GFF3/pkg-plist
@@ -9,4 +9,4 @@ bin/gff3_from_fasta
%%PERL5_MAN3%%/Bio::GFF3::LowLevel::Parser::1_0_backcompat.3.gz
%%PERL5_MAN3%%/Bio::GFF3::Transform::FromFasta.3.gz
%%PERL5_MAN3%%/Bio::GFF3::Transform::SyncDirectives.3.gz
-man/man1/gff3_from_fasta.1.gz
+%%PERL5_MAN1%%/gff3_from_fasta.1.gz
diff --git a/biology/p5-Bio-Graphics/pkg-plist b/biology/p5-Bio-Graphics/pkg-plist
index c84139e3fef7..d3d3927956ca 100644
--- a/biology/p5-Bio-Graphics/pkg-plist
+++ b/biology/p5-Bio-Graphics/pkg-plist
@@ -212,7 +212,7 @@ bin/search_overview.pl
%%PERL5_MAN3%%/Bio::Graphics::Util.3.gz
%%PERL5_MAN3%%/Bio::Graphics::Wiggle.3.gz
%%PERL5_MAN3%%/Bio::Graphics::Wiggle::Loader.3.gz
-man/man1/contig_draw.pl.1.gz
-man/man1/feature_draw.pl.1.gz
-man/man1/frend.pl.1.gz
-man/man1/search_overview.pl.1.gz
+%%PERL5_MAN1%%/contig_draw.pl.1.gz
+%%PERL5_MAN1%%/feature_draw.pl.1.gz
+%%PERL5_MAN1%%/frend.pl.1.gz
+%%PERL5_MAN1%%/search_overview.pl.1.gz
diff --git a/biology/p5-Bio-NEXUS/pkg-plist b/biology/p5-Bio-NEXUS/pkg-plist
index 933493e67e5a..4e59edb5e66d 100644
--- a/biology/p5-Bio-NEXUS/pkg-plist
+++ b/biology/p5-Bio-NEXUS/pkg-plist
@@ -57,6 +57,6 @@ bin/nextool.pl
%%PERL5_MAN3%%/Bio::NEXUS::Util::Exceptions.3.gz
%%PERL5_MAN3%%/Bio::NEXUS::Util::Logger.3.gz
%%PERL5_MAN3%%/Bio::NEXUS::WeightSet.3.gz
-man/man1/nex2text_tree.pl.1.gz
-man/man1/nexplot.pl.1.gz
-man/man1/nextool.pl.1.gz
+%%PERL5_MAN1%%/nex2text_tree.pl.1.gz
+%%PERL5_MAN1%%/nexplot.pl.1.gz
+%%PERL5_MAN1%%/nextool.pl.1.gz
diff --git a/biology/p5-bioperl/pkg-plist b/biology/p5-bioperl/pkg-plist
index 74533a2e94ce..4f532432a681 100644
--- a/biology/p5-bioperl/pkg-plist
+++ b/biology/p5-bioperl/pkg-plist
@@ -1694,69 +1694,69 @@ bin/bp_unflatten_seq.pl
%%PERL5_MAN3%%/Bio::Variation::SeqDiff.3.gz
%%PERL5_MAN3%%/Bio::Variation::VariantI.3.gz
%%PERL5_MAN3%%/Bio::WebAgent.3.gz
-man/man1/bp_aacomp.pl.1.gz
-man/man1/bp_biofetch_genbank_proxy.pl.1.gz
-man/man1/bp_bioflat_index.pl.1.gz
-man/man1/bp_biogetseq.pl.1.gz
-man/man1/bp_blast2tree.pl.1.gz
-man/man1/bp_bulk_load_gff.pl.1.gz
-man/man1/bp_chaos_plot.pl.1.gz
-man/man1/bp_classify_hits_kingdom.pl.1.gz
-man/man1/bp_composite_LD.pl.1.gz
-man/man1/bp_dbsplit.pl.1.gz
-man/man1/bp_download_query_genbank.pl.1.gz
-man/man1/bp_extract_feature_seq.pl.1.gz
-man/man1/bp_fast_load_gff.pl.1.gz
-man/man1/bp_fastam9_to_table.pl.1.gz
-man/man1/bp_fetch.pl.1.gz
-man/man1/bp_filter_search.pl.1.gz
-man/man1/bp_flanks.pl.1.gz
-man/man1/bp_gccalc.pl.1.gz
-man/man1/bp_genbank2gff.pl.1.gz
-man/man1/bp_genbank2gff3.pl.1.gz
-man/man1/bp_generate_histogram.pl.1.gz
-man/man1/bp_heterogeneity_test.pl.1.gz
-man/man1/bp_hivq.pl.1.gz
-man/man1/bp_hmmer_to_table.pl.1.gz
-man/man1/bp_index.pl.1.gz
-man/man1/bp_load_gff.pl.1.gz
-man/man1/bp_local_taxonomydb_query.pl.1.gz
-man/man1/bp_make_mrna_protein.pl.1.gz
-man/man1/bp_mask_by_search.pl.1.gz
-man/man1/bp_meta_gff.pl.1.gz
-man/man1/bp_mrtrans.pl.1.gz
-man/man1/bp_mutate.pl.1.gz
-man/man1/bp_netinstall.pl.1.gz
-man/man1/bp_nexus2nh.pl.1.gz
-man/man1/bp_nrdb.pl.1.gz
-man/man1/bp_oligo_count.pl.1.gz
-man/man1/bp_pairwise_kaks.pl.1.gz
-man/man1/bp_parse_hmmsearch.pl.1.gz
-man/man1/bp_process_gadfly.pl.1.gz
-man/man1/bp_process_sgd.pl.1.gz
-man/man1/bp_process_wormbase.pl.1.gz
-man/man1/bp_query_entrez_taxa.pl.1.gz
-man/man1/bp_remote_blast.pl.1.gz
-man/man1/bp_revtrans-motif.pl.1.gz
-man/man1/bp_search2BSML.pl.1.gz
-man/man1/bp_search2alnblocks.pl.1.gz
-man/man1/bp_search2gff.pl.1.gz
-man/man1/bp_search2table.pl.1.gz
-man/man1/bp_search2tribe.pl.1.gz
-man/man1/bp_seq_length.pl.1.gz
-man/man1/bp_seqconvert.pl.1.gz
-man/man1/bp_seqcut.pl.1.gz
-man/man1/bp_seqfeature_load.pl.1.gz
-man/man1/bp_seqpart.pl.1.gz
-man/man1/bp_seqret.pl.1.gz
-man/man1/bp_seqretsplit.pl.1.gz
-man/man1/bp_split_seq.pl.1.gz
-man/man1/bp_sreformat.pl.1.gz
-man/man1/bp_taxid4species.pl.1.gz
-man/man1/bp_taxonomy2tree.pl.1.gz
-man/man1/bp_translate_seq.pl.1.gz
-man/man1/bp_tree2pag.pl.1.gz
-man/man1/bp_unflatten_seq.pl.1.gz
+%%PERL5_MAN1%%/bp_aacomp.pl.1.gz
+%%PERL5_MAN1%%/bp_biofetch_genbank_proxy.pl.1.gz
+%%PERL5_MAN1%%/bp_bioflat_index.pl.1.gz
+%%PERL5_MAN1%%/bp_biogetseq.pl.1.gz
+%%PERL5_MAN1%%/bp_blast2tree.pl.1.gz
+%%PERL5_MAN1%%/bp_bulk_load_gff.pl.1.gz
+%%PERL5_MAN1%%/bp_chaos_plot.pl.1.gz
+%%PERL5_MAN1%%/bp_classify_hits_kingdom.pl.1.gz
+%%PERL5_MAN1%%/bp_composite_LD.pl.1.gz
+%%PERL5_MAN1%%/bp_dbsplit.pl.1.gz
+%%PERL5_MAN1%%/bp_download_query_genbank.pl.1.gz
+%%PERL5_MAN1%%/bp_extract_feature_seq.pl.1.gz
+%%PERL5_MAN1%%/bp_fast_load_gff.pl.1.gz
+%%PERL5_MAN1%%/bp_fastam9_to_table.pl.1.gz
+%%PERL5_MAN1%%/bp_fetch.pl.1.gz
+%%PERL5_MAN1%%/bp_filter_search.pl.1.gz
+%%PERL5_MAN1%%/bp_flanks.pl.1.gz
+%%PERL5_MAN1%%/bp_gccalc.pl.1.gz
+%%PERL5_MAN1%%/bp_genbank2gff.pl.1.gz
+%%PERL5_MAN1%%/bp_genbank2gff3.pl.1.gz
+%%PERL5_MAN1%%/bp_generate_histogram.pl.1.gz
+%%PERL5_MAN1%%/bp_heterogeneity_test.pl.1.gz
+%%PERL5_MAN1%%/bp_hivq.pl.1.gz
+%%PERL5_MAN1%%/bp_hmmer_to_table.pl.1.gz
+%%PERL5_MAN1%%/bp_index.pl.1.gz
+%%PERL5_MAN1%%/bp_load_gff.pl.1.gz
+%%PERL5_MAN1%%/bp_local_taxonomydb_query.pl.1.gz
+%%PERL5_MAN1%%/bp_make_mrna_protein.pl.1.gz
+%%PERL5_MAN1%%/bp_mask_by_search.pl.1.gz
+%%PERL5_MAN1%%/bp_meta_gff.pl.1.gz
+%%PERL5_MAN1%%/bp_mrtrans.pl.1.gz
+%%PERL5_MAN1%%/bp_mutate.pl.1.gz
+%%PERL5_MAN1%%/bp_netinstall.pl.1.gz
+%%PERL5_MAN1%%/bp_nexus2nh.pl.1.gz
+%%PERL5_MAN1%%/bp_nrdb.pl.1.gz
+%%PERL5_MAN1%%/bp_oligo_count.pl.1.gz
+%%PERL5_MAN1%%/bp_pairwise_kaks.pl.1.gz
+%%PERL5_MAN1%%/bp_parse_hmmsearch.pl.1.gz
+%%PERL5_MAN1%%/bp_process_gadfly.pl.1.gz
+%%PERL5_MAN1%%/bp_process_sgd.pl.1.gz
+%%PERL5_MAN1%%/bp_process_wormbase.pl.1.gz
+%%PERL5_MAN1%%/bp_query_entrez_taxa.pl.1.gz
+%%PERL5_MAN1%%/bp_remote_blast.pl.1.gz
+%%PERL5_MAN1%%/bp_revtrans-motif.pl.1.gz
+%%PERL5_MAN1%%/bp_search2BSML.pl.1.gz
+%%PERL5_MAN1%%/bp_search2alnblocks.pl.1.gz
+%%PERL5_MAN1%%/bp_search2gff.pl.1.gz
+%%PERL5_MAN1%%/bp_search2table.pl.1.gz
+%%PERL5_MAN1%%/bp_search2tribe.pl.1.gz
+%%PERL5_MAN1%%/bp_seq_length.pl.1.gz
+%%PERL5_MAN1%%/bp_seqconvert.pl.1.gz
+%%PERL5_MAN1%%/bp_seqcut.pl.1.gz
+%%PERL5_MAN1%%/bp_seqfeature_load.pl.1.gz
+%%PERL5_MAN1%%/bp_seqpart.pl.1.gz
+%%PERL5_MAN1%%/bp_seqret.pl.1.gz
+%%PERL5_MAN1%%/bp_seqretsplit.pl.1.gz
+%%PERL5_MAN1%%/bp_split_seq.pl.1.gz
+%%PERL5_MAN1%%/bp_sreformat.pl.1.gz
+%%PERL5_MAN1%%/bp_taxid4species.pl.1.gz
+%%PERL5_MAN1%%/bp_taxonomy2tree.pl.1.gz
+%%PERL5_MAN1%%/bp_translate_seq.pl.1.gz
+%%PERL5_MAN1%%/bp_tree2pag.pl.1.gz
+%%PERL5_MAN1%%/bp_unflatten_seq.pl.1.gz
%%DATADIR%%/models/README
%%DATADIR%%/models/biblio.dia
%%DATADIR%%/models/bio_liveseq_variation.dia
diff --git a/cad/p5-Verilog-Perl/pkg-plist b/cad/p5-Verilog-Perl/pkg-plist
index 6bb05857ad83..77e84f107b6a 100644
--- a/cad/p5-Verilog-Perl/pkg-plist
+++ b/cad/p5-Verilog-Perl/pkg-plist
@@ -47,7 +47,7 @@ bin/vsplitmodule
%%SITE_ARCH%%/Verilog/Verilog-Perl.pod
%%SITE_ARCH%%/auto/Verilog/Parser/Parser.so
%%SITE_ARCH%%/auto/Verilog/Preproc/Preproc.so
-man/man1/vhier.1.gz
-man/man1/vpassert.1.gz
-man/man1/vppreproc.1.gz
-man/man1/vrename.1.gz
+%%PERL5_MAN1%%/vhier.1.gz
+%%PERL5_MAN1%%/vpassert.1.gz
+%%PERL5_MAN1%%/vppreproc.1.gz
+%%PERL5_MAN1%%/vrename.1.gz
diff --git a/chinese/p5-Encode-CNMap/pkg-plist b/chinese/p5-Encode-CNMap/pkg-plist
index be85dd3c4789..d764c167081c 100644
--- a/chinese/p5-Encode-CNMap/pkg-plist
+++ b/chinese/p5-Encode-CNMap/pkg-plist
@@ -5,6 +5,6 @@ bin/cnmapwx
%%SITE_ARCH%%/Encode/CNMap/cnmapwx.wdr
%%SITE_ARCH%%/Encode/CNMap/cnmapwx_wdr.pl
%%SITE_ARCH%%/auto/Encode/CNMap/CNMap.so
-man/man1/cnmap.1.gz
-man/man1/cnmapdir.1.gz
-man/man1/cnmapwx.1.gz
+%%PERL5_MAN1%%/cnmap.1.gz
+%%PERL5_MAN1%%/cnmapdir.1.gz
+%%PERL5_MAN1%%/cnmapwx.1.gz
diff --git a/chinese/p5-Encode-HanConvert/pkg-plist b/chinese/p5-Encode-HanConvert/pkg-plist
index 201e46447bd6..a9592da129fa 100644
--- a/chinese/p5-Encode-HanConvert/pkg-plist
+++ b/chinese/p5-Encode-HanConvert/pkg-plist
@@ -4,5 +4,5 @@ bin/g2b.pl
%%SITE_ARCH%%/Encode/HanConvert/Perl.pm
%%SITE_ARCH%%/Encode/HanConvert/Perl.pm-orig
%%SITE_ARCH%%/auto/Encode/HanConvert/HanConvert.so
-man/man1/b2g.pl.1.gz
-man/man1/g2b.pl.1.gz
+%%PERL5_MAN1%%/b2g.pl.1.gz
+%%PERL5_MAN1%%/g2b.pl.1.gz
diff --git a/comms/gscmxx/pkg-plist b/comms/gscmxx/pkg-plist
index 2b0265d65830..1e22e8b12b3e 100644
--- a/comms/gscmxx/pkg-plist
+++ b/comms/gscmxx/pkg-plist
@@ -32,4 +32,4 @@ share/gscmxx/i18n/german
share/gscmxx/i18n/english
share/gscmxx/i18n/italian
%%PERL5_MAN3%%/SCMxx.3.gz
-man/man1/gscmxx.1.gz
+%%PERL5_MAN1%%/gscmxx.1.gz
diff --git a/comms/o2sms/pkg-plist b/comms/o2sms/pkg-plist
index 4dbf9a685d4b..37e180cea758 100644
--- a/comms/o2sms/pkg-plist
+++ b/comms/o2sms/pkg-plist
@@ -20,8 +20,8 @@ bin/vodasms
%%PERL5_MAN3%%/WWW::SMS::IE::o2sms.3.gz
%%PERL5_MAN3%%/WWW::SMS::IE::threesms.3.gz
%%PERL5_MAN3%%/WWW::SMS::IE::vodasms.3.gz
-man/man1/aftsms.1.gz
-man/man1/meteorsms.1.gz
-man/man1/o2sms.1.gz
-man/man1/threesms.1.gz
-man/man1/vodasms.1.gz
+%%PERL5_MAN1%%/aftsms.1.gz
+%%PERL5_MAN1%%/meteorsms.1.gz
+%%PERL5_MAN1%%/o2sms.1.gz
+%%PERL5_MAN1%%/threesms.1.gz
+%%PERL5_MAN1%%/vodasms.1.gz
diff --git a/comms/p5-Device-SerialPort/pkg-plist b/comms/p5-Device-SerialPort/pkg-plist
index 3614375126eb..589fa62a04c2 100644
--- a/comms/p5-Device-SerialPort/pkg-plist
+++ b/comms/p5-Device-SerialPort/pkg-plist
@@ -2,4 +2,4 @@ bin/modemtest
%%SITE_ARCH%%/Device/SerialPort.pm
%%SITE_ARCH%%/auto/Device/SerialPort/SerialPort.so
%%PERL5_MAN3%%/Device::SerialPort.3.gz
-man/man1/modemtest.1.gz
+%%PERL5_MAN1%%/modemtest.1.gz
diff --git a/comms/p5-SMS-SMS77/pkg-plist b/comms/p5-SMS-SMS77/pkg-plist
index d4961ba059c8..93b127b3bfbb 100644
--- a/comms/p5-SMS-SMS77/pkg-plist
+++ b/comms/p5-SMS-SMS77/pkg-plist
@@ -1,5 +1,5 @@
bin/sms77send
-man/man1/sms77send.1.gz
+%%PERL5_MAN1%%/sms77send.1.gz
%%SITE_PERL%%/SMS/SMS77.pm
%%SITE_PERL%%/SMS/SMS77/Message.pm
%%PERL5_MAN3%%/SMS::SMS77.3.gz
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
diff --git a/databases/innotop/pkg-plist b/databases/innotop/pkg-plist
index 02d7a86ee25f..6ee699778e44 100644
--- a/databases/innotop/pkg-plist
+++ b/databases/innotop/pkg-plist
@@ -1,2 +1,2 @@
bin/innotop
-man/man1/innotop.1.gz
+%%PERL5_MAN1%%/innotop.1.gz
diff --git a/databases/mtop/pkg-plist b/databases/mtop/pkg-plist
index ff4c237c83af..4ed1f3e950be 100644
--- a/databases/mtop/pkg-plist
+++ b/databases/mtop/pkg-plist
@@ -1,4 +1,4 @@
bin/mkill
bin/mtop
-man/man1/mkill.1.gz
-man/man1/mtop.1.gz
+%%PERL5_MAN1%%/mkill.1.gz
+%%PERL5_MAN1%%/mtop.1.gz
diff --git a/databases/mytop/Makefile b/databases/mytop/Makefile
index 74204e286184..39fc1b9bae26 100644
--- a/databases/mytop/Makefile
+++ b/databases/mytop/Makefile
@@ -25,6 +25,6 @@ USES+= perl5
USE_PERL5= configure
PLIST_FILES= bin/mytop \
- man/man1/mytop.1.gz
+ ${SITE_MAN1}/mytop.1.gz
.include <bsd.port.mk>
diff --git a/databases/p5-AnyEvent-CouchDB/pkg-plist b/databases/p5-AnyEvent-CouchDB/pkg-plist
index 4ec038f0db32..a0354767d0d9 100644
--- a/databases/p5-AnyEvent-CouchDB/pkg-plist
+++ b/databases/p5-AnyEvent-CouchDB/pkg-plist
@@ -7,4 +7,4 @@ bin/couchdb-push
%%PERL5_MAN3%%/AnyEvent::CouchDB::Database.3.gz
%%PERL5_MAN3%%/AnyEvent::CouchDB::Exceptions.3.gz
%%PERL5_MAN3%%/AnyEvent::CouchDB::Stream.3.gz
-man/man1/couchdb-push.1.gz
+%%PERL5_MAN1%%/couchdb-push.1.gz
diff --git a/databases/p5-Bucardo/pkg-plist b/databases/p5-Bucardo/pkg-plist
index d6e282f21aa7..06dc7f42db5c 100644
--- a/databases/p5-Bucardo/pkg-plist
+++ b/databases/p5-Bucardo/pkg-plist
@@ -2,5 +2,5 @@ bin/bucardo
etc/rc.d/bucardo
%%PERL5_MAN3%%/Bucardo.3.gz
%%SITE_PERL%%/Bucardo.pm
-man/man1/bucardo.1.gz
+%%PERL5_MAN1%%/bucardo.1.gz
share/bucardo/bucardo.schema
diff --git a/databases/p5-DBD-Oracle/pkg-plist b/databases/p5-DBD-Oracle/pkg-plist
index 5e1f0b2ae477..a8baf3f59eb7 100644
--- a/databases/p5-DBD-Oracle/pkg-plist
+++ b/databases/p5-DBD-Oracle/pkg-plist
@@ -11,7 +11,7 @@ bin/ora_explain
%%SITE_ARCH%%/oraperl.ph
%%PERL5_MAN3%%/DBD::Oracle.3.gz
%%PERL5_MAN3%%/DBD::Oraperl.3.gz
-man/man1/ora_explain.1.gz
+%%PERL5_MAN1%%/ora_explain.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Readme
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bind.pl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/commit.pl
diff --git a/databases/p5-DBD-XBase/pkg-plist b/databases/p5-DBD-XBase/pkg-plist
index 246cd95ebec1..3c6cf3b31fa1 100644
--- a/databases/p5-DBD-XBase/pkg-plist
+++ b/databases/p5-DBD-XBase/pkg-plist
@@ -15,5 +15,5 @@ bin/indexdump
%%PERL5_MAN3%%/XBase::Index.3.gz
%%PERL5_MAN3%%/XBase::Memo.3.gz
%%PERL5_MAN3%%/XBase::SDBM.3.gz
-man/man1/dbfdump.1.gz
-man/man1/indexdump.1.gz
+%%PERL5_MAN1%%/dbfdump.1.gz
+%%PERL5_MAN1%%/indexdump.1.gz
diff --git a/databases/p5-DBI-Shell/pkg-plist b/databases/p5-DBI-Shell/pkg-plist
index dfa1a8538591..9c3e7e32936f 100644
--- a/databases/p5-DBI-Shell/pkg-plist
+++ b/databases/p5-DBI-Shell/pkg-plist
@@ -12,4 +12,4 @@ bin/dbish
%%PERL5_MAN3%%/DBI::Format::CSV.3.gz
%%PERL5_MAN3%%/DBI::Format::SQLMinus.3.gz
%%PERL5_MAN3%%/DBI::Shell.3.gz
-man/man1/dbish.1.gz
+%%PERL5_MAN1%%/dbish.1.gz
diff --git a/databases/p5-DBI/pkg-plist b/databases/p5-DBI/pkg-plist
index 6b4d4d01c5de..8eade36c1c33 100644
--- a/databases/p5-DBI/pkg-plist
+++ b/databases/p5-DBI/pkg-plist
@@ -113,6 +113,6 @@ bin/dbiproxy
%%PERL5_MAN3%%/DBI::Util::CacheMemory.3.gz
%%PERL5_MAN3%%/DBI::W32ODBC.3.gz
%%PERL5_MAN3%%/Win32::DBIODBC.3.gz
-man/man1/dbilogstrip.1.gz
-man/man1/dbiprof.1.gz
-man/man1/dbiproxy.1.gz
+%%PERL5_MAN1%%/dbilogstrip.1.gz
+%%PERL5_MAN1%%/dbiprof.1.gz
+%%PERL5_MAN1%%/dbiproxy.1.gz
diff --git a/databases/p5-DBICx-Deploy/pkg-plist b/databases/p5-DBICx-Deploy/pkg-plist
index e34d91a5b680..1e1ea19d510a 100644
--- a/databases/p5-DBICx-Deploy/pkg-plist
+++ b/databases/p5-DBICx-Deploy/pkg-plist
@@ -1,4 +1,4 @@
bin/dbicdeploy
-man/man1/dbicdeploy.1.gz
+%%PERL5_MAN1%%/dbicdeploy.1.gz
%%SITE_PERL%%/DBICx/Deploy.pm
%%PERL5_MAN3%%/DBICx::Deploy.3.gz
diff --git a/databases/p5-DBIx-Class-Migration/pkg-plist b/databases/p5-DBIx-Class-Migration/pkg-plist
index 0c482341b987..62063fa08011 100644
--- a/databases/p5-DBIx-Class-Migration/pkg-plist
+++ b/databases/p5-DBIx-Class-Migration/pkg-plist
@@ -1,5 +1,5 @@
bin/dbic-migration
-man/man1/dbic-migration.1.gz
+%%PERL5_MAN1%%/dbic-migration.1.gz
%%SITE_PERL%%/Catalyst/TraitFor/Model/DBIC/Schema/FromMigration.pm
%%SITE_PERL%%/Catalyst/TraitFor/Model/DBIC/Schema/FromMigration/_MigrationHelper.pm
%%SITE_PERL%%/DBIx/Class/Migration.pm
diff --git a/databases/p5-DBIx-Class-Schema-Loader/pkg-plist b/databases/p5-DBIx-Class-Schema-Loader/pkg-plist
index 6ec8ae6d98bf..c2e4ba193c18 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/pkg-plist
+++ b/databases/p5-DBIx-Class-Schema-Loader/pkg-plist
@@ -79,4 +79,4 @@ bin/dbicdump
%%SITE_PERL%%/DBIx/Class/Schema/Loader/Table/Informix.pm
%%SITE_PERL%%/DBIx/Class/Schema/Loader/Table/Sybase.pm
%%SITE_PERL%%/DBIx/Class/Schema/Loader/Utils.pm
-man/man1/dbicdump.1.gz
+%%PERL5_MAN1%%/dbicdump.1.gz
diff --git a/databases/p5-DBIx-Class/pkg-plist b/databases/p5-DBIx-Class/pkg-plist
index b1a727b70209..c4ab59d01a8c 100644
--- a/databases/p5-DBIx-Class/pkg-plist
+++ b/databases/p5-DBIx-Class/pkg-plist
@@ -297,4 +297,4 @@ bin/dbicadmin
%%PERL5_MAN3%%/DBIx::Class::UTF8Columns.3.gz
%%PERL5_MAN3%%/SQL::Translator::Parser::DBIx::Class.3.gz
%%PERL5_MAN3%%/SQL::Translator::Producer::DBIx::Class::File.3.gz
-man/man1/dbicadmin.1.gz
+%%PERL5_MAN1%%/dbicadmin.1.gz
diff --git a/databases/p5-DBIx-VersionedDDL/pkg-plist b/databases/p5-DBIx-VersionedDDL/pkg-plist
index e629f9b3ea17..bc081cfcea6d 100644
--- a/databases/p5-DBIx-VersionedDDL/pkg-plist
+++ b/databases/p5-DBIx-VersionedDDL/pkg-plist
@@ -3,4 +3,4 @@ bin/migrate_schema
%%SITE_PERL%%/DBIx/VersionedDDL/Plugin/DefaultScriptProcessor.pm
%%PERL5_MAN3%%/DBIx::VersionedDDL.3.gz
%%PERL5_MAN3%%/DBIx::VersionedDDL::Plugin::DefaultScriptProcessor.3.gz
-man/man1/migrate_schema.1.gz
+%%PERL5_MAN1%%/migrate_schema.1.gz
diff --git a/databases/p5-Genezzo/pkg-plist b/databases/p5-Genezzo/pkg-plist
index a1e2381fd4ce..3708ca81888d 100644
--- a/databases/p5-Genezzo/pkg-plist
+++ b/databases/p5-Genezzo/pkg-plist
@@ -144,5 +144,5 @@ bin/genexp.pl
%%PERL5_MAN3%%/Genezzo::XEval::SQLAlter.3.gz
%%PERL5_MAN3%%/Genezzo::gendba.3.gz
%%PERL5_MAN3%%/Genezzo::genexp.3.gz
-man/man1/gendba.pl.1.gz
-man/man1/genexp.pl.1.gz
+%%PERL5_MAN1%%/gendba.pl.1.gz
+%%PERL5_MAN1%%/genexp.pl.1.gz
diff --git a/databases/p5-HTML-FormHandler-Model-DBIC/pkg-plist b/databases/p5-HTML-FormHandler-Model-DBIC/pkg-plist
index c7b70d7d9fad..95934b759174 100644
--- a/databases/p5-HTML-FormHandler-Model-DBIC/pkg-plist
+++ b/databases/p5-HTML-FormHandler-Model-DBIC/pkg-plist
@@ -9,4 +9,4 @@ bin/form_generator.pl
%%PERL5_MAN3%%/HTML::FormHandler::Model::DBIC::TypeMap.3.gz
%%PERL5_MAN3%%/HTML::FormHandler::TraitFor::DBICFields.3.gz
%%PERL5_MAN3%%/HTML::FormHandler::TraitFor::Model::DBIC.3.gz
-man/man1/form_generator.pl.1.gz
+%%PERL5_MAN1%%/form_generator.pl.1.gz
diff --git a/databases/p5-MySQL-Diff/pkg-plist b/databases/p5-MySQL-Diff/pkg-plist
index 2547784812fb..7b68165e7ce8 100644
--- a/databases/p5-MySQL-Diff/pkg-plist
+++ b/databases/p5-MySQL-Diff/pkg-plist
@@ -1,5 +1,5 @@
bin/mysqldiff
-man/man1/mysqldiff.1.gz
+%%PERL5_MAN1%%/mysqldiff.1.gz
%%SITE_PERL%%/MySQL/Diff.pm
%%SITE_PERL%%/MySQL/Diff/Database.pm
%%SITE_PERL%%/MySQL/Diff/Table.pm
diff --git a/databases/p5-Prophet/pkg-plist b/databases/p5-Prophet/pkg-plist
index 56c65645d851..1e8ea25fab93 100644
--- a/databases/p5-Prophet/pkg-plist
+++ b/databases/p5-Prophet/pkg-plist
@@ -198,4 +198,4 @@ bin/prophet
%%PERL5_MAN3%%/Prophet::Web::FunctionResult.3.gz
%%PERL5_MAN3%%/Prophet::Web::Menu.3.gz
%%PERL5_MAN3%%/Prophet::Web::Result.3.gz
-man/man1/prophet.1.gz
+%%PERL5_MAN1%%/prophet.1.gz
diff --git a/databases/p5-SQL-ReservedWords/pkg-plist b/databases/p5-SQL-ReservedWords/pkg-plist
index 5bc41cafaece..7095a924c647 100644
--- a/databases/p5-SQL-ReservedWords/pkg-plist
+++ b/databases/p5-SQL-ReservedWords/pkg-plist
@@ -17,4 +17,4 @@ bin/sqlrw
%%PERL5_MAN3%%/SQL::ReservedWords::SQLServer.3.gz
%%PERL5_MAN3%%/SQL::ReservedWords::SQLite.3.gz
%%PERL5_MAN3%%/SQL::ReservedWords::Sybase.3.gz
-man/man1/sqlrw.1.gz
+%%PERL5_MAN1%%/sqlrw.1.gz
diff --git a/databases/p5-SQL-Translator/pkg-plist b/databases/p5-SQL-Translator/pkg-plist
index d3111f8c7945..9bff40d8bf7a 100644
--- a/databases/p5-SQL-Translator/pkg-plist
+++ b/databases/p5-SQL-Translator/pkg-plist
@@ -93,12 +93,12 @@ bin/sqlt-graph
%%SITE_PERL%%/auto/share/dist/SQL-Translator/DiaUml/uml-class-start.tt2
%%SITE_PERL%%/auto/share/dist/SQL-Translator/DiaUml/uml-class.tt2
%%SITE_PERL%%/auto/share/dist/SQL-Translator/PrecompiledParsers/Parse/RecDescent/DDL/SQLT/README
-man/man1/sqlt-diagram.1.gz
-man/man1/sqlt-diff-old.1.gz
-man/man1/sqlt-diff.1.gz
-man/man1/sqlt-dumper.1.gz
-man/man1/sqlt-graph.1.gz
-man/man1/sqlt.1.gz
+%%PERL5_MAN1%%/sqlt-diagram.1.gz
+%%PERL5_MAN1%%/sqlt-diff-old.1.gz
+%%PERL5_MAN1%%/sqlt-diff.1.gz
+%%PERL5_MAN1%%/sqlt-dumper.1.gz
+%%PERL5_MAN1%%/sqlt-graph.1.gz
+%%PERL5_MAN1%%/sqlt.1.gz
%%PERL5_MAN3%%/SQL::Translator.3.gz
%%PERL5_MAN3%%/SQL::Translator::Diff.3.gz
%%PERL5_MAN3%%/SQL::Translator::Filter::DefaultExtra.3.gz
diff --git a/databases/p5-SQLite-Work/pkg-plist b/databases/p5-SQLite-Work/pkg-plist
index ca219c9f0823..1b5985bcd781 100644
--- a/databases/p5-SQLite-Work/pkg-plist
+++ b/databases/p5-SQLite-Work/pkg-plist
@@ -7,6 +7,6 @@ bin/sqlw_mail
%%PERL5_MAN3%%/SQLite::Work.3.gz
%%PERL5_MAN3%%/SQLite::Work::CGI.3.gz
%%PERL5_MAN3%%/SQLite::Work::Mail.3.gz
-man/man1/sqlreport.1.gz
-man/man1/sqlw_import.1.gz
-man/man1/sqlw_mail.1.gz
+%%PERL5_MAN1%%/sqlreport.1.gz
+%%PERL5_MAN1%%/sqlw_import.1.gz
+%%PERL5_MAN1%%/sqlw_mail.1.gz
diff --git a/databases/p5-Test-Fixture-DBI/pkg-plist b/databases/p5-Test-Fixture-DBI/pkg-plist
index 4f71ab83c012..62b5fd044eb8 100644
--- a/databases/p5-Test-Fixture-DBI/pkg-plist
+++ b/databases/p5-Test-Fixture-DBI/pkg-plist
@@ -8,5 +8,5 @@ bin/make_fixture_yaml.pl
%%PERL5_MAN3%%/Test::Fixture::DBI::Util.3.gz
%%PERL5_MAN3%%/Test::Fixture::DBI::Util::SQLite.3.gz
%%PERL5_MAN3%%/Test::Fixture::DBI::Util::mysql.3.gz
-man/man1/make_database_yaml.pl.1.gz
-man/man1/make_fixture_yaml.pl.1.gz
+%%PERL5_MAN1%%/make_database_yaml.pl.1.gz
+%%PERL5_MAN1%%/make_fixture_yaml.pl.1.gz
diff --git a/databases/p5-mysql-genocide/pkg-plist b/databases/p5-mysql-genocide/pkg-plist
index 0c3f6bd1066f..d6bddcdd959e 100644
--- a/databases/p5-mysql-genocide/pkg-plist
+++ b/databases/p5-mysql-genocide/pkg-plist
@@ -1,2 +1,2 @@
bin/mysql-genocide
-man/man1/mysql-genocide.1.gz
+%%PERL5_MAN1%%/mysql-genocide.1.gz
diff --git a/databases/percona-toolkit/pkg-plist b/databases/percona-toolkit/pkg-plist
index e69054454fae..1452498f0bb5 100644
--- a/databases/percona-toolkit/pkg-plist
+++ b/databases/percona-toolkit/pkg-plist
@@ -30,36 +30,36 @@ bin/pt-table-usage
bin/pt-upgrade
bin/pt-variable-advisor
bin/pt-visual-explain
-man/man1/percona-toolkit.1.gz
-man/man1/pt-align.1.gz
-man/man1/pt-archiver.1.gz
-man/man1/pt-config-diff.1.gz
-man/man1/pt-deadlock-logger.1.gz
-man/man1/pt-diskstats.1.gz
-man/man1/pt-duplicate-key-checker.1.gz
-man/man1/pt-fifo-split.1.gz
-man/man1/pt-find.1.gz
-man/man1/pt-fingerprint.1.gz
-man/man1/pt-fk-error-logger.1.gz
-man/man1/pt-heartbeat.1.gz
-man/man1/pt-index-usage.1.gz
-man/man1/pt-ioprofile.1.gz
-man/man1/pt-kill.1.gz
-man/man1/pt-mext.1.gz
-man/man1/pt-mysql-summary.1.gz
-man/man1/pt-online-schema-change.1.gz
-man/man1/pt-pmp.1.gz
-man/man1/pt-query-digest.1.gz
-man/man1/pt-show-grants.1.gz
-man/man1/pt-sift.1.gz
-man/man1/pt-slave-delay.1.gz
-man/man1/pt-slave-find.1.gz
-man/man1/pt-slave-restart.1.gz
-man/man1/pt-stalk.1.gz
-man/man1/pt-summary.1.gz
-man/man1/pt-table-checksum.1.gz
-man/man1/pt-table-sync.1.gz
-man/man1/pt-table-usage.1.gz
-man/man1/pt-upgrade.1.gz
-man/man1/pt-variable-advisor.1.gz
-man/man1/pt-visual-explain.1.gz
+%%PERL5_MAN1%%/percona-toolkit.1.gz
+%%PERL5_MAN1%%/pt-align.1.gz
+%%PERL5_MAN1%%/pt-archiver.1.gz
+%%PERL5_MAN1%%/pt-config-diff.1.gz
+%%PERL5_MAN1%%/pt-deadlock-logger.1.gz
+%%PERL5_MAN1%%/pt-diskstats.1.gz
+%%PERL5_MAN1%%/pt-duplicate-key-checker.1.gz
+%%PERL5_MAN1%%/pt-fifo-split.1.gz
+%%PERL5_MAN1%%/pt-find.1.gz
+%%PERL5_MAN1%%/pt-fingerprint.1.gz
+%%PERL5_MAN1%%/pt-fk-error-logger.1.gz
+%%PERL5_MAN1%%/pt-heartbeat.1.gz
+%%PERL5_MAN1%%/pt-index-usage.1.gz
+%%PERL5_MAN1%%/pt-ioprofile.1.gz
+%%PERL5_MAN1%%/pt-kill.1.gz
+%%PERL5_MAN1%%/pt-mext.1.gz
+%%PERL5_MAN1%%/pt-mysql-summary.1.gz
+%%PERL5_MAN1%%/pt-online-schema-change.1.gz
+%%PERL5_MAN1%%/pt-pmp.1.gz
+%%PERL5_MAN1%%/pt-query-digest.1.gz
+%%PERL5_MAN1%%/pt-show-grants.1.gz
+%%PERL5_MAN1%%/pt-sift.1.gz
+%%PERL5_MAN1%%/pt-slave-delay.1.gz
+%%PERL5_MAN1%%/pt-slave-find.1.gz
+%%PERL5_MAN1%%/pt-slave-restart.1.gz
+%%PERL5_MAN1%%/pt-stalk.1.gz
+%%PERL5_MAN1%%/pt-summary.1.gz
+%%PERL5_MAN1%%/pt-table-checksum.1.gz
+%%PERL5_MAN1%%/pt-table-sync.1.gz
+%%PERL5_MAN1%%/pt-table-usage.1.gz
+%%PERL5_MAN1%%/pt-upgrade.1.gz
+%%PERL5_MAN1%%/pt-variable-advisor.1.gz
+%%PERL5_MAN1%%/pt-visual-explain.1.gz
diff --git a/databases/pgbadger/pkg-plist b/databases/pgbadger/pkg-plist
index 5a1fc30112b6..e61c121c8bdc 100644
--- a/databases/pgbadger/pkg-plist
+++ b/databases/pgbadger/pkg-plist
@@ -1,2 +1,2 @@
bin/pgbadger
-man/man1/pgbadger.1p.gz
+%%PERL5_MAN1%%/pgbadger.1p.gz
diff --git a/databases/pgtop/pkg-plist b/databases/pgtop/pkg-plist
index 211e232b87e0..9df39bf023a6 100644
--- a/databases/pgtop/pkg-plist
+++ b/databases/pgtop/pkg-plist
@@ -1,2 +1,2 @@
bin/pgtop
-man/man1/pgtop.1.gz
+%%PERL5_MAN1%%/pgtop.1.gz
diff --git a/deskutils/p5-Goo/pkg-plist b/deskutils/p5-Goo/pkg-plist
index 91301087a686..b64882daaa1d 100644
--- a/deskutils/p5-Goo/pkg-plist
+++ b/deskutils/p5-Goo/pkg-plist
@@ -283,5 +283,5 @@ bin/goo.pl
%%SITE_PERL%%/Goo/WebDBLite.pm
%%SITE_PERL%%/Goo/Zone.pm
%%SITE_PERL%%/Goo/test.pl
-man/man1/goo.1.gz
-man/man1/goo.pl.1.gz
+%%PERL5_MAN1%%/goo.1.gz
+%%PERL5_MAN1%%/goo.pl.1.gz
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
diff --git a/dns/axfr2acl/Makefile b/dns/axfr2acl/Makefile
index b53882dde668..c4704599cda6 100644
--- a/dns/axfr2acl/Makefile
+++ b/dns/axfr2acl/Makefile
@@ -17,6 +17,6 @@ RUN_DEPENDS= p5-Net-DNS>0:${PORTSDIR}/dns/p5-Net-DNS
USES= perl5
USE_PERL5= configure
-PLIST_FILES= bin/axfr2acl man/man1/axfr2acl.1.gz
+PLIST_FILES= bin/axfr2acl ${SITE_MAN1}/axfr2acl.1.gz
.include <bsd.port.mk>
diff --git a/dns/dnscheckengine/pkg-plist b/dns/dnscheckengine/pkg-plist
index c4e617414620..708c18535ddf 100644
--- a/dns/dnscheckengine/pkg-plist
+++ b/dns/dnscheckengine/pkg-plist
@@ -7,12 +7,12 @@ libexec/dnscheck/dnscheck-dispatcher
libexec/dnscheck/dnscheck-hostsyntax
libexec/dnscheck/dnscheck-preflight
libexec/dnscheck/dnscheck-zonediff
-man/man1/dnscheck-zonediff.1.gz
-man/man1/dnscheck-dispatcher.1.gz
-man/man1/dnscheck-preflight.1.gz
-man/man1/dnscheck-hostsyntax.1.gz
-man/man1/dnscheck.1.gz
-man/man1/dnscheck-12hourmailer.1.gz
+%%PERL5_MAN1%%/dnscheck-zonediff.1.gz
+%%PERL5_MAN1%%/dnscheck-dispatcher.1.gz
+%%PERL5_MAN1%%/dnscheck-preflight.1.gz
+%%PERL5_MAN1%%/dnscheck-hostsyntax.1.gz
+%%PERL5_MAN1%%/dnscheck.1.gz
+%%PERL5_MAN1%%/dnscheck-12hourmailer.1.gz
%%PERL5_MAN3%%/DNSCheck::Test::Nameserver.3.gz
%%PERL5_MAN3%%/DNSCheck::Config.3.gz
%%PERL5_MAN3%%/DNSCheck.3.gz
diff --git a/dns/dnsdbck/Makefile b/dns/dnsdbck/Makefile
index 74f348e7fa6e..572c771d092c 100644
--- a/dns/dnsdbck/Makefile
+++ b/dns/dnsdbck/Makefile
@@ -18,6 +18,6 @@ RUN_DEPENDS= p5-Net-CIDR>0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
USES= perl5
USE_PERL5= configure
-PLIST_FILES= bin/dnsdbck man/man1/dnsdbck.1.gz
+PLIST_FILES= bin/dnsdbck ${SITE_MAN1}/dnsdbck.1.gz
.include <bsd.port.mk>
diff --git a/dns/fpdns/pkg-plist b/dns/fpdns/pkg-plist
index 8bbeb6e91fde..d7b6a327b928 100644
--- a/dns/fpdns/pkg-plist
+++ b/dns/fpdns/pkg-plist
@@ -1,4 +1,4 @@
bin/fpdns
-man/man1/fpdns.1.gz
+%%PERL5_MAN1%%/fpdns.1.gz
%%SITE_PERL%%/Net/DNS/Fingerprint.pm
%%SITE_PERL%%/Net/DNS/REPLACE
diff --git a/dns/p5-Net-Amazon-Route53/pkg-plist b/dns/p5-Net-Amazon-Route53/pkg-plist
index bbc7d80046a7..2f0de058740d 100644
--- a/dns/p5-Net-Amazon-Route53/pkg-plist
+++ b/dns/p5-Net-Amazon-Route53/pkg-plist
@@ -1,5 +1,5 @@
bin/route53
-man/man1/route53.1.gz
+%%PERL5_MAN1%%/route53.1.gz
%%PERL5_MAN3%%/Net::Amazon::Route53.3.gz
%%PERL5_MAN3%%/Net::Amazon::Route53::Change.3.gz
%%PERL5_MAN3%%/Net::Amazon::Route53::HostedZone.3.gz
diff --git a/dns/p5-Net-RBLClient/pkg-plist b/dns/p5-Net-RBLClient/pkg-plist
index 6190f96944a8..183d524de397 100644
--- a/dns/p5-Net-RBLClient/pkg-plist
+++ b/dns/p5-Net-RBLClient/pkg-plist
@@ -1,4 +1,4 @@
bin/spamalyze
%%SITE_PERL%%/Net/RBLClient.pm
%%PERL5_MAN3%%/Net::RBLClient.3.gz
-man/man1/spamalyze.1.gz
+%%PERL5_MAN1%%/spamalyze.1.gz
diff --git a/dns/p5-pgeodns/pkg-plist b/dns/p5-pgeodns/pkg-plist
index 59629c65c5e3..db1aaacc7e69 100644
--- a/dns/p5-pgeodns/pkg-plist
+++ b/dns/p5-pgeodns/pkg-plist
@@ -2,4 +2,4 @@ bin/pgeodns
%%SITE_PERL%%/Countries.pm
%%SITE_PERL%%/GeoDNS.pm
%%SITE_PERL%%/pgeodns.pl
-man/man1/pgeodns.1.gz
+%%PERL5_MAN1%%/pgeodns.1.gz
diff --git a/dns/renewck/Makefile b/dns/renewck/Makefile
index 75d5e7854c6a..768c1ce8cab0 100644
--- a/dns/renewck/Makefile
+++ b/dns/renewck/Makefile
@@ -19,6 +19,6 @@ RUN_DEPENDS= p5-Time-modules>0:${PORTSDIR}/devel/p5-Time-modules \
USES= perl5
USE_PERL5= configure
-PLIST_FILES= bin/renewck man/man1/renewck.1.gz
+PLIST_FILES= bin/renewck ${SITE_MAN1}/renewck.1.gz
.include <bsd.port.mk>
diff --git a/dns/rpsl2acl/Makefile b/dns/rpsl2acl/Makefile
index d84fcfec4b94..0772a8903aaa 100644
--- a/dns/rpsl2acl/Makefile
+++ b/dns/rpsl2acl/Makefile
@@ -17,6 +17,6 @@ RUN_DEPENDS= p5-Net-CIDR>0:${PORTSDIR}/net-mgmt/p5-Net-CIDR
USES= perl5
USE_PERL5= configure
-PLIST_FILES= bin/rpsl2acl man/man1/rpsl2acl.1.gz
+PLIST_FILES= bin/rpsl2acl ${SITE_MAN1}/rpsl2acl.1.gz
.include <bsd.port.mk>
diff --git a/dns/vhostcname/Makefile b/dns/vhostcname/Makefile
index fa0f83c572f1..adac27934ddc 100644
--- a/dns/vhostcname/Makefile
+++ b/dns/vhostcname/Makefile
@@ -17,6 +17,6 @@ RUN_DEPENDS= p5-Net-DNS>0:${PORTSDIR}/dns/p5-Net-DNS
USES= perl5
USE_PERL5= configure
-PLIST_FILES= bin/vhostcname man/man1/vhostcname.1.gz
+PLIST_FILES= bin/vhostcname ${SITE_MAN1}/vhostcname.1.gz
.include <bsd.port.mk>
diff --git a/dns/whoseip/pkg-plist b/dns/whoseip/pkg-plist
index 6ecf1e345e0c..32a201543559 100644
--- a/dns/whoseip/pkg-plist
+++ b/dns/whoseip/pkg-plist
@@ -1,4 +1,4 @@
bin/whoseip
%%SITE_PERL%%/Whoseip/DB.pm
%%PERL5_MAN3%%/Whoseip::DB.3.gz
-man/man1/whoseip.1.gz
+%%PERL5_MAN1%%/whoseip.1.gz
diff --git a/editors/p5-Vimana/pkg-plist b/editors/p5-Vimana/pkg-plist
index 7be287f2cc1b..1e1be9a5e0de 100644
--- a/editors/p5-Vimana/pkg-plist
+++ b/editors/p5-Vimana/pkg-plist
@@ -44,7 +44,7 @@
%%PERL5_MAN3%%/Vimana::Record.3.gz
%%PERL5_MAN3%%/Vimana::Recursive.3.gz
%%PERL5_MAN3%%/Vimana::Util.3.gz
-man/man1/vim_record.1.gz
-man/man1/vimana.1.gz
+%%PERL5_MAN1%%/vim_record.1.gz
+%%PERL5_MAN1%%/vimana.1.gz
bin/vimana
bin/vim_record
diff --git a/finance/p5-Finance-TW-TSEQuote/pkg-plist b/finance/p5-Finance-TW-TSEQuote/pkg-plist
index 900a4bdcf64f..877b7c9d36e0 100644
--- a/finance/p5-Finance-TW-TSEQuote/pkg-plist
+++ b/finance/p5-Finance-TW-TSEQuote/pkg-plist
@@ -3,4 +3,4 @@ bin/twse-eod-dump
bin/twse-eod-update
%%PERL5_MAN3%%/Finance::TW::TSEQuote.3.gz
%%SITE_PERL%%/Finance/TW/TSEQuote.pm
-man/man1/pfq.1.gz
+%%PERL5_MAN1%%/pfq.1.gz
diff --git a/finance/p5-Finance-YahooQuote/pkg-plist b/finance/p5-Finance-YahooQuote/pkg-plist
index 257a4e2db695..a8ad169e5db6 100644
--- a/finance/p5-Finance-YahooQuote/pkg-plist
+++ b/finance/p5-Finance-YahooQuote/pkg-plist
@@ -1,4 +1,4 @@
bin/yahooquote
%%SITE_PERL%%/Finance/YahooQuote.pm
%%PERL5_MAN3%%/Finance::YahooQuote.3.gz
-man/man1/yahooquote.1.gz
+%%PERL5_MAN1%%/yahooquote.1.gz
diff --git a/ftp/paraget/pkg-plist b/ftp/paraget/pkg-plist
index a0b8fe33e85d..8c4df50eac15 100644
--- a/ftp/paraget/pkg-plist
+++ b/ftp/paraget/pkg-plist
@@ -1,6 +1,6 @@
bin/paraget
bin/paraget-child
-man/man1/paraget.1.gz
+%%PERL5_MAN1%%/paraget.1.gz
%%SITE_PERL%%/Net/Paraget/Assignment.pm
%%SITE_PERL%%/Net/Paraget/AssignmentManager.pm
%%SITE_PERL%%/Net/Paraget/Client.pm
diff --git a/games/frozen-bubble/pkg-plist b/games/frozen-bubble/pkg-plist
index 1e54470ac07c..9193fafa27cb 100644
--- a/games/frozen-bubble/pkg-plist
+++ b/games/frozen-bubble/pkg-plist
@@ -3270,6 +3270,6 @@ bin/frozen-bubble-editor
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/snore.ogg
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/stick.ogg
%%SITE_ARCH%%/auto/share/dist/Games-FrozenBubble/snd/typewriter.ogg
-man/man1/frozen-bubble-editor.1.gz
-man/man1/frozen-bubble.1.gz
+%%PERL5_MAN1%%/frozen-bubble-editor.1.gz
+%%PERL5_MAN1%%/frozen-bubble.1.gz
share/pixmaps/frozen-bubble.png
diff --git a/games/lm-solve/pkg-plist b/games/lm-solve/pkg-plist
index f659b9b789e8..dac510943041 100644
--- a/games/lm-solve/pkg-plist
+++ b/games/lm-solve/pkg-plist
@@ -13,7 +13,7 @@ bin/lm-solve
%%SITE_PERL%%/Games/LMSolve/Tilt/Single.pm
%%SITE_PERL%%/Games/LMSolve.pm
%%SITE_PERL%%/Games/get-version.pl
-man/man1/lm-solve.1.gz
+%%PERL5_MAN1%%/lm-solve.1.gz
%%PERL5_MAN3%%/Games::LMSolve.3.gz
%%PERL5_MAN3%%/Games::LMSolve::Alice.3.gz
%%PERL5_MAN3%%/Games::LMSolve::Base.3.gz
diff --git a/games/p5-Games-AlphaBeta/pkg-plist b/games/p5-Games-AlphaBeta/pkg-plist
index 7195b15280ef..96ab10b1cac4 100644
--- a/games/p5-Games-AlphaBeta/pkg-plist
+++ b/games/p5-Games-AlphaBeta/pkg-plist
@@ -9,4 +9,4 @@ bin/othello-demo
%%SITE_PERL%%/Games/AlphaBeta/Reversi.pm
%%SITE_PERL%%/Games/Sequential.pm
%%SITE_PERL%%/Games/Sequential/Position.pm
-man/man1/othello-demo.1.gz
+%%PERL5_MAN1%%/othello-demo.1.gz
diff --git a/games/p5-Games-Bingo-Print/pkg-plist b/games/p5-Games-Bingo-Print/pkg-plist
index 519e815f84d8..5bb78e4e1bb4 100644
--- a/games/p5-Games-Bingo-Print/pkg-plist
+++ b/games/p5-Games-Bingo-Print/pkg-plist
@@ -1,4 +1,4 @@
bin/bingo_print.pl
-man/man1/bingo_print.pl.1.gz
+%%PERL5_MAN1%%/bingo_print.pl.1.gz
%%SITE_PERL%%/Games/Bingo/Print.pm
%%PERL5_MAN3%%/Games::Bingo::Print.3.gz
diff --git a/games/p5-Games-Bingo/pkg-plist b/games/p5-Games-Bingo/pkg-plist
index 659ed9dcbd99..39edc9a4b385 100644
--- a/games/p5-Games-Bingo/pkg-plist
+++ b/games/p5-Games-Bingo/pkg-plist
@@ -1,5 +1,5 @@
bin/bingo.pl
-man/man1/bingo.pl.1.gz
+%%PERL5_MAN1%%/bingo.pl.1.gz
%%SITE_PERL%%/Games/Bingo.pm
%%SITE_PERL%%/Games/Bingo/Card.pm
%%SITE_PERL%%/Games/Bingo/Column.pm
diff --git a/games/p5-Games-Dice/pkg-plist b/games/p5-Games-Dice/pkg-plist
index 71d648c4405e..4b08da8136ab 100644
--- a/games/p5-Games-Dice/pkg-plist
+++ b/games/p5-Games-Dice/pkg-plist
@@ -1,4 +1,4 @@
bin/roll
%%SITE_PERL%%/Games/Dice.pm
-man/man1/roll.1.gz
+%%PERL5_MAN1%%/roll.1.gz
%%PERL5_MAN3%%/Games::Dice.3.gz
diff --git a/graphics/IPA/pkg-plist b/graphics/IPA/pkg-plist
index 826f4b56e0c1..aa143504d083 100644
--- a/graphics/IPA/pkg-plist
+++ b/graphics/IPA/pkg-plist
@@ -1,5 +1,5 @@
bin/iterm
-man/man1/iterm.1.gz
+%%PERL5_MAN1%%/iterm.1.gz
%%PERL5_MAN3%%/IPA.3.gz
%%PERL5_MAN3%%/IPA::Geometry.3.gz
%%PERL5_MAN3%%/IPA::Global.3.gz
diff --git a/graphics/eps2png/pkg-plist b/graphics/eps2png/pkg-plist
index c48543c6d487..81f1d1cacc88 100644
--- a/graphics/eps2png/pkg-plist
+++ b/graphics/eps2png/pkg-plist
@@ -1,2 +1,2 @@
bin/eps2png
-man/man1/eps2png.1.gz
+%%PERL5_MAN1%%/eps2png.1.gz
diff --git a/graphics/p5-GD/pkg-plist b/graphics/p5-GD/pkg-plist
index 260514b397b2..26aca7e5f01b 100644
--- a/graphics/p5-GD/pkg-plist
+++ b/graphics/p5-GD/pkg-plist
@@ -15,5 +15,5 @@ bin/bdf2gdfont.pl
%%PERL5_MAN3%%/GD::Polygon.3.gz
%%PERL5_MAN3%%/GD::Polyline.3.gz
%%PERL5_MAN3%%/GD::Simple.3.gz
-@comment man/man1/bdf2gdfont.PLS.1.gz
-man/man1/bdf2gdfont.pl.1.gz
+@comment %%PERL5_MAN1%%/bdf2gdfont.PLS.1.gz
+%%PERL5_MAN1%%/bdf2gdfont.pl.1.gz
diff --git a/graphics/p5-Gimp/pkg-plist b/graphics/p5-Gimp/pkg-plist
index f6574de77ddf..cf67edf73033 100644
--- a/graphics/p5-Gimp/pkg-plist
+++ b/graphics/p5-Gimp/pkg-plist
@@ -81,7 +81,7 @@ libexec/gimp/2.2/plug-ins/xachlego
libexec/gimp/2.2/plug-ins/xachshadow
libexec/gimp/2.2/plug-ins/xachvision
libexec/gimp/2.2/plug-ins/yinyang
-man/man1/embedxpm.1.gz
-man/man1/gimpdoc.1.gz
-man/man1/scm2perl.1.gz
-man/man1/xcftopnm.1.gz
+%%PERL5_MAN1%%/embedxpm.1.gz
+%%PERL5_MAN1%%/gimpdoc.1.gz
+%%PERL5_MAN1%%/scm2perl.1.gz
+%%PERL5_MAN1%%/xcftopnm.1.gz
diff --git a/graphics/p5-Graph-Easy/pkg-plist b/graphics/p5-Graph-Easy/pkg-plist
index a637b44cb8e3..d8e177676c19 100644
--- a/graphics/p5-Graph-Easy/pkg-plist
+++ b/graphics/p5-Graph-Easy/pkg-plist
@@ -55,4 +55,4 @@ bin/graph-easy
%%PERL5_MAN3%%/Graph::Easy::Parser::Graphviz.3.gz
%%PERL5_MAN3%%/Graph::Easy::Parser::VCG.3.gz
%%PERL5_MAN3%%/Graph::Easy::Util.3.gz
-man/man1/graph-easy.1.gz
+%%PERL5_MAN1%%/graph-easy.1.gz
diff --git a/graphics/p5-Image-ExifTool-devel/pkg-plist b/graphics/p5-Image-ExifTool-devel/pkg-plist
index 72368e75a14a..8ec42676c2c0 100644
--- a/graphics/p5-Image-ExifTool-devel/pkg-plist
+++ b/graphics/p5-Image-ExifTool-devel/pkg-plist
@@ -358,4 +358,4 @@ bin/exiftool
%%SITE_PERL%%/Image/ExifTool/XMPStruct.pl
%%SITE_PERL%%/Image/ExifTool/ZIP.pm
%%SITE_PERL%%/Image/ExifTool/iWork.pm
-man/man1/exiftool.1.gz
+%%PERL5_MAN1%%/exiftool.1.gz
diff --git a/graphics/p5-Image-ExifTool/pkg-plist b/graphics/p5-Image-ExifTool/pkg-plist
index c79be226d078..6487a58150f9 100644
--- a/graphics/p5-Image-ExifTool/pkg-plist
+++ b/graphics/p5-Image-ExifTool/pkg-plist
@@ -354,4 +354,4 @@ bin/exiftool
%%PERL5_MAN3%%/Image::ExifTool::XMPStruct.3.gz
%%PERL5_MAN3%%/Image::ExifTool::ZIP.3.gz
%%PERL5_MAN3%%/Image::ExifTool::iWork.3.gz
-man/man1/exiftool.1.gz
+%%PERL5_MAN1%%/exiftool.1.gz
diff --git a/graphics/p5-Image-Size/pkg-plist b/graphics/p5-Image-Size/pkg-plist
index 4fca9185c0b1..8700c5aed657 100644
--- a/graphics/p5-Image-Size/pkg-plist
+++ b/graphics/p5-Image-Size/pkg-plist
@@ -1,4 +1,4 @@
bin/imgsize
%%PERL5_MAN3%%/Image::Size.3.gz
-man/man1/imgsize.1.gz
+%%PERL5_MAN1%%/imgsize.1.gz
%%SITE_PERL%%/Image/Size.pm
diff --git a/graphics/p5-SVG-Metadata/pkg-plist b/graphics/p5-SVG-Metadata/pkg-plist
index 06cdec239b7f..8b4591edeac3 100644
--- a/graphics/p5-SVG-Metadata/pkg-plist
+++ b/graphics/p5-SVG-Metadata/pkg-plist
@@ -2,5 +2,5 @@ bin/svg_annotate
bin/svg_validate
%%PERL5_MAN3%%/SVG::Metadata.3.gz
%%SITE_PERL%%/SVG/Metadata.pm
-man/man1/svg_annotate.1.gz
-man/man1/svg_validate.1.gz
+%%PERL5_MAN1%%/svg_annotate.1.gz
+%%PERL5_MAN1%%/svg_validate.1.gz
diff --git a/graphics/p5-SWF-Builder/pkg-plist b/graphics/p5-SWF-Builder/pkg-plist
index 132ffafecf38..749b1432ef23 100644
--- a/graphics/p5-SWF-Builder/pkg-plist
+++ b/graphics/p5-SWF-Builder/pkg-plist
@@ -30,4 +30,4 @@ bin/asc.plx
%%SITE_PERL%%/SWF/Builder/ExElement.pm
%%SITE_PERL%%/SWF/Builder/Gradient.pm
%%SITE_PERL%%/SWF/Builder/Shape.pm
-man/man1/asc.plx.1.gz
+%%PERL5_MAN1%%/asc.plx.1.gz
diff --git a/graphics/p5-Tk-JPEG-Lite/pkg-plist b/graphics/p5-Tk-JPEG-Lite/pkg-plist
index c2af65bcb542..2ad9f51fe23c 100644
--- a/graphics/p5-Tk-JPEG-Lite/pkg-plist
+++ b/graphics/p5-Tk-JPEG-Lite/pkg-plist
@@ -2,4 +2,4 @@ bin/tkjpeg-lite
%%PERL5_MAN3%%/Tk::JPEG::Lite.3.gz
%%SITE_ARCH%%/Tk/JPEG/Lite.pm
%%SITE_ARCH%%/auto/Tk/JPEG/Lite/Lite.so
-man/man1/tkjpeg-lite.1.gz
+%%PERL5_MAN1%%/tkjpeg-lite.1.gz
diff --git a/graphics/p5-feedgnuplot/Makefile b/graphics/p5-feedgnuplot/Makefile
index 2f59d4f3b227..2581d0f3468d 100644
--- a/graphics/p5-feedgnuplot/Makefile
+++ b/graphics/p5-feedgnuplot/Makefile
@@ -20,6 +20,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \
USES= perl5
USE_PERL5= configure
-PLIST_FILES= bin/feedgnuplot man/man1/feedgnuplot.1.gz
+PLIST_FILES= bin/feedgnuplot ${SITE_MAN1}/feedgnuplot.1.gz
.include <bsd.port.mk>
diff --git a/graphics/renrot/pkg-plist b/graphics/renrot/pkg-plist
index ed1365db0480..07ca807934e0 100644
--- a/graphics/renrot/pkg-plist
+++ b/graphics/renrot/pkg-plist
@@ -3,7 +3,7 @@ bin/renrot
@sample etc/renrot/copyright.tag.sample
@sample etc/renrot/renrot.conf.sample
@sample etc/renrot/tags.conf.sample
-man/man1/renrot.1.gz
+%%PERL5_MAN1%%/renrot.1.gz
%%SITE_PERL%%/Image/RenRot/Config.pm
%%SITE_PERL%%/Image/RenRot/FileUtil.pm
%%SITE_PERL%%/Image/RenRot/Logging.pm
diff --git a/irc/nethirc/pkg-plist b/irc/nethirc/pkg-plist
index 04044b781e55..21c012701d1e 100644
--- a/irc/nethirc/pkg-plist
+++ b/irc/nethirc/pkg-plist
@@ -19,4 +19,4 @@ bin/nethirc.pl
%%SITE_PERL%%/NetHirc/Util.pm
%%SITE_PERL%%/NetHirc.pm
%%PERL5_MAN3%%/NetHirc.3.gz
-man/man1/nethirc.pl.1.gz
+%%PERL5_MAN1%%/nethirc.pl.1.gz
diff --git a/irc/p5-POE-Component-IRC-Plugin-Hailo/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-Hailo/pkg-plist
index 6c18f99fc7f7..05b8edf31f8f 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Hailo/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-Hailo/pkg-plist
@@ -1,4 +1,4 @@
bin/irchailo-seed
-man/man1/irchailo-seed.1.gz
+%%PERL5_MAN1%%/irchailo-seed.1.gz
%%SITE_PERL%%/POE/Component/IRC/Plugin/Hailo.pm
%%PERL5_MAN3%%/POE::Component::IRC::Plugin::Hailo.3.gz
diff --git a/irc/p5-POE-Component-Server-IRC/pkg-plist b/irc/p5-POE-Component-Server-IRC/pkg-plist
index 90fcc8ff9354..e841cc5ddce0 100644
--- a/irc/p5-POE-Component-Server-IRC/pkg-plist
+++ b/irc/p5-POE-Component-Server-IRC/pkg-plist
@@ -1,5 +1,5 @@
bin/pmkpasswd
-man/man1/pmkpasswd.1.gz
+%%PERL5_MAN1%%/pmkpasswd.1.gz
%%SITE_PERL%%/POE/Component/Server/IRC.pm
%%SITE_PERL%%/POE/Component/Server/IRC/Common.pm
%%SITE_PERL%%/POE/Component/Server/IRC/Plugin.pm
diff --git a/japanese/p5-Unicode-Japanese/pkg-plist b/japanese/p5-Unicode-Japanese/pkg-plist
index ae495f66dc88..65bec42d9071 100644
--- a/japanese/p5-Unicode-Japanese/pkg-plist
+++ b/japanese/p5-Unicode-Japanese/pkg-plist
@@ -6,5 +6,5 @@ bin/ujguess
%%SITE_ARCH%%/auto/Unicode/Japanese/Japanese.so
%%PERL5_MAN3%%/Unicode::Japanese.3.gz
%%PERL5_MAN3%%/Unicode::Japanese::JA.3.gz
-man/man1/ujconv.1.gz
-man/man1/ujguess.1.gz
+%%PERL5_MAN1%%/ujconv.1.gz
+%%PERL5_MAN1%%/ujguess.1.gz
diff --git a/japanese/p5-WWW-MobileCarrierJP/pkg-plist b/japanese/p5-WWW-MobileCarrierJP/pkg-plist
index 204a4a7d42fe..7953447a99c5 100644
--- a/japanese/p5-WWW-MobileCarrierJP/pkg-plist
+++ b/japanese/p5-WWW-MobileCarrierJP/pkg-plist
@@ -49,4 +49,4 @@ bin/www-mobilecarrierjp-dump_all.pl
%%PERL5_MAN3%%/WWW::MobileCarrierJP::Softbank::PictogramInfo.3.gz
%%PERL5_MAN3%%/WWW::MobileCarrierJP::Softbank::Service.3.gz
%%PERL5_MAN3%%/WWW::MobileCarrierJP::ThirdForce::UserAgent.3.gz
-man/man1/www-mobilecarrierjp-dump_all.pl.1.gz
+%%PERL5_MAN1%%/www-mobilecarrierjp-dump_all.pl.1.gz
diff --git a/lang/p5-JavaScript-Squish/pkg-plist b/lang/p5-JavaScript-Squish/pkg-plist
index eab3bb4f2f98..bb52a66b2a95 100644
--- a/lang/p5-JavaScript-Squish/pkg-plist
+++ b/lang/p5-JavaScript-Squish/pkg-plist
@@ -1,4 +1,4 @@
bin/js_compactor
%%PERL5_MAN3%%/JavaScript::Squish.3.gz
%%SITE_PERL%%/JavaScript/Squish.pm
-man/man1/js_compactor.1.gz
+%%PERL5_MAN1%%/js_compactor.1.gz
diff --git a/lang/p5-Pugs-Compiler-Rule/pkg-plist b/lang/p5-Pugs-Compiler-Rule/pkg-plist
index 69077589cc55..a349d24a53c4 100644
--- a/lang/p5-Pugs-Compiler-Rule/pkg-plist
+++ b/lang/p5-Pugs-Compiler-Rule/pkg-plist
@@ -36,4 +36,4 @@ bin/compile_p6grammar.pl
%%SITE_PERL%%/Pugs/Runtime/Rule.pm
%%SITE_PERL%%/Pugs/Runtime/StrPos.pm
%%SITE_PERL%%/Pugs/Runtime/Tracer.pm
-man/man1/compile_p6grammar.pl.1.gz
+%%PERL5_MAN1%%/compile_p6grammar.pl.1.gz
diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile
index 014b6c598a85..82ec21ae0043 100644
--- a/lang/perl5-devel/Makefile
+++ b/lang/perl5-devel/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= perl
-PORTREVISION= 0
+PORTREVISION= 1
# XXX Remove second line, uncomment first
#DISTVERSION= ${PERL_VERSION}
DISTVERSION= ${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//}
@@ -22,8 +22,6 @@ LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/Artistic
LICENSE_FILE_GPLv1= ${WRKSRC}/Copying
-CONFLICTS_INSTALL= perl5.*-*
-
# XXX Remove github things.
USE_GITHUB= yes
GH_ACCOUNT= Perl
@@ -73,9 +71,11 @@ SITE_PERL_REL?= lib/perl5/site_perl
SITE_PERL?= ${PREFIX}/${SITE_PERL_REL}
SITE_ARCH_REL?= ${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}
SITE_ARCH?= ${PREFIX}/${SITE_ARCH_REL}
-SITE_MAN3_PREFIX= ${SITE_PERL_REL}
-SITE_MAN3_REL?= ${SITE_MAN3_PREFIX}/man/man3
+SITE_MAN_PREFIX= ${SITE_PERL_REL}
+SITE_MAN3_REL?= ${SITE_MAN_PREFIX}/man/man3
SITE_MAN3?= ${PREFIX}/${SITE_MAN3_REL}
+SITE_MAN1_REL?= ${SITE_MAN_PREFIX}/man/man1
+SITE_MAN1?= ${PREFIX}/${SITE_MAN1_REL}
_PRIV_LIB= lib/perl5/${PERL_VER}
_ARCH_LIB= ${_PRIV_LIB}/${PERL_ARCH}
@@ -89,12 +89,12 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \
-Dlibperl=libperl.so.${PORTVERSION} \
-Darchlib=${PREFIX}/${_ARCH_LIB} \
-Dprivlib=${PREFIX}/${_PRIV_LIB} \
- -Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \
- -Dman1dir=${PREFIX}/man/man1 \
+ -Dman3dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man3 \
+ -Dman1dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man1 \
-Dsitearch=${SITE_ARCH} \
-Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \
-Dsiteman3dir=${SITE_MAN3} \
- -Dsiteman1dir=${PREFIX}/man/man1 \
+ -Dsiteman1dir=${SITE_MAN1} \
-Ui_malloc -Ui_iconv -Uinstallusrbinperl -Dusenm=n \
-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
-Dcf_by=${MAINTAINER:C,@.*,,} -Dcf_email=${MAINTAINER} \
@@ -120,11 +120,11 @@ SUB_LIST+= PERL_VERSION=${PERL_VERSION} \
PERL_VER=${PERL_VER} \
SITE_PERL=${SITE_PERL_REL} \
PRIV_LIB=${_PRIV_LIB} \
- MAN3PREFIX=${MAN3PREFIX_REL} \
- SITEMAN3PREFIX=${SITE_MAN3_PREFIX} \
+ PERLMANPREFIX=${PERLMANPREFIX_REL} \
+ SITEMANPREFIX=${SITE_MAN_PREFIX} \
PERL_ARCH=${PERL_ARCH}
-SUB_FILES= perl5_version perl-man.conf
+SUB_FILES= perl-man.conf
INSTALL_TARGET= install-strip
@@ -145,28 +145,33 @@ CONFIGURE_ARGS+= \
-Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ}
.endif
-MAN3PREFIX_REL= ${_PRIV_LIB}/perl
-MAN3PREFIX= ${PREFIX}/${MAN3PREFIX_REL}
-MANDIRS+= ${MAN3PREFIX}/man
+PERLMANPREFIX_REL= ${_PRIV_LIB}/perl
+PERLMANPREFIX= ${PREFIX}/${PERLMANPREFIX_REL}
+MANDIRS+= ${PERLMANPREFIX}/man
PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
PERL_VER=${PERL_VER} \
PERL_ARCH=${PERL_ARCH} \
- MAN3=${MAN3PREFIX_REL}/man/man3 \
- MAN3PREFIX=${MAN3PREFIX_REL} \
- SITEMAN3PREFIX=${SITE_MAN3_PREFIX} \
+ MAN1=${PERLMANPREFIX_REL}/man/man1 \
+ MAN3=${PERLMANPREFIX_REL}/man/man3 \
+ PERLMANPREFIX=${PERLMANPREFIX_REL} \
+ SITEMANPREFIX=${SITE_MAN_PREFIX} \
SITE_PERL=${SITE_PERL_REL} \
SITE_ARCH=${SITE_ARCH_REL} \
PRIV_LIB=${_PRIV_LIB} \
ARCH_LIB=${_ARCH_LIB}
PLIST_SUB+= PORTVERSION=${PORTVERSION} # XXX Remove
+# bsd.default-versions.mk needs to know LOCALBASE for Perl, so
+# bsd.port.options.mk is needed before including it.
+.include <bsd.port.options.mk>
.include "${.CURDIR}/../../Mk/bsd.default-versions.mk"
# if this port is default due PERL5_DEFAULT
# change PKGNAME to reflect this
.if ${PERL_VER} == ${PERL5_DEFAULT} || ${PERL5_DEFAULT} == devel # XXX Remove devel case
PKGNAMESUFFIX= 5
+IAMDEFAULTPERL= yes
.else
# make PKGNAME unique among other lang/perl5.x
.if defined(GH_TAGNAME) # XXX remove if, leave only the else.
@@ -174,13 +179,42 @@ PKGNAMESUFFIX= 5-devel
.else
PKGNAMESUFFIX= ${PERL_VER}
.endif
-# always add default perl5 pkgname to conflicts
-CONFLICTS_INSTALL+= perl5-*
+.endif
+
+# Am I building the default Perl ?
+.if defined(IAMDEFAULTPERL)
+PLIST_SUB+= DEFAULT="" BINSUFFIX=""
+.else
+BINSUFFIX= ${PERL_VERSION}
+PLIST_SUB+= DEFAULT="@comment " BINSUFFIX=${PERL_VERSION}
+CONFIGURE_ARGS+=-Dversiononly
+.endif
+
+.if !defined(IAMDEFAULTPERL)
+pre-everything::
+ @${ECHO_MSG} "##################################################"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} " This is *NOT* the DEFAULT perl version"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "It will *NOT* install ${PREFIX}/bin/perl"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "It will *ONLY* install ${PREFIX}/bin/perl${PERL_VERSION}"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "The default Perl version currently is ${PERL5_DEFAULT}."
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "If you want to use this version as the default,"
+ @${ECHO_MSG} "stop the build now, add this line to your"
+ @${ECHO_MSG} "/etc/make.conf, and then restart the build."
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "DEFAULT_VERSIONS+=perl5=${PERL_VER}"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "##################################################"
+.if !(defined(PACKAGE_BUILDING) || defined(BATCH))
+ @sleep 30
+. endif
.endif
# XXX Remove this
-# No need to spam logs, or make me wait
-.if !defined(PACKAGE_BUILDING) && !defined(PERL_DEV_SHUT_UP)
pre-everything::
@${ECHO_MSG} "########################################"
@${ECHO_MSG} ""
@@ -195,6 +229,8 @@ pre-everything::
@${ECHO_MSG} " You have been warned !"
@${ECHO_MSG} ""
@${ECHO_MSG} "########################################"
+# No need to make me, or the package builders, wait
+.if !(defined(PACKAGE_BUILDING) || defined(PERL_DEV_SHUT_UP) || defined(BATCH))
@sleep 30
.endif
@@ -208,6 +244,11 @@ post-extract:
post-patch:
${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
+.if !defined(IAMDEFAULTPERL)
+ ${REINPLACE_CMD} -e '/do_installprivlib = 0 if .versiononly/d; \
+ /^if.*nopods.*versiononly || /s/.*/if (1) {/' \
+ ${WRKSRC}/installperl
+.endif
post-patch-PTHREAD-on:
${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lpthread|g;' \
${WRKSRC}/hints/freebsd.sh
@@ -217,7 +258,7 @@ post-patch-PTHREAD-off:
.endif # MAKING_PATCHES
post-install:
- ${MKDIR} ${STAGEDIR}${SITE_MAN3}
+ ${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3}
${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto
${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5
@@ -226,14 +267,12 @@ post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
# XXX Remove the ECHO_CMD
# Force PERL_PORT in case the devel has the same version as the latest release
- ${ECHO_CMD} "PERL_PORT= perl5-devel" >> ${WRKDIR}/perl5_version
- ${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc
${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine
${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys
# h2ph needs perl, but perl is not installed, it's only
# staged, so, use the one in WRKDIR
(cd /usr/include && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
- ${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph \
+ ${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph${BINSUFFIX} \
-d ${STAGEDIR}${SITE_ARCH} *.h machine/*.h sys/*.h >/dev/null)
@${FIND} ${STAGEDIR}${SITE_ARCH} -name '*.ph' | sed -e 's|${STAGEDIR}||' >> ${TMPPLIST}
${FIND} ${STAGEDIR} -name '*.so*' -type f | while read f; \
diff --git a/lang/perl5-devel/files/perl-man.conf.in b/lang/perl5-devel/files/perl-man.conf.in
index 441fc5d4c44c..69fee5f683e0 100644
--- a/lang/perl5-devel/files/perl-man.conf.in
+++ b/lang/perl5-devel/files/perl-man.conf.in
@@ -1,2 +1,2 @@
MANPATH %%PREFIX%%/%%SITEMAN3PREFIX%%/man
-MANPATH %%PREFIX%%/%%MAN3PREFIX%%/man
+MANPATH %%PREFIX%%/%%PERLMANPREFIX%%/man
diff --git a/lang/perl5-devel/files/perl5_version.in b/lang/perl5-devel/files/perl5_version.in
deleted file mode 100644
index 97e1f75dfb9f..000000000000
--- a/lang/perl5-devel/files/perl5_version.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# Do not modify PERL_VERSION here, instead use DEFAULT_VERSIONS= perl5=%%PERL_VER%%
-PERL_VERSION=%%PERL_VERSION%%
diff --git a/lang/perl5-devel/pkg-plist b/lang/perl5-devel/pkg-plist
index 593e17954b81..25df4425b43b 100644
--- a/lang/perl5-devel/pkg-plist
+++ b/lang/perl5-devel/pkg-plist
@@ -1,39 +1,38 @@
-bin/c2ph
-bin/corelist
-bin/cpan
-bin/enc2xs
-bin/encguess
-bin/h2ph
-bin/h2xs
-bin/instmodsh
-bin/json_pp
-bin/libnetcfg
-bin/perl
-bin/perl5
+bin/c2ph%%BINSUFFIX%%
+bin/corelist%%BINSUFFIX%%
+bin/cpan%%BINSUFFIX%%
+bin/enc2xs%%BINSUFFIX%%
+bin/encguess%%BINSUFFIX%%
+bin/h2ph%%BINSUFFIX%%
+bin/h2xs%%BINSUFFIX%%
+bin/instmodsh%%BINSUFFIX%%
+bin/json_pp%%BINSUFFIX%%
+bin/libnetcfg%%BINSUFFIX%%
+%%DEFAULT%%bin/perl
+%%DEFAULT%%bin/perl5
bin/perl%%PERL_VERSION%%
-bin/perlbug
-bin/perldoc
-bin/perlivp
-bin/perlthanks
-bin/piconv
-bin/pl2pm
-bin/pod2html
-bin/pod2man
-bin/pod2text
-bin/pod2usage
-bin/podchecker
-bin/podselect
-bin/prove
-bin/pstruct
-bin/ptar
-bin/ptardiff
-bin/ptargrep
-bin/shasum
-bin/splain
-bin/xsubpp
-bin/zipdetails
+bin/perlbug%%BINSUFFIX%%
+bin/perldoc%%BINSUFFIX%%
+bin/perlivp%%BINSUFFIX%%
+bin/perlthanks%%BINSUFFIX%%
+bin/piconv%%BINSUFFIX%%
+bin/pl2pm%%BINSUFFIX%%
+bin/pod2html%%BINSUFFIX%%
+bin/pod2man%%BINSUFFIX%%
+bin/pod2text%%BINSUFFIX%%
+bin/pod2usage%%BINSUFFIX%%
+bin/podchecker%%BINSUFFIX%%
+bin/podselect%%BINSUFFIX%%
+bin/prove%%BINSUFFIX%%
+bin/pstruct%%BINSUFFIX%%
+bin/ptar%%BINSUFFIX%%
+bin/ptardiff%%BINSUFFIX%%
+bin/ptargrep%%BINSUFFIX%%
+bin/shasum%%BINSUFFIX%%
+bin/splain%%BINSUFFIX%%
+bin/xsubpp%%BINSUFFIX%%
+bin/zipdetails%%BINSUFFIX%%
etc/man.d/perl%%PERL_VER%%.conf
-etc/perl5_version
%%PRIV_LIB%%/AnyDBM_File.pm
%%PRIV_LIB%%/App/Cpan.pm
%%PRIV_LIB%%/App/Prove.pm
@@ -2079,226 +2078,227 @@ etc/perl5_version
%%PRIV_LIB%%/vmsish.pm
%%PRIV_LIB%%/warnings.pm
%%PRIV_LIB%%/warnings/register.pm
-man/man1/c2ph.1.gz
-man/man1/corelist.1.gz
-man/man1/cpan.1.gz
-man/man1/enc2xs.1.gz
-man/man1/encguess.1.gz
-man/man1/h2ph.1.gz
-man/man1/h2xs.1.gz
-man/man1/instmodsh.1.gz
-man/man1/json_pp.1.gz
-man/man1/libnetcfg.1.gz
-man/man1/perl.1.gz
-man/man1/perl5004delta.1.gz
-man/man1/perl5005delta.1.gz
-man/man1/perl5100delta.1.gz
-man/man1/perl5101delta.1.gz
-man/man1/perl5120delta.1.gz
-man/man1/perl5121delta.1.gz
-man/man1/perl5122delta.1.gz
-man/man1/perl5123delta.1.gz
-man/man1/perl5124delta.1.gz
-man/man1/perl5125delta.1.gz
-man/man1/perl5140delta.1.gz
-man/man1/perl5141delta.1.gz
-man/man1/perl5142delta.1.gz
-man/man1/perl5143delta.1.gz
-man/man1/perl5144delta.1.gz
-man/man1/perl5160delta.1.gz
-man/man1/perl5161delta.1.gz
-man/man1/perl5162delta.1.gz
-man/man1/perl5163delta.1.gz
-man/man1/perl5180delta.1.gz
-man/man1/perl5181delta.1.gz
-man/man1/perl5182delta.1.gz
-man/man1/perl5184delta.1.gz
-man/man1/perl5200delta.1.gz
-man/man1/perl5201delta.1.gz
-man/man1/perl5202delta.1.gz
-man/man1/perl5203delta.1.gz
-man/man1/perl5220delta.1.gz
-man/man1/perl5230delta.1.gz
-man/man1/perl5231delta.1.gz
-man/man1/perl5232delta.1.gz
-man/man1/perl5233delta.1.gz
-man/man1/perl561delta.1.gz
-man/man1/perl56delta.1.gz
-man/man1/perl581delta.1.gz
-man/man1/perl582delta.1.gz
-man/man1/perl583delta.1.gz
-man/man1/perl584delta.1.gz
-man/man1/perl585delta.1.gz
-man/man1/perl586delta.1.gz
-man/man1/perl587delta.1.gz
-man/man1/perl588delta.1.gz
-man/man1/perl589delta.1.gz
-man/man1/perl58delta.1.gz
-man/man1/perlaix.1.gz
-man/man1/perlamiga.1.gz
-man/man1/perlandroid.1.gz
-man/man1/perlapi.1.gz
-man/man1/perlapio.1.gz
-man/man1/perlartistic.1.gz
-man/man1/perlbook.1.gz
-man/man1/perlboot.1.gz
-man/man1/perlbot.1.gz
-man/man1/perlbs2000.1.gz
-man/man1/perlbug.1.gz
-man/man1/perlcall.1.gz
-man/man1/perlce.1.gz
-man/man1/perlcheat.1.gz
-man/man1/perlclib.1.gz
-man/man1/perlcn.1.gz
-man/man1/perlcommunity.1.gz
-man/man1/perlcygwin.1.gz
-man/man1/perldata.1.gz
-man/man1/perldbmfilter.1.gz
-man/man1/perldebguts.1.gz
-man/man1/perldebtut.1.gz
-man/man1/perldebug.1.gz
-man/man1/perldelta.1.gz
-man/man1/perldiag.1.gz
-man/man1/perldoc.1.gz
-man/man1/perldos.1.gz
-man/man1/perldsc.1.gz
-man/man1/perldtrace.1.gz
-man/man1/perlebcdic.1.gz
-man/man1/perlembed.1.gz
-man/man1/perlexperiment.1.gz
-man/man1/perlfaq.1.gz
-man/man1/perlfaq1.1.gz
-man/man1/perlfaq2.1.gz
-man/man1/perlfaq3.1.gz
-man/man1/perlfaq4.1.gz
-man/man1/perlfaq5.1.gz
-man/man1/perlfaq6.1.gz
-man/man1/perlfaq7.1.gz
-man/man1/perlfaq8.1.gz
-man/man1/perlfaq9.1.gz
-man/man1/perlfilter.1.gz
-man/man1/perlfork.1.gz
-man/man1/perlform.1.gz
-man/man1/perlfreebsd.1.gz
-man/man1/perlfunc.1.gz
-man/man1/perlgit.1.gz
-man/man1/perlglossary.1.gz
-man/man1/perlgpl.1.gz
-man/man1/perlguts.1.gz
-man/man1/perlhack.1.gz
-man/man1/perlhacktips.1.gz
-man/man1/perlhacktut.1.gz
-man/man1/perlhaiku.1.gz
-man/man1/perlhist.1.gz
-man/man1/perlhpux.1.gz
-man/man1/perlhurd.1.gz
-man/man1/perlintern.1.gz
-man/man1/perlinterp.1.gz
-man/man1/perlintro.1.gz
-man/man1/perliol.1.gz
-man/man1/perlipc.1.gz
-man/man1/perlirix.1.gz
-man/man1/perlivp.1.gz
-man/man1/perljp.1.gz
-man/man1/perlko.1.gz
-man/man1/perllexwarn.1.gz
-man/man1/perllinux.1.gz
-man/man1/perllocale.1.gz
-man/man1/perllol.1.gz
-man/man1/perlmacos.1.gz
-man/man1/perlmacosx.1.gz
-man/man1/perlmod.1.gz
-man/man1/perlmodinstall.1.gz
-man/man1/perlmodlib.1.gz
-man/man1/perlmodstyle.1.gz
-man/man1/perlmroapi.1.gz
-man/man1/perlnetware.1.gz
-man/man1/perlnewmod.1.gz
-man/man1/perlnumber.1.gz
-man/man1/perlobj.1.gz
-man/man1/perlootut.1.gz
-man/man1/perlop.1.gz
-man/man1/perlopenbsd.1.gz
-man/man1/perlopentut.1.gz
-man/man1/perlos2.1.gz
-man/man1/perlos390.1.gz
-man/man1/perlos400.1.gz
-man/man1/perlpacktut.1.gz
-man/man1/perlperf.1.gz
-man/man1/perlplan9.1.gz
-man/man1/perlpod.1.gz
-man/man1/perlpodspec.1.gz
-man/man1/perlpodstyle.1.gz
-man/man1/perlpolicy.1.gz
-man/man1/perlport.1.gz
-man/man1/perlpragma.1.gz
-man/man1/perlqnx.1.gz
-man/man1/perlre.1.gz
-man/man1/perlreapi.1.gz
-man/man1/perlrebackslash.1.gz
-man/man1/perlrecharclass.1.gz
-man/man1/perlref.1.gz
-man/man1/perlreftut.1.gz
-man/man1/perlreguts.1.gz
-man/man1/perlrepository.1.gz
-man/man1/perlrequick.1.gz
-man/man1/perlreref.1.gz
-man/man1/perlretut.1.gz
-man/man1/perlriscos.1.gz
-man/man1/perlrun.1.gz
-man/man1/perlsec.1.gz
-man/man1/perlsolaris.1.gz
-man/man1/perlsource.1.gz
-man/man1/perlstyle.1.gz
-man/man1/perlsub.1.gz
-man/man1/perlsymbian.1.gz
-man/man1/perlsyn.1.gz
-man/man1/perlsynology.1.gz
-man/man1/perlthanks.1.gz
-man/man1/perlthrtut.1.gz
-man/man1/perltie.1.gz
-man/man1/perltoc.1.gz
-man/man1/perltodo.1.gz
-man/man1/perltooc.1.gz
-man/man1/perltoot.1.gz
-man/man1/perltrap.1.gz
-man/man1/perltru64.1.gz
-man/man1/perltw.1.gz
-man/man1/perlunicode.1.gz
-man/man1/perlunicook.1.gz
-man/man1/perlunifaq.1.gz
-man/man1/perluniintro.1.gz
-man/man1/perluniprops.1.gz
-man/man1/perlunitut.1.gz
-man/man1/perlutil.1.gz
-man/man1/perlvar.1.gz
-man/man1/perlvms.1.gz
-man/man1/perlvos.1.gz
-man/man1/perlwin32.1.gz
-man/man1/perlxs.1.gz
-man/man1/perlxstut.1.gz
-man/man1/perlxstypemap.1.gz
-man/man1/piconv.1.gz
-man/man1/pl2pm.1.gz
-man/man1/pod2html.1.gz
-man/man1/pod2man.1.gz
-man/man1/pod2text.1.gz
-man/man1/pod2usage.1.gz
-man/man1/podchecker.1.gz
-man/man1/podselect.1.gz
-man/man1/prove.1.gz
-man/man1/pstruct.1.gz
-man/man1/ptar.1.gz
-man/man1/ptardiff.1.gz
-man/man1/ptargrep.1.gz
-man/man1/shasum.1.gz
-man/man1/splain.1.gz
-man/man1/xsubpp.1.gz
-man/man1/zipdetails.1.gz
+%%MAN1%%/c2ph.1.gz
+%%MAN1%%/corelist.1.gz
+%%MAN1%%/cpan.1.gz
+%%MAN1%%/enc2xs.1.gz
+%%MAN1%%/encguess.1.gz
+%%MAN1%%/h2ph.1.gz
+%%MAN1%%/h2xs.1.gz
+%%MAN1%%/instmodsh.1.gz
+%%MAN1%%/json_pp.1.gz
+%%MAN1%%/libnetcfg.1.gz
+%%MAN1%%/perl.1.gz
+%%MAN1%%/perl5004delta.1.gz
+%%MAN1%%/perl5005delta.1.gz
+%%MAN1%%/perl5100delta.1.gz
+%%MAN1%%/perl5101delta.1.gz
+%%MAN1%%/perl5120delta.1.gz
+%%MAN1%%/perl5121delta.1.gz
+%%MAN1%%/perl5122delta.1.gz
+%%MAN1%%/perl5123delta.1.gz
+%%MAN1%%/perl5124delta.1.gz
+%%MAN1%%/perl5125delta.1.gz
+%%MAN1%%/perl5140delta.1.gz
+%%MAN1%%/perl5141delta.1.gz
+%%MAN1%%/perl5142delta.1.gz
+%%MAN1%%/perl5143delta.1.gz
+%%MAN1%%/perl5144delta.1.gz
+%%MAN1%%/perl5160delta.1.gz
+%%MAN1%%/perl5161delta.1.gz
+%%MAN1%%/perl5162delta.1.gz
+%%MAN1%%/perl5163delta.1.gz
+%%MAN1%%/perl5180delta.1.gz
+%%MAN1%%/perl5181delta.1.gz
+%%MAN1%%/perl5182delta.1.gz
+%%MAN1%%/perl5184delta.1.gz
+%%MAN1%%/perl5200delta.1.gz
+%%MAN1%%/perl5201delta.1.gz
+%%MAN1%%/perl5202delta.1.gz
+%%MAN1%%/perl5203delta.1.gz
+%%MAN1%%/perl5220delta.1.gz
+%%MAN1%%/perl5230delta.1.gz
+%%MAN1%%/perl5231delta.1.gz
+%%MAN1%%/perl5232delta.1.gz
+%%MAN1%%/perl5233delta.1.gz
+%%MAN1%%/perl561delta.1.gz
+%%MAN1%%/perl56delta.1.gz
+%%MAN1%%/perl581delta.1.gz
+%%MAN1%%/perl582delta.1.gz
+%%MAN1%%/perl583delta.1.gz
+%%MAN1%%/perl584delta.1.gz
+%%MAN1%%/perl585delta.1.gz
+%%MAN1%%/perl586delta.1.gz
+%%MAN1%%/perl587delta.1.gz
+%%MAN1%%/perl588delta.1.gz
+%%MAN1%%/perl589delta.1.gz
+%%MAN1%%/perl58delta.1.gz
+%%MAN1%%/perlaix.1.gz
+%%MAN1%%/perlamiga.1.gz
+%%MAN1%%/perlandroid.1.gz
+%%MAN1%%/perlapi.1.gz
+%%MAN1%%/perlapio.1.gz
+%%MAN1%%/perlartistic.1.gz
+%%MAN1%%/perlbook.1.gz
+%%MAN1%%/perlboot.1.gz
+%%MAN1%%/perlbot.1.gz
+%%MAN1%%/perlbs2000.1.gz
+%%MAN1%%/perlbug.1.gz
+%%MAN1%%/perlcall.1.gz
+%%MAN1%%/perlce.1.gz
+%%MAN1%%/perlcheat.1.gz
+%%MAN1%%/perlclib.1.gz
+%%MAN1%%/perlcn.1.gz
+%%MAN1%%/perlcommunity.1.gz
+%%MAN1%%/perlcygwin.1.gz
+%%MAN1%%/perldata.1.gz
+%%MAN1%%/perldbmfilter.1.gz
+%%MAN1%%/perldebguts.1.gz
+%%MAN1%%/perldebtut.1.gz
+%%MAN1%%/perldebug.1.gz
+%%MAN1%%/perldelta.1.gz
+%%MAN1%%/perldiag.1.gz
+%%MAN1%%/perldoc.1.gz
+%%MAN1%%/perldos.1.gz
+%%MAN1%%/perldsc.1.gz
+%%MAN1%%/perldtrace.1.gz
+%%MAN1%%/perlebcdic.1.gz
+%%MAN1%%/perlembed.1.gz
+%%MAN1%%/perlexperiment.1.gz
+%%MAN1%%/perlfaq.1.gz
+%%MAN1%%/perlfaq1.1.gz
+%%MAN1%%/perlfaq2.1.gz
+%%MAN1%%/perlfaq3.1.gz
+%%MAN1%%/perlfaq4.1.gz
+%%MAN1%%/perlfaq5.1.gz
+%%MAN1%%/perlfaq6.1.gz
+%%MAN1%%/perlfaq7.1.gz
+%%MAN1%%/perlfaq8.1.gz
+%%MAN1%%/perlfaq9.1.gz
+%%MAN1%%/perlfilter.1.gz
+%%MAN1%%/perlfork.1.gz
+%%MAN1%%/perlform.1.gz
+%%MAN1%%/perlfreebsd.1.gz
+%%MAN1%%/perlfunc.1.gz
+%%MAN1%%/perlgit.1.gz
+%%MAN1%%/perlglossary.1.gz
+%%MAN1%%/perlgpl.1.gz
+%%MAN1%%/perlguts.1.gz
+%%MAN1%%/perlhack.1.gz
+%%MAN1%%/perlhacktips.1.gz
+%%MAN1%%/perlhacktut.1.gz
+%%MAN1%%/perlhaiku.1.gz
+%%MAN1%%/perlhist.1.gz
+%%MAN1%%/perlhpux.1.gz
+%%MAN1%%/perlhurd.1.gz
+%%MAN1%%/perlintern.1.gz
+%%MAN1%%/perlinterp.1.gz
+%%MAN1%%/perlintro.1.gz
+%%MAN1%%/perliol.1.gz
+%%MAN1%%/perlipc.1.gz
+%%MAN1%%/perlirix.1.gz
+%%MAN1%%/perlivp.1.gz
+%%MAN1%%/perljp.1.gz
+%%MAN1%%/perlko.1.gz
+%%MAN1%%/perllexwarn.1.gz
+%%MAN1%%/perllinux.1.gz
+%%MAN1%%/perllocale.1.gz
+%%MAN1%%/perllol.1.gz
+%%MAN1%%/perlmacos.1.gz
+%%MAN1%%/perlmacosx.1.gz
+%%MAN1%%/perlmod.1.gz
+%%MAN1%%/perlmodinstall.1.gz
+%%MAN1%%/perlmodlib.1.gz
+%%MAN1%%/perlmodstyle.1.gz
+%%MAN1%%/perlmroapi.1.gz
+%%MAN1%%/perlnetware.1.gz
+%%MAN1%%/perlnewmod.1.gz
+%%MAN1%%/perlnumber.1.gz
+%%MAN1%%/perlobj.1.gz
+%%MAN1%%/perlootut.1.gz
+%%MAN1%%/perlop.1.gz
+%%MAN1%%/perlopenbsd.1.gz
+%%MAN1%%/perlopentut.1.gz
+%%MAN1%%/perlos2.1.gz
+%%MAN1%%/perlos390.1.gz
+%%MAN1%%/perlos400.1.gz
+%%MAN1%%/perlpacktut.1.gz
+%%MAN1%%/perlperf.1.gz
+%%MAN1%%/perlplan9.1.gz
+%%MAN1%%/perlpod.1.gz
+%%MAN1%%/perlpodspec.1.gz
+%%MAN1%%/perlpodstyle.1.gz
+%%MAN1%%/perlpolicy.1.gz
+%%MAN1%%/perlport.1.gz
+%%MAN1%%/perlpragma.1.gz
+%%MAN1%%/perlqnx.1.gz
+%%MAN1%%/perlre.1.gz
+%%MAN1%%/perlreapi.1.gz
+%%MAN1%%/perlrebackslash.1.gz
+%%MAN1%%/perlrecharclass.1.gz
+%%MAN1%%/perlref.1.gz
+%%MAN1%%/perlreftut.1.gz
+%%MAN1%%/perlreguts.1.gz
+%%MAN1%%/perlrepository.1.gz
+%%MAN1%%/perlrequick.1.gz
+%%MAN1%%/perlreref.1.gz
+%%MAN1%%/perlretut.1.gz
+%%MAN1%%/perlriscos.1.gz
+%%MAN1%%/perlrun.1.gz
+%%MAN1%%/perlsec.1.gz
+%%MAN1%%/perlsolaris.1.gz
+%%MAN1%%/perlsource.1.gz
+%%MAN1%%/perlstyle.1.gz
+%%MAN1%%/perlsub.1.gz
+%%MAN1%%/perlsymbian.1.gz
+%%MAN1%%/perlsyn.1.gz
+%%MAN1%%/perlsynology.1.gz
+%%MAN1%%/perlthanks.1.gz
+%%MAN1%%/perlthrtut.1.gz
+%%MAN1%%/perltie.1.gz
+%%MAN1%%/perltoc.1.gz
+%%MAN1%%/perltodo.1.gz
+%%MAN1%%/perltooc.1.gz
+%%MAN1%%/perltoot.1.gz
+%%MAN1%%/perltrap.1.gz
+%%MAN1%%/perltru64.1.gz
+%%MAN1%%/perltw.1.gz
+%%MAN1%%/perlunicode.1.gz
+%%MAN1%%/perlunicook.1.gz
+%%MAN1%%/perlunifaq.1.gz
+%%MAN1%%/perluniintro.1.gz
+%%MAN1%%/perluniprops.1.gz
+%%MAN1%%/perlunitut.1.gz
+%%MAN1%%/perlutil.1.gz
+%%MAN1%%/perlvar.1.gz
+%%MAN1%%/perlvms.1.gz
+%%MAN1%%/perlvos.1.gz
+%%MAN1%%/perlwin32.1.gz
+%%MAN1%%/perlxs.1.gz
+%%MAN1%%/perlxstut.1.gz
+%%MAN1%%/perlxstypemap.1.gz
+%%MAN1%%/piconv.1.gz
+%%MAN1%%/pl2pm.1.gz
+%%MAN1%%/pod2html.1.gz
+%%MAN1%%/pod2man.1.gz
+%%MAN1%%/pod2text.1.gz
+%%MAN1%%/pod2usage.1.gz
+%%MAN1%%/podchecker.1.gz
+%%MAN1%%/podselect.1.gz
+%%MAN1%%/prove.1.gz
+%%MAN1%%/pstruct.1.gz
+%%MAN1%%/ptar.1.gz
+%%MAN1%%/ptardiff.1.gz
+%%MAN1%%/ptargrep.1.gz
+%%MAN1%%/shasum.1.gz
+%%MAN1%%/splain.1.gz
+%%MAN1%%/xsubpp.1.gz
+%%MAN1%%/zipdetails.1.gz
@dir %%SITE_PERL%%/auto
@dir %%SITE_ARCH%%/auto
+@dir %%SITE_PERL%%/man/man1
@dir %%SITE_PERL%%/man/man3
-@exec makewhatis %D/%%SITEMAN3PREFIX%%/man
-@exec makewhatis %D/%%MAN3PREFIX%%/man
-@rmtry %%MAN3PREFIX%%/man/whatis
-@rmtry %%SITEMAN3PREFIX%%/man/whatis
+@exec makewhatis %D/%%SITEMANPREFIX%%/man
+@exec makewhatis %D/%%PERLMANPREFIX%%/man
+@rmtry %%PERLMANPREFIX%%/man/whatis
+@rmtry %%SITEMANPREFIX%%/man/whatis
diff --git a/lang/perl5-devel/version.mk b/lang/perl5-devel/version.mk
index 6ca99533f738..3722a4d4cc17 100644
--- a/lang/perl5-devel/version.mk
+++ b/lang/perl5-devel/version.mk
@@ -1 +1,2 @@
PERL_VERSION= 5.23.3
+PERL5_DEPEND= perl5>=5.23
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index 1227ebf48af4..d207c4cf5ab2 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -3,7 +3,7 @@
PORTNAME= perl
PORTVERSION= ${PERL_VERSION}
-PORTREVISION= 22
+PORTREVISION= 23
CATEGORIES= lang devel perl5
MASTER_SITES= CPAN/../../src/5.0
DIST_SUBDIR= perl
@@ -19,8 +19,6 @@ LICENSE_FILE_GPLv1= ${WRKSRC}/Copying
DEPRECATED= Unsupported, please upgrade to a more recent version of Perl
EXPIRATION_DATE=2015-12-31
-CONFLICTS_INSTALL= perl5.*-*
-
OPTIONS_DEFINE= DEBUG GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD \
MULTIPLICITY SITECUSTOMIZE USE_PERL
OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD USE_PERL MULTIPLICITY
@@ -44,9 +42,11 @@ SITE_PERL_REL?= lib/perl5/site_perl
SITE_PERL?= ${PREFIX}/${SITE_PERL_REL}
SITE_ARCH_REL?= ${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}
SITE_ARCH?= ${PREFIX}/${SITE_ARCH_REL}
-SITE_MAN3_PREFIX= ${SITE_PERL_REL}
-SITE_MAN3_REL?= ${SITE_MAN3_PREFIX}/man/man3
+SITE_MAN_PREFIX= ${SITE_PERL_REL}
+SITE_MAN3_REL?= ${SITE_MAN_PREFIX}/man/man3
SITE_MAN3?= ${PREFIX}/${SITE_MAN3_REL}
+SITE_MAN1_REL?= ${SITE_MAN_PREFIX}/man/man1
+SITE_MAN1?= ${PREFIX}/${SITE_MAN1_REL}
_PRIV_LIB= lib/perl5/${PERL_VER}
_ARCH_LIB= ${_PRIV_LIB}/${PERL_ARCH}
@@ -58,12 +58,12 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \
-Dlibperl=libperl.so.${PERL_VERSION} \
-Darchlib=${PREFIX}/${_ARCH_LIB} \
-Dprivlib=${PREFIX}/${_PRIV_LIB} \
- -Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \
- -Dman1dir=${PREFIX}/man/man1 \
+ -Dman3dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man3 \
+ -Dman1dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man1 \
-Dsitearch=${SITE_ARCH} \
-Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \
-Dsiteman3dir=${SITE_MAN3} \
- -Dsiteman1dir=${PREFIX}/man/man1 \
+ -Dsiteman1dir=${SITE_MAN1} \
-Dotherlibdirs=${PREFIX}/lib/perl5/site_perl/${PERL_VER}:${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
-Ui_malloc -Ui_iconv -Uinstallusrbinperl -Dusenm=n \
-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
@@ -85,11 +85,11 @@ SUB_LIST+= PERL_VERSION=${PERL_VERSION} \
PERL_VER=${PERL_VER} \
SITE_PERL=${SITE_PERL_REL} \
PRIV_LIB=${_PRIV_LIB} \
- MAN3PREFIX=${MAN3PREFIX_REL} \
- SITEMAN3PREFIX=${SITE_MAN3_PREFIX} \
+ PERLMANPREFIX=${PERLMANPREFIX_REL} \
+ SITEMANPREFIX=${SITE_MAN_PREFIX} \
PERL_ARCH=${PERL_ARCH}
-SUB_FILES= perl5_version use.perl perl-man.conf
+SUB_FILES= use.perl perl-man.conf
PKGINSTALL= ${WRKDIR}/use.perl
PKGDEINSTALL= ${WRKDIR}/use.perl
@@ -102,11 +102,43 @@ INSTALL_TARGET= install-strip
# change PKGNAME to reflect this
.if ${PERL_VER} == ${PERL5_DEFAULT}
PKGNAMESUFFIX= ${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//}
+IAMDEFAULTPERL= yes
.else
# make PKGNAME unique among other lang/perl5.x
PKGNAMESUFFIX= ${PERL_VER}
-# always add default perl5 pkgname to conflicts
-CONFLICTS_INSTALL+= perl5-*
+.endif
+
+# Am I building the default Perl ?
+.if defined(IAMDEFAULTPERL)
+PLIST_SUB+= DEFAULT="" BINSUFFIX=""
+.else
+BINSUFFIX= ${PERL_VERSION}
+PLIST_SUB+= DEFAULT="@comment " BINSUFFIX=${PERL_VERSION}
+CONFIGURE_ARGS+=-Dversiononly
+.endif
+
+.if !defined(IAMDEFAULTPERL)
+pre-everything::
+ @${ECHO_MSG} "##################################################"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} " This is *NOT* the DEFAULT perl version"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "It will *NOT* install ${PREFIX}/bin/perl"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "It will *ONLY* install ${PREFIX}/bin/perl${PERL_VERSION}"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "The default Perl version currently is ${PERL5_DEFAULT}."
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "If you want to use this version as the default,"
+ @${ECHO_MSG} "stop the build now, add this line to your"
+ @${ECHO_MSG} "/etc/make.conf, and then restart the build."
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "DEFAULT_VERSIONS+=perl5=${PERL_VER}"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "##################################################"
+. if !(defined(PACKAGE_BUILDING) || defined(BATCH))
+ @sleep 30
+. endif
.endif
.if defined(PERL_VENDOR_PREFIX)
@@ -126,16 +158,17 @@ CONFIGURE_ARGS+= \
-Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ}
.endif
-MAN3PREFIX_REL= ${_PRIV_LIB}/perl
-MAN3PREFIX= ${PREFIX}/${MAN3PREFIX_REL}
-MANDIRS+= ${MAN3PREFIX}/man
+PERLMANPREFIX_REL= ${_PRIV_LIB}/perl
+PERLMANPREFIX= ${PREFIX}/${PERLMANPREFIX_REL}
+MANDIRS+= ${PERLMANPREFIX}/man
PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
PERL_VER=${PERL_VER} \
PERL_ARCH=${PERL_ARCH} \
- MAN3=${MAN3PREFIX_REL}/man/man3 \
- MAN3PREFIX=${MAN3PREFIX_REL} \
- SITEMAN3PREFIX=${SITE_MAN3_PREFIX} \
+ MAN1=${PERLMANPREFIX_REL}/man/man1 \
+ MAN3=${PERLMANPREFIX_REL}/man/man3 \
+ PERLMANPREFIX=${PERLMANPREFIX_REL} \
+ SITEMANPREFIX=${SITE_MAN_PREFIX} \
SITE_PERL=${SITE_PERL_REL} \
SITE_ARCH=${SITE_ARCH_REL} \
PRIV_LIB=${_PRIV_LIB} \
@@ -204,6 +237,11 @@ post-extract:
post-patch:
${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
+.if !defined(IAMDEFAULTPERL)
+ ${REINPLACE_CMD} -e '/do_installprivlib = 0 if .versiononly/d; \
+ /^if.*nopods.*versiononly || /s/.*/if (1) {/' \
+ ${WRKSRC}/installperl
+.endif
.if ${PORT_OPTIONS:MPTHREAD}
${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lpthread|g;' \
${WRKSRC}/hints/freebsd.sh
@@ -213,21 +251,20 @@ post-patch:
.endif
post-install:
- ${MKDIR} ${STAGEDIR}${SITE_MAN3}
+ ${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3}
${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto
${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5
${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so
${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER}
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
- ${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc
${FIND} ${STAGEDIR} -name '*.bs' -size 0 -delete
${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine
${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys
# h2ph needs perl, but perl is not installed, it's only
# staged, so, use the one in WRKDIR
(cd /usr/include && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
- ${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph \
+ ${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph${BINSUFFIX} \
-d ${STAGEDIR}${SITE_ARCH} *.h machine/*.h sys/*.h >/dev/null)
@${FIND} ${STAGEDIR}${SITE_ARCH} -name '*.ph' | sed -e 's|${STAGEDIR}||' >> ${TMPPLIST}
${FIND} ${STAGEDIR} -name '*.so*' -type f | while read f; \
diff --git a/lang/perl5.16/files/perl-man.conf.in b/lang/perl5.16/files/perl-man.conf.in
index 441fc5d4c44c..69fee5f683e0 100644
--- a/lang/perl5.16/files/perl-man.conf.in
+++ b/lang/perl5.16/files/perl-man.conf.in
@@ -1,2 +1,2 @@
MANPATH %%PREFIX%%/%%SITEMAN3PREFIX%%/man
-MANPATH %%PREFIX%%/%%MAN3PREFIX%%/man
+MANPATH %%PREFIX%%/%%PERLMANPREFIX%%/man
diff --git a/lang/perl5.16/files/perl5_version.in b/lang/perl5.16/files/perl5_version.in
deleted file mode 100644
index 97e1f75dfb9f..000000000000
--- a/lang/perl5.16/files/perl5_version.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# Do not modify PERL_VERSION here, instead use DEFAULT_VERSIONS= perl5=%%PERL_VER%%
-PERL_VERSION=%%PERL_VERSION%%
diff --git a/lang/perl5.16/pkg-plist b/lang/perl5.16/pkg-plist
index c1f6171cc07a..d3047198b41a 100644
--- a/lang/perl5.16/pkg-plist
+++ b/lang/perl5.16/pkg-plist
@@ -1,47 +1,46 @@
-bin/a2p
-bin/c2ph
-bin/config_data
-bin/corelist
-bin/cpan
-bin/cpan2dist
-bin/cpanp
-bin/cpanp-run-perl
-bin/enc2xs
-bin/find2perl
-bin/h2ph
-bin/h2xs
-bin/instmodsh
-bin/json_pp
-bin/libnetcfg
-bin/perl
-bin/perl5
+bin/a2p%%BINSUFFIX%%
+bin/c2ph%%BINSUFFIX%%
+bin/config_data%%BINSUFFIX%%
+bin/corelist%%BINSUFFIX%%
+bin/cpan%%BINSUFFIX%%
+bin/cpan2dist%%BINSUFFIX%%
+bin/cpanp%%BINSUFFIX%%
+bin/cpanp-run-perl%%BINSUFFIX%%
+bin/enc2xs%%BINSUFFIX%%
+bin/find2perl%%BINSUFFIX%%
+bin/h2ph%%BINSUFFIX%%
+bin/h2xs%%BINSUFFIX%%
+bin/instmodsh%%BINSUFFIX%%
+bin/json_pp%%BINSUFFIX%%
+bin/libnetcfg%%BINSUFFIX%%
+%%DEFAULT%%bin/perl
+%%DEFAULT%%bin/perl5
bin/perl%%PERL_VERSION%%
-bin/perlbug
-bin/perldoc
-bin/perlivp
-bin/perlthanks
-bin/piconv
-bin/pl2pm
-bin/pod2html
-bin/pod2latex
-bin/pod2man
-bin/pod2text
-bin/pod2usage
-bin/podchecker
-bin/podselect
-bin/prove
-bin/psed
-bin/pstruct
-bin/ptar
-bin/ptardiff
-bin/ptargrep
-bin/s2p
-bin/shasum
-bin/splain
-bin/xsubpp
-bin/zipdetails
+bin/perlbug%%BINSUFFIX%%
+bin/perldoc%%BINSUFFIX%%
+bin/perlivp%%BINSUFFIX%%
+bin/perlthanks%%BINSUFFIX%%
+bin/piconv%%BINSUFFIX%%
+bin/pl2pm%%BINSUFFIX%%
+bin/pod2html%%BINSUFFIX%%
+bin/pod2latex%%BINSUFFIX%%
+bin/pod2man%%BINSUFFIX%%
+bin/pod2text%%BINSUFFIX%%
+bin/pod2usage%%BINSUFFIX%%
+bin/podchecker%%BINSUFFIX%%
+bin/podselect%%BINSUFFIX%%
+bin/prove%%BINSUFFIX%%
+bin/psed%%BINSUFFIX%%
+bin/pstruct%%BINSUFFIX%%
+bin/ptar%%BINSUFFIX%%
+bin/ptardiff%%BINSUFFIX%%
+bin/ptargrep%%BINSUFFIX%%
+bin/s2p%%BINSUFFIX%%
+bin/shasum%%BINSUFFIX%%
+bin/splain%%BINSUFFIX%%
+bin/xsubpp%%BINSUFFIX%%
+bin/zipdetails%%BINSUFFIX%%
etc/man.d/perl%%PERL_VER%%.conf
-etc/perl5_version
%%PRIV_LIB%%/AnyDBM_File.pm
%%PRIV_LIB%%/App/Cpan.pm
%%PRIV_LIB%%/App/Prove.pm
@@ -2640,220 +2639,221 @@ etc/perl5_version
%%PRIV_LIB%%/vmsish.pm
%%PRIV_LIB%%/warnings.pm
%%PRIV_LIB%%/warnings/register.pm
-man/man1/a2p.1.gz
-man/man1/c2ph.1.gz
-man/man1/config_data.1.gz
-man/man1/corelist.1.gz
-man/man1/cpan.1.gz
-man/man1/cpan2dist.1.gz
-man/man1/cpanp.1.gz
-man/man1/enc2xs.1.gz
-man/man1/find2perl.1.gz
-man/man1/h2ph.1.gz
-man/man1/h2xs.1.gz
-man/man1/instmodsh.1.gz
-man/man1/json_pp.1.gz
-man/man1/libnetcfg.1.gz
-man/man1/perl.1.gz
-man/man1/perl5004delta.1.gz
-man/man1/perl5005delta.1.gz
-man/man1/perl5100delta.1.gz
-man/man1/perl5101delta.1.gz
-man/man1/perl5120delta.1.gz
-man/man1/perl5121delta.1.gz
-man/man1/perl5122delta.1.gz
-man/man1/perl5123delta.1.gz
-man/man1/perl5124delta.1.gz
-man/man1/perl5140delta.1.gz
-man/man1/perl5141delta.1.gz
-man/man1/perl5142delta.1.gz
-man/man1/perl5143delta.1.gz
-man/man1/perl5160delta.1.gz
-man/man1/perl5161delta.1.gz
-man/man1/perl5162delta.1.gz
-man/man1/perl5163delta.1.gz
-man/man1/perl561delta.1.gz
-man/man1/perl56delta.1.gz
-man/man1/perl581delta.1.gz
-man/man1/perl582delta.1.gz
-man/man1/perl583delta.1.gz
-man/man1/perl584delta.1.gz
-man/man1/perl585delta.1.gz
-man/man1/perl586delta.1.gz
-man/man1/perl587delta.1.gz
-man/man1/perl588delta.1.gz
-man/man1/perl589delta.1.gz
-man/man1/perl58delta.1.gz
-man/man1/perlaix.1.gz
-man/man1/perlamiga.1.gz
-man/man1/perlapi.1.gz
-man/man1/perlapio.1.gz
-man/man1/perlartistic.1.gz
-man/man1/perlbeos.1.gz
-man/man1/perlbook.1.gz
-man/man1/perlboot.1.gz
-man/man1/perlbot.1.gz
-man/man1/perlbs2000.1.gz
-man/man1/perlbug.1.gz
-man/man1/perlcall.1.gz
-man/man1/perlce.1.gz
-man/man1/perlcheat.1.gz
-man/man1/perlclib.1.gz
-man/man1/perlcn.1.gz
-man/man1/perlcommunity.1.gz
-man/man1/perlcygwin.1.gz
-man/man1/perldata.1.gz
-man/man1/perldbmfilter.1.gz
-man/man1/perldebguts.1.gz
-man/man1/perldebtut.1.gz
-man/man1/perldebug.1.gz
-man/man1/perldelta.1.gz
-man/man1/perldgux.1.gz
-man/man1/perldiag.1.gz
-man/man1/perldoc.1.gz
-man/man1/perldos.1.gz
-man/man1/perldsc.1.gz
-man/man1/perldtrace.1.gz
-man/man1/perlebcdic.1.gz
-man/man1/perlembed.1.gz
-man/man1/perlepoc.1.gz
-man/man1/perlexperiment.1.gz
-man/man1/perlfaq.1.gz
-man/man1/perlfaq1.1.gz
-man/man1/perlfaq2.1.gz
-man/man1/perlfaq3.1.gz
-man/man1/perlfaq4.1.gz
-man/man1/perlfaq5.1.gz
-man/man1/perlfaq6.1.gz
-man/man1/perlfaq7.1.gz
-man/man1/perlfaq8.1.gz
-man/man1/perlfaq9.1.gz
-man/man1/perlfilter.1.gz
-man/man1/perlfork.1.gz
-man/man1/perlform.1.gz
-man/man1/perlfreebsd.1.gz
-man/man1/perlfunc.1.gz
-man/man1/perlgit.1.gz
-man/man1/perlglossary.1.gz
-man/man1/perlgpl.1.gz
-man/man1/perlguts.1.gz
-man/man1/perlhack.1.gz
-man/man1/perlhacktips.1.gz
-man/man1/perlhacktut.1.gz
-man/man1/perlhaiku.1.gz
-man/man1/perlhist.1.gz
-man/man1/perlhpux.1.gz
-man/man1/perlhurd.1.gz
-man/man1/perlintern.1.gz
-man/man1/perlinterp.1.gz
-man/man1/perlintro.1.gz
-man/man1/perliol.1.gz
-man/man1/perlipc.1.gz
-man/man1/perlirix.1.gz
-man/man1/perlivp.1.gz
-man/man1/perljp.1.gz
-man/man1/perlko.1.gz
-man/man1/perllexwarn.1.gz
-man/man1/perllinux.1.gz
-man/man1/perllocale.1.gz
-man/man1/perllol.1.gz
-man/man1/perlmacos.1.gz
-man/man1/perlmacosx.1.gz
-man/man1/perlmod.1.gz
-man/man1/perlmodinstall.1.gz
-man/man1/perlmodlib.1.gz
-man/man1/perlmodstyle.1.gz
-man/man1/perlmpeix.1.gz
-man/man1/perlmroapi.1.gz
-man/man1/perlnetware.1.gz
-man/man1/perlnewmod.1.gz
-man/man1/perlnumber.1.gz
-man/man1/perlobj.1.gz
-man/man1/perlootut.1.gz
-man/man1/perlop.1.gz
-man/man1/perlopenbsd.1.gz
-man/man1/perlopentut.1.gz
-man/man1/perlos2.1.gz
-man/man1/perlos390.1.gz
-man/man1/perlos400.1.gz
-man/man1/perlpacktut.1.gz
-man/man1/perlperf.1.gz
-man/man1/perlplan9.1.gz
-man/man1/perlpod.1.gz
-man/man1/perlpodspec.1.gz
-man/man1/perlpodstyle.1.gz
-man/man1/perlpolicy.1.gz
-man/man1/perlport.1.gz
-man/man1/perlpragma.1.gz
-man/man1/perlqnx.1.gz
-man/man1/perlre.1.gz
-man/man1/perlreapi.1.gz
-man/man1/perlrebackslash.1.gz
-man/man1/perlrecharclass.1.gz
-man/man1/perlref.1.gz
-man/man1/perlreftut.1.gz
-man/man1/perlreguts.1.gz
-man/man1/perlrequick.1.gz
-man/man1/perlreref.1.gz
-man/man1/perlretut.1.gz
-man/man1/perlriscos.1.gz
-man/man1/perlrun.1.gz
-man/man1/perlsec.1.gz
-man/man1/perlsolaris.1.gz
-man/man1/perlsource.1.gz
-man/man1/perlstyle.1.gz
-man/man1/perlsub.1.gz
-man/man1/perlsymbian.1.gz
-man/man1/perlsyn.1.gz
-man/man1/perlthanks.1.gz
-man/man1/perlthrtut.1.gz
-man/man1/perltie.1.gz
-man/man1/perltoc.1.gz
-man/man1/perltodo.1.gz
-man/man1/perltooc.1.gz
-man/man1/perltoot.1.gz
-man/man1/perltrap.1.gz
-man/man1/perltru64.1.gz
-man/man1/perltw.1.gz
-man/man1/perlunicode.1.gz
-man/man1/perlunifaq.1.gz
-man/man1/perluniintro.1.gz
-man/man1/perluniprops.1.gz
-man/man1/perlunitut.1.gz
-man/man1/perlutil.1.gz
-man/man1/perluts.1.gz
-man/man1/perlvar.1.gz
-man/man1/perlvmesa.1.gz
-man/man1/perlvms.1.gz
-man/man1/perlvos.1.gz
-man/man1/perlwin32.1.gz
-man/man1/perlxs.1.gz
-man/man1/perlxstut.1.gz
-man/man1/perlxstypemap.1.gz
-man/man1/piconv.1.gz
-man/man1/pl2pm.1.gz
-man/man1/pod2html.1.gz
-man/man1/pod2latex.1.gz
-man/man1/pod2man.1.gz
-man/man1/pod2text.1.gz
-man/man1/pod2usage.1.gz
-man/man1/podchecker.1.gz
-man/man1/podselect.1.gz
-man/man1/prove.1.gz
-man/man1/psed.1.gz
-man/man1/pstruct.1.gz
-man/man1/ptar.1.gz
-man/man1/ptardiff.1.gz
-man/man1/ptargrep.1.gz
-man/man1/s2p.1.gz
-man/man1/shasum.1.gz
-man/man1/splain.1.gz
-man/man1/xsubpp.1.gz
-man/man1/zipdetails.1.gz
+%%MAN1%%/a2p.1.gz
+%%MAN1%%/c2ph.1.gz
+%%MAN1%%/config_data.1.gz
+%%MAN1%%/corelist.1.gz
+%%MAN1%%/cpan.1.gz
+%%MAN1%%/cpan2dist.1.gz
+%%MAN1%%/cpanp.1.gz
+%%MAN1%%/enc2xs.1.gz
+%%MAN1%%/find2perl.1.gz
+%%MAN1%%/h2ph.1.gz
+%%MAN1%%/h2xs.1.gz
+%%MAN1%%/instmodsh.1.gz
+%%MAN1%%/json_pp.1.gz
+%%MAN1%%/libnetcfg.1.gz
+%%MAN1%%/perl.1.gz
+%%MAN1%%/perl5004delta.1.gz
+%%MAN1%%/perl5005delta.1.gz
+%%MAN1%%/perl5100delta.1.gz
+%%MAN1%%/perl5101delta.1.gz
+%%MAN1%%/perl5120delta.1.gz
+%%MAN1%%/perl5121delta.1.gz
+%%MAN1%%/perl5122delta.1.gz
+%%MAN1%%/perl5123delta.1.gz
+%%MAN1%%/perl5124delta.1.gz
+%%MAN1%%/perl5140delta.1.gz
+%%MAN1%%/perl5141delta.1.gz
+%%MAN1%%/perl5142delta.1.gz
+%%MAN1%%/perl5143delta.1.gz
+%%MAN1%%/perl5160delta.1.gz
+%%MAN1%%/perl5161delta.1.gz
+%%MAN1%%/perl5162delta.1.gz
+%%MAN1%%/perl5163delta.1.gz
+%%MAN1%%/perl561delta.1.gz
+%%MAN1%%/perl56delta.1.gz
+%%MAN1%%/perl581delta.1.gz
+%%MAN1%%/perl582delta.1.gz
+%%MAN1%%/perl583delta.1.gz
+%%MAN1%%/perl584delta.1.gz
+%%MAN1%%/perl585delta.1.gz
+%%MAN1%%/perl586delta.1.gz
+%%MAN1%%/perl587delta.1.gz
+%%MAN1%%/perl588delta.1.gz
+%%MAN1%%/perl589delta.1.gz
+%%MAN1%%/perl58delta.1.gz
+%%MAN1%%/perlaix.1.gz
+%%MAN1%%/perlamiga.1.gz
+%%MAN1%%/perlapi.1.gz
+%%MAN1%%/perlapio.1.gz
+%%MAN1%%/perlartistic.1.gz
+%%MAN1%%/perlbeos.1.gz
+%%MAN1%%/perlbook.1.gz
+%%MAN1%%/perlboot.1.gz
+%%MAN1%%/perlbot.1.gz
+%%MAN1%%/perlbs2000.1.gz
+%%MAN1%%/perlbug.1.gz
+%%MAN1%%/perlcall.1.gz
+%%MAN1%%/perlce.1.gz
+%%MAN1%%/perlcheat.1.gz
+%%MAN1%%/perlclib.1.gz
+%%MAN1%%/perlcn.1.gz
+%%MAN1%%/perlcommunity.1.gz
+%%MAN1%%/perlcygwin.1.gz
+%%MAN1%%/perldata.1.gz
+%%MAN1%%/perldbmfilter.1.gz
+%%MAN1%%/perldebguts.1.gz
+%%MAN1%%/perldebtut.1.gz
+%%MAN1%%/perldebug.1.gz
+%%MAN1%%/perldelta.1.gz
+%%MAN1%%/perldgux.1.gz
+%%MAN1%%/perldiag.1.gz
+%%MAN1%%/perldoc.1.gz
+%%MAN1%%/perldos.1.gz
+%%MAN1%%/perldsc.1.gz
+%%MAN1%%/perldtrace.1.gz
+%%MAN1%%/perlebcdic.1.gz
+%%MAN1%%/perlembed.1.gz
+%%MAN1%%/perlepoc.1.gz
+%%MAN1%%/perlexperiment.1.gz
+%%MAN1%%/perlfaq.1.gz
+%%MAN1%%/perlfaq1.1.gz
+%%MAN1%%/perlfaq2.1.gz
+%%MAN1%%/perlfaq3.1.gz
+%%MAN1%%/perlfaq4.1.gz
+%%MAN1%%/perlfaq5.1.gz
+%%MAN1%%/perlfaq6.1.gz
+%%MAN1%%/perlfaq7.1.gz
+%%MAN1%%/perlfaq8.1.gz
+%%MAN1%%/perlfaq9.1.gz
+%%MAN1%%/perlfilter.1.gz
+%%MAN1%%/perlfork.1.gz
+%%MAN1%%/perlform.1.gz
+%%MAN1%%/perlfreebsd.1.gz
+%%MAN1%%/perlfunc.1.gz
+%%MAN1%%/perlgit.1.gz
+%%MAN1%%/perlglossary.1.gz
+%%MAN1%%/perlgpl.1.gz
+%%MAN1%%/perlguts.1.gz
+%%MAN1%%/perlhack.1.gz
+%%MAN1%%/perlhacktips.1.gz
+%%MAN1%%/perlhacktut.1.gz
+%%MAN1%%/perlhaiku.1.gz
+%%MAN1%%/perlhist.1.gz
+%%MAN1%%/perlhpux.1.gz
+%%MAN1%%/perlhurd.1.gz
+%%MAN1%%/perlintern.1.gz
+%%MAN1%%/perlinterp.1.gz
+%%MAN1%%/perlintro.1.gz
+%%MAN1%%/perliol.1.gz
+%%MAN1%%/perlipc.1.gz
+%%MAN1%%/perlirix.1.gz
+%%MAN1%%/perlivp.1.gz
+%%MAN1%%/perljp.1.gz
+%%MAN1%%/perlko.1.gz
+%%MAN1%%/perllexwarn.1.gz
+%%MAN1%%/perllinux.1.gz
+%%MAN1%%/perllocale.1.gz
+%%MAN1%%/perllol.1.gz
+%%MAN1%%/perlmacos.1.gz
+%%MAN1%%/perlmacosx.1.gz
+%%MAN1%%/perlmod.1.gz
+%%MAN1%%/perlmodinstall.1.gz
+%%MAN1%%/perlmodlib.1.gz
+%%MAN1%%/perlmodstyle.1.gz
+%%MAN1%%/perlmpeix.1.gz
+%%MAN1%%/perlmroapi.1.gz
+%%MAN1%%/perlnetware.1.gz
+%%MAN1%%/perlnewmod.1.gz
+%%MAN1%%/perlnumber.1.gz
+%%MAN1%%/perlobj.1.gz
+%%MAN1%%/perlootut.1.gz
+%%MAN1%%/perlop.1.gz
+%%MAN1%%/perlopenbsd.1.gz
+%%MAN1%%/perlopentut.1.gz
+%%MAN1%%/perlos2.1.gz
+%%MAN1%%/perlos390.1.gz
+%%MAN1%%/perlos400.1.gz
+%%MAN1%%/perlpacktut.1.gz
+%%MAN1%%/perlperf.1.gz
+%%MAN1%%/perlplan9.1.gz
+%%MAN1%%/perlpod.1.gz
+%%MAN1%%/perlpodspec.1.gz
+%%MAN1%%/perlpodstyle.1.gz
+%%MAN1%%/perlpolicy.1.gz
+%%MAN1%%/perlport.1.gz
+%%MAN1%%/perlpragma.1.gz
+%%MAN1%%/perlqnx.1.gz
+%%MAN1%%/perlre.1.gz
+%%MAN1%%/perlreapi.1.gz
+%%MAN1%%/perlrebackslash.1.gz
+%%MAN1%%/perlrecharclass.1.gz
+%%MAN1%%/perlref.1.gz
+%%MAN1%%/perlreftut.1.gz
+%%MAN1%%/perlreguts.1.gz
+%%MAN1%%/perlrequick.1.gz
+%%MAN1%%/perlreref.1.gz
+%%MAN1%%/perlretut.1.gz
+%%MAN1%%/perlriscos.1.gz
+%%MAN1%%/perlrun.1.gz
+%%MAN1%%/perlsec.1.gz
+%%MAN1%%/perlsolaris.1.gz
+%%MAN1%%/perlsource.1.gz
+%%MAN1%%/perlstyle.1.gz
+%%MAN1%%/perlsub.1.gz
+%%MAN1%%/perlsymbian.1.gz
+%%MAN1%%/perlsyn.1.gz
+%%MAN1%%/perlthanks.1.gz
+%%MAN1%%/perlthrtut.1.gz
+%%MAN1%%/perltie.1.gz
+%%MAN1%%/perltoc.1.gz
+%%MAN1%%/perltodo.1.gz
+%%MAN1%%/perltooc.1.gz
+%%MAN1%%/perltoot.1.gz
+%%MAN1%%/perltrap.1.gz
+%%MAN1%%/perltru64.1.gz
+%%MAN1%%/perltw.1.gz
+%%MAN1%%/perlunicode.1.gz
+%%MAN1%%/perlunifaq.1.gz
+%%MAN1%%/perluniintro.1.gz
+%%MAN1%%/perluniprops.1.gz
+%%MAN1%%/perlunitut.1.gz
+%%MAN1%%/perlutil.1.gz
+%%MAN1%%/perluts.1.gz
+%%MAN1%%/perlvar.1.gz
+%%MAN1%%/perlvmesa.1.gz
+%%MAN1%%/perlvms.1.gz
+%%MAN1%%/perlvos.1.gz
+%%MAN1%%/perlwin32.1.gz
+%%MAN1%%/perlxs.1.gz
+%%MAN1%%/perlxstut.1.gz
+%%MAN1%%/perlxstypemap.1.gz
+%%MAN1%%/piconv.1.gz
+%%MAN1%%/pl2pm.1.gz
+%%MAN1%%/pod2html.1.gz
+%%MAN1%%/pod2latex.1.gz
+%%MAN1%%/pod2man.1.gz
+%%MAN1%%/pod2text.1.gz
+%%MAN1%%/pod2usage.1.gz
+%%MAN1%%/podchecker.1.gz
+%%MAN1%%/podselect.1.gz
+%%MAN1%%/prove.1.gz
+%%MAN1%%/psed.1.gz
+%%MAN1%%/pstruct.1.gz
+%%MAN1%%/ptar.1.gz
+%%MAN1%%/ptardiff.1.gz
+%%MAN1%%/ptargrep.1.gz
+%%MAN1%%/s2p.1.gz
+%%MAN1%%/shasum.1.gz
+%%MAN1%%/splain.1.gz
+%%MAN1%%/xsubpp.1.gz
+%%MAN1%%/zipdetails.1.gz
+@dir %%SITE_PERL%%/man/man1
@dir %%SITE_PERL%%/man/man3
@dir %%SITE_PERL%%/auto
@dir %%SITE_ARCH%%/auto
-@exec makewhatis %D/%%SITEMAN3PREFIX%%/man
-@exec makewhatis %D/%%MAN3PREFIX%%/man
-@rmtry %%MAN3PREFIX%%/man/whatis
-@rmtry %%SITEMAN3PREFIX%%/man/whatis
+@exec makewhatis %D/%%SITEMANPREFIX%%/man
+@exec makewhatis %D/%%PERLMANPREFIX%%/man
+@rmtry %%PERLMANPREFIX%%/man/whatis
+@rmtry %%SITEMANPREFIX%%/man/whatis
diff --git a/lang/perl5.16/version.mk b/lang/perl5.16/version.mk
index 67486eedca70..51386756ee79 100644
--- a/lang/perl5.16/version.mk
+++ b/lang/perl5.16/version.mk
@@ -1 +1,2 @@
PERL_VERSION= 5.16.3
+PERL5_DEPEND= perl5>=5.16<5.17
diff --git a/lang/perl5.18/Makefile b/lang/perl5.18/Makefile
index 723d57672d09..22e79cfcb07d 100644
--- a/lang/perl5.18/Makefile
+++ b/lang/perl5.18/Makefile
@@ -3,7 +3,7 @@
PORTNAME= perl
PORTVERSION= ${PERL_VERSION}
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= lang devel perl5
MASTER_SITES= CPAN/../../src/5.0
DIST_SUBDIR= perl
@@ -19,8 +19,6 @@ LICENSE_FILE_GPLv1= ${WRKSRC}/Copying
DEPRECATED= Unsupported, please upgrade to a more recent version of Perl
EXPIRATION_DATE=2016-12-31
-CONFLICTS_INSTALL= perl5.*-*
-
OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \
MULTIPLICITY SITECUSTOMIZE USE_PERL
# it seems perl malloc has problems with threaded perl on FreeBSD
@@ -66,9 +64,11 @@ SITE_PERL_REL?= lib/perl5/site_perl
SITE_PERL?= ${PREFIX}/${SITE_PERL_REL}
SITE_ARCH_REL?= ${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}
SITE_ARCH?= ${PREFIX}/${SITE_ARCH_REL}
-SITE_MAN3_PREFIX= ${SITE_PERL_REL}
-SITE_MAN3_REL?= ${SITE_MAN3_PREFIX}/man/man3
+SITE_MAN_PREFIX= ${SITE_PERL_REL}
+SITE_MAN3_REL?= ${SITE_MAN_PREFIX}/man/man3
SITE_MAN3?= ${PREFIX}/${SITE_MAN3_REL}
+SITE_MAN1_REL?= ${SITE_MAN_PREFIX}/man/man1
+SITE_MAN1?= ${PREFIX}/${SITE_MAN1_REL}
_PRIV_LIB= lib/perl5/${PERL_VER}
_ARCH_LIB= ${_PRIV_LIB}/${PERL_ARCH}
@@ -80,12 +80,12 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \
-Dlibperl=libperl.so.${PERL_VERSION} \
-Darchlib=${PREFIX}/${_ARCH_LIB} \
-Dprivlib=${PREFIX}/${_PRIV_LIB} \
- -Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \
- -Dman1dir=${PREFIX}/man/man1 \
+ -Dman3dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man3 \
+ -Dman1dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man1 \
-Dsitearch=${SITE_ARCH} \
-Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \
-Dsiteman3dir=${SITE_MAN3} \
- -Dsiteman1dir=${PREFIX}/man/man1 \
+ -Dsiteman1dir=${SITE_MAN1} \
-Dotherlibdirs=${PREFIX}/lib/perl5/site_perl/${PERL_VER}:${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
-Ui_malloc -Ui_iconv -Uinstallusrbinperl -Dusenm=n \
-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
@@ -107,27 +107,62 @@ SUB_LIST+= PERL_VERSION=${PERL_VERSION} \
PERL_VER=${PERL_VER} \
SITE_PERL=${SITE_PERL_REL} \
PRIV_LIB=${_PRIV_LIB} \
- MAN3PREFIX=${MAN3PREFIX_REL} \
- SITEMAN3PREFIX=${SITE_MAN3_PREFIX} \
+ PERLMANPREFIX=${PERLMANPREFIX_REL} \
+ SITEMANPREFIX=${SITE_MAN_PREFIX} \
PERL_ARCH=${PERL_ARCH}
-SUB_FILES= perl5_version use.perl perl-man.conf
+SUB_FILES= use.perl perl-man.conf
PKGINSTALL= ${WRKDIR}/use.perl
PKGDEINSTALL= ${WRKDIR}/use.perl
INSTALL_TARGET= install-strip
+# bsd.default-versions.mk needs to know LOCALBASE for Perl, so
+# bsd.port.options.mk is needed before including it.
+.include <bsd.port.options.mk>
.include "${.CURDIR}/../../Mk/bsd.default-versions.mk"
# if this port is default due PERL5_DEFAULT
# change PKGNAME to reflect this
.if ${PERL_VER} == ${PERL5_DEFAULT}
PKGNAMESUFFIX= ${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//}
+IAMDEFAULTPERL= yes
.else
# make PKGNAME unique among other lang/perl5.x
PKGNAMESUFFIX= ${PERL_VER}
-# always add default perl5 pkgname to conflicts
-CONFLICTS_INSTALL+= perl5-*
+.endif
+
+# Am I building the default Perl ?
+.if defined(IAMDEFAULTPERL)
+PLIST_SUB+= DEFAULT="" BINSUFFIX=""
+.else
+BINSUFFIX= ${PERL_VERSION}
+PLIST_SUB+= DEFAULT="@comment " BINSUFFIX=${PERL_VERSION}
+CONFIGURE_ARGS+=-Dversiononly
+.endif
+
+.if !defined(IAMDEFAULTPERL)
+pre-everything::
+ @${ECHO_MSG} "##################################################"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} " This is *NOT* the DEFAULT perl version"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "It will *NOT* install ${PREFIX}/bin/perl"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "It will *ONLY* install ${PREFIX}/bin/perl${PERL_VERSION}"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "The default Perl version currently is ${PERL5_DEFAULT}."
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "If you want to use this version as the default,"
+ @${ECHO_MSG} "stop the build now, add this line to your"
+ @${ECHO_MSG} "/etc/make.conf, and then restart the build."
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "DEFAULT_VERSIONS+=perl5=${PERL_VER}"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "##################################################"
+. if !(defined(PACKAGE_BUILDING) || defined(BATCH))
+ @sleep 30
+. endif
.endif
.if defined(PERL_VENDOR_PREFIX)
@@ -147,16 +182,17 @@ CONFIGURE_ARGS+= \
-Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ}
.endif
-MAN3PREFIX_REL= ${_PRIV_LIB}/perl
-MAN3PREFIX= ${PREFIX}/${MAN3PREFIX_REL}
-MANDIRS+= ${MAN3PREFIX}/man
+PERLMANPREFIX_REL= ${_PRIV_LIB}/perl
+PERLMANPREFIX= ${PREFIX}/${PERLMANPREFIX_REL}
+MANDIRS+= ${PERLMANPREFIX}/man
PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
PERL_VER=${PERL_VER} \
PERL_ARCH=${PERL_ARCH} \
- MAN3=${MAN3PREFIX_REL}/man/man3 \
- MAN3PREFIX=${MAN3PREFIX_REL} \
- SITEMAN3PREFIX=${SITE_MAN3_PREFIX} \
+ MAN1=${PERLMANPREFIX_REL}/man/man1 \
+ MAN3=${PERLMANPREFIX_REL}/man/man3 \
+ PERLMANPREFIX=${PERLMANPREFIX_REL} \
+ SITEMANPREFIX=${SITE_MAN_PREFIX} \
SITE_PERL=${SITE_PERL_REL} \
SITE_ARCH=${SITE_ARCH_REL} \
PRIV_LIB=${_PRIV_LIB} \
@@ -172,6 +208,11 @@ post-extract:
post-patch:
${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
+.if !defined(IAMDEFAULTPERL)
+ ${REINPLACE_CMD} -e '/do_installprivlib = 0 if .versiononly/d; \
+ /^if.*nopods.*versiononly || /s/.*/if (1) {/' \
+ ${WRKSRC}/installperl
+.endif
post-patch-PTHREAD-on:
${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lpthread|g;' \
${WRKSRC}/hints/freebsd.sh
@@ -181,21 +222,20 @@ post-patch-PTHREAD-off:
.endif
post-install:
- ${MKDIR} ${STAGEDIR}${SITE_MAN3}
+ ${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3}
${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto
${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5
${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so
${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER}
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
- ${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc
${FIND} ${STAGEDIR} -name '*.bs' -size 0 -delete
${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine
${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys
# h2ph needs perl, but perl is not installed, it's only
# staged, so, use the one in WRKDIR
(cd /usr/include && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
- ${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph \
+ ${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph${BINSUFFIX} \
-d ${STAGEDIR}${SITE_ARCH} *.h machine/*.h sys/*.h >/dev/null)
@${FIND} ${STAGEDIR}${SITE_ARCH} -name '*.ph' | sed -e 's|${STAGEDIR}||' >> ${TMPPLIST}
${FIND} ${STAGEDIR} -name '*.so*' -type f | while read f; \
diff --git a/lang/perl5.18/files/perl-man.conf.in b/lang/perl5.18/files/perl-man.conf.in
index 441fc5d4c44c..69fee5f683e0 100644
--- a/lang/perl5.18/files/perl-man.conf.in
+++ b/lang/perl5.18/files/perl-man.conf.in
@@ -1,2 +1,2 @@
MANPATH %%PREFIX%%/%%SITEMAN3PREFIX%%/man
-MANPATH %%PREFIX%%/%%MAN3PREFIX%%/man
+MANPATH %%PREFIX%%/%%PERLMANPREFIX%%/man
diff --git a/lang/perl5.18/files/perl5_version.in b/lang/perl5.18/files/perl5_version.in
deleted file mode 100644
index 97e1f75dfb9f..000000000000
--- a/lang/perl5.18/files/perl5_version.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# Do not modify PERL_VERSION here, instead use DEFAULT_VERSIONS= perl5=%%PERL_VER%%
-PERL_VERSION=%%PERL_VERSION%%
diff --git a/lang/perl5.18/pkg-plist b/lang/perl5.18/pkg-plist
index d7c58f0065a8..28d84fe5dc89 100644
--- a/lang/perl5.18/pkg-plist
+++ b/lang/perl5.18/pkg-plist
@@ -1,47 +1,46 @@
-bin/a2p
-bin/c2ph
-bin/config_data
-bin/corelist
-bin/cpan
-bin/cpan2dist
-bin/cpanp
-bin/cpanp-run-perl
-bin/enc2xs
-bin/find2perl
-bin/h2ph
-bin/h2xs
-bin/instmodsh
-bin/json_pp
-bin/libnetcfg
-bin/perl
-bin/perl5
+bin/a2p%%BINSUFFIX%%
+bin/c2ph%%BINSUFFIX%%
+bin/config_data%%BINSUFFIX%%
+bin/corelist%%BINSUFFIX%%
+bin/cpan%%BINSUFFIX%%
+bin/cpan2dist%%BINSUFFIX%%
+bin/cpanp%%BINSUFFIX%%
+bin/cpanp-run-perl%%BINSUFFIX%%
+bin/enc2xs%%BINSUFFIX%%
+bin/find2perl%%BINSUFFIX%%
+bin/h2ph%%BINSUFFIX%%
+bin/h2xs%%BINSUFFIX%%
+bin/instmodsh%%BINSUFFIX%%
+bin/json_pp%%BINSUFFIX%%
+bin/libnetcfg%%BINSUFFIX%%
+%%DEFAULT%%bin/perl
+%%DEFAULT%%bin/perl5
bin/perl%%PERL_VERSION%%
-bin/perlbug
-bin/perldoc
-bin/perlivp
-bin/perlthanks
-bin/piconv
-bin/pl2pm
-bin/pod2html
-bin/pod2latex
-bin/pod2man
-bin/pod2text
-bin/pod2usage
-bin/podchecker
-bin/podselect
-bin/prove
-bin/psed
-bin/pstruct
-bin/ptar
-bin/ptardiff
-bin/ptargrep
-bin/s2p
-bin/shasum
-bin/splain
-bin/xsubpp
-bin/zipdetails
+bin/perlbug%%BINSUFFIX%%
+bin/perldoc%%BINSUFFIX%%
+bin/perlivp%%BINSUFFIX%%
+bin/perlthanks%%BINSUFFIX%%
+bin/piconv%%BINSUFFIX%%
+bin/pl2pm%%BINSUFFIX%%
+bin/pod2html%%BINSUFFIX%%
+bin/pod2latex%%BINSUFFIX%%
+bin/pod2man%%BINSUFFIX%%
+bin/pod2text%%BINSUFFIX%%
+bin/pod2usage%%BINSUFFIX%%
+bin/podchecker%%BINSUFFIX%%
+bin/podselect%%BINSUFFIX%%
+bin/prove%%BINSUFFIX%%
+bin/psed%%BINSUFFIX%%
+bin/pstruct%%BINSUFFIX%%
+bin/ptar%%BINSUFFIX%%
+bin/ptardiff%%BINSUFFIX%%
+bin/ptargrep%%BINSUFFIX%%
+bin/s2p%%BINSUFFIX%%
+bin/shasum%%BINSUFFIX%%
+bin/splain%%BINSUFFIX%%
+bin/xsubpp%%BINSUFFIX%%
+bin/zipdetails%%BINSUFFIX%%
etc/man.d/perl%%PERL_VER%%.conf
-etc/perl5_version
%%PRIV_LIB%%/AnyDBM_File.pm
%%PRIV_LIB%%/App/Cpan.pm
%%PRIV_LIB%%/App/Prove.pm
@@ -2665,223 +2664,224 @@ etc/perl5_version
%%PRIV_LIB%%/vmsish.pm
%%PRIV_LIB%%/warnings.pm
%%PRIV_LIB%%/warnings/register.pm
-man/man1/a2p.1.gz
-man/man1/c2ph.1.gz
-man/man1/config_data.1.gz
-man/man1/corelist.1.gz
-man/man1/cpan.1.gz
-man/man1/cpan2dist.1.gz
-man/man1/cpanp.1.gz
-man/man1/enc2xs.1.gz
-man/man1/find2perl.1.gz
-man/man1/h2ph.1.gz
-man/man1/h2xs.1.gz
-man/man1/instmodsh.1.gz
-man/man1/json_pp.1.gz
-man/man1/libnetcfg.1.gz
-man/man1/perl.1.gz
-man/man1/perl5004delta.1.gz
-man/man1/perl5005delta.1.gz
-man/man1/perl5100delta.1.gz
-man/man1/perl5101delta.1.gz
-man/man1/perl5120delta.1.gz
-man/man1/perl5121delta.1.gz
-man/man1/perl5122delta.1.gz
-man/man1/perl5123delta.1.gz
-man/man1/perl5124delta.1.gz
-man/man1/perl5125delta.1.gz
-man/man1/perl5140delta.1.gz
-man/man1/perl5141delta.1.gz
-man/man1/perl5142delta.1.gz
-man/man1/perl5143delta.1.gz
-man/man1/perl5144delta.1.gz
-man/man1/perl5160delta.1.gz
-man/man1/perl5161delta.1.gz
-man/man1/perl5162delta.1.gz
-man/man1/perl5163delta.1.gz
-man/man1/perl5180delta.1.gz
-man/man1/perl5181delta.1.gz
-man/man1/perl5182delta.1.gz
-man/man1/perl5183delta.1.gz
-man/man1/perl5184delta.1.gz
-man/man1/perl561delta.1.gz
-man/man1/perl56delta.1.gz
-man/man1/perl581delta.1.gz
-man/man1/perl582delta.1.gz
-man/man1/perl583delta.1.gz
-man/man1/perl584delta.1.gz
-man/man1/perl585delta.1.gz
-man/man1/perl586delta.1.gz
-man/man1/perl587delta.1.gz
-man/man1/perl588delta.1.gz
-man/man1/perl589delta.1.gz
-man/man1/perl58delta.1.gz
-man/man1/perlaix.1.gz
-man/man1/perlamiga.1.gz
-man/man1/perlapi.1.gz
-man/man1/perlapio.1.gz
-man/man1/perlartistic.1.gz
-man/man1/perlbook.1.gz
-man/man1/perlboot.1.gz
-man/man1/perlbot.1.gz
-man/man1/perlbs2000.1.gz
-man/man1/perlbug.1.gz
-man/man1/perlcall.1.gz
-man/man1/perlce.1.gz
-man/man1/perlcheat.1.gz
-man/man1/perlclib.1.gz
-man/man1/perlcn.1.gz
-man/man1/perlcommunity.1.gz
-man/man1/perlcygwin.1.gz
-man/man1/perldata.1.gz
-man/man1/perldbmfilter.1.gz
-man/man1/perldebguts.1.gz
-man/man1/perldebtut.1.gz
-man/man1/perldebug.1.gz
-man/man1/perldelta.1.gz
-man/man1/perldgux.1.gz
-man/man1/perldiag.1.gz
-man/man1/perldoc.1.gz
-man/man1/perldos.1.gz
-man/man1/perldsc.1.gz
-man/man1/perldtrace.1.gz
-man/man1/perlebcdic.1.gz
-man/man1/perlembed.1.gz
-man/man1/perlexperiment.1.gz
-man/man1/perlfaq.1.gz
-man/man1/perlfaq1.1.gz
-man/man1/perlfaq2.1.gz
-man/man1/perlfaq3.1.gz
-man/man1/perlfaq4.1.gz
-man/man1/perlfaq5.1.gz
-man/man1/perlfaq6.1.gz
-man/man1/perlfaq7.1.gz
-man/man1/perlfaq8.1.gz
-man/man1/perlfaq9.1.gz
-man/man1/perlfilter.1.gz
-man/man1/perlfork.1.gz
-man/man1/perlform.1.gz
-man/man1/perlfreebsd.1.gz
-man/man1/perlfunc.1.gz
-man/man1/perlgit.1.gz
-man/man1/perlglossary.1.gz
-man/man1/perlgpl.1.gz
-man/man1/perlguts.1.gz
-man/man1/perlhack.1.gz
-man/man1/perlhacktips.1.gz
-man/man1/perlhacktut.1.gz
-man/man1/perlhaiku.1.gz
-man/man1/perlhist.1.gz
-man/man1/perlhpux.1.gz
-man/man1/perlhurd.1.gz
-man/man1/perlintern.1.gz
-man/man1/perlinterp.1.gz
-man/man1/perlintro.1.gz
-man/man1/perliol.1.gz
-man/man1/perlipc.1.gz
-man/man1/perlirix.1.gz
-man/man1/perlivp.1.gz
-man/man1/perljp.1.gz
-man/man1/perlko.1.gz
-man/man1/perllexwarn.1.gz
-man/man1/perllinux.1.gz
-man/man1/perllocale.1.gz
-man/man1/perllol.1.gz
-man/man1/perlmacos.1.gz
-man/man1/perlmacosx.1.gz
-man/man1/perlmod.1.gz
-man/man1/perlmodinstall.1.gz
-man/man1/perlmodlib.1.gz
-man/man1/perlmodstyle.1.gz
-man/man1/perlmroapi.1.gz
-man/man1/perlnetware.1.gz
-man/man1/perlnewmod.1.gz
-man/man1/perlnumber.1.gz
-man/man1/perlobj.1.gz
-man/man1/perlootut.1.gz
-man/man1/perlop.1.gz
-man/man1/perlopenbsd.1.gz
-man/man1/perlopentut.1.gz
-man/man1/perlos2.1.gz
-man/man1/perlos390.1.gz
-man/man1/perlos400.1.gz
-man/man1/perlpacktut.1.gz
-man/man1/perlperf.1.gz
-man/man1/perlplan9.1.gz
-man/man1/perlpod.1.gz
-man/man1/perlpodspec.1.gz
-man/man1/perlpodstyle.1.gz
-man/man1/perlpolicy.1.gz
-man/man1/perlport.1.gz
-man/man1/perlpragma.1.gz
-man/man1/perlqnx.1.gz
-man/man1/perlre.1.gz
-man/man1/perlreapi.1.gz
-man/man1/perlrebackslash.1.gz
-man/man1/perlrecharclass.1.gz
-man/man1/perlref.1.gz
-man/man1/perlreftut.1.gz
-man/man1/perlreguts.1.gz
-man/man1/perlrepository.1.gz
-man/man1/perlrequick.1.gz
-man/man1/perlreref.1.gz
-man/man1/perlretut.1.gz
-man/man1/perlriscos.1.gz
-man/man1/perlrun.1.gz
-man/man1/perlsec.1.gz
-man/man1/perlsolaris.1.gz
-man/man1/perlsource.1.gz
-man/man1/perlstyle.1.gz
-man/man1/perlsub.1.gz
-man/man1/perlsymbian.1.gz
-man/man1/perlsyn.1.gz
-man/man1/perlthanks.1.gz
-man/man1/perlthrtut.1.gz
-man/man1/perltie.1.gz
-man/man1/perltoc.1.gz
-man/man1/perltodo.1.gz
-man/man1/perltooc.1.gz
-man/man1/perltoot.1.gz
-man/man1/perltrap.1.gz
-man/man1/perltru64.1.gz
-man/man1/perltw.1.gz
-man/man1/perlunicode.1.gz
-man/man1/perlunifaq.1.gz
-man/man1/perluniintro.1.gz
-man/man1/perluniprops.1.gz
-man/man1/perlunitut.1.gz
-man/man1/perlutil.1.gz
-man/man1/perlvar.1.gz
-man/man1/perlvms.1.gz
-man/man1/perlvos.1.gz
-man/man1/perlwin32.1.gz
-man/man1/perlxs.1.gz
-man/man1/perlxstut.1.gz
-man/man1/perlxstypemap.1.gz
-man/man1/piconv.1.gz
-man/man1/pl2pm.1.gz
-man/man1/pod2html.1.gz
-man/man1/pod2latex.1.gz
-man/man1/pod2man.1.gz
-man/man1/pod2text.1.gz
-man/man1/pod2usage.1.gz
-man/man1/podchecker.1.gz
-man/man1/podselect.1.gz
-man/man1/prove.1.gz
-man/man1/psed.1.gz
-man/man1/pstruct.1.gz
-man/man1/ptar.1.gz
-man/man1/ptardiff.1.gz
-man/man1/ptargrep.1.gz
-man/man1/s2p.1.gz
-man/man1/shasum.1.gz
-man/man1/splain.1.gz
-man/man1/xsubpp.1.gz
-man/man1/zipdetails.1.gz
+%%MAN1%%/a2p.1.gz
+%%MAN1%%/c2ph.1.gz
+%%MAN1%%/config_data.1.gz
+%%MAN1%%/corelist.1.gz
+%%MAN1%%/cpan.1.gz
+%%MAN1%%/cpan2dist.1.gz
+%%MAN1%%/cpanp.1.gz
+%%MAN1%%/enc2xs.1.gz
+%%MAN1%%/find2perl.1.gz
+%%MAN1%%/h2ph.1.gz
+%%MAN1%%/h2xs.1.gz
+%%MAN1%%/instmodsh.1.gz
+%%MAN1%%/json_pp.1.gz
+%%MAN1%%/libnetcfg.1.gz
+%%MAN1%%/perl.1.gz
+%%MAN1%%/perl5004delta.1.gz
+%%MAN1%%/perl5005delta.1.gz
+%%MAN1%%/perl5100delta.1.gz
+%%MAN1%%/perl5101delta.1.gz
+%%MAN1%%/perl5120delta.1.gz
+%%MAN1%%/perl5121delta.1.gz
+%%MAN1%%/perl5122delta.1.gz
+%%MAN1%%/perl5123delta.1.gz
+%%MAN1%%/perl5124delta.1.gz
+%%MAN1%%/perl5125delta.1.gz
+%%MAN1%%/perl5140delta.1.gz
+%%MAN1%%/perl5141delta.1.gz
+%%MAN1%%/perl5142delta.1.gz
+%%MAN1%%/perl5143delta.1.gz
+%%MAN1%%/perl5144delta.1.gz
+%%MAN1%%/perl5160delta.1.gz
+%%MAN1%%/perl5161delta.1.gz
+%%MAN1%%/perl5162delta.1.gz
+%%MAN1%%/perl5163delta.1.gz
+%%MAN1%%/perl5180delta.1.gz
+%%MAN1%%/perl5181delta.1.gz
+%%MAN1%%/perl5182delta.1.gz
+%%MAN1%%/perl5183delta.1.gz
+%%MAN1%%/perl5184delta.1.gz
+%%MAN1%%/perl561delta.1.gz
+%%MAN1%%/perl56delta.1.gz
+%%MAN1%%/perl581delta.1.gz
+%%MAN1%%/perl582delta.1.gz
+%%MAN1%%/perl583delta.1.gz
+%%MAN1%%/perl584delta.1.gz
+%%MAN1%%/perl585delta.1.gz
+%%MAN1%%/perl586delta.1.gz
+%%MAN1%%/perl587delta.1.gz
+%%MAN1%%/perl588delta.1.gz
+%%MAN1%%/perl589delta.1.gz
+%%MAN1%%/perl58delta.1.gz
+%%MAN1%%/perlaix.1.gz
+%%MAN1%%/perlamiga.1.gz
+%%MAN1%%/perlapi.1.gz
+%%MAN1%%/perlapio.1.gz
+%%MAN1%%/perlartistic.1.gz
+%%MAN1%%/perlbook.1.gz
+%%MAN1%%/perlboot.1.gz
+%%MAN1%%/perlbot.1.gz
+%%MAN1%%/perlbs2000.1.gz
+%%MAN1%%/perlbug.1.gz
+%%MAN1%%/perlcall.1.gz
+%%MAN1%%/perlce.1.gz
+%%MAN1%%/perlcheat.1.gz
+%%MAN1%%/perlclib.1.gz
+%%MAN1%%/perlcn.1.gz
+%%MAN1%%/perlcommunity.1.gz
+%%MAN1%%/perlcygwin.1.gz
+%%MAN1%%/perldata.1.gz
+%%MAN1%%/perldbmfilter.1.gz
+%%MAN1%%/perldebguts.1.gz
+%%MAN1%%/perldebtut.1.gz
+%%MAN1%%/perldebug.1.gz
+%%MAN1%%/perldelta.1.gz
+%%MAN1%%/perldgux.1.gz
+%%MAN1%%/perldiag.1.gz
+%%MAN1%%/perldoc.1.gz
+%%MAN1%%/perldos.1.gz
+%%MAN1%%/perldsc.1.gz
+%%MAN1%%/perldtrace.1.gz
+%%MAN1%%/perlebcdic.1.gz
+%%MAN1%%/perlembed.1.gz
+%%MAN1%%/perlexperiment.1.gz
+%%MAN1%%/perlfaq.1.gz
+%%MAN1%%/perlfaq1.1.gz
+%%MAN1%%/perlfaq2.1.gz
+%%MAN1%%/perlfaq3.1.gz
+%%MAN1%%/perlfaq4.1.gz
+%%MAN1%%/perlfaq5.1.gz
+%%MAN1%%/perlfaq6.1.gz
+%%MAN1%%/perlfaq7.1.gz
+%%MAN1%%/perlfaq8.1.gz
+%%MAN1%%/perlfaq9.1.gz
+%%MAN1%%/perlfilter.1.gz
+%%MAN1%%/perlfork.1.gz
+%%MAN1%%/perlform.1.gz
+%%MAN1%%/perlfreebsd.1.gz
+%%MAN1%%/perlfunc.1.gz
+%%MAN1%%/perlgit.1.gz
+%%MAN1%%/perlglossary.1.gz
+%%MAN1%%/perlgpl.1.gz
+%%MAN1%%/perlguts.1.gz
+%%MAN1%%/perlhack.1.gz
+%%MAN1%%/perlhacktips.1.gz
+%%MAN1%%/perlhacktut.1.gz
+%%MAN1%%/perlhaiku.1.gz
+%%MAN1%%/perlhist.1.gz
+%%MAN1%%/perlhpux.1.gz
+%%MAN1%%/perlhurd.1.gz
+%%MAN1%%/perlintern.1.gz
+%%MAN1%%/perlinterp.1.gz
+%%MAN1%%/perlintro.1.gz
+%%MAN1%%/perliol.1.gz
+%%MAN1%%/perlipc.1.gz
+%%MAN1%%/perlirix.1.gz
+%%MAN1%%/perlivp.1.gz
+%%MAN1%%/perljp.1.gz
+%%MAN1%%/perlko.1.gz
+%%MAN1%%/perllexwarn.1.gz
+%%MAN1%%/perllinux.1.gz
+%%MAN1%%/perllocale.1.gz
+%%MAN1%%/perllol.1.gz
+%%MAN1%%/perlmacos.1.gz
+%%MAN1%%/perlmacosx.1.gz
+%%MAN1%%/perlmod.1.gz
+%%MAN1%%/perlmodinstall.1.gz
+%%MAN1%%/perlmodlib.1.gz
+%%MAN1%%/perlmodstyle.1.gz
+%%MAN1%%/perlmroapi.1.gz
+%%MAN1%%/perlnetware.1.gz
+%%MAN1%%/perlnewmod.1.gz
+%%MAN1%%/perlnumber.1.gz
+%%MAN1%%/perlobj.1.gz
+%%MAN1%%/perlootut.1.gz
+%%MAN1%%/perlop.1.gz
+%%MAN1%%/perlopenbsd.1.gz
+%%MAN1%%/perlopentut.1.gz
+%%MAN1%%/perlos2.1.gz
+%%MAN1%%/perlos390.1.gz
+%%MAN1%%/perlos400.1.gz
+%%MAN1%%/perlpacktut.1.gz
+%%MAN1%%/perlperf.1.gz
+%%MAN1%%/perlplan9.1.gz
+%%MAN1%%/perlpod.1.gz
+%%MAN1%%/perlpodspec.1.gz
+%%MAN1%%/perlpodstyle.1.gz
+%%MAN1%%/perlpolicy.1.gz
+%%MAN1%%/perlport.1.gz
+%%MAN1%%/perlpragma.1.gz
+%%MAN1%%/perlqnx.1.gz
+%%MAN1%%/perlre.1.gz
+%%MAN1%%/perlreapi.1.gz
+%%MAN1%%/perlrebackslash.1.gz
+%%MAN1%%/perlrecharclass.1.gz
+%%MAN1%%/perlref.1.gz
+%%MAN1%%/perlreftut.1.gz
+%%MAN1%%/perlreguts.1.gz
+%%MAN1%%/perlrepository.1.gz
+%%MAN1%%/perlrequick.1.gz
+%%MAN1%%/perlreref.1.gz
+%%MAN1%%/perlretut.1.gz
+%%MAN1%%/perlriscos.1.gz
+%%MAN1%%/perlrun.1.gz
+%%MAN1%%/perlsec.1.gz
+%%MAN1%%/perlsolaris.1.gz
+%%MAN1%%/perlsource.1.gz
+%%MAN1%%/perlstyle.1.gz
+%%MAN1%%/perlsub.1.gz
+%%MAN1%%/perlsymbian.1.gz
+%%MAN1%%/perlsyn.1.gz
+%%MAN1%%/perlthanks.1.gz
+%%MAN1%%/perlthrtut.1.gz
+%%MAN1%%/perltie.1.gz
+%%MAN1%%/perltoc.1.gz
+%%MAN1%%/perltodo.1.gz
+%%MAN1%%/perltooc.1.gz
+%%MAN1%%/perltoot.1.gz
+%%MAN1%%/perltrap.1.gz
+%%MAN1%%/perltru64.1.gz
+%%MAN1%%/perltw.1.gz
+%%MAN1%%/perlunicode.1.gz
+%%MAN1%%/perlunifaq.1.gz
+%%MAN1%%/perluniintro.1.gz
+%%MAN1%%/perluniprops.1.gz
+%%MAN1%%/perlunitut.1.gz
+%%MAN1%%/perlutil.1.gz
+%%MAN1%%/perlvar.1.gz
+%%MAN1%%/perlvms.1.gz
+%%MAN1%%/perlvos.1.gz
+%%MAN1%%/perlwin32.1.gz
+%%MAN1%%/perlxs.1.gz
+%%MAN1%%/perlxstut.1.gz
+%%MAN1%%/perlxstypemap.1.gz
+%%MAN1%%/piconv.1.gz
+%%MAN1%%/pl2pm.1.gz
+%%MAN1%%/pod2html.1.gz
+%%MAN1%%/pod2latex.1.gz
+%%MAN1%%/pod2man.1.gz
+%%MAN1%%/pod2text.1.gz
+%%MAN1%%/pod2usage.1.gz
+%%MAN1%%/podchecker.1.gz
+%%MAN1%%/podselect.1.gz
+%%MAN1%%/prove.1.gz
+%%MAN1%%/psed.1.gz
+%%MAN1%%/pstruct.1.gz
+%%MAN1%%/ptar.1.gz
+%%MAN1%%/ptardiff.1.gz
+%%MAN1%%/ptargrep.1.gz
+%%MAN1%%/s2p.1.gz
+%%MAN1%%/shasum.1.gz
+%%MAN1%%/splain.1.gz
+%%MAN1%%/xsubpp.1.gz
+%%MAN1%%/zipdetails.1.gz
+@dir %%SITE_PERL%%/man/man1
@dir %%SITE_PERL%%/man/man3
@dir %%SITE_PERL%%/auto
@dir %%SITE_ARCH%%/auto
-@exec makewhatis %D/%%SITEMAN3PREFIX%%/man
-@exec makewhatis %D/%%MAN3PREFIX%%/man
-@rmtry %%MAN3PREFIX%%/man/whatis
-@rmtry %%SITEMAN3PREFIX%%/man/whatis
+@exec makewhatis %D/%%SITEMANPREFIX%%/man
+@exec makewhatis %D/%%PERLMANPREFIX%%/man
+@rmtry %%PERLMANPREFIX%%/man/whatis
+@rmtry %%SITEMANPREFIX%%/man/whatis
diff --git a/lang/perl5.18/version.mk b/lang/perl5.18/version.mk
index df0e6b7dff74..e6a8a2457ca6 100644
--- a/lang/perl5.18/version.mk
+++ b/lang/perl5.18/version.mk
@@ -1 +1,2 @@
PERL_VERSION= 5.18.4
+PERL5_DEPEND= perl5>=5.18<5.19
diff --git a/lang/perl5.20/Makefile b/lang/perl5.20/Makefile
index 2a19a9854e97..d16143d8d264 100644
--- a/lang/perl5.20/Makefile
+++ b/lang/perl5.20/Makefile
@@ -3,7 +3,7 @@
PORTNAME= perl
PORTVERSION= ${PERL_VERSION}
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= lang devel perl5
MASTER_SITES= CPAN/../../src/5.0
DIST_SUBDIR= perl
@@ -16,8 +16,6 @@ LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/Artistic
LICENSE_FILE_GPLv1= ${WRKSRC}/Copying
-CONFLICTS_INSTALL= perl5.*-*
-
OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \
MULTIPLICITY SITECUSTOMIZE
# it seems perl malloc has problems with threaded perl on FreeBSD
@@ -60,9 +58,11 @@ SITE_PERL_REL?= lib/perl5/site_perl
SITE_PERL?= ${PREFIX}/${SITE_PERL_REL}
SITE_ARCH_REL?= ${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}
SITE_ARCH?= ${PREFIX}/${SITE_ARCH_REL}
-SITE_MAN3_PREFIX= ${SITE_PERL_REL}
-SITE_MAN3_REL?= ${SITE_MAN3_PREFIX}/man/man3
+SITE_MAN_PREFIX= ${SITE_PERL_REL}
+SITE_MAN3_REL?= ${SITE_MAN_PREFIX}/man/man3
SITE_MAN3?= ${PREFIX}/${SITE_MAN3_REL}
+SITE_MAN1_REL?= ${SITE_MAN_PREFIX}/man/man1
+SITE_MAN1?= ${PREFIX}/${SITE_MAN1_REL}
_PRIV_LIB= lib/perl5/${PERL_VER}
_ARCH_LIB= ${_PRIV_LIB}/${PERL_ARCH}
@@ -74,12 +74,12 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \
-Dlibperl=libperl.so.${PERL_VERSION} \
-Darchlib=${PREFIX}/${_ARCH_LIB} \
-Dprivlib=${PREFIX}/${_PRIV_LIB} \
- -Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \
- -Dman1dir=${PREFIX}/man/man1 \
+ -Dman3dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man3 \
+ -Dman1dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man1 \
-Dsitearch=${SITE_ARCH} \
-Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \
-Dsiteman3dir=${SITE_MAN3} \
- -Dsiteman1dir=${PREFIX}/man/man1 \
+ -Dsiteman1dir=${SITE_MAN1} \
-Ui_malloc -Ui_iconv -Uinstallusrbinperl -Dusenm=n \
-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
-Dcf_by=${MAINTAINER:C,@.*,,} -Dcf_email=${MAINTAINER} \
@@ -104,11 +104,11 @@ SUB_LIST+= PERL_VERSION=${PERL_VERSION} \
PERL_VER=${PERL_VER} \
SITE_PERL=${SITE_PERL_REL} \
PRIV_LIB=${_PRIV_LIB} \
- MAN3PREFIX=${MAN3PREFIX_REL} \
- SITEMAN3PREFIX=${SITE_MAN3_PREFIX} \
+ PERLMANPREFIX=${PERLMANPREFIX_REL} \
+ SITEMANPREFIX=${SITE_MAN_PREFIX} \
PERL_ARCH=${PERL_ARCH}
-SUB_FILES= perl5_version perl-man.conf
+SUB_FILES= perl-man.conf
INSTALL_TARGET= install-strip
@@ -129,34 +129,69 @@ CONFIGURE_ARGS+= \
-Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ}
.endif
-MAN3PREFIX_REL= ${_PRIV_LIB}/perl
-MAN3PREFIX= ${PREFIX}/${MAN3PREFIX_REL}
-MANDIRS+= ${MAN3PREFIX}/man
+PERLMANPREFIX_REL= ${_PRIV_LIB}/perl
+PERLMANPREFIX= ${PREFIX}/${PERLMANPREFIX_REL}
+MANDIRS+= ${PERLMANPREFIX}/man
PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
PERL_VER=${PERL_VER} \
PERL_ARCH=${PERL_ARCH} \
- MAN3=${MAN3PREFIX_REL}/man/man3 \
- MAN3PREFIX=${MAN3PREFIX_REL} \
- SITEMAN3PREFIX=${SITE_MAN3_PREFIX} \
+ MAN1=${PERLMANPREFIX_REL}/man/man1 \
+ MAN3=${PERLMANPREFIX_REL}/man/man3 \
+ PERLMANPREFIX=${PERLMANPREFIX_REL} \
+ SITEMANPREFIX=${SITE_MAN_PREFIX} \
SITE_PERL=${SITE_PERL_REL} \
SITE_ARCH=${SITE_ARCH_REL} \
PRIV_LIB=${_PRIV_LIB} \
ARCH_LIB=${_ARCH_LIB}
+# bsd.default-versions.mk needs to know LOCALBASE for Perl, so
+# bsd.port.options.mk is needed before including it.
+.include <bsd.port.options.mk>
.include "${.CURDIR}/../../Mk/bsd.default-versions.mk"
# if this port is default due PERL5_DEFAULT
# change PKGNAME to reflect this
.if ${PERL_VER} == ${PERL5_DEFAULT}
PKGNAMESUFFIX= ${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//}
+IAMDEFAULTPERL= yes
.else
# make PKGNAME unique among other lang/perl5.x
PKGNAMESUFFIX= ${PERL_VER}
-# always add default perl5 pkgname to conflicts
-CONFLICTS_INSTALL+= perl5-*
.endif
+# Am I building the default Perl ?
+.if defined(IAMDEFAULTPERL)
+PLIST_SUB+= DEFAULT="" BINSUFFIX=""
+.else
+BINSUFFIX= ${PERL_VERSION}
+PLIST_SUB+= DEFAULT="@comment " BINSUFFIX=${PERL_VERSION}
+CONFIGURE_ARGS+=-Dversiononly
+.endif
+
+.if !defined(IAMDEFAULTPERL)
+pre-everything::
+ @${ECHO_MSG} "##################################################"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} " This is *NOT* the DEFAULT perl version"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "It will *NOT* install ${PREFIX}/bin/perl"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "It will *ONLY* install ${PREFIX}/bin/perl${PERL_VERSION}"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "The default Perl version currently is ${PERL5_DEFAULT}."
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "If you want to use this version as the default,"
+ @${ECHO_MSG} "stop the build now, add this line to your"
+ @${ECHO_MSG} "/etc/make.conf, and then restart the build."
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "DEFAULT_VERSIONS+=perl5=${PERL_VER}"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "##################################################"
+. if !(defined(PACKAGE_BUILDING) || defined(BATCH))
+ @sleep 30
+. endif
+.endif
# Put a symlink to the future libperl.so.x.yy so that -lperl works.
post-extract:
@@ -168,6 +203,11 @@ post-extract:
post-patch:
${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
+.if !defined(IAMDEFAULTPERL)
+ ${REINPLACE_CMD} -e '/do_installprivlib = 0 if .versiononly/d; \
+ /^if.*nopods.*versiononly || /s/.*/if (1) {/' \
+ ${WRKSRC}/installperl
+.endif
post-patch-PTHREAD-on:
${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lpthread|g;' \
${WRKSRC}/hints/freebsd.sh
@@ -177,20 +217,19 @@ post-patch-PTHREAD-off:
.endif
post-install:
- ${MKDIR} ${STAGEDIR}${SITE_MAN3}
+ ${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3}
${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto
${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5
${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so
${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER}
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
- ${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc
${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine
${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys
# h2ph needs perl, but perl is not installed, it's only
# staged, so, use the one in WRKDIR
(cd /usr/include && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
- ${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph \
+ ${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph${BINSUFFIX} \
-d ${STAGEDIR}${SITE_ARCH} *.h machine/*.h sys/*.h >/dev/null)
@${FIND} ${STAGEDIR}${SITE_ARCH} -name '*.ph' | sed -e 's|${STAGEDIR}||' >> ${TMPPLIST}
${FIND} ${STAGEDIR} -name '*.so*' -type f | while read f; \
diff --git a/lang/perl5.20/files/perl-man.conf.in b/lang/perl5.20/files/perl-man.conf.in
index 441fc5d4c44c..69fee5f683e0 100644
--- a/lang/perl5.20/files/perl-man.conf.in
+++ b/lang/perl5.20/files/perl-man.conf.in
@@ -1,2 +1,2 @@
MANPATH %%PREFIX%%/%%SITEMAN3PREFIX%%/man
-MANPATH %%PREFIX%%/%%MAN3PREFIX%%/man
+MANPATH %%PREFIX%%/%%PERLMANPREFIX%%/man
diff --git a/lang/perl5.20/files/perl5_version.in b/lang/perl5.20/files/perl5_version.in
deleted file mode 100644
index 97e1f75dfb9f..000000000000
--- a/lang/perl5.20/files/perl5_version.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# Do not modify PERL_VERSION here, instead use DEFAULT_VERSIONS= perl5=%%PERL_VER%%
-PERL_VERSION=%%PERL_VERSION%%
diff --git a/lang/perl5.20/pkg-plist b/lang/perl5.20/pkg-plist
index 8d6d6ab7598f..5dad39f8e99e 100644
--- a/lang/perl5.20/pkg-plist
+++ b/lang/perl5.20/pkg-plist
@@ -1,43 +1,42 @@
-bin/a2p
-bin/c2ph
-bin/config_data
-bin/corelist
-bin/cpan
-bin/enc2xs
-bin/find2perl
-bin/h2ph
-bin/h2xs
-bin/instmodsh
-bin/json_pp
-bin/libnetcfg
-bin/perl
-bin/perl5
+bin/a2p%%BINSUFFIX%%
+bin/c2ph%%BINSUFFIX%%
+bin/config_data%%BINSUFFIX%%
+bin/corelist%%BINSUFFIX%%
+bin/cpan%%BINSUFFIX%%
+bin/enc2xs%%BINSUFFIX%%
+bin/find2perl%%BINSUFFIX%%
+bin/h2ph%%BINSUFFIX%%
+bin/h2xs%%BINSUFFIX%%
+bin/instmodsh%%BINSUFFIX%%
+bin/json_pp%%BINSUFFIX%%
+bin/libnetcfg%%BINSUFFIX%%
+%%DEFAULT%%bin/perl
+%%DEFAULT%%bin/perl5
bin/perl%%PERL_VERSION%%
-bin/perlbug
-bin/perldoc
-bin/perlivp
-bin/perlthanks
-bin/piconv
-bin/pl2pm
-bin/pod2html
-bin/pod2man
-bin/pod2text
-bin/pod2usage
-bin/podchecker
-bin/podselect
-bin/prove
-bin/psed
-bin/pstruct
-bin/ptar
-bin/ptardiff
-bin/ptargrep
-bin/s2p
-bin/shasum
-bin/splain
-bin/xsubpp
-bin/zipdetails
+bin/perlbug%%BINSUFFIX%%
+bin/perldoc%%BINSUFFIX%%
+bin/perlivp%%BINSUFFIX%%
+bin/perlthanks%%BINSUFFIX%%
+bin/piconv%%BINSUFFIX%%
+bin/pl2pm%%BINSUFFIX%%
+bin/pod2html%%BINSUFFIX%%
+bin/pod2man%%BINSUFFIX%%
+bin/pod2text%%BINSUFFIX%%
+bin/pod2usage%%BINSUFFIX%%
+bin/podchecker%%BINSUFFIX%%
+bin/podselect%%BINSUFFIX%%
+bin/prove%%BINSUFFIX%%
+bin/psed%%BINSUFFIX%%
+bin/pstruct%%BINSUFFIX%%
+bin/ptar%%BINSUFFIX%%
+bin/ptardiff%%BINSUFFIX%%
+bin/ptargrep%%BINSUFFIX%%
+bin/s2p%%BINSUFFIX%%
+bin/shasum%%BINSUFFIX%%
+bin/splain%%BINSUFFIX%%
+bin/xsubpp%%BINSUFFIX%%
+bin/zipdetails%%BINSUFFIX%%
etc/man.d/perl%%PERL_VER%%.conf
-etc/perl5_version
%%PRIV_LIB%%/AnyDBM_File.pm
%%PRIV_LIB%%/App/Cpan.pm
%%PRIV_LIB%%/App/Prove.pm
@@ -2040,225 +2039,226 @@ etc/perl5_version
%%PRIV_LIB%%/vmsish.pm
%%PRIV_LIB%%/warnings.pm
%%PRIV_LIB%%/warnings/register.pm
-man/man1/a2p.1.gz
-man/man1/c2ph.1.gz
-man/man1/config_data.1.gz
-man/man1/corelist.1.gz
-man/man1/cpan.1.gz
-man/man1/enc2xs.1.gz
-man/man1/find2perl.1.gz
-man/man1/h2ph.1.gz
-man/man1/h2xs.1.gz
-man/man1/instmodsh.1.gz
-man/man1/json_pp.1.gz
-man/man1/libnetcfg.1.gz
-man/man1/perl.1.gz
-man/man1/perl5004delta.1.gz
-man/man1/perl5005delta.1.gz
-man/man1/perl5100delta.1.gz
-man/man1/perl5101delta.1.gz
-man/man1/perl5120delta.1.gz
-man/man1/perl5121delta.1.gz
-man/man1/perl5122delta.1.gz
-man/man1/perl5123delta.1.gz
-man/man1/perl5124delta.1.gz
-man/man1/perl5125delta.1.gz
-man/man1/perl5140delta.1.gz
-man/man1/perl5141delta.1.gz
-man/man1/perl5142delta.1.gz
-man/man1/perl5143delta.1.gz
-man/man1/perl5144delta.1.gz
-man/man1/perl5160delta.1.gz
-man/man1/perl5161delta.1.gz
-man/man1/perl5162delta.1.gz
-man/man1/perl5163delta.1.gz
-man/man1/perl5180delta.1.gz
-man/man1/perl5181delta.1.gz
-man/man1/perl5182delta.1.gz
-man/man1/perl5184delta.1.gz
-man/man1/perl5200delta.1.gz
-man/man1/perl5201delta.1.gz
-man/man1/perl5202delta.1.gz
-man/man1/perl5203delta.1.gz
-man/man1/perl561delta.1.gz
-man/man1/perl56delta.1.gz
-man/man1/perl581delta.1.gz
-man/man1/perl582delta.1.gz
-man/man1/perl583delta.1.gz
-man/man1/perl584delta.1.gz
-man/man1/perl585delta.1.gz
-man/man1/perl586delta.1.gz
-man/man1/perl587delta.1.gz
-man/man1/perl588delta.1.gz
-man/man1/perl589delta.1.gz
-man/man1/perl58delta.1.gz
-man/man1/perlaix.1.gz
-man/man1/perlamiga.1.gz
-man/man1/perlandroid.1.gz
-man/man1/perlapi.1.gz
-man/man1/perlapio.1.gz
-man/man1/perlartistic.1.gz
-man/man1/perlbook.1.gz
-man/man1/perlboot.1.gz
-man/man1/perlbot.1.gz
-man/man1/perlbs2000.1.gz
-man/man1/perlbug.1.gz
-man/man1/perlcall.1.gz
-man/man1/perlce.1.gz
-man/man1/perlcheat.1.gz
-man/man1/perlclib.1.gz
-man/man1/perlcn.1.gz
-man/man1/perlcommunity.1.gz
-man/man1/perlcygwin.1.gz
-man/man1/perldata.1.gz
-man/man1/perldbmfilter.1.gz
-man/man1/perldebguts.1.gz
-man/man1/perldebtut.1.gz
-man/man1/perldebug.1.gz
-man/man1/perldelta.1.gz
-man/man1/perldiag.1.gz
-man/man1/perldoc.1.gz
-man/man1/perldos.1.gz
-man/man1/perldsc.1.gz
-man/man1/perldtrace.1.gz
-man/man1/perlebcdic.1.gz
-man/man1/perlembed.1.gz
-man/man1/perlexperiment.1.gz
-man/man1/perlfaq.1.gz
-man/man1/perlfaq1.1.gz
-man/man1/perlfaq2.1.gz
-man/man1/perlfaq3.1.gz
-man/man1/perlfaq4.1.gz
-man/man1/perlfaq5.1.gz
-man/man1/perlfaq6.1.gz
-man/man1/perlfaq7.1.gz
-man/man1/perlfaq8.1.gz
-man/man1/perlfaq9.1.gz
-man/man1/perlfilter.1.gz
-man/man1/perlfork.1.gz
-man/man1/perlform.1.gz
-man/man1/perlfreebsd.1.gz
-man/man1/perlfunc.1.gz
-man/man1/perlgit.1.gz
-man/man1/perlglossary.1.gz
-man/man1/perlgpl.1.gz
-man/man1/perlguts.1.gz
-man/man1/perlhack.1.gz
-man/man1/perlhacktips.1.gz
-man/man1/perlhacktut.1.gz
-man/man1/perlhaiku.1.gz
-man/man1/perlhist.1.gz
-man/man1/perlhpux.1.gz
-man/man1/perlhurd.1.gz
-man/man1/perlintern.1.gz
-man/man1/perlinterp.1.gz
-man/man1/perlintro.1.gz
-man/man1/perliol.1.gz
-man/man1/perlipc.1.gz
-man/man1/perlirix.1.gz
-man/man1/perlivp.1.gz
-man/man1/perljp.1.gz
-man/man1/perlko.1.gz
-man/man1/perllexwarn.1.gz
-man/man1/perllinux.1.gz
-man/man1/perllocale.1.gz
-man/man1/perllol.1.gz
-man/man1/perlmacos.1.gz
-man/man1/perlmacosx.1.gz
-man/man1/perlmod.1.gz
-man/man1/perlmodinstall.1.gz
-man/man1/perlmodlib.1.gz
-man/man1/perlmodstyle.1.gz
-man/man1/perlmroapi.1.gz
-man/man1/perlnetware.1.gz
-man/man1/perlnewmod.1.gz
-man/man1/perlnumber.1.gz
-man/man1/perlobj.1.gz
-man/man1/perlootut.1.gz
-man/man1/perlop.1.gz
-man/man1/perlopenbsd.1.gz
-man/man1/perlopentut.1.gz
-man/man1/perlos2.1.gz
-man/man1/perlos390.1.gz
-man/man1/perlos400.1.gz
-man/man1/perlpacktut.1.gz
-man/man1/perlperf.1.gz
-man/man1/perlplan9.1.gz
-man/man1/perlpod.1.gz
-man/man1/perlpodspec.1.gz
-man/man1/perlpodstyle.1.gz
-man/man1/perlpolicy.1.gz
-man/man1/perlport.1.gz
-man/man1/perlpragma.1.gz
-man/man1/perlqnx.1.gz
-man/man1/perlre.1.gz
-man/man1/perlreapi.1.gz
-man/man1/perlrebackslash.1.gz
-man/man1/perlrecharclass.1.gz
-man/man1/perlref.1.gz
-man/man1/perlreftut.1.gz
-man/man1/perlreguts.1.gz
-man/man1/perlrepository.1.gz
-man/man1/perlrequick.1.gz
-man/man1/perlreref.1.gz
-man/man1/perlretut.1.gz
-man/man1/perlriscos.1.gz
-man/man1/perlrun.1.gz
-man/man1/perlsec.1.gz
-man/man1/perlsolaris.1.gz
-man/man1/perlsource.1.gz
-man/man1/perlstyle.1.gz
-man/man1/perlsub.1.gz
-man/man1/perlsymbian.1.gz
-man/man1/perlsyn.1.gz
-man/man1/perlsynology.1.gz
-man/man1/perlthanks.1.gz
-man/man1/perlthrtut.1.gz
-man/man1/perltie.1.gz
-man/man1/perltoc.1.gz
-man/man1/perltodo.1.gz
-man/man1/perltooc.1.gz
-man/man1/perltoot.1.gz
-man/man1/perltrap.1.gz
-man/man1/perltru64.1.gz
-man/man1/perltw.1.gz
-man/man1/perlunicode.1.gz
-man/man1/perlunicook.1.gz
-man/man1/perlunifaq.1.gz
-man/man1/perluniintro.1.gz
-man/man1/perluniprops.1.gz
-man/man1/perlunitut.1.gz
-man/man1/perlutil.1.gz
-man/man1/perlvar.1.gz
-man/man1/perlvms.1.gz
-man/man1/perlvos.1.gz
-man/man1/perlwin32.1.gz
-man/man1/perlxs.1.gz
-man/man1/perlxstut.1.gz
-man/man1/perlxstypemap.1.gz
-man/man1/piconv.1.gz
-man/man1/pl2pm.1.gz
-man/man1/pod2html.1.gz
-man/man1/pod2man.1.gz
-man/man1/pod2text.1.gz
-man/man1/pod2usage.1.gz
-man/man1/podchecker.1.gz
-man/man1/podselect.1.gz
-man/man1/prove.1.gz
-man/man1/psed.1.gz
-man/man1/pstruct.1.gz
-man/man1/ptar.1.gz
-man/man1/ptardiff.1.gz
-man/man1/ptargrep.1.gz
-man/man1/s2p.1.gz
-man/man1/shasum.1.gz
-man/man1/splain.1.gz
-man/man1/xsubpp.1.gz
-man/man1/zipdetails.1.gz
+%%MAN1%%/a2p.1.gz
+%%MAN1%%/c2ph.1.gz
+%%MAN1%%/config_data.1.gz
+%%MAN1%%/corelist.1.gz
+%%MAN1%%/cpan.1.gz
+%%MAN1%%/enc2xs.1.gz
+%%MAN1%%/find2perl.1.gz
+%%MAN1%%/h2ph.1.gz
+%%MAN1%%/h2xs.1.gz
+%%MAN1%%/instmodsh.1.gz
+%%MAN1%%/json_pp.1.gz
+%%MAN1%%/libnetcfg.1.gz
+%%MAN1%%/perl.1.gz
+%%MAN1%%/perl5004delta.1.gz
+%%MAN1%%/perl5005delta.1.gz
+%%MAN1%%/perl5100delta.1.gz
+%%MAN1%%/perl5101delta.1.gz
+%%MAN1%%/perl5120delta.1.gz
+%%MAN1%%/perl5121delta.1.gz
+%%MAN1%%/perl5122delta.1.gz
+%%MAN1%%/perl5123delta.1.gz
+%%MAN1%%/perl5124delta.1.gz
+%%MAN1%%/perl5125delta.1.gz
+%%MAN1%%/perl5140delta.1.gz
+%%MAN1%%/perl5141delta.1.gz
+%%MAN1%%/perl5142delta.1.gz
+%%MAN1%%/perl5143delta.1.gz
+%%MAN1%%/perl5144delta.1.gz
+%%MAN1%%/perl5160delta.1.gz
+%%MAN1%%/perl5161delta.1.gz
+%%MAN1%%/perl5162delta.1.gz
+%%MAN1%%/perl5163delta.1.gz
+%%MAN1%%/perl5180delta.1.gz
+%%MAN1%%/perl5181delta.1.gz
+%%MAN1%%/perl5182delta.1.gz
+%%MAN1%%/perl5184delta.1.gz
+%%MAN1%%/perl5200delta.1.gz
+%%MAN1%%/perl5201delta.1.gz
+%%MAN1%%/perl5202delta.1.gz
+%%MAN1%%/perl5203delta.1.gz
+%%MAN1%%/perl561delta.1.gz
+%%MAN1%%/perl56delta.1.gz
+%%MAN1%%/perl581delta.1.gz
+%%MAN1%%/perl582delta.1.gz
+%%MAN1%%/perl583delta.1.gz
+%%MAN1%%/perl584delta.1.gz
+%%MAN1%%/perl585delta.1.gz
+%%MAN1%%/perl586delta.1.gz
+%%MAN1%%/perl587delta.1.gz
+%%MAN1%%/perl588delta.1.gz
+%%MAN1%%/perl589delta.1.gz
+%%MAN1%%/perl58delta.1.gz
+%%MAN1%%/perlaix.1.gz
+%%MAN1%%/perlamiga.1.gz
+%%MAN1%%/perlandroid.1.gz
+%%MAN1%%/perlapi.1.gz
+%%MAN1%%/perlapio.1.gz
+%%MAN1%%/perlartistic.1.gz
+%%MAN1%%/perlbook.1.gz
+%%MAN1%%/perlboot.1.gz
+%%MAN1%%/perlbot.1.gz
+%%MAN1%%/perlbs2000.1.gz
+%%MAN1%%/perlbug.1.gz
+%%MAN1%%/perlcall.1.gz
+%%MAN1%%/perlce.1.gz
+%%MAN1%%/perlcheat.1.gz
+%%MAN1%%/perlclib.1.gz
+%%MAN1%%/perlcn.1.gz
+%%MAN1%%/perlcommunity.1.gz
+%%MAN1%%/perlcygwin.1.gz
+%%MAN1%%/perldata.1.gz
+%%MAN1%%/perldbmfilter.1.gz
+%%MAN1%%/perldebguts.1.gz
+%%MAN1%%/perldebtut.1.gz
+%%MAN1%%/perldebug.1.gz
+%%MAN1%%/perldelta.1.gz
+%%MAN1%%/perldiag.1.gz
+%%MAN1%%/perldoc.1.gz
+%%MAN1%%/perldos.1.gz
+%%MAN1%%/perldsc.1.gz
+%%MAN1%%/perldtrace.1.gz
+%%MAN1%%/perlebcdic.1.gz
+%%MAN1%%/perlembed.1.gz
+%%MAN1%%/perlexperiment.1.gz
+%%MAN1%%/perlfaq.1.gz
+%%MAN1%%/perlfaq1.1.gz
+%%MAN1%%/perlfaq2.1.gz
+%%MAN1%%/perlfaq3.1.gz
+%%MAN1%%/perlfaq4.1.gz
+%%MAN1%%/perlfaq5.1.gz
+%%MAN1%%/perlfaq6.1.gz
+%%MAN1%%/perlfaq7.1.gz
+%%MAN1%%/perlfaq8.1.gz
+%%MAN1%%/perlfaq9.1.gz
+%%MAN1%%/perlfilter.1.gz
+%%MAN1%%/perlfork.1.gz
+%%MAN1%%/perlform.1.gz
+%%MAN1%%/perlfreebsd.1.gz
+%%MAN1%%/perlfunc.1.gz
+%%MAN1%%/perlgit.1.gz
+%%MAN1%%/perlglossary.1.gz
+%%MAN1%%/perlgpl.1.gz
+%%MAN1%%/perlguts.1.gz
+%%MAN1%%/perlhack.1.gz
+%%MAN1%%/perlhacktips.1.gz
+%%MAN1%%/perlhacktut.1.gz
+%%MAN1%%/perlhaiku.1.gz
+%%MAN1%%/perlhist.1.gz
+%%MAN1%%/perlhpux.1.gz
+%%MAN1%%/perlhurd.1.gz
+%%MAN1%%/perlintern.1.gz
+%%MAN1%%/perlinterp.1.gz
+%%MAN1%%/perlintro.1.gz
+%%MAN1%%/perliol.1.gz
+%%MAN1%%/perlipc.1.gz
+%%MAN1%%/perlirix.1.gz
+%%MAN1%%/perlivp.1.gz
+%%MAN1%%/perljp.1.gz
+%%MAN1%%/perlko.1.gz
+%%MAN1%%/perllexwarn.1.gz
+%%MAN1%%/perllinux.1.gz
+%%MAN1%%/perllocale.1.gz
+%%MAN1%%/perllol.1.gz
+%%MAN1%%/perlmacos.1.gz
+%%MAN1%%/perlmacosx.1.gz
+%%MAN1%%/perlmod.1.gz
+%%MAN1%%/perlmodinstall.1.gz
+%%MAN1%%/perlmodlib.1.gz
+%%MAN1%%/perlmodstyle.1.gz
+%%MAN1%%/perlmroapi.1.gz
+%%MAN1%%/perlnetware.1.gz
+%%MAN1%%/perlnewmod.1.gz
+%%MAN1%%/perlnumber.1.gz
+%%MAN1%%/perlobj.1.gz
+%%MAN1%%/perlootut.1.gz
+%%MAN1%%/perlop.1.gz
+%%MAN1%%/perlopenbsd.1.gz
+%%MAN1%%/perlopentut.1.gz
+%%MAN1%%/perlos2.1.gz
+%%MAN1%%/perlos390.1.gz
+%%MAN1%%/perlos400.1.gz
+%%MAN1%%/perlpacktut.1.gz
+%%MAN1%%/perlperf.1.gz
+%%MAN1%%/perlplan9.1.gz
+%%MAN1%%/perlpod.1.gz
+%%MAN1%%/perlpodspec.1.gz
+%%MAN1%%/perlpodstyle.1.gz
+%%MAN1%%/perlpolicy.1.gz
+%%MAN1%%/perlport.1.gz
+%%MAN1%%/perlpragma.1.gz
+%%MAN1%%/perlqnx.1.gz
+%%MAN1%%/perlre.1.gz
+%%MAN1%%/perlreapi.1.gz
+%%MAN1%%/perlrebackslash.1.gz
+%%MAN1%%/perlrecharclass.1.gz
+%%MAN1%%/perlref.1.gz
+%%MAN1%%/perlreftut.1.gz
+%%MAN1%%/perlreguts.1.gz
+%%MAN1%%/perlrepository.1.gz
+%%MAN1%%/perlrequick.1.gz
+%%MAN1%%/perlreref.1.gz
+%%MAN1%%/perlretut.1.gz
+%%MAN1%%/perlriscos.1.gz
+%%MAN1%%/perlrun.1.gz
+%%MAN1%%/perlsec.1.gz
+%%MAN1%%/perlsolaris.1.gz
+%%MAN1%%/perlsource.1.gz
+%%MAN1%%/perlstyle.1.gz
+%%MAN1%%/perlsub.1.gz
+%%MAN1%%/perlsymbian.1.gz
+%%MAN1%%/perlsyn.1.gz
+%%MAN1%%/perlsynology.1.gz
+%%MAN1%%/perlthanks.1.gz
+%%MAN1%%/perlthrtut.1.gz
+%%MAN1%%/perltie.1.gz
+%%MAN1%%/perltoc.1.gz
+%%MAN1%%/perltodo.1.gz
+%%MAN1%%/perltooc.1.gz
+%%MAN1%%/perltoot.1.gz
+%%MAN1%%/perltrap.1.gz
+%%MAN1%%/perltru64.1.gz
+%%MAN1%%/perltw.1.gz
+%%MAN1%%/perlunicode.1.gz
+%%MAN1%%/perlunicook.1.gz
+%%MAN1%%/perlunifaq.1.gz
+%%MAN1%%/perluniintro.1.gz
+%%MAN1%%/perluniprops.1.gz
+%%MAN1%%/perlunitut.1.gz
+%%MAN1%%/perlutil.1.gz
+%%MAN1%%/perlvar.1.gz
+%%MAN1%%/perlvms.1.gz
+%%MAN1%%/perlvos.1.gz
+%%MAN1%%/perlwin32.1.gz
+%%MAN1%%/perlxs.1.gz
+%%MAN1%%/perlxstut.1.gz
+%%MAN1%%/perlxstypemap.1.gz
+%%MAN1%%/piconv.1.gz
+%%MAN1%%/pl2pm.1.gz
+%%MAN1%%/pod2html.1.gz
+%%MAN1%%/pod2man.1.gz
+%%MAN1%%/pod2text.1.gz
+%%MAN1%%/pod2usage.1.gz
+%%MAN1%%/podchecker.1.gz
+%%MAN1%%/podselect.1.gz
+%%MAN1%%/prove.1.gz
+%%MAN1%%/psed.1.gz
+%%MAN1%%/pstruct.1.gz
+%%MAN1%%/ptar.1.gz
+%%MAN1%%/ptardiff.1.gz
+%%MAN1%%/ptargrep.1.gz
+%%MAN1%%/s2p.1.gz
+%%MAN1%%/shasum.1.gz
+%%MAN1%%/splain.1.gz
+%%MAN1%%/xsubpp.1.gz
+%%MAN1%%/zipdetails.1.gz
+@dir %%SITE_PERL%%/man/man1
@dir %%SITE_PERL%%/man/man3
@dir %%SITE_PERL%%/auto
@dir %%SITE_ARCH%%/auto
-@exec makewhatis %D/%%SITEMAN3PREFIX%%/man
-@exec makewhatis %D/%%MAN3PREFIX%%/man
-@rmtry %%MAN3PREFIX%%/man/whatis
-@rmtry %%SITEMAN3PREFIX%%/man/whatis
+@exec makewhatis %D/%%SITEMANPREFIX%%/man
+@exec makewhatis %D/%%PERLMANPREFIX%%/man
+@rmtry %%PERLMANPREFIX%%/man/whatis
+@rmtry %%SITEMANPREFIX%%/man/whatis
diff --git a/lang/perl5.20/version.mk b/lang/perl5.20/version.mk
index f0f40360d2bc..ced683a3dec9 100644
--- a/lang/perl5.20/version.mk
+++ b/lang/perl5.20/version.mk
@@ -1 +1,2 @@
PERL_VERSION= 5.20.3
+PERL5_DEPEND= perl5>=5.20<5.21
diff --git a/lang/perl5.22/Makefile b/lang/perl5.22/Makefile
index b130183931e7..b7eb3e827ef8 100644
--- a/lang/perl5.22/Makefile
+++ b/lang/perl5.22/Makefile
@@ -3,7 +3,7 @@
PORTNAME= perl
DISTVERSION= ${PERL_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= lang devel perl5
MASTER_SITES= CPAN/../../src/5.0 CPAN/../by-authors/id/R/RJ/RJBS
DIST_SUBDIR= perl
@@ -16,8 +16,6 @@ LICENSE_COMB= dual
LICENSE_FILE_ART10= ${WRKSRC}/Artistic
LICENSE_FILE_GPLv1= ${WRKSRC}/Copying
-CONFLICTS_INSTALL= perl5.*-*
-
OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \
MULTIPLICITY SITECUSTOMIZE
# it seems perl malloc has problems with threaded perl on FreeBSD
@@ -59,9 +57,11 @@ SITE_PERL_REL?= lib/perl5/site_perl
SITE_PERL?= ${PREFIX}/${SITE_PERL_REL}
SITE_ARCH_REL?= ${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}
SITE_ARCH?= ${PREFIX}/${SITE_ARCH_REL}
-SITE_MAN3_PREFIX= ${SITE_PERL_REL}
-SITE_MAN3_REL?= ${SITE_MAN3_PREFIX}/man/man3
+SITE_MAN_PREFIX= ${SITE_PERL_REL}
+SITE_MAN3_REL?= ${SITE_MAN_PREFIX}/man/man3
SITE_MAN3?= ${PREFIX}/${SITE_MAN3_REL}
+SITE_MAN1_REL?= ${SITE_MAN_PREFIX}/man/man1
+SITE_MAN1?= ${PREFIX}/${SITE_MAN1_REL}
_PRIV_LIB= lib/perl5/${PERL_VER}
_ARCH_LIB= ${_PRIV_LIB}/${PERL_ARCH}
@@ -74,12 +74,12 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \
-Dlibperl=libperl.so.${PERL_VERSION} \
-Darchlib=${PREFIX}/${_ARCH_LIB} \
-Dprivlib=${PREFIX}/${_PRIV_LIB} \
- -Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \
- -Dman1dir=${PREFIX}/man/man1 \
+ -Dman3dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man3 \
+ -Dman1dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man1 \
-Dsitearch=${SITE_ARCH} \
-Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \
-Dsiteman3dir=${SITE_MAN3} \
- -Dsiteman1dir=${PREFIX}/man/man1 \
+ -Dsiteman1dir=${SITE_MAN1} \
-Ui_malloc -Ui_iconv -Uinstallusrbinperl -Dusenm=n \
-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
-Dcf_by=${MAINTAINER:C,@.*,,} -Dcf_email=${MAINTAINER} \
@@ -101,11 +101,11 @@ SUB_LIST+= PERL_VERSION=${PERL_VERSION} \
PERL_VER=${PERL_VER} \
SITE_PERL=${SITE_PERL_REL} \
PRIV_LIB=${_PRIV_LIB} \
- MAN3PREFIX=${MAN3PREFIX_REL} \
- SITEMAN3PREFIX=${SITE_MAN3_PREFIX} \
+ PERLMANPREFIX=${PERLMANPREFIX_REL} \
+ SITEMANPREFIX=${SITE_MAN_PREFIX} \
PERL_ARCH=${PERL_ARCH}
-SUB_FILES= perl5_version perl-man.conf
+SUB_FILES= perl-man.conf
INSTALL_TARGET= install-strip
@@ -127,32 +127,68 @@ CONFIGURE_ARGS+= \
-Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ}
.endif
-MAN3PREFIX_REL= ${_PRIV_LIB}/perl
-MAN3PREFIX= ${PREFIX}/${MAN3PREFIX_REL}
-MANDIRS+= ${MAN3PREFIX}/man
+PERLMANPREFIX_REL= ${_PRIV_LIB}/perl
+PERLMANPREFIX= ${PREFIX}/${PERLMANPREFIX_REL}
+MANDIRS+= ${PERLMANPREFIX}/man
PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
PERL_VER=${PERL_VER} \
PERL_ARCH=${PERL_ARCH} \
- MAN3=${MAN3PREFIX_REL}/man/man3 \
- MAN3PREFIX=${MAN3PREFIX_REL} \
- SITEMAN3PREFIX=${SITE_MAN3_PREFIX} \
+ MAN1=${PERLMANPREFIX_REL}/man/man1 \
+ MAN3=${PERLMANPREFIX_REL}/man/man3 \
+ PERLMANPREFIX=${PERLMANPREFIX_REL} \
+ SITEMANPREFIX=${SITE_MAN_PREFIX} \
SITE_PERL=${SITE_PERL_REL} \
SITE_ARCH=${SITE_ARCH_REL} \
PRIV_LIB=${_PRIV_LIB} \
ARCH_LIB=${_ARCH_LIB}
+# bsd.default-versions.mk needs to know LOCALBASE for Perl, so
+# bsd.port.options.mk is needed before including it.
+.include <bsd.port.options.mk>
.include "${.CURDIR}/../../Mk/bsd.default-versions.mk"
# if this port is default due PERL5_DEFAULT
# change PKGNAME to reflect this
.if ${PERL_VER} == ${PERL5_DEFAULT}
PKGNAMESUFFIX= 5
+IAMDEFAULTPERL= yes
.else
# make PKGNAME unique among other lang/perl5.x
PKGNAMESUFFIX= ${PERL_VER}
-# always add default perl5 pkgname to conflicts
-CONFLICTS_INSTALL+= perl5-*
+.endif
+
+# Am I building the default Perl ?
+.if defined(IAMDEFAULTPERL)
+PLIST_SUB+= DEFAULT="" BINSUFFIX=""
+.else
+BINSUFFIX= ${PERL_VERSION}
+PLIST_SUB+= DEFAULT="@comment " BINSUFFIX=${PERL_VERSION}
+CONFIGURE_ARGS+=-Dversiononly
+.endif
+
+.if !defined(IAMDEFAULTPERL)
+pre-everything::
+ @${ECHO_MSG} "##################################################"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} " This is *NOT* the DEFAULT perl version"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "It will *NOT* install ${PREFIX}/bin/perl"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "It will *ONLY* install ${PREFIX}/bin/perl${PERL_VERSION}"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "The default Perl version currently is ${PERL5_DEFAULT}."
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "If you want to use this version as the default,"
+ @${ECHO_MSG} "stop the build now, add this line to your"
+ @${ECHO_MSG} "/etc/make.conf, and then restart the build."
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "DEFAULT_VERSIONS+=perl5=${PERL_VER}"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "##################################################"
+. if !(defined(PACKAGE_BUILDING) || defined(BATCH))
+ @sleep 30
+. endif
.endif
# Put a symlink to the future libperl.so.x.yy so that -lperl works.
@@ -165,6 +201,11 @@ post-extract:
post-patch:
${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
+.if !defined(IAMDEFAULTPERL)
+ ${REINPLACE_CMD} -e '/do_installprivlib = 0 if .versiononly/d; \
+ /^if.*nopods.*versiononly || /s/.*/if (1) {/' \
+ ${WRKSRC}/installperl
+.endif
post-patch-PTHREAD-on:
${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lpthread|g;' \
${WRKSRC}/hints/freebsd.sh
@@ -174,20 +215,19 @@ post-patch-PTHREAD-off:
.endif
post-install:
- ${MKDIR} ${STAGEDIR}${SITE_MAN3}
+ ${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3}
${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto
${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5
${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so
${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER}
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
- ${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc
${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine
${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys
# h2ph needs perl, but perl is not installed, it's only
# staged, so, use the one in WRKDIR
(cd /usr/include && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
- ${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph \
+ ${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph${BINSUFFIX} \
-d ${STAGEDIR}${SITE_ARCH} *.h machine/*.h sys/*.h >/dev/null)
@${FIND} ${STAGEDIR}${SITE_ARCH} -name '*.ph' | sed -e 's|${STAGEDIR}||' >> ${TMPPLIST}
${FIND} ${STAGEDIR} -name '*.so*' -type f | while read f; \
diff --git a/lang/perl5.22/files/perl-man.conf.in b/lang/perl5.22/files/perl-man.conf.in
index 441fc5d4c44c..69fee5f683e0 100644
--- a/lang/perl5.22/files/perl-man.conf.in
+++ b/lang/perl5.22/files/perl-man.conf.in
@@ -1,2 +1,2 @@
MANPATH %%PREFIX%%/%%SITEMAN3PREFIX%%/man
-MANPATH %%PREFIX%%/%%MAN3PREFIX%%/man
+MANPATH %%PREFIX%%/%%PERLMANPREFIX%%/man
diff --git a/lang/perl5.22/files/perl5_version.in b/lang/perl5.22/files/perl5_version.in
deleted file mode 100644
index 97e1f75dfb9f..000000000000
--- a/lang/perl5.22/files/perl5_version.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# Do not modify PERL_VERSION here, instead use DEFAULT_VERSIONS= perl5=%%PERL_VER%%
-PERL_VERSION=%%PERL_VERSION%%
diff --git a/lang/perl5.22/pkg-plist b/lang/perl5.22/pkg-plist
index f5be326d36ae..debfcbdb6c37 100644
--- a/lang/perl5.22/pkg-plist
+++ b/lang/perl5.22/pkg-plist
@@ -1,39 +1,38 @@
-bin/c2ph
-bin/corelist
-bin/cpan
-bin/enc2xs
-bin/encguess
-bin/h2ph
-bin/h2xs
-bin/instmodsh
-bin/json_pp
-bin/libnetcfg
-bin/perl
-bin/perl5
+bin/c2ph%%BINSUFFIX%%
+bin/corelist%%BINSUFFIX%%
+bin/cpan%%BINSUFFIX%%
+bin/enc2xs%%BINSUFFIX%%
+bin/encguess%%BINSUFFIX%%
+bin/h2ph%%BINSUFFIX%%
+bin/h2xs%%BINSUFFIX%%
+bin/instmodsh%%BINSUFFIX%%
+bin/json_pp%%BINSUFFIX%%
+bin/libnetcfg%%BINSUFFIX%%
+%%DEFAULT%%bin/perl
+%%DEFAULT%%bin/perl5
bin/perl%%PERL_VERSION%%
-bin/perlbug
-bin/perldoc
-bin/perlivp
-bin/perlthanks
-bin/piconv
-bin/pl2pm
-bin/pod2html
-bin/pod2man
-bin/pod2text
-bin/pod2usage
-bin/podchecker
-bin/podselect
-bin/prove
-bin/pstruct
-bin/ptar
-bin/ptardiff
-bin/ptargrep
-bin/shasum
-bin/splain
-bin/xsubpp
-bin/zipdetails
+bin/perlbug%%BINSUFFIX%%
+bin/perldoc%%BINSUFFIX%%
+bin/perlivp%%BINSUFFIX%%
+bin/perlthanks%%BINSUFFIX%%
+bin/piconv%%BINSUFFIX%%
+bin/pl2pm%%BINSUFFIX%%
+bin/pod2html%%BINSUFFIX%%
+bin/pod2man%%BINSUFFIX%%
+bin/pod2text%%BINSUFFIX%%
+bin/pod2usage%%BINSUFFIX%%
+bin/podchecker%%BINSUFFIX%%
+bin/podselect%%BINSUFFIX%%
+bin/prove%%BINSUFFIX%%
+bin/pstruct%%BINSUFFIX%%
+bin/ptar%%BINSUFFIX%%
+bin/ptardiff%%BINSUFFIX%%
+bin/ptargrep%%BINSUFFIX%%
+bin/shasum%%BINSUFFIX%%
+bin/splain%%BINSUFFIX%%
+bin/xsubpp%%BINSUFFIX%%
+bin/zipdetails%%BINSUFFIX%%
etc/man.d/perl%%PERL_VER%%.conf
-etc/perl5_version
%%PRIV_LIB%%/AnyDBM_File.pm
%%PRIV_LIB%%/App/Cpan.pm
%%PRIV_LIB%%/App/Prove.pm
@@ -2037,233 +2036,234 @@ etc/perl5_version
%%PRIV_LIB%%/vmsish.pm
%%PRIV_LIB%%/warnings.pm
%%PRIV_LIB%%/warnings/register.pm
-man/man1/c2ph.1.gz
-man/man1/corelist.1.gz
-man/man1/cpan.1.gz
-man/man1/enc2xs.1.gz
-man/man1/encguess.1.gz
-man/man1/h2ph.1.gz
-man/man1/h2xs.1.gz
-man/man1/instmodsh.1.gz
-man/man1/json_pp.1.gz
-man/man1/libnetcfg.1.gz
-man/man1/perl.1.gz
-man/man1/perl5004delta.1.gz
-man/man1/perl5005delta.1.gz
-man/man1/perl5100delta.1.gz
-man/man1/perl5101delta.1.gz
-man/man1/perl5120delta.1.gz
-man/man1/perl5121delta.1.gz
-man/man1/perl5122delta.1.gz
-man/man1/perl5123delta.1.gz
-man/man1/perl5124delta.1.gz
-man/man1/perl5125delta.1.gz
-man/man1/perl5140delta.1.gz
-man/man1/perl5141delta.1.gz
-man/man1/perl5142delta.1.gz
-man/man1/perl5143delta.1.gz
-man/man1/perl5144delta.1.gz
-man/man1/perl5160delta.1.gz
-man/man1/perl5161delta.1.gz
-man/man1/perl5162delta.1.gz
-man/man1/perl5163delta.1.gz
-man/man1/perl5180delta.1.gz
-man/man1/perl5181delta.1.gz
-man/man1/perl5182delta.1.gz
-man/man1/perl5184delta.1.gz
-man/man1/perl5200delta.1.gz
-man/man1/perl5201delta.1.gz
-man/man1/perl5202delta.1.gz
-man/man1/perl5210delta.1.gz
-man/man1/perl52110delta.1.gz
-man/man1/perl52111delta.1.gz
-man/man1/perl5211delta.1.gz
-man/man1/perl5212delta.1.gz
-man/man1/perl5213delta.1.gz
-man/man1/perl5214delta.1.gz
-man/man1/perl5215delta.1.gz
-man/man1/perl5216delta.1.gz
-man/man1/perl5217delta.1.gz
-man/man1/perl5218delta.1.gz
-man/man1/perl5219delta.1.gz
-man/man1/perl5220delta.1.gz
-man/man1/perl561delta.1.gz
-man/man1/perl56delta.1.gz
-man/man1/perl581delta.1.gz
-man/man1/perl582delta.1.gz
-man/man1/perl583delta.1.gz
-man/man1/perl584delta.1.gz
-man/man1/perl585delta.1.gz
-man/man1/perl586delta.1.gz
-man/man1/perl587delta.1.gz
-man/man1/perl588delta.1.gz
-man/man1/perl589delta.1.gz
-man/man1/perl58delta.1.gz
-man/man1/perlaix.1.gz
-man/man1/perlamiga.1.gz
-man/man1/perlandroid.1.gz
-man/man1/perlapi.1.gz
-man/man1/perlapio.1.gz
-man/man1/perlartistic.1.gz
-man/man1/perlbook.1.gz
-man/man1/perlboot.1.gz
-man/man1/perlbot.1.gz
-man/man1/perlbs2000.1.gz
-man/man1/perlbug.1.gz
-man/man1/perlcall.1.gz
-man/man1/perlce.1.gz
-man/man1/perlcheat.1.gz
-man/man1/perlclib.1.gz
-man/man1/perlcn.1.gz
-man/man1/perlcommunity.1.gz
-man/man1/perlcygwin.1.gz
-man/man1/perldata.1.gz
-man/man1/perldbmfilter.1.gz
-man/man1/perldebguts.1.gz
-man/man1/perldebtut.1.gz
-man/man1/perldebug.1.gz
-man/man1/perldelta.1.gz
-man/man1/perldiag.1.gz
-man/man1/perldoc.1.gz
-man/man1/perldos.1.gz
-man/man1/perldsc.1.gz
-man/man1/perldtrace.1.gz
-man/man1/perlebcdic.1.gz
-man/man1/perlembed.1.gz
-man/man1/perlexperiment.1.gz
-man/man1/perlfaq.1.gz
-man/man1/perlfaq1.1.gz
-man/man1/perlfaq2.1.gz
-man/man1/perlfaq3.1.gz
-man/man1/perlfaq4.1.gz
-man/man1/perlfaq5.1.gz
-man/man1/perlfaq6.1.gz
-man/man1/perlfaq7.1.gz
-man/man1/perlfaq8.1.gz
-man/man1/perlfaq9.1.gz
-man/man1/perlfilter.1.gz
-man/man1/perlfork.1.gz
-man/man1/perlform.1.gz
-man/man1/perlfreebsd.1.gz
-man/man1/perlfunc.1.gz
-man/man1/perlgit.1.gz
-man/man1/perlglossary.1.gz
-man/man1/perlgpl.1.gz
-man/man1/perlguts.1.gz
-man/man1/perlhack.1.gz
-man/man1/perlhacktips.1.gz
-man/man1/perlhacktut.1.gz
-man/man1/perlhaiku.1.gz
-man/man1/perlhist.1.gz
-man/man1/perlhpux.1.gz
-man/man1/perlhurd.1.gz
-man/man1/perlintern.1.gz
-man/man1/perlinterp.1.gz
-man/man1/perlintro.1.gz
-man/man1/perliol.1.gz
-man/man1/perlipc.1.gz
-man/man1/perlirix.1.gz
-man/man1/perlivp.1.gz
-man/man1/perljp.1.gz
-man/man1/perlko.1.gz
-man/man1/perllexwarn.1.gz
-man/man1/perllinux.1.gz
-man/man1/perllocale.1.gz
-man/man1/perllol.1.gz
-man/man1/perlmacos.1.gz
-man/man1/perlmacosx.1.gz
-man/man1/perlmod.1.gz
-man/man1/perlmodinstall.1.gz
-man/man1/perlmodlib.1.gz
-man/man1/perlmodstyle.1.gz
-man/man1/perlmroapi.1.gz
-man/man1/perlnetware.1.gz
-man/man1/perlnewmod.1.gz
-man/man1/perlnumber.1.gz
-man/man1/perlobj.1.gz
-man/man1/perlootut.1.gz
-man/man1/perlop.1.gz
-man/man1/perlopenbsd.1.gz
-man/man1/perlopentut.1.gz
-man/man1/perlos2.1.gz
-man/man1/perlos390.1.gz
-man/man1/perlos400.1.gz
-man/man1/perlpacktut.1.gz
-man/man1/perlperf.1.gz
-man/man1/perlplan9.1.gz
-man/man1/perlpod.1.gz
-man/man1/perlpodspec.1.gz
-man/man1/perlpodstyle.1.gz
-man/man1/perlpolicy.1.gz
-man/man1/perlport.1.gz
-man/man1/perlpragma.1.gz
-man/man1/perlqnx.1.gz
-man/man1/perlre.1.gz
-man/man1/perlreapi.1.gz
-man/man1/perlrebackslash.1.gz
-man/man1/perlrecharclass.1.gz
-man/man1/perlref.1.gz
-man/man1/perlreftut.1.gz
-man/man1/perlreguts.1.gz
-man/man1/perlrepository.1.gz
-man/man1/perlrequick.1.gz
-man/man1/perlreref.1.gz
-man/man1/perlretut.1.gz
-man/man1/perlriscos.1.gz
-man/man1/perlrun.1.gz
-man/man1/perlsec.1.gz
-man/man1/perlsolaris.1.gz
-man/man1/perlsource.1.gz
-man/man1/perlstyle.1.gz
-man/man1/perlsub.1.gz
-man/man1/perlsymbian.1.gz
-man/man1/perlsyn.1.gz
-man/man1/perlsynology.1.gz
-man/man1/perlthanks.1.gz
-man/man1/perlthrtut.1.gz
-man/man1/perltie.1.gz
-man/man1/perltoc.1.gz
-man/man1/perltodo.1.gz
-man/man1/perltooc.1.gz
-man/man1/perltoot.1.gz
-man/man1/perltrap.1.gz
-man/man1/perltru64.1.gz
-man/man1/perltw.1.gz
-man/man1/perlunicode.1.gz
-man/man1/perlunicook.1.gz
-man/man1/perlunifaq.1.gz
-man/man1/perluniintro.1.gz
-man/man1/perluniprops.1.gz
-man/man1/perlunitut.1.gz
-man/man1/perlutil.1.gz
-man/man1/perlvar.1.gz
-man/man1/perlvms.1.gz
-man/man1/perlvos.1.gz
-man/man1/perlwin32.1.gz
-man/man1/perlxs.1.gz
-man/man1/perlxstut.1.gz
-man/man1/perlxstypemap.1.gz
-man/man1/piconv.1.gz
-man/man1/pl2pm.1.gz
-man/man1/pod2html.1.gz
-man/man1/pod2man.1.gz
-man/man1/pod2text.1.gz
-man/man1/pod2usage.1.gz
-man/man1/podchecker.1.gz
-man/man1/podselect.1.gz
-man/man1/prove.1.gz
-man/man1/pstruct.1.gz
-man/man1/ptar.1.gz
-man/man1/ptardiff.1.gz
-man/man1/ptargrep.1.gz
-man/man1/shasum.1.gz
-man/man1/splain.1.gz
-man/man1/xsubpp.1.gz
-man/man1/zipdetails.1.gz
+%%MAN1%%/c2ph.1.gz
+%%MAN1%%/corelist.1.gz
+%%MAN1%%/cpan.1.gz
+%%MAN1%%/enc2xs.1.gz
+%%MAN1%%/encguess.1.gz
+%%MAN1%%/h2ph.1.gz
+%%MAN1%%/h2xs.1.gz
+%%MAN1%%/instmodsh.1.gz
+%%MAN1%%/json_pp.1.gz
+%%MAN1%%/libnetcfg.1.gz
+%%MAN1%%/perl.1.gz
+%%MAN1%%/perl5004delta.1.gz
+%%MAN1%%/perl5005delta.1.gz
+%%MAN1%%/perl5100delta.1.gz
+%%MAN1%%/perl5101delta.1.gz
+%%MAN1%%/perl5120delta.1.gz
+%%MAN1%%/perl5121delta.1.gz
+%%MAN1%%/perl5122delta.1.gz
+%%MAN1%%/perl5123delta.1.gz
+%%MAN1%%/perl5124delta.1.gz
+%%MAN1%%/perl5125delta.1.gz
+%%MAN1%%/perl5140delta.1.gz
+%%MAN1%%/perl5141delta.1.gz
+%%MAN1%%/perl5142delta.1.gz
+%%MAN1%%/perl5143delta.1.gz
+%%MAN1%%/perl5144delta.1.gz
+%%MAN1%%/perl5160delta.1.gz
+%%MAN1%%/perl5161delta.1.gz
+%%MAN1%%/perl5162delta.1.gz
+%%MAN1%%/perl5163delta.1.gz
+%%MAN1%%/perl5180delta.1.gz
+%%MAN1%%/perl5181delta.1.gz
+%%MAN1%%/perl5182delta.1.gz
+%%MAN1%%/perl5184delta.1.gz
+%%MAN1%%/perl5200delta.1.gz
+%%MAN1%%/perl5201delta.1.gz
+%%MAN1%%/perl5202delta.1.gz
+%%MAN1%%/perl5210delta.1.gz
+%%MAN1%%/perl52110delta.1.gz
+%%MAN1%%/perl52111delta.1.gz
+%%MAN1%%/perl5211delta.1.gz
+%%MAN1%%/perl5212delta.1.gz
+%%MAN1%%/perl5213delta.1.gz
+%%MAN1%%/perl5214delta.1.gz
+%%MAN1%%/perl5215delta.1.gz
+%%MAN1%%/perl5216delta.1.gz
+%%MAN1%%/perl5217delta.1.gz
+%%MAN1%%/perl5218delta.1.gz
+%%MAN1%%/perl5219delta.1.gz
+%%MAN1%%/perl5220delta.1.gz
+%%MAN1%%/perl561delta.1.gz
+%%MAN1%%/perl56delta.1.gz
+%%MAN1%%/perl581delta.1.gz
+%%MAN1%%/perl582delta.1.gz
+%%MAN1%%/perl583delta.1.gz
+%%MAN1%%/perl584delta.1.gz
+%%MAN1%%/perl585delta.1.gz
+%%MAN1%%/perl586delta.1.gz
+%%MAN1%%/perl587delta.1.gz
+%%MAN1%%/perl588delta.1.gz
+%%MAN1%%/perl589delta.1.gz
+%%MAN1%%/perl58delta.1.gz
+%%MAN1%%/perlaix.1.gz
+%%MAN1%%/perlamiga.1.gz
+%%MAN1%%/perlandroid.1.gz
+%%MAN1%%/perlapi.1.gz
+%%MAN1%%/perlapio.1.gz
+%%MAN1%%/perlartistic.1.gz
+%%MAN1%%/perlbook.1.gz
+%%MAN1%%/perlboot.1.gz
+%%MAN1%%/perlbot.1.gz
+%%MAN1%%/perlbs2000.1.gz
+%%MAN1%%/perlbug.1.gz
+%%MAN1%%/perlcall.1.gz
+%%MAN1%%/perlce.1.gz
+%%MAN1%%/perlcheat.1.gz
+%%MAN1%%/perlclib.1.gz
+%%MAN1%%/perlcn.1.gz
+%%MAN1%%/perlcommunity.1.gz
+%%MAN1%%/perlcygwin.1.gz
+%%MAN1%%/perldata.1.gz
+%%MAN1%%/perldbmfilter.1.gz
+%%MAN1%%/perldebguts.1.gz
+%%MAN1%%/perldebtut.1.gz
+%%MAN1%%/perldebug.1.gz
+%%MAN1%%/perldelta.1.gz
+%%MAN1%%/perldiag.1.gz
+%%MAN1%%/perldoc.1.gz
+%%MAN1%%/perldos.1.gz
+%%MAN1%%/perldsc.1.gz
+%%MAN1%%/perldtrace.1.gz
+%%MAN1%%/perlebcdic.1.gz
+%%MAN1%%/perlembed.1.gz
+%%MAN1%%/perlexperiment.1.gz
+%%MAN1%%/perlfaq.1.gz
+%%MAN1%%/perlfaq1.1.gz
+%%MAN1%%/perlfaq2.1.gz
+%%MAN1%%/perlfaq3.1.gz
+%%MAN1%%/perlfaq4.1.gz
+%%MAN1%%/perlfaq5.1.gz
+%%MAN1%%/perlfaq6.1.gz
+%%MAN1%%/perlfaq7.1.gz
+%%MAN1%%/perlfaq8.1.gz
+%%MAN1%%/perlfaq9.1.gz
+%%MAN1%%/perlfilter.1.gz
+%%MAN1%%/perlfork.1.gz
+%%MAN1%%/perlform.1.gz
+%%MAN1%%/perlfreebsd.1.gz
+%%MAN1%%/perlfunc.1.gz
+%%MAN1%%/perlgit.1.gz
+%%MAN1%%/perlglossary.1.gz
+%%MAN1%%/perlgpl.1.gz
+%%MAN1%%/perlguts.1.gz
+%%MAN1%%/perlhack.1.gz
+%%MAN1%%/perlhacktips.1.gz
+%%MAN1%%/perlhacktut.1.gz
+%%MAN1%%/perlhaiku.1.gz
+%%MAN1%%/perlhist.1.gz
+%%MAN1%%/perlhpux.1.gz
+%%MAN1%%/perlhurd.1.gz
+%%MAN1%%/perlintern.1.gz
+%%MAN1%%/perlinterp.1.gz
+%%MAN1%%/perlintro.1.gz
+%%MAN1%%/perliol.1.gz
+%%MAN1%%/perlipc.1.gz
+%%MAN1%%/perlirix.1.gz
+%%MAN1%%/perlivp.1.gz
+%%MAN1%%/perljp.1.gz
+%%MAN1%%/perlko.1.gz
+%%MAN1%%/perllexwarn.1.gz
+%%MAN1%%/perllinux.1.gz
+%%MAN1%%/perllocale.1.gz
+%%MAN1%%/perllol.1.gz
+%%MAN1%%/perlmacos.1.gz
+%%MAN1%%/perlmacosx.1.gz
+%%MAN1%%/perlmod.1.gz
+%%MAN1%%/perlmodinstall.1.gz
+%%MAN1%%/perlmodlib.1.gz
+%%MAN1%%/perlmodstyle.1.gz
+%%MAN1%%/perlmroapi.1.gz
+%%MAN1%%/perlnetware.1.gz
+%%MAN1%%/perlnewmod.1.gz
+%%MAN1%%/perlnumber.1.gz
+%%MAN1%%/perlobj.1.gz
+%%MAN1%%/perlootut.1.gz
+%%MAN1%%/perlop.1.gz
+%%MAN1%%/perlopenbsd.1.gz
+%%MAN1%%/perlopentut.1.gz
+%%MAN1%%/perlos2.1.gz
+%%MAN1%%/perlos390.1.gz
+%%MAN1%%/perlos400.1.gz
+%%MAN1%%/perlpacktut.1.gz
+%%MAN1%%/perlperf.1.gz
+%%MAN1%%/perlplan9.1.gz
+%%MAN1%%/perlpod.1.gz
+%%MAN1%%/perlpodspec.1.gz
+%%MAN1%%/perlpodstyle.1.gz
+%%MAN1%%/perlpolicy.1.gz
+%%MAN1%%/perlport.1.gz
+%%MAN1%%/perlpragma.1.gz
+%%MAN1%%/perlqnx.1.gz
+%%MAN1%%/perlre.1.gz
+%%MAN1%%/perlreapi.1.gz
+%%MAN1%%/perlrebackslash.1.gz
+%%MAN1%%/perlrecharclass.1.gz
+%%MAN1%%/perlref.1.gz
+%%MAN1%%/perlreftut.1.gz
+%%MAN1%%/perlreguts.1.gz
+%%MAN1%%/perlrepository.1.gz
+%%MAN1%%/perlrequick.1.gz
+%%MAN1%%/perlreref.1.gz
+%%MAN1%%/perlretut.1.gz
+%%MAN1%%/perlriscos.1.gz
+%%MAN1%%/perlrun.1.gz
+%%MAN1%%/perlsec.1.gz
+%%MAN1%%/perlsolaris.1.gz
+%%MAN1%%/perlsource.1.gz
+%%MAN1%%/perlstyle.1.gz
+%%MAN1%%/perlsub.1.gz
+%%MAN1%%/perlsymbian.1.gz
+%%MAN1%%/perlsyn.1.gz
+%%MAN1%%/perlsynology.1.gz
+%%MAN1%%/perlthanks.1.gz
+%%MAN1%%/perlthrtut.1.gz
+%%MAN1%%/perltie.1.gz
+%%MAN1%%/perltoc.1.gz
+%%MAN1%%/perltodo.1.gz
+%%MAN1%%/perltooc.1.gz
+%%MAN1%%/perltoot.1.gz
+%%MAN1%%/perltrap.1.gz
+%%MAN1%%/perltru64.1.gz
+%%MAN1%%/perltw.1.gz
+%%MAN1%%/perlunicode.1.gz
+%%MAN1%%/perlunicook.1.gz
+%%MAN1%%/perlunifaq.1.gz
+%%MAN1%%/perluniintro.1.gz
+%%MAN1%%/perluniprops.1.gz
+%%MAN1%%/perlunitut.1.gz
+%%MAN1%%/perlutil.1.gz
+%%MAN1%%/perlvar.1.gz
+%%MAN1%%/perlvms.1.gz
+%%MAN1%%/perlvos.1.gz
+%%MAN1%%/perlwin32.1.gz
+%%MAN1%%/perlxs.1.gz
+%%MAN1%%/perlxstut.1.gz
+%%MAN1%%/perlxstypemap.1.gz
+%%MAN1%%/piconv.1.gz
+%%MAN1%%/pl2pm.1.gz
+%%MAN1%%/pod2html.1.gz
+%%MAN1%%/pod2man.1.gz
+%%MAN1%%/pod2text.1.gz
+%%MAN1%%/pod2usage.1.gz
+%%MAN1%%/podchecker.1.gz
+%%MAN1%%/podselect.1.gz
+%%MAN1%%/prove.1.gz
+%%MAN1%%/pstruct.1.gz
+%%MAN1%%/ptar.1.gz
+%%MAN1%%/ptardiff.1.gz
+%%MAN1%%/ptargrep.1.gz
+%%MAN1%%/shasum.1.gz
+%%MAN1%%/splain.1.gz
+%%MAN1%%/xsubpp.1.gz
+%%MAN1%%/zipdetails.1.gz
@dir %%SITE_PERL%%/auto
@dir %%SITE_ARCH%%/auto
+@dir %%SITE_PERL%%/man/man1
@dir %%SITE_PERL%%/man/man3
-@exec makewhatis %D/%%SITEMAN3PREFIX%%/man
-@exec makewhatis %D/%%MAN3PREFIX%%/man
-@rmtry %%MAN3PREFIX%%/man/whatis
-@rmtry %%SITEMAN3PREFIX%%/man/whatis
+@exec makewhatis %D/%%SITEMANPREFIX%%/man
+@exec makewhatis %D/%%PERLMANPREFIX%%/man
+@rmtry %%PERLMANPREFIX%%/man/whatis
+@rmtry %%SITEMANPREFIX%%/man/whatis
diff --git a/lang/perl5.22/version.mk b/lang/perl5.22/version.mk
index 9ed42cdde904..02e9d1df04eb 100644
--- a/lang/perl5.22/version.mk
+++ b/lang/perl5.22/version.mk
@@ -1 +1,2 @@
PERL_VERSION= 5.22.0
+PERL5_DEPEND= perl5>=5.22<5.23
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index f3fa3fa41825..54a0b3e82a9e 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -170,11 +170,10 @@ post-install:
@${ECHO_CMD} man/man${s}/${m}.${s}.gz >> ${TMPPLIST}
. endfor
.endfor
-.for m in ${CYRUS_PERL_MAN1}
- @${ECHO_CMD} man/man1/${m}.1.gz >> ${TMPPLIST}
-.endfor
-.for m in ${CYRUS_PERL_MAN3}
- @${ECHO_CMD} ${SITE_MAN3}/${m}.3.gz >> ${TMPPLIST}
+.for s in 1 3
+. for m in ${CYRUS_PERL_MAN${s}}
+ @${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST}
+. endfor
.endfor
.for m in ${CYRUS_MAN8}
@${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST}
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 639a341b2391..a3c966b94ebe 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -187,11 +187,10 @@ post-install:
@${ECHO_CMD} man/man${s}/${m}.${s}.gz >> ${TMPPLIST}
. endfor
.endfor
-.for m in ${CYRUS_PERL_MAN1}
- @${ECHO_CMD} man/man1/${m}.1.gz >> ${TMPPLIST}
-.endfor
-.for m in ${CYRUS_PERL_MAN3}
- @${ECHO_CMD} ${SITE_MAN3}/${m}.3.gz >> ${TMPPLIST}
+.for s in 1 3
+. for m in ${CYRUS_PERL_MAN${s}}
+ @${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST}
+. endfor
.endfor
.for m in ${CYRUS_MAN8}
@${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST}
diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile
index b46c9a7d3a29..b79b91c52a1c 100644
--- a/mail/cyrus-imapd25/Makefile
+++ b/mail/cyrus-imapd25/Makefile
@@ -214,11 +214,10 @@ post-install:
@${ECHO_CMD} man/man${s}/${m}.${s}.gz >> ${TMPPLIST}
. endfor
.endfor
-.for m in ${CYRUS_PERL_MAN1}
- @${ECHO_CMD} man/man1/${m}.1.gz >> ${TMPPLIST}
-.endfor
-.for m in ${CYRUS_PERL_MAN3}
- @${ECHO_CMD} ${SITE_MAN3}/${m}.3.gz >> ${TMPPLIST}
+.for s in 1 3
+. for m in ${CYRUS_PERL_MAN${s}}
+ @${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST}
+. endfor
.endfor
.for m in ${CYRUS_MAN8}
@${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST}
diff --git a/mail/grepmail/pkg-plist b/mail/grepmail/pkg-plist
index d4c0acf15137..94532eec1631 100644
--- a/mail/grepmail/pkg-plist
+++ b/mail/grepmail/pkg-plist
@@ -1,2 +1,2 @@
bin/grepmail
-man/man1/grepmail.1.gz
+%%PERL5_MAN1%%/grepmail.1.gz
diff --git a/mail/mbx2mbox/pkg-plist b/mail/mbx2mbox/pkg-plist
index 550d228fa606..56d85f899857 100644
--- a/mail/mbx2mbox/pkg-plist
+++ b/mail/mbx2mbox/pkg-plist
@@ -1,2 +1,2 @@
bin/mbx2mbox
-man/man1/mbx2mbox.1.gz
+%%PERL5_MAN1%%/mbx2mbox.1.gz
diff --git a/mail/mime-construct/pkg-plist b/mail/mime-construct/pkg-plist
index baa8f8f7de87..96a8d73c4bd6 100644
--- a/mail/mime-construct/pkg-plist
+++ b/mail/mime-construct/pkg-plist
@@ -1,2 +1,2 @@
bin/mime-construct
-man/man1/mime-construct.1.gz
+%%PERL5_MAN1%%/mime-construct.1.gz
diff --git a/mail/p5-Log-Procmail/pkg-plist b/mail/p5-Log-Procmail/pkg-plist
index 06b2beb5c038..cfa722189629 100644
--- a/mail/p5-Log-Procmail/pkg-plist
+++ b/mail/p5-Log-Procmail/pkg-plist
@@ -1,4 +1,4 @@
bin/mailstat.pl
%%PERL5_MAN3%%/Log::Procmail.3.gz
%%SITE_PERL%%/Log/Procmail.pm
-man/man1/mailstat.pl.1.gz
+%%PERL5_MAN1%%/mailstat.pl.1.gz
diff --git a/mail/p5-Mail-CheckUser/pkg-plist b/mail/p5-Mail-CheckUser/pkg-plist
index 5e9dfc4814c0..2dbb1bd8aef0 100644
--- a/mail/p5-Mail-CheckUser/pkg-plist
+++ b/mail/p5-Mail-CheckUser/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Mail/CheckUser.pm
bin/cufilter
%%PERL5_MAN3%%/Mail::CheckUser.3.gz
-man/man1/cufilter.1.gz
+%%PERL5_MAN1%%/cufilter.1.gz
diff --git a/mail/p5-Mail-SPF/pkg-plist b/mail/p5-Mail-SPF/pkg-plist
index 1fdfebf5049a..ee1736e0dc71 100644
--- a/mail/p5-Mail-SPF/pkg-plist
+++ b/mail/p5-Mail-SPF/pkg-plist
@@ -49,4 +49,4 @@ sbin/spfd.pl
%%PERL5_MAN3%%/Mail::SPF::Util.3.gz
%%PERL5_MAN3%%/Mail::SPF::v1::Record.3.gz
%%PERL5_MAN3%%/Mail::SPF::v2::Record.3.gz
-man/man1/spfquery.pl.1.gz
+%%PERL5_MAN1%%/spfquery.pl.1.gz
diff --git a/mail/p5-Mail-SRS/pkg-plist b/mail/p5-Mail-SRS/pkg-plist
index aca33d46aa68..b9cd8dce4d99 100644
--- a/mail/p5-Mail-SRS/pkg-plist
+++ b/mail/p5-Mail-SRS/pkg-plist
@@ -13,5 +13,5 @@ bin/srsd
%%PERL5_MAN3%%/Mail::SRS::Guarded.3.gz
%%PERL5_MAN3%%/Mail::SRS::Reversible.3.gz
%%PERL5_MAN3%%/Mail::SRS::Shortcut.3.gz
-man/man1/srs.1.gz
-man/man1/srsd.1.gz
+%%PERL5_MAN1%%/srs.1.gz
+%%PERL5_MAN1%%/srsd.1.gz
diff --git a/mail/p5-qpsmtpd/pkg-plist b/mail/p5-qpsmtpd/pkg-plist
index 0b64e66e2277..a4e39b8a867c 100644
--- a/mail/p5-qpsmtpd/pkg-plist
+++ b/mail/p5-qpsmtpd/pkg-plist
@@ -2,7 +2,7 @@ bin/qpsmtpd
bin/qpsmtpd-async
bin/qpsmtpd-forkserver
bin/qpsmtpd-prefork
-man/man1/qpsmtpd-async.1.gz
+%%PERL5_MAN1%%/qpsmtpd-async.1.gz
%%DATADIR%%/plugins/async/dns_whitelist_soft
%%DATADIR%%/plugins/async/dnsbl
%%DATADIR%%/plugins/async/earlytalker
diff --git a/mail/razor-agents/Makefile b/mail/razor-agents/Makefile
index a6dfe2e99006..285112cdee04 100644
--- a/mail/razor-agents/Makefile
+++ b/mail/razor-agents/Makefile
@@ -31,6 +31,6 @@ PORTSCOUT= skipv:2.85
post-patch:
@${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e 's|/etc/razor|${PREFIX}/etc|g'
- @${PERL} -pi -e 's,share/man,man,g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+ @${REINPLACE_CMD} -e '/MAN5/s,man/man5,${SITE_MAN3_REL:S/3/5/},g' ${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>
diff --git a/mail/razor-agents/pkg-plist b/mail/razor-agents/pkg-plist
index 9fb953204757..dfdcc9a6a603 100644
--- a/mail/razor-agents/pkg-plist
+++ b/mail/razor-agents/pkg-plist
@@ -6,13 +6,13 @@ bin/razor-revoke
%%PERL5_MAN3%%/Razor2::Errorhandler.3.gz
%%PERL5_MAN3%%/Razor2::Preproc::deHTMLxs.3.gz
%%PERL5_MAN3%%/Razor2::Syslog.3.gz
-man/man1/razor-admin.1.gz
-man/man1/razor-check.1.gz
-man/man1/razor-report.1.gz
-man/man1/razor-revoke.1.gz
-man/man5/razor-agent.conf.5.gz
-man/man5/razor-agents.5.gz
-man/man5/razor-whitelist.5.gz
+%%PERL5_MAN1%%/razor-admin.1.gz
+%%PERL5_MAN1%%/razor-check.1.gz
+%%PERL5_MAN1%%/razor-report.1.gz
+%%PERL5_MAN1%%/razor-revoke.1.gz
+%%SITE_PERL%%/man/man5/razor-agent.conf.5.gz
+%%SITE_PERL%%/man/man5/razor-agents.5.gz
+%%SITE_PERL%%/man/man5/razor-whitelist.5.gz
%%SITE_ARCH%%/Razor2/Client/Agent.pm
%%SITE_ARCH%%/Razor2/Client/Config.pm
%%SITE_ARCH%%/Razor2/Client/Core.pm
diff --git a/mail/spamassassin/pkg-plist b/mail/spamassassin/pkg-plist
index 983404e4343f..805ba049e1ce 100644
--- a/mail/spamassassin/pkg-plist
+++ b/mail/spamassassin/pkg-plist
@@ -199,14 +199,14 @@ lib/libspamc.so.0
%%PERL5_MAN3%%/Mail::SpamAssassin::Util::Progress.3.gz
%%PERL5_MAN3%%/Mail::SpamAssassin::Util::RegistrarBoundaries.3.gz
%%PERL5_MAN3%%/spamassassin-run.3.gz
-man/man1/sa-awl.1.gz
-man/man1/sa-compile.1.gz
-man/man1/sa-learn.1.gz
-man/man1/sa-update.1.gz
-man/man1/spamassassin-run.1.gz
-man/man1/spamassassin.1.gz
-man/man1/spamc.1.gz
-man/man1/spamd.1.gz
+%%PERL5_MAN1%%/sa-awl.1.gz
+%%PERL5_MAN1%%/sa-compile.1.gz
+%%PERL5_MAN1%%/sa-learn.1.gz
+%%PERL5_MAN1%%/sa-update.1.gz
+%%PERL5_MAN1%%/spamassassin-run.1.gz
+%%PERL5_MAN1%%/spamassassin.1.gz
+%%PERL5_MAN1%%/spamc.1.gz
+%%PERL5_MAN1%%/spamd.1.gz
%%DATADIR%%/languages
%%DATADIR%%/sa-update-pubkey.txt
%%DATADIR%%/user_prefs.template
diff --git a/math/PDL/Makefile b/math/PDL/Makefile
index cd067b7adba5..22457ef48033 100644
--- a/math/PDL/Makefile
+++ b/math/PDL/Makefile
@@ -82,14 +82,15 @@ post-patch:
post-install:
@(cd ${WRKSRC}; ${PERL} -Iblib/lib -Iblib/arch Doc/scantree.pl)
@(cd ${WRKSRC}/blib/man3 ; \
- ${FIND} *.3 | ${SED} "s,^,${MAN3PREFIX:S,^${PREFIX}/,,}/man/man3/,;s/3$$/3.gz/" \
+ ${FIND} *.3 | ${SED} "s,^,${MAN3PREFIX}/man/man3/,;s/3$$/3.gz/" \
>> ${TMPPLIST} ; \
cd ${WRKSRC}/blib/man1 ; \
- ${FIND} *.1 | ${SED} "s,^,man/man1/,;s/1$$/1.gz/" >> ${TMPPLIST})
+ ${FIND} *.1 | ${SED} "s,^,${MAN1PREFIX}/man/man1/,;s/1$$/1.gz/" \
+ >> ${TMPPLIST})
@(${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/PDL* -type f | \
${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST} ; \
${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/PDL -type f \
- -name "[A-Z]*" | ${SED} "s,^${STAGEDIR}${PREFIX}/,," \
- >> ${TMPPLIST})
+ -name "[A-Z]*" | ${SED} "s,^${STAGEDIR}${PREFIX}/,," \
+ >> ${TMPPLIST})
.include <bsd.port.mk>
diff --git a/math/p5-Math-Cephes/pkg-plist b/math/p5-Math-Cephes/pkg-plist
index dfcd58c540df..90bd67dffa93 100644
--- a/math/p5-Math-Cephes/pkg-plist
+++ b/math/p5-Math-Cephes/pkg-plist
@@ -12,4 +12,4 @@ bin/pmath
%%PERL5_MAN3%%/Math::Cephes::Fraction.3.gz
%%PERL5_MAN3%%/Math::Cephes::Matrix.3.gz
%%PERL5_MAN3%%/Math::Cephes::Polynomial.3.gz
-man/man1/pmath.1.gz
+%%PERL5_MAN1%%/pmath.1.gz
diff --git a/math/p5-Math-Evol/pkg-plist b/math/p5-Math-Evol/pkg-plist
index 84befdf32c71..3a5d205ed11e 100644
--- a/math/p5-Math-Evol/pkg-plist
+++ b/math/p5-Math-Evol/pkg-plist
@@ -1,4 +1,4 @@
bin/ps_evol
%%PERL5_MAN3%%/Math::Evol.3.gz
%%SITE_PERL%%/Math/Evol.pm
-man/man1/ps_evol.1.gz
+%%PERL5_MAN1%%/ps_evol.1.gz
diff --git a/math/p5-Math-GSL/pkg-plist b/math/p5-Math-GSL/pkg-plist
index 998038fc6ab9..43d49e659b9b 100644
--- a/math/p5-Math-GSL/pkg-plist
+++ b/math/p5-Math-GSL/pkg-plist
@@ -157,4 +157,4 @@ bin/smolder_smoke_signal
%%PERL5_MAN3%%/Math::GSL::VectorComplex.3.gz
%%PERL5_MAN3%%/Math::GSL::Wavelet.3.gz
%%PERL5_MAN3%%/Math::GSL::Wavelet2D.3.gz
-man/man1/smolder_smoke_signal.1.gz
+%%PERL5_MAN1%%/smolder_smoke_signal.1.gz
diff --git a/math/p5-NetCDF/Makefile b/math/p5-NetCDF/Makefile
index 2b2a55ee29d6..c9d8f7d2459d 100644
--- a/math/p5-NetCDF/Makefile
+++ b/math/p5-NetCDF/Makefile
@@ -14,12 +14,12 @@ COMMENT= Perl5 module to read and write netCDF files
LIB_DEPENDS= libnetcdf.so:${PORTSDIR}/science/netcdf
-USES= perl5
+USES= perl5 fakeroot
-WRKSRC= ${WRKDIR}/${DISTNAME}/src
+WRKSRC_SUBDIR= src
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPP_NETCDF=-I${LOCALBASE}/include LD_NETCDF=-lnetcdf \
- PERL_MANDIR=${STAGEDIR}${MAN1PREFIX}/man PERL=${PERL5}
+ PERL_MANDIR=${STAGEDIR}${SITE_PERL}/man PERL=${PERL5}
pre-install:
@${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' ${WRKSRC}/perl/Makefile
diff --git a/math/p5-NetCDF/pkg-plist b/math/p5-NetCDF/pkg-plist
index 12eaff22b654..c95f7723f977 100644
--- a/math/p5-NetCDF/pkg-plist
+++ b/math/p5-NetCDF/pkg-plist
@@ -1,4 +1,4 @@
-man/man1/netCDFPerl.1.gz
+%%PERL5_MAN1%%/netCDFPerl.1.gz
%%SITE_ARCH%%/NetCDF.pm
%%SITE_ARCH%%/auto/NetCDF/NetCDF.so
%%SITE_ARCH%%/auto/NetCDF/autosplit.ix
diff --git a/misc/p5-Bot-Training/pkg-plist b/misc/p5-Bot-Training/pkg-plist
index b1107a75cade..33bf8bbd78c1 100644
--- a/misc/p5-Bot-Training/pkg-plist
+++ b/misc/p5-Bot-Training/pkg-plist
@@ -2,4 +2,4 @@ bin/bot-training
%%SITE_PERL%%/Bot/Training.pm
%%SITE_PERL%%/Bot/Training/Plugin.pm
%%PERL5_MAN3%%/Bot::Training.3.gz
-man/man1/bot-training.1.gz
+%%PERL5_MAN1%%/bot-training.1.gz
diff --git a/misc/p5-Text-FIGlet/pkg-plist b/misc/p5-Text-FIGlet/pkg-plist
index c57fb00d734d..bcc6cc6221f3 100644
--- a/misc/p5-Text-FIGlet/pkg-plist
+++ b/misc/p5-Text-FIGlet/pkg-plist
@@ -14,7 +14,7 @@ bin/showfigfonts.pl
%%PERL5_MAN3%%/Text::FIGlet::Illuminated.3.gz
%%PERL5_MAN3%%/Text::FIGlet::LICENSE.3.gz
%%PERL5_MAN3%%/Text::FIGlet::Ransom.3.gz
-man/man1/charmap.pl.1.gz
-man/man1/figlet.pl.1.gz
-man/man1/minifig.pl.1.gz
-man/man1/showfigfonts.pl.1.gz
+%%PERL5_MAN1%%/charmap.pl.1.gz
+%%PERL5_MAN1%%/figlet.pl.1.gz
+%%PERL5_MAN1%%/minifig.pl.1.gz
+%%PERL5_MAN1%%/showfigfonts.pl.1.gz
diff --git a/misc/pfm/pkg-plist b/misc/pfm/pkg-plist
index 1c830d003e1e..df499f52f659 100644
--- a/misc/pfm/pkg-plist
+++ b/misc/pfm/pkg-plist
@@ -1,5 +1,5 @@
bin/pfm
-man/man1/pfm.1.gz
+%%PERL5_MAN1%%/pfm.1.gz
%%PERL5_MAN3%%/App::PFM::Abstract.3.gz
%%PERL5_MAN3%%/App::PFM::Application.3.gz
%%PERL5_MAN3%%/App::PFM::Browser.3.gz
diff --git a/multimedia/acidrip/pkg-plist b/multimedia/acidrip/pkg-plist
index 5782d8fe434b..e345d3978056 100644
--- a/multimedia/acidrip/pkg-plist
+++ b/multimedia/acidrip/pkg-plist
@@ -4,4 +4,4 @@ bin/acidrip
%%SITE_PERL%%/AcidRip/logo.png
%%SITE_PERL%%/AcidRip/messages.pm
%%SITE_PERL%%/AcidRip/signals.pm
-man/man1/acidrip.1.gz
+%%PERL5_MAN1%%/acidrip.1.gz
diff --git a/multimedia/clive/Makefile b/multimedia/clive/Makefile
index 4727e1a01d78..0e731feaad52 100644
--- a/multimedia/clive/Makefile
+++ b/multimedia/clive/Makefile
@@ -26,6 +26,6 @@ USES= perl5
USE_PERL5= configure
PLIST_FILES= bin/clive \
- man/man1/clive.1.gz
+ ${SITE_MAN1}/clive.1.gz
.include <bsd.port.mk>
diff --git a/multimedia/dvdrip/pkg-plist b/multimedia/dvdrip/pkg-plist
index 779776220144..01b557c192f3 100644
--- a/multimedia/dvdrip/pkg-plist
+++ b/multimedia/dvdrip/pkg-plist
@@ -8,9 +8,9 @@ bin/dvdrip-splash
bin/dvdrip-splitpipe
bin/dvdrip-subpng
bin/dvdrip-thumb
-man/man1/dvdrip.1.gz
-man/man1/dvdrip-progress.1.gz
-man/man1/dvdrip-splitpipe.1.gz
+%%PERL5_MAN1%%/dvdrip.1.gz
+%%PERL5_MAN1%%/dvdrip-progress.1.gz
+%%PERL5_MAN1%%/dvdrip-splitpipe.1.gz
%%PERL5_MAN3%%/Video::DVDRip.3.gz
%%PERL5_MAN3%%/Video::DVDRip::CPAN::Scanf.3.gz
%%SITE_PERL%%/LocaleData/cs/LC_MESSAGES/video.dvdrip.mo
diff --git a/multimedia/gcap/Makefile b/multimedia/gcap/Makefile
index 164b9c7e633c..568d3f5bb420 100644
--- a/multimedia/gcap/Makefile
+++ b/multimedia/gcap/Makefile
@@ -27,6 +27,6 @@ USES= perl5
USE_PERL5= configure
NO_ARCH= yes
-PLIST_FILES= bin/gcap man/man1/gcap.1.gz
+PLIST_FILES= bin/gcap ${SITE_MAN1}/gcap.1.gz
.include <bsd.port.mk>
diff --git a/multimedia/grake/Makefile b/multimedia/grake/Makefile
index 53fb4ac662ab..fa49a63ce7c4 100644
--- a/multimedia/grake/Makefile
+++ b/multimedia/grake/Makefile
@@ -25,6 +25,6 @@ USES= perl5
USE_PERL5= configure
NO_ARCH= yes
-PLIST_FILES= bin/grake man/man1/grake.1.gz
+PLIST_FILES= bin/grake ${SITE_MAN1}/grake.1.gz
.include <bsd.port.mk>
diff --git a/multimedia/gtk-youtube-viewer/pkg-plist b/multimedia/gtk-youtube-viewer/pkg-plist
index f4cae64199ef..63039e49a1d8 100644
--- a/multimedia/gtk-youtube-viewer/pkg-plist
+++ b/multimedia/gtk-youtube-viewer/pkg-plist
@@ -43,6 +43,6 @@ bin/youtube-viewer
%%PERL5_MAN3%%/WWW::YoutubeViewer::Utils.3.gz
%%PERL5_MAN3%%/WWW::YoutubeViewer::VideoCategories.3.gz
%%PERL5_MAN3%%/WWW::YoutubeViewer::Videos.3.gz
-man/man1/youtube-viewer.1.gz
+%%PERL5_MAN1%%/youtube-viewer.1.gz
%%GTK2%%share/applications/gtk-youtube-viewer.desktop
%%GTK2%%share/pixmaps/gtk-youtube-viewer.png
diff --git a/multimedia/mp3cd/pkg-plist b/multimedia/mp3cd/pkg-plist
index 79b9fe45b430..24e3f82aaf8c 100644
--- a/multimedia/mp3cd/pkg-plist
+++ b/multimedia/mp3cd/pkg-plist
@@ -1,2 +1,2 @@
bin/mp3cd
-man/man1/mp3cd.1.gz
+%%PERL5_MAN1%%/mp3cd.1.gz
diff --git a/multimedia/p5-FLV-Info/pkg-plist b/multimedia/p5-FLV-Info/pkg-plist
index c5d01c55941c..2dccc92f3df2 100644
--- a/multimedia/p5-FLV-Info/pkg-plist
+++ b/multimedia/p5-FLV-Info/pkg-plist
@@ -37,8 +37,8 @@ bin/swf2flv
%%SITE_PERL%%/FLV/ToSWF.pm
%%SITE_PERL%%/FLV/Util.pm
%%SITE_PERL%%/FLV/VideoTag.pm
-man/man1/flv2flv.1.gz
-man/man1/flv2mp3.1.gz
-man/man1/flv2swf.1.gz
-man/man1/flvinfo.1.gz
-man/man1/swf2flv.1.gz
+%%PERL5_MAN1%%/flv2flv.1.gz
+%%PERL5_MAN1%%/flv2mp3.1.gz
+%%PERL5_MAN1%%/flv2swf.1.gz
+%%PERL5_MAN1%%/flvinfo.1.gz
+%%PERL5_MAN1%%/swf2flv.1.gz
diff --git a/multimedia/p5-Subtitles/pkg-plist b/multimedia/p5-Subtitles/pkg-plist
index 32580fd09643..548e7d226b2f 100644
--- a/multimedia/p5-Subtitles/pkg-plist
+++ b/multimedia/p5-Subtitles/pkg-plist
@@ -1,6 +1,6 @@
bin/subs
%%PERL5_MAN3%%/Subtitles.3.gz
-man/man1/subs.1.gz
+%%PERL5_MAN1%%/subs.1.gz
%%SUBPLAY%%bin/subplay
-%%SUBPLAY%%man/man1/subplay.1.gz
+%%SUBPLAY%%%%PERL5_MAN1%%/subplay.1.gz
%%SITE_PERL%%/Subtitles.pm
diff --git a/multimedia/umph/Makefile b/multimedia/umph/Makefile
index 6e3feee25963..0b46ec7b5a1c 100644
--- a/multimedia/umph/Makefile
+++ b/multimedia/umph/Makefile
@@ -21,6 +21,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PERL5= configure
USES= perl5
-PLIST_FILES= bin/umph man/man1/umph.1.gz
+PLIST_FILES= bin/umph ${SITE_MAN1}/umph.1.gz
.include <bsd.port.mk>
diff --git a/net-im/sendxmpp/Makefile b/net-im/sendxmpp/Makefile
index 12b43ed38163..4ee338df6fe8 100644
--- a/net-im/sendxmpp/Makefile
+++ b/net-im/sendxmpp/Makefile
@@ -22,7 +22,7 @@ USE_PERL5= configure
NO_ARCH= yes
PORTEXAMPLES= send-url.xml sendxmpp-raw-messages
-PLIST_FILES= bin/sendxmpp man/man1/sendxmpp.1.gz
+PLIST_FILES= bin/sendxmpp ${SITE_MAN1}/sendxmpp.1.gz
OPTIONS_DEFINE= EXAMPLES
diff --git a/net-im/twitmail/pkg-plist b/net-im/twitmail/pkg-plist
index 8fe81b7d535b..244e274ce816 100644
--- a/net-im/twitmail/pkg-plist
+++ b/net-im/twitmail/pkg-plist
@@ -1,2 +1,2 @@
bin/twitmail
-man/man1/twitmail.1.gz
+%%PERL5_MAN1%%/twitmail.1.gz
diff --git a/net-mgmt/2ping/Makefile b/net-mgmt/2ping/Makefile
index 0537255e8ae6..1acb56564c39 100644
--- a/net-mgmt/2ping/Makefile
+++ b/net-mgmt/2ping/Makefile
@@ -20,7 +20,7 @@ USE_PERL5= configure
USES= perl5
PLIST_FILES= bin/2ping \
- man/man1/2ping.1.gz
+ ${SITE_MAN1}/2ping.1.gz
post-patch:
@${REINPLACE_CMD} -e 's|2ping.1p|2ping.1|' ${WRKSRC}/Makefile.PL
diff --git a/net-mgmt/icli/pkg-plist b/net-mgmt/icli/pkg-plist
index bae60566e56b..1c32da72d5e1 100644
--- a/net-mgmt/icli/pkg-plist
+++ b/net-mgmt/icli/pkg-plist
@@ -3,4 +3,4 @@ bin/icli
%%PERL5_MAN3%%/App::Icli::ConfigData.3.gz
%%SITE_PERL%%/App/Icli.pm
%%SITE_PERL%%/App/Icli/ConfigData.pm
-man/man1/icli.1.gz
+%%PERL5_MAN1%%/icli.1.gz
diff --git a/net-mgmt/nagios-check_postgres/pkg-plist b/net-mgmt/nagios-check_postgres/pkg-plist
index e54ffc17260f..ba6c486d5549 100644
--- a/net-mgmt/nagios-check_postgres/pkg-plist
+++ b/net-mgmt/nagios-check_postgres/pkg-plist
@@ -55,5 +55,5 @@ bin/check_postgres.pl
%%NAGIOS%%libexec/nagios/check_postgres_txn_wraparound
%%NAGIOS%%libexec/nagios/check_postgres_version
%%NAGIOS%%libexec/nagios/check_postgres_wal_files
-man/man1/check_postgres.1p.gz
+%%PERL5_MAN1%%/check_postgres.1p.gz
%%CACTI%%share/cacti/scripts/check_postgres_dbstats
diff --git a/net-mgmt/netdisco/pkg-plist b/net-mgmt/netdisco/pkg-plist
index d3f8fb40e6d7..390d35fab0cf 100644
--- a/net-mgmt/netdisco/pkg-plist
+++ b/net-mgmt/netdisco/pkg-plist
@@ -462,16 +462,16 @@ bin/netdisco-web-fg
%%SITE_PERL%%/auto/share/dist/App-Netdisco/views/sidebar/search/device.tt
%%SITE_PERL%%/auto/share/dist/App-Netdisco/views/sidebar/search/node.tt
%%SITE_PERL%%/auto/share/dist/App-Netdisco/views/sidebar/search/port.tt
-man/man1/nd-import-topology.1.gz
-man/man1/netdisco-daemon-fg.1.gz
-man/man1/netdisco-daemon.1.gz
-man/man1/netdisco-db-deploy.1.gz
-man/man1/netdisco-deploy.1.gz
-man/man1/netdisco-do.1.gz
-man/man1/netdisco-rancid-export.1.gz
-man/man1/netdisco-sshcollector.1.gz
-man/man1/netdisco-web-fg.1.gz
-man/man1/netdisco-web.1.gz
+%%PERL5_MAN1%%/nd-import-topology.1.gz
+%%PERL5_MAN1%%/netdisco-daemon-fg.1.gz
+%%PERL5_MAN1%%/netdisco-daemon.1.gz
+%%PERL5_MAN1%%/netdisco-db-deploy.1.gz
+%%PERL5_MAN1%%/netdisco-deploy.1.gz
+%%PERL5_MAN1%%/netdisco-do.1.gz
+%%PERL5_MAN1%%/netdisco-rancid-export.1.gz
+%%PERL5_MAN1%%/netdisco-sshcollector.1.gz
+%%PERL5_MAN1%%/netdisco-web-fg.1.gz
+%%PERL5_MAN1%%/netdisco-web.1.gz
@dir %%SITE_PERL%%/App/Netdisco/AnyEvent
@dir %%SITE_PERL%%/App/Netdisco/Core
@dir %%SITE_PERL%%/App/Netdisco/DB/Result/Virtual
diff --git a/net-mgmt/netspoc/pkg-plist b/net-mgmt/netspoc/pkg-plist
index 71e4e0ebe117..f81f66726d18 100644
--- a/net-mgmt/netspoc/pkg-plist
+++ b/net-mgmt/netspoc/pkg-plist
@@ -3,5 +3,5 @@ bin/netspoc
bin/print-group
%%PERL5_MAN3%%/Netspoc.3.gz
%%SITE_PERL%%/Netspoc.pm
-man/man1/netspoc.1.gz
-man/man1/print-group.1.gz
+%%PERL5_MAN1%%/netspoc.1.gz
+%%PERL5_MAN1%%/print-group.1.gz
diff --git a/net-mgmt/ocsinventory-agent/pkg-plist b/net-mgmt/ocsinventory-agent/pkg-plist
index 89dd30c2a84b..a6417223614a 100644
--- a/net-mgmt/ocsinventory-agent/pkg-plist
+++ b/net-mgmt/ocsinventory-agent/pkg-plist
@@ -214,4 +214,4 @@ bin/ocsinventory-agent
%%SITE_PERL%%/Ocsinventory/LoggerBackend/Stderr.pm
%%SITE_PERL%%/Ocsinventory/LoggerBackend/Syslog.pm
%%SITE_PERL%%/Ocsinventory/Unix/postinst.pl
-man/man1/ocsinventory-agent.1.gz
+%%PERL5_MAN1%%/ocsinventory-agent.1.gz
diff --git a/net-mgmt/p5-Cflow/pkg-plist b/net-mgmt/p5-Cflow/pkg-plist
index fc6ef10a66a3..4c9f2ebfc2bb 100644
--- a/net-mgmt/p5-Cflow/pkg-plist
+++ b/net-mgmt/p5-Cflow/pkg-plist
@@ -3,4 +3,4 @@ bin/flowdumper
%%SITE_ARCH%%/auto/Cflow/autosplit.ix
%%SITE_ARCH%%/Cflow.pm
%%PERL5_MAN3%%/Cflow.3.gz
-man/man1/flowdumper.1.gz
+%%PERL5_MAN1%%/flowdumper.1.gz
diff --git a/net-mgmt/p5-FusionInventory-Agent/pkg-plist b/net-mgmt/p5-FusionInventory-Agent/pkg-plist
index 6f2dc53bc008..bd787a1a6406 100644
--- a/net-mgmt/p5-FusionInventory-Agent/pkg-plist
+++ b/net-mgmt/p5-FusionInventory-Agent/pkg-plist
@@ -39,8 +39,8 @@ bin/fusioninventory-injector
%%PERL5_MAN3%%/FusionInventory::Agent::XML::Query::Inventory.3.gz
%%PERL5_MAN3%%/FusionInventory::Agent::XML::Query::Prolog.3.gz
%%PERL5_MAN3%%/FusionInventory::Agent::XML::Response.3.gz
-man/man1/fusioninventory-agent.1.gz
-man/man1/fusioninventory-injector.1.gz
+%%PERL5_MAN1%%/fusioninventory-agent.1.gz
+%%PERL5_MAN1%%/fusioninventory-injector.1.gz
share/fusioninventory/lib/FusionInventory/Agent.pm
share/fusioninventory/lib/FusionInventory/Agent/Config.pm
share/fusioninventory/lib/FusionInventory/Agent/HTTP/Client.pm
diff --git a/net-mgmt/p5-Nagios-Object/pkg-plist b/net-mgmt/p5-Nagios-Object/pkg-plist
index 9c1ea0045f2d..f174dbf3219c 100644
--- a/net-mgmt/p5-Nagios-Object/pkg-plist
+++ b/net-mgmt/p5-Nagios-Object/pkg-plist
@@ -3,11 +3,11 @@ bin/decode_flags.pl
bin/parse.pl
bin/statusdat_demo.pl
bin/test_configuration.pl
-man/man1/config_status_demo.pl.1.gz
-man/man1/decode_flags.pl.1.gz
-man/man1/parse.pl.1.gz
-man/man1/statusdat_demo.pl.1.gz
-man/man1/test_configuration.pl.1.gz
+%%PERL5_MAN1%%/config_status_demo.pl.1.gz
+%%PERL5_MAN1%%/decode_flags.pl.1.gz
+%%PERL5_MAN1%%/parse.pl.1.gz
+%%PERL5_MAN1%%/statusdat_demo.pl.1.gz
+%%PERL5_MAN1%%/test_configuration.pl.1.gz
%%SITE_PERL%%/Nagios/Config.pm
%%SITE_PERL%%/Nagios/Object.pm
%%SITE_PERL%%/Nagios/StatusLog.pm
diff --git a/net-mgmt/p5-Net-IPv4Addr/pkg-plist b/net-mgmt/p5-Net-IPv4Addr/pkg-plist
index af7b716808b8..3d7834d98346 100644
--- a/net-mgmt/p5-Net-IPv4Addr/pkg-plist
+++ b/net-mgmt/p5-Net-IPv4Addr/pkg-plist
@@ -2,4 +2,4 @@ bin/ipv4calc
%%PERL5_MAN3%%/Net::IPv4Addr.3.gz
%%SITE_PERL%%/Net/IPv4Addr.pm
%%SITE_PERL%%/auto/Net/IPv4Addr/autosplit.ix
-man/man1/ipv4calc.1.gz
+%%PERL5_MAN1%%/ipv4calc.1.gz
diff --git a/net-mgmt/p5-Net-SNMP/pkg-plist b/net-mgmt/p5-Net-SNMP/pkg-plist
index 6c84f50d8c7c..2a00fcacb495 100644
--- a/net-mgmt/p5-Net-SNMP/pkg-plist
+++ b/net-mgmt/p5-Net-SNMP/pkg-plist
@@ -15,4 +15,4 @@ bin/snmpkey
%%SITE_PERL%%/Net/SNMP/Transport/IPv6/TCP.pm
%%SITE_PERL%%/Net/SNMP/Transport/IPv6/UDP.pm
%%PERL5_MAN3%%/Net::SNMP.3.gz
-man/man1/snmpkey.1.gz
+%%PERL5_MAN1%%/snmpkey.1.gz
diff --git a/net-mgmt/p5-Net-SNMPTrapd/pkg-plist b/net-mgmt/p5-Net-SNMPTrapd/pkg-plist
index d4f9e0e63dfb..418ae980b117 100644
--- a/net-mgmt/p5-Net-SNMPTrapd/pkg-plist
+++ b/net-mgmt/p5-Net-SNMPTrapd/pkg-plist
@@ -2,5 +2,5 @@ bin/snmptrapd-simple.pl
bin/snmptrapd-sendtest.pl
%%SITE_PERL%%/Net/SNMPTrapd.pm
%%PERL5_MAN3%%/Net::SNMPTrapd.3.gz
-man/man1/snmptrapd-sendtest.pl.1.gz
-man/man1/snmptrapd-simple.pl.1.gz
+%%PERL5_MAN1%%/snmptrapd-sendtest.pl.1.gz
+%%PERL5_MAN1%%/snmptrapd-simple.pl.1.gz
diff --git a/net-mgmt/p5-jmx4perl/pkg-plist b/net-mgmt/p5-jmx4perl/pkg-plist
index fe56e07a0035..63f0a1fb68ce 100644
--- a/net-mgmt/p5-jmx4perl/pkg-plist
+++ b/net-mgmt/p5-jmx4perl/pkg-plist
@@ -3,11 +3,11 @@ bin/check_jmx4perl
bin/j4psh
bin/jmx4perl
bin/jolokia
-man/man1/cacti_jmx4perl.1.gz
-man/man1/check_jmx4perl.1.gz
-man/man1/j4psh.1.gz
-man/man1/jmx4perl.1.gz
-man/man1/jolokia.1.gz
+%%PERL5_MAN1%%/cacti_jmx4perl.1.gz
+%%PERL5_MAN1%%/check_jmx4perl.1.gz
+%%PERL5_MAN1%%/j4psh.1.gz
+%%PERL5_MAN1%%/jmx4perl.1.gz
+%%PERL5_MAN1%%/jolokia.1.gz
%%PERL5_MAN3%%/JMX::Jmx4Perl.3.gz
%%PERL5_MAN3%%/JMX::Jmx4Perl::Agent.3.gz
%%PERL5_MAN3%%/JMX::Jmx4Perl::Agent::Jolokia::ArtifactHandler.3.gz
diff --git a/net-mgmt/pancho/pkg-plist b/net-mgmt/pancho/pkg-plist
index 6999d7809180..b6901a49befe 100644
--- a/net-mgmt/pancho/pkg-plist
+++ b/net-mgmt/pancho/pkg-plist
@@ -1,6 +1,6 @@
bin/pancho
@sample etc/pancho.conf.sample
-man/man1/pancho.1.gz
+%%PERL5_MAN1%%/pancho.1.gz
%%SITE_PERL%%/Pancho/Util.pm
%%SITE_PERL%%/Pancho/Snmp.pm
%%SITE_PERL%%/Pancho/Log.pm
diff --git a/net-p2p/p5-Net-BitTorrent/pkg-plist b/net-p2p/p5-Net-BitTorrent/pkg-plist
index 45cf81612e49..25b07a580fb9 100644
--- a/net-p2p/p5-Net-BitTorrent/pkg-plist
+++ b/net-p2p/p5-Net-BitTorrent/pkg-plist
@@ -25,4 +25,4 @@ bin/net-bittorrent.pl
%%PERL5_MAN3%%/Net::BitTorrent::Torrent::Tracker::UDP.3.gz
%%PERL5_MAN3%%/Net::BitTorrent::Util.3.gz
%%PERL5_MAN3%%/Net::BitTorrent::Version.3.gz
-man/man1/net-bittorrent.pl.1.gz
+%%PERL5_MAN1%%/net-bittorrent.pl.1.gz
diff --git a/net-p2p/p5-Net-DirectConnect/pkg-plist b/net-p2p/p5-Net-DirectConnect/pkg-plist
index 934f9b7f895a..670b61c31991 100644
--- a/net-p2p/p5-Net-DirectConnect/pkg-plist
+++ b/net-p2p/p5-Net-DirectConnect/pkg-plist
@@ -19,5 +19,5 @@ bin/dcshare
%%SITE_PERL%%/Net/DirectConnect/sctp.pm
%%PERL5_MAN3%%/Net::DirectConnect.3.gz
%%PERL5_MAN3%%/Net::DirectConnect::filelist.3.gz
-man/man1/dcget.1.gz
-man/man1/dcshare.1.gz
+%%PERL5_MAN1%%/dcget.1.gz
+%%PERL5_MAN1%%/dcshare.1.gz
diff --git a/net/ldapsh/pkg-plist b/net/ldapsh/pkg-plist
index 4f8ae7b11385..aaf9096eb5a1 100644
--- a/net/ldapsh/pkg-plist
+++ b/net/ldapsh/pkg-plist
@@ -23,6 +23,6 @@ bin/ldapsh
%%PERL5_MAN3%%/Net::LDAP::Shell.3.gz
%%PERL5_MAN3%%/Net::LDAP::Shell::Parse.3.gz
%%PERL5_MAN3%%/Net::LDAP::Shell::Util.3.gz
-man/man1/ldapsh.1.gz
+%%PERL5_MAN1%%/ldapsh.1.gz
%%DOCSDIR%%/COMMANDS
%%EXAMPLESDIR%%/ldapsh_config
diff --git a/net/p5-Geo-IP-PurePerl/pkg-plist b/net/p5-Geo-IP-PurePerl/pkg-plist
index 7ce2b0997d5d..9e401d3ad3c7 100644
--- a/net/p5-Geo-IP-PurePerl/pkg-plist
+++ b/net/p5-Geo-IP-PurePerl/pkg-plist
@@ -1,4 +1,4 @@
bin/geoip-lookup
%%PERL5_MAN3%%/Geo::IP::PurePerl.3.gz
%%SITE_PERL%%/Geo/IP/PurePerl.pm
-man/man1/geoip-lookup.1.gz
+%%PERL5_MAN1%%/geoip-lookup.1.gz
diff --git a/net/p5-IP-Country/pkg-plist b/net/p5-IP-Country/pkg-plist
index eb459e168735..dcf97bf239b9 100644
--- a/net/p5-IP-Country/pkg-plist
+++ b/net/p5-IP-Country/pkg-plist
@@ -1,5 +1,5 @@
bin/ip2cc
-man/man1/ip2cc.1.gz
+%%PERL5_MAN1%%/ip2cc.1.gz
%%PERL5_MAN3%%/IP::Authority.3.gz
%%PERL5_MAN3%%/IP::Country.3.gz
%%PERL5_MAN3%%/IP::Country::Fast.3.gz
diff --git a/net/p5-Net-Amazon-S3/pkg-plist b/net/p5-Net-Amazon-S3/pkg-plist
index 2bc0b62ab759..40e54fd7de58 100644
--- a/net/p5-Net-Amazon-S3/pkg-plist
+++ b/net/p5-Net-Amazon-S3/pkg-plist
@@ -51,4 +51,4 @@ bin/s3cl
%%PERL5_MAN3%%/Net::Amazon::S3::Request::PutPart.3.gz
%%PERL5_MAN3%%/Net::Amazon::S3::Request::SetBucketAccessControl.3.gz
%%PERL5_MAN3%%/Net::Amazon::S3::Request::SetObjectAccessControl.3.gz
-man/man1/s3cl.1.gz
+%%PERL5_MAN1%%/s3cl.1.gz
diff --git a/net/p5-Net-Appliance-Session/pkg-plist b/net/p5-Net-Appliance-Session/pkg-plist
index f26436677fe6..dbb7c97dd968 100644
--- a/net/p5-Net-Appliance-Session/pkg-plist
+++ b/net/p5-Net-Appliance-Session/pkg-plist
@@ -5,4 +5,4 @@ bin/nas
%%SITE_PERL%%/Net/Appliance/Session/Engine.pm
%%SITE_PERL%%/Net/Appliance/Session/Scripting.pm
%%SITE_PERL%%/Net/Appliance/Session/Transport.pm
-man/man1/nas.1.gz
+%%PERL5_MAN1%%/nas.1.gz
diff --git a/net/p5-Net-FS-Flickr/pkg-plist b/net/p5-Net-FS-Flickr/pkg-plist
index 2d8a7cd5ed6a..51a6691785c5 100644
--- a/net/p5-Net-FS-Flickr/pkg-plist
+++ b/net/p5-Net-FS-Flickr/pkg-plist
@@ -4,4 +4,4 @@ bin/flickrfs
%%SITE_PERL%%/Net/FS/Flickr/DefaultImage.pm
%%PERL5_MAN3%%/Net::FS::Flickr.3.gz
%%PERL5_MAN3%%/Net::FS::Flickr::Access.3.gz
-man/man1/flickrfs.1.gz
+%%PERL5_MAN1%%/flickrfs.1.gz
diff --git a/net/p5-Net-FS-Gmail/pkg-plist b/net/p5-Net-FS-Gmail/pkg-plist
index 665ddb3861d4..40d523dd90bd 100644
--- a/net/p5-Net-FS-Gmail/pkg-plist
+++ b/net/p5-Net-FS-Gmail/pkg-plist
@@ -1,4 +1,4 @@
bin/gmailfs
-man/man1/gmailfs.1.gz
+%%PERL5_MAN1%%/gmailfs.1.gz
%%PERL5_MAN3%%/Net::FS::Gmail.3.gz
%%SITE_PERL%%/Net/FS/Gmail.pm
diff --git a/net/p5-Net-Google-PicasaWeb/pkg-plist b/net/p5-Net-Google-PicasaWeb/pkg-plist
index 5b9c15c9754f..cfc736714b84 100644
--- a/net/p5-Net-Google-PicasaWeb/pkg-plist
+++ b/net/p5-Net-Google-PicasaWeb/pkg-plist
@@ -17,6 +17,6 @@ bin/picasa-list
%%PERL5_MAN3%%/Net::Google::PicasaWeb::Media.3.gz
%%PERL5_MAN3%%/Net::Google::PicasaWeb::MediaEntry.3.gz
%%PERL5_MAN3%%/Net::Google::PicasaWeb::MediaFeed.3.gz
-man/man1/picasa.1.gz
-man/man1/picasa-get.1.gz
-man/man1/picasa-list.1.gz
+%%PERL5_MAN1%%/picasa.1.gz
+%%PERL5_MAN1%%/picasa-get.1.gz
+%%PERL5_MAN1%%/picasa-list.1.gz
diff --git a/net/p5-Net-NIS-Listgroup/pkg-plist b/net/p5-Net-NIS-Listgroup/pkg-plist
index 6beb66cfb3fc..141d366a52c0 100644
--- a/net/p5-Net-NIS-Listgroup/pkg-plist
+++ b/net/p5-Net-NIS-Listgroup/pkg-plist
@@ -2,4 +2,4 @@
%%SITE_PERL%%/Net/NIS/Listgroup.pm
bin/listgroup
bin/make_cron
-man/man1/listgroup.1.gz
+%%PERL5_MAN1%%/listgroup.1.gz
diff --git a/net/p5-Net-OpenStack-Attack/pkg-plist b/net/p5-Net-OpenStack-Attack/pkg-plist
index 5dc01e837180..01aa73ea2382 100644
--- a/net/p5-Net-OpenStack-Attack/pkg-plist
+++ b/net/p5-Net-OpenStack-Attack/pkg-plist
@@ -1,4 +1,4 @@
bin/stackattack
%%SITE_PERL%%/Net/OpenStack/Attack.pm
%%PERL5_MAN3%%/Net::OpenStack::Attack.3.gz
-man/man1/stackattack.1.gz
+%%PERL5_MAN1%%/stackattack.1.gz
diff --git a/net/p5-Net-Pcap/pkg-plist b/net/p5-Net-Pcap/pkg-plist
index a26d254bb79c..977806e3a459 100644
--- a/net/p5-Net-Pcap/pkg-plist
+++ b/net/p5-Net-Pcap/pkg-plist
@@ -2,4 +2,4 @@ bin/pcapinfo
%%SITE_ARCH%%/Net/Pcap.pm
%%SITE_ARCH%%/auto/Net/Pcap/Pcap.so
%%PERL5_MAN3%%/Net::Pcap.3.gz
-man/man1/pcapinfo.1.gz
+%%PERL5_MAN1%%/pcapinfo.1.gz
diff --git a/net/p5-Net-Proxy/pkg-plist b/net/p5-Net-Proxy/pkg-plist
index 700c69139f7f..f71f2e9b6623 100644
--- a/net/p5-Net-Proxy/pkg-plist
+++ b/net/p5-Net-Proxy/pkg-plist
@@ -1,7 +1,7 @@
bin/connect-tunnel
bin/sslh
-man/man1/connect-tunnel.1.gz
-man/man1/sslh.1.gz
+%%PERL5_MAN1%%/connect-tunnel.1.gz
+%%PERL5_MAN1%%/sslh.1.gz
%%SITE_PERL%%/Net/Proxy.pm
%%SITE_PERL%%/Net/Proxy/Connector.pm
%%SITE_PERL%%/Net/Proxy/Connector/connect.pm
diff --git a/net/p5-Net-RTP/pkg-plist b/net/p5-Net-RTP/pkg-plist
index 278037a9863a..ea5223d438e2 100644
--- a/net/p5-Net-RTP/pkg-plist
+++ b/net/p5-Net-RTP/pkg-plist
@@ -7,8 +7,8 @@ bin/rtptimer.pl
%%PERL5_MAN3%%/Net::RTP::Packet.3.gz
%%SITE_PERL%%/Net/RTP.pm
%%SITE_PERL%%/Net/RTP/Packet.pm
-man/man1/rtpdump.pl.1.gz
-man/man1/rtplosslog.pl.1.gz
-man/man1/rtpsend-pcmu.pl.1.gz
-man/man1/rtpstats.pl.1.gz
-man/man1/rtptimer.pl.1.gz
+%%PERL5_MAN1%%/rtpdump.pl.1.gz
+%%PERL5_MAN1%%/rtplosslog.pl.1.gz
+%%PERL5_MAN1%%/rtpsend-pcmu.pl.1.gz
+%%PERL5_MAN1%%/rtpstats.pl.1.gz
+%%PERL5_MAN1%%/rtptimer.pl.1.gz
diff --git a/net/p5-Net-SAP/pkg-plist b/net/p5-Net-SAP/pkg-plist
index f03c1e9f4415..810ca27c1c57 100644
--- a/net/p5-Net-SAP/pkg-plist
+++ b/net/p5-Net-SAP/pkg-plist
@@ -3,4 +3,4 @@ bin/psapd
%%PERL5_MAN3%%/Net::SAP::Packet.3.gz
%%SITE_PERL%%/Net/SAP.pm
%%SITE_PERL%%/Net/SAP/Packet.pm
-man/man1/psapd.1.gz
+%%PERL5_MAN1%%/psapd.1.gz
diff --git a/net/p5-Net-SDP/pkg-plist b/net/p5-Net-SDP/pkg-plist
index 27f31efab29e..f9f22450965c 100644
--- a/net/p5-Net-SDP/pkg-plist
+++ b/net/p5-Net-SDP/pkg-plist
@@ -5,4 +5,4 @@ bin/sdp2rat
%%SITE_PERL%%/Net/SDP.pm
%%SITE_PERL%%/Net/SDP/Media.pm
%%SITE_PERL%%/Net/SDP/Time.pm
-man/man1/sdp2rat.1.gz
+%%PERL5_MAN1%%/sdp2rat.1.gz
diff --git a/net/p5-Net-SPDY/pkg-plist b/net/p5-Net-SPDY/pkg-plist
index 916b084b469a..48800281b541 100644
--- a/net/p5-Net-SPDY/pkg-plist
+++ b/net/p5-Net-SPDY/pkg-plist
@@ -8,5 +8,5 @@ bin/spdy-server.pl
%%PERL5_MAN3%%/Net::SPDY::Compressor.3.gz
%%PERL5_MAN3%%/Net::SPDY::Framer.3.gz
%%PERL5_MAN3%%/Net::SPDY::Session.3.gz
-man/man1/spdy-client.pl.1.gz
-man/man1/spdy-server.pl.1.gz
+%%PERL5_MAN1%%/spdy-client.pl.1.gz
+%%PERL5_MAN1%%/spdy-server.pl.1.gz
diff --git a/net/p5-Net-Server/pkg-plist b/net/p5-Net-Server/pkg-plist
index 54add2fa9d9f..55d21f7233f1 100644
--- a/net/p5-Net-Server/pkg-plist
+++ b/net/p5-Net-Server/pkg-plist
@@ -42,4 +42,4 @@ bin/net-server
%%SITE_PERL%%/Net/Server/Proto/UNIXDGRAM.pm
%%SITE_PERL%%/Net/Server/SIG.pm
%%SITE_PERL%%/Net/Server/Single.pm
-man/man1/net-server.1.gz
+%%PERL5_MAN1%%/net-server.1.gz
diff --git a/net/p5-Net-VNC/pkg-plist b/net/p5-Net-VNC/pkg-plist
index 9fcb86d6d168..9e75418f0fc9 100644
--- a/net/p5-Net-VNC/pkg-plist
+++ b/net/p5-Net-VNC/pkg-plist
@@ -1,4 +1,4 @@
bin/vnccapture
%%PERL5_MAN3%%/Net::VNC.3.gz
%%SITE_PERL%%/Net/VNC.pm
-man/man1/vnccapture.1.gz
+%%PERL5_MAN1%%/vnccapture.1.gz
diff --git a/net/p5-Net-Whois-Raw/pkg-plist b/net/p5-Net-Whois-Raw/pkg-plist
index 4f224e7106f9..bdbf3f8d9ab3 100644
--- a/net/p5-Net-Whois-Raw/pkg-plist
+++ b/net/p5-Net-Whois-Raw/pkg-plist
@@ -3,4 +3,4 @@ bin/pwhois
%%SITE_PERL%%/Net/Whois/Raw/Common.pm
%%SITE_PERL%%/Net/Whois/Raw/Data.pm
%%PERL5_MAN3%%/Net::Whois::Raw.3.gz
-man/man1/pwhois.1.gz
+%%PERL5_MAN1%%/pwhois.1.gz
diff --git a/net/p5-OAI-Harvester/pkg-plist b/net/p5-OAI-Harvester/pkg-plist
index 96874776a86f..4d170828631e 100644
--- a/net/p5-OAI-Harvester/pkg-plist
+++ b/net/p5-OAI-Harvester/pkg-plist
@@ -27,5 +27,5 @@ bin/oai-listsets
%%PERL5_MAN3%%/Net::OAI::Record::Header.3.gz
%%PERL5_MAN3%%/Net::OAI::Record::OAI_DC.3.gz
%%PERL5_MAN3%%/Net::OAI::ResumptionToken.3.gz
-man/man1/oai-listrecords.1.gz
-man/man1/oai-listsets.1.gz
+%%PERL5_MAN1%%/oai-listrecords.1.gz
+%%PERL5_MAN1%%/oai-listsets.1.gz
diff --git a/net/p5-OurNet-BBS/pkg-plist b/net/p5-OurNet-BBS/pkg-plist
index bd75cd9b8ffd..bcafbfd4e7c7 100644
--- a/net/p5-OurNet-BBS/pkg-plist
+++ b/net/p5-OurNet-BBS/pkg-plist
@@ -118,6 +118,6 @@ bin/bbsmail
%%PERL5_MAN3%%/OurNet::BBS.3.gz
%%PERL5_MAN3%%/OurNet::BBS::Roadmap.3.gz
%%PERL5_MAN3%%/OurNet::BBS::Tutorial.3.gz
-man/man1/bbsboard.1.gz
-man/man1/bbscomd.1.gz
-man/man1/bbsmail.1.gz
+%%PERL5_MAN1%%/bbsboard.1.gz
+%%PERL5_MAN1%%/bbscomd.1.gz
+%%PERL5_MAN1%%/bbsmail.1.gz
diff --git a/net/p5-RPC-XML/pkg-plist b/net/p5-RPC-XML/pkg-plist
index 0b97d3c96292..dffb1fb5685f 100644
--- a/net/p5-RPC-XML/pkg-plist
+++ b/net/p5-RPC-XML/pkg-plist
@@ -27,4 +27,4 @@ bin/make_method
%%PERL5_MAN3%%/RPC::XML::ParserFactory.3.gz
%%PERL5_MAN3%%/RPC::XML::Procedure.3.gz
%%PERL5_MAN3%%/RPC::XML::Server.3.gz
-man/man1/make_method.1.gz
+%%PERL5_MAN1%%/make_method.1.gz
diff --git a/net/p5-SOAP-Lite/pkg-plist b/net/p5-SOAP-Lite/pkg-plist
index de48b6e7678c..5fa61dc87ec9 100644
--- a/net/p5-SOAP-Lite/pkg-plist
+++ b/net/p5-SOAP-Lite/pkg-plist
@@ -51,5 +51,5 @@ bin/stubmaker.pl
%%PERL5_MAN3%%/SOAP::Transport::POP3.3.gz
%%PERL5_MAN3%%/SOAP::Transport::TCP.3.gz
%%PERL5_MAN3%%/SOAP::Utils.3.gz
-man/man1/SOAPsh.pl.1.gz
-man/man1/stubmaker.pl.1.gz
+%%PERL5_MAN1%%/SOAPsh.pl.1.gz
+%%PERL5_MAN1%%/stubmaker.pl.1.gz
diff --git a/net/p5-Server-Starter/pkg-plist b/net/p5-Server-Starter/pkg-plist
index 96437541ee2e..1abf0cdde1ff 100644
--- a/net/p5-Server-Starter/pkg-plist
+++ b/net/p5-Server-Starter/pkg-plist
@@ -2,4 +2,4 @@ bin/start_server
%%SITE_PERL%%/Server/Starter.pm
%%SITE_PERL%%/Server/Starter/Guard.pm
%%PERL5_MAN3%%/Server::Starter.3.gz
-man/man1/start_server.1.gz
+%%PERL5_MAN1%%/start_server.1.gz
diff --git a/net/p5-Socket-GetAddrInfo/pkg-plist b/net/p5-Socket-GetAddrInfo/pkg-plist
index bdf7cd3b6197..bd508c5a7d10 100644
--- a/net/p5-Socket-GetAddrInfo/pkg-plist
+++ b/net/p5-Socket-GetAddrInfo/pkg-plist
@@ -10,5 +10,5 @@ bin/getnameinfo
%%PERL5_MAN3%%/Socket::GetAddrInfo::Emul.3.gz
%%PERL5_MAN3%%/Socket::GetAddrInfo::Socket6api.3.gz
%%PERL5_MAN3%%/Socket::GetAddrInfo::Strict.3.gz
-man/man1/getaddrinfo.1.gz
-man/man1/getnameinfo.1.gz
+%%PERL5_MAN1%%/getaddrinfo.1.gz
+%%PERL5_MAN1%%/getnameinfo.1.gz
diff --git a/net/p5-VM-EC2/pkg-plist b/net/p5-VM-EC2/pkg-plist
index c8882f24b97d..ef6934883264 100644
--- a/net/p5-VM-EC2/pkg-plist
+++ b/net/p5-VM-EC2/pkg-plist
@@ -353,4 +353,4 @@ bin/sync_to_snapshot.pl
%%PERL5_MAN3%%/VM::EC2::Volume::Status::Details.3.gz
%%PERL5_MAN3%%/VM::EC2::Volume::Status::Event.3.gz
%%PERL5_MAN3%%/VM::EC2::Volume::StatusItem.3.gz
-man/man1/migrate-ebs-image.pl.1.gz
+%%PERL5_MAN1%%/migrate-ebs-image.pl.1.gz
diff --git a/net/rdapper/Makefile b/net/rdapper/Makefile
index 669aa813fc75..6fa9db4808c6 100644
--- a/net/rdapper/Makefile
+++ b/net/rdapper/Makefile
@@ -18,6 +18,6 @@ GH_ACCOUNT= jodrell
GH_TAGNAME= c6961117a5
USE_PERL5= configure run
-PLIST_FILES= bin/rdapper man/man1/rdapper.1.gz
+PLIST_FILES= bin/rdapper ${SITE_MAN1}/rdapper.1.gz
.include <bsd.port.mk>
diff --git a/net/wakeonlan/pkg-plist b/net/wakeonlan/pkg-plist
index ab19c61824d1..b408d1ed1c95 100644
--- a/net/wakeonlan/pkg-plist
+++ b/net/wakeonlan/pkg-plist
@@ -1,3 +1,3 @@
bin/wakeonlan
-man/man1/wakeonlan.1.gz
+%%PERL5_MAN1%%/wakeonlan.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lab001.wol
diff --git a/palm/p5-Palm/pkg-plist b/palm/p5-Palm/pkg-plist
index f98249e842d8..1b8e059618d5 100644
--- a/palm/p5-Palm/pkg-plist
+++ b/palm/p5-Palm/pkg-plist
@@ -15,4 +15,4 @@ bin/pdbdump
%%PERL5_MAN3%%/Palm::Raw.3.gz
%%PERL5_MAN3%%/Palm::StdAppInfo.3.gz
%%PERL5_MAN3%%/Palm::ToDo.3.gz
-man/man1/pdbdump.1.gz
+%%PERL5_MAN1%%/pdbdump.1.gz
diff --git a/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist b/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist
index c45b43fe20af..de8a58588dae 100644
--- a/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist
+++ b/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist
@@ -4,12 +4,12 @@ bin/find-updated
bin/make-readmes
bin/portindex
bin/portdepends
-man/man1/cache-init.1.gz
-man/man1/cache-update.1.gz
-man/man1/find-updated.1.gz
-man/man1/make-readmes.1.gz
-man/man1/portdepends.1.gz
-man/man1/portindex.1.gz
+%%PERL5_MAN1%%/cache-init.1.gz
+%%PERL5_MAN1%%/cache-update.1.gz
+%%PERL5_MAN1%%/find-updated.1.gz
+%%PERL5_MAN1%%/make-readmes.1.gz
+%%PERL5_MAN1%%/portdepends.1.gz
+%%PERL5_MAN1%%/portindex.1.gz
@sample etc/portindex.cfg.sample
%%SITE_PERL%%/FreeBSD/Portindex/Category.pm
%%SITE_PERL%%/FreeBSD/Portindex/Config.pm
diff --git a/print/a2pdf/pkg-plist b/print/a2pdf/pkg-plist
index 7bd83baf54ac..799d4339c1af 100644
--- a/print/a2pdf/pkg-plist
+++ b/print/a2pdf/pkg-plist
@@ -1,3 +1,3 @@
bin/a2pdf
%%SITE_PERL%%/App/a2pdf.pm
-man/man1/a2pdf.1.gz
+%%PERL5_MAN1%%/a2pdf.1.gz
diff --git a/print/latex-biber/pkg-plist b/print/latex-biber/pkg-plist
index b42e25672b0e..27891947166d 100644
--- a/print/latex-biber/pkg-plist
+++ b/print/latex-biber/pkg-plist
@@ -1,5 +1,5 @@
bin/biber
-man/man1/biber.1.gz
+%%PERL5_MAN1%%/biber.1.gz
%%PERL5_MAN3%%/Biber.3.gz
%%PERL5_MAN3%%/Biber::Config.3.gz
%%PERL5_MAN3%%/Biber::Constants.3.gz
diff --git a/science/p5-Chemistry-Mok/pkg-plist b/science/p5-Chemistry-Mok/pkg-plist
index df28d4d591ff..cfc3440f6cfc 100644
--- a/science/p5-Chemistry-Mok/pkg-plist
+++ b/science/p5-Chemistry-Mok/pkg-plist
@@ -1,4 +1,4 @@
bin/mok
%%SITE_PERL%%/Chemistry/Mok.pm
%%PERL5_MAN3%%/Chemistry::Mok.3.gz
-man/man1/mok.1.gz
+%%PERL5_MAN1%%/mok.1.gz
diff --git a/science/p5-Geo-BUFR/pkg-plist b/science/p5-Geo-BUFR/pkg-plist
index 9a130154aa9e..7515d4f69fd5 100644
--- a/science/p5-Geo-BUFR/pkg-plist
+++ b/science/p5-Geo-BUFR/pkg-plist
@@ -16,8 +16,8 @@ bin/bufrresolve.pl
%%PERL5_MAN3%%/Geo::bufrencode.3.gz
%%PERL5_MAN3%%/Geo::bufrread.3.gz
%%PERL5_MAN3%%/Geo::bufrresolve.3.gz
-man/man1/bufr_reencode.pl.1.gz
-man/man1/bufralter.pl.1.gz
-man/man1/bufrencode.pl.1.gz
-man/man1/bufrread.pl.1.gz
-man/man1/bufrresolve.pl.1.gz
+%%PERL5_MAN1%%/bufr_reencode.pl.1.gz
+%%PERL5_MAN1%%/bufralter.pl.1.gz
+%%PERL5_MAN1%%/bufrencode.pl.1.gz
+%%PERL5_MAN1%%/bufrread.pl.1.gz
+%%PERL5_MAN1%%/bufrresolve.pl.1.gz
diff --git a/science/p5-Physics-Unit/pkg-plist b/science/p5-Physics-Unit/pkg-plist
index 18a8a5b17978..46270cf0d263 100644
--- a/science/p5-Physics-Unit/pkg-plist
+++ b/science/p5-Physics-Unit/pkg-plist
@@ -1,5 +1,5 @@
bin/physics-unit
-man/man1/physics-unit.1.gz
+%%PERL5_MAN1%%/physics-unit.1.gz
%%SITE_PERL%%/Physics/Unit.pm
%%SITE_PERL%%/Physics/Unit/Implementation.pod
%%SITE_PERL%%/Physics/Unit/UnitsByName.pod
diff --git a/security/clusterssh/pkg-plist b/security/clusterssh/pkg-plist
index 59c6e0f73504..1fd3b0b8786f 100644
--- a/security/clusterssh/pkg-plist
+++ b/security/clusterssh/pkg-plist
@@ -3,10 +3,10 @@ bin/crsh
bin/cscp
bin/cssh
bin/ctel
-man/man1/ccon.1.gz
-man/man1/crsh.1.gz
-man/man1/cssh.1.gz
-man/man1/ctel.1.gz
+%%PERL5_MAN1%%/ccon.1.gz
+%%PERL5_MAN1%%/crsh.1.gz
+%%PERL5_MAN1%%/cssh.1.gz
+%%PERL5_MAN1%%/ctel.1.gz
%%SITE_PERL%%/App/ClusterSSH.pm
%%SITE_PERL%%/App/ClusterSSH/Base.pm
%%SITE_PERL%%/App/ClusterSSH/Cluster.pm
diff --git a/security/log2timeline/pkg-plist b/security/log2timeline/pkg-plist
index 097bd3cf0287..e59398d60c99 100644
--- a/security/log2timeline/pkg-plist
+++ b/security/log2timeline/pkg-plist
@@ -186,6 +186,6 @@ bin/timescanner
%%PERL5_MAN3%%/Log2t::output::tab.3.gz
%%PERL5_MAN3%%/Parse::Evtx2.3.gz
%%PERL5_MAN3%%/Parse::Evtx2::Chunk.3.gz
-man/man1/l2t_process.1.gz
-man/man1/log2timeline.1.gz
-man/man1/timescanner.1.gz
+%%PERL5_MAN1%%/l2t_process.1.gz
+%%PERL5_MAN1%%/log2timeline.1.gz
+%%PERL5_MAN1%%/timescanner.1.gz
diff --git a/security/p5-App-Genpass/pkg-plist b/security/p5-App-Genpass/pkg-plist
index 6a27a004c98e..78892b9ef62c 100644
--- a/security/p5-App-Genpass/pkg-plist
+++ b/security/p5-App-Genpass/pkg-plist
@@ -1,4 +1,4 @@
bin/genpass
%%SITE_PERL%%/App/Genpass.pm
%%PERL5_MAN3%%/App::Genpass.3.gz
-man/man1/genpass.1.gz
+%%PERL5_MAN1%%/genpass.1.gz
diff --git a/security/p5-App-TLSMe/pkg-plist b/security/p5-App-TLSMe/pkg-plist
index 240226af1dab..6956133488eb 100644
--- a/security/p5-App-TLSMe/pkg-plist
+++ b/security/p5-App-TLSMe/pkg-plist
@@ -1,4 +1,4 @@
-man/man1/tlsme.1.gz
+%%PERL5_MAN1%%/tlsme.1.gz
%%PERL5_MAN3%%/App::TLSMe.3.gz
%%PERL5_MAN3%%/App::TLSMe::Connection.3.gz
%%PERL5_MAN3%%/App::TLSMe::Connection::http.3.gz
diff --git a/security/p5-Authen-PAAS/pkg-plist b/security/p5-Authen-PAAS/pkg-plist
index e15900d0d00a..1509bb58d8a7 100644
--- a/security/p5-Authen-PAAS/pkg-plist
+++ b/security/p5-Authen-PAAS/pkg-plist
@@ -21,4 +21,4 @@ bin/authen-paas-passwd
%%SITE_PERL%%/Authen/PAAS/Principal.pm
%%SITE_PERL%%/Authen/PAAS/SimpleCallback.pm
%%SITE_PERL%%/Authen/PAAS/Subject.pm
-man/man1/authen-paas-passwd.1.gz
+%%PERL5_MAN1%%/authen-paas-passwd.1.gz
diff --git a/security/p5-Crypt-Primes/pkg-plist b/security/p5-Crypt-Primes/pkg-plist
index ff38cf50cce3..0c6b0409f05f 100644
--- a/security/p5-Crypt-Primes/pkg-plist
+++ b/security/p5-Crypt-Primes/pkg-plist
@@ -1,4 +1,4 @@
bin/largeprimes
%%PERL5_MAN3%%/Crypt::Primes.3.gz
%%SITE_PERL%%/Crypt/Primes.pm
-man/man1/largeprimes.1.gz
+%%PERL5_MAN1%%/largeprimes.1.gz
diff --git a/security/p5-Crypt-T_e_a/pkg-plist b/security/p5-Crypt-T_e_a/pkg-plist
index 312d2232600b..54c64db481a2 100644
--- a/security/p5-Crypt-T_e_a/pkg-plist
+++ b/security/p5-Crypt-T_e_a/pkg-plist
@@ -1,4 +1,4 @@
bin/tea
%%SITE_PERL%%/Crypt/Tea.pm
%%PERL5_MAN3%%/Crypt::Tea.3.gz
-man/man1/tea.1.gz
+%%PERL5_MAN1%%/tea.1.gz
diff --git a/security/p5-Crypt-Tea_JS/pkg-plist b/security/p5-Crypt-Tea_JS/pkg-plist
index d802a21d0cc6..4f2535751d03 100644
--- a/security/p5-Crypt-Tea_JS/pkg-plist
+++ b/security/p5-Crypt-Tea_JS/pkg-plist
@@ -1,5 +1,5 @@
bin/tea
-man/man1/tea.1.gz
+%%PERL5_MAN1%%/tea.1.gz
%%PERL5_MAN3%%/Crypt::Tea_JS.3.gz
%%SITE_ARCH%%/Crypt/Tea_JS.pm
%%SITE_ARCH%%/auto/Crypt/Tea_JS/Tea_JS.so
diff --git a/security/p5-Digest-Whirlpool/pkg-plist b/security/p5-Digest-Whirlpool/pkg-plist
index d1774b220512..05c32bf98f67 100644
--- a/security/p5-Digest-Whirlpool/pkg-plist
+++ b/security/p5-Digest-Whirlpool/pkg-plist
@@ -2,4 +2,4 @@
%%SITE_ARCH%%/auto/Digest/Whirlpool/Whirlpool.so
bin/whirlpoolsum
%%PERL5_MAN3%%/Digest::Whirlpool.3.gz
-man/man1/whirlpoolsum.1.gz
+%%PERL5_MAN1%%/whirlpoolsum.1.gz
diff --git a/security/p5-File-KeePass-Agent/pkg-plist b/security/p5-File-KeePass-Agent/pkg-plist
index a6a5ca84a5e8..ac02c66e0b26 100644
--- a/security/p5-File-KeePass-Agent/pkg-plist
+++ b/security/p5-File-KeePass-Agent/pkg-plist
@@ -5,4 +5,4 @@ bin/fkp-agent
%%PERL5_MAN3%%/File::KeePass::Agent.3.gz
%%PERL5_MAN3%%/File::KeePass::Agent::linux.3.gz
%%PERL5_MAN3%%/File::KeePass::Agent::unix.3.gz
-man/man1/fkp-agent.1.gz
+%%PERL5_MAN1%%/fkp-agent.1.gz
diff --git a/security/p5-Filter-Crypto/pkg-plist b/security/p5-Filter-Crypto/pkg-plist
index 1886c3259af3..d9000d827ea3 100644
--- a/security/p5-Filter-Crypto/pkg-plist
+++ b/security/p5-Filter-Crypto/pkg-plist
@@ -9,4 +9,4 @@ bin/crypt_file
%%PERL5_MAN3%%/Filter::Crypto::CryptFile.3.gz
%%PERL5_MAN3%%/Filter::Crypto::Decrypt.3.gz
%%PERL5_MAN3%%/PAR::Filter::Crypto.3.gz
-man/man1/crypt_file.1.gz
+%%PERL5_MAN1%%/crypt_file.1.gz
diff --git a/security/p5-GnuPG/pkg-plist b/security/p5-GnuPG/pkg-plist
index 6e1a8c42929e..0284bd9066d5 100644
--- a/security/p5-GnuPG/pkg-plist
+++ b/security/p5-GnuPG/pkg-plist
@@ -7,4 +7,4 @@ bin/gpgmailtunl
%%SITE_PERL%%/GnuPG/Tie/Sign.pm
%%PERL5_MAN3%%/GnuPG.3.gz
%%PERL5_MAN3%%/GnuPG::Tie.3.gz
-man/man1/gpgmailtunl.1.gz
+%%PERL5_MAN1%%/gpgmailtunl.1.gz
diff --git a/security/p5-Module-Signature/pkg-plist b/security/p5-Module-Signature/pkg-plist
index 781a37350a50..29718ba7eb30 100644
--- a/security/p5-Module-Signature/pkg-plist
+++ b/security/p5-Module-Signature/pkg-plist
@@ -1,4 +1,4 @@
bin/cpansign
%%SITE_PERL%%/Module/Signature.pm
%%PERL5_MAN3%%/Module::Signature.3.gz
-man/man1/cpansign.1.gz
+%%PERL5_MAN1%%/cpansign.1.gz
diff --git a/security/p5-Net-Radius-Server/pkg-plist b/security/p5-Net-Radius-Server/pkg-plist
index 28eacdf0e925..b388e4045fca 100644
--- a/security/p5-Net-Radius-Server/pkg-plist
+++ b/security/p5-Net-Radius-Server/pkg-plist
@@ -32,9 +32,9 @@ bin/rad-client
%%SITE_PERL%%/Net/Radius/Server/Set/Proxy.pm
%%SITE_PERL%%/Net/Radius/Server/Set/Replace.pm
%%SITE_PERL%%/Net/Radius/Server/Set/Simple.pm
-man/man1/nrsd.1.gz
-man/man1/nrsdbtoyaml.1.gz
-man/man1/pam-client.1.gz
-man/man1/rad-bulk-make.1.gz
-man/man1/rad-bulk.1.gz
-man/man1/rad-client.1.gz
+%%PERL5_MAN1%%/nrsd.1.gz
+%%PERL5_MAN1%%/nrsdbtoyaml.1.gz
+%%PERL5_MAN1%%/pam-client.1.gz
+%%PERL5_MAN1%%/rad-bulk-make.1.gz
+%%PERL5_MAN1%%/rad-bulk.1.gz
+%%PERL5_MAN1%%/rad-client.1.gz
diff --git a/security/p5-String-MkPasswd/pkg-plist b/security/p5-String-MkPasswd/pkg-plist
index 361d71b9d871..109a69424e78 100644
--- a/security/p5-String-MkPasswd/pkg-plist
+++ b/security/p5-String-MkPasswd/pkg-plist
@@ -1,4 +1,4 @@
bin/mkpasswd.pl
%%SITE_PERL%%/String/MkPasswd.pm
%%PERL5_MAN3%%/String::MkPasswd.3.gz
-man/man1/mkpasswd.pl.1.gz
+%%PERL5_MAN1%%/mkpasswd.pl.1.gz
diff --git a/security/p5-openxpki/pkg-plist b/security/p5-openxpki/pkg-plist
index 1badc32af3b9..0fb7d5c0b14c 100644
--- a/security/p5-openxpki/pkg-plist
+++ b/security/p5-openxpki/pkg-plist
@@ -654,10 +654,10 @@ bin/openxpkictl
%%PERL5_MAN3%%/OpenXPKI::Workflow::Handler.3.gz
%%PERL5_MAN3%%/OpenXPKI::XML::Cache.3.gz
%%PERL5_MAN3%%/OpenXPKI::i18n.3.gz
-man/man1/openxpkiadm.1.gz
-man/man1/openxpkicli.1.gz
-man/man1/openxpkicmd.1.gz
-man/man1/openxpkictl.1.gz
+%%PERL5_MAN1%%/openxpkiadm.1.gz
+%%PERL5_MAN1%%/openxpkicli.1.gz
+%%PERL5_MAN1%%/openxpkicmd.1.gz
+%%PERL5_MAN1%%/openxpkictl.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.md
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apache/_htaccess
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apache/openxpki-scep.conf
diff --git a/security/pbnj/pkg-plist b/security/pbnj/pkg-plist
index 5974870a6414..c4289aa15d1b 100644
--- a/security/pbnj/pkg-plist
+++ b/security/pbnj/pkg-plist
@@ -1,6 +1,6 @@
bin/scanpbnj
bin/outputpbnj
bin/genlist
-man/man1/genlist.1p.gz
-man/man1/outputpbnj.1p.gz
-man/man1/scanpbnj.1p.gz
+%%PERL5_MAN1%%/genlist.1p.gz
+%%PERL5_MAN1%%/outputpbnj.1p.gz
+%%PERL5_MAN1%%/scanpbnj.1p.gz
diff --git a/security/swatch/pkg-plist b/security/swatch/pkg-plist
index 46f9a1faa0d7..9b29b68b91a6 100644
--- a/security/swatch/pkg-plist
+++ b/security/swatch/pkg-plist
@@ -6,4 +6,4 @@ bin/swatch
%%PERL5_MAN3%%/Swatch::Actions.3.gz
%%PERL5_MAN3%%/Swatch::Threshold.3.gz
%%PERL5_MAN3%%/Swatch::Throttle.3.gz
-man/man1/swatch.1.gz
+%%PERL5_MAN1%%/swatch.1.gz
diff --git a/shells/p5-Bash-Completion/pkg-plist b/shells/p5-Bash-Completion/pkg-plist
index b5daa96a1068..5e2ea77d9f78 100644
--- a/shells/p5-Bash-Completion/pkg-plist
+++ b/shells/p5-Bash-Completion/pkg-plist
@@ -14,5 +14,5 @@ bin/setup-bash-complete
%%PERL5_MAN3%%/Bash::Completion::Plugins::Perldoc.3.gz
%%PERL5_MAN3%%/Bash::Completion::Request.3.gz
%%PERL5_MAN3%%/Bash::Completion::Utils.3.gz
-man/man1/bash-complete.1.gz
-man/man1/setup-bash-complete.1.gz
+%%PERL5_MAN1%%/bash-complete.1.gz
+%%PERL5_MAN1%%/setup-bash-complete.1.gz
diff --git a/shells/p5-Shell-Perl/pkg-plist b/shells/p5-Shell-Perl/pkg-plist
index 33970d1e605a..5e2a34919552 100644
--- a/shells/p5-Shell-Perl/pkg-plist
+++ b/shells/p5-Shell-Perl/pkg-plist
@@ -1,5 +1,5 @@
bin/pirl
-man/man1/pirl.1.gz
+%%PERL5_MAN1%%/pirl.1.gz
%%PERL5_MAN3%%/Shell::Perl.3.gz
%%PERL5_MAN3%%/Shell::Perl::Dumper.3.gz
%%SITE_PERL%%/Shell/Perl.pm
diff --git a/shells/p5-Term-Bash-Completion-Generator/pkg-plist b/shells/p5-Term-Bash-Completion-Generator/pkg-plist
index cfac7cd24eef..ed226b2826e8 100644
--- a/shells/p5-Term-Bash-Completion-Generator/pkg-plist
+++ b/shells/p5-Term-Bash-Completion-Generator/pkg-plist
@@ -1,4 +1,4 @@
bin/generate_perl_completion_script
%%SITE_PERL%%/Term/Bash/Completion/Generator.pm
%%PERL5_MAN3%%/Term::Bash::Completion::Generator.3.gz
-man/man1/generate_perl_completion_script.1.gz
+%%PERL5_MAN1%%/generate_perl_completion_script.1.gz
diff --git a/shells/psh/pkg-plist b/shells/psh/pkg-plist
index f60b6679861b..246cc4f5577f 100644
--- a/shells/psh/pkg-plist
+++ b/shells/psh/pkg-plist
@@ -111,10 +111,10 @@ bin/psh
%%SITE_PERL%%/Psh/Support/Functions.pm
%%SITE_PERL%%/Psh/Support/TiedOption.pm
%%SITE_PERL%%/Psh/Util.pm
-man/man1/psh.1.gz
-man/man1/pshcomplete.1.gz
-man/man1/pshconfig.1.gz
-man/man1/pshdevel.1.gz
+%%PERL5_MAN1%%/psh.1.gz
+%%PERL5_MAN1%%/pshcomplete.1.gz
+%%PERL5_MAN1%%/pshconfig.1.gz
+%%PERL5_MAN1%%/pshdevel.1.gz
%%PERL5_MAN3%%/Psh::Builtins::Alias.3.gz
%%PERL5_MAN3%%/Psh::Builtins::Bg.3.gz
%%PERL5_MAN3%%/Psh::Builtins::Bind.3.gz
diff --git a/sysutils/p5-Brackup/pkg-plist b/sysutils/p5-Brackup/pkg-plist
index b3caf48e2eeb..28d0f5d06b79 100644
--- a/sysutils/p5-Brackup/pkg-plist
+++ b/sysutils/p5-Brackup/pkg-plist
@@ -61,8 +61,8 @@ bin/brackup-verify-inventory
%%SITE_PERL%%/Brackup/TargetBackupStatInfo.pm
%%SITE_PERL%%/Brackup/Test.pm
%%SITE_PERL%%/Brackup/Util.pm
-man/man1/brackup-mount.1.gz
-man/man1/brackup-restore.1.gz
-man/man1/brackup-target.1.gz
-man/man1/brackup-verify-inventory.1.gz
-man/man1/brackup.1.gz
+%%PERL5_MAN1%%/brackup-mount.1.gz
+%%PERL5_MAN1%%/brackup-restore.1.gz
+%%PERL5_MAN1%%/brackup-target.1.gz
+%%PERL5_MAN1%%/brackup-verify-inventory.1.gz
+%%PERL5_MAN1%%/brackup.1.gz
diff --git a/sysutils/p5-Filesys-DiskUsage/pkg-plist b/sysutils/p5-Filesys-DiskUsage/pkg-plist
index 85ae30bd7732..826fd908ee88 100644
--- a/sysutils/p5-Filesys-DiskUsage/pkg-plist
+++ b/sysutils/p5-Filesys-DiskUsage/pkg-plist
@@ -1,4 +1,4 @@
bin/fdu
%%SITE_PERL%%/Filesys/DiskUsage.pm
%%PERL5_MAN3%%/Filesys::DiskUsage.3.gz
-man/man1/fdu.1.gz
+%%PERL5_MAN1%%/fdu.1.gz
diff --git a/sysutils/p5-MogileFS-Server/pkg-plist b/sysutils/p5-MogileFS-Server/pkg-plist
index 92d16cd21b18..44095f42542b 100644
--- a/sysutils/p5-MogileFS-Server/pkg-plist
+++ b/sysutils/p5-MogileFS-Server/pkg-plist
@@ -2,9 +2,9 @@ bin/mogautomount
bin/mogdbsetup
bin/mogilefsd
bin/mogstored
-man/man1/mogautomount.1.gz
-man/man1/mogilefsd.1.gz
-man/man1/mogstored.1.gz
+%%PERL5_MAN1%%/mogautomount.1.gz
+%%PERL5_MAN1%%/mogilefsd.1.gz
+%%PERL5_MAN1%%/mogstored.1.gz
%%SITE_PERL%%/MogileFS/Checksum.pm
%%SITE_PERL%%/MogileFS/Class.pm
%%SITE_PERL%%/MogileFS/Config.pm
diff --git a/sysutils/p5-MogileFS-Utils/pkg-plist b/sysutils/p5-MogileFS-Utils/pkg-plist
index 460dbc499373..9eae984fc88e 100644
--- a/sysutils/p5-MogileFS-Utils/pkg-plist
+++ b/sysutils/p5-MogileFS-Utils/pkg-plist
@@ -9,16 +9,16 @@ bin/mogrename
bin/mogstats
bin/mogtool
bin/mogupload
-man/man1/mogadm.1.gz
-man/man1/mogdelete.1.gz
-man/man1/mogfetch.1.gz
-man/man1/mogfiledebug.1.gz
-man/man1/mogfileinfo.1.gz
-man/man1/moglistfids.1.gz
-man/man1/moglistkeys.1.gz
-man/man1/mogrename.1.gz
-man/man1/mogstats.1.gz
-man/man1/mogtool.1.gz
-man/man1/mogupload.1.gz
+%%PERL5_MAN1%%/mogadm.1.gz
+%%PERL5_MAN1%%/mogdelete.1.gz
+%%PERL5_MAN1%%/mogfetch.1.gz
+%%PERL5_MAN1%%/mogfiledebug.1.gz
+%%PERL5_MAN1%%/mogfileinfo.1.gz
+%%PERL5_MAN1%%/moglistfids.1.gz
+%%PERL5_MAN1%%/moglistkeys.1.gz
+%%PERL5_MAN1%%/mogrename.1.gz
+%%PERL5_MAN1%%/mogstats.1.gz
+%%PERL5_MAN1%%/mogtool.1.gz
+%%PERL5_MAN1%%/mogupload.1.gz
%%SITE_PERL%%/MogileFS/Utils.pm
%%PERL5_MAN3%%/MogileFS::Utils.3.gz
diff --git a/sysutils/p5-Monitor-Simple/pkg-plist b/sysutils/p5-Monitor-Simple/pkg-plist
index 9e27549f74b8..9bc1b261d42f 100644
--- a/sysutils/p5-Monitor-Simple/pkg-plist
+++ b/sysutils/p5-Monitor-Simple/pkg-plist
@@ -32,4 +32,4 @@ bin/smonitor
%%PERL5_MAN3%%/Monitor::Simple::Output.3.gz
%%PERL5_MAN3%%/Monitor::Simple::UserAgent.3.gz
%%PERL5_MAN3%%/Monitor::Simple::Utils.3.gz
-man/man1/smonitor.1.gz
+%%PERL5_MAN1%%/smonitor.1.gz
diff --git a/sysutils/p5-Proclet/pkg-plist b/sysutils/p5-Proclet/pkg-plist
index 6d192d52b94e..fa1c38e0e5e0 100644
--- a/sysutils/p5-Proclet/pkg-plist
+++ b/sysutils/p5-Proclet/pkg-plist
@@ -1,5 +1,5 @@
bin/proclet
-man/man1/proclet.1.gz
+%%PERL5_MAN1%%/proclet.1.gz
%%PERL5_MAN3%%/Proclet.3.gz
%%PERL5_MAN3%%/Proclet::Declare.3.gz
%%SITE_PERL%%/Proclet.pm
diff --git a/sysutils/p5-Rex/pkg-plist b/sysutils/p5-Rex/pkg-plist
index 5587e959d2d6..f1e1d0761937 100644
--- a/sysutils/p5-Rex/pkg-plist
+++ b/sysutils/p5-Rex/pkg-plist
@@ -367,5 +367,5 @@ bin/rexify
%%SITE_PERL%%/Rex/Virtualization/VBox/shutdown.pm
%%SITE_PERL%%/Rex/Virtualization/VBox/start.pm
%%SITE_PERL%%/Rex/Virtualization/VBox/status.pm
-man/man1/rex.1.gz
-man/man1/rexify.1.gz
+%%PERL5_MAN1%%/rex.1.gz
+%%PERL5_MAN1%%/rexify.1.gz
diff --git a/sysutils/p5-Schedule-Load/pkg-plist b/sysutils/p5-Schedule-Load/pkg-plist
index 507371767e9e..6c9e03901b74 100644
--- a/sysutils/p5-Schedule-Load/pkg-plist
+++ b/sysutils/p5-Schedule-Load/pkg-plist
@@ -34,11 +34,11 @@ bin/slrsh
%%SITE_PERL%%/Schedule/Load/Schedule.pm
%%SITE_PERL%%/auto/Schedule/Load/Hosts/Host/autosplit.ix
%%SITE_PERL%%/auto/Schedule/Load/Hosts/Proc/autosplit.ix
-man/man1/rschedule.1.gz
-man/man1/slchoosed.1.gz
-man/man1/slchoosed_watchd.1.gz
-man/man1/slpolice.1.gz
-man/man1/slreportd.1.gz
-man/man1/slrsh.1.gz
+%%PERL5_MAN1%%/rschedule.1.gz
+%%PERL5_MAN1%%/slchoosed.1.gz
+%%PERL5_MAN1%%/slchoosed_watchd.1.gz
+%%PERL5_MAN1%%/slpolice.1.gz
+%%PERL5_MAN1%%/slreportd.1.gz
+%%PERL5_MAN1%%/slrsh.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/init.d/slchoosed
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/init.d/slreportd
diff --git a/sysutils/p5-Sys-Gamin/pkg-plist b/sysutils/p5-Sys-Gamin/pkg-plist
index d8bfaf5cb309..28663b1dddb5 100644
--- a/sysutils/p5-Sys-Gamin/pkg-plist
+++ b/sysutils/p5-Sys-Gamin/pkg-plist
@@ -14,4 +14,4 @@ bin/gamin-monitor
%%SITE_ARCH%%/auto/Sys/Gamin/suspend.al
%%SITE_ARCH%%/auto/Sys/Gamin/suspended.al
%%SITE_ARCH%%/auto/Sys/Gamin/which.al
-man/man1/gamin-monitor.1.gz
+%%PERL5_MAN1%%/gamin-monitor.1.gz
diff --git a/sysutils/p5-Tail-Stat/pkg-plist b/sysutils/p5-Tail-Stat/pkg-plist
index ef440af49cd6..5e92a84887b0 100644
--- a/sysutils/p5-Tail-Stat/pkg-plist
+++ b/sysutils/p5-Tail-Stat/pkg-plist
@@ -7,7 +7,7 @@ bin/tstatd
%%PERL5_MAN3%%/Tail::Stat::Plugin::icecast.3.gz
%%PERL5_MAN3%%/Tail::Stat::Plugin::nginx.3.gz
%%PERL5_MAN3%%/Tail::Stat::Plugin::spamd.3.gz
-man/man1/tstatd.1.gz
+%%PERL5_MAN1%%/tstatd.1.gz
%%SITE_PERL%%/Tail/Stat.pm
%%SITE_PERL%%/Tail/Stat/Plugin.pm
%%SITE_PERL%%/Tail/Stat/Plugin/apache.pm
diff --git a/sysutils/p5-Ubic/pkg-plist b/sysutils/p5-Ubic/pkg-plist
index 4fea2ec07bbb..656f07bf3d95 100644
--- a/sysutils/p5-Ubic/pkg-plist
+++ b/sysutils/p5-Ubic/pkg-plist
@@ -4,12 +4,12 @@ bin/ubic-daemon
bin/ubic-periodic
bin/ubic-update
bin/ubic-watchdog
-man/man1/ubic-admin.1.gz
-man/man1/ubic-daemon.1.gz
-man/man1/ubic-periodic.1.gz
-man/man1/ubic-update.1.gz
-man/man1/ubic-watchdog.1.gz
-man/man1/ubic.1.gz
+%%PERL5_MAN1%%/ubic-admin.1.gz
+%%PERL5_MAN1%%/ubic-daemon.1.gz
+%%PERL5_MAN1%%/ubic-periodic.1.gz
+%%PERL5_MAN1%%/ubic-update.1.gz
+%%PERL5_MAN1%%/ubic-watchdog.1.gz
+%%PERL5_MAN1%%/ubic.1.gz
%%PERL5_MAN3%%/Ubic.3.gz
%%PERL5_MAN3%%/Ubic::AccessGuard.3.gz
%%PERL5_MAN3%%/Ubic::Admin::Setup.3.gz
diff --git a/sysutils/p5-arclog/pkg-plist b/sysutils/p5-arclog/pkg-plist
index a2a78ab51dbd..658bf124bda9 100644
--- a/sysutils/p5-arclog/pkg-plist
+++ b/sysutils/p5-arclog/pkg-plist
@@ -1,2 +1,2 @@
bin/arclog
-man/man1/arclog.1.gz
+%%PERL5_MAN1%%/arclog.1.gz
diff --git a/sysutils/p5-reslog/pkg-plist b/sysutils/p5-reslog/pkg-plist
index 0e3b787da6de..9e1098a65d45 100644
--- a/sysutils/p5-reslog/pkg-plist
+++ b/sysutils/p5-reslog/pkg-plist
@@ -1,2 +1,2 @@
bin/reslog
-man/man1/reslog.1.gz
+%%PERL5_MAN1%%/reslog.1.gz
diff --git a/sysutils/savelogs/pkg-plist b/sysutils/savelogs/pkg-plist
index 513a47decb03..26ed3b0ad36f 100644
--- a/sysutils/savelogs/pkg-plist
+++ b/sysutils/savelogs/pkg-plist
@@ -1,6 +1,6 @@
bin/savelogs
etc/savelogs.conf.sample
-man/man1/rotation.1.gz
-man/man1/savelogs.1.gz
+%%PERL5_MAN1%%/rotation.1.gz
+%%PERL5_MAN1%%/savelogs.1.gz
%%PORTDOCS%%%%DOCSDIR%%/FAQ
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/savelogs.conf.lint
diff --git a/sysutils/watchmen/Makefile b/sysutils/watchmen/Makefile
index 8692a4f550f1..293d876cbf64 100644
--- a/sysutils/watchmen/Makefile
+++ b/sysutils/watchmen/Makefile
@@ -28,7 +28,7 @@ POD2MAN?= pod2man
PLIST_FILES= bin/${PORTNAME} \
"@sample etc/${PORTNAME}.conf.sample" \
- man/man1/${PORTNAME}.1.gz
+ ${SITE_MAN1}/${PORTNAME}.1.gz
.include <bsd.port.options.mk>
diff --git a/textproc/ack/pkg-plist b/textproc/ack/pkg-plist
index 386cbd1bb5ea..78695380a451 100644
--- a/textproc/ack/pkg-plist
+++ b/textproc/ack/pkg-plist
@@ -16,4 +16,4 @@ bin/ack
%%SITE_PERL%%/App/Ack/Resource.pm
%%SITE_PERL%%/App/Ack/Resource/Basic.pm
%%SITE_PERL%%/App/Ack/Resources.pm
-man/man1/ack.1.gz
+%%PERL5_MAN1%%/ack.1.gz
diff --git a/textproc/dtdparse/pkg-plist b/textproc/dtdparse/pkg-plist
index da745905a954..29e9b7bda182 100644
--- a/textproc/dtdparse/pkg-plist
+++ b/textproc/dtdparse/pkg-plist
@@ -3,11 +3,11 @@ bin/dtddiff2html
bin/dtdflatten
bin/dtdformat
bin/dtdparse
-man/man1/dtddiff2html.1.gz
-man/man1/dtdformat.1.gz
-man/man1/dtddiff.1.gz
-man/man1/dtdparse.1.gz
-man/man1/dtdflatten.1.gz
+%%PERL5_MAN1%%/dtddiff2html.1.gz
+%%PERL5_MAN1%%/dtdformat.1.gz
+%%PERL5_MAN1%%/dtddiff.1.gz
+%%PERL5_MAN1%%/dtdparse.1.gz
+%%PERL5_MAN1%%/dtdflatten.1.gz
%%PERL5_MAN3%%/SGML::DTDParse::DTD.3.gz
%%PERL5_MAN3%%/SGML::DTDParse.3.gz
%%PERL5_MAN3%%/SGML::DTDParse::Util.3.gz
diff --git a/textproc/makepatch/pkg-plist b/textproc/makepatch/pkg-plist
index 50e2d9072464..24543a7c20e1 100644
--- a/textproc/makepatch/pkg-plist
+++ b/textproc/makepatch/pkg-plist
@@ -1,4 +1,4 @@
bin/applypatch
bin/makepatch
-man/man1/makepatch.1.gz
-man/man1/applypatch.1.gz
+%%PERL5_MAN1%%/makepatch.1.gz
+%%PERL5_MAN1%%/applypatch.1.gz
diff --git a/textproc/p5-Algorithm-CheckDigits/pkg-plist b/textproc/p5-Algorithm-CheckDigits/pkg-plist
index bbf8f1f9ff52..1a02fce7a1c1 100644
--- a/textproc/p5-Algorithm-CheckDigits/pkg-plist
+++ b/textproc/p5-Algorithm-CheckDigits/pkg-plist
@@ -1,5 +1,5 @@
bin/checkdigits.pl
-man/man1/checkdigits.pl.1.gz
+%%PERL5_MAN1%%/checkdigits.pl.1.gz
%%PERL5_MAN3%%/Algorithm::CheckDigits.3.gz
%%PERL5_MAN3%%/Algorithm::CheckDigits::M07_001.3.gz
%%PERL5_MAN3%%/Algorithm::CheckDigits::M09_001.3.gz
diff --git a/textproc/p5-CAM-PDF/pkg-plist b/textproc/p5-CAM-PDF/pkg-plist
index 9d6d75a89fc6..6dd1105826ca 100644
--- a/textproc/p5-CAM-PDF/pkg-plist
+++ b/textproc/p5-CAM-PDF/pkg-plist
@@ -49,30 +49,30 @@ bin/uninlinepdfimages.pl
%%SITE_PERL%%/CAM/PDF/Renderer/Images.pm
%%SITE_PERL%%/CAM/PDF/Renderer/Text.pm
%%SITE_PERL%%/CAM/PDF/Renderer/TextFB.pm
-man/man1/appendpdf.pl.1.gz
-man/man1/changepagestring.pl.1.gz
-man/man1/changepdfstring.pl.1.gz
-man/man1/changerefkeys.pl.1.gz
-man/man1/crunchjpgs.pl.1.gz
-man/man1/deillustrate.pl.1.gz
-man/man1/deletepdfpage.pl.1.gz
-man/man1/extractallimages.pl.1.gz
-man/man1/extractjpgs.pl.1.gz
-man/man1/fillpdffields.pl.1.gz
-man/man1/getpdffontobject.pl.1.gz
-man/man1/getpdfpage.pl.1.gz
-man/man1/getpdfpageobject.pl.1.gz
-man/man1/getpdftext.pl.1.gz
-man/man1/listfonts.pl.1.gz
-man/man1/listimages.pl.1.gz
-man/man1/listpdffields.pl.1.gz
-man/man1/pdfinfo.pl.1.gz
-man/man1/readpdf.pl.1.gz
-man/man1/renderpdf.pl.1.gz
-man/man1/replacepdfobj.pl.1.gz
-man/man1/revertpdf.pl.1.gz
-man/man1/rewritepdf.pl.1.gz
-man/man1/setpdfbackground.pl.1.gz
-man/man1/setpdfpage.pl.1.gz
-man/man1/stamppdf.pl.1.gz
-man/man1/uninlinepdfimages.pl.1.gz
+%%PERL5_MAN1%%/appendpdf.pl.1.gz
+%%PERL5_MAN1%%/changepagestring.pl.1.gz
+%%PERL5_MAN1%%/changepdfstring.pl.1.gz
+%%PERL5_MAN1%%/changerefkeys.pl.1.gz
+%%PERL5_MAN1%%/crunchjpgs.pl.1.gz
+%%PERL5_MAN1%%/deillustrate.pl.1.gz
+%%PERL5_MAN1%%/deletepdfpage.pl.1.gz
+%%PERL5_MAN1%%/extractallimages.pl.1.gz
+%%PERL5_MAN1%%/extractjpgs.pl.1.gz
+%%PERL5_MAN1%%/fillpdffields.pl.1.gz
+%%PERL5_MAN1%%/getpdffontobject.pl.1.gz
+%%PERL5_MAN1%%/getpdfpage.pl.1.gz
+%%PERL5_MAN1%%/getpdfpageobject.pl.1.gz
+%%PERL5_MAN1%%/getpdftext.pl.1.gz
+%%PERL5_MAN1%%/listfonts.pl.1.gz
+%%PERL5_MAN1%%/listimages.pl.1.gz
+%%PERL5_MAN1%%/listpdffields.pl.1.gz
+%%PERL5_MAN1%%/pdfinfo.pl.1.gz
+%%PERL5_MAN1%%/readpdf.pl.1.gz
+%%PERL5_MAN1%%/renderpdf.pl.1.gz
+%%PERL5_MAN1%%/replacepdfobj.pl.1.gz
+%%PERL5_MAN1%%/revertpdf.pl.1.gz
+%%PERL5_MAN1%%/rewritepdf.pl.1.gz
+%%PERL5_MAN1%%/setpdfbackground.pl.1.gz
+%%PERL5_MAN1%%/setpdfpage.pl.1.gz
+%%PERL5_MAN1%%/stamppdf.pl.1.gz
+%%PERL5_MAN1%%/uninlinepdfimages.pl.1.gz
diff --git a/textproc/p5-DocSet/pkg-plist b/textproc/p5-DocSet/pkg-plist
index f1d4e3956d60..e1c0f2edb8f2 100644
--- a/textproc/p5-DocSet/pkg-plist
+++ b/textproc/p5-DocSet/pkg-plist
@@ -41,4 +41,4 @@ bin/html2ps
%%SITE_PERL%%/DocSet/Source/Text.pm
%%SITE_PERL%%/DocSet/Template/Plugin/NavigateCache.pm
%%SITE_PERL%%/DocSet/Util.pm
-man/man1/docset_build.1.gz
+%%PERL5_MAN1%%/docset_build.1.gz
diff --git a/textproc/p5-EBook-Tools/pkg-plist b/textproc/p5-EBook-Tools/pkg-plist
index acbba7787025..f5f4f4009a15 100644
--- a/textproc/p5-EBook-Tools/pkg-plist
+++ b/textproc/p5-EBook-Tools/pkg-plist
@@ -1,4 +1,4 @@
-man/man1/ebook.1.gz
+%%PERL5_MAN1%%/ebook.1.gz
%%PERL5_MAN3%%/EBook::Tools.3.gz
%%PERL5_MAN3%%/EBook::Tools::BISG.3.gz
%%PERL5_MAN3%%/EBook::Tools::EReader.3.gz
diff --git a/textproc/p5-Excel-Writer-XLSX/pkg-plist b/textproc/p5-Excel-Writer-XLSX/pkg-plist
index cfc85111af22..f973988590a8 100644
--- a/textproc/p5-Excel-Writer-XLSX/pkg-plist
+++ b/textproc/p5-Excel-Writer-XLSX/pkg-plist
@@ -61,4 +61,4 @@ bin/extract_vba
%%PERL5_MAN3%%/Excel::Writer::XLSX::Utility.3.gz
%%PERL5_MAN3%%/Excel::Writer::XLSX::Workbook.3.gz
%%PERL5_MAN3%%/Excel::Writer::XLSX::Worksheet.3.gz
-man/man1/extract_vba.1.gz
+%%PERL5_MAN1%%/extract_vba.1.gz
diff --git a/textproc/p5-HTML-Copy/pkg-plist b/textproc/p5-HTML-Copy/pkg-plist
index b73136bf35db..0c4bc9ed09b9 100644
--- a/textproc/p5-HTML-Copy/pkg-plist
+++ b/textproc/p5-HTML-Copy/pkg-plist
@@ -1,4 +1,4 @@
bin/htmlcopy
%%PERL5_MAN3%%/HTML::Copy.3.gz
%%SITE_PERL%%/HTML/Copy.pm
-man/man1/htmlcopy.1.gz
+%%PERL5_MAN1%%/htmlcopy.1.gz
diff --git a/textproc/p5-Hailo/pkg-plist b/textproc/p5-Hailo/pkg-plist
index e43e5e2c5bb5..5b6302293597 100644
--- a/textproc/p5-Hailo/pkg-plist
+++ b/textproc/p5-Hailo/pkg-plist
@@ -1,5 +1,5 @@
bin/hailo
-man/man1/hailo.1.gz
+%%PERL5_MAN1%%/hailo.1.gz
%%PERL5_MAN3%%/Hailo.3.gz
%%PERL5_MAN3%%/Hailo::Command.3.gz
%%PERL5_MAN3%%/Hailo::Engine::Default.3.gz
diff --git a/textproc/p5-Kwalify/pkg-plist b/textproc/p5-Kwalify/pkg-plist
index 23827560a8a1..8e4318e77ba7 100644
--- a/textproc/p5-Kwalify/pkg-plist
+++ b/textproc/p5-Kwalify/pkg-plist
@@ -3,4 +3,4 @@ bin/pkwalify
%%PERL5_MAN3%%/Schema::Kwalify.3.gz
%%SITE_PERL%%/Kwalify.pm
%%SITE_PERL%%/Schema/Kwalify.pm
-man/man1/pkwalify.1.gz
+%%PERL5_MAN1%%/pkwalify.1.gz
diff --git a/textproc/p5-LaTeX-Driver/pkg-plist b/textproc/p5-LaTeX-Driver/pkg-plist
index 8297962fa30f..1eb893449125 100644
--- a/textproc/p5-LaTeX-Driver/pkg-plist
+++ b/textproc/p5-LaTeX-Driver/pkg-plist
@@ -5,6 +5,6 @@ bin/latex2ps
%%SITE_PERL%%/LaTeX/Driver/FilterProgram.pm
%%PERL5_MAN3%%/LaTeX::Driver.3.gz
%%PERL5_MAN3%%/LaTeX::Driver::FilterProgram.3.gz
-man/man1/latex2dvi.1.gz
-man/man1/latex2pdf.1.gz
-man/man1/latex2ps.1.gz
+%%PERL5_MAN1%%/latex2dvi.1.gz
+%%PERL5_MAN1%%/latex2pdf.1.gz
+%%PERL5_MAN1%%/latex2ps.1.gz
diff --git a/textproc/p5-LaTeX-Encode/pkg-plist b/textproc/p5-LaTeX-Encode/pkg-plist
index 25f293cd15f0..2e7864a98281 100644
--- a/textproc/p5-LaTeX-Encode/pkg-plist
+++ b/textproc/p5-LaTeX-Encode/pkg-plist
@@ -1,4 +1,4 @@
bin/latex-encode
%%PERL5_MAN3%%/LaTeX::Encode.3.gz
%%SITE_PERL%%/LaTeX/Encode.pm
-man/man1/latex-encode.1.gz
+%%PERL5_MAN1%%/latex-encode.1.gz
diff --git a/textproc/p5-LaTeX-Pod/pkg-plist b/textproc/p5-LaTeX-Pod/pkg-plist
index 0f713a54b906..efdfb38bf163 100644
--- a/textproc/p5-LaTeX-Pod/pkg-plist
+++ b/textproc/p5-LaTeX-Pod/pkg-plist
@@ -1,4 +1,4 @@
bin/latex2pod
%%PERL5_MAN3%%/LaTeX::Pod.3.gz
%%SITE_PERL%%/LaTeX/Pod.pm
-man/man1/latex2pod.1.gz
+%%PERL5_MAN1%%/latex2pod.1.gz
diff --git a/textproc/p5-LaTeX-Table/pkg-plist b/textproc/p5-LaTeX-Table/pkg-plist
index 91b29d6c2e58..704f526f15b2 100644
--- a/textproc/p5-LaTeX-Table/pkg-plist
+++ b/textproc/p5-LaTeX-Table/pkg-plist
@@ -22,5 +22,5 @@ bin/ltpretty
%%SITE_PERL%%/LaTeX/Table/Types/Longtable.pm
%%SITE_PERL%%/LaTeX/Table/Types/Xtab.pm
%%SITE_PERL%%/LaTeX/Table/Types/TypeI.pm
-man/man1/csv2pdf.1.gz
-man/man1/ltpretty.1.gz
+%%PERL5_MAN1%%/csv2pdf.1.gz
+%%PERL5_MAN1%%/ltpretty.1.gz
diff --git a/textproc/p5-Lingua-Ident/pkg-plist b/textproc/p5-Lingua-Ident/pkg-plist
index 4f83919be88f..68440706ac40 100644
--- a/textproc/p5-Lingua-Ident/pkg-plist
+++ b/textproc/p5-Lingua-Ident/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Lingua/Ident.pm
bin/trainlid
%%PERL5_MAN3%%/Lingua::Ident.3.gz
-man/man1/trainlid.1.gz
+%%PERL5_MAN1%%/trainlid.1.gz
diff --git a/textproc/p5-Lingua-Identify/pkg-plist b/textproc/p5-Lingua-Identify/pkg-plist
index ee69c2180cc0..d86c5143d355 100644
--- a/textproc/p5-Lingua-Identify/pkg-plist
+++ b/textproc/p5-Lingua-Identify/pkg-plist
@@ -56,5 +56,5 @@ bin/make-lingua-identify-language
%%SITE_PERL%%/Lingua/Identify/SV.pm
%%SITE_PERL%%/Lingua/Identify/TR.pm
%%SITE_PERL%%/Lingua/Identify/UK.pm
-man/man1/langident.1.gz
-man/man1/make-lingua-identify-language.1.gz
+%%PERL5_MAN1%%/langident.1.gz
+%%PERL5_MAN1%%/make-lingua-identify-language.1.gz
diff --git a/textproc/p5-Lingua-Treebank/pkg-plist b/textproc/p5-Lingua-Treebank/pkg-plist
index 7266523e20ef..8c8eda8926ab 100644
--- a/textproc/p5-Lingua-Treebank/pkg-plist
+++ b/textproc/p5-Lingua-Treebank/pkg-plist
@@ -10,9 +10,9 @@ bin/vocabulary
%%SITE_PERL%%/Lingua/Treebank.pm
%%SITE_PERL%%/Lingua/Treebank/Const.pm
%%SITE_PERL%%/Lingua/Treebank/HeadFinder.pm
-man/man1/get-words.1.gz
-man/man1/list-edges.1.gz
-man/man1/list-rewrites.1.gz
-man/man1/tree-collapse.1.gz
-man/man1/tree-inflate.1.gz
-man/man1/vocabulary.1.gz
+%%PERL5_MAN1%%/get-words.1.gz
+%%PERL5_MAN1%%/list-edges.1.gz
+%%PERL5_MAN1%%/list-rewrites.1.gz
+%%PERL5_MAN1%%/tree-collapse.1.gz
+%%PERL5_MAN1%%/tree-inflate.1.gz
+%%PERL5_MAN1%%/vocabulary.1.gz
diff --git a/textproc/p5-MARC-Lint/pkg-plist b/textproc/p5-MARC-Lint/pkg-plist
index d17c4b9dfdbc..69966f4380e0 100644
--- a/textproc/p5-MARC-Lint/pkg-plist
+++ b/textproc/p5-MARC-Lint/pkg-plist
@@ -3,4 +3,4 @@ bin/marclint
%%PERL5_MAN3%%/MARC::Lint::CodeData.3.gz
%%SITE_PERL%%/MARC/Lint.pm
%%SITE_PERL%%/MARC/Lint/CodeData.pm
-man/man1/marclint.1.gz
+%%PERL5_MAN1%%/marclint.1.gz
diff --git a/textproc/p5-MARC-Record/pkg-plist b/textproc/p5-MARC-Record/pkg-plist
index b311edc5bc78..19c99612d400 100644
--- a/textproc/p5-MARC-Record/pkg-plist
+++ b/textproc/p5-MARC-Record/pkg-plist
@@ -1,5 +1,5 @@
bin/marcdump
-man/man1/marcdump.1.gz
+%%PERL5_MAN1%%/marcdump.1.gz
%%PERL5_MAN3%%/MARC::Batch.3.gz
%%PERL5_MAN3%%/MARC::Doc::Tutorial.3.gz
%%PERL5_MAN3%%/MARC::Field.3.gz
diff --git a/textproc/p5-MARC-XML/pkg-plist b/textproc/p5-MARC-XML/pkg-plist
index 75c02b6ad09c..0bfe68462015 100644
--- a/textproc/p5-MARC-XML/pkg-plist
+++ b/textproc/p5-MARC-XML/pkg-plist
@@ -2,5 +2,5 @@ bin/marc2xml
bin/xml2marc
%%PERL5_MAN3%%/MARC::File::XML.3.gz
%%SITE_PERL%%/MARC/File/XML.pm
-man/man1/marc2xml.1.gz
-man/man1/xml2marc.1.gz
+%%PERL5_MAN1%%/marc2xml.1.gz
+%%PERL5_MAN1%%/xml2marc.1.gz
diff --git a/textproc/p5-Makefile-Parser/pkg-plist b/textproc/p5-Makefile-Parser/pkg-plist
index 0896ddd03188..4ff98d93bfa2 100644
--- a/textproc/p5-Makefile-Parser/pkg-plist
+++ b/textproc/p5-Makefile-Parser/pkg-plist
@@ -15,6 +15,6 @@ bin/plmake
%%SITE_PERL%%/Makefile/AST/Variable.pm
%%SITE_PERL%%/Makefile/Parser.pm
%%SITE_PERL%%/Makefile/Parser/GmakeDB.pm
-man/man1/makesimple.1.gz
-man/man1/pgmake-db.1.gz
-man/man1/plmake.1.gz
+%%PERL5_MAN1%%/makesimple.1.gz
+%%PERL5_MAN1%%/pgmake-db.1.gz
+%%PERL5_MAN1%%/plmake.1.gz
diff --git a/textproc/p5-Marpa-HTML/pkg-plist b/textproc/p5-Marpa-HTML/pkg-plist
index 1b31261cbc42..c8a78142238e 100644
--- a/textproc/p5-Marpa-HTML/pkg-plist
+++ b/textproc/p5-Marpa-HTML/pkg-plist
@@ -10,5 +10,5 @@ bin/html_score
%%SITE_PERL%%/Marpa/HTML/Version.pm
%%PERL5_MAN3%%/Marpa::HTML.3.gz
%%PERL5_MAN3%%/Marpa::HTML::Support.3.gz
-man/man1/html_fmt.1.gz
-man/man1/html_score.1.gz
+%%PERL5_MAN1%%/html_fmt.1.gz
+%%PERL5_MAN1%%/html_score.1.gz
diff --git a/textproc/p5-Net-Snort-Parser/pkg-plist b/textproc/p5-Net-Snort-Parser/pkg-plist
index 67305d27f599..b227c1bf46be 100644
--- a/textproc/p5-Net-Snort-Parser/pkg-plist
+++ b/textproc/p5-Net-Snort-Parser/pkg-plist
@@ -5,4 +5,4 @@ bin/verify-rule
%%SITE_PERL%%/Net/Snort/Parser/File.pm
%%SITE_PERL%%/Net/Snort/Parser/Rule.pm
%%SITE_PERL%%/Net/Snort/Parser/RuleOptions.pm
-man/man1/snortconfig.1.gz
+%%PERL5_MAN1%%/snortconfig.1.gz
diff --git a/textproc/p5-ODF-lpOD/pkg-plist b/textproc/p5-ODF-lpOD/pkg-plist
index baf00d6fe642..61d5ca8a54e2 100644
--- a/textproc/p5-ODF-lpOD/pkg-plist
+++ b/textproc/p5-ODF-lpOD/pkg-plist
@@ -33,4 +33,4 @@ bin/lpod_test
%%SITE_PERL%%/ODF/lpOD/templates/presentation.odp
%%SITE_PERL%%/ODF/lpOD/templates/spreadsheet.ods
%%SITE_PERL%%/ODF/lpOD/templates/text.odt
-man/man1/lpod_test.1.gz
+%%PERL5_MAN1%%/lpod_test.1.gz
diff --git a/textproc/p5-OpenOffice-OODoc/pkg-plist b/textproc/p5-OpenOffice-OODoc/pkg-plist
index 64fda654e677..7e553c351704 100644
--- a/textproc/p5-OpenOffice-OODoc/pkg-plist
+++ b/textproc/p5-OpenOffice-OODoc/pkg-plist
@@ -51,16 +51,16 @@ bin/odffilesearch
bin/text2odf
bin/odffindbasic
bin/odfextract
-man/man1/odf2pod.1.gz
-man/man1/odf_set_fields.1.gz
-man/man1/odf_set_title.1.gz
-man/man1/odfbuild.1.gz
-man/man1/odfextract.1.gz
-man/man1/odffilesearch.1.gz
-man/man1/odffindbasic.1.gz
-man/man1/odfhighlight.1.gz
-man/man1/odfmetadoc.1.gz
-man/man1/odfsearch.1.gz
-man/man1/oodoc_test.1.gz
-man/man1/text2odf.1.gz
-man/man1/text2table.1.gz
+%%PERL5_MAN1%%/odf2pod.1.gz
+%%PERL5_MAN1%%/odf_set_fields.1.gz
+%%PERL5_MAN1%%/odf_set_title.1.gz
+%%PERL5_MAN1%%/odfbuild.1.gz
+%%PERL5_MAN1%%/odfextract.1.gz
+%%PERL5_MAN1%%/odffilesearch.1.gz
+%%PERL5_MAN1%%/odffindbasic.1.gz
+%%PERL5_MAN1%%/odfhighlight.1.gz
+%%PERL5_MAN1%%/odfmetadoc.1.gz
+%%PERL5_MAN1%%/odfsearch.1.gz
+%%PERL5_MAN1%%/oodoc_test.1.gz
+%%PERL5_MAN1%%/text2odf.1.gz
+%%PERL5_MAN1%%/text2table.1.gz
diff --git a/textproc/p5-PDF-FromHTML/pkg-plist b/textproc/p5-PDF-FromHTML/pkg-plist
index 0e2dc8512729..230cc63a6d5e 100644
--- a/textproc/p5-PDF-FromHTML/pkg-plist
+++ b/textproc/p5-PDF-FromHTML/pkg-plist
@@ -56,4 +56,4 @@ bin/html2pdf.pl
%%SITE_PERL%%/PDF/FromHTML/Template/Iterator.pm
%%SITE_PERL%%/PDF/FromHTML/Template/TextObject.pm
%%SITE_PERL%%/PDF/FromHTML/Twig.pm
-man/man1/html2pdf.pl.1.gz
+%%PERL5_MAN1%%/html2pdf.pl.1.gz
diff --git a/textproc/p5-Perl-Critic/pkg-plist b/textproc/p5-Perl-Critic/pkg-plist
index 334c97050fbb..f76029fc3523 100644
--- a/textproc/p5-Perl-Critic/pkg-plist
+++ b/textproc/p5-Perl-Critic/pkg-plist
@@ -393,4 +393,4 @@ bin/perlcritic
%%PERL5_MAN3%%/Perl::Critic::Utils::Perl.3.gz
%%PERL5_MAN3%%/Perl::Critic::Violation.3.gz
%%PERL5_MAN3%%/Test::Perl::Critic::Policy.3.gz
-man/man1/perlcritic.1.gz
+%%PERL5_MAN1%%/perlcritic.1.gz
diff --git a/textproc/p5-Perl-MinimumVersion/pkg-plist b/textproc/p5-Perl-MinimumVersion/pkg-plist
index 0fc248391259..36272f321cb5 100644
--- a/textproc/p5-Perl-MinimumVersion/pkg-plist
+++ b/textproc/p5-Perl-MinimumVersion/pkg-plist
@@ -2,4 +2,4 @@ bin/perlver
%%PERL5_MAN3%%/Perl::MinimumVersion.3.gz
%%SITE_PERL%%/Perl/MinimumVersion.pm
%%SITE_PERL%%/Perl/MinimumVersion/Reason.pm
-man/man1/perlver.1.gz
+%%PERL5_MAN1%%/perlver.1.gz
diff --git a/textproc/p5-PerlPoint-Converters/pkg-plist b/textproc/p5-PerlPoint-Converters/pkg-plist
index 11cd36f85017..c64406964604 100644
--- a/textproc/p5-PerlPoint-Converters/pkg-plist
+++ b/textproc/p5-PerlPoint-Converters/pkg-plist
@@ -8,5 +8,5 @@ bin/pp2latex
%%PERL5_MAN3%%/PerlPoint::Converters.3.gz
%%PERL5_MAN3%%/PerlPoint::Tags::HTML.3.gz
%%PERL5_MAN3%%/PerlPoint::Tags::LaTeX.3.gz
-man/man1/pp2html.1.gz
-man/man1/pp2latex.1.gz
+%%PERL5_MAN1%%/pp2html.1.gz
+%%PERL5_MAN1%%/pp2latex.1.gz
diff --git a/textproc/p5-PerlPoint-Package/pkg-plist b/textproc/p5-PerlPoint-Package/pkg-plist
index 14baa00c95a4..1c118f8855a2 100644
--- a/textproc/p5-PerlPoint-Package/pkg-plist
+++ b/textproc/p5-PerlPoint-Package/pkg-plist
@@ -24,8 +24,8 @@ bin/pp2sdf
%%SITE_PERL%%/PerlPoint/Tags/Basic.pm
%%SITE_PERL%%/PerlPoint/Tags/SDF.pm
%%SITE_PERL%%/PerlPoint/Template.pm
-man/man1/perlpoint.1.gz
-man/man1/pp2sdf.1.gz
+%%PERL5_MAN1%%/perlpoint.1.gz
+%%PERL5_MAN1%%/pp2sdf.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/.pp2sdf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perlpods.pp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perlpoint
diff --git a/textproc/p5-Pod-Abstract/pkg-plist b/textproc/p5-Pod-Abstract/pkg-plist
index 049d695a1299..30622af701a6 100644
--- a/textproc/p5-Pod-Abstract/pkg-plist
+++ b/textproc/p5-Pod-Abstract/pkg-plist
@@ -35,4 +35,4 @@ bin/paf
%%SITE_PERL%%/Pod/Abstract/Path.pm
%%SITE_PERL%%/Pod/Abstract/Serial.pm
%%SITE_PERL%%/Pod/Abstract/Tree.pm
-man/man1/paf.1.gz
+%%PERL5_MAN1%%/paf.1.gz
diff --git a/textproc/p5-Pod-Autopod/pkg-plist b/textproc/p5-Pod-Autopod/pkg-plist
index 284312ab6233..2946e5939042 100644
--- a/textproc/p5-Pod-Autopod/pkg-plist
+++ b/textproc/p5-Pod-Autopod/pkg-plist
@@ -1,4 +1,4 @@
bin/autopod
%%SITE_PERL%%/Pod/Autopod.pm
%%PERL5_MAN3%%/Pod::Autopod.3.gz
-man/man1/autopod.1.gz
+%%PERL5_MAN1%%/autopod.1.gz
diff --git a/textproc/p5-Pod-DocBook/pkg-plist b/textproc/p5-Pod-DocBook/pkg-plist
index 5a46e5c65ec6..2a5250db27eb 100644
--- a/textproc/p5-Pod-DocBook/pkg-plist
+++ b/textproc/p5-Pod-DocBook/pkg-plist
@@ -1,4 +1,4 @@
bin/pod2docbook
%%PERL5_MAN3%%/Pod::DocBook.3.gz
%%SITE_PERL%%/Pod/DocBook.pm
-man/man1/pod2docbook.1.gz
+%%PERL5_MAN1%%/pod2docbook.1.gz
diff --git a/textproc/p5-Pod-HtmlEasy/pkg-plist b/textproc/p5-Pod-HtmlEasy/pkg-plist
index f5d8d273ee31..7c5366b32205 100644
--- a/textproc/p5-Pod-HtmlEasy/pkg-plist
+++ b/textproc/p5-Pod-HtmlEasy/pkg-plist
@@ -6,4 +6,4 @@ bin/podhtmleasy.sh
%%SITE_PERL%%/Pod/HtmlEasy/Data.pm
%%SITE_PERL%%/Pod/HtmlEasy/Parser.pm
%%SITE_PERL%%/Pod/HtmlEasy.pm
-man/man1/pod2indexed_html.pl.1.gz
+%%PERL5_MAN1%%/pod2indexed_html.pl.1.gz
diff --git a/textproc/p5-Pod-Markdown/pkg-plist b/textproc/p5-Pod-Markdown/pkg-plist
index 438b96be63b8..b8fac5f38dcb 100644
--- a/textproc/p5-Pod-Markdown/pkg-plist
+++ b/textproc/p5-Pod-Markdown/pkg-plist
@@ -3,4 +3,4 @@ bin/pod2markdown
%%SITE_PERL%%/Pod/Perldoc/ToMarkdown.pm
%%PERL5_MAN3%%/Pod::Markdown.3.gz
%%PERL5_MAN3%%/Pod::Perldoc::ToMarkdown.3.gz
-man/man1/pod2markdown.1.gz
+%%PERL5_MAN1%%/pod2markdown.1.gz
diff --git a/textproc/p5-Pod-POM/pkg-plist b/textproc/p5-Pod-POM/pkg-plist
index 31e897a272dd..01b23c2c3f8f 100644
--- a/textproc/p5-Pod-POM/pkg-plist
+++ b/textproc/p5-Pod-POM/pkg-plist
@@ -46,6 +46,6 @@ bin/pomdump
%%PERL5_MAN3%%/Pod::POM::View::HTML.3.gz
%%PERL5_MAN3%%/Pod::POM::View::Pod.3.gz
%%PERL5_MAN3%%/Pod::POM::View::Text.3.gz
-man/man1/podlint.1.gz
-man/man1/pom2.1.gz
-man/man1/pomdump.1.gz
+%%PERL5_MAN1%%/podlint.1.gz
+%%PERL5_MAN1%%/pom2.1.gz
+%%PERL5_MAN1%%/pomdump.1.gz
diff --git a/textproc/p5-Pod-ProjectDocs/pkg-plist b/textproc/p5-Pod-ProjectDocs/pkg-plist
index b0d953299402..55c6c930b2e9 100644
--- a/textproc/p5-Pod-ProjectDocs/pkg-plist
+++ b/textproc/p5-Pod-ProjectDocs/pkg-plist
@@ -12,4 +12,4 @@ bin/pod2projdocs
%%SITE_PERL%%/Pod/ProjectDocs/Parser/JavaScriptPod.pm
%%SITE_PERL%%/Pod/ProjectDocs/Parser/PerlPod.pm
%%SITE_PERL%%/Pod/ProjectDocs/Template.pm
-man/man1/pod2projdocs.1.gz
+%%PERL5_MAN1%%/pod2projdocs.1.gz
diff --git a/textproc/p5-Pod-Readme/pkg-plist b/textproc/p5-Pod-Readme/pkg-plist
index 118857c780b3..729dcf2c1177 100644
--- a/textproc/p5-Pod-Readme/pkg-plist
+++ b/textproc/p5-Pod-Readme/pkg-plist
@@ -1,4 +1,4 @@
bin/pod2readme
%%PERL5_MAN3%%/Pod::Readme.3.gz
%%SITE_PERL%%/Pod/Readme.pm
-man/man1/pod2readme.1.gz
+%%PERL5_MAN1%%/pod2readme.1.gz
diff --git a/textproc/p5-Pod-Spell/pkg-plist b/textproc/p5-Pod-Spell/pkg-plist
index 69c2ee7f4c7a..a561ca40a345 100644
--- a/textproc/p5-Pod-Spell/pkg-plist
+++ b/textproc/p5-Pod-Spell/pkg-plist
@@ -2,6 +2,6 @@ bin/podspell
%%SITE_PERL%%/Pod/Spell.pm
%%SITE_PERL%%/Pod/Wordlist.pm
%%SITE_PERL%%/auto/share/dist/Pod-Spell/wordlist
-man/man1/podspell.1.gz
+%%PERL5_MAN1%%/podspell.1.gz
%%PERL5_MAN3%%/Pod::Spell.3.gz
%%PERL5_MAN3%%/Pod::Wordlist.3.gz
diff --git a/textproc/p5-Pod-Stripper/pkg-plist b/textproc/p5-Pod-Stripper/pkg-plist
index d0e04bb9c04d..507fe38c79e7 100644
--- a/textproc/p5-Pod-Stripper/pkg-plist
+++ b/textproc/p5-Pod-Stripper/pkg-plist
@@ -1,4 +1,4 @@
bin/podstrip
%%PERL5_MAN3%%/Pod::Stripper.3.gz
%%SITE_PERL%%/Pod/Stripper.pm
-man/man1/podstrip.1.gz
+%%PERL5_MAN1%%/podstrip.1.gz
diff --git a/textproc/p5-Pod-Tree/pkg-plist b/textproc/p5-Pod-Tree/pkg-plist
index 9d85b3189b18..5a4297367327 100644
--- a/textproc/p5-Pod-Tree/pkg-plist
+++ b/textproc/p5-Pod-Tree/pkg-plist
@@ -30,7 +30,7 @@ bin/podtree2html
%%PERL5_MAN3%%/Pod::Tree::PerlPod.3.gz
%%PERL5_MAN3%%/Pod::Tree::PerlTop.3.gz
%%PERL5_MAN3%%/Pod::Tree::Pod.3.gz
-man/man1/mod2html.1.gz
-man/man1/perl2html.1.gz
-man/man1/pods2html.1.gz
-man/man1/podtree2html.1.gz
+%%PERL5_MAN1%%/mod2html.1.gz
+%%PERL5_MAN1%%/perl2html.1.gz
+%%PERL5_MAN1%%/pods2html.1.gz
+%%PERL5_MAN1%%/podtree2html.1.gz
diff --git a/textproc/p5-Pod-WikiDoc/pkg-plist b/textproc/p5-Pod-WikiDoc/pkg-plist
index 0c2454fffdb7..d0414d96423f 100644
--- a/textproc/p5-Pod-WikiDoc/pkg-plist
+++ b/textproc/p5-Pod-WikiDoc/pkg-plist
@@ -1,5 +1,5 @@
bin/wikidoc
-man/man1/wikidoc.1.gz
+%%PERL5_MAN1%%/wikidoc.1.gz
%%PERL5_MAN3%%/Pod::WikiDoc.3.gz
%%PERL5_MAN3%%/Pod::WikiDoc::Cookbook.3.gz
%%PERL5_MAN3%%/Pod::WikiDoc::Parser.3.gz
diff --git a/textproc/p5-Pod-XML/pkg-plist b/textproc/p5-Pod-XML/pkg-plist
index fdc42e6e3477..f13bfcb7b2f3 100644
--- a/textproc/p5-Pod-XML/pkg-plist
+++ b/textproc/p5-Pod-XML/pkg-plist
@@ -1,4 +1,4 @@
bin/pod2xml
%%PERL5_MAN3%%/Pod::XML.3.gz
%%SITE_PERL%%/Pod/XML.pm
-man/man1/pod2xml.1.gz
+%%PERL5_MAN1%%/pod2xml.1.gz
diff --git a/textproc/p5-Pod-Xhtml/pkg-plist b/textproc/p5-Pod-Xhtml/pkg-plist
index 803b2fb74d2a..715f13ab34f0 100644
--- a/textproc/p5-Pod-Xhtml/pkg-plist
+++ b/textproc/p5-Pod-Xhtml/pkg-plist
@@ -3,4 +3,4 @@ bin/pod2xhtml
%%PERL5_MAN3%%/Pod::Xhtml.3.gz
%%SITE_PERL%%/Pod/Hyperlink/BounceURL.pm
%%SITE_PERL%%/Pod/Xhtml.pm
-man/man1/pod2xhtml.1.gz
+%%PERL5_MAN1%%/pod2xhtml.1.gz
diff --git a/textproc/p5-Regexp-Debugger/pkg-plist b/textproc/p5-Regexp-Debugger/pkg-plist
index e6182507ba8e..492fdd2280d6 100644
--- a/textproc/p5-Regexp-Debugger/pkg-plist
+++ b/textproc/p5-Regexp-Debugger/pkg-plist
@@ -1,4 +1,4 @@
bin/rxrx
%%SITE_PERL%%/Regexp/Debugger.pm
%%PERL5_MAN3%%/Regexp::Debugger.3.gz
-man/man1/rxrx.1.gz
+%%PERL5_MAN1%%/rxrx.1.gz
diff --git a/textproc/p5-SGML-DTDParse/pkg-plist b/textproc/p5-SGML-DTDParse/pkg-plist
index 4aba7e6de15f..9a713d9ba62d 100644
--- a/textproc/p5-SGML-DTDParse/pkg-plist
+++ b/textproc/p5-SGML-DTDParse/pkg-plist
@@ -15,8 +15,8 @@ bin/dtdparse
%%SITE_PERL%%/SGML/DTDParse/Format/refentry.pl
%%SITE_PERL%%/SGML/DTDParse/Tokenizer.pm
%%SITE_PERL%%/SGML/DTDParse/Util.pm
-man/man1/dtddiff.1.gz
-man/man1/dtddiff2html.1.gz
-man/man1/dtdflatten.1.gz
-man/man1/dtdformat.1.gz
-man/man1/dtdparse.1.gz
+%%PERL5_MAN1%%/dtddiff.1.gz
+%%PERL5_MAN1%%/dtddiff2html.1.gz
+%%PERL5_MAN1%%/dtdflatten.1.gz
+%%PERL5_MAN1%%/dtdformat.1.gz
+%%PERL5_MAN1%%/dtdparse.1.gz
diff --git a/textproc/p5-Spork/pkg-plist b/textproc/p5-Spork/pkg-plist
index 27d75c24dd37..7fbc2f872967 100644
--- a/textproc/p5-Spork/pkg-plist
+++ b/textproc/p5-Spork/pkg-plist
@@ -15,4 +15,4 @@ bin/spork
%%SITE_PERL%%/Spork/Registry.pm
%%SITE_PERL%%/Spork/Slides.pm
%%SITE_PERL%%/Spork/Template/TT2.pm
-man/man1/spork.1.gz
+%%PERL5_MAN1%%/spork.1.gz
diff --git a/textproc/p5-Spreadsheet-WriteExcel/pkg-plist b/textproc/p5-Spreadsheet-WriteExcel/pkg-plist
index 29d145d7de85..aff69eaf97b1 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/pkg-plist
+++ b/textproc/p5-Spreadsheet-WriteExcel/pkg-plist
@@ -39,7 +39,7 @@ bin/chartex
%%SITE_PERL%%/Spreadsheet/WriteExcel/Utility.pm
%%SITE_PERL%%/Spreadsheet/WriteExcel/Workbook.pm
%%SITE_PERL%%/Spreadsheet/WriteExcel/Worksheet.pm
-man/man1/chartex.1.gz
+%%PERL5_MAN1%%/chartex.1.gz
%%PORTDOCS%%%%DOCSDIR%%/Perl_Journal_Article.html
%%PORTDOCS%%%%DOCSDIR%%/images/example.jpg
%%PORTDOCS%%%%DOCSDIR%%/images/swe.png
diff --git a/textproc/p5-String-ShellQuote/pkg-plist b/textproc/p5-String-ShellQuote/pkg-plist
index e200e44ff8ee..c7c6a3897448 100644
--- a/textproc/p5-String-ShellQuote/pkg-plist
+++ b/textproc/p5-String-ShellQuote/pkg-plist
@@ -1,4 +1,4 @@
bin/shell-quote
%%PERL5_MAN3%%/String::ShellQuote.3.gz
%%SITE_PERL%%/String/ShellQuote.pm
-man/man1/shell-quote.1.gz
+%%PERL5_MAN1%%/shell-quote.1.gz
diff --git a/textproc/p5-Text-BibTeX/pkg-plist b/textproc/p5-Text-BibTeX/pkg-plist
index adb07694b1a3..4aa74cf048b1 100644
--- a/textproc/p5-Text-BibTeX/pkg-plist
+++ b/textproc/p5-Text-BibTeX/pkg-plist
@@ -23,14 +23,14 @@ lib/libbtparse.so
%%SITE_ARCH%%/Text/BibTeX/Structure.pm
%%SITE_ARCH%%/Text/BibTeX/Value.pm
%%SITE_ARCH%%/auto/Text/BibTeX/BibTeX.so
-man/man1/bt_format_names.1.gz
-man/man1/bt_input.1.gz
-man/man1/bt_language.1.gz
-man/man1/bt_macros.1.gz
-man/man1/bt_misc.1.gz
-man/man1/bt_post_processing.1.gz
-man/man1/bt_postprocess.1.gz
-man/man1/bt_split_names.1.gz
-man/man1/bt_traversal.1.gz
-man/man1/btool_faq.1.gz
-man/man1/btparse.1.gz
+%%PERL5_MAN1%%/bt_format_names.1.gz
+%%PERL5_MAN1%%/bt_input.1.gz
+%%PERL5_MAN1%%/bt_language.1.gz
+%%PERL5_MAN1%%/bt_macros.1.gz
+%%PERL5_MAN1%%/bt_misc.1.gz
+%%PERL5_MAN1%%/bt_post_processing.1.gz
+%%PERL5_MAN1%%/bt_postprocess.1.gz
+%%PERL5_MAN1%%/bt_split_names.1.gz
+%%PERL5_MAN1%%/bt_traversal.1.gz
+%%PERL5_MAN1%%/btool_faq.1.gz
+%%PERL5_MAN1%%/btparse.1.gz
diff --git a/textproc/p5-Text-Colorizer/pkg-plist b/textproc/p5-Text-Colorizer/pkg-plist
index 96b9ad0f5628..18f5541fc204 100644
--- a/textproc/p5-Text-Colorizer/pkg-plist
+++ b/textproc/p5-Text-Colorizer/pkg-plist
@@ -1,4 +1,4 @@
bin/text_colorizer
%%SITE_PERL%%/Text/Colorizer.pm
%%PERL5_MAN3%%/Text::Colorizer.3.gz
-man/man1/text_colorizer.1.gz
+%%PERL5_MAN1%%/text_colorizer.1.gz
diff --git a/textproc/p5-Text-EtText/pkg-plist b/textproc/p5-Text-EtText/pkg-plist
index adf94cb6e51d..f023600ad49d 100644
--- a/textproc/p5-Text-EtText/pkg-plist
+++ b/textproc/p5-Text-EtText/pkg-plist
@@ -11,5 +11,5 @@ bin/ettext2html
%%SITE_PERL%%/Text/EtText/HTML2EtText.pm
%%SITE_PERL%%/Text/EtText/LinkGlossary.pm
%%SITE_PERL%%/Text/EtText/Lists.pm
-man/man1/ethtml2text.1.gz
-man/man1/ettext2html.1.gz
+%%PERL5_MAN1%%/ethtml2text.1.gz
+%%PERL5_MAN1%%/ettext2html.1.gz
diff --git a/textproc/p5-Text-LTSV/pkg-plist b/textproc/p5-Text-LTSV/pkg-plist
index 585deea48217..38df58dc4e67 100644
--- a/textproc/p5-Text-LTSV/pkg-plist
+++ b/textproc/p5-Text-LTSV/pkg-plist
@@ -1,5 +1,5 @@
bin/ltsview
-man/man1/ltsview.1.gz
+%%PERL5_MAN1%%/ltsview.1.gz
%%PERL5_MAN3%%/Text::LTSV.3.gz
%%SITE_PERL%%/Text/LTSV.pm
%%SITE_PERL%%/Text/LTSV/Iterator.pm
diff --git a/textproc/p5-Text-Language-Guess/pkg-plist b/textproc/p5-Text-Language-Guess/pkg-plist
index d64089fb4c16..9647e5330a72 100644
--- a/textproc/p5-Text-Language-Guess/pkg-plist
+++ b/textproc/p5-Text-Language-Guess/pkg-plist
@@ -1,4 +1,4 @@
%%PERL5_MAN3%%/Text::Language::Guess.3.gz
bin/language-guess
%%SITE_PERL%%/Text/Language/Guess.pm
-man/man1/language-guess.1.gz
+%%PERL5_MAN1%%/language-guess.1.gz
diff --git a/textproc/p5-Text-Lorem/pkg-plist b/textproc/p5-Text-Lorem/pkg-plist
index ec9dacab58d6..493bbc15a06e 100644
--- a/textproc/p5-Text-Lorem/pkg-plist
+++ b/textproc/p5-Text-Lorem/pkg-plist
@@ -1,4 +1,4 @@
bin/lorem
%%PERL5_MAN3%%/Text::Lorem.3.gz
%%SITE_PERL%%/Text/Lorem.pm
-man/man1/lorem.1.gz
+%%PERL5_MAN1%%/lorem.1.gz
diff --git a/textproc/p5-Text-Markdown/pkg-plist b/textproc/p5-Text-Markdown/pkg-plist
index 48d8a0759440..ad2e38ec76e3 100644
--- a/textproc/p5-Text-Markdown/pkg-plist
+++ b/textproc/p5-Text-Markdown/pkg-plist
@@ -1,4 +1,4 @@
bin/Markdown.pl
%%PERL5_MAN3%%/Text::Markdown.3.gz
%%SITE_PERL%%/Text/Markdown.pm
-man/man1/Markdown.pl.1.gz
+%%PERL5_MAN1%%/Markdown.pl.1.gz
diff --git a/textproc/p5-Text-MultiMarkdown/pkg-plist b/textproc/p5-Text-MultiMarkdown/pkg-plist
index 5ffd2fff52c0..7039fca7262d 100644
--- a/textproc/p5-Text-MultiMarkdown/pkg-plist
+++ b/textproc/p5-Text-MultiMarkdown/pkg-plist
@@ -1,4 +1,4 @@
bin/MultiMarkdown.pl
%%PERL5_MAN3%%/Text::MultiMarkdown.3.gz
%%SITE_PERL%%/Text/MultiMarkdown.pm
-man/man1/MultiMarkdown.pl.1.gz
+%%PERL5_MAN1%%/MultiMarkdown.pl.1.gz
diff --git a/textproc/p5-Text-NSP/pkg-plist b/textproc/p5-Text-NSP/pkg-plist
index f10a61e22031..90825cf64085 100644
--- a/textproc/p5-Text-NSP/pkg-plist
+++ b/textproc/p5-Text-NSP/pkg-plist
@@ -79,15 +79,15 @@ bin/statistic.pl
%%SITE_PERL%%/Text/NSP/Measures/4D.pm
%%SITE_PERL%%/Text/NSP/Measures/4D/MI.pm
%%SITE_PERL%%/Text/NSP/Measures/4D/MI/ll.pm
-man/man1/combig.pl.1.gz
-man/man1/count.pl.1.gz
-man/man1/count2huge.pl.1.gz
-man/man1/find-compounds.pl.1.gz
-man/man1/huge-count.pl.1.gz
-man/man1/huge-delete.pl.1.gz
-man/man1/huge-merge.pl.1.gz
-man/man1/huge-sort.pl.1.gz
-man/man1/huge-split.pl.1.gz
-man/man1/kocos.pl.1.gz
-man/man1/rank.pl.1.gz
-man/man1/statistic.pl.1.gz
+%%PERL5_MAN1%%/combig.pl.1.gz
+%%PERL5_MAN1%%/count.pl.1.gz
+%%PERL5_MAN1%%/count2huge.pl.1.gz
+%%PERL5_MAN1%%/find-compounds.pl.1.gz
+%%PERL5_MAN1%%/huge-count.pl.1.gz
+%%PERL5_MAN1%%/huge-delete.pl.1.gz
+%%PERL5_MAN1%%/huge-merge.pl.1.gz
+%%PERL5_MAN1%%/huge-sort.pl.1.gz
+%%PERL5_MAN1%%/huge-split.pl.1.gz
+%%PERL5_MAN1%%/kocos.pl.1.gz
+%%PERL5_MAN1%%/rank.pl.1.gz
+%%PERL5_MAN1%%/statistic.pl.1.gz
diff --git a/textproc/p5-Text-Ngrams/pkg-plist b/textproc/p5-Text-Ngrams/pkg-plist
index 36a17780fc34..83ee161ea4ff 100644
--- a/textproc/p5-Text-Ngrams/pkg-plist
+++ b/textproc/p5-Text-Ngrams/pkg-plist
@@ -2,4 +2,4 @@ bin/ngrams.pl
%%PERL5_MAN3%%/Text::Ngrams.3.gz
%%SITE_PERL%%/Text/Ngrams.pm
%%SITE_PERL%%/Text/ngrams.pl
-man/man1/ngrams.pl.1.gz
+%%PERL5_MAN1%%/ngrams.pl.1.gz
diff --git a/textproc/p5-Text-RecordParser/pkg-plist b/textproc/p5-Text-RecordParser/pkg-plist
index 559d029b1d0e..1aa70850ed14 100644
--- a/textproc/p5-Text-RecordParser/pkg-plist
+++ b/textproc/p5-Text-RecordParser/pkg-plist
@@ -7,6 +7,6 @@ bin/tabmerge
%%SITE_PERL%%/Text/RecordParser.pm
%%SITE_PERL%%/Text/RecordParser/Tab.pm
%%SITE_PERL%%/Text/RecordParser/Object.pm
-man/man1/tablify.1.gz
-man/man1/tabmerge.1.gz
-man/man1/tab2graph.1.gz
+%%PERL5_MAN1%%/tablify.1.gz
+%%PERL5_MAN1%%/tabmerge.1.gz
+%%PERL5_MAN1%%/tab2graph.1.gz
diff --git a/textproc/p5-Text-Similarity/pkg-plist b/textproc/p5-Text-Similarity/pkg-plist
index 66972fc1449c..56f37f9d4fb6 100644
--- a/textproc/p5-Text-Similarity/pkg-plist
+++ b/textproc/p5-Text-Similarity/pkg-plist
@@ -5,4 +5,4 @@ bin/text_similarity.pl
%%SITE_PERL%%/Text/OverlapFinder.pm
%%SITE_PERL%%/Text/Similarity.pm
%%SITE_PERL%%/Text/Similarity/Overlaps.pm
-man/man1/text_similarity.pl.1.gz
+%%PERL5_MAN1%%/text_similarity.pl.1.gz
diff --git a/textproc/p5-Text-VimColor/pkg-plist b/textproc/p5-Text-VimColor/pkg-plist
index 63f23eb6b482..f4f7186a5759 100644
--- a/textproc/p5-Text-VimColor/pkg-plist
+++ b/textproc/p5-Text-VimColor/pkg-plist
@@ -5,4 +5,4 @@ bin/text-vimcolor
%%SITE_PERL%%/auto/share/dist/Text-VimColor/light.css
%%SITE_PERL%%/auto/share/dist/Text-VimColor/light.xsl
%%SITE_PERL%%/auto/share/dist/Text-VimColor/mark.vim
-man/man1/text-vimcolor.1.gz
+%%PERL5_MAN1%%/text-vimcolor.1.gz
diff --git a/textproc/p5-Text-Xslate/pkg-plist b/textproc/p5-Text-Xslate/pkg-plist
index 7e2b2705e8c7..58602419a2a9 100644
--- a/textproc/p5-Text-Xslate/pkg-plist
+++ b/textproc/p5-Text-Xslate/pkg-plist
@@ -52,4 +52,4 @@ bin/xslate
%%SITE_ARCH%%/Text/Xslate/Type/Raw.pm
%%SITE_ARCH%%/Text/Xslate/Util.pm
%%SITE_ARCH%%/auto/Text/Xslate/Xslate.so
-man/man1/xslate.1.gz
+%%PERL5_MAN1%%/xslate.1.gz
diff --git a/textproc/p5-Tk-Pod/pkg-plist b/textproc/p5-Tk-Pod/pkg-plist
index 04b2bdafd19e..2f5e0dc04575 100644
--- a/textproc/p5-Tk-Pod/pkg-plist
+++ b/textproc/p5-Tk-Pod/pkg-plist
@@ -24,5 +24,5 @@ bin/tkpod
%%PERL5_MAN3%%/Tk::Pod::Tree.3.gz
%%PERL5_MAN3%%/Tk::Pod::Util.3.gz
%%PERL5_MAN3%%/Tk::Pod_usage.3.gz
-man/man1/tkmore.1.gz
-man/man1/tkpod.1.gz
+%%PERL5_MAN1%%/tkmore.1.gz
+%%PERL5_MAN1%%/tkpod.1.gz
diff --git a/textproc/p5-Tk-XMLViewer/pkg-plist b/textproc/p5-Tk-XMLViewer/pkg-plist
index 78db641c2ce2..eef23ccb295d 100644
--- a/textproc/p5-Tk-XMLViewer/pkg-plist
+++ b/textproc/p5-Tk-XMLViewer/pkg-plist
@@ -1,4 +1,4 @@
bin/tkxmlview
%%SITE_PERL%%/Tk/XMLViewer.pm
%%PERL5_MAN3%%/Tk::XMLViewer.3.gz
-man/man1/tkxmlview.1.gz
+%%PERL5_MAN1%%/tkxmlview.1.gz
diff --git a/textproc/p5-UML-Class-Simple/pkg-plist b/textproc/p5-UML-Class-Simple/pkg-plist
index 7c22c206d74f..97066e406d9a 100644
--- a/textproc/p5-UML-Class-Simple/pkg-plist
+++ b/textproc/p5-UML-Class-Simple/pkg-plist
@@ -1,4 +1,4 @@
bin/umlclass.pl
%%SITE_PERL%%/UML/Class/Simple.pm
%%PERL5_MAN3%%/UML::Class::Simple.3.gz
-man/man1/umlclass.pl.1.gz
+%%PERL5_MAN1%%/umlclass.pl.1.gz
diff --git a/textproc/p5-UML-Sequence/pkg-plist b/textproc/p5-UML-Sequence/pkg-plist
index 7a7adf91079d..2e204b488cb6 100644
--- a/textproc/p5-UML-Sequence/pkg-plist
+++ b/textproc/p5-UML-Sequence/pkg-plist
@@ -27,6 +27,6 @@ bin/seq2svg.pl
%%SITE_PERL%%/UML/genericseq.pl
%%SITE_PERL%%/UML/seq2rast.pl
%%SITE_PERL%%/UML/seq2svg.pl
-man/man1/genericseq.pl.1.gz
-man/man1/seq2rast.pl.1.gz
-man/man1/seq2svg.pl.1.gz
+%%PERL5_MAN1%%/genericseq.pl.1.gz
+%%PERL5_MAN1%%/seq2rast.pl.1.gz
+%%PERL5_MAN1%%/seq2svg.pl.1.gz
diff --git a/textproc/p5-UML-State/pkg-plist b/textproc/p5-UML-State/pkg-plist
index 2af79a76b632..10a671bc6c3c 100644
--- a/textproc/p5-UML-State/pkg-plist
+++ b/textproc/p5-UML-State/pkg-plist
@@ -6,5 +6,5 @@ bin/drawstatexml.pl
%%SITE_PERL%%/UML/State.pm
%%SITE_PERL%%/UML/drawstate.pl
%%SITE_PERL%%/UML/drawstatexml.pl
-man/man1/drawstate.pl.1.gz
-man/man1/drawstatexml.pl.1.gz
+%%PERL5_MAN1%%/drawstate.pl.1.gz
+%%PERL5_MAN1%%/drawstatexml.pl.1.gz
diff --git a/textproc/p5-URI-Find/pkg-plist b/textproc/p5-URI-Find/pkg-plist
index bba364810cbc..f2009aea0730 100644
--- a/textproc/p5-URI-Find/pkg-plist
+++ b/textproc/p5-URI-Find/pkg-plist
@@ -3,4 +3,4 @@ bin/urifind
%%PERL5_MAN3%%/URI::Find::Schemeless.3.gz
%%SITE_PERL%%/URI/Find.pm
%%SITE_PERL%%/URI/Find/Schemeless.pm
-man/man1/urifind.1.gz
+%%PERL5_MAN1%%/urifind.1.gz
diff --git a/textproc/p5-WordNet-Similarity/pkg-plist b/textproc/p5-WordNet-Similarity/pkg-plist
index e1d0e6ea1714..a3dcbc27e041 100644
--- a/textproc/p5-WordNet-Similarity/pkg-plist
+++ b/textproc/p5-WordNet-Similarity/pkg-plist
@@ -58,14 +58,14 @@ bin/wordVectors.pl
%%SITE_PERL%%/WordNet/vector-relation.dat
%%SITE_PERL%%/WordNet/vectorFile.pm
%%SITE_PERL%%/WordNet/wordvectors.dat
-man/man1/BNCFreq.pl.1.gz
-man/man1/brownFreq.pl.1.gz
-man/man1/compounds.pl.1.gz
-man/man1/rawtextFreq.pl.1.gz
-man/man1/semCorFreq.pl.1.gz
-man/man1/semCorRawFreq.pl.1.gz
-man/man1/similarity.pl.1.gz
-man/man1/similarity_server.pl.1.gz
-man/man1/treebankFreq.pl.1.gz
-man/man1/wnDepths.pl.1.gz
-man/man1/wordVectors.pl.1.gz
+%%PERL5_MAN1%%/BNCFreq.pl.1.gz
+%%PERL5_MAN1%%/brownFreq.pl.1.gz
+%%PERL5_MAN1%%/compounds.pl.1.gz
+%%PERL5_MAN1%%/rawtextFreq.pl.1.gz
+%%PERL5_MAN1%%/semCorFreq.pl.1.gz
+%%PERL5_MAN1%%/semCorRawFreq.pl.1.gz
+%%PERL5_MAN1%%/similarity.pl.1.gz
+%%PERL5_MAN1%%/similarity_server.pl.1.gz
+%%PERL5_MAN1%%/treebankFreq.pl.1.gz
+%%PERL5_MAN1%%/wnDepths.pl.1.gz
+%%PERL5_MAN1%%/wordVectors.pl.1.gz
diff --git a/textproc/p5-XML-Compile/pkg-plist b/textproc/p5-XML-Compile/pkg-plist
index c8ddb0e7ca73..4ef09dd46799 100644
--- a/textproc/p5-XML-Compile/pkg-plist
+++ b/textproc/p5-XML-Compile/pkg-plist
@@ -49,5 +49,5 @@ bin/xml2yaml
%%PERL5_MAN3%%/XML::Compile::Translate::Template.3.gz
%%PERL5_MAN3%%/XML::Compile::Translate::Writer.3.gz
%%PERL5_MAN3%%/XML::Compile::Util.3.gz
-man/man1/schema2example.1.gz
-man/man1/xml2yaml.1.gz
+%%PERL5_MAN1%%/schema2example.1.gz
+%%PERL5_MAN1%%/xml2yaml.1.gz
diff --git a/textproc/p5-XML-DT/pkg-plist b/textproc/p5-XML-DT/pkg-plist
index 131625bfd4bd..dd2c9e63867f 100644
--- a/textproc/p5-XML-DT/pkg-plist
+++ b/textproc/p5-XML-DT/pkg-plist
@@ -1,8 +1,8 @@
bin/mkdtskel
bin/mkdtdskel
bin/mkxmltype
-man/man1/mkdtdskel.1.gz
-man/man1/mkdtskel.1.gz
-man/man1/mkxmltype.1.gz
+%%PERL5_MAN1%%/mkdtdskel.1.gz
+%%PERL5_MAN1%%/mkdtskel.1.gz
+%%PERL5_MAN1%%/mkxmltype.1.gz
%%PERL5_MAN3%%/XML::DT.3.gz
%%SITE_PERL%%/XML/DT.pm
diff --git a/textproc/p5-XML-Driver-HTML/pkg-plist b/textproc/p5-XML-Driver-HTML/pkg-plist
index 3c17a107d0a2..4a27305081e4 100644
--- a/textproc/p5-XML-Driver-HTML/pkg-plist
+++ b/textproc/p5-XML-Driver-HTML/pkg-plist
@@ -1,4 +1,4 @@
bin/html2xhtml
%%PERL5_MAN3%%/XML::Driver::HTML.3.gz
%%SITE_PERL%%/XML/Driver/HTML.pm
-man/man1/html2xhtml.1.gz
+%%PERL5_MAN1%%/html2xhtml.1.gz
diff --git a/textproc/p5-XML-Encoding/pkg-plist b/textproc/p5-XML-Encoding/pkg-plist
index e793abe0a428..2605274a7b97 100644
--- a/textproc/p5-XML-Encoding/pkg-plist
+++ b/textproc/p5-XML-Encoding/pkg-plist
@@ -2,5 +2,5 @@ bin/compile_encoding
bin/make_encmap
%%PERL5_MAN3%%/XML::Encoding.3.gz
%%SITE_PERL%%/XML/Encoding.pm
-man/man1/compile_encoding.1.gz
-man/man1/make_encmap.1.gz
+%%PERL5_MAN1%%/compile_encoding.1.gz
+%%PERL5_MAN1%%/make_encmap.1.gz
diff --git a/textproc/p5-XML-Entities/pkg-plist b/textproc/p5-XML-Entities/pkg-plist
index eca4013c8b26..4c7e916478fa 100644
--- a/textproc/p5-XML-Entities/pkg-plist
+++ b/textproc/p5-XML-Entities/pkg-plist
@@ -5,4 +5,4 @@ bin/download-entities.pl
%%PERL5_MAN3%%/XML::Entities.3pm.gz
%%PERL5_MAN3%%/XML::Entities::Data.3pm.gz
%%PERL5_MAN3%%/download-entities.pl.3pm.gz
-man/man1/download-entities.pl.1.gz
+%%PERL5_MAN1%%/download-entities.pl.1.gz
diff --git a/textproc/p5-XML-Handler-Dtd2DocBook/pkg-plist b/textproc/p5-XML-Handler-Dtd2DocBook/pkg-plist
index 720b4f5162ca..ce5a359f1574 100644
--- a/textproc/p5-XML-Handler-Dtd2DocBook/pkg-plist
+++ b/textproc/p5-XML-Handler-Dtd2DocBook/pkg-plist
@@ -17,4 +17,4 @@ bin/dtd2db.pl
%%SITE_PERL%%/XML/Handler/Dtd2DocBook/fr/index.tmpl
%%SITE_PERL%%/XML/Handler/Dtd2DocBook/fr/notation.tmpl
%%SITE_PERL%%/XML/Handler/Dtd2DocBook/fr/prolog.tmpl
-man/man1/dtd2db.pl.1.gz
+%%PERL5_MAN1%%/dtd2db.pl.1.gz
diff --git a/textproc/p5-XML-Handler-Dtd2Html/pkg-plist b/textproc/p5-XML-Handler-Dtd2Html/pkg-plist
index 34dfa19c479e..dc9f5bc1e909 100644
--- a/textproc/p5-XML-Handler-Dtd2Html/pkg-plist
+++ b/textproc/p5-XML-Handler-Dtd2Html/pkg-plist
@@ -40,4 +40,4 @@ bin/dtd2html.pl
%%SITE_PERL%%/XML/Handler/Dtd2Html/prev.png
%%SITE_PERL%%/XML/Handler/Dtd2Html/simple.css
%%SITE_PERL%%/XML/Handler/Dtd2Html/up.png
-man/man1/dtd2html.pl.1.gz
+%%PERL5_MAN1%%/dtd2html.pl.1.gz
diff --git a/textproc/p5-XML-Handler-YAWriter/pkg-plist b/textproc/p5-XML-Handler-YAWriter/pkg-plist
index 38399ee181fd..c07383d74a20 100644
--- a/textproc/p5-XML-Handler-YAWriter/pkg-plist
+++ b/textproc/p5-XML-Handler-YAWriter/pkg-plist
@@ -1,4 +1,4 @@
bin/xmlpretty
%%PERL5_MAN3%%/XML::Handler::YAWriter.3.gz
%%SITE_PERL%%/XML/Handler/YAWriter.pm
-man/man1/xmlpretty.1.gz
+%%PERL5_MAN1%%/xmlpretty.1.gz
diff --git a/textproc/p5-XML-LibXML-PrettyPrint/pkg-plist b/textproc/p5-XML-LibXML-PrettyPrint/pkg-plist
index 06c095d25c1b..d22ebb636a9a 100644
--- a/textproc/p5-XML-LibXML-PrettyPrint/pkg-plist
+++ b/textproc/p5-XML-LibXML-PrettyPrint/pkg-plist
@@ -1,4 +1,4 @@
bin/xml-pretty
%%SITE_PERL%%/XML/LibXML/PrettyPrint.pm
%%PERL5_MAN3%%/XML::LibXML::PrettyPrint.3.gz
-man/man1/xml-pretty.1.gz
+%%PERL5_MAN1%%/xml-pretty.1.gz
diff --git a/textproc/p5-XML-Rewrite/pkg-plist b/textproc/p5-XML-Rewrite/pkg-plist
index bbdeaf1cabb6..dcc84e66d4b1 100644
--- a/textproc/p5-XML-Rewrite/pkg-plist
+++ b/textproc/p5-XML-Rewrite/pkg-plist
@@ -1,5 +1,5 @@
bin/xmlrewrite
-man/man1/xmlrewrite.1.gz
+%%PERL5_MAN1%%/xmlrewrite.1.gz
%%SITE_PERL%%/XML/Rewrite.pm
%%SITE_PERL%%/XML/Rewrite.pod
%%SITE_PERL%%/XML/Rewrite/Schema.pm
diff --git a/textproc/p5-XML-Twig/pkg-plist b/textproc/p5-XML-Twig/pkg-plist
index ab2c0c1f63fd..ba86c464a35e 100644
--- a/textproc/p5-XML-Twig/pkg-plist
+++ b/textproc/p5-XML-Twig/pkg-plist
@@ -6,8 +6,8 @@ bin/xml_split
%%SITE_PERL%%/XML/Twig.pm
%%SITE_PERL%%/XML/Twig/XPath.pm
%%PERL5_MAN3%%/XML::Twig.3.gz
-man/man1/xml_grep.1.gz
-man/man1/xml_merge.1.gz
-man/man1/xml_pp.1.gz
-man/man1/xml_spellcheck.1.gz
-man/man1/xml_split.1.gz
+%%PERL5_MAN1%%/xml_grep.1.gz
+%%PERL5_MAN1%%/xml_merge.1.gz
+%%PERL5_MAN1%%/xml_pp.1.gz
+%%PERL5_MAN1%%/xml_spellcheck.1.gz
+%%PERL5_MAN1%%/xml_split.1.gz
diff --git a/textproc/p5-XML-Validate/pkg-plist b/textproc/p5-XML-Validate/pkg-plist
index f0e8b5f224cc..f8f1b0b128d0 100644
--- a/textproc/p5-XML-Validate/pkg-plist
+++ b/textproc/p5-XML-Validate/pkg-plist
@@ -1,5 +1,5 @@
bin/validxml.pl
-man/man1/validxml.pl.1.gz
+%%PERL5_MAN1%%/validxml.pl.1.gz
%%SITE_PERL%%/XML/Validate.pm
%%SITE_PERL%%/XML/Validate/Base.pm
%%SITE_PERL%%/XML/Validate/LibXML.pm
diff --git a/textproc/p5-XML-XSH/pkg-plist b/textproc/p5-XML-XSH/pkg-plist
index 542a75d148e4..ac0cdbd3e5bc 100644
--- a/textproc/p5-XML-XSH/pkg-plist
+++ b/textproc/p5-XML-XSH/pkg-plist
@@ -13,4 +13,4 @@ bin/xsh
%%SITE_PERL%%/XML/XSH/Iterators.pm
%%SITE_PERL%%/XML/XSH/LibXMLCompat.pm
%%SITE_PERL%%/XML/XSH/Parser.pm
-man/man1/xsh.1.gz
+%%PERL5_MAN1%%/xsh.1.gz
diff --git a/textproc/p5-XML-XSLT/pkg-plist b/textproc/p5-XML-XSLT/pkg-plist
index 53b9d86dc707..281fdae6a481 100644
--- a/textproc/p5-XML-XSLT/pkg-plist
+++ b/textproc/p5-XML-XSLT/pkg-plist
@@ -1,4 +1,4 @@
bin/xslt-parser
%%PERL5_MAN3%%/XML::XSLT.3.gz
%%SITE_PERL%%/XML/XSLT.pm
-man/man1/xslt-parser.1.gz
+%%PERL5_MAN1%%/xslt-parser.1.gz
diff --git a/textproc/p5-XML-XUpdate-LibXML/pkg-plist b/textproc/p5-XML-XUpdate-LibXML/pkg-plist
index 6cd822057985..a07b2923303b 100644
--- a/textproc/p5-XML-XUpdate-LibXML/pkg-plist
+++ b/textproc/p5-XML-XUpdate-LibXML/pkg-plist
@@ -1,5 +1,5 @@
bin/xupdate
-man/man1/xupdate.1.gz
+%%PERL5_MAN1%%/xupdate.1.gz
%%PERL5_MAN3%%/XML::Normalize::LibXML.3.gz
%%PERL5_MAN3%%/XML::XUpdate::LibXML.3.gz
%%SITE_PERL%%/XML/Normalize/LibXML.pm
diff --git a/textproc/p5-YAML-Shell/pkg-plist b/textproc/p5-YAML-Shell/pkg-plist
index 2544296ebaad..e9342ceea638 100644
--- a/textproc/p5-YAML-Shell/pkg-plist
+++ b/textproc/p5-YAML-Shell/pkg-plist
@@ -1,5 +1,5 @@
bin/ysh
-man/man1/ysh.1.gz
+%%PERL5_MAN1%%/ysh.1.gz
%%PERL5_MAN3%%/YAML::Shell.3.gz
%%SITE_PERL%%/YAML/Shell.pm
%%SITE_PERL%%/YAML/Shell.pod
diff --git a/textproc/p5-pod2pdf/pkg-plist b/textproc/p5-pod2pdf/pkg-plist
index 319d55067fc6..4922e23a00de 100644
--- a/textproc/p5-pod2pdf/pkg-plist
+++ b/textproc/p5-pod2pdf/pkg-plist
@@ -1,3 +1,3 @@
bin/pod2pdf
-man/man1/pod2pdf.1.gz
+%%PERL5_MAN1%%/pod2pdf.1.gz
%%SITE_PERL%%/App/pod2pdf.pm
diff --git a/textproc/p5-xmltv/pkg-plist b/textproc/p5-xmltv/pkg-plist
index 0653a6b711bd..2a7afae07f82 100644
--- a/textproc/p5-xmltv/pkg-plist
+++ b/textproc/p5-xmltv/pkg-plist
@@ -97,55 +97,55 @@ bin/tv_validate_grabber
%%SITE_PERL%%/XMLTV/ValidateFile.pm
%%SITE_PERL%%/XMLTV/ValidateGrabber.pm
%%SITE_PERL%%/XMLTV/Version.pm
-man/man1/tv_augment_tz.1.gz
-man/man1/tv_cat.1.gz
-man/man1/tv_check.1.gz
-man/man1/tv_count.1.gz
-man/man1/tv_extractinfo_ar.1.gz
-man/man1/tv_extractinfo_en.1.gz
-man/man1/tv_find_grabbers.1.gz
-man/man1/tv_grab_ar.1.gz
-man/man1/tv_grab_ch_search.1.gz
-man/man1/tv_grab_combiner.1.gz
-man/man1/tv_grab_dtv_la.1.gz
-man/man1/tv_grab_es_laguiatv.1.gz
-man/man1/tv_grab_eu_egon.1.gz
-man/man1/tv_grab_eu_epgdata.1.gz
-man/man1/tv_grab_fi.1.gz
-man/man1/tv_grab_fi_sv.1.gz
-man/man1/tv_grab_fr.1.gz
-man/man1/tv_grab_fr_kazer.1.gz
-man/man1/tv_grab_hr.1.gz
-man/man1/tv_grab_huro.1.gz
-man/man1/tv_grab_il.1.gz
-man/man1/tv_grab_is.1.gz
-man/man1/tv_grab_it.1.gz
-man/man1/tv_grab_it_dvb.1.gz
-man/man1/tv_grab_na_dd.1.gz
-man/man1/tv_grab_na_dtv.1.gz
-man/man1/tv_grab_nl.1.gz
-man/man1/tv_grab_no_gfeed.1.gz
-man/man1/tv_grab_pt.1.gz
-man/man1/tv_grab_pt_meo.1.gz
-man/man1/tv_grab_se_swedb.1.gz
-man/man1/tv_grab_se_tvzon.1.gz
-man/man1/tv_grab_uk_atlas.1.gz
-man/man1/tv_grab_uk_bleb.1.gz
-man/man1/tv_grab_uk_guardian.1.gz
-man/man1/tv_grab_uk_rt.1.gz
-man/man1/tv_grab_uk_tvguide.1.gz
-man/man1/tv_grab_za.1.gz
-man/man1/tv_grep.1.gz
-man/man1/tv_imdb.1.gz
-man/man1/tv_merge.1.gz
-man/man1/tv_remove_some_overlapping.1.gz
-man/man1/tv_sort.1.gz
-man/man1/tv_split.1.gz
-man/man1/tv_to_latex.1.gz
-man/man1/tv_to_potatoe.1.gz
-man/man1/tv_to_text.1.gz
-man/man1/tv_validate_file.1.gz
-man/man1/tv_validate_grabber.1.gz
+%%PERL5_MAN1%%/tv_augment_tz.1.gz
+%%PERL5_MAN1%%/tv_cat.1.gz
+%%PERL5_MAN1%%/tv_check.1.gz
+%%PERL5_MAN1%%/tv_count.1.gz
+%%PERL5_MAN1%%/tv_extractinfo_ar.1.gz
+%%PERL5_MAN1%%/tv_extractinfo_en.1.gz
+%%PERL5_MAN1%%/tv_find_grabbers.1.gz
+%%PERL5_MAN1%%/tv_grab_ar.1.gz
+%%PERL5_MAN1%%/tv_grab_ch_search.1.gz
+%%PERL5_MAN1%%/tv_grab_combiner.1.gz
+%%PERL5_MAN1%%/tv_grab_dtv_la.1.gz
+%%PERL5_MAN1%%/tv_grab_es_laguiatv.1.gz
+%%PERL5_MAN1%%/tv_grab_eu_egon.1.gz
+%%PERL5_MAN1%%/tv_grab_eu_epgdata.1.gz
+%%PERL5_MAN1%%/tv_grab_fi.1.gz
+%%PERL5_MAN1%%/tv_grab_fi_sv.1.gz
+%%PERL5_MAN1%%/tv_grab_fr.1.gz
+%%PERL5_MAN1%%/tv_grab_fr_kazer.1.gz
+%%PERL5_MAN1%%/tv_grab_hr.1.gz
+%%PERL5_MAN1%%/tv_grab_huro.1.gz
+%%PERL5_MAN1%%/tv_grab_il.1.gz
+%%PERL5_MAN1%%/tv_grab_is.1.gz
+%%PERL5_MAN1%%/tv_grab_it.1.gz
+%%PERL5_MAN1%%/tv_grab_it_dvb.1.gz
+%%PERL5_MAN1%%/tv_grab_na_dd.1.gz
+%%PERL5_MAN1%%/tv_grab_na_dtv.1.gz
+%%PERL5_MAN1%%/tv_grab_nl.1.gz
+%%PERL5_MAN1%%/tv_grab_no_gfeed.1.gz
+%%PERL5_MAN1%%/tv_grab_pt.1.gz
+%%PERL5_MAN1%%/tv_grab_pt_meo.1.gz
+%%PERL5_MAN1%%/tv_grab_se_swedb.1.gz
+%%PERL5_MAN1%%/tv_grab_se_tvzon.1.gz
+%%PERL5_MAN1%%/tv_grab_uk_atlas.1.gz
+%%PERL5_MAN1%%/tv_grab_uk_bleb.1.gz
+%%PERL5_MAN1%%/tv_grab_uk_guardian.1.gz
+%%PERL5_MAN1%%/tv_grab_uk_rt.1.gz
+%%PERL5_MAN1%%/tv_grab_uk_tvguide.1.gz
+%%PERL5_MAN1%%/tv_grab_za.1.gz
+%%PERL5_MAN1%%/tv_grep.1.gz
+%%PERL5_MAN1%%/tv_imdb.1.gz
+%%PERL5_MAN1%%/tv_merge.1.gz
+%%PERL5_MAN1%%/tv_remove_some_overlapping.1.gz
+%%PERL5_MAN1%%/tv_sort.1.gz
+%%PERL5_MAN1%%/tv_split.1.gz
+%%PERL5_MAN1%%/tv_to_latex.1.gz
+%%PERL5_MAN1%%/tv_to_potatoe.1.gz
+%%PERL5_MAN1%%/tv_to_text.1.gz
+%%PERL5_MAN1%%/tv_validate_file.1.gz
+%%PERL5_MAN1%%/tv_validate_grabber.1.gz
%%DATADIR%%/tv_grab_eu_epgdata/channel_ids
%%DATADIR%%/tv_grab_huro/catmap.cz
%%DATADIR%%/tv_grab_huro/catmap.hu
diff --git a/textproc/po4a/files/patch-Po4aBuilder.pm b/textproc/po4a/files/patch-Po4aBuilder.pm
index e1d05327ed9c..34f9c8575f89 100644
--- a/textproc/po4a/files/patch-Po4aBuilder.pm
+++ b/textproc/po4a/files/patch-Po4aBuilder.pm
@@ -1,6 +1,6 @@
---- Po4aBuilder.pm.orig 2013-08-21 15:11:04.000000000 -0500
-+++ Po4aBuilder.pm 2015-04-06 11:57:21.938813000 -0500
-@@ -132,13 +132,13 @@
+--- Po4aBuilder.pm.orig 2013-08-21 20:11:04 UTC
++++ Po4aBuilder.pm
+@@ -132,13 +132,13 @@ sub ACTION_install {
require ExtUtils::Install;
# $self->depends_on('build');
@@ -10,9 +10,10 @@
$self->install_path(man => $mandir);
$self->install_path(manl10n => $mandir);
- my $localedir = $mandir;
+- my $localedir = $mandir;
- $localedir =~ s,/man$,/locale,;
-+ $localedir =~ s,/man$,/share/locale,;
++ my $localedir = $self->install_path->{'bin'};
++ $localedir =~ s,/bin$,/share/locale,;
$self->install_path(po => $localedir);
ExtUtils::Install::install($self->install_map, !$self->quiet, 0, $self->{args}{uninst}||0);
diff --git a/textproc/po4a/pkg-plist b/textproc/po4a/pkg-plist
index 90631e4408ea..ff4b330ea287 100644
--- a/textproc/po4a/pkg-plist
+++ b/textproc/po4a/pkg-plist
@@ -79,272 +79,272 @@ share/locale/uk/LC_MESSAGES/po4a.mo
share/locale/vi/LC_MESSAGES/po4a.mo
share/locale/zh_CN/LC_MESSAGES/po4a.mo
share/locale/zh_HK/LC_MESSAGES/po4a.mo
-man/ca/man1/po4a-normalize.1p.gz
-man/ca/man1/po4a-translate.1p.gz
-man/ca/man3/Locale::Po4a::BibTeX.3pm.gz
-man/ca/man3/Locale::Po4a::Chooser.3pm.gz
-man/ca/man3/Locale::Po4a::Dia.3pm.gz
-man/ca/man3/Locale::Po4a::Docbook.3pm.gz
-man/ca/man3/Locale::Po4a::Guide.3pm.gz
-man/ca/man3/Locale::Po4a::KernelHelp.3pm.gz
-man/ca/man3/Locale::Po4a::LaTeX.3pm.gz
-man/ca/man3/Locale::Po4a::Po.3pm.gz
-man/ca/man3/Locale::Po4a::Pod.3pm.gz
-man/ca/man3/Locale::Po4a::Sgml.3pm.gz
-man/ca/man3/Locale::Po4a::Texinfo.3pm.gz
-man/ca/man3/Locale::Po4a::TransTractor.3pm.gz
-man/ca/man7/po4a.7.gz
-man/de/man1/msguntypot.1p.gz
-man/de/man1/po4a-build.1.gz
-man/de/man1/po4a-gettextize.1p.gz
-man/de/man1/po4a-normalize.1p.gz
-man/de/man1/po4a-translate.1p.gz
-man/de/man1/po4a-updatepo.1p.gz
-man/de/man1/po4a.1p.gz
-man/de/man1/po4aman-display-po.1.gz
-man/de/man1/po4apod-display-po.1.gz
-man/de/man3/Locale::Po4a::AsciiDoc.3pm.gz
-man/de/man3/Locale::Po4a::BibTeX.3pm.gz
-man/de/man3/Locale::Po4a::Chooser.3pm.gz
-man/de/man3/Locale::Po4a::Common.3pm.gz
-man/de/man3/Locale::Po4a::Dia.3pm.gz
-man/de/man3/Locale::Po4a::Docbook.3pm.gz
-man/de/man3/Locale::Po4a::Guide.3pm.gz
-man/de/man3/Locale::Po4a::Halibut.3pm.gz
-man/de/man3/Locale::Po4a::Ini.3pm.gz
-man/de/man3/Locale::Po4a::KernelHelp.3pm.gz
-man/de/man3/Locale::Po4a::LaTeX.3pm.gz
-man/de/man3/Locale::Po4a::Man.3pm.gz
-man/de/man3/Locale::Po4a::Po.3pm.gz
-man/de/man3/Locale::Po4a::Pod.3pm.gz
-man/de/man3/Locale::Po4a::Sgml.3pm.gz
-man/de/man3/Locale::Po4a::TeX.3pm.gz
-man/de/man3/Locale::Po4a::Texinfo.3pm.gz
-man/de/man3/Locale::Po4a::Text.3pm.gz
-man/de/man3/Locale::Po4a::TransTractor.3pm.gz
-man/de/man3/Locale::Po4a::Wml.3pm.gz
-man/de/man3/Locale::Po4a::Xhtml.3pm.gz
-man/de/man3/Locale::Po4a::Xml.3pm.gz
-man/de/man5/po4a-build.conf.5.gz
-man/de/man7/po4a-runtime.7.gz
-man/de/man7/po4a.7.gz
-man/es/man1/msguntypot.1p.gz
-man/es/man1/po4a-build.1.gz
-man/es/man1/po4a-gettextize.1p.gz
-man/es/man1/po4a-normalize.1p.gz
-man/es/man1/po4a-translate.1p.gz
-man/es/man1/po4a-updatepo.1p.gz
-man/es/man1/po4a.1p.gz
-man/es/man1/po4aman-display-po.1.gz
-man/es/man1/po4apod-display-po.1.gz
-man/es/man3/Locale::Po4a::AsciiDoc.3pm.gz
-man/es/man3/Locale::Po4a::BibTeX.3pm.gz
-man/es/man3/Locale::Po4a::Chooser.3pm.gz
-man/es/man3/Locale::Po4a::Common.3pm.gz
-man/es/man3/Locale::Po4a::Dia.3pm.gz
-man/es/man3/Locale::Po4a::Docbook.3pm.gz
-man/es/man3/Locale::Po4a::Guide.3pm.gz
-man/es/man3/Locale::Po4a::Halibut.3pm.gz
-man/es/man3/Locale::Po4a::Ini.3pm.gz
-man/es/man3/Locale::Po4a::KernelHelp.3pm.gz
-man/es/man3/Locale::Po4a::LaTeX.3pm.gz
-man/es/man3/Locale::Po4a::Man.3pm.gz
-man/es/man3/Locale::Po4a::Po.3pm.gz
-man/es/man3/Locale::Po4a::Pod.3pm.gz
-man/es/man3/Locale::Po4a::Sgml.3pm.gz
-man/es/man3/Locale::Po4a::TeX.3pm.gz
-man/es/man3/Locale::Po4a::Texinfo.3pm.gz
-man/es/man3/Locale::Po4a::Text.3pm.gz
-man/es/man3/Locale::Po4a::TransTractor.3pm.gz
-man/es/man3/Locale::Po4a::Wml.3pm.gz
-man/es/man3/Locale::Po4a::Xhtml.3pm.gz
-man/es/man3/Locale::Po4a::Xml.3pm.gz
-man/es/man5/po4a-build.conf.5.gz
-man/es/man7/po4a-runtime.7.gz
-man/es/man7/po4a.7.gz
-man/fr/man1/msguntypot.1p.gz
-man/fr/man1/po4a-build.1.gz
-man/fr/man1/po4a-gettextize.1p.gz
-man/fr/man1/po4a-normalize.1p.gz
-man/fr/man1/po4a-translate.1p.gz
-man/fr/man1/po4a-updatepo.1p.gz
-man/fr/man1/po4a.1p.gz
-man/fr/man1/po4aman-display-po.1.gz
-man/fr/man1/po4apod-display-po.1.gz
-man/fr/man3/Locale::Po4a::AsciiDoc.3pm.gz
-man/fr/man3/Locale::Po4a::BibTeX.3pm.gz
-man/fr/man3/Locale::Po4a::Chooser.3pm.gz
-man/fr/man3/Locale::Po4a::Common.3pm.gz
-man/fr/man3/Locale::Po4a::Dia.3pm.gz
-man/fr/man3/Locale::Po4a::Docbook.3pm.gz
-man/fr/man3/Locale::Po4a::Guide.3pm.gz
-man/fr/man3/Locale::Po4a::Halibut.3pm.gz
-man/fr/man3/Locale::Po4a::Ini.3pm.gz
-man/fr/man3/Locale::Po4a::KernelHelp.3pm.gz
-man/fr/man3/Locale::Po4a::LaTeX.3pm.gz
-man/fr/man3/Locale::Po4a::Man.3pm.gz
-man/fr/man3/Locale::Po4a::Po.3pm.gz
-man/fr/man3/Locale::Po4a::Pod.3pm.gz
-man/fr/man3/Locale::Po4a::Sgml.3pm.gz
-man/fr/man3/Locale::Po4a::TeX.3pm.gz
-man/fr/man3/Locale::Po4a::Texinfo.3pm.gz
-man/fr/man3/Locale::Po4a::Text.3pm.gz
-man/fr/man3/Locale::Po4a::TransTractor.3pm.gz
-man/fr/man3/Locale::Po4a::Wml.3pm.gz
-man/fr/man3/Locale::Po4a::Xhtml.3pm.gz
-man/fr/man3/Locale::Po4a::Xml.3pm.gz
-man/fr/man5/po4a-build.conf.5.gz
-man/fr/man7/po4a-runtime.7.gz
-man/fr/man7/po4a.7.gz
-man/it/man1/po4a-normalize.1p.gz
-man/it/man1/po4a-translate.1p.gz
-man/it/man3/Locale::Po4a::Chooser.3pm.gz
-man/it/man3/Locale::Po4a::Dia.3pm.gz
-man/it/man3/Locale::Po4a::Docbook.3pm.gz
-man/it/man3/Locale::Po4a::Guide.3pm.gz
-man/it/man3/Locale::Po4a::KernelHelp.3pm.gz
-man/it/man3/Locale::Po4a::Pod.3pm.gz
-man/ja/man1/msguntypot.1p.gz
-man/ja/man1/po4a-build.1.gz
-man/ja/man1/po4a-gettextize.1p.gz
-man/ja/man1/po4a-normalize.1p.gz
-man/ja/man1/po4a-translate.1p.gz
-man/ja/man1/po4a-updatepo.1p.gz
-man/ja/man1/po4a.1p.gz
-man/ja/man1/po4aman-display-po.1.gz
-man/ja/man1/po4apod-display-po.1.gz
-man/ja/man3/Locale::Po4a::AsciiDoc.3pm.gz
-man/ja/man3/Locale::Po4a::BibTeX.3pm.gz
-man/ja/man3/Locale::Po4a::Chooser.3pm.gz
-man/ja/man3/Locale::Po4a::Common.3pm.gz
-man/ja/man3/Locale::Po4a::Dia.3pm.gz
-man/ja/man3/Locale::Po4a::Docbook.3pm.gz
-man/ja/man3/Locale::Po4a::Guide.3pm.gz
-man/ja/man3/Locale::Po4a::Halibut.3pm.gz
-man/ja/man3/Locale::Po4a::Ini.3pm.gz
-man/ja/man3/Locale::Po4a::KernelHelp.3pm.gz
-man/ja/man3/Locale::Po4a::LaTeX.3pm.gz
-man/ja/man3/Locale::Po4a::Man.3pm.gz
-man/ja/man3/Locale::Po4a::Po.3pm.gz
-man/ja/man3/Locale::Po4a::Pod.3pm.gz
-man/ja/man3/Locale::Po4a::Sgml.3pm.gz
-man/ja/man3/Locale::Po4a::TeX.3pm.gz
-man/ja/man3/Locale::Po4a::Texinfo.3pm.gz
-man/ja/man3/Locale::Po4a::Text.3pm.gz
-man/ja/man3/Locale::Po4a::TransTractor.3pm.gz
-man/ja/man3/Locale::Po4a::Wml.3pm.gz
-man/ja/man3/Locale::Po4a::Xhtml.3pm.gz
-man/ja/man3/Locale::Po4a::Xml.3pm.gz
-man/ja/man5/po4a-build.conf.5.gz
-man/ja/man7/po4a-runtime.7.gz
-man/ja/man7/po4a.7.gz
-man/man1/msguntypot.1p.gz
-man/man1/po4a-build.1.gz
-man/man1/po4a-gettextize.1p.gz
-man/man1/po4a-normalize.1p.gz
-man/man1/po4a-translate.1p.gz
-man/man1/po4a-updatepo.1p.gz
-man/man1/po4a.1p.gz
-man/man1/po4aman-display-po.1.gz
-man/man1/po4apod-display-po.1.gz
-man/man3/Locale::Po4a::AsciiDoc.pm.3pm.gz
-man/man3/Locale::Po4a::BibTeX.pm.3pm.gz
-man/man3/Locale::Po4a::Chooser.pm.3pm.gz
-man/man3/Locale::Po4a::Common.pm.3pm.gz
-man/man3/Locale::Po4a::Dia.pm.3pm.gz
-man/man3/Locale::Po4a::Docbook.pm.3pm.gz
-man/man3/Locale::Po4a::Guide.pm.3pm.gz
-man/man3/Locale::Po4a::Halibut.pm.3pm.gz
-man/man3/Locale::Po4a::Ini.pm.3pm.gz
-man/man3/Locale::Po4a::KernelHelp.pm.3pm.gz
-man/man3/Locale::Po4a::LaTeX.pm.3pm.gz
-man/man3/Locale::Po4a::Man.pm.3pm.gz
-man/man3/Locale::Po4a::Po.pm.3pm.gz
-man/man3/Locale::Po4a::Pod.pm.3pm.gz
-man/man3/Locale::Po4a::Sgml.pm.3pm.gz
-man/man3/Locale::Po4a::TeX.pm.3pm.gz
-man/man3/Locale::Po4a::Texinfo.pm.3pm.gz
-man/man3/Locale::Po4a::Text.pm.3pm.gz
-man/man3/Locale::Po4a::TransTractor.pm.3pm.gz
-man/man3/Locale::Po4a::Wml.pm.3pm.gz
-man/man3/Locale::Po4a::Xhtml.pm.3pm.gz
-man/man3/Locale::Po4a::Xml.pm.3pm.gz
-man/man5/po4a-build.conf.5.gz
-man/man7/po4a-runtime.7.gz
-man/man7/po4a.7.gz
-man/pl/man1/msguntypot.1p.gz
-man/pl/man1/po4a-build.1.gz
-man/pl/man1/po4a-gettextize.1p.gz
-man/pl/man1/po4a-normalize.1p.gz
-man/pl/man1/po4a-translate.1p.gz
-man/pl/man1/po4a-updatepo.1p.gz
-man/pl/man1/po4a.1p.gz
-man/pl/man1/po4aman-display-po.1.gz
-man/pl/man1/po4apod-display-po.1.gz
-man/pl/man3/Locale::Po4a::BibTeX.3pm.gz
-man/pl/man3/Locale::Po4a::Chooser.3pm.gz
-man/pl/man3/Locale::Po4a::Common.3pm.gz
-man/pl/man3/Locale::Po4a::Dia.3pm.gz
-man/pl/man3/Locale::Po4a::Docbook.3pm.gz
-man/pl/man3/Locale::Po4a::Guide.3pm.gz
-man/pl/man3/Locale::Po4a::Halibut.3pm.gz
-man/pl/man3/Locale::Po4a::Ini.3pm.gz
-man/pl/man3/Locale::Po4a::KernelHelp.3pm.gz
-man/pl/man3/Locale::Po4a::LaTeX.3pm.gz
-man/pl/man3/Locale::Po4a::Man.3pm.gz
-man/pl/man3/Locale::Po4a::Po.3pm.gz
-man/pl/man3/Locale::Po4a::Pod.3pm.gz
-man/pl/man3/Locale::Po4a::Sgml.3pm.gz
-man/pl/man3/Locale::Po4a::TeX.3pm.gz
-man/pl/man3/Locale::Po4a::Texinfo.3pm.gz
-man/pl/man3/Locale::Po4a::Text.3pm.gz
-man/pl/man3/Locale::Po4a::TransTractor.3pm.gz
-man/pl/man3/Locale::Po4a::Wml.3pm.gz
-man/pl/man3/Locale::Po4a::Xhtml.3pm.gz
-man/pl/man3/Locale::Po4a::Xml.3pm.gz
-man/pl/man5/po4a-build.conf.5.gz
-man/pl/man7/po4a-runtime.7.gz
-man/pl/man7/po4a.7.gz
-man/pt/man1/msguntypot.1p.gz
-man/pt/man1/po4a-build.1.gz
-man/pt/man1/po4a-gettextize.1p.gz
-man/pt/man1/po4a-normalize.1p.gz
-man/pt/man1/po4a-translate.1p.gz
-man/pt/man1/po4a-updatepo.1p.gz
-man/pt/man1/po4a.1p.gz
-man/pt/man1/po4aman-display-po.1.gz
-man/pt/man1/po4apod-display-po.1.gz
-man/pt/man3/Locale::Po4a::BibTeX.3pm.gz
-man/pt/man3/Locale::Po4a::Chooser.3pm.gz
-man/pt/man3/Locale::Po4a::Common.3pm.gz
-man/pt/man3/Locale::Po4a::Dia.3pm.gz
-man/pt/man3/Locale::Po4a::Docbook.3pm.gz
-man/pt/man3/Locale::Po4a::Guide.3pm.gz
-man/pt/man3/Locale::Po4a::Halibut.3pm.gz
-man/pt/man3/Locale::Po4a::Ini.3pm.gz
-man/pt/man3/Locale::Po4a::KernelHelp.3pm.gz
-man/pt/man3/Locale::Po4a::LaTeX.3pm.gz
-man/pt/man3/Locale::Po4a::Man.3pm.gz
-man/pt/man3/Locale::Po4a::Po.3pm.gz
-man/pt/man3/Locale::Po4a::Pod.3pm.gz
-man/pt/man3/Locale::Po4a::Sgml.3pm.gz
-man/pt/man3/Locale::Po4a::TeX.3pm.gz
-man/pt/man3/Locale::Po4a::Texinfo.3pm.gz
-man/pt/man3/Locale::Po4a::Text.3pm.gz
-man/pt/man3/Locale::Po4a::TransTractor.3pm.gz
-man/pt/man3/Locale::Po4a::Wml.3pm.gz
-man/pt/man3/Locale::Po4a::Xhtml.3pm.gz
-man/pt/man3/Locale::Po4a::Xml.3pm.gz
-man/pt/man5/po4a-build.conf.5.gz
-man/pt/man7/po4a-runtime.7.gz
-man/pt/man7/po4a.7.gz
-man/ru/man1/msguntypot.1p.gz
-man/ru/man1/po4a-build.1.gz
-man/ru/man1/po4a-gettextize.1p.gz
-man/ru/man1/po4a-normalize.1p.gz
-man/ru/man1/po4a-translate.1p.gz
-man/ru/man1/po4a-updatepo.1p.gz
-man/ru/man1/po4a.1p.gz
-man/ru/man1/po4aman-display-po.1.gz
-man/ru/man1/po4apod-display-po.1.gz
-man/ru/man3/Locale::Po4a::Man.3pm.gz
+%%SITE_PERL%%/man/ca/man1/po4a-normalize.1p.gz
+%%SITE_PERL%%/man/ca/man1/po4a-translate.1p.gz
+%%SITE_PERL%%/man/ca/man3/Locale::Po4a::BibTeX.3pm.gz
+%%SITE_PERL%%/man/ca/man3/Locale::Po4a::Chooser.3pm.gz
+%%SITE_PERL%%/man/ca/man3/Locale::Po4a::Dia.3pm.gz
+%%SITE_PERL%%/man/ca/man3/Locale::Po4a::Docbook.3pm.gz
+%%SITE_PERL%%/man/ca/man3/Locale::Po4a::Guide.3pm.gz
+%%SITE_PERL%%/man/ca/man3/Locale::Po4a::KernelHelp.3pm.gz
+%%SITE_PERL%%/man/ca/man3/Locale::Po4a::LaTeX.3pm.gz
+%%SITE_PERL%%/man/ca/man3/Locale::Po4a::Po.3pm.gz
+%%SITE_PERL%%/man/ca/man3/Locale::Po4a::Pod.3pm.gz
+%%SITE_PERL%%/man/ca/man3/Locale::Po4a::Sgml.3pm.gz
+%%SITE_PERL%%/man/ca/man3/Locale::Po4a::Texinfo.3pm.gz
+%%SITE_PERL%%/man/ca/man3/Locale::Po4a::TransTractor.3pm.gz
+%%SITE_PERL%%/man/ca/man7/po4a.7.gz
+%%SITE_PERL%%/man/de/man1/msguntypot.1p.gz
+%%SITE_PERL%%/man/de/man1/po4a-build.1.gz
+%%SITE_PERL%%/man/de/man1/po4a-gettextize.1p.gz
+%%SITE_PERL%%/man/de/man1/po4a-normalize.1p.gz
+%%SITE_PERL%%/man/de/man1/po4a-translate.1p.gz
+%%SITE_PERL%%/man/de/man1/po4a-updatepo.1p.gz
+%%SITE_PERL%%/man/de/man1/po4a.1p.gz
+%%SITE_PERL%%/man/de/man1/po4aman-display-po.1.gz
+%%SITE_PERL%%/man/de/man1/po4apod-display-po.1.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::AsciiDoc.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::BibTeX.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::Chooser.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::Common.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::Dia.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::Docbook.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::Guide.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::Halibut.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::Ini.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::KernelHelp.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::LaTeX.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::Man.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::Po.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::Pod.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::Sgml.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::TeX.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::Texinfo.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::Text.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::TransTractor.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::Wml.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::Xhtml.3pm.gz
+%%SITE_PERL%%/man/de/man3/Locale::Po4a::Xml.3pm.gz
+%%SITE_PERL%%/man/de/man5/po4a-build.conf.5.gz
+%%SITE_PERL%%/man/de/man7/po4a-runtime.7.gz
+%%SITE_PERL%%/man/de/man7/po4a.7.gz
+%%SITE_PERL%%/man/es/man1/msguntypot.1p.gz
+%%SITE_PERL%%/man/es/man1/po4a-build.1.gz
+%%SITE_PERL%%/man/es/man1/po4a-gettextize.1p.gz
+%%SITE_PERL%%/man/es/man1/po4a-normalize.1p.gz
+%%SITE_PERL%%/man/es/man1/po4a-translate.1p.gz
+%%SITE_PERL%%/man/es/man1/po4a-updatepo.1p.gz
+%%SITE_PERL%%/man/es/man1/po4a.1p.gz
+%%SITE_PERL%%/man/es/man1/po4aman-display-po.1.gz
+%%SITE_PERL%%/man/es/man1/po4apod-display-po.1.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::AsciiDoc.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::BibTeX.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::Chooser.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::Common.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::Dia.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::Docbook.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::Guide.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::Halibut.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::Ini.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::KernelHelp.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::LaTeX.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::Man.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::Po.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::Pod.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::Sgml.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::TeX.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::Texinfo.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::Text.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::TransTractor.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::Wml.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::Xhtml.3pm.gz
+%%SITE_PERL%%/man/es/man3/Locale::Po4a::Xml.3pm.gz
+%%SITE_PERL%%/man/es/man5/po4a-build.conf.5.gz
+%%SITE_PERL%%/man/es/man7/po4a-runtime.7.gz
+%%SITE_PERL%%/man/es/man7/po4a.7.gz
+%%SITE_PERL%%/man/fr/man1/msguntypot.1p.gz
+%%SITE_PERL%%/man/fr/man1/po4a-build.1.gz
+%%SITE_PERL%%/man/fr/man1/po4a-gettextize.1p.gz
+%%SITE_PERL%%/man/fr/man1/po4a-normalize.1p.gz
+%%SITE_PERL%%/man/fr/man1/po4a-translate.1p.gz
+%%SITE_PERL%%/man/fr/man1/po4a-updatepo.1p.gz
+%%SITE_PERL%%/man/fr/man1/po4a.1p.gz
+%%SITE_PERL%%/man/fr/man1/po4aman-display-po.1.gz
+%%SITE_PERL%%/man/fr/man1/po4apod-display-po.1.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::AsciiDoc.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::BibTeX.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::Chooser.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::Common.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::Dia.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::Docbook.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::Guide.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::Halibut.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::Ini.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::KernelHelp.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::LaTeX.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::Man.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::Po.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::Pod.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::Sgml.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::TeX.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::Texinfo.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::Text.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::TransTractor.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::Wml.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::Xhtml.3pm.gz
+%%SITE_PERL%%/man/fr/man3/Locale::Po4a::Xml.3pm.gz
+%%SITE_PERL%%/man/fr/man5/po4a-build.conf.5.gz
+%%SITE_PERL%%/man/fr/man7/po4a-runtime.7.gz
+%%SITE_PERL%%/man/fr/man7/po4a.7.gz
+%%SITE_PERL%%/man/it/man1/po4a-normalize.1p.gz
+%%SITE_PERL%%/man/it/man1/po4a-translate.1p.gz
+%%SITE_PERL%%/man/it/man3/Locale::Po4a::Chooser.3pm.gz
+%%SITE_PERL%%/man/it/man3/Locale::Po4a::Dia.3pm.gz
+%%SITE_PERL%%/man/it/man3/Locale::Po4a::Docbook.3pm.gz
+%%SITE_PERL%%/man/it/man3/Locale::Po4a::Guide.3pm.gz
+%%SITE_PERL%%/man/it/man3/Locale::Po4a::KernelHelp.3pm.gz
+%%SITE_PERL%%/man/it/man3/Locale::Po4a::Pod.3pm.gz
+%%SITE_PERL%%/man/ja/man1/msguntypot.1p.gz
+%%SITE_PERL%%/man/ja/man1/po4a-build.1.gz
+%%SITE_PERL%%/man/ja/man1/po4a-gettextize.1p.gz
+%%SITE_PERL%%/man/ja/man1/po4a-normalize.1p.gz
+%%SITE_PERL%%/man/ja/man1/po4a-translate.1p.gz
+%%SITE_PERL%%/man/ja/man1/po4a-updatepo.1p.gz
+%%SITE_PERL%%/man/ja/man1/po4a.1p.gz
+%%SITE_PERL%%/man/ja/man1/po4aman-display-po.1.gz
+%%SITE_PERL%%/man/ja/man1/po4apod-display-po.1.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::AsciiDoc.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::BibTeX.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::Chooser.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::Common.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::Dia.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::Docbook.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::Guide.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::Halibut.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::Ini.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::KernelHelp.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::LaTeX.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::Man.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::Po.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::Pod.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::Sgml.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::TeX.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::Texinfo.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::Text.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::TransTractor.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::Wml.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::Xhtml.3pm.gz
+%%SITE_PERL%%/man/ja/man3/Locale::Po4a::Xml.3pm.gz
+%%SITE_PERL%%/man/ja/man5/po4a-build.conf.5.gz
+%%SITE_PERL%%/man/ja/man7/po4a-runtime.7.gz
+%%SITE_PERL%%/man/ja/man7/po4a.7.gz
+%%PERL5_MAN1%%/msguntypot.1p.gz
+%%PERL5_MAN1%%/po4a-build.1.gz
+%%PERL5_MAN1%%/po4a-gettextize.1p.gz
+%%PERL5_MAN1%%/po4a-normalize.1p.gz
+%%PERL5_MAN1%%/po4a-translate.1p.gz
+%%PERL5_MAN1%%/po4a-updatepo.1p.gz
+%%PERL5_MAN1%%/po4a.1p.gz
+%%PERL5_MAN1%%/po4aman-display-po.1.gz
+%%PERL5_MAN1%%/po4apod-display-po.1.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::AsciiDoc.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::BibTeX.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::Chooser.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::Common.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::Dia.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::Docbook.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::Guide.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::Halibut.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::Ini.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::KernelHelp.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::LaTeX.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::Man.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::Po.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::Pod.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::Sgml.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::TeX.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::Texinfo.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::Text.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::TransTractor.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::Wml.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::Xhtml.pm.3pm.gz
+%%SITE_PERL%%/man/man3/Locale::Po4a::Xml.pm.3pm.gz
+%%SITE_PERL%%/man/man5/po4a-build.conf.5.gz
+%%SITE_PERL%%/man/man7/po4a-runtime.7.gz
+%%SITE_PERL%%/man/man7/po4a.7.gz
+%%SITE_PERL%%/man/pl/man1/msguntypot.1p.gz
+%%SITE_PERL%%/man/pl/man1/po4a-build.1.gz
+%%SITE_PERL%%/man/pl/man1/po4a-gettextize.1p.gz
+%%SITE_PERL%%/man/pl/man1/po4a-normalize.1p.gz
+%%SITE_PERL%%/man/pl/man1/po4a-translate.1p.gz
+%%SITE_PERL%%/man/pl/man1/po4a-updatepo.1p.gz
+%%SITE_PERL%%/man/pl/man1/po4a.1p.gz
+%%SITE_PERL%%/man/pl/man1/po4aman-display-po.1.gz
+%%SITE_PERL%%/man/pl/man1/po4apod-display-po.1.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::BibTeX.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::Chooser.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::Common.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::Dia.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::Docbook.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::Guide.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::Halibut.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::Ini.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::KernelHelp.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::LaTeX.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::Man.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::Po.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::Pod.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::Sgml.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::TeX.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::Texinfo.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::Text.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::TransTractor.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::Wml.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::Xhtml.3pm.gz
+%%SITE_PERL%%/man/pl/man3/Locale::Po4a::Xml.3pm.gz
+%%SITE_PERL%%/man/pl/man5/po4a-build.conf.5.gz
+%%SITE_PERL%%/man/pl/man7/po4a-runtime.7.gz
+%%SITE_PERL%%/man/pl/man7/po4a.7.gz
+%%SITE_PERL%%/man/pt/man1/msguntypot.1p.gz
+%%SITE_PERL%%/man/pt/man1/po4a-build.1.gz
+%%SITE_PERL%%/man/pt/man1/po4a-gettextize.1p.gz
+%%SITE_PERL%%/man/pt/man1/po4a-normalize.1p.gz
+%%SITE_PERL%%/man/pt/man1/po4a-translate.1p.gz
+%%SITE_PERL%%/man/pt/man1/po4a-updatepo.1p.gz
+%%SITE_PERL%%/man/pt/man1/po4a.1p.gz
+%%SITE_PERL%%/man/pt/man1/po4aman-display-po.1.gz
+%%SITE_PERL%%/man/pt/man1/po4apod-display-po.1.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::BibTeX.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::Chooser.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::Common.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::Dia.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::Docbook.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::Guide.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::Halibut.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::Ini.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::KernelHelp.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::LaTeX.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::Man.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::Po.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::Pod.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::Sgml.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::TeX.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::Texinfo.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::Text.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::TransTractor.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::Wml.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::Xhtml.3pm.gz
+%%SITE_PERL%%/man/pt/man3/Locale::Po4a::Xml.3pm.gz
+%%SITE_PERL%%/man/pt/man5/po4a-build.conf.5.gz
+%%SITE_PERL%%/man/pt/man7/po4a-runtime.7.gz
+%%SITE_PERL%%/man/pt/man7/po4a.7.gz
+%%SITE_PERL%%/man/ru/man1/msguntypot.1p.gz
+%%SITE_PERL%%/man/ru/man1/po4a-build.1.gz
+%%SITE_PERL%%/man/ru/man1/po4a-gettextize.1p.gz
+%%SITE_PERL%%/man/ru/man1/po4a-normalize.1p.gz
+%%SITE_PERL%%/man/ru/man1/po4a-translate.1p.gz
+%%SITE_PERL%%/man/ru/man1/po4a-updatepo.1p.gz
+%%SITE_PERL%%/man/ru/man1/po4a.1p.gz
+%%SITE_PERL%%/man/ru/man1/po4aman-display-po.1.gz
+%%SITE_PERL%%/man/ru/man1/po4apod-display-po.1.gz
+%%SITE_PERL%%/man/ru/man3/Locale::Po4a::Man.3pm.gz
diff --git a/textproc/sdf/pkg-plist b/textproc/sdf/pkg-plist
index 7347b88c794d..88459fe07b1f 100644
--- a/textproc/sdf/pkg-plist
+++ b/textproc/sdf/pkg-plist
@@ -183,7 +183,7 @@ bin/sdngen
%%SITE_PERL%%/sdf/tosgml.pl
%%SITE_PERL%%/sdf/totxt.pl
%%SITE_PERL%%/sdf/values.pl
-man/man1/pod2sdf.1.gz
+%%PERL5_MAN1%%/pod2sdf.1.gz
%%PORTDOCS%%%%DOCSDIR%%/build
%%PORTDOCS%%%%DOCSDIR%%/catalog.html
%%PORTDOCS%%%%DOCSDIR%%/catalog.sdf
diff --git a/textproc/texi2db/Makefile b/textproc/texi2db/Makefile
index 68bb2f92ade1..0cc123d59fb5 100644
--- a/textproc/texi2db/Makefile
+++ b/textproc/texi2db/Makefile
@@ -16,6 +16,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
-PLIST_FILES= bin/texi2db man/man1/${PORTNAME}.1.gz
+PLIST_FILES= bin/texi2db ${SITE_MAN1}/${PORTNAME}.1.gz
.include <bsd.port.mk>
diff --git a/textproc/txt2html/pkg-plist b/textproc/txt2html/pkg-plist
index 340ea34dc036..d1a88df8366b 100644
--- a/textproc/txt2html/pkg-plist
+++ b/textproc/txt2html/pkg-plist
@@ -1,4 +1,4 @@
bin/txt2html
%%SITE_PERL%%/HTML/TextToHTML.pm
%%PERL5_MAN3%%/HTML::TextToHTML.3.gz
-man/man1/txt2html.1.gz
+%%PERL5_MAN1%%/txt2html.1.gz
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
diff --git a/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist b/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist
index 6970ea5fe643..d6ad0f25c452 100644
--- a/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist
@@ -3,4 +3,4 @@ bin/podviewer
%%PERL5_MAN3%%/Gtk2::Ex::PodViewer::Parser.3.gz
%%SITE_PERL%%/Gtk2/Ex/PodViewer.pm
%%SITE_PERL%%/Gtk2/Ex/PodViewer/Parser.pm
-man/man1/podviewer.1.gz
+%%PERL5_MAN1%%/podviewer.1.gz
diff --git a/x11-toolkits/p5-Prima/pkg-plist b/x11-toolkits/p5-Prima/pkg-plist
index 8f2379ecedbf..c4a9c0d40664 100644
--- a/x11-toolkits/p5-Prima/pkg-plist
+++ b/x11-toolkits/p5-Prima/pkg-plist
@@ -359,10 +359,10 @@ bin/tmlink
%%PERL5_MAN3%%/pod::Prima::internals.3.gz
%%PERL5_MAN3%%/pod::Prima::tutorial.3.gz
%%PERL5_MAN3%%/pod::gencls.3.gz
-man/man1/VB.1.gz
-man/man1/cfgmaint.1.gz
-man/man1/fmview.1.gz
-man/man1/gencls.1.gz
-man/man1/p-class.1.gz
-man/man1/podview.1.gz
-man/man1/tmlink.1.gz
+%%PERL5_MAN1%%/VB.1.gz
+%%PERL5_MAN1%%/cfgmaint.1.gz
+%%PERL5_MAN1%%/fmview.1.gz
+%%PERL5_MAN1%%/gencls.1.gz
+%%PERL5_MAN1%%/p-class.1.gz
+%%PERL5_MAN1%%/podview.1.gz
+%%PERL5_MAN1%%/tmlink.1.gz
diff --git a/x11-toolkits/p5-Tk/pkg-plist b/x11-toolkits/p5-Tk/pkg-plist
index 19e90c3af4b0..7469270a19a1 100644
--- a/x11-toolkits/p5-Tk/pkg-plist
+++ b/x11-toolkits/p5-Tk/pkg-plist
@@ -743,7 +743,7 @@ bin/widget
%%SITE_ARCH%%/auto/Tk/lsearch.al
%%SITE_ARCH%%/auto/Tk/tabFocus.al
%%SITE_ARCH%%/auto/Tk/updateWidgets.al
-man/man1/ptked.1.gz
-man/man1/ptksh.1.gz
-man/man1/tkjpeg.1.gz
-man/man1/widget.1.gz
+%%PERL5_MAN1%%/ptked.1.gz
+%%PERL5_MAN1%%/ptksh.1.gz
+%%PERL5_MAN1%%/tkjpeg.1.gz
+%%PERL5_MAN1%%/widget.1.gz
diff --git a/x11-toolkits/p5-Wx/pkg-plist b/x11-toolkits/p5-Wx/pkg-plist
index eaee0c7e2121..6aab9b8acc4f 100644
--- a/x11-toolkits/p5-Wx/pkg-plist
+++ b/x11-toolkits/p5-Wx/pkg-plist
@@ -13,7 +13,7 @@ bin/wxperl_overload
%%PERL5_MAN3%%/Wx::build::MakeMaker::Win32_MSVC.3.gz
%%PERL5_MAN3%%/Wx::build::Options.3.gz
%%PERL5_MAN3%%/Wx::build::Utils.3.gz
-man/man1/wxperl_overload.1.gz
+%%PERL5_MAN1%%/wxperl_overload.1.gz
%%SITE_ARCH%%/Wx.pm
%%SITE_ARCH%%/Wx/AUI.pm
%%SITE_ARCH%%/Wx/Api.pod
diff --git a/x11/p5-Clipboard/pkg-plist b/x11/p5-Clipboard/pkg-plist
index 6c947cc53e30..803f50ec39aa 100644
--- a/x11/p5-Clipboard/pkg-plist
+++ b/x11/p5-Clipboard/pkg-plist
@@ -8,8 +8,8 @@ bin/clipjoin
%%SITE_PERL%%/Clipboard/MacPasteboard.pm
%%SITE_PERL%%/Clipboard/Win32.pm
%%SITE_PERL%%/Clipboard/Xclip.pm
-man/man1/clipaccumulate.1.gz
-man/man1/clipbrowse.1.gz
-man/man1/clipedit.1.gz
-man/man1/clipfilter.1.gz
-man/man1/clipjoin.1.gz
+%%PERL5_MAN1%%/clipaccumulate.1.gz
+%%PERL5_MAN1%%/clipbrowse.1.gz
+%%PERL5_MAN1%%/clipedit.1.gz
+%%PERL5_MAN1%%/clipfilter.1.gz
+%%PERL5_MAN1%%/clipjoin.1.gz
diff --git a/x11/p5-XTerm-Conf/pkg-plist b/x11/p5-XTerm-Conf/pkg-plist
index 48989fbc840f..8748a28ee691 100644
--- a/x11/p5-XTerm-Conf/pkg-plist
+++ b/x11/p5-XTerm-Conf/pkg-plist
@@ -1,4 +1,4 @@
bin/xterm-conf
%%PERL5_MAN3%%/XTerm::Conf.3.gz
%%SITE_PERL%%/XTerm/Conf.pm
-man/man1/xterm-conf.1.gz
+%%PERL5_MAN1%%/xterm-conf.1.gz