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

5 files changed, 317 insertions, 281 deletions

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