Update to 5.6.2. Also:

- redirect output from h2ph to /dev/null [1];
- fix File::Path insecure file/directory permissions [2];
  this resolves CAN-2004-0452
  (http://vuxml.freebsd.org/c418d472-6bd1-11d9-93ca-000a95bc6fae.html);
- for OSVERSION < 500036, create symlinks in /usr/bin not only for
  perl and suidperl, but also for a2p, c2ph, find2perl, h2ph, h2xs,
  perlbug, perlcc, perldoc, pl2pm, pod2html, pod2latex, pod2man,
  pod2text, s2p, and splain;  perl and suidperl are still enough for
  more recent FreeBSD versions [3];
- clean up created symlinks upon deinstallation [4];
- try to cleanup symlinks created by older versions of lang/perl5 and
  lang/perl5.8, during both installation and deinstallation [5];
- added support for DISABLE_BSDPAN environment variable [6];
- be explicit about use.perl usage after installation of 4.X systems,
  and on systems where lang/perl5.8 is prefered to lang/perl5; the exact
  range is OSVERSION < 500036 || OSVERSION >= 502100 [7];
- respect __MAKE_CONF partially (the build-time value is used) [8];
- use.perl is now the same as pkg-install is now the same as
  pkg-deinstall;  apart from the changes already mentioned above, this
  is a shell script now;
- use.perl's logic is also simplified in several ways [9];
- fix a BSDPAN bug [10];
- create and remove %%SITE_PERL%%/%%PERL_ARCH%%/auto, just
  like  lang/perl5.8 does, to silent pointyhat [11];
- apply a patch to handle daylight saving time correctly in
  POSIX::strftime [12];
- the port now creates and uses shared libperl.so, as lang/perl5.8 port
  does;
- move MAN3 manual pages under ${PREFIX}/lib/perl5/${PERL_VER}/perl, as
  to avoid conflict with some of the p5 ports;
- do not build suidperl by default any longer;  one should use
  ENABLE_SUIDPERL to do that;
- move out manpage list to a separate Makefile.man;
- in general, the port layout is made much more similar to lang/perl5.8,
  including.

Outstanding issues: Module::Build support for BSDPAN, SU_CMD support (PR
70831), PR 64963 (partially), and anything else that I forgot.

[1] Nudged by: krion
[2] Reported by: nectar
    Patch from: Chris Turner @ RedHat
[3] PR: 55760, 57151, 58406
[4] Requested by: kris
    PR: 54262
[5] PR: 51281, 51539
[6] PR: 57134
[7] PR: 60736
[8] PR: 74431
[9] Perl version submitted by des, implemented in sh
[10] Reported by: Alexander Nagilum <freebsd %at% nagilum de>
[11] PR: 71390
[12] PR: 74042, perl bug 18238

30 files changed, 2228 insertions, 1082 deletions

diff --git a/lang/perl5.6/Makefile b/lang/perl5.6/Makefile
index 2b1ab97b1f60..e73677c2a5b4 100644
--- a/lang/perl5.6/Makefile
+++ b/lang/perl5.6/Makefile
@@ -7,19 +7,19 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	15
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
-		${MASTER_SITE_LOCAL:S/$/:local/}
+		${MASTER_SITE_LOCAL:S/$/:local/} \
+		http://www.tobez.org/download/port-mirrors/lang/perl56/:local
 MASTER_SITE_SUBDIR=	../../src \
-			tobez/:local
+			tobez/:local ./:local
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		BSDPAN-${PORTVERSION}_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
+		BSDPAN-${PERL_VER}${EXTRACT_SUFX}:local
 
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Practical Extraction and Report Language
 
-PERL_VER=	5.6.1
+PERL_VER=	5.6.2
 PERL_ARCH=	mach
 PERL_VERSION=	${PERL_VER}
 
@@ -28,13 +28,26 @@ CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
 	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
-	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
-	-Dsitearch=${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
-	-Dsitelib=${PREFIX}/lib/perl5/site_perl/${PERL_VER} \
-	-Dscriptdir=${PREFIX}/bin \
-	-Dcc="${CC}" \
-	-Ui_malloc -Ui_iconv -Dccflags=-DAPPLLIB_EXP=\"${BSDPAN_DEST}\"
-INSTALLS_SHLIB=	yes
+	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \
+	-Dman1dir=${PREFIX}/man/man1 \
+	-Dsitearch=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH} \
+	-Dsitelib=${PREFIX}/${SITE_PERL_REL} -Dscriptdir=${PREFIX}/bin \
+	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
+	-Dsiteman1dir=${PREFIX}/man/man1 \
+	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
+	-Dcc="${CC}" -Doptimize="${CFLAGS}" -Duseshrplib \
+	-Dccflags=-DAPPLLIB_EXP=\"${BSDPAN_DEST}\"
+
+.include "Makefile.man"
+.include <bsd.port.pre.mk>
+
+.if defined(ENABLE_SUIDPERL)
+CONFIGURE_ARGS+=	-Dd_dosuid=define
+PLIST_SUB+=		ENABLE_SUIDPERL=""
+.else
+CONFIGURE_ARGS+=	-Ud_dosuid
+PLIST_SUB+=		ENABLE_SUIDPERL="@comment "
+.endif
 
 .if defined(WITH_GDBM)
 CONFIGURE_ARGS+=	-Di_gdbm
@@ -45,137 +58,90 @@ CONFIGURE_ARGS+=	-Ui_gdbm
 PLIST_SUB+=		GDBM="@comment "
 .endif
 
+.if defined(WITHOUT_PERL_MALLOC)
+.undef WITH_PERL_MALLOC
+.else
+WITH_PERL_MALLOC=	yes
+.endif
+
+.if defined(WITH_THREADS)
+IGNORE=	Threads are not very useful in perl ${PERL_VERSION}, please use lang/perl5.8
+.endif
+
 .if defined(WITH_PERL_MALLOC)
 CONFIGURE_ARGS+=	-Dusemymalloc=y
 .else
 CONFIGURE_ARGS+=	-Dusemymalloc=n
 .endif
 
-INCLUDEDIR=	/usr/include
-
 .ifdef USE_PERL5
 .error You have `USE_PERL5' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} >= 502100
-LATEST_LINK=	perl5.6
+LATEST_LINK=	perl5.8
 .endif
 
-.if ${OSVERSION} >= 500043 && ${OSVERSION} < 502100
+.if ${OSVERSION} < 500036
+PKGMESSAGE=	${PKGDIR}/pkg-message-sysperl
+.elif ${OSVERSION} < 502100
 PKGMESSAGE=	${PKGDIR}/.not-here
+.else
+PKGMESSAGE=	${PKGDIR}/pkg-message-prefer58
+.endif
+
+.if ${OSVERSION} >= 500036 && ${OSVERSION} < 502100
+PLIST_SUB+=		NEED_USE_PERL="@comment "
+.else
+PLIST_SUB+=		NEED_USE_PERL=""
 .endif
 
-MAN1=	a2p.1 c2ph.1 dprofpp.1 find2perl.1 h2ph.1 h2xs.1 perl.1 \
-	perl5004delta.1 perl5005delta.1 perlaix.1 perlamiga.1 \
-	perlapi.1 perlapio.1 perlbook.1 perlboot.1 perlbot.1 \
-	perlbs2000.1 perlbug.1 perlcall.1 perlcc.1 perlclib.1 \
-	perlcompile.1 perlcygwin.1 perldata.1 perldbmfilter.1 \
-	perldebguts.1 perldebtut.1 perldebug.1 perldelta.1 perldiag.1 \
-	perldoc.1 perldos.1 perldsc.1 perlebcdic.1 perlembed.1 \
-	perlepoc.1 perlfaq.1 perlfaq1.1 perlfaq2.1 perlfaq3.1 \
-	perlfaq4.1 perlfaq5.1 perlfaq6.1 perlfaq7.1 perlfaq8.1 \
-	perlfaq9.1 perlfilter.1 perlfork.1 perlform.1 perlfunc.1 \
-	perlguts.1 perlhack.1 perlhist.1 perlhpux.1 perlintern.1 \
-	perlipc.1 perllexwarn.1 perllocale.1 perllol.1 perlmachten.1 \
-	perlmacos.1 perlmod.1 perlmodinstall.1 perlmodlib.1 \
-	perlmpeix.1 perlnewmod.1 perlnumber.1 perlobj.1 perlop.1 \
-	perlopentut.1 perlos2.1 perlos390.1 perlpod.1 perlport.1 \
-	perlre.1 perlref.1 perlreftut.1 perlrequick.1 perlretut.1 \
-	perlrun.1 perlsec.1 perlsolaris.1 perlstyle.1 perlsub.1 \
-	perlsyn.1 perlthrtut.1 perltie.1 perltoc.1 perltodo.1 \
-	perltoot.1 perltootc.1 perltrap.1 perlunicode.1 perlutil.1 \
-	perlvar.1 perlvmesa.1 perlvms.1 perlvos.1 perlwin32.1 \
-	perlxs.1 perlxstut.1 pl2pm.1 pod2html.1 pod2man.1 pod2text.1 \
-	pod2usage.1 podchecker.1 podselect.1 pstruct.1 s2p.1 \
-	splain.1 xsubpp.1
-
-MAN3=	AnyDBM_File.3 AutoLoader.3 AutoSplit.3 B.3 B::Asmdata.3 \
-	B::Assembler.3 B::Bblock.3 B::Bytecode.3 B::C.3 B::CC.3 \
-	B::Concise.3 B::Debug.3 B::Deparse.3 B::Disassembler.3 \
-	B::Lint.3 B::Showlex.3 B::Stackobj.3 B::Stash.3 B::Terse.3 \
-	B::Xref.3 Benchmark.3 ByteLoader.3 CGI.3 CGI::Apache.3 \
-	CGI::Carp.3 CGI::Cookie.3 CGI::Fast.3 CGI::Pretty.3 \
-	CGI::Push.3 CGI::Switch.3 CGI::Util.3 CPAN.3 CPAN::FirstTime.3 \
-	CPAN::Nox.3 Carp.3 Carp::Heavy.3 Class::Struct.3 Config.3 \
-	Cwd.3 DB.3 DB_File.3 Data::Dumper.3 Devel::DProf.3 \
-	Devel::Peek.3 Devel::SelfStubber.3 DirHandle.3 Dumpvalue.3 \
-	DynaLoader.3 English.3 Env.3 Errno.3 Exporter.3 \
-	Exporter::Heavy.3 ExtUtils::Command.3 ExtUtils::Embed.3 \
-	ExtUtils::Install.3 ExtUtils::Installed.3 ExtUtils::Liblist.3 \
-	ExtUtils::MM_Cygwin.3 ExtUtils::MM_OS2.3 ExtUtils::MM_Unix.3 \
-	ExtUtils::MM_VMS.3 ExtUtils::MM_Win32.3 ExtUtils::MakeMaker.3 \
-	ExtUtils::Manifest.3 ExtUtils::Miniperl.3 ExtUtils::Mkbootstrap.3 \
-	ExtUtils::Mksymlists.3 ExtUtils::Packlist.3 ExtUtils::testlib.3 \
-	Fatal.3 Fcntl.3 File::Basename.3 File::CheckTree.3 \
-	File::Compare.3 File::Copy.3 File::DosGlob.3 File::Find.3 \
-	File::Glob.3 File::Path.3 File::Spec.3 File::Spec::Epoc.3 \
-	File::Spec::Functions.3 File::Spec::Mac.3 File::Spec::OS2.3 \
-	File::Spec::Unix.3 File::Spec::VMS.3 File::Spec::Win32.3 \
-	File::Temp.3 File::stat.3 FileCache.3 FileHandle.3 FindBin.3 \
-	Getopt::Long.3 Getopt::Std.3 I18N::Collate.3 \
-	IO.3 IO::Dir.3 IO::File.3 IO::Handle.3 IO::Pipe.3 IO::Poll.3 \
-	IO::Seekable.3 IO::Select.3 IO::Socket.3 IO::Socket::INET.3 \
-	IO::Socket::UNIX.3 IPC::Msg.3 IPC::Open2.3 IPC::Open3.3 \
-	IPC::Semaphore.3 IPC::SysV.3 Math::BigFloat.3 Math::BigInt.3 \
-	Math::Complex.3 Math::Trig.3 NDBM_File.3 Net::Ping.3 \
-	Net::hostent.3 Net::netent.3 Net::protoent.3 Net::servent.3 \
-	O.3 Opcode.3 POSIX.3 Pod::Checker.3 Pod::Find.3 Pod::Html.3 \
-	Pod::InputObjects.3 Pod::LaTeX.3 Pod::Man.3 Pod::ParseUtils.3 \
-	Pod::Parser.3 Pod::Plainer.3 Pod::Select.3 Pod::Text.3 \
-	Pod::Text::Color.3 Pod::Text::Overstrike.3 Pod::Text::Termcap.3 \
-	Pod::Usage.3 SDBM_File.3 Safe.3 Search::Dict.3 SelectSaver.3 \
-	SelfLoader.3 Shell.3 Socket.3 Symbol.3 Sys::Hostname.3 \
-	Sys::Syslog.3 Term::ANSIColor.3 Term::Cap.3 Term::Complete.3 \
-	Term::ReadLine.3 Test.3 Test::Harness.3 Text::Abbrev.3 \
-	Text::ParseWords.3 Text::Soundex.3 Text::Tabs.3 Text::Wrap.3 \
-	Tie::Array.3 Tie::Handle.3 Tie::Hash.3 Tie::RefHash.3 \
-	Tie::Scalar.3 Tie::SubstrHash.3 Time::Local.3 Time::gmtime.3 \
-	Time::localtime.3 Time::tm.3 UNIVERSAL.3 User::grent.3 \
-	User::pwent.3 Win32.3 XSLoader.3 attributes.3 attrs.3 \
-	autouse.3 base.3 blib.3 bytes.3 charnames.3 constant.3 \
-	diagnostics.3 fields.3 filetest.3 integer.3 less.3 lib.3 \
-	locale.3 open.3 ops.3 overload.3 re.3 sigtrap.3 strict.3 \
-	subs.3 utf8.3 vars.3 warnings.3 warnings::register.3
 .if defined(WITH_GDBM)
 MAN3+=	GDBM_File.3
 .endif
-
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
 
 test:
 	@(cd ${WRKSRC}; make test)
 
 BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VER}/BSDPAN
 BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
-		ExtUtils/MM_Unix.pm ExtUtils/Packlist.pm
+		ExtUtils/MM_Unix.pm \
+		ExtUtils/MakeMaker.pm \
+		ExtUtils/Packlist.pm
 BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-${PORTVERSION}
-BSDPAN_REVISION=1
+
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 post-patch:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
 		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
 		-e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \
+		-e 's|%%MAKE_CONF%%|${__MAKE_CONF}|g;' \
 		${FILESDIR}/use.perl \
 		> ${WRKDIR}/use.perl
+	${CP} ${WRKDIR}/use.perl ${PKGINSTALL}
+	${CP} ${WRKDIR}/use.perl ${PKGDEINSTALL}
+
+pre-install:
+	@${RM} -f ${PREFIX}/bin/perl${PERL_VER}
+	@${RM} -f ${PREFIX}/bin/perl
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/perl ${PREFIX}/bin/suidperl
-	@${LN} -sf ${PREFIX}/bin/perl ${PREFIX}/bin/perl5
-	@${LN} -sf ${PREFIX}/bin/perl ${PREFIX}/bin/perl${PERL_VER}
-	${INSTALL_SCRIPT} ${WRKDIR}/use.perl ${PREFIX}/bin/use.perl
+	@${STRIP_CMD} ${PREFIX}/bin/perl${PERL_VER}
+	@${STRIP_CMD} ${PREFIX}/bin/perl
+	@${LN} -sf ${PREFIX}/bin/perl${PERL_VER} ${PREFIX}/bin/perl5
 .for file in ${BSDPAN_FILES}
 	${MKDIR} ${BSDPAN_DEST}/${file:H}
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
 		${BSDPAN_WRKSRC}/${file} ${BSDPAN_DEST}/${file}
 .endfor
-	@(cd ${INCLUDEDIR} && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h)
-.if ${OSVERSION} < 500043 || ${OSVERSION} > 502100
+	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.if ${OSVERSION} < 500036 || ${OSVERSION} >= 502100
+	${INSTALL_SCRIPT} ${WRKDIR}/use.perl ${PREFIX}/bin/use.perl
 	@fmt ${PKGMESSAGE}
-.else
-	@${PREFIX}/bin/use.perl port
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/perl5.6/Makefile.man b/lang/perl5.6/Makefile.man
new file mode 100644
index 000000000000..af08e5e6fe8c
--- /dev/null
+++ b/lang/perl5.6/Makefile.man
@@ -0,0 +1,341 @@
+# $FreeBSD$
+
+MAN1+=	a2p.1
+MAN1+=	c2ph.1
+MAN1+=	dprofpp.1
+MAN1+=	find2perl.1
+MAN1+=	h2ph.1
+MAN1+=	h2xs.1
+MAN1+=	perl.1
+MAN1+=	perl5004delta.1
+MAN1+=	perl5005delta.1
+MAN1+=	perlaix.1
+MAN1+=	perlamiga.1
+MAN1+=	perlapi.1
+MAN1+=	perlapio.1
+MAN1+=	perlbook.1
+MAN1+=	perlboot.1
+MAN1+=	perlbot.1
+MAN1+=	perlbs2000.1
+MAN1+=	perlbug.1
+MAN1+=	perlcall.1
+MAN1+=	perlcc.1
+MAN1+=	perlclib.1
+MAN1+=	perlcompile.1
+MAN1+=	perlcygwin.1
+MAN1+=	perldata.1
+MAN1+=	perldbmfilter.1
+MAN1+=	perldebguts.1
+MAN1+=	perldebtut.1
+MAN1+=	perldebug.1
+MAN1+=	perldelta.1
+MAN1+=	perldiag.1
+MAN1+=	perldoc.1
+MAN1+=	perldos.1
+MAN1+=	perldsc.1
+MAN1+=	perlebcdic.1
+MAN1+=	perlembed.1
+MAN1+=	perlepoc.1
+MAN1+=	perlfaq.1
+MAN1+=	perlfaq1.1
+MAN1+=	perlfaq2.1
+MAN1+=	perlfaq3.1
+MAN1+=	perlfaq4.1
+MAN1+=	perlfaq5.1
+MAN1+=	perlfaq6.1
+MAN1+=	perlfaq7.1
+MAN1+=	perlfaq8.1
+MAN1+=	perlfaq9.1
+MAN1+=	perlfilter.1
+MAN1+=	perlfork.1
+MAN1+=	perlform.1
+MAN1+=	perlfunc.1
+MAN1+=	perlguts.1
+MAN1+=	perlhack.1
+MAN1+=	perlhist.1
+MAN1+=	perlhpux.1
+MAN1+=	perlintern.1
+MAN1+=	perlipc.1
+MAN1+=	perllexwarn.1
+MAN1+=	perllocale.1
+MAN1+=	perllol.1
+MAN1+=	perlmachten.1
+MAN1+=	perlmacos.1
+MAN1+=	perlmod.1
+MAN1+=	perlmodinstall.1
+MAN1+=	perlmodlib.1
+MAN1+=	perlmpeix.1
+MAN1+=	perlnewmod.1
+MAN1+=	perlnumber.1
+MAN1+=	perlobj.1
+MAN1+=	perlop.1
+MAN1+=	perlopentut.1
+MAN1+=	perlos2.1
+MAN1+=	perlos390.1
+MAN1+=	perlpod.1
+MAN1+=	perlport.1
+MAN1+=	perlre.1
+MAN1+=	perlref.1
+MAN1+=	perlreftut.1
+MAN1+=	perlrequick.1
+MAN1+=	perlretut.1
+MAN1+=	perlrun.1
+MAN1+=	perlsec.1
+MAN1+=	perlsolaris.1
+MAN1+=	perlstyle.1
+MAN1+=	perlsub.1
+MAN1+=	perlsyn.1
+MAN1+=	perlthrtut.1
+MAN1+=	perltie.1
+MAN1+=	perltoc.1
+MAN1+=	perltodo.1
+MAN1+=	perltoot.1
+MAN1+=	perltootc.1
+MAN1+=	perltrap.1
+MAN1+=	perlunicode.1
+MAN1+=	perlutil.1
+MAN1+=	perlvar.1
+MAN1+=	perlvmesa.1
+MAN1+=	perlvms.1
+MAN1+=	perlvos.1
+MAN1+=	perlwin32.1
+MAN1+=	perlxs.1
+MAN1+=	perlxstut.1
+MAN1+=	pl2pm.1
+MAN1+=	pod2html.1
+MAN1+=	pod2man.1
+MAN1+=	pod2text.1
+MAN1+=	pod2usage.1
+MAN1+=	podchecker.1
+MAN1+=	podselect.1
+MAN1+=	pstruct.1
+MAN1+=	s2p.1
+MAN1+=	splain.1
+MAN1+=	xsubpp.1
+
+MAN3+=	AnyDBM_File.3
+MAN3+=	AutoLoader.3
+MAN3+=	AutoSplit.3
+MAN3+=	B.3
+MAN3+=	B::Asmdata.3
+MAN3+=	B::Assembler.3
+MAN3+=	B::Bblock.3
+MAN3+=	B::Bytecode.3
+MAN3+=	B::C.3
+MAN3+=	B::CC.3
+MAN3+=	B::Concise.3
+MAN3+=	B::Debug.3
+MAN3+=	B::Deparse.3
+MAN3+=	B::Disassembler.3
+MAN3+=	B::Lint.3
+MAN3+=	B::Showlex.3
+MAN3+=	B::Stackobj.3
+MAN3+=	B::Stash.3
+MAN3+=	B::Terse.3
+MAN3+=	B::Xref.3
+MAN3+=	Benchmark.3
+MAN3+=	ByteLoader.3
+MAN3+=	CGI.3
+MAN3+=	CGI::Apache.3
+MAN3+=	CGI::Carp.3
+MAN3+=	CGI::Cookie.3
+MAN3+=	CGI::Fast.3
+MAN3+=	CGI::Pretty.3
+MAN3+=	CGI::Push.3
+MAN3+=	CGI::Switch.3
+MAN3+=	CGI::Util.3
+MAN3+=	CPAN.3
+MAN3+=	CPAN::FirstTime.3
+MAN3+=	CPAN::Nox.3
+MAN3+=	Carp.3
+MAN3+=	Carp::Heavy.3
+MAN3+=	Class::Struct.3
+MAN3+=	Config.3
+MAN3+=	Cwd.3
+MAN3+=	DB.3
+MAN3+=	DB_File.3
+MAN3+=	Data::Dumper.3
+MAN3+=	Devel::DProf.3
+MAN3+=	Devel::Peek.3
+MAN3+=	Devel::SelfStubber.3
+MAN3+=	DirHandle.3
+MAN3+=	Dumpvalue.3
+MAN3+=	DynaLoader.3
+MAN3+=	English.3
+MAN3+=	Env.3
+MAN3+=	Errno.3
+MAN3+=	Exporter.3
+MAN3+=	Exporter::Heavy.3
+MAN3+=	ExtUtils::Command.3
+MAN3+=	ExtUtils::Command::MM.3
+MAN3+=	ExtUtils::Embed.3
+MAN3+=	ExtUtils::Install.3
+MAN3+=	ExtUtils::Installed.3
+MAN3+=	ExtUtils::Liblist.3
+MAN3+=	ExtUtils::Liblist::Kid.3
+MAN3+=	ExtUtils::MM.3
+MAN3+=	ExtUtils::MM_Any.3
+MAN3+=	ExtUtils::MM_BeOS.3
+MAN3+=	ExtUtils::MM_Cygwin.3
+MAN3+=	ExtUtils::MM_DOS.3
+MAN3+=	ExtUtils::MM_MacOS.3
+MAN3+=	ExtUtils::MM_NW5.3
+MAN3+=	ExtUtils::MM_OS2.3
+MAN3+=	ExtUtils::MM_UWIN.3
+MAN3+=	ExtUtils::MM_Unix.3
+MAN3+=	ExtUtils::MM_VMS.3
+MAN3+=	ExtUtils::MM_Win32.3
+MAN3+=	ExtUtils::MM_Win95.3
+MAN3+=	ExtUtils::MY.3
+MAN3+=	ExtUtils::MakeMaker.3
+MAN3+=	ExtUtils::MakeMaker::FAQ.3
+MAN3+=	ExtUtils::MakeMaker::Tutorial.3
+MAN3+=	ExtUtils::MakeMaker::bytes.3
+MAN3+=	ExtUtils::MakeMaker::vmsish.3
+MAN3+=	ExtUtils::Manifest.3
+MAN3+=	ExtUtils::Miniperl.3
+MAN3+=	ExtUtils::Mkbootstrap.3
+MAN3+=	ExtUtils::Mksymlists.3
+MAN3+=	ExtUtils::Packlist.3
+MAN3+=	ExtUtils::testlib.3
+MAN3+=	Fatal.3
+MAN3+=	Fcntl.3
+MAN3+=	File::Basename.3
+MAN3+=	File::CheckTree.3
+MAN3+=	File::Compare.3
+MAN3+=	File::Copy.3
+MAN3+=	File::DosGlob.3
+MAN3+=	File::Find.3
+MAN3+=	File::Glob.3
+MAN3+=	File::Path.3
+MAN3+=	File::Spec.3
+MAN3+=	File::Spec::Cygwin.3
+MAN3+=	File::Spec::Epoc.3
+MAN3+=	File::Spec::Functions.3
+MAN3+=	File::Spec::Mac.3
+MAN3+=	File::Spec::OS2.3
+MAN3+=	File::Spec::Unix.3
+MAN3+=	File::Spec::VMS.3
+MAN3+=	File::Spec::Win32.3
+MAN3+=	File::Temp.3
+MAN3+=	File::stat.3
+MAN3+=	FileCache.3
+MAN3+=	FileHandle.3
+MAN3+=	FindBin.3
+MAN3+=	Getopt::Long.3
+MAN3+=	Getopt::Std.3
+MAN3+=	I18N::Collate.3
+MAN3+=	IO.3
+MAN3+=	IO::Dir.3
+MAN3+=	IO::File.3
+MAN3+=	IO::Handle.3
+MAN3+=	IO::Pipe.3
+MAN3+=	IO::Poll.3
+MAN3+=	IO::Seekable.3
+MAN3+=	IO::Select.3
+MAN3+=	IO::Socket.3
+MAN3+=	IO::Socket::INET.3
+MAN3+=	IO::Socket::UNIX.3
+MAN3+=	IPC::Msg.3
+MAN3+=	IPC::Open2.3
+MAN3+=	IPC::Open3.3
+MAN3+=	IPC::Semaphore.3
+MAN3+=	IPC::SysV.3
+MAN3+=	Math::BigFloat.3
+MAN3+=	Math::BigInt.3
+MAN3+=	Math::Complex.3
+MAN3+=	Math::Trig.3
+MAN3+=	NDBM_File.3
+MAN3+=	Net::Ping.3
+MAN3+=	Net::hostent.3
+MAN3+=	Net::netent.3
+MAN3+=	Net::protoent.3
+MAN3+=	Net::servent.3
+MAN3+=	O.3
+MAN3+=	Opcode.3
+MAN3+=	POSIX.3
+MAN3+=	Pod::Checker.3
+MAN3+=	Pod::Find.3
+MAN3+=	Pod::Html.3
+MAN3+=	Pod::InputObjects.3
+MAN3+=	Pod::LaTeX.3
+MAN3+=	Pod::Man.3
+MAN3+=	Pod::ParseUtils.3
+MAN3+=	Pod::Parser.3
+MAN3+=	Pod::Plainer.3
+MAN3+=	Pod::Select.3
+MAN3+=	Pod::Text.3
+MAN3+=	Pod::Text::Color.3
+MAN3+=	Pod::Text::Overstrike.3
+MAN3+=	Pod::Text::Termcap.3
+MAN3+=	Pod::Usage.3
+MAN3+=	SDBM_File.3
+MAN3+=	Safe.3
+MAN3+=	Search::Dict.3
+MAN3+=	SelectSaver.3
+MAN3+=	SelfLoader.3
+MAN3+=	Shell.3
+MAN3+=	Socket.3
+MAN3+=	Symbol.3
+MAN3+=	Sys::Hostname.3
+MAN3+=	Sys::Syslog.3
+MAN3+=	Term::ANSIColor.3
+MAN3+=	Term::Cap.3
+MAN3+=	Term::Complete.3
+MAN3+=	Term::ReadLine.3
+MAN3+=	Test.3
+MAN3+=	Test::Builder.3
+MAN3+=	Test::Harness.3
+MAN3+=	Test::Harness::Assert.3
+MAN3+=	Test::Harness::Iterator.3
+MAN3+=	Test::Harness::Straps.3
+MAN3+=	Test::More.3
+MAN3+=	Test::Simple.3
+MAN3+=	Test::Tutorial.3
+MAN3+=	Text::Abbrev.3
+MAN3+=	Text::ParseWords.3
+MAN3+=	Text::Soundex.3
+MAN3+=	Text::Tabs.3
+MAN3+=	Text::Wrap.3
+MAN3+=	Tie::Array.3
+MAN3+=	Tie::Handle.3
+MAN3+=	Tie::Hash.3
+MAN3+=	Tie::RefHash.3
+MAN3+=	Tie::Scalar.3
+MAN3+=	Tie::SubstrHash.3
+MAN3+=	Time::Local.3
+MAN3+=	Time::gmtime.3
+MAN3+=	Time::localtime.3
+MAN3+=	Time::tm.3
+MAN3+=	UNIVERSAL.3
+MAN3+=	User::grent.3
+MAN3+=	User::pwent.3
+MAN3+=	Win32.3
+MAN3+=	XSLoader.3
+MAN3+=	attributes.3
+MAN3+=	attrs.3
+MAN3+=	autouse.3
+MAN3+=	base.3
+MAN3+=	blib.3
+MAN3+=	bytes.3
+MAN3+=	charnames.3
+MAN3+=	constant.3
+MAN3+=	diagnostics.3
+MAN3+=	fields.3
+MAN3+=	filetest.3
+MAN3+=	if.3
+MAN3+=	integer.3
+MAN3+=	less.3
+MAN3+=	lib.3
+MAN3+=	locale.3
+MAN3+=	open.3
+MAN3+=	ops.3
+MAN3+=	overload.3
+MAN3+=	re.3
+MAN3+=	sigtrap.3
+MAN3+=	strict.3
+MAN3+=	subs.3
+MAN3+=	utf8.3
+MAN3+=	vars.3
+MAN3+=	warnings.3
+MAN3+=	warnings::register.3
diff --git a/lang/perl5.6/distinfo b/lang/perl5.6/distinfo
index 7d166da9df3a..989e964c4f17 100644
--- a/lang/perl5.6/distinfo
+++ b/lang/perl5.6/distinfo
@@ -1,4 +1,4 @@
-MD5 (perl-5.6.1.tar.gz) = ec1ff15464809b562aecfaa2e65edba6
-SIZE (perl-5.6.1.tar.gz) = 5983695
-MD5 (BSDPAN-5.6.1_1.tar.gz) = 7b15f1dc2df28d07276d9363ebe703f3
-SIZE (BSDPAN-5.6.1_1.tar.gz) = 6233
+MD5 (perl-5.6.2.tar.gz) = 6aa648d086ecda5400de3472dbe1ebfe
+SIZE (perl-5.6.2.tar.gz) = 6255479
+MD5 (BSDPAN-5.6.2.tar.gz) = 3edde9aaefa11d8396700e42e99f2f36
+SIZE (BSDPAN-5.6.2.tar.gz) = 8451
diff --git a/lang/perl5.6/files/patch-Install.pm b/lang/perl5.6/files/patch-Install.pm
index bbd42019def6..228b24a1088a 100644
--- a/lang/perl5.6/files/patch-Install.pm
+++ b/lang/perl5.6/files/patch-Install.pm
@@ -11,12 +11,3 @@ $FreeBSD$
  		if (-f $targetfile){
  		    forceunlink($targetfile) unless $nonono;
  		} else {
-@@ -156,7 +156,7 @@
- 	    } else {
- 		inc_uninstall($_,$File::Find::dir,$verbose,0); # nonono set to 0
- 	    }
--	    $packlist->{$origfile}++;
-+	    $packlist->{$targetfile}++;
- 
- 	}, ".");
- 	chdir($cwd) or Carp::croak("Couldn't chdir to $cwd: $!");
diff --git a/lang/perl5.6/files/patch-POSIX.xs b/lang/perl5.6/files/patch-POSIX.xs
new file mode 100644
index 000000000000..7a3caa960822
--- /dev/null
+++ b/lang/perl5.6/files/patch-POSIX.xs
@@ -0,0 +1,19 @@
+--- ext/POSIX/POSIX.xs.orig	Tue Feb  1 11:55:24 2005
++++ ext/POSIX/POSIX.xs	Tue Feb  1 11:56:43 2005
+@@ -3860,6 +3860,16 @@
+ 	    mytm.tm_yday = yday;
+ 	    mytm.tm_isdst = isdst;
+ 	    mini_mktime(&mytm);
++ /* use libc to normalize the thing -- @@@ -- FreeBSD PR 74042, perl bug 18238 */
++ {
++ struct tm mytm2;
++ time_t t;
++ mytm2 = mytm;
++ t = mktime(&mytm2);
++ mytm2 = *localtime(&t);
++ mytm.tm_gmtoff = mytm2.tm_gmtoff;
++ mytm.tm_zone = mytm2.tm_zone;
++ }
+ 	    len = strftime(tmpbuf, sizeof tmpbuf, fmt, &mytm);
+ 	    /*
+ 	    ** The following is needed to handle to the situation where 
diff --git a/lang/perl5.6/files/patch-Path.pm b/lang/perl5.6/files/patch-Path.pm
new file mode 100644
index 000000000000..2735b0f6a648
--- /dev/null
+++ b/lang/perl5.6/files/patch-Path.pm
@@ -0,0 +1,30 @@
+$FreeBSD$
+--- lib/File/Path.pm.orig	Sat Jan 29 20:23:40 2005
++++ lib/File/Path.pm	Sat Jan 29 20:24:56 2005
+@@ -196,7 +196,7 @@ sub rmtree {
+ 	    # it's also intended to change it to writable in case we have
+ 	    # to recurse in which case we are better than rm -rf for 
+ 	    # subtrees with strange permissions
+-	    chmod(0777, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
++	    chmod(0700, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
+ 	      or carp "Can't make directory $root read+writeable: $!"
+ 		unless $safe;
+ 
+@@ -230,7 +230,7 @@ sub rmtree {
+ 		print "skipped $root\n" if $verbose;
+ 		next;
+ 	    }
+-	    chmod 0777, $root
++	    chmod 0700, $root
+ 	      or carp "Can't make directory $root writeable: $!"
+ 		if $force_writeable;
+ 	    print "rmdir $root\n" if $verbose;
+@@ -252,7 +252,7 @@ sub rmtree {
+ 		print "skipped $root\n" if $verbose;
+ 		next;
+ 	    }
+-	    chmod 0666, $root
++	    chmod 0600, $root
+ 	      or carp "Can't make file $root writeable: $!"
+ 		if $force_writeable;
+ 	    print "unlink $root\n" if $verbose;
diff --git a/lang/perl5.6/files/patch-Safe.pm b/lang/perl5.6/files/patch-Safe.pm
deleted file mode 100644
index 142b03ca4fba..000000000000
--- a/lang/perl5.6/files/patch-Safe.pm
+++ /dev/null
@@ -1,20 +0,0 @@
---- ext/Opcode/Safe.pm.orig	Fri Feb 23 03:57:54 2001
-+++ ext/Opcode/Safe.pm	Mon Apr 21 16:24:39 2003
-@@ -213,7 +213,7 @@ sub reval {
-     # Create anon sub ref in root of compartment.
-     # Uses a closure (on $expr) to pass in the code to be executed.
-     # (eval on one line to keep line numbers as expected by caller)
--	my $evalcode = sprintf('package %s; sub { eval $expr; }', $root);
-+	my $evalcode = sprintf('package %s; sub { @_ = (); eval $expr; }', $root);
-     my $evalsub;
- 
- 	if ($strict) { use strict; $evalsub = eval $evalcode; }
-@@ -227,7 +227,7 @@ sub rdo {
-     my $root = $obj->{Root};
- 
-     my $evalsub = eval
--	    sprintf('package %s; sub { do $file }', $root);
-+	    sprintf('package %s; sub { @_ = (); do $file }', $root);
-     return Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub);
- }
- 
diff --git a/lang/perl5.6/files/patch-ac b/lang/perl5.6/files/patch-ac
deleted file mode 100644
index 41b4b73fb67a..000000000000
--- a/lang/perl5.6/files/patch-ac
+++ /dev/null
@@ -1,35 +0,0 @@
-$FreeBSD$
-
---- hints/freebsd.sh.orig	Sun Jul 28 09:37:51 2002
-+++ hints/freebsd.sh	Sun Jul 28 09:39:23 2002
-@@ -85,10 +85,20 @@
- 	d_setreuid='define'
- 	d_setegid='undef'
- 	d_seteuid='undef'
-+	d_dosuid='define'
- 	;;
- *)	usevfork='true'
--	usemymalloc='n'
-+	case "$usemymalloc" in
-+	    "") usemymalloc='n'
-+	    ;;
-+	esac
- 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
-+ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
-+	d_setregid='define'
-+	d_setreuid='define'
-+	d_setegid='undef'
-+	d_seteuid='undef'
-+	d_dosuid='define'
- 	;;
- esac
- 
-@@ -115,7 +125,8 @@
-             fi
-             lddlflags='-Bshareable'
-         fi
--        cccdlflags='-DPIC -fpic'
-+        cccdlflags='-DPIC -fPIC'
-+        libswanted=`echo $libswanted | sed 's/ iconv / /'`
-         ;;
- esac
diff --git a/lang/perl5.6/files/patch-freebsd.sh b/lang/perl5.6/files/patch-freebsd.sh
new file mode 100644
index 000000000000..b7c1121c17ed
--- /dev/null
+++ b/lang/perl5.6/files/patch-freebsd.sh
@@ -0,0 +1,17 @@
+--- hints/freebsd.sh.orig	Mon Jan 31 22:08:10 2005
++++ hints/freebsd.sh	Mon Jan 31 22:10:17 2005
+@@ -101,7 +101,14 @@ case "$osvers" in
+ 	    "") usemymalloc='n'
+ 	        ;;
+ 	esac
++	d_setregid='define'
++	d_setreuid='define'
++	d_setegid='define'
++	d_seteuid='define'
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
++	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ iconv / /'`
++	libswanted=`echo $libswanted | sed 's/ dl / /'`
+ 	;;
+ esac
+ 
diff --git a/lang/perl5.6/files/patch-makedepend b/lang/perl5.6/files/patch-makedepend
deleted file mode 100644
index 39d99bc3ee42..000000000000
--- a/lang/perl5.6/files/patch-makedepend
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- makedepend.SH.orig	Wed May 29 19:29:05 2002
-+++ makedepend.SH	Wed May 29 19:31:31 2002
-@@ -155,6 +155,8 @@
-         $sed \
- 	    -e '1d' \
- 	    -e '/^#.*<stdin>/d' \
-+	    -e '/^#.*<built-in>/d' \
-+	    -e '/^#.*<command line>/d' \
- 	    -e '/^#.*"-"/d' \
- 	    -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
- 	    -e 's/^[	 ]*#[	 ]*line/#/' \
diff --git a/lang/perl5.6/files/use.perl b/lang/perl5.6/files/use.perl
index 0853b08da0a4..916f5f288e58 100644
--- a/lang/perl5.6/files/use.perl
+++ b/lang/perl5.6/files/use.perl
@@ -1,140 +1,264 @@
-#! %%PREFIX%%/bin/perl -w
+#!/bin/sh
+
 # $FreeBSD$
-use strict;
 
-# XXX what to do with perldoc, pelbug, perlcc ??
+this=`echo -n $0 | /usr/bin/sed -e 's!^.*/!!'`
+PERL_VERSION="%%PERL_VERSION%%"
+MAKE_CONF=%%MAKE_CONF%%
+banner=`date +"%F %T"`
+banner="# added by use.perl $banner"
+if [ -z "${OSVERSION}" ]; then
+	if [ -f /sbin/sysctl -a -x /sbin/sysctl ] ; then
+    		osreldate=`/sbin/sysctl -n kern.osreldate`
+	else
+    		osreldate=`/usr/sbin/sysctl -n kern.osreldate`
+	fi
+else
+    	osreldate=${OSVERSION}
+fi
 
-sub usage
-{
-	print STDERR <<EOF;
-Usage:
-  $0 port       -> /usr/bin/perl is the perl5 port
-  $0 system     -> /usr/bin/perl is the system perl
-EOF
-	exit 2;
-}
+if [ "x$this" = "xuse.perl" ]; then
+	PKG_PREFIX="%%PREFIX%%"
+	if [ "$1" = "port" ] ; then
+		need_remove_links=yes
+		need_create_links=yes
+		need_cleanup_make_conf=yes
+		need_cleanup_manpath=yes
+		need_spam_make_conf=yes
+		need_spam_manpath=yes
+	elif [ "$1" = "system" ] ; then
+		need_remove_links=yes
+		if [ $osreldate -lt 500036 ] ; then
+			need_base_system_perl=yes
+		fi
+		need_cleanup_make_conf=yes
+		need_cleanup_manpath=yes
+	else
+		echo 'Usage:
+	$0 port       -> /usr/bin/perl is the perl5 port
+	$0 system     -> /usr/bin/perl is the system perl'
+		exit 2;
+	fi
+else
+	if [ "$2" = "POST-INSTALL" ] ; then
+		need_remove_links=yes
+		if [ $osreldate -ge 500036 -a $osreldate -lt 502100 ] ; then
+			need_create_links=yes
+			need_cleanup_make_conf=yes
+			need_cleanup_manpath=yes
+			need_spam_make_conf=yes
+			need_spam_manpath=yes
+		fi
+		need_post_install=yes
+	elif [ "$2" = "POST-DEINSTALL" ] ; then
+		need_remove_links=yes
+		if [ $osreldate -lt 500036 ] ; then
+			need_base_system_perl=yes
+		fi
+		need_cleanup_make_conf=yes
+		need_cleanup_manpath=yes
+	else
+		exit 0;
+	fi
+fi
 
-my $port_perl = '%%PREFIX%%/bin/perl';
-$port_perl =~ tr|/|/|s;
+link_list="
+	a2p
+	c2ph
+	find2perl
+	h2ph
+	h2xs
+	perlbug
+	perlcc
+	perldoc
+	pl2pm
+	pod2html
+	pod2latex
+	pod2man
+	pod2text
+	s2p
+	splain"
+if [ $osreldate -ge 500036 ] ; then
+	link_list=""
+fi
+special_link_list="
+	perl
+	perl5
+	suidperl"
 
-@ARGV == 1 or usage();
-if ($ARGV[0] eq 'port') {
-	switch_to_port();
-} elsif ($ARGV[0] eq 'system') {
-	switch_to_system();
-} else {
-	usage();
+do_remove_links()
+{
+	echo "Removing stale symlinks from /usr/bin..."
+	for binary in $link_list $special_link_list
+	do
+		if [ -L "/usr/bin/$binary" ] ; then
+			echo "    Removing /usr/bin/$binary"
+			/bin/rm -f "/usr/bin/$binary"
+		else
+			echo "    Skipping /usr/bin/$binary"
+		fi
+	done
+	bins=`/bin/ls /usr/bin/*perl*5.* ${PKG_PREFIX}/bin/*perl*5.* 2>/dev/null`
+	for binary in $bins
+	do
+		if [ -L "$binary" ] ; then
+			echo "    Removing $binary installed by an older perl port"
+			/bin/rm -f "$binary"
+		fi
+	done
+	echo "Done."
 }
-exit 0;
-
-# Both functions depend on the idea that switch_to_port leaves
-# perl5 alone.  If the wrapper is installed on a -current system,
-# /usr/bin/perl5 will also be the wrapper.
 
-sub switch_to_system
+do_create_links()
 {
-	# protect against cases where people use PREFIX=/usr
-	if ($port_perl ne '/usr/bin/perl') {
-		unlink '/usr/bin/perl', '/usr/bin/suidperl',
-			'/usr/bin/perl%%PERL_VERSION%%';
-
-		link '/usr/bin/perl5', '/usr/bin/perl';
-		link '/usr/bin/perl5', '/usr/bin/perl%%PERL_VERSION%%';
-
-		my $ident = `/usr/bin/ident -q /usr/bin/perl5`;
-		if ($ident =~ m#src/usr.bin/perl/perl.c#) {
-			link '/usr/bin/perl5', '/usr/bin/suidperl';
-		} else {
-			link '/usr/bin/sperl5', '/usr/bin/suidperl';
-		}
-	}
-
-	open MK, ">> /etc/make.conf" or die "/etc/make.conf: $!";
-	print MK <<EOF;
-# -- use.perl generated deltas -- #
-# Created: @{[scalar localtime]}
-# Setting to use base system perl:
-.undef PERL_VER
-.undef PERL_VERSION
-.undef PERL_ARCH
-.undef NOPERL
-.undef NO_PERL
-
-EOF
-	close MK;
-
-	open MPOLD, "< /etc/manpath.config" or die "/etc/manpath.config: $!";
-	open MPNEW, "> /etc/manpath.config.new" or die "/etc/manpath.config.new: $!";
-	while (<MPOLD>) {
-		next if m|use.perl generated line|;
-		next if m|^\s*OPTIONAL_MANPATH\s+\S+/lib/perl5/%%PERL_VERSION%%/man\s*$|;
-		print MPNEW;
-	}
-	close MPNEW;
-	close MPOLD;
-	rename '/etc/manpath.config', '/etc/manpath.config.bak';
-	rename '/etc/manpath.config.new', '/etc/manpath.config';
+	echo "Creating various symlinks in /usr/bin..."
+	for binary in $link_list
+	do
+		if [ -f "/usr/bin/$binary" ] ; then
+			echo "    Backing up /usr/bin/$binary as /usr/bin/$binary.freebsd"
+			/bin/mv -f "/usr/bin/$binary" "/usr/bin/$binary.freebsd"
+		fi
+		if [ -e "/usr/bin/$binary" ] ; then
+			echo "    *** /usr/bin/$binary is still there, which should not happen"
+		elif [ -e "$PKG_PREFIX/bin/$binary" ] ; then
+			echo "    Symlinking $PKG_PREFIX/bin/$binary to /usr/bin/$binary"
+			/bin/ln -sf "$PKG_PREFIX/bin/$binary" "/usr/bin/$binary"
+		else
+			echo "    *** $PKG_PREFIX/bin/$binary is not there, a symlink won't do any good"
+		fi
+	done
+	for binary in $special_link_list
+	do
+		if [ -f "/usr/bin/$binary" ] ; then
+			echo "    Removing /usr/bin/$binary"
+		fi
+		bin=`echo $binary | /usr/bin/sed -e 's!perl5!perl!'`
+		bin=`echo $bin | /usr/bin/sed -e 's!suidperl!sperl!'`
+		if [ -e "/usr/bin/$binary.XXX" ] ; then
+			echo "    *** /usr/bin/$binary is still there, which should not happen"
+		elif [ -e "$PKG_PREFIX/bin/${bin}%%PERL_VERSION%%" ] ; then
+			echo "    Symlinking $PKG_PREFIX/bin/${bin}%%PERL_VERSION%% to /usr/bin/$binary"
+			/bin/ln -sf "$PKG_PREFIX/bin/${bin}%%PERL_VERSION%%" "/usr/bin/$binary"
+		else
+			echo "    *** $PKG_PREFIX/bin/${bin}%%PERL_VERSION%% is not there, a symlink won't do any good"
+		fi
+	done
+	echo "Done."
 }
 
-sub switch_to_port
+do_base_system_perl()
 {
-	# protect against cases where people use PREFIX=/usr
-	if ($port_perl ne '/usr/bin/perl') {
+	echo "Restoring base system perl binaries..."
+	for binary in $link_list
+	do
+		if [ -e "/usr/bin/$binary" ] ; then
+			echo "    *** /usr/bin/$binary is there, which should not happen"
+		else
+			if [ -f "/usr/bin/$binary.freebsd" ] ; then
+				echo "    Moving /usr/bin/$binary.freebsd to /usr/bin/$binary"
+				/bin/mv -f "/usr/bin/$binary.freebsd" "/usr/bin/$binary"
+			else
+				echo "    *** /usr/bin/$binary.freebsd is NOT there, nothing to restore"
+			fi
+		fi
+	done
+	for binary in $special_link_list
+	do
+		if [ -e "/usr/bin/$binary" ] ; then
+			echo "    *** /usr/bin/$binary is there, which should not happen"
+		else
+			bin=`echo $binary | /usr/bin/sed -e 's!perl5!perl!'`
+			bin=`echo $bin | /usr/bin/sed -e 's!suidperl!sperl!'`
+			bins=`/bin/ls /usr/bin/${bin}5.* 2>/dev/null | /usr/bin/sort`
+			bin=""
+			for b in $bins
+			do
+				if [ -f $b -a ! -L $b ] ; then
+					bin=$b
+				fi
+			done
+			if [ -z $bin ] ; then
+				echo "    *** cannot find what /usr/bin/$binary shall be restored FROM"
+			elif [ -f $bin ] ; then
+				echo "    Hardlinking $bin to /usr/bin/$binary"
+				ln -f "$bin" "/usr/bin/$binary"
+			else
+				echo "    *** $bin is NOT there, nothing to restore"
+			fi
+		fi
+	done
+	echo "Done."
+}
 
-		my $need_perl5_link;
-		if (-e "/usr/bin/perl5" && !-l "/usr/bin/perl5") {
-			my $ident = `/usr/bin/ident -q /usr/bin/perl5`;
-			if ($ident =~ m#src/usr.bin/perl/perl.c#) {
-				rename '/usr/bin/perl', '/usr/bin/perl-wrapper';
-			} else {
-				unlink '/usr/bin/perl';
-			}
-		} else {
-			unlink "/usr/bin/perl5";
-			$need_perl5_link = 1;
-		}
+do_post_install()
+{
+	INCLUDEDIR=/usr/include
+	install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/auto
+	install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VERSION%%/auto
+	install -d ${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/man/man3
+	cd ${INCLUDEDIR} && ${PKG_PREFIX}/bin/h2ph *.h machine/*.h sys/*.h >/dev/null
+}
 
-		unlink '/usr/bin/suidperl', '/usr/bin/perl%%PERL_VERSION%%';
+do_cleanup_make_conf()
+{
+	echo -n "Cleaning up ${MAKE_CONF}..."
+	if [ -f ${MAKE_CONF} ] ; then
+		/usr/bin/awk 's=0;
+			/^#.*use.perl/ { s=1; mode=1 }
+			/^#/ { s=1; if (mode != 1) { mode=0 } }
+			/.*PERL.*=/ { s=1; if (mode == 1) { mode=2 } }
+			/^$/ { s=1; if (mode != 2) { mode = 0 } }
+			{ if (s != 1) { mode = 0 } if (mode == 0) print }' ${MAKE_CONF} >${MAKE_CONF}.new
+		/bin/mv ${MAKE_CONF} ${MAKE_CONF}.bak
+		/bin/mv ${MAKE_CONF}.new ${MAKE_CONF}
+	fi
+	echo " Done."
+}
 
-		symlink '%%PREFIX%%/bin/perl', '/usr/bin/perl';
-		symlink '%%PREFIX%%/bin/suidperl', '/usr/bin/suidperl';
-		symlink '%%PREFIX%%/bin/perl', '/usr/bin/perl%%PERL_VERSION%%';
-		symlink '%%PREFIX%%/bin/perl', '/usr/bin/perl5' if $need_perl5_link;
-	}
+do_cleanup_manpath()
+{
+	echo -n "Cleaning up /etc/manpath.config..."
+	if [ -f /etc/manpath.config ] ; then
+		/usr/bin/awk 's=0;
+			/^#.*use.perl/ { s=1; mode=1 }
+			/^#/ { s=1; if (mode != 1) { mode=0 } }
+			/^OPTIONAL_MANPATH.*perl5/ { s=1; if (mode == 1) { mode=2 } }
+			/^$/ { s=1; if (mode != 2) { mode = 0 } }
+			{ if (s != 1) { mode = 0 } if (mode == 0) print }' /etc/manpath.config >/etc/manpath.config.new
+		/bin/mv /etc/manpath.config /etc/manpath.config.bak
+		/bin/mv /etc/manpath.config.new /etc/manpath.config
+	fi
+	echo " Done."
+}
 
-	open MK, ">> /etc/make.conf" or die "/etc/make.conf: $!";
-	print MK <<EOF;
-# -- use.perl generated deltas -- #
-# Created: @{[scalar localtime]}
-# Setting to use base perl from ports:
-PERL_VER=%%PERL_VER%%
-PERL_VERSION=%%PERL_VERSION%%
-PERL_ARCH=%%PERL_ARCH%%
-NOPERL=yo
-NO_PERL=yo
-NO_PERL_WRAPPER=yo
+do_spam_make_conf()
+{
+	echo -n "Spamming ${MAKE_CONF}..."
+	echo "$banner" >>${MAKE_CONF}
+	echo "PERL_VER=%%PERL_VER%%" >>${MAKE_CONF}
+	echo "PERL_VERSION=%%PERL_VERSION%%" >>${MAKE_CONF}
+	if [ $osreldate -lt 500036 ] ; then
+		echo "NOPERL=yes" >>${MAKE_CONF}
+	fi
+	echo " Done."
+}
 
-EOF
-	close MK;
+do_spam_manpath()
+{
+	echo -n "Spamming /etc/manpath.config..."
+	echo "$banner" >>/etc/manpath.config
+	echo "OPTIONAL_MANPATH	${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/man" >>/etc/manpath.config
+	echo "OPTIONAL_MANPATH	${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/perl/man" >>/etc/manpath.config
+	echo " Done."
+}
 
-	my $perl_port_manpath = <<EOF;
-# -- use.perl generated line -- #
-OPTIONAL_MANPATH	%%PREFIX%%/lib/perl5/%%PERL_VERSION%%/man
-EOF
+[ $need_remove_links ] && do_remove_links
+[ $need_create_links ] && do_create_links
+[ $need_base_system_perl ] && do_base_system_perl
+[ $need_post_install ] && do_post_install
+[ $need_cleanup_make_conf ] && do_cleanup_make_conf
+[ $need_spam_make_conf ] && do_spam_make_conf
+[ $need_cleanup_manpath ] && do_cleanup_manpath
+[ $need_spam_manpath ] && do_spam_manpath
 
-	open MPOLD, "< /etc/manpath.config" or die "/etc/manpath.config: $!";
-	open MPNEW, "> /etc/manpath.config.new" or die "/etc/manpath.config.new: $!";
-	my $modified = 0;
-	while (<MPOLD>) {
-		if (!$modified && m|^\s*OPTIONAL_MANPATH\s+\S+/lib/perl5/\S+/man\s*$|) {
-			print MPNEW $perl_port_manpath;
-			$modified = 1;
-		}
-		print MPNEW;
-	}
-	print MPNEW $perl_port_manpath unless $modified;
-	close MPNEW;
-	close MPOLD;
-	rename '/etc/manpath.config', '/etc/manpath.config.bak';
-	rename '/etc/manpath.config.new', '/etc/manpath.config';
-}
+exit 0
diff --git a/lang/perl5.6/pkg-install b/lang/perl5.6/pkg-install
deleted file mode 100644
index 30a44d633c5c..000000000000
--- a/lang/perl5.6/pkg-install
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != POST-INSTALL ] ; then
-	exit 0
-fi
-
-INCLUDEDIR=/usr/include
-
-install -d ${PKG_PREFIX}/lib/perl5/site_perl/5.6.1/mach
-cd ${INCLUDEDIR} && ${PKG_PREFIX}/bin/h2ph *.h machine/*.h sys/*.h
-
-if [ -z "${OSVERSION}" ]; then
-	if [ -f /sbin/sysctl -a -x /sbin/sysctl ] ; then
-		osreldate=`/sbin/sysctl -n kern.osreldate`
-	else
-		osreldate=`/usr/sbin/sysctl -n kern.osreldate`
-	fi
-else
-    	osreldate=${OSVERSION}
-fi
-
-if [ $osreldate -ge 500043 -a $osreldate -lt 502100 ] ; then
-	${PKG_PREFIX}/bin/use.perl port
-fi
-
-exit 0
diff --git a/lang/perl5.6/pkg-message-prefer58 b/lang/perl5.6/pkg-message-prefer58
new file mode 100644
index 000000000000..52353972dac4
--- /dev/null
+++ b/lang/perl5.6/pkg-message-prefer58
@@ -0,0 +1,26 @@
+Installation of Perl distribution is finished.  Please note, that since
+on this version of FreeBSD the preferred Perl port is lang/perl5.8, this
+distribution will not be used by default.
+
+If you want this version of Perl to be used by default, please type
+
+  use.perl port
+
+Assuming that use.perl script (which was installed with the rest of the
+Perl distribution) can be found in your PATH (you might have to type
+`rehash' first, depending upon a shell you use), this action will
+replace /usr/bin/perl and /usr/bin/suidperl with symbolic links to the
+versions of these binaries in the Perl distribution.  This action will
+also put some variables into your /etc/make.conf file, so that newly
+installed ports (not packages!) will use new version of perl, and the
+system upgrades from the source will not overwrite the changes made.
+
+Note that use.perl port is specific to a given perl installation.  If
+you later upgrade the perl port, run use.perl port again to update the
+symbolic links and /etc/make.conf.
+
+At any time you can also type
+
+  use.perl system
+
+if you wish to remove those symbolic links from your system.
diff --git a/lang/perl5.6/pkg-message b/lang/perl5.6/pkg-message-sysperl
index e575728b19be..0438edb18a19 100644
--- a/lang/perl5.6/pkg-message
+++ b/lang/perl5.6/pkg-message-sysperl
@@ -15,6 +15,10 @@ also put some variables into your /etc/make.conf file, so that newly
 installed ports (not packages!) will use new version of perl, and the
 system upgrades from the source will not overwrite the changes made.
 
+Note that use.perl port is specific to a given perl installation.  If
+you later upgrade the perl port, run use.perl port again to update the
+symbolic links and /etc/make.conf.
+
 At any time you can also type
 
   use.perl system
diff --git a/lang/perl5.6/pkg-plist b/lang/perl5.6/pkg-plist
index ec2a2459167c..99bb4c697e72 100644
--- a/lang/perl5.6/pkg-plist
+++ b/lang/perl5.6/pkg-plist
@@ -1,17 +1,13 @@
-bin/perl
-@exec ln -fs %D/%F %B/perl%%PERL_VER%%
-@exec ln -fs %D/%F %B/perl5
-@unexec rm %B/perl%%PERL_VER%%
-@unexec rm %B/perl5
-bin/sperl%%PERL_VER%%
-@exec ln -fs %D/%F %B/suidperl
-@unexec rm %B/suidperl
 bin/a2p
 bin/c2ph
 bin/dprofpp
 bin/find2perl
 bin/h2ph
 bin/h2xs
+bin/perl
+bin/perl%%PERL_VER%%
+@exec ln -fs %D/%F %B/perl5
+@unexec rm -f %B/perl5 2>&1 >/dev/null || true
 bin/perlbug
 bin/perlcc
 bin/perldoc
@@ -25,192 +21,10 @@ bin/podchecker
 bin/podselect
 bin/pstruct
 bin/s2p
+%%ENABLE_SUIDPERL%%bin/sperl%%PERL_VER%%
 bin/splain
-bin/use.perl
-lib/perl5/%%PERL_VER%%/AnyDBM_File.pm
-lib/perl5/%%PERL_VER%%/AutoLoader.pm
-lib/perl5/%%PERL_VER%%/AutoSplit.pm
-lib/perl5/%%PERL_VER%%/B/assemble
-lib/perl5/%%PERL_VER%%/B/cc_harness
-lib/perl5/%%PERL_VER%%/B/disassemble
-lib/perl5/%%PERL_VER%%/B/makeliblinks
-lib/perl5/%%PERL_VER%%/BSDPAN/BSDPAN.pm
-lib/perl5/%%PERL_VER%%/BSDPAN/BSDPAN/Override.pm
-lib/perl5/%%PERL_VER%%/BSDPAN/Config.pm
-lib/perl5/%%PERL_VER%%/BSDPAN/ExtUtils/MM_Unix.pm
-lib/perl5/%%PERL_VER%%/BSDPAN/ExtUtils/Packlist.pm
-lib/perl5/%%PERL_VER%%/Benchmark.pm
-lib/perl5/%%PERL_VER%%/CGI.pm
-lib/perl5/%%PERL_VER%%/CGI/Apache.pm
-lib/perl5/%%PERL_VER%%/CGI/Carp.pm
-lib/perl5/%%PERL_VER%%/CGI/Cookie.pm
-lib/perl5/%%PERL_VER%%/CGI/Fast.pm
-lib/perl5/%%PERL_VER%%/CGI/Pretty.pm
-lib/perl5/%%PERL_VER%%/CGI/Push.pm
-lib/perl5/%%PERL_VER%%/CGI/Switch.pm
-lib/perl5/%%PERL_VER%%/CGI/Util.pm
-lib/perl5/%%PERL_VER%%/CPAN.pm
-lib/perl5/%%PERL_VER%%/CPAN/FirstTime.pm
-lib/perl5/%%PERL_VER%%/CPAN/Nox.pm
-lib/perl5/%%PERL_VER%%/Carp.pm
-lib/perl5/%%PERL_VER%%/Carp/Heavy.pm
-lib/perl5/%%PERL_VER%%/Class/Struct.pm
-lib/perl5/%%PERL_VER%%/Cwd.pm
-lib/perl5/%%PERL_VER%%/DB.pm
-lib/perl5/%%PERL_VER%%/Devel/SelfStubber.pm
-lib/perl5/%%PERL_VER%%/DirHandle.pm
-lib/perl5/%%PERL_VER%%/Dumpvalue.pm
-lib/perl5/%%PERL_VER%%/English.pm
-lib/perl5/%%PERL_VER%%/Env.pm
-lib/perl5/%%PERL_VER%%/Exporter.pm
-lib/perl5/%%PERL_VER%%/Exporter/Heavy.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Command.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Embed.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Install.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Installed.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Liblist.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/MM_Cygwin.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/MM_OS2.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/MM_Unix.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/MM_VMS.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/MM_Win32.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Manifest.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Miniperl.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Mkbootstrap.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Mksymlists.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Packlist.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/inst
-lib/perl5/%%PERL_VER%%/ExtUtils/testlib.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/typemap
-lib/perl5/%%PERL_VER%%/ExtUtils/xsubpp
-lib/perl5/%%PERL_VER%%/Fatal.pm
-lib/perl5/%%PERL_VER%%/File/Basename.pm
-lib/perl5/%%PERL_VER%%/File/CheckTree.pm
-lib/perl5/%%PERL_VER%%/File/Compare.pm
-lib/perl5/%%PERL_VER%%/File/Copy.pm
-lib/perl5/%%PERL_VER%%/File/DosGlob.pm
-lib/perl5/%%PERL_VER%%/File/Find.pm
-lib/perl5/%%PERL_VER%%/File/Path.pm
-lib/perl5/%%PERL_VER%%/File/Spec.pm
-lib/perl5/%%PERL_VER%%/File/Spec/Epoc.pm
-lib/perl5/%%PERL_VER%%/File/Spec/Functions.pm
-lib/perl5/%%PERL_VER%%/File/Spec/Mac.pm
-lib/perl5/%%PERL_VER%%/File/Spec/OS2.pm
-lib/perl5/%%PERL_VER%%/File/Spec/Unix.pm
-lib/perl5/%%PERL_VER%%/File/Spec/VMS.pm
-lib/perl5/%%PERL_VER%%/File/Spec/Win32.pm
-lib/perl5/%%PERL_VER%%/File/Temp.pm
-lib/perl5/%%PERL_VER%%/File/stat.pm
-lib/perl5/%%PERL_VER%%/FileCache.pm
-lib/perl5/%%PERL_VER%%/FileHandle.pm
-lib/perl5/%%PERL_VER%%/FindBin.pm
-lib/perl5/%%PERL_VER%%/Getopt/Long.pm
-lib/perl5/%%PERL_VER%%/Getopt/Std.pm
-lib/perl5/%%PERL_VER%%/I18N/Collate.pm
-lib/perl5/%%PERL_VER%%/IO/Socket/INET.pm
-lib/perl5/%%PERL_VER%%/IO/Socket/UNIX.pm
-lib/perl5/%%PERL_VER%%/IPC/Open2.pm
-lib/perl5/%%PERL_VER%%/IPC/Open3.pm
-lib/perl5/%%PERL_VER%%/Math/BigFloat.pm
-lib/perl5/%%PERL_VER%%/Math/BigInt.pm
-lib/perl5/%%PERL_VER%%/Math/Complex.pm
-lib/perl5/%%PERL_VER%%/Math/Trig.pm
-lib/perl5/%%PERL_VER%%/Net/Ping.pm
-lib/perl5/%%PERL_VER%%/Net/hostent.pm
-lib/perl5/%%PERL_VER%%/Net/netent.pm
-lib/perl5/%%PERL_VER%%/Net/protoent.pm
-lib/perl5/%%PERL_VER%%/Net/servent.pm
-lib/perl5/%%PERL_VER%%/Pod/Checker.pm
-lib/perl5/%%PERL_VER%%/Pod/Find.pm
-lib/perl5/%%PERL_VER%%/Pod/Functions.pm
-lib/perl5/%%PERL_VER%%/Pod/Html.pm
-lib/perl5/%%PERL_VER%%/Pod/InputObjects.pm
-lib/perl5/%%PERL_VER%%/Pod/LaTeX.pm
-lib/perl5/%%PERL_VER%%/Pod/Man.pm
-lib/perl5/%%PERL_VER%%/Pod/ParseUtils.pm
-lib/perl5/%%PERL_VER%%/Pod/Parser.pm
-lib/perl5/%%PERL_VER%%/Pod/Plainer.pm
-lib/perl5/%%PERL_VER%%/Pod/Select.pm
-lib/perl5/%%PERL_VER%%/Pod/Text.pm
-lib/perl5/%%PERL_VER%%/Pod/Text/Color.pm
-lib/perl5/%%PERL_VER%%/Pod/Text/Overstrike.pm
-lib/perl5/%%PERL_VER%%/Pod/Text/Termcap.pm
-lib/perl5/%%PERL_VER%%/Pod/Usage.pm
-lib/perl5/%%PERL_VER%%/Search/Dict.pm
-lib/perl5/%%PERL_VER%%/SelectSaver.pm
-lib/perl5/%%PERL_VER%%/SelfLoader.pm
-lib/perl5/%%PERL_VER%%/Shell.pm
-lib/perl5/%%PERL_VER%%/Symbol.pm
-lib/perl5/%%PERL_VER%%/Term/ANSIColor.pm
-lib/perl5/%%PERL_VER%%/Term/Cap.pm
-lib/perl5/%%PERL_VER%%/Term/Complete.pm
-lib/perl5/%%PERL_VER%%/Term/ReadLine.pm
-lib/perl5/%%PERL_VER%%/Test.pm
-lib/perl5/%%PERL_VER%%/Test/Harness.pm
-lib/perl5/%%PERL_VER%%/Text/Abbrev.pm
-lib/perl5/%%PERL_VER%%/Text/ParseWords.pm
-lib/perl5/%%PERL_VER%%/Text/Soundex.pm
-lib/perl5/%%PERL_VER%%/Text/Tabs.pm
-lib/perl5/%%PERL_VER%%/Text/Wrap.pm
-lib/perl5/%%PERL_VER%%/Tie/Array.pm
-lib/perl5/%%PERL_VER%%/Tie/Handle.pm
-lib/perl5/%%PERL_VER%%/Tie/Hash.pm
-lib/perl5/%%PERL_VER%%/Tie/RefHash.pm
-lib/perl5/%%PERL_VER%%/Tie/Scalar.pm
-lib/perl5/%%PERL_VER%%/Tie/SubstrHash.pm
-lib/perl5/%%PERL_VER%%/Time/Local.pm
-lib/perl5/%%PERL_VER%%/Time/gmtime.pm
-lib/perl5/%%PERL_VER%%/Time/localtime.pm
-lib/perl5/%%PERL_VER%%/Time/tm.pm
-lib/perl5/%%PERL_VER%%/UNIVERSAL.pm
-lib/perl5/%%PERL_VER%%/User/grent.pm
-lib/perl5/%%PERL_VER%%/User/pwent.pm
-lib/perl5/%%PERL_VER%%/Win32.pod
-lib/perl5/%%PERL_VER%%/abbrev.pl
-lib/perl5/%%PERL_VER%%/assert.pl
-lib/perl5/%%PERL_VER%%/attributes.pm
-lib/perl5/%%PERL_VER%%/auto/Getopt/Long/Configure.al
-lib/perl5/%%PERL_VER%%/auto/Getopt/Long/Croak.al
-lib/perl5/%%PERL_VER%%/auto/Getopt/Long/FindOption.al
-lib/perl5/%%PERL_VER%%/auto/Getopt/Long/GetOptions.al
-lib/perl5/%%PERL_VER%%/auto/Getopt/Long/autosplit.ix
-lib/perl5/%%PERL_VER%%/auto/Getopt/Long/config.al
-lib/perl5/%%PERL_VER%%/autouse.pm
-lib/perl5/%%PERL_VER%%/base.pm
-lib/perl5/%%PERL_VER%%/bigfloat.pl
-lib/perl5/%%PERL_VER%%/bigint.pl
-lib/perl5/%%PERL_VER%%/bigrat.pl
-lib/perl5/%%PERL_VER%%/blib.pm
-lib/perl5/%%PERL_VER%%/bytes.pm
-lib/perl5/%%PERL_VER%%/bytes_heavy.pl
-lib/perl5/%%PERL_VER%%/cacheout.pl
-lib/perl5/%%PERL_VER%%/charnames.pm
-lib/perl5/%%PERL_VER%%/chat2.pl
-lib/perl5/%%PERL_VER%%/complete.pl
-lib/perl5/%%PERL_VER%%/constant.pm
-lib/perl5/%%PERL_VER%%/ctime.pl
-lib/perl5/%%PERL_VER%%/diagnostics.pm
-lib/perl5/%%PERL_VER%%/dotsh.pl
-lib/perl5/%%PERL_VER%%/dumpvar.pl
-lib/perl5/%%PERL_VER%%/exceptions.pl
-lib/perl5/%%PERL_VER%%/fastcwd.pl
-lib/perl5/%%PERL_VER%%/fields.pm
-lib/perl5/%%PERL_VER%%/filetest.pm
-lib/perl5/%%PERL_VER%%/find.pl
-lib/perl5/%%PERL_VER%%/finddepth.pl
-lib/perl5/%%PERL_VER%%/flush.pl
-lib/perl5/%%PERL_VER%%/ftp.pl
-lib/perl5/%%PERL_VER%%/getcwd.pl
-lib/perl5/%%PERL_VER%%/getopt.pl
-lib/perl5/%%PERL_VER%%/getopts.pl
-lib/perl5/%%PERL_VER%%/hostname.pl
-lib/perl5/%%PERL_VER%%/importenv.pl
-lib/perl5/%%PERL_VER%%/integer.pm
-lib/perl5/%%PERL_VER%%/less.pm
-lib/perl5/%%PERL_VER%%/lib.pm
-lib/perl5/%%PERL_VER%%/locale.pm
-lib/perl5/%%PERL_VER%%/look.pl
+%%ENABLE_SUIDPERL%%bin/suidperl
+%%NEED_USE_PERL%%bin/use.perl
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/.packlist
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B/Asmdata.pm
@@ -249,7 +63,6 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/hv.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/intrpvar.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/iperlsys.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/keywords.h
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/libperl.a
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/mg.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/nostdio.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/objXSUB.h
@@ -271,7 +84,7 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/regcomp.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/regexp.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/regnodes.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/scope.h
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/sperl.o
+%%ENABLE_SUIDPERL%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/sperl.o
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/sv.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/thrdvar.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/thread.h
@@ -328,18 +141,18 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek/Peek.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek/Peek.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader/DynaLoader.a
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader/autosplit.ix
+lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader/extralibs.ld
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader/dl_expandspec.al
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader/dl_find_symbol_anywhere.al
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader/dl_findfile.al
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader/extralibs.ld
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl/Fcntl.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl/Fcntl.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/Glob.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/Glob.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/autosplit.ix
-%%GDBM%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/autosplit.ix
-%%GDBM%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.so
 %%GDBM%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.bs
+%%GDBM%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.so
+%%GDBM%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/autosplit.ix
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV/SysV.bs
@@ -513,9 +326,328 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs/attrs.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs/attrs.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re/re.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re/re.so
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm/extralibs.ld
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/ops.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/re.pm
+lib/perl5/%%PERL_VER%%/AnyDBM_File.pm
+lib/perl5/%%PERL_VER%%/AutoLoader.pm
+lib/perl5/%%PERL_VER%%/AutoSplit.pm
+lib/perl5/%%PERL_VER%%/B/assemble
+lib/perl5/%%PERL_VER%%/B/cc_harness
+lib/perl5/%%PERL_VER%%/B/disassemble
+lib/perl5/%%PERL_VER%%/B/makeliblinks
+lib/perl5/%%PERL_VER%%/BSDPAN/BSDPAN.pm
+lib/perl5/%%PERL_VER%%/BSDPAN/BSDPAN/Override.pm
+lib/perl5/%%PERL_VER%%/BSDPAN/Config.pm
+lib/perl5/%%PERL_VER%%/BSDPAN/ExtUtils/MM_Unix.pm
+lib/perl5/%%PERL_VER%%/BSDPAN/ExtUtils/MakeMaker.pm
+lib/perl5/%%PERL_VER%%/BSDPAN/ExtUtils/Packlist.pm
+lib/perl5/%%PERL_VER%%/Benchmark.pm
+lib/perl5/%%PERL_VER%%/CGI.pm
+lib/perl5/%%PERL_VER%%/CGI/Apache.pm
+lib/perl5/%%PERL_VER%%/CGI/Carp.pm
+lib/perl5/%%PERL_VER%%/CGI/Cookie.pm
+lib/perl5/%%PERL_VER%%/CGI/Fast.pm
+lib/perl5/%%PERL_VER%%/CGI/Pretty.pm
+lib/perl5/%%PERL_VER%%/CGI/Push.pm
+lib/perl5/%%PERL_VER%%/CGI/Switch.pm
+lib/perl5/%%PERL_VER%%/CGI/Util.pm
+lib/perl5/%%PERL_VER%%/CPAN.pm
+lib/perl5/%%PERL_VER%%/CPAN/FirstTime.pm
+lib/perl5/%%PERL_VER%%/CPAN/Nox.pm
+lib/perl5/%%PERL_VER%%/Carp.pm
+lib/perl5/%%PERL_VER%%/Carp/Heavy.pm
+lib/perl5/%%PERL_VER%%/Class/Struct.pm
+lib/perl5/%%PERL_VER%%/Cwd.pm
+lib/perl5/%%PERL_VER%%/DB.pm
+lib/perl5/%%PERL_VER%%/Devel/SelfStubber.pm
+lib/perl5/%%PERL_VER%%/DirHandle.pm
+lib/perl5/%%PERL_VER%%/Dumpvalue.pm
+lib/perl5/%%PERL_VER%%/English.pm
+lib/perl5/%%PERL_VER%%/Env.pm
+lib/perl5/%%PERL_VER%%/Exporter.pm
+lib/perl5/%%PERL_VER%%/Exporter/Heavy.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Changes
+lib/perl5/%%PERL_VER%%/ExtUtils/Command.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Command/MM.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Embed.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Install.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Installed.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Liblist.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Liblist/Kid.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MANIFEST.SKIP
+lib/perl5/%%PERL_VER%%/ExtUtils/MM.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_Any.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_BeOS.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_Cygwin.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_DOS.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_MacOS.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_NW5.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_OS2.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_UWIN.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_Unix.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_VMS.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_Win32.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_Win95.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MY.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker/FAQ.pod
+lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker/Tutorial.pod
+lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker/bytes.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker/vmsish.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Manifest.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Miniperl.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Mkbootstrap.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Mksymlists.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/NOTES
+lib/perl5/%%PERL_VER%%/ExtUtils/PATCHING
+lib/perl5/%%PERL_VER%%/ExtUtils/Packlist.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/README
+lib/perl5/%%PERL_VER%%/ExtUtils/TODO
+lib/perl5/%%PERL_VER%%/ExtUtils/instmodsh
+lib/perl5/%%PERL_VER%%/ExtUtils/t/00compile.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/00setup_dummy.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/Command.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/INST.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/INST_PREFIX.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/Install.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/Installed.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/Liblist.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/MM_Any.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/MM_BeOS.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/MM_Cygwin.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/MM_NW5.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/MM_OS2.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/MM_Unix.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/MM_VMS.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/MM_Win32.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/Manifest.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/Mkbootstrap.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/Packlist.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/VERSION_FROM.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/backwards.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/basic.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/bytes.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/hints.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/oneliner.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/postamble.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/prefixify.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/prereq_print.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/problems.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/prompt.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/recurs.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/split_command.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/testlib.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/vmsish.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/writemakefile_args.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/zz_cleanup_dummy.t
+lib/perl5/%%PERL_VER%%/ExtUtils/testlib.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/typemap
+lib/perl5/%%PERL_VER%%/ExtUtils/xsubpp
+lib/perl5/%%PERL_VER%%/Fatal.pm
+lib/perl5/%%PERL_VER%%/File/Basename.pm
+lib/perl5/%%PERL_VER%%/File/CheckTree.pm
+lib/perl5/%%PERL_VER%%/File/Compare.pm
+lib/perl5/%%PERL_VER%%/File/Copy.pm
+lib/perl5/%%PERL_VER%%/File/DosGlob.pm
+lib/perl5/%%PERL_VER%%/File/Find.pm
+lib/perl5/%%PERL_VER%%/File/Path.pm
+lib/perl5/%%PERL_VER%%/File/Spec.pm
+lib/perl5/%%PERL_VER%%/File/Spec/Cygwin.pm
+lib/perl5/%%PERL_VER%%/File/Spec/Epoc.pm
+lib/perl5/%%PERL_VER%%/File/Spec/Functions.pm
+lib/perl5/%%PERL_VER%%/File/Spec/Mac.pm
+lib/perl5/%%PERL_VER%%/File/Spec/OS2.pm
+lib/perl5/%%PERL_VER%%/File/Spec/Unix.pm
+lib/perl5/%%PERL_VER%%/File/Spec/VMS.pm
+lib/perl5/%%PERL_VER%%/File/Spec/Win32.pm
+lib/perl5/%%PERL_VER%%/File/Spec/t/Functions.t
+lib/perl5/%%PERL_VER%%/File/Spec/t/Spec.t
+lib/perl5/%%PERL_VER%%/File/Spec/t/crossplatform.t
+lib/perl5/%%PERL_VER%%/File/Spec/t/rel2abs2rel.t
+lib/perl5/%%PERL_VER%%/File/Temp.pm
+lib/perl5/%%PERL_VER%%/File/Temp/t/mktemp.t
+lib/perl5/%%PERL_VER%%/File/Temp/t/object.t
+lib/perl5/%%PERL_VER%%/File/Temp/t/posix.t
+lib/perl5/%%PERL_VER%%/File/Temp/t/security.t
+lib/perl5/%%PERL_VER%%/File/Temp/t/tempfile.t
+lib/perl5/%%PERL_VER%%/File/stat.pm
+lib/perl5/%%PERL_VER%%/FileCache.pm
+lib/perl5/%%PERL_VER%%/FileHandle.pm
+lib/perl5/%%PERL_VER%%/FindBin.pm
+lib/perl5/%%PERL_VER%%/Getopt/Long.pm
+lib/perl5/%%PERL_VER%%/Getopt/Std.pm
+lib/perl5/%%PERL_VER%%/I18N/Collate.pm
+lib/perl5/%%PERL_VER%%/IO/Socket/INET.pm
+lib/perl5/%%PERL_VER%%/IO/Socket/UNIX.pm
+lib/perl5/%%PERL_VER%%/IPC/Open2.pm
+lib/perl5/%%PERL_VER%%/IPC/Open3.pm
+lib/perl5/%%PERL_VER%%/Math/BigFloat.pm
+lib/perl5/%%PERL_VER%%/Math/BigInt.pm
+lib/perl5/%%PERL_VER%%/Math/Complex.pm
+lib/perl5/%%PERL_VER%%/Math/Trig.pm
+lib/perl5/%%PERL_VER%%/Net/Ping.pm
+lib/perl5/%%PERL_VER%%/Net/hostent.pm
+lib/perl5/%%PERL_VER%%/Net/netent.pm
+lib/perl5/%%PERL_VER%%/Net/protoent.pm
+lib/perl5/%%PERL_VER%%/Net/servent.pm
+lib/perl5/%%PERL_VER%%/Pod/Checker.pm
+lib/perl5/%%PERL_VER%%/Pod/Find.pm
+lib/perl5/%%PERL_VER%%/Pod/Functions.pm
+lib/perl5/%%PERL_VER%%/Pod/Html.pm
+lib/perl5/%%PERL_VER%%/Pod/InputObjects.pm
+lib/perl5/%%PERL_VER%%/Pod/LaTeX.pm
+lib/perl5/%%PERL_VER%%/Pod/Man.pm
+lib/perl5/%%PERL_VER%%/Pod/ParseUtils.pm
+lib/perl5/%%PERL_VER%%/Pod/Parser.pm
+lib/perl5/%%PERL_VER%%/Pod/Plainer.pm
+lib/perl5/%%PERL_VER%%/Pod/Select.pm
+lib/perl5/%%PERL_VER%%/Pod/Text.pm
+lib/perl5/%%PERL_VER%%/Pod/Text/Color.pm
+lib/perl5/%%PERL_VER%%/Pod/Text/Overstrike.pm
+lib/perl5/%%PERL_VER%%/Pod/Text/Termcap.pm
+lib/perl5/%%PERL_VER%%/Pod/Usage.pm
+lib/perl5/%%PERL_VER%%/Search/Dict.pm
+lib/perl5/%%PERL_VER%%/SelectSaver.pm
+lib/perl5/%%PERL_VER%%/SelfLoader.pm
+lib/perl5/%%PERL_VER%%/Shell.pm
+lib/perl5/%%PERL_VER%%/Symbol.pm
+lib/perl5/%%PERL_VER%%/Term/ANSIColor.pm
+lib/perl5/%%PERL_VER%%/Term/Cap.pm
+lib/perl5/%%PERL_VER%%/Term/Complete.pm
+lib/perl5/%%PERL_VER%%/Term/ReadLine.pm
+lib/perl5/%%PERL_VER%%/Test.pm
+lib/perl5/%%PERL_VER%%/Test/Builder.pm
+lib/perl5/%%PERL_VER%%/Test/Harness.pm
+lib/perl5/%%PERL_VER%%/Test/Harness/Assert.pm
+lib/perl5/%%PERL_VER%%/Test/Harness/Changes
+lib/perl5/%%PERL_VER%%/Test/Harness/Iterator.pm
+lib/perl5/%%PERL_VER%%/Test/Harness/Straps.pm
+lib/perl5/%%PERL_VER%%/Test/Harness/t/00compile.t
+lib/perl5/%%PERL_VER%%/Test/Harness/t/assert.t
+lib/perl5/%%PERL_VER%%/Test/Harness/t/base.t
+lib/perl5/%%PERL_VER%%/Test/Harness/t/callback.t
+lib/perl5/%%PERL_VER%%/Test/Harness/t/nonumbers.t
+lib/perl5/%%PERL_VER%%/Test/Harness/t/ok.t
+lib/perl5/%%PERL_VER%%/Test/Harness/t/pod.t
+lib/perl5/%%PERL_VER%%/Test/Harness/t/strap-analyze.t
+lib/perl5/%%PERL_VER%%/Test/Harness/t/strap.t
+lib/perl5/%%PERL_VER%%/Test/Harness/t/test-harness.t
+lib/perl5/%%PERL_VER%%/Test/More.pm
+lib/perl5/%%PERL_VER%%/Test/Simple.pm
+lib/perl5/%%PERL_VER%%/Test/Simple/Changes
+lib/perl5/%%PERL_VER%%/Test/Simple/README
+lib/perl5/%%PERL_VER%%/Test/Simple/t/Builder.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/More.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/bad_plan.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/buffer.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/curr_test.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/details.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/diag.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/exit.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/extra.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/fail-like.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/fail-more.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/fail.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/filehandles.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/fork.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/has_plan.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/has_plan2.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/import.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/is_deeply.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/maybe_regex.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/missing.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/no_ending.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/no_header.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/no_plan.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/ok_obj.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/output.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/plan.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/plan_is_noplan.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/plan_no_plan.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/plan_skip_all.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/simple.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/skip.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/skipall.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/strays.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/threads.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/todo.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/undef.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/use_ok.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/useing.t
+lib/perl5/%%PERL_VER%%/Test/Tutorial.pod
+lib/perl5/%%PERL_VER%%/Test/t/fail.t
+lib/perl5/%%PERL_VER%%/Test/t/mix.t
+lib/perl5/%%PERL_VER%%/Test/t/onfail.t
+lib/perl5/%%PERL_VER%%/Test/t/qr.t
+lib/perl5/%%PERL_VER%%/Test/t/skip.t
+lib/perl5/%%PERL_VER%%/Test/t/success.t
+lib/perl5/%%PERL_VER%%/Test/t/todo.t
+lib/perl5/%%PERL_VER%%/Text/Abbrev.pm
+lib/perl5/%%PERL_VER%%/Text/ParseWords.pm
+lib/perl5/%%PERL_VER%%/Text/Soundex.pm
+lib/perl5/%%PERL_VER%%/Text/Tabs.pm
+lib/perl5/%%PERL_VER%%/Text/Wrap.pm
+lib/perl5/%%PERL_VER%%/Tie/Array.pm
+lib/perl5/%%PERL_VER%%/Tie/Handle.pm
+lib/perl5/%%PERL_VER%%/Tie/Hash.pm
+lib/perl5/%%PERL_VER%%/Tie/RefHash.pm
+lib/perl5/%%PERL_VER%%/Tie/Scalar.pm
+lib/perl5/%%PERL_VER%%/Tie/SubstrHash.pm
+lib/perl5/%%PERL_VER%%/Time/Local.pm
+lib/perl5/%%PERL_VER%%/Time/gmtime.pm
+lib/perl5/%%PERL_VER%%/Time/localtime.pm
+lib/perl5/%%PERL_VER%%/Time/tm.pm
+lib/perl5/%%PERL_VER%%/UNIVERSAL.pm
+lib/perl5/%%PERL_VER%%/User/grent.pm
+lib/perl5/%%PERL_VER%%/User/pwent.pm
+lib/perl5/%%PERL_VER%%/Win32.pod
+lib/perl5/%%PERL_VER%%/abbrev.pl
+lib/perl5/%%PERL_VER%%/assert.pl
+lib/perl5/%%PERL_VER%%/attributes.pm
+lib/perl5/%%PERL_VER%%/auto/Getopt/Long/Configure.al
+lib/perl5/%%PERL_VER%%/auto/Getopt/Long/Croak.al
+lib/perl5/%%PERL_VER%%/auto/Getopt/Long/FindOption.al
+lib/perl5/%%PERL_VER%%/auto/Getopt/Long/GetOptions.al
+lib/perl5/%%PERL_VER%%/auto/Getopt/Long/autosplit.ix
+lib/perl5/%%PERL_VER%%/auto/Getopt/Long/config.al
+lib/perl5/%%PERL_VER%%/autouse.pm
+lib/perl5/%%PERL_VER%%/base.pm
+lib/perl5/%%PERL_VER%%/bigfloat.pl
+lib/perl5/%%PERL_VER%%/bigint.pl
+lib/perl5/%%PERL_VER%%/bigrat.pl
+lib/perl5/%%PERL_VER%%/blib.pm
+lib/perl5/%%PERL_VER%%/bytes.pm
+lib/perl5/%%PERL_VER%%/bytes_heavy.pl
+lib/perl5/%%PERL_VER%%/cacheout.pl
+lib/perl5/%%PERL_VER%%/charnames.pm
+lib/perl5/%%PERL_VER%%/chat2.pl
+lib/perl5/%%PERL_VER%%/complete.pl
+lib/perl5/%%PERL_VER%%/constant.pm
+lib/perl5/%%PERL_VER%%/ctime.pl
+lib/perl5/%%PERL_VER%%/diagnostics.pm
+lib/perl5/%%PERL_VER%%/dotsh.pl
+lib/perl5/%%PERL_VER%%/dumpvar.pl
+lib/perl5/%%PERL_VER%%/exceptions.pl
+lib/perl5/%%PERL_VER%%/fastcwd.pl
+lib/perl5/%%PERL_VER%%/fields.pm
+lib/perl5/%%PERL_VER%%/filetest.pm
+lib/perl5/%%PERL_VER%%/find.pl
+lib/perl5/%%PERL_VER%%/finddepth.pl
+lib/perl5/%%PERL_VER%%/flush.pl
+lib/perl5/%%PERL_VER%%/ftp.pl
+lib/perl5/%%PERL_VER%%/getcwd.pl
+lib/perl5/%%PERL_VER%%/getopt.pl
+lib/perl5/%%PERL_VER%%/getopts.pl
+lib/perl5/%%PERL_VER%%/hostname.pl
+lib/perl5/%%PERL_VER%%/if.pm
+lib/perl5/%%PERL_VER%%/if.t
+lib/perl5/%%PERL_VER%%/importenv.pl
+lib/perl5/%%PERL_VER%%/integer.pm
+lib/perl5/%%PERL_VER%%/less.pm
+lib/perl5/%%PERL_VER%%/lib.pm
+lib/perl5/%%PERL_VER%%/locale.pm
+lib/perl5/%%PERL_VER%%/look.pl
+lib/perl5/%%PERL_VER%%/mach/CORE/libperl.so
 lib/perl5/%%PERL_VER%%/newgetopt.pl
 lib/perl5/%%PERL_VER%%/open.pm
 lib/perl5/%%PERL_VER%%/open2.pl
@@ -898,12 +1030,10 @@ lib/perl5/%%PERL_VER%%/validate.pl
 lib/perl5/%%PERL_VER%%/vars.pm
 lib/perl5/%%PERL_VER%%/warnings.pm
 lib/perl5/%%PERL_VER%%/warnings/register.pm
+@dirrm lib/perl5/%%PERL_VER%%/BSDPAN/BSDPAN
+@dirrm lib/perl5/%%PERL_VER%%/BSDPAN/ExtUtils
+@dirrm lib/perl5/%%PERL_VER%%/BSDPAN
 @unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
 %%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
@@ -940,6 +1070,13 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO/Socket 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO 2>/dev/null || true
@@ -956,7 +1093,12 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Time 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Tie 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test 2>/dev/null || true
+@dirrm lib/perl5/%%PERL_VER%%/Test/Simple/t
+@dirrm lib/perl5/%%PERL_VER%%/Test/Simple
+@dirrm lib/perl5/%%PERL_VER%%/Test/t
+@dirrm lib/perl5/%%PERL_VER%%/Test/Harness/t
+@dirrm lib/perl5/%%PERL_VER%%/Test/Harness
+@dirrm lib/perl5/%%PERL_VER%%/Test
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Search 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Text 2>/dev/null || true
@@ -966,9 +1108,16 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/IPC 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File/Spec 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils 2>/dev/null || true
+@dirrm lib/perl5/%%PERL_VER%%/File/Temp/t
+@dirrm lib/perl5/%%PERL_VER%%/File/Temp
+@dirrm lib/perl5/%%PERL_VER%%/File/Spec/t
+@dirrm lib/perl5/%%PERL_VER%%/File/Spec
+@dirrm lib/perl5/%%PERL_VER%%/File
+@dirrm lib/perl5/%%PERL_VER%%/ExtUtils/t
+@dirrm lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker
+@dirrm lib/perl5/%%PERL_VER%%/ExtUtils/Liblist
+@dirrm lib/perl5/%%PERL_VER%%/ExtUtils/Command
+@dirrm lib/perl5/%%PERL_VER%%/ExtUtils
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
@@ -976,10 +1125,10 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Carp 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/CPAN 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/pod 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man/man3 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/BSDPAN/BSDPAN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/BSDPAN/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/BSDPAN 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
 @unexec rmdir %D/lib/perl5 2>/dev/null || true
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 2b1ab97b1f60..e73677c2a5b4 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -7,19 +7,19 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	15
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
-		${MASTER_SITE_LOCAL:S/$/:local/}
+		${MASTER_SITE_LOCAL:S/$/:local/} \
+		http://www.tobez.org/download/port-mirrors/lang/perl56/:local
 MASTER_SITE_SUBDIR=	../../src \
-			tobez/:local
+			tobez/:local ./:local
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		BSDPAN-${PORTVERSION}_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
+		BSDPAN-${PERL_VER}${EXTRACT_SUFX}:local
 
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Practical Extraction and Report Language
 
-PERL_VER=	5.6.1
+PERL_VER=	5.6.2
 PERL_ARCH=	mach
 PERL_VERSION=	${PERL_VER}
 
@@ -28,13 +28,26 @@ CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
 	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
-	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
-	-Dsitearch=${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
-	-Dsitelib=${PREFIX}/lib/perl5/site_perl/${PERL_VER} \
-	-Dscriptdir=${PREFIX}/bin \
-	-Dcc="${CC}" \
-	-Ui_malloc -Ui_iconv -Dccflags=-DAPPLLIB_EXP=\"${BSDPAN_DEST}\"
-INSTALLS_SHLIB=	yes
+	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \
+	-Dman1dir=${PREFIX}/man/man1 \
+	-Dsitearch=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH} \
+	-Dsitelib=${PREFIX}/${SITE_PERL_REL} -Dscriptdir=${PREFIX}/bin \
+	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
+	-Dsiteman1dir=${PREFIX}/man/man1 \
+	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
+	-Dcc="${CC}" -Doptimize="${CFLAGS}" -Duseshrplib \
+	-Dccflags=-DAPPLLIB_EXP=\"${BSDPAN_DEST}\"
+
+.include "Makefile.man"
+.include <bsd.port.pre.mk>
+
+.if defined(ENABLE_SUIDPERL)
+CONFIGURE_ARGS+=	-Dd_dosuid=define
+PLIST_SUB+=		ENABLE_SUIDPERL=""
+.else
+CONFIGURE_ARGS+=	-Ud_dosuid
+PLIST_SUB+=		ENABLE_SUIDPERL="@comment "
+.endif
 
 .if defined(WITH_GDBM)
 CONFIGURE_ARGS+=	-Di_gdbm
@@ -45,137 +58,90 @@ CONFIGURE_ARGS+=	-Ui_gdbm
 PLIST_SUB+=		GDBM="@comment "
 .endif
 
+.if defined(WITHOUT_PERL_MALLOC)
+.undef WITH_PERL_MALLOC
+.else
+WITH_PERL_MALLOC=	yes
+.endif
+
+.if defined(WITH_THREADS)
+IGNORE=	Threads are not very useful in perl ${PERL_VERSION}, please use lang/perl5.8
+.endif
+
 .if defined(WITH_PERL_MALLOC)
 CONFIGURE_ARGS+=	-Dusemymalloc=y
 .else
 CONFIGURE_ARGS+=	-Dusemymalloc=n
 .endif
 
-INCLUDEDIR=	/usr/include
-
 .ifdef USE_PERL5
 .error You have `USE_PERL5' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} >= 502100
-LATEST_LINK=	perl5.6
+LATEST_LINK=	perl5.8
 .endif
 
-.if ${OSVERSION} >= 500043 && ${OSVERSION} < 502100
+.if ${OSVERSION} < 500036
+PKGMESSAGE=	${PKGDIR}/pkg-message-sysperl
+.elif ${OSVERSION} < 502100
 PKGMESSAGE=	${PKGDIR}/.not-here
+.else
+PKGMESSAGE=	${PKGDIR}/pkg-message-prefer58
+.endif
+
+.if ${OSVERSION} >= 500036 && ${OSVERSION} < 502100
+PLIST_SUB+=		NEED_USE_PERL="@comment "
+.else
+PLIST_SUB+=		NEED_USE_PERL=""
 .endif
 
-MAN1=	a2p.1 c2ph.1 dprofpp.1 find2perl.1 h2ph.1 h2xs.1 perl.1 \
-	perl5004delta.1 perl5005delta.1 perlaix.1 perlamiga.1 \
-	perlapi.1 perlapio.1 perlbook.1 perlboot.1 perlbot.1 \
-	perlbs2000.1 perlbug.1 perlcall.1 perlcc.1 perlclib.1 \
-	perlcompile.1 perlcygwin.1 perldata.1 perldbmfilter.1 \
-	perldebguts.1 perldebtut.1 perldebug.1 perldelta.1 perldiag.1 \
-	perldoc.1 perldos.1 perldsc.1 perlebcdic.1 perlembed.1 \
-	perlepoc.1 perlfaq.1 perlfaq1.1 perlfaq2.1 perlfaq3.1 \
-	perlfaq4.1 perlfaq5.1 perlfaq6.1 perlfaq7.1 perlfaq8.1 \
-	perlfaq9.1 perlfilter.1 perlfork.1 perlform.1 perlfunc.1 \
-	perlguts.1 perlhack.1 perlhist.1 perlhpux.1 perlintern.1 \
-	perlipc.1 perllexwarn.1 perllocale.1 perllol.1 perlmachten.1 \
-	perlmacos.1 perlmod.1 perlmodinstall.1 perlmodlib.1 \
-	perlmpeix.1 perlnewmod.1 perlnumber.1 perlobj.1 perlop.1 \
-	perlopentut.1 perlos2.1 perlos390.1 perlpod.1 perlport.1 \
-	perlre.1 perlref.1 perlreftut.1 perlrequick.1 perlretut.1 \
-	perlrun.1 perlsec.1 perlsolaris.1 perlstyle.1 perlsub.1 \
-	perlsyn.1 perlthrtut.1 perltie.1 perltoc.1 perltodo.1 \
-	perltoot.1 perltootc.1 perltrap.1 perlunicode.1 perlutil.1 \
-	perlvar.1 perlvmesa.1 perlvms.1 perlvos.1 perlwin32.1 \
-	perlxs.1 perlxstut.1 pl2pm.1 pod2html.1 pod2man.1 pod2text.1 \
-	pod2usage.1 podchecker.1 podselect.1 pstruct.1 s2p.1 \
-	splain.1 xsubpp.1
-
-MAN3=	AnyDBM_File.3 AutoLoader.3 AutoSplit.3 B.3 B::Asmdata.3 \
-	B::Assembler.3 B::Bblock.3 B::Bytecode.3 B::C.3 B::CC.3 \
-	B::Concise.3 B::Debug.3 B::Deparse.3 B::Disassembler.3 \
-	B::Lint.3 B::Showlex.3 B::Stackobj.3 B::Stash.3 B::Terse.3 \
-	B::Xref.3 Benchmark.3 ByteLoader.3 CGI.3 CGI::Apache.3 \
-	CGI::Carp.3 CGI::Cookie.3 CGI::Fast.3 CGI::Pretty.3 \
-	CGI::Push.3 CGI::Switch.3 CGI::Util.3 CPAN.3 CPAN::FirstTime.3 \
-	CPAN::Nox.3 Carp.3 Carp::Heavy.3 Class::Struct.3 Config.3 \
-	Cwd.3 DB.3 DB_File.3 Data::Dumper.3 Devel::DProf.3 \
-	Devel::Peek.3 Devel::SelfStubber.3 DirHandle.3 Dumpvalue.3 \
-	DynaLoader.3 English.3 Env.3 Errno.3 Exporter.3 \
-	Exporter::Heavy.3 ExtUtils::Command.3 ExtUtils::Embed.3 \
-	ExtUtils::Install.3 ExtUtils::Installed.3 ExtUtils::Liblist.3 \
-	ExtUtils::MM_Cygwin.3 ExtUtils::MM_OS2.3 ExtUtils::MM_Unix.3 \
-	ExtUtils::MM_VMS.3 ExtUtils::MM_Win32.3 ExtUtils::MakeMaker.3 \
-	ExtUtils::Manifest.3 ExtUtils::Miniperl.3 ExtUtils::Mkbootstrap.3 \
-	ExtUtils::Mksymlists.3 ExtUtils::Packlist.3 ExtUtils::testlib.3 \
-	Fatal.3 Fcntl.3 File::Basename.3 File::CheckTree.3 \
-	File::Compare.3 File::Copy.3 File::DosGlob.3 File::Find.3 \
-	File::Glob.3 File::Path.3 File::Spec.3 File::Spec::Epoc.3 \
-	File::Spec::Functions.3 File::Spec::Mac.3 File::Spec::OS2.3 \
-	File::Spec::Unix.3 File::Spec::VMS.3 File::Spec::Win32.3 \
-	File::Temp.3 File::stat.3 FileCache.3 FileHandle.3 FindBin.3 \
-	Getopt::Long.3 Getopt::Std.3 I18N::Collate.3 \
-	IO.3 IO::Dir.3 IO::File.3 IO::Handle.3 IO::Pipe.3 IO::Poll.3 \
-	IO::Seekable.3 IO::Select.3 IO::Socket.3 IO::Socket::INET.3 \
-	IO::Socket::UNIX.3 IPC::Msg.3 IPC::Open2.3 IPC::Open3.3 \
-	IPC::Semaphore.3 IPC::SysV.3 Math::BigFloat.3 Math::BigInt.3 \
-	Math::Complex.3 Math::Trig.3 NDBM_File.3 Net::Ping.3 \
-	Net::hostent.3 Net::netent.3 Net::protoent.3 Net::servent.3 \
-	O.3 Opcode.3 POSIX.3 Pod::Checker.3 Pod::Find.3 Pod::Html.3 \
-	Pod::InputObjects.3 Pod::LaTeX.3 Pod::Man.3 Pod::ParseUtils.3 \
-	Pod::Parser.3 Pod::Plainer.3 Pod::Select.3 Pod::Text.3 \
-	Pod::Text::Color.3 Pod::Text::Overstrike.3 Pod::Text::Termcap.3 \
-	Pod::Usage.3 SDBM_File.3 Safe.3 Search::Dict.3 SelectSaver.3 \
-	SelfLoader.3 Shell.3 Socket.3 Symbol.3 Sys::Hostname.3 \
-	Sys::Syslog.3 Term::ANSIColor.3 Term::Cap.3 Term::Complete.3 \
-	Term::ReadLine.3 Test.3 Test::Harness.3 Text::Abbrev.3 \
-	Text::ParseWords.3 Text::Soundex.3 Text::Tabs.3 Text::Wrap.3 \
-	Tie::Array.3 Tie::Handle.3 Tie::Hash.3 Tie::RefHash.3 \
-	Tie::Scalar.3 Tie::SubstrHash.3 Time::Local.3 Time::gmtime.3 \
-	Time::localtime.3 Time::tm.3 UNIVERSAL.3 User::grent.3 \
-	User::pwent.3 Win32.3 XSLoader.3 attributes.3 attrs.3 \
-	autouse.3 base.3 blib.3 bytes.3 charnames.3 constant.3 \
-	diagnostics.3 fields.3 filetest.3 integer.3 less.3 lib.3 \
-	locale.3 open.3 ops.3 overload.3 re.3 sigtrap.3 strict.3 \
-	subs.3 utf8.3 vars.3 warnings.3 warnings::register.3
 .if defined(WITH_GDBM)
 MAN3+=	GDBM_File.3
 .endif
-
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
 
 test:
 	@(cd ${WRKSRC}; make test)
 
 BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VER}/BSDPAN
 BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
-		ExtUtils/MM_Unix.pm ExtUtils/Packlist.pm
+		ExtUtils/MM_Unix.pm \
+		ExtUtils/MakeMaker.pm \
+		ExtUtils/Packlist.pm
 BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-${PORTVERSION}
-BSDPAN_REVISION=1
+
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 post-patch:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
 		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
 		-e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \
+		-e 's|%%MAKE_CONF%%|${__MAKE_CONF}|g;' \
 		${FILESDIR}/use.perl \
 		> ${WRKDIR}/use.perl
+	${CP} ${WRKDIR}/use.perl ${PKGINSTALL}
+	${CP} ${WRKDIR}/use.perl ${PKGDEINSTALL}
+
+pre-install:
+	@${RM} -f ${PREFIX}/bin/perl${PERL_VER}
+	@${RM} -f ${PREFIX}/bin/perl
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/perl ${PREFIX}/bin/suidperl
-	@${LN} -sf ${PREFIX}/bin/perl ${PREFIX}/bin/perl5
-	@${LN} -sf ${PREFIX}/bin/perl ${PREFIX}/bin/perl${PERL_VER}
-	${INSTALL_SCRIPT} ${WRKDIR}/use.perl ${PREFIX}/bin/use.perl
+	@${STRIP_CMD} ${PREFIX}/bin/perl${PERL_VER}
+	@${STRIP_CMD} ${PREFIX}/bin/perl
+	@${LN} -sf ${PREFIX}/bin/perl${PERL_VER} ${PREFIX}/bin/perl5
 .for file in ${BSDPAN_FILES}
 	${MKDIR} ${BSDPAN_DEST}/${file:H}
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
 		${BSDPAN_WRKSRC}/${file} ${BSDPAN_DEST}/${file}
 .endfor
-	@(cd ${INCLUDEDIR} && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h)
-.if ${OSVERSION} < 500043 || ${OSVERSION} > 502100
+	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.if ${OSVERSION} < 500036 || ${OSVERSION} >= 502100
+	${INSTALL_SCRIPT} ${WRKDIR}/use.perl ${PREFIX}/bin/use.perl
 	@fmt ${PKGMESSAGE}
-.else
-	@${PREFIX}/bin/use.perl port
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/perl5/Makefile.man b/lang/perl5/Makefile.man
new file mode 100644
index 000000000000..af08e5e6fe8c
--- /dev/null
+++ b/lang/perl5/Makefile.man
@@ -0,0 +1,341 @@
+# $FreeBSD$
+
+MAN1+=	a2p.1
+MAN1+=	c2ph.1
+MAN1+=	dprofpp.1
+MAN1+=	find2perl.1
+MAN1+=	h2ph.1
+MAN1+=	h2xs.1
+MAN1+=	perl.1
+MAN1+=	perl5004delta.1
+MAN1+=	perl5005delta.1
+MAN1+=	perlaix.1
+MAN1+=	perlamiga.1
+MAN1+=	perlapi.1
+MAN1+=	perlapio.1
+MAN1+=	perlbook.1
+MAN1+=	perlboot.1
+MAN1+=	perlbot.1
+MAN1+=	perlbs2000.1
+MAN1+=	perlbug.1
+MAN1+=	perlcall.1
+MAN1+=	perlcc.1
+MAN1+=	perlclib.1
+MAN1+=	perlcompile.1
+MAN1+=	perlcygwin.1
+MAN1+=	perldata.1
+MAN1+=	perldbmfilter.1
+MAN1+=	perldebguts.1
+MAN1+=	perldebtut.1
+MAN1+=	perldebug.1
+MAN1+=	perldelta.1
+MAN1+=	perldiag.1
+MAN1+=	perldoc.1
+MAN1+=	perldos.1
+MAN1+=	perldsc.1
+MAN1+=	perlebcdic.1
+MAN1+=	perlembed.1
+MAN1+=	perlepoc.1
+MAN1+=	perlfaq.1
+MAN1+=	perlfaq1.1
+MAN1+=	perlfaq2.1
+MAN1+=	perlfaq3.1
+MAN1+=	perlfaq4.1
+MAN1+=	perlfaq5.1
+MAN1+=	perlfaq6.1
+MAN1+=	perlfaq7.1
+MAN1+=	perlfaq8.1
+MAN1+=	perlfaq9.1
+MAN1+=	perlfilter.1
+MAN1+=	perlfork.1
+MAN1+=	perlform.1
+MAN1+=	perlfunc.1
+MAN1+=	perlguts.1
+MAN1+=	perlhack.1
+MAN1+=	perlhist.1
+MAN1+=	perlhpux.1
+MAN1+=	perlintern.1
+MAN1+=	perlipc.1
+MAN1+=	perllexwarn.1
+MAN1+=	perllocale.1
+MAN1+=	perllol.1
+MAN1+=	perlmachten.1
+MAN1+=	perlmacos.1
+MAN1+=	perlmod.1
+MAN1+=	perlmodinstall.1
+MAN1+=	perlmodlib.1
+MAN1+=	perlmpeix.1
+MAN1+=	perlnewmod.1
+MAN1+=	perlnumber.1
+MAN1+=	perlobj.1
+MAN1+=	perlop.1
+MAN1+=	perlopentut.1
+MAN1+=	perlos2.1
+MAN1+=	perlos390.1
+MAN1+=	perlpod.1
+MAN1+=	perlport.1
+MAN1+=	perlre.1
+MAN1+=	perlref.1
+MAN1+=	perlreftut.1
+MAN1+=	perlrequick.1
+MAN1+=	perlretut.1
+MAN1+=	perlrun.1
+MAN1+=	perlsec.1
+MAN1+=	perlsolaris.1
+MAN1+=	perlstyle.1
+MAN1+=	perlsub.1
+MAN1+=	perlsyn.1
+MAN1+=	perlthrtut.1
+MAN1+=	perltie.1
+MAN1+=	perltoc.1
+MAN1+=	perltodo.1
+MAN1+=	perltoot.1
+MAN1+=	perltootc.1
+MAN1+=	perltrap.1
+MAN1+=	perlunicode.1
+MAN1+=	perlutil.1
+MAN1+=	perlvar.1
+MAN1+=	perlvmesa.1
+MAN1+=	perlvms.1
+MAN1+=	perlvos.1
+MAN1+=	perlwin32.1
+MAN1+=	perlxs.1
+MAN1+=	perlxstut.1
+MAN1+=	pl2pm.1
+MAN1+=	pod2html.1
+MAN1+=	pod2man.1
+MAN1+=	pod2text.1
+MAN1+=	pod2usage.1
+MAN1+=	podchecker.1
+MAN1+=	podselect.1
+MAN1+=	pstruct.1
+MAN1+=	s2p.1
+MAN1+=	splain.1
+MAN1+=	xsubpp.1
+
+MAN3+=	AnyDBM_File.3
+MAN3+=	AutoLoader.3
+MAN3+=	AutoSplit.3
+MAN3+=	B.3
+MAN3+=	B::Asmdata.3
+MAN3+=	B::Assembler.3
+MAN3+=	B::Bblock.3
+MAN3+=	B::Bytecode.3
+MAN3+=	B::C.3
+MAN3+=	B::CC.3
+MAN3+=	B::Concise.3
+MAN3+=	B::Debug.3
+MAN3+=	B::Deparse.3
+MAN3+=	B::Disassembler.3
+MAN3+=	B::Lint.3
+MAN3+=	B::Showlex.3
+MAN3+=	B::Stackobj.3
+MAN3+=	B::Stash.3
+MAN3+=	B::Terse.3
+MAN3+=	B::Xref.3
+MAN3+=	Benchmark.3
+MAN3+=	ByteLoader.3
+MAN3+=	CGI.3
+MAN3+=	CGI::Apache.3
+MAN3+=	CGI::Carp.3
+MAN3+=	CGI::Cookie.3
+MAN3+=	CGI::Fast.3
+MAN3+=	CGI::Pretty.3
+MAN3+=	CGI::Push.3
+MAN3+=	CGI::Switch.3
+MAN3+=	CGI::Util.3
+MAN3+=	CPAN.3
+MAN3+=	CPAN::FirstTime.3
+MAN3+=	CPAN::Nox.3
+MAN3+=	Carp.3
+MAN3+=	Carp::Heavy.3
+MAN3+=	Class::Struct.3
+MAN3+=	Config.3
+MAN3+=	Cwd.3
+MAN3+=	DB.3
+MAN3+=	DB_File.3
+MAN3+=	Data::Dumper.3
+MAN3+=	Devel::DProf.3
+MAN3+=	Devel::Peek.3
+MAN3+=	Devel::SelfStubber.3
+MAN3+=	DirHandle.3
+MAN3+=	Dumpvalue.3
+MAN3+=	DynaLoader.3
+MAN3+=	English.3
+MAN3+=	Env.3
+MAN3+=	Errno.3
+MAN3+=	Exporter.3
+MAN3+=	Exporter::Heavy.3
+MAN3+=	ExtUtils::Command.3
+MAN3+=	ExtUtils::Command::MM.3
+MAN3+=	ExtUtils::Embed.3
+MAN3+=	ExtUtils::Install.3
+MAN3+=	ExtUtils::Installed.3
+MAN3+=	ExtUtils::Liblist.3
+MAN3+=	ExtUtils::Liblist::Kid.3
+MAN3+=	ExtUtils::MM.3
+MAN3+=	ExtUtils::MM_Any.3
+MAN3+=	ExtUtils::MM_BeOS.3
+MAN3+=	ExtUtils::MM_Cygwin.3
+MAN3+=	ExtUtils::MM_DOS.3
+MAN3+=	ExtUtils::MM_MacOS.3
+MAN3+=	ExtUtils::MM_NW5.3
+MAN3+=	ExtUtils::MM_OS2.3
+MAN3+=	ExtUtils::MM_UWIN.3
+MAN3+=	ExtUtils::MM_Unix.3
+MAN3+=	ExtUtils::MM_VMS.3
+MAN3+=	ExtUtils::MM_Win32.3
+MAN3+=	ExtUtils::MM_Win95.3
+MAN3+=	ExtUtils::MY.3
+MAN3+=	ExtUtils::MakeMaker.3
+MAN3+=	ExtUtils::MakeMaker::FAQ.3
+MAN3+=	ExtUtils::MakeMaker::Tutorial.3
+MAN3+=	ExtUtils::MakeMaker::bytes.3
+MAN3+=	ExtUtils::MakeMaker::vmsish.3
+MAN3+=	ExtUtils::Manifest.3
+MAN3+=	ExtUtils::Miniperl.3
+MAN3+=	ExtUtils::Mkbootstrap.3
+MAN3+=	ExtUtils::Mksymlists.3
+MAN3+=	ExtUtils::Packlist.3
+MAN3+=	ExtUtils::testlib.3
+MAN3+=	Fatal.3
+MAN3+=	Fcntl.3
+MAN3+=	File::Basename.3
+MAN3+=	File::CheckTree.3
+MAN3+=	File::Compare.3
+MAN3+=	File::Copy.3
+MAN3+=	File::DosGlob.3
+MAN3+=	File::Find.3
+MAN3+=	File::Glob.3
+MAN3+=	File::Path.3
+MAN3+=	File::Spec.3
+MAN3+=	File::Spec::Cygwin.3
+MAN3+=	File::Spec::Epoc.3
+MAN3+=	File::Spec::Functions.3
+MAN3+=	File::Spec::Mac.3
+MAN3+=	File::Spec::OS2.3
+MAN3+=	File::Spec::Unix.3
+MAN3+=	File::Spec::VMS.3
+MAN3+=	File::Spec::Win32.3
+MAN3+=	File::Temp.3
+MAN3+=	File::stat.3
+MAN3+=	FileCache.3
+MAN3+=	FileHandle.3
+MAN3+=	FindBin.3
+MAN3+=	Getopt::Long.3
+MAN3+=	Getopt::Std.3
+MAN3+=	I18N::Collate.3
+MAN3+=	IO.3
+MAN3+=	IO::Dir.3
+MAN3+=	IO::File.3
+MAN3+=	IO::Handle.3
+MAN3+=	IO::Pipe.3
+MAN3+=	IO::Poll.3
+MAN3+=	IO::Seekable.3
+MAN3+=	IO::Select.3
+MAN3+=	IO::Socket.3
+MAN3+=	IO::Socket::INET.3
+MAN3+=	IO::Socket::UNIX.3
+MAN3+=	IPC::Msg.3
+MAN3+=	IPC::Open2.3
+MAN3+=	IPC::Open3.3
+MAN3+=	IPC::Semaphore.3
+MAN3+=	IPC::SysV.3
+MAN3+=	Math::BigFloat.3
+MAN3+=	Math::BigInt.3
+MAN3+=	Math::Complex.3
+MAN3+=	Math::Trig.3
+MAN3+=	NDBM_File.3
+MAN3+=	Net::Ping.3
+MAN3+=	Net::hostent.3
+MAN3+=	Net::netent.3
+MAN3+=	Net::protoent.3
+MAN3+=	Net::servent.3
+MAN3+=	O.3
+MAN3+=	Opcode.3
+MAN3+=	POSIX.3
+MAN3+=	Pod::Checker.3
+MAN3+=	Pod::Find.3
+MAN3+=	Pod::Html.3
+MAN3+=	Pod::InputObjects.3
+MAN3+=	Pod::LaTeX.3
+MAN3+=	Pod::Man.3
+MAN3+=	Pod::ParseUtils.3
+MAN3+=	Pod::Parser.3
+MAN3+=	Pod::Plainer.3
+MAN3+=	Pod::Select.3
+MAN3+=	Pod::Text.3
+MAN3+=	Pod::Text::Color.3
+MAN3+=	Pod::Text::Overstrike.3
+MAN3+=	Pod::Text::Termcap.3
+MAN3+=	Pod::Usage.3
+MAN3+=	SDBM_File.3
+MAN3+=	Safe.3
+MAN3+=	Search::Dict.3
+MAN3+=	SelectSaver.3
+MAN3+=	SelfLoader.3
+MAN3+=	Shell.3
+MAN3+=	Socket.3
+MAN3+=	Symbol.3
+MAN3+=	Sys::Hostname.3
+MAN3+=	Sys::Syslog.3
+MAN3+=	Term::ANSIColor.3
+MAN3+=	Term::Cap.3
+MAN3+=	Term::Complete.3
+MAN3+=	Term::ReadLine.3
+MAN3+=	Test.3
+MAN3+=	Test::Builder.3
+MAN3+=	Test::Harness.3
+MAN3+=	Test::Harness::Assert.3
+MAN3+=	Test::Harness::Iterator.3
+MAN3+=	Test::Harness::Straps.3
+MAN3+=	Test::More.3
+MAN3+=	Test::Simple.3
+MAN3+=	Test::Tutorial.3
+MAN3+=	Text::Abbrev.3
+MAN3+=	Text::ParseWords.3
+MAN3+=	Text::Soundex.3
+MAN3+=	Text::Tabs.3
+MAN3+=	Text::Wrap.3
+MAN3+=	Tie::Array.3
+MAN3+=	Tie::Handle.3
+MAN3+=	Tie::Hash.3
+MAN3+=	Tie::RefHash.3
+MAN3+=	Tie::Scalar.3
+MAN3+=	Tie::SubstrHash.3
+MAN3+=	Time::Local.3
+MAN3+=	Time::gmtime.3
+MAN3+=	Time::localtime.3
+MAN3+=	Time::tm.3
+MAN3+=	UNIVERSAL.3
+MAN3+=	User::grent.3
+MAN3+=	User::pwent.3
+MAN3+=	Win32.3
+MAN3+=	XSLoader.3
+MAN3+=	attributes.3
+MAN3+=	attrs.3
+MAN3+=	autouse.3
+MAN3+=	base.3
+MAN3+=	blib.3
+MAN3+=	bytes.3
+MAN3+=	charnames.3
+MAN3+=	constant.3
+MAN3+=	diagnostics.3
+MAN3+=	fields.3
+MAN3+=	filetest.3
+MAN3+=	if.3
+MAN3+=	integer.3
+MAN3+=	less.3
+MAN3+=	lib.3
+MAN3+=	locale.3
+MAN3+=	open.3
+MAN3+=	ops.3
+MAN3+=	overload.3
+MAN3+=	re.3
+MAN3+=	sigtrap.3
+MAN3+=	strict.3
+MAN3+=	subs.3
+MAN3+=	utf8.3
+MAN3+=	vars.3
+MAN3+=	warnings.3
+MAN3+=	warnings::register.3
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index 7d166da9df3a..989e964c4f17 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,4 +1,4 @@
-MD5 (perl-5.6.1.tar.gz) = ec1ff15464809b562aecfaa2e65edba6
-SIZE (perl-5.6.1.tar.gz) = 5983695
-MD5 (BSDPAN-5.6.1_1.tar.gz) = 7b15f1dc2df28d07276d9363ebe703f3
-SIZE (BSDPAN-5.6.1_1.tar.gz) = 6233
+MD5 (perl-5.6.2.tar.gz) = 6aa648d086ecda5400de3472dbe1ebfe
+SIZE (perl-5.6.2.tar.gz) = 6255479
+MD5 (BSDPAN-5.6.2.tar.gz) = 3edde9aaefa11d8396700e42e99f2f36
+SIZE (BSDPAN-5.6.2.tar.gz) = 8451
diff --git a/lang/perl5/files/patch-Install.pm b/lang/perl5/files/patch-Install.pm
index bbd42019def6..228b24a1088a 100644
--- a/lang/perl5/files/patch-Install.pm
+++ b/lang/perl5/files/patch-Install.pm
@@ -11,12 +11,3 @@ $FreeBSD$
  		if (-f $targetfile){
  		    forceunlink($targetfile) unless $nonono;
  		} else {
-@@ -156,7 +156,7 @@
- 	    } else {
- 		inc_uninstall($_,$File::Find::dir,$verbose,0); # nonono set to 0
- 	    }
--	    $packlist->{$origfile}++;
-+	    $packlist->{$targetfile}++;
- 
- 	}, ".");
- 	chdir($cwd) or Carp::croak("Couldn't chdir to $cwd: $!");
diff --git a/lang/perl5/files/patch-POSIX.xs b/lang/perl5/files/patch-POSIX.xs
new file mode 100644
index 000000000000..7a3caa960822
--- /dev/null
+++ b/lang/perl5/files/patch-POSIX.xs
@@ -0,0 +1,19 @@
+--- ext/POSIX/POSIX.xs.orig	Tue Feb  1 11:55:24 2005
++++ ext/POSIX/POSIX.xs	Tue Feb  1 11:56:43 2005
+@@ -3860,6 +3860,16 @@
+ 	    mytm.tm_yday = yday;
+ 	    mytm.tm_isdst = isdst;
+ 	    mini_mktime(&mytm);
++ /* use libc to normalize the thing -- @@@ -- FreeBSD PR 74042, perl bug 18238 */
++ {
++ struct tm mytm2;
++ time_t t;
++ mytm2 = mytm;
++ t = mktime(&mytm2);
++ mytm2 = *localtime(&t);
++ mytm.tm_gmtoff = mytm2.tm_gmtoff;
++ mytm.tm_zone = mytm2.tm_zone;
++ }
+ 	    len = strftime(tmpbuf, sizeof tmpbuf, fmt, &mytm);
+ 	    /*
+ 	    ** The following is needed to handle to the situation where 
diff --git a/lang/perl5/files/patch-Path.pm b/lang/perl5/files/patch-Path.pm
new file mode 100644
index 000000000000..2735b0f6a648
--- /dev/null
+++ b/lang/perl5/files/patch-Path.pm
@@ -0,0 +1,30 @@
+$FreeBSD$
+--- lib/File/Path.pm.orig	Sat Jan 29 20:23:40 2005
++++ lib/File/Path.pm	Sat Jan 29 20:24:56 2005
+@@ -196,7 +196,7 @@ sub rmtree {
+ 	    # it's also intended to change it to writable in case we have
+ 	    # to recurse in which case we are better than rm -rf for 
+ 	    # subtrees with strange permissions
+-	    chmod(0777, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
++	    chmod(0700, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
+ 	      or carp "Can't make directory $root read+writeable: $!"
+ 		unless $safe;
+ 
+@@ -230,7 +230,7 @@ sub rmtree {
+ 		print "skipped $root\n" if $verbose;
+ 		next;
+ 	    }
+-	    chmod 0777, $root
++	    chmod 0700, $root
+ 	      or carp "Can't make directory $root writeable: $!"
+ 		if $force_writeable;
+ 	    print "rmdir $root\n" if $verbose;
+@@ -252,7 +252,7 @@ sub rmtree {
+ 		print "skipped $root\n" if $verbose;
+ 		next;
+ 	    }
+-	    chmod 0666, $root
++	    chmod 0600, $root
+ 	      or carp "Can't make file $root writeable: $!"
+ 		if $force_writeable;
+ 	    print "unlink $root\n" if $verbose;
diff --git a/lang/perl5/files/patch-Safe.pm b/lang/perl5/files/patch-Safe.pm
deleted file mode 100644
index 142b03ca4fba..000000000000
--- a/lang/perl5/files/patch-Safe.pm
+++ /dev/null
@@ -1,20 +0,0 @@
---- ext/Opcode/Safe.pm.orig	Fri Feb 23 03:57:54 2001
-+++ ext/Opcode/Safe.pm	Mon Apr 21 16:24:39 2003
-@@ -213,7 +213,7 @@ sub reval {
-     # Create anon sub ref in root of compartment.
-     # Uses a closure (on $expr) to pass in the code to be executed.
-     # (eval on one line to keep line numbers as expected by caller)
--	my $evalcode = sprintf('package %s; sub { eval $expr; }', $root);
-+	my $evalcode = sprintf('package %s; sub { @_ = (); eval $expr; }', $root);
-     my $evalsub;
- 
- 	if ($strict) { use strict; $evalsub = eval $evalcode; }
-@@ -227,7 +227,7 @@ sub rdo {
-     my $root = $obj->{Root};
- 
-     my $evalsub = eval
--	    sprintf('package %s; sub { do $file }', $root);
-+	    sprintf('package %s; sub { @_ = (); do $file }', $root);
-     return Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub);
- }
- 
diff --git a/lang/perl5/files/patch-ac b/lang/perl5/files/patch-ac
deleted file mode 100644
index 41b4b73fb67a..000000000000
--- a/lang/perl5/files/patch-ac
+++ /dev/null
@@ -1,35 +0,0 @@
-$FreeBSD$
-
---- hints/freebsd.sh.orig	Sun Jul 28 09:37:51 2002
-+++ hints/freebsd.sh	Sun Jul 28 09:39:23 2002
-@@ -85,10 +85,20 @@
- 	d_setreuid='define'
- 	d_setegid='undef'
- 	d_seteuid='undef'
-+	d_dosuid='define'
- 	;;
- *)	usevfork='true'
--	usemymalloc='n'
-+	case "$usemymalloc" in
-+	    "") usemymalloc='n'
-+	    ;;
-+	esac
- 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
-+ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
-+	d_setregid='define'
-+	d_setreuid='define'
-+	d_setegid='undef'
-+	d_seteuid='undef'
-+	d_dosuid='define'
- 	;;
- esac
- 
-@@ -115,7 +125,8 @@
-             fi
-             lddlflags='-Bshareable'
-         fi
--        cccdlflags='-DPIC -fpic'
-+        cccdlflags='-DPIC -fPIC'
-+        libswanted=`echo $libswanted | sed 's/ iconv / /'`
-         ;;
- esac
diff --git a/lang/perl5/files/patch-freebsd.sh b/lang/perl5/files/patch-freebsd.sh
new file mode 100644
index 000000000000..b7c1121c17ed
--- /dev/null
+++ b/lang/perl5/files/patch-freebsd.sh
@@ -0,0 +1,17 @@
+--- hints/freebsd.sh.orig	Mon Jan 31 22:08:10 2005
++++ hints/freebsd.sh	Mon Jan 31 22:10:17 2005
+@@ -101,7 +101,14 @@ case "$osvers" in
+ 	    "") usemymalloc='n'
+ 	        ;;
+ 	esac
++	d_setregid='define'
++	d_setreuid='define'
++	d_setegid='define'
++	d_seteuid='define'
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
++	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ iconv / /'`
++	libswanted=`echo $libswanted | sed 's/ dl / /'`
+ 	;;
+ esac
+ 
diff --git a/lang/perl5/files/patch-makedepend b/lang/perl5/files/patch-makedepend
deleted file mode 100644
index 39d99bc3ee42..000000000000
--- a/lang/perl5/files/patch-makedepend
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- makedepend.SH.orig	Wed May 29 19:29:05 2002
-+++ makedepend.SH	Wed May 29 19:31:31 2002
-@@ -155,6 +155,8 @@
-         $sed \
- 	    -e '1d' \
- 	    -e '/^#.*<stdin>/d' \
-+	    -e '/^#.*<built-in>/d' \
-+	    -e '/^#.*<command line>/d' \
- 	    -e '/^#.*"-"/d' \
- 	    -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
- 	    -e 's/^[	 ]*#[	 ]*line/#/' \
diff --git a/lang/perl5/files/use.perl b/lang/perl5/files/use.perl
index 0853b08da0a4..916f5f288e58 100644
--- a/lang/perl5/files/use.perl
+++ b/lang/perl5/files/use.perl
@@ -1,140 +1,264 @@
-#! %%PREFIX%%/bin/perl -w
+#!/bin/sh
+
 # $FreeBSD$
-use strict;
 
-# XXX what to do with perldoc, pelbug, perlcc ??
+this=`echo -n $0 | /usr/bin/sed -e 's!^.*/!!'`
+PERL_VERSION="%%PERL_VERSION%%"
+MAKE_CONF=%%MAKE_CONF%%
+banner=`date +"%F %T"`
+banner="# added by use.perl $banner"
+if [ -z "${OSVERSION}" ]; then
+	if [ -f /sbin/sysctl -a -x /sbin/sysctl ] ; then
+    		osreldate=`/sbin/sysctl -n kern.osreldate`
+	else
+    		osreldate=`/usr/sbin/sysctl -n kern.osreldate`
+	fi
+else
+    	osreldate=${OSVERSION}
+fi
 
-sub usage
-{
-	print STDERR <<EOF;
-Usage:
-  $0 port       -> /usr/bin/perl is the perl5 port
-  $0 system     -> /usr/bin/perl is the system perl
-EOF
-	exit 2;
-}
+if [ "x$this" = "xuse.perl" ]; then
+	PKG_PREFIX="%%PREFIX%%"
+	if [ "$1" = "port" ] ; then
+		need_remove_links=yes
+		need_create_links=yes
+		need_cleanup_make_conf=yes
+		need_cleanup_manpath=yes
+		need_spam_make_conf=yes
+		need_spam_manpath=yes
+	elif [ "$1" = "system" ] ; then
+		need_remove_links=yes
+		if [ $osreldate -lt 500036 ] ; then
+			need_base_system_perl=yes
+		fi
+		need_cleanup_make_conf=yes
+		need_cleanup_manpath=yes
+	else
+		echo 'Usage:
+	$0 port       -> /usr/bin/perl is the perl5 port
+	$0 system     -> /usr/bin/perl is the system perl'
+		exit 2;
+	fi
+else
+	if [ "$2" = "POST-INSTALL" ] ; then
+		need_remove_links=yes
+		if [ $osreldate -ge 500036 -a $osreldate -lt 502100 ] ; then
+			need_create_links=yes
+			need_cleanup_make_conf=yes
+			need_cleanup_manpath=yes
+			need_spam_make_conf=yes
+			need_spam_manpath=yes
+		fi
+		need_post_install=yes
+	elif [ "$2" = "POST-DEINSTALL" ] ; then
+		need_remove_links=yes
+		if [ $osreldate -lt 500036 ] ; then
+			need_base_system_perl=yes
+		fi
+		need_cleanup_make_conf=yes
+		need_cleanup_manpath=yes
+	else
+		exit 0;
+	fi
+fi
 
-my $port_perl = '%%PREFIX%%/bin/perl';
-$port_perl =~ tr|/|/|s;
+link_list="
+	a2p
+	c2ph
+	find2perl
+	h2ph
+	h2xs
+	perlbug
+	perlcc
+	perldoc
+	pl2pm
+	pod2html
+	pod2latex
+	pod2man
+	pod2text
+	s2p
+	splain"
+if [ $osreldate -ge 500036 ] ; then
+	link_list=""
+fi
+special_link_list="
+	perl
+	perl5
+	suidperl"
 
-@ARGV == 1 or usage();
-if ($ARGV[0] eq 'port') {
-	switch_to_port();
-} elsif ($ARGV[0] eq 'system') {
-	switch_to_system();
-} else {
-	usage();
+do_remove_links()
+{
+	echo "Removing stale symlinks from /usr/bin..."
+	for binary in $link_list $special_link_list
+	do
+		if [ -L "/usr/bin/$binary" ] ; then
+			echo "    Removing /usr/bin/$binary"
+			/bin/rm -f "/usr/bin/$binary"
+		else
+			echo "    Skipping /usr/bin/$binary"
+		fi
+	done
+	bins=`/bin/ls /usr/bin/*perl*5.* ${PKG_PREFIX}/bin/*perl*5.* 2>/dev/null`
+	for binary in $bins
+	do
+		if [ -L "$binary" ] ; then
+			echo "    Removing $binary installed by an older perl port"
+			/bin/rm -f "$binary"
+		fi
+	done
+	echo "Done."
 }
-exit 0;
-
-# Both functions depend on the idea that switch_to_port leaves
-# perl5 alone.  If the wrapper is installed on a -current system,
-# /usr/bin/perl5 will also be the wrapper.
 
-sub switch_to_system
+do_create_links()
 {
-	# protect against cases where people use PREFIX=/usr
-	if ($port_perl ne '/usr/bin/perl') {
-		unlink '/usr/bin/perl', '/usr/bin/suidperl',
-			'/usr/bin/perl%%PERL_VERSION%%';
-
-		link '/usr/bin/perl5', '/usr/bin/perl';
-		link '/usr/bin/perl5', '/usr/bin/perl%%PERL_VERSION%%';
-
-		my $ident = `/usr/bin/ident -q /usr/bin/perl5`;
-		if ($ident =~ m#src/usr.bin/perl/perl.c#) {
-			link '/usr/bin/perl5', '/usr/bin/suidperl';
-		} else {
-			link '/usr/bin/sperl5', '/usr/bin/suidperl';
-		}
-	}
-
-	open MK, ">> /etc/make.conf" or die "/etc/make.conf: $!";
-	print MK <<EOF;
-# -- use.perl generated deltas -- #
-# Created: @{[scalar localtime]}
-# Setting to use base system perl:
-.undef PERL_VER
-.undef PERL_VERSION
-.undef PERL_ARCH
-.undef NOPERL
-.undef NO_PERL
-
-EOF
-	close MK;
-
-	open MPOLD, "< /etc/manpath.config" or die "/etc/manpath.config: $!";
-	open MPNEW, "> /etc/manpath.config.new" or die "/etc/manpath.config.new: $!";
-	while (<MPOLD>) {
-		next if m|use.perl generated line|;
-		next if m|^\s*OPTIONAL_MANPATH\s+\S+/lib/perl5/%%PERL_VERSION%%/man\s*$|;
-		print MPNEW;
-	}
-	close MPNEW;
-	close MPOLD;
-	rename '/etc/manpath.config', '/etc/manpath.config.bak';
-	rename '/etc/manpath.config.new', '/etc/manpath.config';
+	echo "Creating various symlinks in /usr/bin..."
+	for binary in $link_list
+	do
+		if [ -f "/usr/bin/$binary" ] ; then
+			echo "    Backing up /usr/bin/$binary as /usr/bin/$binary.freebsd"
+			/bin/mv -f "/usr/bin/$binary" "/usr/bin/$binary.freebsd"
+		fi
+		if [ -e "/usr/bin/$binary" ] ; then
+			echo "    *** /usr/bin/$binary is still there, which should not happen"
+		elif [ -e "$PKG_PREFIX/bin/$binary" ] ; then
+			echo "    Symlinking $PKG_PREFIX/bin/$binary to /usr/bin/$binary"
+			/bin/ln -sf "$PKG_PREFIX/bin/$binary" "/usr/bin/$binary"
+		else
+			echo "    *** $PKG_PREFIX/bin/$binary is not there, a symlink won't do any good"
+		fi
+	done
+	for binary in $special_link_list
+	do
+		if [ -f "/usr/bin/$binary" ] ; then
+			echo "    Removing /usr/bin/$binary"
+		fi
+		bin=`echo $binary | /usr/bin/sed -e 's!perl5!perl!'`
+		bin=`echo $bin | /usr/bin/sed -e 's!suidperl!sperl!'`
+		if [ -e "/usr/bin/$binary.XXX" ] ; then
+			echo "    *** /usr/bin/$binary is still there, which should not happen"
+		elif [ -e "$PKG_PREFIX/bin/${bin}%%PERL_VERSION%%" ] ; then
+			echo "    Symlinking $PKG_PREFIX/bin/${bin}%%PERL_VERSION%% to /usr/bin/$binary"
+			/bin/ln -sf "$PKG_PREFIX/bin/${bin}%%PERL_VERSION%%" "/usr/bin/$binary"
+		else
+			echo "    *** $PKG_PREFIX/bin/${bin}%%PERL_VERSION%% is not there, a symlink won't do any good"
+		fi
+	done
+	echo "Done."
 }
 
-sub switch_to_port
+do_base_system_perl()
 {
-	# protect against cases where people use PREFIX=/usr
-	if ($port_perl ne '/usr/bin/perl') {
+	echo "Restoring base system perl binaries..."
+	for binary in $link_list
+	do
+		if [ -e "/usr/bin/$binary" ] ; then
+			echo "    *** /usr/bin/$binary is there, which should not happen"
+		else
+			if [ -f "/usr/bin/$binary.freebsd" ] ; then
+				echo "    Moving /usr/bin/$binary.freebsd to /usr/bin/$binary"
+				/bin/mv -f "/usr/bin/$binary.freebsd" "/usr/bin/$binary"
+			else
+				echo "    *** /usr/bin/$binary.freebsd is NOT there, nothing to restore"
+			fi
+		fi
+	done
+	for binary in $special_link_list
+	do
+		if [ -e "/usr/bin/$binary" ] ; then
+			echo "    *** /usr/bin/$binary is there, which should not happen"
+		else
+			bin=`echo $binary | /usr/bin/sed -e 's!perl5!perl!'`
+			bin=`echo $bin | /usr/bin/sed -e 's!suidperl!sperl!'`
+			bins=`/bin/ls /usr/bin/${bin}5.* 2>/dev/null | /usr/bin/sort`
+			bin=""
+			for b in $bins
+			do
+				if [ -f $b -a ! -L $b ] ; then
+					bin=$b
+				fi
+			done
+			if [ -z $bin ] ; then
+				echo "    *** cannot find what /usr/bin/$binary shall be restored FROM"
+			elif [ -f $bin ] ; then
+				echo "    Hardlinking $bin to /usr/bin/$binary"
+				ln -f "$bin" "/usr/bin/$binary"
+			else
+				echo "    *** $bin is NOT there, nothing to restore"
+			fi
+		fi
+	done
+	echo "Done."
+}
 
-		my $need_perl5_link;
-		if (-e "/usr/bin/perl5" && !-l "/usr/bin/perl5") {
-			my $ident = `/usr/bin/ident -q /usr/bin/perl5`;
-			if ($ident =~ m#src/usr.bin/perl/perl.c#) {
-				rename '/usr/bin/perl', '/usr/bin/perl-wrapper';
-			} else {
-				unlink '/usr/bin/perl';
-			}
-		} else {
-			unlink "/usr/bin/perl5";
-			$need_perl5_link = 1;
-		}
+do_post_install()
+{
+	INCLUDEDIR=/usr/include
+	install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/auto
+	install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VERSION%%/auto
+	install -d ${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/man/man3
+	cd ${INCLUDEDIR} && ${PKG_PREFIX}/bin/h2ph *.h machine/*.h sys/*.h >/dev/null
+}
 
-		unlink '/usr/bin/suidperl', '/usr/bin/perl%%PERL_VERSION%%';
+do_cleanup_make_conf()
+{
+	echo -n "Cleaning up ${MAKE_CONF}..."
+	if [ -f ${MAKE_CONF} ] ; then
+		/usr/bin/awk 's=0;
+			/^#.*use.perl/ { s=1; mode=1 }
+			/^#/ { s=1; if (mode != 1) { mode=0 } }
+			/.*PERL.*=/ { s=1; if (mode == 1) { mode=2 } }
+			/^$/ { s=1; if (mode != 2) { mode = 0 } }
+			{ if (s != 1) { mode = 0 } if (mode == 0) print }' ${MAKE_CONF} >${MAKE_CONF}.new
+		/bin/mv ${MAKE_CONF} ${MAKE_CONF}.bak
+		/bin/mv ${MAKE_CONF}.new ${MAKE_CONF}
+	fi
+	echo " Done."
+}
 
-		symlink '%%PREFIX%%/bin/perl', '/usr/bin/perl';
-		symlink '%%PREFIX%%/bin/suidperl', '/usr/bin/suidperl';
-		symlink '%%PREFIX%%/bin/perl', '/usr/bin/perl%%PERL_VERSION%%';
-		symlink '%%PREFIX%%/bin/perl', '/usr/bin/perl5' if $need_perl5_link;
-	}
+do_cleanup_manpath()
+{
+	echo -n "Cleaning up /etc/manpath.config..."
+	if [ -f /etc/manpath.config ] ; then
+		/usr/bin/awk 's=0;
+			/^#.*use.perl/ { s=1; mode=1 }
+			/^#/ { s=1; if (mode != 1) { mode=0 } }
+			/^OPTIONAL_MANPATH.*perl5/ { s=1; if (mode == 1) { mode=2 } }
+			/^$/ { s=1; if (mode != 2) { mode = 0 } }
+			{ if (s != 1) { mode = 0 } if (mode == 0) print }' /etc/manpath.config >/etc/manpath.config.new
+		/bin/mv /etc/manpath.config /etc/manpath.config.bak
+		/bin/mv /etc/manpath.config.new /etc/manpath.config
+	fi
+	echo " Done."
+}
 
-	open MK, ">> /etc/make.conf" or die "/etc/make.conf: $!";
-	print MK <<EOF;
-# -- use.perl generated deltas -- #
-# Created: @{[scalar localtime]}
-# Setting to use base perl from ports:
-PERL_VER=%%PERL_VER%%
-PERL_VERSION=%%PERL_VERSION%%
-PERL_ARCH=%%PERL_ARCH%%
-NOPERL=yo
-NO_PERL=yo
-NO_PERL_WRAPPER=yo
+do_spam_make_conf()
+{
+	echo -n "Spamming ${MAKE_CONF}..."
+	echo "$banner" >>${MAKE_CONF}
+	echo "PERL_VER=%%PERL_VER%%" >>${MAKE_CONF}
+	echo "PERL_VERSION=%%PERL_VERSION%%" >>${MAKE_CONF}
+	if [ $osreldate -lt 500036 ] ; then
+		echo "NOPERL=yes" >>${MAKE_CONF}
+	fi
+	echo " Done."
+}
 
-EOF
-	close MK;
+do_spam_manpath()
+{
+	echo -n "Spamming /etc/manpath.config..."
+	echo "$banner" >>/etc/manpath.config
+	echo "OPTIONAL_MANPATH	${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/man" >>/etc/manpath.config
+	echo "OPTIONAL_MANPATH	${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/perl/man" >>/etc/manpath.config
+	echo " Done."
+}
 
-	my $perl_port_manpath = <<EOF;
-# -- use.perl generated line -- #
-OPTIONAL_MANPATH	%%PREFIX%%/lib/perl5/%%PERL_VERSION%%/man
-EOF
+[ $need_remove_links ] && do_remove_links
+[ $need_create_links ] && do_create_links
+[ $need_base_system_perl ] && do_base_system_perl
+[ $need_post_install ] && do_post_install
+[ $need_cleanup_make_conf ] && do_cleanup_make_conf
+[ $need_spam_make_conf ] && do_spam_make_conf
+[ $need_cleanup_manpath ] && do_cleanup_manpath
+[ $need_spam_manpath ] && do_spam_manpath
 
-	open MPOLD, "< /etc/manpath.config" or die "/etc/manpath.config: $!";
-	open MPNEW, "> /etc/manpath.config.new" or die "/etc/manpath.config.new: $!";
-	my $modified = 0;
-	while (<MPOLD>) {
-		if (!$modified && m|^\s*OPTIONAL_MANPATH\s+\S+/lib/perl5/\S+/man\s*$|) {
-			print MPNEW $perl_port_manpath;
-			$modified = 1;
-		}
-		print MPNEW;
-	}
-	print MPNEW $perl_port_manpath unless $modified;
-	close MPNEW;
-	close MPOLD;
-	rename '/etc/manpath.config', '/etc/manpath.config.bak';
-	rename '/etc/manpath.config.new', '/etc/manpath.config';
-}
+exit 0
diff --git a/lang/perl5/pkg-install b/lang/perl5/pkg-install
deleted file mode 100644
index 30a44d633c5c..000000000000
--- a/lang/perl5/pkg-install
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != POST-INSTALL ] ; then
-	exit 0
-fi
-
-INCLUDEDIR=/usr/include
-
-install -d ${PKG_PREFIX}/lib/perl5/site_perl/5.6.1/mach
-cd ${INCLUDEDIR} && ${PKG_PREFIX}/bin/h2ph *.h machine/*.h sys/*.h
-
-if [ -z "${OSVERSION}" ]; then
-	if [ -f /sbin/sysctl -a -x /sbin/sysctl ] ; then
-		osreldate=`/sbin/sysctl -n kern.osreldate`
-	else
-		osreldate=`/usr/sbin/sysctl -n kern.osreldate`
-	fi
-else
-    	osreldate=${OSVERSION}
-fi
-
-if [ $osreldate -ge 500043 -a $osreldate -lt 502100 ] ; then
-	${PKG_PREFIX}/bin/use.perl port
-fi
-
-exit 0
diff --git a/lang/perl5/pkg-message-prefer58 b/lang/perl5/pkg-message-prefer58
new file mode 100644
index 000000000000..52353972dac4
--- /dev/null
+++ b/lang/perl5/pkg-message-prefer58
@@ -0,0 +1,26 @@
+Installation of Perl distribution is finished.  Please note, that since
+on this version of FreeBSD the preferred Perl port is lang/perl5.8, this
+distribution will not be used by default.
+
+If you want this version of Perl to be used by default, please type
+
+  use.perl port
+
+Assuming that use.perl script (which was installed with the rest of the
+Perl distribution) can be found in your PATH (you might have to type
+`rehash' first, depending upon a shell you use), this action will
+replace /usr/bin/perl and /usr/bin/suidperl with symbolic links to the
+versions of these binaries in the Perl distribution.  This action will
+also put some variables into your /etc/make.conf file, so that newly
+installed ports (not packages!) will use new version of perl, and the
+system upgrades from the source will not overwrite the changes made.
+
+Note that use.perl port is specific to a given perl installation.  If
+you later upgrade the perl port, run use.perl port again to update the
+symbolic links and /etc/make.conf.
+
+At any time you can also type
+
+  use.perl system
+
+if you wish to remove those symbolic links from your system.
diff --git a/lang/perl5/pkg-message b/lang/perl5/pkg-message-sysperl
index e575728b19be..0438edb18a19 100644
--- a/lang/perl5/pkg-message
+++ b/lang/perl5/pkg-message-sysperl
@@ -15,6 +15,10 @@ also put some variables into your /etc/make.conf file, so that newly
 installed ports (not packages!) will use new version of perl, and the
 system upgrades from the source will not overwrite the changes made.
 
+Note that use.perl port is specific to a given perl installation.  If
+you later upgrade the perl port, run use.perl port again to update the
+symbolic links and /etc/make.conf.
+
 At any time you can also type
 
   use.perl system
diff --git a/lang/perl5/pkg-plist b/lang/perl5/pkg-plist
index ec2a2459167c..99bb4c697e72 100644
--- a/lang/perl5/pkg-plist
+++ b/lang/perl5/pkg-plist
@@ -1,17 +1,13 @@
-bin/perl
-@exec ln -fs %D/%F %B/perl%%PERL_VER%%
-@exec ln -fs %D/%F %B/perl5
-@unexec rm %B/perl%%PERL_VER%%
-@unexec rm %B/perl5
-bin/sperl%%PERL_VER%%
-@exec ln -fs %D/%F %B/suidperl
-@unexec rm %B/suidperl
 bin/a2p
 bin/c2ph
 bin/dprofpp
 bin/find2perl
 bin/h2ph
 bin/h2xs
+bin/perl
+bin/perl%%PERL_VER%%
+@exec ln -fs %D/%F %B/perl5
+@unexec rm -f %B/perl5 2>&1 >/dev/null || true
 bin/perlbug
 bin/perlcc
 bin/perldoc
@@ -25,192 +21,10 @@ bin/podchecker
 bin/podselect
 bin/pstruct
 bin/s2p
+%%ENABLE_SUIDPERL%%bin/sperl%%PERL_VER%%
 bin/splain
-bin/use.perl
-lib/perl5/%%PERL_VER%%/AnyDBM_File.pm
-lib/perl5/%%PERL_VER%%/AutoLoader.pm
-lib/perl5/%%PERL_VER%%/AutoSplit.pm
-lib/perl5/%%PERL_VER%%/B/assemble
-lib/perl5/%%PERL_VER%%/B/cc_harness
-lib/perl5/%%PERL_VER%%/B/disassemble
-lib/perl5/%%PERL_VER%%/B/makeliblinks
-lib/perl5/%%PERL_VER%%/BSDPAN/BSDPAN.pm
-lib/perl5/%%PERL_VER%%/BSDPAN/BSDPAN/Override.pm
-lib/perl5/%%PERL_VER%%/BSDPAN/Config.pm
-lib/perl5/%%PERL_VER%%/BSDPAN/ExtUtils/MM_Unix.pm
-lib/perl5/%%PERL_VER%%/BSDPAN/ExtUtils/Packlist.pm
-lib/perl5/%%PERL_VER%%/Benchmark.pm
-lib/perl5/%%PERL_VER%%/CGI.pm
-lib/perl5/%%PERL_VER%%/CGI/Apache.pm
-lib/perl5/%%PERL_VER%%/CGI/Carp.pm
-lib/perl5/%%PERL_VER%%/CGI/Cookie.pm
-lib/perl5/%%PERL_VER%%/CGI/Fast.pm
-lib/perl5/%%PERL_VER%%/CGI/Pretty.pm
-lib/perl5/%%PERL_VER%%/CGI/Push.pm
-lib/perl5/%%PERL_VER%%/CGI/Switch.pm
-lib/perl5/%%PERL_VER%%/CGI/Util.pm
-lib/perl5/%%PERL_VER%%/CPAN.pm
-lib/perl5/%%PERL_VER%%/CPAN/FirstTime.pm
-lib/perl5/%%PERL_VER%%/CPAN/Nox.pm
-lib/perl5/%%PERL_VER%%/Carp.pm
-lib/perl5/%%PERL_VER%%/Carp/Heavy.pm
-lib/perl5/%%PERL_VER%%/Class/Struct.pm
-lib/perl5/%%PERL_VER%%/Cwd.pm
-lib/perl5/%%PERL_VER%%/DB.pm
-lib/perl5/%%PERL_VER%%/Devel/SelfStubber.pm
-lib/perl5/%%PERL_VER%%/DirHandle.pm
-lib/perl5/%%PERL_VER%%/Dumpvalue.pm
-lib/perl5/%%PERL_VER%%/English.pm
-lib/perl5/%%PERL_VER%%/Env.pm
-lib/perl5/%%PERL_VER%%/Exporter.pm
-lib/perl5/%%PERL_VER%%/Exporter/Heavy.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Command.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Embed.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Install.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Installed.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Liblist.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/MM_Cygwin.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/MM_OS2.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/MM_Unix.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/MM_VMS.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/MM_Win32.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Manifest.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Miniperl.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Mkbootstrap.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Mksymlists.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/Packlist.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/inst
-lib/perl5/%%PERL_VER%%/ExtUtils/testlib.pm
-lib/perl5/%%PERL_VER%%/ExtUtils/typemap
-lib/perl5/%%PERL_VER%%/ExtUtils/xsubpp
-lib/perl5/%%PERL_VER%%/Fatal.pm
-lib/perl5/%%PERL_VER%%/File/Basename.pm
-lib/perl5/%%PERL_VER%%/File/CheckTree.pm
-lib/perl5/%%PERL_VER%%/File/Compare.pm
-lib/perl5/%%PERL_VER%%/File/Copy.pm
-lib/perl5/%%PERL_VER%%/File/DosGlob.pm
-lib/perl5/%%PERL_VER%%/File/Find.pm
-lib/perl5/%%PERL_VER%%/File/Path.pm
-lib/perl5/%%PERL_VER%%/File/Spec.pm
-lib/perl5/%%PERL_VER%%/File/Spec/Epoc.pm
-lib/perl5/%%PERL_VER%%/File/Spec/Functions.pm
-lib/perl5/%%PERL_VER%%/File/Spec/Mac.pm
-lib/perl5/%%PERL_VER%%/File/Spec/OS2.pm
-lib/perl5/%%PERL_VER%%/File/Spec/Unix.pm
-lib/perl5/%%PERL_VER%%/File/Spec/VMS.pm
-lib/perl5/%%PERL_VER%%/File/Spec/Win32.pm
-lib/perl5/%%PERL_VER%%/File/Temp.pm
-lib/perl5/%%PERL_VER%%/File/stat.pm
-lib/perl5/%%PERL_VER%%/FileCache.pm
-lib/perl5/%%PERL_VER%%/FileHandle.pm
-lib/perl5/%%PERL_VER%%/FindBin.pm
-lib/perl5/%%PERL_VER%%/Getopt/Long.pm
-lib/perl5/%%PERL_VER%%/Getopt/Std.pm
-lib/perl5/%%PERL_VER%%/I18N/Collate.pm
-lib/perl5/%%PERL_VER%%/IO/Socket/INET.pm
-lib/perl5/%%PERL_VER%%/IO/Socket/UNIX.pm
-lib/perl5/%%PERL_VER%%/IPC/Open2.pm
-lib/perl5/%%PERL_VER%%/IPC/Open3.pm
-lib/perl5/%%PERL_VER%%/Math/BigFloat.pm
-lib/perl5/%%PERL_VER%%/Math/BigInt.pm
-lib/perl5/%%PERL_VER%%/Math/Complex.pm
-lib/perl5/%%PERL_VER%%/Math/Trig.pm
-lib/perl5/%%PERL_VER%%/Net/Ping.pm
-lib/perl5/%%PERL_VER%%/Net/hostent.pm
-lib/perl5/%%PERL_VER%%/Net/netent.pm
-lib/perl5/%%PERL_VER%%/Net/protoent.pm
-lib/perl5/%%PERL_VER%%/Net/servent.pm
-lib/perl5/%%PERL_VER%%/Pod/Checker.pm
-lib/perl5/%%PERL_VER%%/Pod/Find.pm
-lib/perl5/%%PERL_VER%%/Pod/Functions.pm
-lib/perl5/%%PERL_VER%%/Pod/Html.pm
-lib/perl5/%%PERL_VER%%/Pod/InputObjects.pm
-lib/perl5/%%PERL_VER%%/Pod/LaTeX.pm
-lib/perl5/%%PERL_VER%%/Pod/Man.pm
-lib/perl5/%%PERL_VER%%/Pod/ParseUtils.pm
-lib/perl5/%%PERL_VER%%/Pod/Parser.pm
-lib/perl5/%%PERL_VER%%/Pod/Plainer.pm
-lib/perl5/%%PERL_VER%%/Pod/Select.pm
-lib/perl5/%%PERL_VER%%/Pod/Text.pm
-lib/perl5/%%PERL_VER%%/Pod/Text/Color.pm
-lib/perl5/%%PERL_VER%%/Pod/Text/Overstrike.pm
-lib/perl5/%%PERL_VER%%/Pod/Text/Termcap.pm
-lib/perl5/%%PERL_VER%%/Pod/Usage.pm
-lib/perl5/%%PERL_VER%%/Search/Dict.pm
-lib/perl5/%%PERL_VER%%/SelectSaver.pm
-lib/perl5/%%PERL_VER%%/SelfLoader.pm
-lib/perl5/%%PERL_VER%%/Shell.pm
-lib/perl5/%%PERL_VER%%/Symbol.pm
-lib/perl5/%%PERL_VER%%/Term/ANSIColor.pm
-lib/perl5/%%PERL_VER%%/Term/Cap.pm
-lib/perl5/%%PERL_VER%%/Term/Complete.pm
-lib/perl5/%%PERL_VER%%/Term/ReadLine.pm
-lib/perl5/%%PERL_VER%%/Test.pm
-lib/perl5/%%PERL_VER%%/Test/Harness.pm
-lib/perl5/%%PERL_VER%%/Text/Abbrev.pm
-lib/perl5/%%PERL_VER%%/Text/ParseWords.pm
-lib/perl5/%%PERL_VER%%/Text/Soundex.pm
-lib/perl5/%%PERL_VER%%/Text/Tabs.pm
-lib/perl5/%%PERL_VER%%/Text/Wrap.pm
-lib/perl5/%%PERL_VER%%/Tie/Array.pm
-lib/perl5/%%PERL_VER%%/Tie/Handle.pm
-lib/perl5/%%PERL_VER%%/Tie/Hash.pm
-lib/perl5/%%PERL_VER%%/Tie/RefHash.pm
-lib/perl5/%%PERL_VER%%/Tie/Scalar.pm
-lib/perl5/%%PERL_VER%%/Tie/SubstrHash.pm
-lib/perl5/%%PERL_VER%%/Time/Local.pm
-lib/perl5/%%PERL_VER%%/Time/gmtime.pm
-lib/perl5/%%PERL_VER%%/Time/localtime.pm
-lib/perl5/%%PERL_VER%%/Time/tm.pm
-lib/perl5/%%PERL_VER%%/UNIVERSAL.pm
-lib/perl5/%%PERL_VER%%/User/grent.pm
-lib/perl5/%%PERL_VER%%/User/pwent.pm
-lib/perl5/%%PERL_VER%%/Win32.pod
-lib/perl5/%%PERL_VER%%/abbrev.pl
-lib/perl5/%%PERL_VER%%/assert.pl
-lib/perl5/%%PERL_VER%%/attributes.pm
-lib/perl5/%%PERL_VER%%/auto/Getopt/Long/Configure.al
-lib/perl5/%%PERL_VER%%/auto/Getopt/Long/Croak.al
-lib/perl5/%%PERL_VER%%/auto/Getopt/Long/FindOption.al
-lib/perl5/%%PERL_VER%%/auto/Getopt/Long/GetOptions.al
-lib/perl5/%%PERL_VER%%/auto/Getopt/Long/autosplit.ix
-lib/perl5/%%PERL_VER%%/auto/Getopt/Long/config.al
-lib/perl5/%%PERL_VER%%/autouse.pm
-lib/perl5/%%PERL_VER%%/base.pm
-lib/perl5/%%PERL_VER%%/bigfloat.pl
-lib/perl5/%%PERL_VER%%/bigint.pl
-lib/perl5/%%PERL_VER%%/bigrat.pl
-lib/perl5/%%PERL_VER%%/blib.pm
-lib/perl5/%%PERL_VER%%/bytes.pm
-lib/perl5/%%PERL_VER%%/bytes_heavy.pl
-lib/perl5/%%PERL_VER%%/cacheout.pl
-lib/perl5/%%PERL_VER%%/charnames.pm
-lib/perl5/%%PERL_VER%%/chat2.pl
-lib/perl5/%%PERL_VER%%/complete.pl
-lib/perl5/%%PERL_VER%%/constant.pm
-lib/perl5/%%PERL_VER%%/ctime.pl
-lib/perl5/%%PERL_VER%%/diagnostics.pm
-lib/perl5/%%PERL_VER%%/dotsh.pl
-lib/perl5/%%PERL_VER%%/dumpvar.pl
-lib/perl5/%%PERL_VER%%/exceptions.pl
-lib/perl5/%%PERL_VER%%/fastcwd.pl
-lib/perl5/%%PERL_VER%%/fields.pm
-lib/perl5/%%PERL_VER%%/filetest.pm
-lib/perl5/%%PERL_VER%%/find.pl
-lib/perl5/%%PERL_VER%%/finddepth.pl
-lib/perl5/%%PERL_VER%%/flush.pl
-lib/perl5/%%PERL_VER%%/ftp.pl
-lib/perl5/%%PERL_VER%%/getcwd.pl
-lib/perl5/%%PERL_VER%%/getopt.pl
-lib/perl5/%%PERL_VER%%/getopts.pl
-lib/perl5/%%PERL_VER%%/hostname.pl
-lib/perl5/%%PERL_VER%%/importenv.pl
-lib/perl5/%%PERL_VER%%/integer.pm
-lib/perl5/%%PERL_VER%%/less.pm
-lib/perl5/%%PERL_VER%%/lib.pm
-lib/perl5/%%PERL_VER%%/locale.pm
-lib/perl5/%%PERL_VER%%/look.pl
+%%ENABLE_SUIDPERL%%bin/suidperl
+%%NEED_USE_PERL%%bin/use.perl
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/.packlist
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B/Asmdata.pm
@@ -249,7 +63,6 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/hv.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/intrpvar.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/iperlsys.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/keywords.h
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/libperl.a
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/mg.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/nostdio.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/objXSUB.h
@@ -271,7 +84,7 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/regcomp.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/regexp.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/regnodes.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/scope.h
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/sperl.o
+%%ENABLE_SUIDPERL%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/sperl.o
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/sv.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/thrdvar.h
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/thread.h
@@ -328,18 +141,18 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek/Peek.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek/Peek.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader/DynaLoader.a
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader/autosplit.ix
+lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader/extralibs.ld
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader/dl_expandspec.al
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader/dl_find_symbol_anywhere.al
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader/dl_findfile.al
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader/extralibs.ld
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl/Fcntl.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl/Fcntl.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/Glob.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/Glob.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/autosplit.ix
-%%GDBM%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/autosplit.ix
-%%GDBM%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.so
 %%GDBM%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.bs
+%%GDBM%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.so
+%%GDBM%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/autosplit.ix
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV/SysV.bs
@@ -513,9 +326,328 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs/attrs.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs/attrs.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re/re.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re/re.so
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm/extralibs.ld
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/ops.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/re.pm
+lib/perl5/%%PERL_VER%%/AnyDBM_File.pm
+lib/perl5/%%PERL_VER%%/AutoLoader.pm
+lib/perl5/%%PERL_VER%%/AutoSplit.pm
+lib/perl5/%%PERL_VER%%/B/assemble
+lib/perl5/%%PERL_VER%%/B/cc_harness
+lib/perl5/%%PERL_VER%%/B/disassemble
+lib/perl5/%%PERL_VER%%/B/makeliblinks
+lib/perl5/%%PERL_VER%%/BSDPAN/BSDPAN.pm
+lib/perl5/%%PERL_VER%%/BSDPAN/BSDPAN/Override.pm
+lib/perl5/%%PERL_VER%%/BSDPAN/Config.pm
+lib/perl5/%%PERL_VER%%/BSDPAN/ExtUtils/MM_Unix.pm
+lib/perl5/%%PERL_VER%%/BSDPAN/ExtUtils/MakeMaker.pm
+lib/perl5/%%PERL_VER%%/BSDPAN/ExtUtils/Packlist.pm
+lib/perl5/%%PERL_VER%%/Benchmark.pm
+lib/perl5/%%PERL_VER%%/CGI.pm
+lib/perl5/%%PERL_VER%%/CGI/Apache.pm
+lib/perl5/%%PERL_VER%%/CGI/Carp.pm
+lib/perl5/%%PERL_VER%%/CGI/Cookie.pm
+lib/perl5/%%PERL_VER%%/CGI/Fast.pm
+lib/perl5/%%PERL_VER%%/CGI/Pretty.pm
+lib/perl5/%%PERL_VER%%/CGI/Push.pm
+lib/perl5/%%PERL_VER%%/CGI/Switch.pm
+lib/perl5/%%PERL_VER%%/CGI/Util.pm
+lib/perl5/%%PERL_VER%%/CPAN.pm
+lib/perl5/%%PERL_VER%%/CPAN/FirstTime.pm
+lib/perl5/%%PERL_VER%%/CPAN/Nox.pm
+lib/perl5/%%PERL_VER%%/Carp.pm
+lib/perl5/%%PERL_VER%%/Carp/Heavy.pm
+lib/perl5/%%PERL_VER%%/Class/Struct.pm
+lib/perl5/%%PERL_VER%%/Cwd.pm
+lib/perl5/%%PERL_VER%%/DB.pm
+lib/perl5/%%PERL_VER%%/Devel/SelfStubber.pm
+lib/perl5/%%PERL_VER%%/DirHandle.pm
+lib/perl5/%%PERL_VER%%/Dumpvalue.pm
+lib/perl5/%%PERL_VER%%/English.pm
+lib/perl5/%%PERL_VER%%/Env.pm
+lib/perl5/%%PERL_VER%%/Exporter.pm
+lib/perl5/%%PERL_VER%%/Exporter/Heavy.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Changes
+lib/perl5/%%PERL_VER%%/ExtUtils/Command.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Command/MM.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Embed.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Install.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Installed.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Liblist.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Liblist/Kid.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MANIFEST.SKIP
+lib/perl5/%%PERL_VER%%/ExtUtils/MM.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_Any.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_BeOS.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_Cygwin.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_DOS.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_MacOS.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_NW5.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_OS2.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_UWIN.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_Unix.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_VMS.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_Win32.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MM_Win95.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MY.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker/FAQ.pod
+lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker/Tutorial.pod
+lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker/bytes.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker/vmsish.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Manifest.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Miniperl.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Mkbootstrap.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/Mksymlists.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/NOTES
+lib/perl5/%%PERL_VER%%/ExtUtils/PATCHING
+lib/perl5/%%PERL_VER%%/ExtUtils/Packlist.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/README
+lib/perl5/%%PERL_VER%%/ExtUtils/TODO
+lib/perl5/%%PERL_VER%%/ExtUtils/instmodsh
+lib/perl5/%%PERL_VER%%/ExtUtils/t/00compile.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/00setup_dummy.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/Command.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/INST.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/INST_PREFIX.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/Install.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/Installed.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/Liblist.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/MM_Any.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/MM_BeOS.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/MM_Cygwin.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/MM_NW5.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/MM_OS2.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/MM_Unix.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/MM_VMS.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/MM_Win32.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/Manifest.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/Mkbootstrap.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/Packlist.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/VERSION_FROM.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/backwards.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/basic.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/bytes.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/hints.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/oneliner.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/postamble.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/prefixify.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/prereq_print.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/problems.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/prompt.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/recurs.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/split_command.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/testlib.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/vmsish.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/writemakefile_args.t
+lib/perl5/%%PERL_VER%%/ExtUtils/t/zz_cleanup_dummy.t
+lib/perl5/%%PERL_VER%%/ExtUtils/testlib.pm
+lib/perl5/%%PERL_VER%%/ExtUtils/typemap
+lib/perl5/%%PERL_VER%%/ExtUtils/xsubpp
+lib/perl5/%%PERL_VER%%/Fatal.pm
+lib/perl5/%%PERL_VER%%/File/Basename.pm
+lib/perl5/%%PERL_VER%%/File/CheckTree.pm
+lib/perl5/%%PERL_VER%%/File/Compare.pm
+lib/perl5/%%PERL_VER%%/File/Copy.pm
+lib/perl5/%%PERL_VER%%/File/DosGlob.pm
+lib/perl5/%%PERL_VER%%/File/Find.pm
+lib/perl5/%%PERL_VER%%/File/Path.pm
+lib/perl5/%%PERL_VER%%/File/Spec.pm
+lib/perl5/%%PERL_VER%%/File/Spec/Cygwin.pm
+lib/perl5/%%PERL_VER%%/File/Spec/Epoc.pm
+lib/perl5/%%PERL_VER%%/File/Spec/Functions.pm
+lib/perl5/%%PERL_VER%%/File/Spec/Mac.pm
+lib/perl5/%%PERL_VER%%/File/Spec/OS2.pm
+lib/perl5/%%PERL_VER%%/File/Spec/Unix.pm
+lib/perl5/%%PERL_VER%%/File/Spec/VMS.pm
+lib/perl5/%%PERL_VER%%/File/Spec/Win32.pm
+lib/perl5/%%PERL_VER%%/File/Spec/t/Functions.t
+lib/perl5/%%PERL_VER%%/File/Spec/t/Spec.t
+lib/perl5/%%PERL_VER%%/File/Spec/t/crossplatform.t
+lib/perl5/%%PERL_VER%%/File/Spec/t/rel2abs2rel.t
+lib/perl5/%%PERL_VER%%/File/Temp.pm
+lib/perl5/%%PERL_VER%%/File/Temp/t/mktemp.t
+lib/perl5/%%PERL_VER%%/File/Temp/t/object.t
+lib/perl5/%%PERL_VER%%/File/Temp/t/posix.t
+lib/perl5/%%PERL_VER%%/File/Temp/t/security.t
+lib/perl5/%%PERL_VER%%/File/Temp/t/tempfile.t
+lib/perl5/%%PERL_VER%%/File/stat.pm
+lib/perl5/%%PERL_VER%%/FileCache.pm
+lib/perl5/%%PERL_VER%%/FileHandle.pm
+lib/perl5/%%PERL_VER%%/FindBin.pm
+lib/perl5/%%PERL_VER%%/Getopt/Long.pm
+lib/perl5/%%PERL_VER%%/Getopt/Std.pm
+lib/perl5/%%PERL_VER%%/I18N/Collate.pm
+lib/perl5/%%PERL_VER%%/IO/Socket/INET.pm
+lib/perl5/%%PERL_VER%%/IO/Socket/UNIX.pm
+lib/perl5/%%PERL_VER%%/IPC/Open2.pm
+lib/perl5/%%PERL_VER%%/IPC/Open3.pm
+lib/perl5/%%PERL_VER%%/Math/BigFloat.pm
+lib/perl5/%%PERL_VER%%/Math/BigInt.pm
+lib/perl5/%%PERL_VER%%/Math/Complex.pm
+lib/perl5/%%PERL_VER%%/Math/Trig.pm
+lib/perl5/%%PERL_VER%%/Net/Ping.pm
+lib/perl5/%%PERL_VER%%/Net/hostent.pm
+lib/perl5/%%PERL_VER%%/Net/netent.pm
+lib/perl5/%%PERL_VER%%/Net/protoent.pm
+lib/perl5/%%PERL_VER%%/Net/servent.pm
+lib/perl5/%%PERL_VER%%/Pod/Checker.pm
+lib/perl5/%%PERL_VER%%/Pod/Find.pm
+lib/perl5/%%PERL_VER%%/Pod/Functions.pm
+lib/perl5/%%PERL_VER%%/Pod/Html.pm
+lib/perl5/%%PERL_VER%%/Pod/InputObjects.pm
+lib/perl5/%%PERL_VER%%/Pod/LaTeX.pm
+lib/perl5/%%PERL_VER%%/Pod/Man.pm
+lib/perl5/%%PERL_VER%%/Pod/ParseUtils.pm
+lib/perl5/%%PERL_VER%%/Pod/Parser.pm
+lib/perl5/%%PERL_VER%%/Pod/Plainer.pm
+lib/perl5/%%PERL_VER%%/Pod/Select.pm
+lib/perl5/%%PERL_VER%%/Pod/Text.pm
+lib/perl5/%%PERL_VER%%/Pod/Text/Color.pm
+lib/perl5/%%PERL_VER%%/Pod/Text/Overstrike.pm
+lib/perl5/%%PERL_VER%%/Pod/Text/Termcap.pm
+lib/perl5/%%PERL_VER%%/Pod/Usage.pm
+lib/perl5/%%PERL_VER%%/Search/Dict.pm
+lib/perl5/%%PERL_VER%%/SelectSaver.pm
+lib/perl5/%%PERL_VER%%/SelfLoader.pm
+lib/perl5/%%PERL_VER%%/Shell.pm
+lib/perl5/%%PERL_VER%%/Symbol.pm
+lib/perl5/%%PERL_VER%%/Term/ANSIColor.pm
+lib/perl5/%%PERL_VER%%/Term/Cap.pm
+lib/perl5/%%PERL_VER%%/Term/Complete.pm
+lib/perl5/%%PERL_VER%%/Term/ReadLine.pm
+lib/perl5/%%PERL_VER%%/Test.pm
+lib/perl5/%%PERL_VER%%/Test/Builder.pm
+lib/perl5/%%PERL_VER%%/Test/Harness.pm
+lib/perl5/%%PERL_VER%%/Test/Harness/Assert.pm
+lib/perl5/%%PERL_VER%%/Test/Harness/Changes
+lib/perl5/%%PERL_VER%%/Test/Harness/Iterator.pm
+lib/perl5/%%PERL_VER%%/Test/Harness/Straps.pm
+lib/perl5/%%PERL_VER%%/Test/Harness/t/00compile.t
+lib/perl5/%%PERL_VER%%/Test/Harness/t/assert.t
+lib/perl5/%%PERL_VER%%/Test/Harness/t/base.t
+lib/perl5/%%PERL_VER%%/Test/Harness/t/callback.t
+lib/perl5/%%PERL_VER%%/Test/Harness/t/nonumbers.t
+lib/perl5/%%PERL_VER%%/Test/Harness/t/ok.t
+lib/perl5/%%PERL_VER%%/Test/Harness/t/pod.t
+lib/perl5/%%PERL_VER%%/Test/Harness/t/strap-analyze.t
+lib/perl5/%%PERL_VER%%/Test/Harness/t/strap.t
+lib/perl5/%%PERL_VER%%/Test/Harness/t/test-harness.t
+lib/perl5/%%PERL_VER%%/Test/More.pm
+lib/perl5/%%PERL_VER%%/Test/Simple.pm
+lib/perl5/%%PERL_VER%%/Test/Simple/Changes
+lib/perl5/%%PERL_VER%%/Test/Simple/README
+lib/perl5/%%PERL_VER%%/Test/Simple/t/Builder.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/More.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/bad_plan.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/buffer.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/curr_test.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/details.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/diag.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/exit.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/extra.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/fail-like.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/fail-more.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/fail.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/filehandles.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/fork.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/has_plan.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/has_plan2.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/import.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/is_deeply.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/maybe_regex.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/missing.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/no_ending.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/no_header.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/no_plan.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/ok_obj.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/output.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/plan.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/plan_is_noplan.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/plan_no_plan.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/plan_skip_all.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/simple.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/skip.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/skipall.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/strays.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/threads.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/todo.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/undef.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/use_ok.t
+lib/perl5/%%PERL_VER%%/Test/Simple/t/useing.t
+lib/perl5/%%PERL_VER%%/Test/Tutorial.pod
+lib/perl5/%%PERL_VER%%/Test/t/fail.t
+lib/perl5/%%PERL_VER%%/Test/t/mix.t
+lib/perl5/%%PERL_VER%%/Test/t/onfail.t
+lib/perl5/%%PERL_VER%%/Test/t/qr.t
+lib/perl5/%%PERL_VER%%/Test/t/skip.t
+lib/perl5/%%PERL_VER%%/Test/t/success.t
+lib/perl5/%%PERL_VER%%/Test/t/todo.t
+lib/perl5/%%PERL_VER%%/Text/Abbrev.pm
+lib/perl5/%%PERL_VER%%/Text/ParseWords.pm
+lib/perl5/%%PERL_VER%%/Text/Soundex.pm
+lib/perl5/%%PERL_VER%%/Text/Tabs.pm
+lib/perl5/%%PERL_VER%%/Text/Wrap.pm
+lib/perl5/%%PERL_VER%%/Tie/Array.pm
+lib/perl5/%%PERL_VER%%/Tie/Handle.pm
+lib/perl5/%%PERL_VER%%/Tie/Hash.pm
+lib/perl5/%%PERL_VER%%/Tie/RefHash.pm
+lib/perl5/%%PERL_VER%%/Tie/Scalar.pm
+lib/perl5/%%PERL_VER%%/Tie/SubstrHash.pm
+lib/perl5/%%PERL_VER%%/Time/Local.pm
+lib/perl5/%%PERL_VER%%/Time/gmtime.pm
+lib/perl5/%%PERL_VER%%/Time/localtime.pm
+lib/perl5/%%PERL_VER%%/Time/tm.pm
+lib/perl5/%%PERL_VER%%/UNIVERSAL.pm
+lib/perl5/%%PERL_VER%%/User/grent.pm
+lib/perl5/%%PERL_VER%%/User/pwent.pm
+lib/perl5/%%PERL_VER%%/Win32.pod
+lib/perl5/%%PERL_VER%%/abbrev.pl
+lib/perl5/%%PERL_VER%%/assert.pl
+lib/perl5/%%PERL_VER%%/attributes.pm
+lib/perl5/%%PERL_VER%%/auto/Getopt/Long/Configure.al
+lib/perl5/%%PERL_VER%%/auto/Getopt/Long/Croak.al
+lib/perl5/%%PERL_VER%%/auto/Getopt/Long/FindOption.al
+lib/perl5/%%PERL_VER%%/auto/Getopt/Long/GetOptions.al
+lib/perl5/%%PERL_VER%%/auto/Getopt/Long/autosplit.ix
+lib/perl5/%%PERL_VER%%/auto/Getopt/Long/config.al
+lib/perl5/%%PERL_VER%%/autouse.pm
+lib/perl5/%%PERL_VER%%/base.pm
+lib/perl5/%%PERL_VER%%/bigfloat.pl
+lib/perl5/%%PERL_VER%%/bigint.pl
+lib/perl5/%%PERL_VER%%/bigrat.pl
+lib/perl5/%%PERL_VER%%/blib.pm
+lib/perl5/%%PERL_VER%%/bytes.pm
+lib/perl5/%%PERL_VER%%/bytes_heavy.pl
+lib/perl5/%%PERL_VER%%/cacheout.pl
+lib/perl5/%%PERL_VER%%/charnames.pm
+lib/perl5/%%PERL_VER%%/chat2.pl
+lib/perl5/%%PERL_VER%%/complete.pl
+lib/perl5/%%PERL_VER%%/constant.pm
+lib/perl5/%%PERL_VER%%/ctime.pl
+lib/perl5/%%PERL_VER%%/diagnostics.pm
+lib/perl5/%%PERL_VER%%/dotsh.pl
+lib/perl5/%%PERL_VER%%/dumpvar.pl
+lib/perl5/%%PERL_VER%%/exceptions.pl
+lib/perl5/%%PERL_VER%%/fastcwd.pl
+lib/perl5/%%PERL_VER%%/fields.pm
+lib/perl5/%%PERL_VER%%/filetest.pm
+lib/perl5/%%PERL_VER%%/find.pl
+lib/perl5/%%PERL_VER%%/finddepth.pl
+lib/perl5/%%PERL_VER%%/flush.pl
+lib/perl5/%%PERL_VER%%/ftp.pl
+lib/perl5/%%PERL_VER%%/getcwd.pl
+lib/perl5/%%PERL_VER%%/getopt.pl
+lib/perl5/%%PERL_VER%%/getopts.pl
+lib/perl5/%%PERL_VER%%/hostname.pl
+lib/perl5/%%PERL_VER%%/if.pm
+lib/perl5/%%PERL_VER%%/if.t
+lib/perl5/%%PERL_VER%%/importenv.pl
+lib/perl5/%%PERL_VER%%/integer.pm
+lib/perl5/%%PERL_VER%%/less.pm
+lib/perl5/%%PERL_VER%%/lib.pm
+lib/perl5/%%PERL_VER%%/locale.pm
+lib/perl5/%%PERL_VER%%/look.pl
+lib/perl5/%%PERL_VER%%/mach/CORE/libperl.so
 lib/perl5/%%PERL_VER%%/newgetopt.pl
 lib/perl5/%%PERL_VER%%/open.pm
 lib/perl5/%%PERL_VER%%/open2.pl
@@ -898,12 +1030,10 @@ lib/perl5/%%PERL_VER%%/validate.pl
 lib/perl5/%%PERL_VER%%/vars.pm
 lib/perl5/%%PERL_VER%%/warnings.pm
 lib/perl5/%%PERL_VER%%/warnings/register.pm
+@dirrm lib/perl5/%%PERL_VER%%/BSDPAN/BSDPAN
+@dirrm lib/perl5/%%PERL_VER%%/BSDPAN/ExtUtils
+@dirrm lib/perl5/%%PERL_VER%%/BSDPAN
 @unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
 %%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
@@ -940,6 +1070,13 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO/Socket 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO 2>/dev/null || true
@@ -956,7 +1093,12 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Time 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Tie 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test 2>/dev/null || true
+@dirrm lib/perl5/%%PERL_VER%%/Test/Simple/t
+@dirrm lib/perl5/%%PERL_VER%%/Test/Simple
+@dirrm lib/perl5/%%PERL_VER%%/Test/t
+@dirrm lib/perl5/%%PERL_VER%%/Test/Harness/t
+@dirrm lib/perl5/%%PERL_VER%%/Test/Harness
+@dirrm lib/perl5/%%PERL_VER%%/Test
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Search 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Text 2>/dev/null || true
@@ -966,9 +1108,16 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/IPC 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File/Spec 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils 2>/dev/null || true
+@dirrm lib/perl5/%%PERL_VER%%/File/Temp/t
+@dirrm lib/perl5/%%PERL_VER%%/File/Temp
+@dirrm lib/perl5/%%PERL_VER%%/File/Spec/t
+@dirrm lib/perl5/%%PERL_VER%%/File/Spec
+@dirrm lib/perl5/%%PERL_VER%%/File
+@dirrm lib/perl5/%%PERL_VER%%/ExtUtils/t
+@dirrm lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker
+@dirrm lib/perl5/%%PERL_VER%%/ExtUtils/Liblist
+@dirrm lib/perl5/%%PERL_VER%%/ExtUtils/Command
+@dirrm lib/perl5/%%PERL_VER%%/ExtUtils
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
@@ -976,10 +1125,10 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Carp 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/CPAN 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/pod 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man/man3 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/BSDPAN/BSDPAN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/BSDPAN/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/BSDPAN 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
 @unexec rmdir %D/lib/perl5 2>/dev/null || true