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

14 files changed, 37 insertions, 40 deletions

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