1. Update to 5.8.4.

2. Make this port respect Makefile.local.
3. Transfer manpages to Makefile.man.
4. Move manpages for modules, included into distribution, into
   lib/perl5/PERL_VER/perl/man/man3, to eliminate file conflicts
   with p5 ports for modules included with perl.
5. Use PREFIX/SITE_PERL_REL instead of SITE_PERL in the Makefile.
6. Switch to bzipped sources.
7. Other small adjustments.

PR:	65925, 66096, 67205

Submitted by:	foxfair (1), Charles Swiger <chuck@pkix.net> (1), krion (3)
Reported by:	Roy Badami <roy@gnomon.org.uk> (2)

35 files changed, 2880 insertions, 695 deletions

diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile
index 90d96bccfaef..9867d4a1752a 100644
--- a/lang/perl5.10/Makefile
+++ b/lang/perl5.10/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	5
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -15,28 +14,38 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 MASTER_SITE_SUBDIR=	../../src \
 			tobez/:local ./:local
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		BSDPAN-5.8.0_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
+		BSDPAN-${PERL_VER}${EXTRACT_SUFX}:local
+#		BSDPAN-5.8.0_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
 
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Practical Extraction and Report Language
 
-PERL_VER=	5.8.2
+PERL_VER=	5.8.4
 PERL_ARCH=	mach
 PERL_VERSION=	${PERL_VER}
 
+USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 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 \
+	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \
 	-Dman1dir=${PREFIX}/man/man1 \
-	-Dsitearch=${SITE_PERL}/${PERL_ARCH} \
-	-Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \
+	-Duse64bitint \
+	-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}\"
 
+INCLUDEDIR=	/usr/include
+
+.include "Makefile.man"
+.include <bsd.port.pre.mk>
+
 .if defined(ENABLE_SUIDPERL)
 CONFIGURE_ARGS+=	-Dd_dosuid=define
 PLIST_SUB+=		ENABLE_SUIDPERL=""
@@ -76,137 +85,16 @@ CONFIGURE_ARGS+=	-Dusemymalloc=y
 CONFIGURE_ARGS+=	-Dusemymalloc=n
 .endif
 
-INCLUDEDIR=	/usr/include
-
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} < 502100
 LATEST_LINK=	perl5.8
 .else
 PKGMESSAGE=	${PKGDIR}/.not-here
 .endif
 
-MAN1=	a2p.1 c2ph.1 dprofpp.1 enc2xs.1 find2perl.1 h2ph.1 h2xs.1 \
-	libnetcfg.1 perl.1 perl5004delta.1 perl5005delta.1 \
-	perl561delta.1 perl56delta.1 perl570delta.1 perl571delta.1 \
-	perl572delta.1 perlaix.1 perlamiga.1 perlapi.1 perlapio.1 \
-	perlapollo.1 perlbeos.1 perlbook.1 perlboot.1 perlbot.1 \
-	perlbs2000.1 perlbug.1 perlcall.1 perlcc.1 perlce.1 perlclib.1 \
-	perlcn.1 perlcompile.1 perlcygwin.1 perldata.1 perldbmfilter.1 \
-	perldebguts.1 perldebtut.1 perldebug.1 perldelta.1 perldgux.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 \
-	perlfreebsd.1 perlfunc.1 perlguts.1 perlhack.1 perlhist.1 \
-	perlhpux.1 perlhurd.1 perlintern.1 perlintro.1 perliol.1 \
-	perlipc.1 perlirix.1 perlivp.1 perljp.1 perlko.1 perllexwarn.1 \
-	perllocale.1 perllol.1 perlmachten.1 perlmacos.1 perlmint.1 \
-	perlmod.1 perlmodinstall.1 perlmodlib.1 perlmodstyle.1 \
-	perlmpeix.1 perlnetware.1 perlnewmod.1 perlnumber.1 perlobj.1 \
-	perlop.1 perlopentut.1 perlos2.1 perlos390.1 perlothrtut.1 \
-	perlpacktut.1 perlplan9.1 perlpod.1 perlpodspec.1 perlport.1 \
-	perlqnx.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 \
-	perltooc.1 perltoot.1 perltrap.1 perltru64.1 perltw.1 \
-	perlunicode.1 perluniintro.1 perlutil.1 perluts.1 perlvar.1 \
-	perlvmesa.1 perlvms.1 perlvos.1 perlwin32.1 perlxs.1 perlxstut.1 \
-	piconv.1 pl2pm.1 pod2html.1 pod2latex.1 pod2man.1 pod2text.1 \
-	pod2usage.1 podchecker.1 podselect.1 psed.1 pstruct.1 s2p.1 \
-	splain.1 xsubpp.1 cpan.1  perl573delta.1 perl58delta.1 perl581delta.1 \
-	perlartistic.1 perlcheat.1 perlgpl.1 perlmacosx.1 perlos400.1 \
-	perlreref.1
-
-MAN3=	AnyDBM_File.3 Attribute::Handlers.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::ISA.3 Class::Struct.3 Config.3 Cwd.3 \
-	DB.3 DB_File.3 Data::Dumper.3 Devel::DProf.3 Devel::PPPort.3 \
-	Devel::Peek.3 Devel::SelfStubber.3 Digest.3 Digest::MD5.3 \
-	DirHandle.3 Dumpvalue.3 DynaLoader.3 Encode.3 Encode::Alias.3 \
-	Encode::Byte.3 Encode::CJKConstants.3 Encode::CN.3 \
-	Encode::CN::HZ.3 Encode::Config.3 Encode::EBCDIC.3 \
-	Encode::Encoder.3 Encode::Encoding.3 Encode::Guess.3 \
-	Encode::JP.3 Encode::JP::H2Z.3 Encode::JP::JIS7.3 Encode::KR.3 \
-	Encode::KR::2022_KR.3 Encode::MIME::Header.3 Encode::PerlIO.3 \
-	Encode::Supported.3 Encode::Symbol.3 Encode::TW.3 \
-	Encode::Unicode.3 Encode::Unicode::UTF7.3 English.3 Env.3 Errno.3 \
-	Exporter.3 Exporter::Heavy.3 ExtUtils::Command.3 \
-	ExtUtils::Command::MM.3 ExtUtils::Constant.3 ExtUtils::Embed.3 \
-	ExtUtils::Install.3 ExtUtils::Installed.3 ExtUtils::Liblist.3 \
-	ExtUtils::MM.3 ExtUtils::MM_Any.3 ExtUtils::MM_BeOS.3 \
-	ExtUtils::MM_Cygwin.3 ExtUtils::MM_DOS.3 ExtUtils::MM_MacOS.3 \
-	ExtUtils::MM_NW5.3 ExtUtils::MM_OS2.3 ExtUtils::MM_UWIN.3 \
-	ExtUtils::MM_Unix.3 ExtUtils::MM_VMS.3 ExtUtils::MM_Win32.3 \
-	ExtUtils::MM_Win95.3 ExtUtils::MY.3 ExtUtils::MakeMaker.3 \
-	ExtUtils::MakeMaker::FAQ.3 ExtUtils::MakeMaker::Tutorial.3 \
-	ExtUtils::MakeMaker::bytes.3 ExtUtils::MakeMaker::vmsish.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::Cygwin.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 Filter::Simple.3 \
-	Filter::Util::Call.3 FindBin.3 Getopt::Long.3 Getopt::Std.3 \
-	Hash::Util.3 I18N::Collate.3 I18N::LangTags.3 I18N::LangTags::List.3 \
-	I18N::Langinfo.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 List::Util.3 \
-	Locale::Constants.3 Locale::Country.3 Locale::Currency.3 \
-	Locale::Language.3 Locale::Maketext.3 Locale::Maketext::TPJ13.3 \
-	Locale::Script.3 MIME::Base64.3 MIME::QuotedPrint.3 \
-	Math::BigFloat.3 Math::BigInt.3 Math::BigInt::Calc.3 \
-	Math::BigInt::Scalar.3 Math::BigRat.3 \
-	Math::Complex.3 Math::Trig.3 Memoize.3 Memoize::AnyDBM_File.3 \
-	Memoize::Expire.3 Memoize::ExpireFile.3 Memoize::ExpireTest.3 \
-	Memoize::NDBM_File.3 Memoize::SDBM_File.3 Memoize::Storable.3 \
-	NDBM_File.3 NEXT.3 Net::Cmd.3 Net::Config.3 Net::Domain.3 \
-	Net::FTP.3 Net::NNTP.3 Net::Netrc.3 Net::POP3.3 \
-	Net::Ping.3 Net::SMTP.3 Net::Time.3 Net::hostent.3 \
-	Net::libnetFAQ.3 Net::netent.3 Net::protoent.3 Net::servent.3 \
-	O.3 Opcode.3 POSIX.3 PerlIO.3 PerlIO::encoding.3 PerlIO::scalar.3 \
-	PerlIO::via.3 PerlIO::via::QuotedPrint.3 Pod::Checker.3 \
-	Pod::Find.3 Pod::Html.3 Pod::InputObjects.3 Pod::LaTeX.3 \
-	Pod::Man.3 Pod::ParseLink.3 Pod::ParseUtils.3 Pod::Parser.3 \
-	Pod::Perldoc::ToChecker.3 Pod::Perldoc::ToMan.3 \
-	Pod::Perldoc::ToNroff.3 Pod::Perldoc::ToPod.3 Pod::Perldoc::ToRtf.3 \
-	Pod::Perldoc::ToText.3 Pod::Perldoc::ToTk.3 Pod::Perldoc::ToXml.3 \
-	Pod::PlainText.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 Scalar::Util.3 Search::Dict.3 SelectSaver.3 \
-	SelfLoader.3 Shell.3 Socket.3 Storable.3 Switch.3 Symbol.3 \
-	Sys::Hostname.3 Sys::Syslog.3 Term::ANSIColor.3 Term::Cap.3 \
-	Term::Complete.3 Term::ReadLine.3 Test.3 Test::Builder.3 \
-	Test::Harness.3 Test::Harness::Assert.3 Test::Harness::Iterator.3 \
-	Test::Harness::Straps.3 Test::More.3 Test::Simple.3 Test::Tutorial.3 \
-	Text::Abbrev.3 Text::Balanced.3 Text::ParseWords.3 \
-	Text::Soundex.3 Text::Tabs.3 Text::Wrap.3 Thread.3 Thread::Queue.3 \
-	Thread::Semaphore.3 Tie::Array.3 Tie::File.3 Tie::Handle.3 \
-	Tie::Hash.3 Tie::Memoize.3 Tie::RefHash.3 Tie::Scalar.3 \
-	Tie::SubstrHash.3 Time::HiRes.3 Time::Local.3 Time::gmtime.3 \
-	Time::localtime.3 Time::tm.3 UNIVERSAL.3 Unicode::Collate.3 \
-	Unicode::Normalize.3 Unicode::UCD.3 User::grent.3 User::pwent.3 \
-	Win32.3 XS::APItest.3 XS::Typemap.3 XSLoader.3 attributes.3 \
-	attrs.3 autouse.3 base.3 bigint.3 bignum.3 bigrat.3 blib.3 \
-	bytes.3 charnames.3 constant.3 diagnostics.3 encoding.3 \
-	fields.3 filetest.3 if.3 integer.3 less.3 lib.3 locale.3 \
-	open.3 ops.3 overload.3 re.3 sigtrap.3 sort.3 strict.3 \
-	subs.3 threads.3 threads::shared.3 utf8.3 vars.3 vmsish.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)
@@ -214,8 +102,8 @@ 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
-BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-5.8.0
-BSDPAN_REVISION=1
+BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-5.8.4
+# BSDPAN_REVISION=1
 
 post-patch:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
@@ -240,7 +128,9 @@ post-install:
 		${BSDPAN_WRKSRC}/${files} ${BSDPAN_DEST}/${files}
 .endfor
 	@(cd ${INCLUDEDIR} && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h)
-	${MKDIR} ${SITE_PERL}/${PERL_ARCH}/auto
+	${MKDIR} ${PREFIX}/${SITE_PERL_REL}/auto
+	${MKDIR} ${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto
+	${MKDIR} ${PREFIX}/lib/perl5/${PERL_VER}/man/man3
 .if ${OSVERSION} < 502100
 	@fmt ${PKGMESSAGE}
 .else
diff --git a/lang/perl5.10/Makefile.man b/lang/perl5.10/Makefile.man
new file mode 100644
index 000000000000..30fe98bb0f88
--- /dev/null
+++ b/lang/perl5.10/Makefile.man
@@ -0,0 +1,500 @@
+# $Id$
+
+MAN1+=	a2p.1
+MAN1+=	c2ph.1
+MAN1+=	cpan.1
+MAN1+=	dprofpp.1
+MAN1+=	enc2xs.1
+MAN1+=	find2perl.1
+MAN1+=	h2ph.1
+MAN1+=	h2xs.1
+MAN1+=	libnetcfg.1
+MAN1+=	perl.1
+MAN1+=	perl5004delta.1
+MAN1+=	perl5005delta.1
+MAN1+=	perl561delta.1
+MAN1+=	perl56delta.1
+MAN1+=	perl570delta.1
+MAN1+=	perl571delta.1
+MAN1+=	perl572delta.1
+MAN1+=	perl573delta.1
+MAN1+=	perl581delta.1
+MAN1+=	perl582delta.1
+MAN1+=	perl583delta.1
+MAN1+=	perl584delta.1
+MAN1+=	perl58delta.1
+MAN1+=	perlaix.1
+MAN1+=	perlamiga.1
+MAN1+=	perlapi.1
+MAN1+=	perlapio.1
+MAN1+=	perlapollo.1
+MAN1+=	perlartistic.1
+MAN1+=	perlbeos.1
+MAN1+=	perlbook.1
+MAN1+=	perlboot.1
+MAN1+=	perlbot.1
+MAN1+=	perlbs2000.1
+MAN1+=	perlbug.1
+MAN1+=	perlcall.1
+MAN1+=	perlcc.1
+MAN1+=	perlce.1
+MAN1+=	perlcheat.1
+MAN1+=	perlclib.1
+MAN1+=	perlcn.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+=	perldgux.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+=	perlfreebsd.1
+MAN1+=	perlfunc.1
+MAN1+=	perlgpl.1
+MAN1+=	perlguts.1
+MAN1+=	perlhack.1
+MAN1+=	perlhist.1
+MAN1+=	perlhpux.1
+MAN1+=	perlhurd.1
+MAN1+=	perlintern.1
+MAN1+=	perlintro.1
+MAN1+=	perliol.1
+MAN1+=	perlipc.1
+MAN1+=	perlirix.1
+MAN1+=	perlivp.1
+MAN1+=	perljp.1
+MAN1+=	perlko.1
+MAN1+=	perllexwarn.1
+MAN1+=	perllocale.1
+MAN1+=	perllol.1
+MAN1+=	perlmachten.1
+MAN1+=	perlmacos.1
+MAN1+=	perlmacosx.1
+MAN1+=	perlmint.1
+MAN1+=	perlmod.1
+MAN1+=	perlmodinstall.1
+MAN1+=	perlmodlib.1
+MAN1+=	perlmodstyle.1
+MAN1+=	perlmpeix.1
+MAN1+=	perlnetware.1
+MAN1+=	perlnewmod.1
+MAN1+=	perlnumber.1
+MAN1+=	perlobj.1
+MAN1+=	perlop.1
+MAN1+=	perlopentut.1
+MAN1+=	perlos2.1
+MAN1+=	perlos390.1
+MAN1+=	perlos400.1
+MAN1+=	perlothrtut.1
+MAN1+=	perlpacktut.1
+MAN1+=	perlplan9.1
+MAN1+=	perlpod.1
+MAN1+=	perlpodspec.1
+MAN1+=	perlport.1
+MAN1+=	perlqnx.1
+MAN1+=	perlre.1
+MAN1+=	perlref.1
+MAN1+=	perlreftut.1
+MAN1+=	perlrequick.1
+MAN1+=	perlreref.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+=	perltooc.1
+MAN1+=	perltoot.1
+MAN1+=	perltrap.1
+MAN1+=	perltru64.1
+MAN1+=	perltw.1
+MAN1+=	perlunicode.1
+MAN1+=	perluniintro.1
+MAN1+=	perlutil.1
+MAN1+=	perluts.1
+MAN1+=	perlvar.1
+MAN1+=	perlvmesa.1
+MAN1+=	perlvms.1
+MAN1+=	perlvos.1
+MAN1+=	perlwin32.1
+MAN1+=	perlxs.1
+MAN1+=	perlxstut.1
+MAN1+=	piconv.1
+MAN1+=	pl2pm.1
+MAN1+=	pod2html.1
+MAN1+=	pod2latex.1
+MAN1+=	pod2man.1
+MAN1+=	pod2text.1
+MAN1+=	pod2usage.1
+MAN1+=	podchecker.1
+MAN1+=	podselect.1
+MAN1+=	prove.1
+MAN1+=	psed.1
+MAN1+=	pstruct.1
+MAN1+=	s2p.1
+MAN1+=	splain.1
+MAN1+=	xsubpp.1
+
+MAN3+=	AnyDBM_File.3
+MAN3+=	Attribute::Handlers.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::ISA.3
+MAN3+=	Class::Struct.3
+MAN3+=	Config.3
+MAN3+=	Cwd.3
+MAN3+=	DB.3
+MAN3+=	DBM_Filter.3
+MAN3+=	DBM_Filter::compress.3
+MAN3+=	DBM_Filter::encode.3
+MAN3+=	DBM_Filter::int32.3
+MAN3+=	DBM_Filter::null.3
+MAN3+=	DBM_Filter::utf8.3
+MAN3+=	DB_File.3
+MAN3+=	Data::Dumper.3
+MAN3+=	Devel::DProf.3
+MAN3+=	Devel::PPPort.3
+MAN3+=	Devel::Peek.3
+MAN3+=	Devel::SelfStubber.3
+MAN3+=	Digest.3
+MAN3+=	Digest::MD5.3
+MAN3+=	Digest::base.3
+MAN3+=	DirHandle.3
+MAN3+=	Dumpvalue.3
+MAN3+=	DynaLoader.3
+MAN3+=	Encode.3
+MAN3+=	Encode::Alias.3
+MAN3+=	Encode::Byte.3
+MAN3+=	Encode::CJKConstants.3
+MAN3+=	Encode::CN.3
+MAN3+=	Encode::CN::HZ.3
+MAN3+=	Encode::Config.3
+MAN3+=	Encode::EBCDIC.3
+MAN3+=	Encode::Encoder.3
+MAN3+=	Encode::Encoding.3
+MAN3+=	Encode::Guess.3
+MAN3+=	Encode::JP.3
+MAN3+=	Encode::JP::H2Z.3
+MAN3+=	Encode::JP::JIS7.3
+MAN3+=	Encode::KR.3
+MAN3+=	Encode::KR::2022_KR.3
+MAN3+=	Encode::MIME::Header.3
+MAN3+=	Encode::PerlIO.3
+MAN3+=	Encode::Supported.3
+MAN3+=	Encode::Symbol.3
+MAN3+=	Encode::TW.3
+MAN3+=	Encode::Unicode.3
+MAN3+=	Encode::Unicode::UTF7.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::Constant.3
+MAN3+=	ExtUtils::Embed.3
+MAN3+=	ExtUtils::Install.3
+MAN3+=	ExtUtils::Installed.3
+MAN3+=	ExtUtils::Liblist.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+=	Filter::Simple.3
+MAN3+=	Filter::Util::Call.3
+MAN3+=	FindBin.3
+MAN3+=	Getopt::Long.3
+MAN3+=	Getopt::Std.3
+MAN3+=	Hash::Util.3
+MAN3+=	I18N::Collate.3
+MAN3+=	I18N::LangTags.3
+MAN3+=	I18N::LangTags::List.3
+MAN3+=	I18N::Langinfo.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+=	List::Util.3
+MAN3+=	Locale::Constants.3
+MAN3+=	Locale::Country.3
+MAN3+=	Locale::Currency.3
+MAN3+=	Locale::Language.3
+MAN3+=	Locale::Maketext.3
+MAN3+=	Locale::Maketext::TPJ13.3
+MAN3+=	Locale::Script.3
+MAN3+=	MIME::Base64.3
+MAN3+=	MIME::QuotedPrint.3
+MAN3+=	Math::BigFloat.3
+MAN3+=	Math::BigInt.3
+MAN3+=	Math::BigInt::Calc.3
+MAN3+=	Math::BigInt::CalcEmu.3
+MAN3+=	Math::BigRat.3
+MAN3+=	Math::Complex.3
+MAN3+=	Math::Trig.3
+MAN3+=	Memoize.3
+MAN3+=	Memoize::AnyDBM_File.3
+MAN3+=	Memoize::Expire.3
+MAN3+=	Memoize::ExpireFile.3
+MAN3+=	Memoize::ExpireTest.3
+MAN3+=	Memoize::NDBM_File.3
+MAN3+=	Memoize::SDBM_File.3
+MAN3+=	Memoize::Storable.3
+MAN3+=	NDBM_File.3
+MAN3+=	NEXT.3
+MAN3+=	Net::Cmd.3
+MAN3+=	Net::Config.3
+MAN3+=	Net::Domain.3
+MAN3+=	Net::FTP.3
+MAN3+=	Net::NNTP.3
+MAN3+=	Net::Netrc.3
+MAN3+=	Net::POP3.3
+MAN3+=	Net::Ping.3
+MAN3+=	Net::SMTP.3
+MAN3+=	Net::Time.3
+MAN3+=	Net::hostent.3
+MAN3+=	Net::libnetFAQ.3
+MAN3+=	Net::netent.3
+MAN3+=	Net::protoent.3
+MAN3+=	Net::servent.3
+MAN3+=	O.3
+MAN3+=	Opcode.3
+MAN3+=	POSIX.3
+MAN3+=	PerlIO.3
+MAN3+=	PerlIO::encoding.3
+MAN3+=	PerlIO::scalar.3
+MAN3+=	PerlIO::via.3
+MAN3+=	PerlIO::via::QuotedPrint.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::ParseLink.3
+MAN3+=	Pod::ParseUtils.3
+MAN3+=	Pod::Parser.3
+MAN3+=	Pod::Perldoc::ToChecker.3
+MAN3+=	Pod::Perldoc::ToMan.3
+MAN3+=	Pod::Perldoc::ToNroff.3
+MAN3+=	Pod::Perldoc::ToPod.3
+MAN3+=	Pod::Perldoc::ToRtf.3
+MAN3+=	Pod::Perldoc::ToText.3
+MAN3+=	Pod::Perldoc::ToTk.3
+MAN3+=	Pod::Perldoc::ToXml.3
+MAN3+=	Pod::PlainText.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+=	Scalar::Util.3
+MAN3+=	Search::Dict.3
+MAN3+=	SelectSaver.3
+MAN3+=	SelfLoader.3
+MAN3+=	Shell.3
+MAN3+=	Socket.3
+MAN3+=	Storable.3
+MAN3+=	Switch.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::Balanced.3
+MAN3+=	Text::ParseWords.3
+MAN3+=	Text::Soundex.3
+MAN3+=	Text::Tabs.3
+MAN3+=	Text::Wrap.3
+MAN3+=	Thread.3
+MAN3+=	Thread::Queue.3
+MAN3+=	Thread::Semaphore.3
+MAN3+=	Tie::Array.3
+MAN3+=	Tie::File.3
+MAN3+=	Tie::Handle.3
+MAN3+=	Tie::Hash.3
+MAN3+=	Tie::Memoize.3
+MAN3+=	Tie::RefHash.3
+MAN3+=	Tie::Scalar.3
+MAN3+=	Tie::SubstrHash.3
+MAN3+=	Time::HiRes.3
+MAN3+=	Time::Local.3
+MAN3+=	Time::gmtime.3
+MAN3+=	Time::localtime.3
+MAN3+=	Time::tm.3
+MAN3+=	UNIVERSAL.3
+MAN3+=	Unicode::Collate.3
+MAN3+=	Unicode::Normalize.3
+MAN3+=	Unicode::UCD.3
+MAN3+=	User::grent.3
+MAN3+=	User::pwent.3
+MAN3+=	XS::APItest.3
+MAN3+=	XS::Typemap.3
+MAN3+=	XSLoader.3
+MAN3+=	attributes.3
+MAN3+=	attrs.3
+MAN3+=	autouse.3
+MAN3+=	base.3
+MAN3+=	bigint.3
+MAN3+=	bignum.3
+MAN3+=	bigrat.3
+MAN3+=	blib.3
+MAN3+=	bytes.3
+MAN3+=	charnames.3
+MAN3+=	constant.3
+MAN3+=	diagnostics.3
+MAN3+=	encoding.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+=	sort.3
+MAN3+=	strict.3
+MAN3+=	subs.3
+MAN3+=	threads.3
+MAN3+=	threads::shared.3
+MAN3+=	utf8.3
+MAN3+=	vars.3
+MAN3+=	vmsish.3
+MAN3+=	warnings.3
+MAN3+=	warnings::register.3
diff --git a/lang/perl5.10/distinfo b/lang/perl5.10/distinfo
index 9ddd2a2cb528..e6442b145987 100644
--- a/lang/perl5.10/distinfo
+++ b/lang/perl5.10/distinfo
@@ -1,4 +1,4 @@
-MD5 (perl-5.8.2.tar.gz) = fa356b74f99166b63a68a322c3c68f91
-SIZE (perl-5.8.2.tar.gz) = 11896287
-MD5 (BSDPAN-5.8.0_1.tar.gz) = af9f075e073b14714cfeb8a7582013e7
-SIZE (BSDPAN-5.8.0_1.tar.gz) = 6338
+MD5 (perl-5.8.4.tar.bz2) = 3eb135afd0114f4e1acdd4ad6b8fd947
+SIZE (perl-5.8.4.tar.bz2) = 9598489
+MD5 (BSDPAN-5.8.4.tar.bz2) = 966436256621e247cc1fd7cbbfe5030c
+SIZE (BSDPAN-5.8.4.tar.bz2) = 6301
diff --git a/lang/perl5.10/files/patch-freebsd.sh b/lang/perl5.10/files/patch-freebsd.sh
new file mode 100644
index 000000000000..68ec6d4cd8a1
--- /dev/null
+++ b/lang/perl5.10/files/patch-freebsd.sh
@@ -0,0 +1,20 @@
+--- hints/freebsd.sh.orig	Sun May 30 17:55:47 2004
++++ hints/freebsd.sh	Sun May 30 17:57:16 2004
+@@ -88,6 +88,7 @@ case "$osvers" in
+ 	esac
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
+ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ dl / /'`
+ 	# iconv gone in Perl 5.8.1, but if someone compiles 5.8.0 or earlier.
+ 	libswanted=`echo $libswanted | sed 's/ iconv / /'`
+ 	d_setregid='define'
+@@ -102,6 +103,9 @@ case "$osvers" in
+ 	        ;;
+ 	esac
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
++	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ dl / /'`
++	libswanted=`echo $libswanted | sed 's/ iconv / /'`
+ 	;;
+ esac
+ 
diff --git a/lang/perl5.10/files/use.perl b/lang/perl5.10/files/use.perl
index 354c8e1e59cc..ba6057f1c5db 100644
--- a/lang/perl5.10/files/use.perl
+++ b/lang/perl5.10/files/use.perl
@@ -69,6 +69,7 @@ EOF
 	while (<MPOLD>) {
 		next if m|use.perl generated line|;
 		next if m|^\s*OPTIONAL_MANPATH\s+\S+/lib/perl5/%%PERL_VERSION%%/man\s*$|;
+		next if m|^\s*OPTIONAL_MANPATH\s+\S+/lib/perl5/%%PERL_VERSION%%/perl/man\s*$|;
 		print MPNEW;
 	}
 	close MPNEW;
@@ -112,6 +113,7 @@ EOF
 	my $perl_port_manpath = <<EOF;
 # -- use.perl generated line -- #
 OPTIONAL_MANPATH	%%PREFIX%%/lib/perl5/%%PERL_VERSION%%/man
+OPTIONAL_MANPATH	%%PREFIX%%/lib/perl5/%%PERL_VERSION%%/perl/man
 EOF
 
 	open MPOLD, "< /etc/manpath.config" or die "/etc/manpath.config: $!";
diff --git a/lang/perl5.10/pkg-install b/lang/perl5.10/pkg-install
index eb3fde91af87..a1544bccac42 100644
--- a/lang/perl5.10/pkg-install
+++ b/lang/perl5.10/pkg-install
@@ -6,7 +6,9 @@ fi
 
 INCLUDEDIR=/usr/include
 
-install -d ${PKG_PREFIX}/lib/perl5/site_perl/5.8.2/mach
+install -d ${PKG_PREFIX}/lib/perl5/site_perl/5.8.4/mach
+install -d ${PKG_PREFIX}/lib/perl5/site_perl/5.8.4/auto
+install -d ${PKG_PREFIX}/lib/perl5/5.8.4/man/man3
 cd ${INCLUDEDIR} && ${PKG_PREFIX}/bin/h2ph *.h machine/*.h sys/*.h
 
 if [ -z "${OSVERSION}" ]; then
diff --git a/lang/perl5.10/pkg-plist b/lang/perl5.10/pkg-plist
index 52965e7bbf55..a0cc81e1fc48 100644
--- a/lang/perl5.10/pkg-plist
+++ b/lang/perl5.10/pkg-plist
@@ -6,6 +6,7 @@ bin/enc2xs
 bin/find2perl
 bin/h2ph
 bin/h2xs
+bin/instmodsh
 bin/libnetcfg
 bin/perl
 bin/perl%%PERL_VER%%
@@ -24,6 +25,7 @@ bin/pod2text
 bin/pod2usage
 bin/podchecker
 bin/podselect
+bin/prove
 bin/psed
 bin/pstruct
 bin/s2p
@@ -104,8 +106,17 @@ lib/perl5/%%PERL_VER%%/Carp/Heavy.pm
 lib/perl5/%%PERL_VER%%/Class/ISA.pm
 lib/perl5/%%PERL_VER%%/Class/Struct.pm
 lib/perl5/%%PERL_VER%%/DB.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter.pm
+lib/perl5/%%PERL_VER%%/dbm_filter_util.pl
+lib/perl5/%%PERL_VER%%/DBM_Filter/Changes
+lib/perl5/%%PERL_VER%%/DBM_Filter/compress.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/encode.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/int32.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/null.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/utf8.pm
 lib/perl5/%%PERL_VER%%/Devel/SelfStubber.pm
 lib/perl5/%%PERL_VER%%/Digest.pm
+lib/perl5/%%PERL_VER%%/Digest/base.pm
 lib/perl5/%%PERL_VER%%/DirHandle.pm
 lib/perl5/%%PERL_VER%%/Dumpvalue.pm
 lib/perl5/%%PERL_VER%%/Encode/CN/HZ.pm
@@ -166,7 +177,6 @@ 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/testlib.pm
 lib/perl5/%%PERL_VER%%/ExtUtils/typemap
 lib/perl5/%%PERL_VER%%/ExtUtils/xsubpp
@@ -233,7 +243,7 @@ lib/perl5/%%PERL_VER%%/Math/BigFloat.pm
 lib/perl5/%%PERL_VER%%/Math/BigFloat/Trace.pm
 lib/perl5/%%PERL_VER%%/Math/BigInt.pm
 lib/perl5/%%PERL_VER%%/Math/BigInt/Calc.pm
-lib/perl5/%%PERL_VER%%/Math/BigInt/Scalar.pm
+lib/perl5/%%PERL_VER%%/Math/BigInt/CalcEmu.pm
 lib/perl5/%%PERL_VER%%/Math/BigInt/Trace.pm
 lib/perl5/%%PERL_VER%%/Math/BigRat.pm
 lib/perl5/%%PERL_VER%%/Math/Complex.pm
@@ -374,7 +384,6 @@ lib/perl5/%%PERL_VER%%/Unicode/README
 lib/perl5/%%PERL_VER%%/Unicode/UCD.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
@@ -844,6 +853,7 @@ lib/perl5/%%PERL_VER%%/open2.pl
 lib/perl5/%%PERL_VER%%/open3.pl
 lib/perl5/%%PERL_VER%%/overload.pm
 lib/perl5/%%PERL_VER%%/perl5db.pl
+lib/perl5/%%PERL_VER%%/pod/a2p.pod
 lib/perl5/%%PERL_VER%%/pod/perl.pod
 lib/perl5/%%PERL_VER%%/pod/perl5004delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl5005delta.pod
@@ -854,6 +864,9 @@ lib/perl5/%%PERL_VER%%/pod/perl571delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl572delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl573delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl581delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl582delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl583delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl584delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl58delta.pod
 lib/perl5/%%PERL_VER%%/pod/perlaix.pod
 lib/perl5/%%PERL_VER%%/pod/perlamiga.pod
@@ -1247,6 +1260,7 @@ lib/perl5/%%PERL_VER%%/unicore/lib/InYijing.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Inherite.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/JoinCont.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Kannada.pl
+lib/perl5/%%PERL_VER%%/unicore/lib/Katakan2.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Katakana.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Khmer.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/L.pl
@@ -1311,6 +1325,7 @@ lib/perl5/%%PERL_VER%%/unicore/lib/So.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/SoftDott.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Space.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/SpacePer.pl
+lib/perl5/%%PERL_VER%%/unicore/lib/Sterm.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Syriac.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Tagalog.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Tagbanwa.pl
@@ -1326,6 +1341,7 @@ lib/perl5/%%PERL_VER%%/unicore/lib/Ugaritic.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/UnifiedI.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Upper.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Uppercas.pl
+lib/perl5/%%PERL_VER%%/unicore/lib/Variatio.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/WhiteSpa.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Word.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/XDigit.pl
@@ -1454,7 +1470,9 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Scalar 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/List 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Digest 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VER%%/DBM_Filter 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/CN 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/MIME 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/KR 2>/dev/null || true
@@ -1518,13 +1536,18 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute 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%%/auto 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%% 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%%/auto 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 2>/dev/null || true
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile
index 90d96bccfaef..9867d4a1752a 100644
--- a/lang/perl5.12/Makefile
+++ b/lang/perl5.12/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	5
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -15,28 +14,38 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 MASTER_SITE_SUBDIR=	../../src \
 			tobez/:local ./:local
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		BSDPAN-5.8.0_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
+		BSDPAN-${PERL_VER}${EXTRACT_SUFX}:local
+#		BSDPAN-5.8.0_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
 
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Practical Extraction and Report Language
 
-PERL_VER=	5.8.2
+PERL_VER=	5.8.4
 PERL_ARCH=	mach
 PERL_VERSION=	${PERL_VER}
 
+USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 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 \
+	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \
 	-Dman1dir=${PREFIX}/man/man1 \
-	-Dsitearch=${SITE_PERL}/${PERL_ARCH} \
-	-Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \
+	-Duse64bitint \
+	-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}\"
 
+INCLUDEDIR=	/usr/include
+
+.include "Makefile.man"
+.include <bsd.port.pre.mk>
+
 .if defined(ENABLE_SUIDPERL)
 CONFIGURE_ARGS+=	-Dd_dosuid=define
 PLIST_SUB+=		ENABLE_SUIDPERL=""
@@ -76,137 +85,16 @@ CONFIGURE_ARGS+=	-Dusemymalloc=y
 CONFIGURE_ARGS+=	-Dusemymalloc=n
 .endif
 
-INCLUDEDIR=	/usr/include
-
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} < 502100
 LATEST_LINK=	perl5.8
 .else
 PKGMESSAGE=	${PKGDIR}/.not-here
 .endif
 
-MAN1=	a2p.1 c2ph.1 dprofpp.1 enc2xs.1 find2perl.1 h2ph.1 h2xs.1 \
-	libnetcfg.1 perl.1 perl5004delta.1 perl5005delta.1 \
-	perl561delta.1 perl56delta.1 perl570delta.1 perl571delta.1 \
-	perl572delta.1 perlaix.1 perlamiga.1 perlapi.1 perlapio.1 \
-	perlapollo.1 perlbeos.1 perlbook.1 perlboot.1 perlbot.1 \
-	perlbs2000.1 perlbug.1 perlcall.1 perlcc.1 perlce.1 perlclib.1 \
-	perlcn.1 perlcompile.1 perlcygwin.1 perldata.1 perldbmfilter.1 \
-	perldebguts.1 perldebtut.1 perldebug.1 perldelta.1 perldgux.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 \
-	perlfreebsd.1 perlfunc.1 perlguts.1 perlhack.1 perlhist.1 \
-	perlhpux.1 perlhurd.1 perlintern.1 perlintro.1 perliol.1 \
-	perlipc.1 perlirix.1 perlivp.1 perljp.1 perlko.1 perllexwarn.1 \
-	perllocale.1 perllol.1 perlmachten.1 perlmacos.1 perlmint.1 \
-	perlmod.1 perlmodinstall.1 perlmodlib.1 perlmodstyle.1 \
-	perlmpeix.1 perlnetware.1 perlnewmod.1 perlnumber.1 perlobj.1 \
-	perlop.1 perlopentut.1 perlos2.1 perlos390.1 perlothrtut.1 \
-	perlpacktut.1 perlplan9.1 perlpod.1 perlpodspec.1 perlport.1 \
-	perlqnx.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 \
-	perltooc.1 perltoot.1 perltrap.1 perltru64.1 perltw.1 \
-	perlunicode.1 perluniintro.1 perlutil.1 perluts.1 perlvar.1 \
-	perlvmesa.1 perlvms.1 perlvos.1 perlwin32.1 perlxs.1 perlxstut.1 \
-	piconv.1 pl2pm.1 pod2html.1 pod2latex.1 pod2man.1 pod2text.1 \
-	pod2usage.1 podchecker.1 podselect.1 psed.1 pstruct.1 s2p.1 \
-	splain.1 xsubpp.1 cpan.1  perl573delta.1 perl58delta.1 perl581delta.1 \
-	perlartistic.1 perlcheat.1 perlgpl.1 perlmacosx.1 perlos400.1 \
-	perlreref.1
-
-MAN3=	AnyDBM_File.3 Attribute::Handlers.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::ISA.3 Class::Struct.3 Config.3 Cwd.3 \
-	DB.3 DB_File.3 Data::Dumper.3 Devel::DProf.3 Devel::PPPort.3 \
-	Devel::Peek.3 Devel::SelfStubber.3 Digest.3 Digest::MD5.3 \
-	DirHandle.3 Dumpvalue.3 DynaLoader.3 Encode.3 Encode::Alias.3 \
-	Encode::Byte.3 Encode::CJKConstants.3 Encode::CN.3 \
-	Encode::CN::HZ.3 Encode::Config.3 Encode::EBCDIC.3 \
-	Encode::Encoder.3 Encode::Encoding.3 Encode::Guess.3 \
-	Encode::JP.3 Encode::JP::H2Z.3 Encode::JP::JIS7.3 Encode::KR.3 \
-	Encode::KR::2022_KR.3 Encode::MIME::Header.3 Encode::PerlIO.3 \
-	Encode::Supported.3 Encode::Symbol.3 Encode::TW.3 \
-	Encode::Unicode.3 Encode::Unicode::UTF7.3 English.3 Env.3 Errno.3 \
-	Exporter.3 Exporter::Heavy.3 ExtUtils::Command.3 \
-	ExtUtils::Command::MM.3 ExtUtils::Constant.3 ExtUtils::Embed.3 \
-	ExtUtils::Install.3 ExtUtils::Installed.3 ExtUtils::Liblist.3 \
-	ExtUtils::MM.3 ExtUtils::MM_Any.3 ExtUtils::MM_BeOS.3 \
-	ExtUtils::MM_Cygwin.3 ExtUtils::MM_DOS.3 ExtUtils::MM_MacOS.3 \
-	ExtUtils::MM_NW5.3 ExtUtils::MM_OS2.3 ExtUtils::MM_UWIN.3 \
-	ExtUtils::MM_Unix.3 ExtUtils::MM_VMS.3 ExtUtils::MM_Win32.3 \
-	ExtUtils::MM_Win95.3 ExtUtils::MY.3 ExtUtils::MakeMaker.3 \
-	ExtUtils::MakeMaker::FAQ.3 ExtUtils::MakeMaker::Tutorial.3 \
-	ExtUtils::MakeMaker::bytes.3 ExtUtils::MakeMaker::vmsish.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::Cygwin.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 Filter::Simple.3 \
-	Filter::Util::Call.3 FindBin.3 Getopt::Long.3 Getopt::Std.3 \
-	Hash::Util.3 I18N::Collate.3 I18N::LangTags.3 I18N::LangTags::List.3 \
-	I18N::Langinfo.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 List::Util.3 \
-	Locale::Constants.3 Locale::Country.3 Locale::Currency.3 \
-	Locale::Language.3 Locale::Maketext.3 Locale::Maketext::TPJ13.3 \
-	Locale::Script.3 MIME::Base64.3 MIME::QuotedPrint.3 \
-	Math::BigFloat.3 Math::BigInt.3 Math::BigInt::Calc.3 \
-	Math::BigInt::Scalar.3 Math::BigRat.3 \
-	Math::Complex.3 Math::Trig.3 Memoize.3 Memoize::AnyDBM_File.3 \
-	Memoize::Expire.3 Memoize::ExpireFile.3 Memoize::ExpireTest.3 \
-	Memoize::NDBM_File.3 Memoize::SDBM_File.3 Memoize::Storable.3 \
-	NDBM_File.3 NEXT.3 Net::Cmd.3 Net::Config.3 Net::Domain.3 \
-	Net::FTP.3 Net::NNTP.3 Net::Netrc.3 Net::POP3.3 \
-	Net::Ping.3 Net::SMTP.3 Net::Time.3 Net::hostent.3 \
-	Net::libnetFAQ.3 Net::netent.3 Net::protoent.3 Net::servent.3 \
-	O.3 Opcode.3 POSIX.3 PerlIO.3 PerlIO::encoding.3 PerlIO::scalar.3 \
-	PerlIO::via.3 PerlIO::via::QuotedPrint.3 Pod::Checker.3 \
-	Pod::Find.3 Pod::Html.3 Pod::InputObjects.3 Pod::LaTeX.3 \
-	Pod::Man.3 Pod::ParseLink.3 Pod::ParseUtils.3 Pod::Parser.3 \
-	Pod::Perldoc::ToChecker.3 Pod::Perldoc::ToMan.3 \
-	Pod::Perldoc::ToNroff.3 Pod::Perldoc::ToPod.3 Pod::Perldoc::ToRtf.3 \
-	Pod::Perldoc::ToText.3 Pod::Perldoc::ToTk.3 Pod::Perldoc::ToXml.3 \
-	Pod::PlainText.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 Scalar::Util.3 Search::Dict.3 SelectSaver.3 \
-	SelfLoader.3 Shell.3 Socket.3 Storable.3 Switch.3 Symbol.3 \
-	Sys::Hostname.3 Sys::Syslog.3 Term::ANSIColor.3 Term::Cap.3 \
-	Term::Complete.3 Term::ReadLine.3 Test.3 Test::Builder.3 \
-	Test::Harness.3 Test::Harness::Assert.3 Test::Harness::Iterator.3 \
-	Test::Harness::Straps.3 Test::More.3 Test::Simple.3 Test::Tutorial.3 \
-	Text::Abbrev.3 Text::Balanced.3 Text::ParseWords.3 \
-	Text::Soundex.3 Text::Tabs.3 Text::Wrap.3 Thread.3 Thread::Queue.3 \
-	Thread::Semaphore.3 Tie::Array.3 Tie::File.3 Tie::Handle.3 \
-	Tie::Hash.3 Tie::Memoize.3 Tie::RefHash.3 Tie::Scalar.3 \
-	Tie::SubstrHash.3 Time::HiRes.3 Time::Local.3 Time::gmtime.3 \
-	Time::localtime.3 Time::tm.3 UNIVERSAL.3 Unicode::Collate.3 \
-	Unicode::Normalize.3 Unicode::UCD.3 User::grent.3 User::pwent.3 \
-	Win32.3 XS::APItest.3 XS::Typemap.3 XSLoader.3 attributes.3 \
-	attrs.3 autouse.3 base.3 bigint.3 bignum.3 bigrat.3 blib.3 \
-	bytes.3 charnames.3 constant.3 diagnostics.3 encoding.3 \
-	fields.3 filetest.3 if.3 integer.3 less.3 lib.3 locale.3 \
-	open.3 ops.3 overload.3 re.3 sigtrap.3 sort.3 strict.3 \
-	subs.3 threads.3 threads::shared.3 utf8.3 vars.3 vmsish.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)
@@ -214,8 +102,8 @@ 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
-BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-5.8.0
-BSDPAN_REVISION=1
+BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-5.8.4
+# BSDPAN_REVISION=1
 
 post-patch:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
@@ -240,7 +128,9 @@ post-install:
 		${BSDPAN_WRKSRC}/${files} ${BSDPAN_DEST}/${files}
 .endfor
 	@(cd ${INCLUDEDIR} && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h)
-	${MKDIR} ${SITE_PERL}/${PERL_ARCH}/auto
+	${MKDIR} ${PREFIX}/${SITE_PERL_REL}/auto
+	${MKDIR} ${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto
+	${MKDIR} ${PREFIX}/lib/perl5/${PERL_VER}/man/man3
 .if ${OSVERSION} < 502100
 	@fmt ${PKGMESSAGE}
 .else
diff --git a/lang/perl5.12/Makefile.man b/lang/perl5.12/Makefile.man
new file mode 100644
index 000000000000..30fe98bb0f88
--- /dev/null
+++ b/lang/perl5.12/Makefile.man
@@ -0,0 +1,500 @@
+# $Id$
+
+MAN1+=	a2p.1
+MAN1+=	c2ph.1
+MAN1+=	cpan.1
+MAN1+=	dprofpp.1
+MAN1+=	enc2xs.1
+MAN1+=	find2perl.1
+MAN1+=	h2ph.1
+MAN1+=	h2xs.1
+MAN1+=	libnetcfg.1
+MAN1+=	perl.1
+MAN1+=	perl5004delta.1
+MAN1+=	perl5005delta.1
+MAN1+=	perl561delta.1
+MAN1+=	perl56delta.1
+MAN1+=	perl570delta.1
+MAN1+=	perl571delta.1
+MAN1+=	perl572delta.1
+MAN1+=	perl573delta.1
+MAN1+=	perl581delta.1
+MAN1+=	perl582delta.1
+MAN1+=	perl583delta.1
+MAN1+=	perl584delta.1
+MAN1+=	perl58delta.1
+MAN1+=	perlaix.1
+MAN1+=	perlamiga.1
+MAN1+=	perlapi.1
+MAN1+=	perlapio.1
+MAN1+=	perlapollo.1
+MAN1+=	perlartistic.1
+MAN1+=	perlbeos.1
+MAN1+=	perlbook.1
+MAN1+=	perlboot.1
+MAN1+=	perlbot.1
+MAN1+=	perlbs2000.1
+MAN1+=	perlbug.1
+MAN1+=	perlcall.1
+MAN1+=	perlcc.1
+MAN1+=	perlce.1
+MAN1+=	perlcheat.1
+MAN1+=	perlclib.1
+MAN1+=	perlcn.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+=	perldgux.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+=	perlfreebsd.1
+MAN1+=	perlfunc.1
+MAN1+=	perlgpl.1
+MAN1+=	perlguts.1
+MAN1+=	perlhack.1
+MAN1+=	perlhist.1
+MAN1+=	perlhpux.1
+MAN1+=	perlhurd.1
+MAN1+=	perlintern.1
+MAN1+=	perlintro.1
+MAN1+=	perliol.1
+MAN1+=	perlipc.1
+MAN1+=	perlirix.1
+MAN1+=	perlivp.1
+MAN1+=	perljp.1
+MAN1+=	perlko.1
+MAN1+=	perllexwarn.1
+MAN1+=	perllocale.1
+MAN1+=	perllol.1
+MAN1+=	perlmachten.1
+MAN1+=	perlmacos.1
+MAN1+=	perlmacosx.1
+MAN1+=	perlmint.1
+MAN1+=	perlmod.1
+MAN1+=	perlmodinstall.1
+MAN1+=	perlmodlib.1
+MAN1+=	perlmodstyle.1
+MAN1+=	perlmpeix.1
+MAN1+=	perlnetware.1
+MAN1+=	perlnewmod.1
+MAN1+=	perlnumber.1
+MAN1+=	perlobj.1
+MAN1+=	perlop.1
+MAN1+=	perlopentut.1
+MAN1+=	perlos2.1
+MAN1+=	perlos390.1
+MAN1+=	perlos400.1
+MAN1+=	perlothrtut.1
+MAN1+=	perlpacktut.1
+MAN1+=	perlplan9.1
+MAN1+=	perlpod.1
+MAN1+=	perlpodspec.1
+MAN1+=	perlport.1
+MAN1+=	perlqnx.1
+MAN1+=	perlre.1
+MAN1+=	perlref.1
+MAN1+=	perlreftut.1
+MAN1+=	perlrequick.1
+MAN1+=	perlreref.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+=	perltooc.1
+MAN1+=	perltoot.1
+MAN1+=	perltrap.1
+MAN1+=	perltru64.1
+MAN1+=	perltw.1
+MAN1+=	perlunicode.1
+MAN1+=	perluniintro.1
+MAN1+=	perlutil.1
+MAN1+=	perluts.1
+MAN1+=	perlvar.1
+MAN1+=	perlvmesa.1
+MAN1+=	perlvms.1
+MAN1+=	perlvos.1
+MAN1+=	perlwin32.1
+MAN1+=	perlxs.1
+MAN1+=	perlxstut.1
+MAN1+=	piconv.1
+MAN1+=	pl2pm.1
+MAN1+=	pod2html.1
+MAN1+=	pod2latex.1
+MAN1+=	pod2man.1
+MAN1+=	pod2text.1
+MAN1+=	pod2usage.1
+MAN1+=	podchecker.1
+MAN1+=	podselect.1
+MAN1+=	prove.1
+MAN1+=	psed.1
+MAN1+=	pstruct.1
+MAN1+=	s2p.1
+MAN1+=	splain.1
+MAN1+=	xsubpp.1
+
+MAN3+=	AnyDBM_File.3
+MAN3+=	Attribute::Handlers.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::ISA.3
+MAN3+=	Class::Struct.3
+MAN3+=	Config.3
+MAN3+=	Cwd.3
+MAN3+=	DB.3
+MAN3+=	DBM_Filter.3
+MAN3+=	DBM_Filter::compress.3
+MAN3+=	DBM_Filter::encode.3
+MAN3+=	DBM_Filter::int32.3
+MAN3+=	DBM_Filter::null.3
+MAN3+=	DBM_Filter::utf8.3
+MAN3+=	DB_File.3
+MAN3+=	Data::Dumper.3
+MAN3+=	Devel::DProf.3
+MAN3+=	Devel::PPPort.3
+MAN3+=	Devel::Peek.3
+MAN3+=	Devel::SelfStubber.3
+MAN3+=	Digest.3
+MAN3+=	Digest::MD5.3
+MAN3+=	Digest::base.3
+MAN3+=	DirHandle.3
+MAN3+=	Dumpvalue.3
+MAN3+=	DynaLoader.3
+MAN3+=	Encode.3
+MAN3+=	Encode::Alias.3
+MAN3+=	Encode::Byte.3
+MAN3+=	Encode::CJKConstants.3
+MAN3+=	Encode::CN.3
+MAN3+=	Encode::CN::HZ.3
+MAN3+=	Encode::Config.3
+MAN3+=	Encode::EBCDIC.3
+MAN3+=	Encode::Encoder.3
+MAN3+=	Encode::Encoding.3
+MAN3+=	Encode::Guess.3
+MAN3+=	Encode::JP.3
+MAN3+=	Encode::JP::H2Z.3
+MAN3+=	Encode::JP::JIS7.3
+MAN3+=	Encode::KR.3
+MAN3+=	Encode::KR::2022_KR.3
+MAN3+=	Encode::MIME::Header.3
+MAN3+=	Encode::PerlIO.3
+MAN3+=	Encode::Supported.3
+MAN3+=	Encode::Symbol.3
+MAN3+=	Encode::TW.3
+MAN3+=	Encode::Unicode.3
+MAN3+=	Encode::Unicode::UTF7.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::Constant.3
+MAN3+=	ExtUtils::Embed.3
+MAN3+=	ExtUtils::Install.3
+MAN3+=	ExtUtils::Installed.3
+MAN3+=	ExtUtils::Liblist.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+=	Filter::Simple.3
+MAN3+=	Filter::Util::Call.3
+MAN3+=	FindBin.3
+MAN3+=	Getopt::Long.3
+MAN3+=	Getopt::Std.3
+MAN3+=	Hash::Util.3
+MAN3+=	I18N::Collate.3
+MAN3+=	I18N::LangTags.3
+MAN3+=	I18N::LangTags::List.3
+MAN3+=	I18N::Langinfo.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+=	List::Util.3
+MAN3+=	Locale::Constants.3
+MAN3+=	Locale::Country.3
+MAN3+=	Locale::Currency.3
+MAN3+=	Locale::Language.3
+MAN3+=	Locale::Maketext.3
+MAN3+=	Locale::Maketext::TPJ13.3
+MAN3+=	Locale::Script.3
+MAN3+=	MIME::Base64.3
+MAN3+=	MIME::QuotedPrint.3
+MAN3+=	Math::BigFloat.3
+MAN3+=	Math::BigInt.3
+MAN3+=	Math::BigInt::Calc.3
+MAN3+=	Math::BigInt::CalcEmu.3
+MAN3+=	Math::BigRat.3
+MAN3+=	Math::Complex.3
+MAN3+=	Math::Trig.3
+MAN3+=	Memoize.3
+MAN3+=	Memoize::AnyDBM_File.3
+MAN3+=	Memoize::Expire.3
+MAN3+=	Memoize::ExpireFile.3
+MAN3+=	Memoize::ExpireTest.3
+MAN3+=	Memoize::NDBM_File.3
+MAN3+=	Memoize::SDBM_File.3
+MAN3+=	Memoize::Storable.3
+MAN3+=	NDBM_File.3
+MAN3+=	NEXT.3
+MAN3+=	Net::Cmd.3
+MAN3+=	Net::Config.3
+MAN3+=	Net::Domain.3
+MAN3+=	Net::FTP.3
+MAN3+=	Net::NNTP.3
+MAN3+=	Net::Netrc.3
+MAN3+=	Net::POP3.3
+MAN3+=	Net::Ping.3
+MAN3+=	Net::SMTP.3
+MAN3+=	Net::Time.3
+MAN3+=	Net::hostent.3
+MAN3+=	Net::libnetFAQ.3
+MAN3+=	Net::netent.3
+MAN3+=	Net::protoent.3
+MAN3+=	Net::servent.3
+MAN3+=	O.3
+MAN3+=	Opcode.3
+MAN3+=	POSIX.3
+MAN3+=	PerlIO.3
+MAN3+=	PerlIO::encoding.3
+MAN3+=	PerlIO::scalar.3
+MAN3+=	PerlIO::via.3
+MAN3+=	PerlIO::via::QuotedPrint.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::ParseLink.3
+MAN3+=	Pod::ParseUtils.3
+MAN3+=	Pod::Parser.3
+MAN3+=	Pod::Perldoc::ToChecker.3
+MAN3+=	Pod::Perldoc::ToMan.3
+MAN3+=	Pod::Perldoc::ToNroff.3
+MAN3+=	Pod::Perldoc::ToPod.3
+MAN3+=	Pod::Perldoc::ToRtf.3
+MAN3+=	Pod::Perldoc::ToText.3
+MAN3+=	Pod::Perldoc::ToTk.3
+MAN3+=	Pod::Perldoc::ToXml.3
+MAN3+=	Pod::PlainText.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+=	Scalar::Util.3
+MAN3+=	Search::Dict.3
+MAN3+=	SelectSaver.3
+MAN3+=	SelfLoader.3
+MAN3+=	Shell.3
+MAN3+=	Socket.3
+MAN3+=	Storable.3
+MAN3+=	Switch.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::Balanced.3
+MAN3+=	Text::ParseWords.3
+MAN3+=	Text::Soundex.3
+MAN3+=	Text::Tabs.3
+MAN3+=	Text::Wrap.3
+MAN3+=	Thread.3
+MAN3+=	Thread::Queue.3
+MAN3+=	Thread::Semaphore.3
+MAN3+=	Tie::Array.3
+MAN3+=	Tie::File.3
+MAN3+=	Tie::Handle.3
+MAN3+=	Tie::Hash.3
+MAN3+=	Tie::Memoize.3
+MAN3+=	Tie::RefHash.3
+MAN3+=	Tie::Scalar.3
+MAN3+=	Tie::SubstrHash.3
+MAN3+=	Time::HiRes.3
+MAN3+=	Time::Local.3
+MAN3+=	Time::gmtime.3
+MAN3+=	Time::localtime.3
+MAN3+=	Time::tm.3
+MAN3+=	UNIVERSAL.3
+MAN3+=	Unicode::Collate.3
+MAN3+=	Unicode::Normalize.3
+MAN3+=	Unicode::UCD.3
+MAN3+=	User::grent.3
+MAN3+=	User::pwent.3
+MAN3+=	XS::APItest.3
+MAN3+=	XS::Typemap.3
+MAN3+=	XSLoader.3
+MAN3+=	attributes.3
+MAN3+=	attrs.3
+MAN3+=	autouse.3
+MAN3+=	base.3
+MAN3+=	bigint.3
+MAN3+=	bignum.3
+MAN3+=	bigrat.3
+MAN3+=	blib.3
+MAN3+=	bytes.3
+MAN3+=	charnames.3
+MAN3+=	constant.3
+MAN3+=	diagnostics.3
+MAN3+=	encoding.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+=	sort.3
+MAN3+=	strict.3
+MAN3+=	subs.3
+MAN3+=	threads.3
+MAN3+=	threads::shared.3
+MAN3+=	utf8.3
+MAN3+=	vars.3
+MAN3+=	vmsish.3
+MAN3+=	warnings.3
+MAN3+=	warnings::register.3
diff --git a/lang/perl5.12/distinfo b/lang/perl5.12/distinfo
index 9ddd2a2cb528..e6442b145987 100644
--- a/lang/perl5.12/distinfo
+++ b/lang/perl5.12/distinfo
@@ -1,4 +1,4 @@
-MD5 (perl-5.8.2.tar.gz) = fa356b74f99166b63a68a322c3c68f91
-SIZE (perl-5.8.2.tar.gz) = 11896287
-MD5 (BSDPAN-5.8.0_1.tar.gz) = af9f075e073b14714cfeb8a7582013e7
-SIZE (BSDPAN-5.8.0_1.tar.gz) = 6338
+MD5 (perl-5.8.4.tar.bz2) = 3eb135afd0114f4e1acdd4ad6b8fd947
+SIZE (perl-5.8.4.tar.bz2) = 9598489
+MD5 (BSDPAN-5.8.4.tar.bz2) = 966436256621e247cc1fd7cbbfe5030c
+SIZE (BSDPAN-5.8.4.tar.bz2) = 6301
diff --git a/lang/perl5.12/files/patch-freebsd.sh b/lang/perl5.12/files/patch-freebsd.sh
new file mode 100644
index 000000000000..68ec6d4cd8a1
--- /dev/null
+++ b/lang/perl5.12/files/patch-freebsd.sh
@@ -0,0 +1,20 @@
+--- hints/freebsd.sh.orig	Sun May 30 17:55:47 2004
++++ hints/freebsd.sh	Sun May 30 17:57:16 2004
+@@ -88,6 +88,7 @@ case "$osvers" in
+ 	esac
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
+ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ dl / /'`
+ 	# iconv gone in Perl 5.8.1, but if someone compiles 5.8.0 or earlier.
+ 	libswanted=`echo $libswanted | sed 's/ iconv / /'`
+ 	d_setregid='define'
+@@ -102,6 +103,9 @@ case "$osvers" in
+ 	        ;;
+ 	esac
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
++	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ dl / /'`
++	libswanted=`echo $libswanted | sed 's/ iconv / /'`
+ 	;;
+ esac
+ 
diff --git a/lang/perl5.12/files/use.perl b/lang/perl5.12/files/use.perl
index 354c8e1e59cc..ba6057f1c5db 100644
--- a/lang/perl5.12/files/use.perl
+++ b/lang/perl5.12/files/use.perl
@@ -69,6 +69,7 @@ EOF
 	while (<MPOLD>) {
 		next if m|use.perl generated line|;
 		next if m|^\s*OPTIONAL_MANPATH\s+\S+/lib/perl5/%%PERL_VERSION%%/man\s*$|;
+		next if m|^\s*OPTIONAL_MANPATH\s+\S+/lib/perl5/%%PERL_VERSION%%/perl/man\s*$|;
 		print MPNEW;
 	}
 	close MPNEW;
@@ -112,6 +113,7 @@ EOF
 	my $perl_port_manpath = <<EOF;
 # -- use.perl generated line -- #
 OPTIONAL_MANPATH	%%PREFIX%%/lib/perl5/%%PERL_VERSION%%/man
+OPTIONAL_MANPATH	%%PREFIX%%/lib/perl5/%%PERL_VERSION%%/perl/man
 EOF
 
 	open MPOLD, "< /etc/manpath.config" or die "/etc/manpath.config: $!";
diff --git a/lang/perl5.12/pkg-install b/lang/perl5.12/pkg-install
index eb3fde91af87..a1544bccac42 100644
--- a/lang/perl5.12/pkg-install
+++ b/lang/perl5.12/pkg-install
@@ -6,7 +6,9 @@ fi
 
 INCLUDEDIR=/usr/include
 
-install -d ${PKG_PREFIX}/lib/perl5/site_perl/5.8.2/mach
+install -d ${PKG_PREFIX}/lib/perl5/site_perl/5.8.4/mach
+install -d ${PKG_PREFIX}/lib/perl5/site_perl/5.8.4/auto
+install -d ${PKG_PREFIX}/lib/perl5/5.8.4/man/man3
 cd ${INCLUDEDIR} && ${PKG_PREFIX}/bin/h2ph *.h machine/*.h sys/*.h
 
 if [ -z "${OSVERSION}" ]; then
diff --git a/lang/perl5.12/pkg-plist b/lang/perl5.12/pkg-plist
index 52965e7bbf55..a0cc81e1fc48 100644
--- a/lang/perl5.12/pkg-plist
+++ b/lang/perl5.12/pkg-plist
@@ -6,6 +6,7 @@ bin/enc2xs
 bin/find2perl
 bin/h2ph
 bin/h2xs
+bin/instmodsh
 bin/libnetcfg
 bin/perl
 bin/perl%%PERL_VER%%
@@ -24,6 +25,7 @@ bin/pod2text
 bin/pod2usage
 bin/podchecker
 bin/podselect
+bin/prove
 bin/psed
 bin/pstruct
 bin/s2p
@@ -104,8 +106,17 @@ lib/perl5/%%PERL_VER%%/Carp/Heavy.pm
 lib/perl5/%%PERL_VER%%/Class/ISA.pm
 lib/perl5/%%PERL_VER%%/Class/Struct.pm
 lib/perl5/%%PERL_VER%%/DB.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter.pm
+lib/perl5/%%PERL_VER%%/dbm_filter_util.pl
+lib/perl5/%%PERL_VER%%/DBM_Filter/Changes
+lib/perl5/%%PERL_VER%%/DBM_Filter/compress.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/encode.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/int32.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/null.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/utf8.pm
 lib/perl5/%%PERL_VER%%/Devel/SelfStubber.pm
 lib/perl5/%%PERL_VER%%/Digest.pm
+lib/perl5/%%PERL_VER%%/Digest/base.pm
 lib/perl5/%%PERL_VER%%/DirHandle.pm
 lib/perl5/%%PERL_VER%%/Dumpvalue.pm
 lib/perl5/%%PERL_VER%%/Encode/CN/HZ.pm
@@ -166,7 +177,6 @@ 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/testlib.pm
 lib/perl5/%%PERL_VER%%/ExtUtils/typemap
 lib/perl5/%%PERL_VER%%/ExtUtils/xsubpp
@@ -233,7 +243,7 @@ lib/perl5/%%PERL_VER%%/Math/BigFloat.pm
 lib/perl5/%%PERL_VER%%/Math/BigFloat/Trace.pm
 lib/perl5/%%PERL_VER%%/Math/BigInt.pm
 lib/perl5/%%PERL_VER%%/Math/BigInt/Calc.pm
-lib/perl5/%%PERL_VER%%/Math/BigInt/Scalar.pm
+lib/perl5/%%PERL_VER%%/Math/BigInt/CalcEmu.pm
 lib/perl5/%%PERL_VER%%/Math/BigInt/Trace.pm
 lib/perl5/%%PERL_VER%%/Math/BigRat.pm
 lib/perl5/%%PERL_VER%%/Math/Complex.pm
@@ -374,7 +384,6 @@ lib/perl5/%%PERL_VER%%/Unicode/README
 lib/perl5/%%PERL_VER%%/Unicode/UCD.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
@@ -844,6 +853,7 @@ lib/perl5/%%PERL_VER%%/open2.pl
 lib/perl5/%%PERL_VER%%/open3.pl
 lib/perl5/%%PERL_VER%%/overload.pm
 lib/perl5/%%PERL_VER%%/perl5db.pl
+lib/perl5/%%PERL_VER%%/pod/a2p.pod
 lib/perl5/%%PERL_VER%%/pod/perl.pod
 lib/perl5/%%PERL_VER%%/pod/perl5004delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl5005delta.pod
@@ -854,6 +864,9 @@ lib/perl5/%%PERL_VER%%/pod/perl571delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl572delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl573delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl581delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl582delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl583delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl584delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl58delta.pod
 lib/perl5/%%PERL_VER%%/pod/perlaix.pod
 lib/perl5/%%PERL_VER%%/pod/perlamiga.pod
@@ -1247,6 +1260,7 @@ lib/perl5/%%PERL_VER%%/unicore/lib/InYijing.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Inherite.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/JoinCont.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Kannada.pl
+lib/perl5/%%PERL_VER%%/unicore/lib/Katakan2.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Katakana.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Khmer.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/L.pl
@@ -1311,6 +1325,7 @@ lib/perl5/%%PERL_VER%%/unicore/lib/So.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/SoftDott.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Space.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/SpacePer.pl
+lib/perl5/%%PERL_VER%%/unicore/lib/Sterm.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Syriac.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Tagalog.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Tagbanwa.pl
@@ -1326,6 +1341,7 @@ lib/perl5/%%PERL_VER%%/unicore/lib/Ugaritic.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/UnifiedI.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Upper.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Uppercas.pl
+lib/perl5/%%PERL_VER%%/unicore/lib/Variatio.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/WhiteSpa.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Word.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/XDigit.pl
@@ -1454,7 +1470,9 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Scalar 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/List 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Digest 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VER%%/DBM_Filter 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/CN 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/MIME 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/KR 2>/dev/null || true
@@ -1518,13 +1536,18 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute 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%%/auto 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%% 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%%/auto 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 2>/dev/null || true
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index 90d96bccfaef..9867d4a1752a 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	5
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -15,28 +14,38 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 MASTER_SITE_SUBDIR=	../../src \
 			tobez/:local ./:local
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		BSDPAN-5.8.0_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
+		BSDPAN-${PERL_VER}${EXTRACT_SUFX}:local
+#		BSDPAN-5.8.0_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
 
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Practical Extraction and Report Language
 
-PERL_VER=	5.8.2
+PERL_VER=	5.8.4
 PERL_ARCH=	mach
 PERL_VERSION=	${PERL_VER}
 
+USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 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 \
+	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \
 	-Dman1dir=${PREFIX}/man/man1 \
-	-Dsitearch=${SITE_PERL}/${PERL_ARCH} \
-	-Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \
+	-Duse64bitint \
+	-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}\"
 
+INCLUDEDIR=	/usr/include
+
+.include "Makefile.man"
+.include <bsd.port.pre.mk>
+
 .if defined(ENABLE_SUIDPERL)
 CONFIGURE_ARGS+=	-Dd_dosuid=define
 PLIST_SUB+=		ENABLE_SUIDPERL=""
@@ -76,137 +85,16 @@ CONFIGURE_ARGS+=	-Dusemymalloc=y
 CONFIGURE_ARGS+=	-Dusemymalloc=n
 .endif
 
-INCLUDEDIR=	/usr/include
-
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} < 502100
 LATEST_LINK=	perl5.8
 .else
 PKGMESSAGE=	${PKGDIR}/.not-here
 .endif
 
-MAN1=	a2p.1 c2ph.1 dprofpp.1 enc2xs.1 find2perl.1 h2ph.1 h2xs.1 \
-	libnetcfg.1 perl.1 perl5004delta.1 perl5005delta.1 \
-	perl561delta.1 perl56delta.1 perl570delta.1 perl571delta.1 \
-	perl572delta.1 perlaix.1 perlamiga.1 perlapi.1 perlapio.1 \
-	perlapollo.1 perlbeos.1 perlbook.1 perlboot.1 perlbot.1 \
-	perlbs2000.1 perlbug.1 perlcall.1 perlcc.1 perlce.1 perlclib.1 \
-	perlcn.1 perlcompile.1 perlcygwin.1 perldata.1 perldbmfilter.1 \
-	perldebguts.1 perldebtut.1 perldebug.1 perldelta.1 perldgux.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 \
-	perlfreebsd.1 perlfunc.1 perlguts.1 perlhack.1 perlhist.1 \
-	perlhpux.1 perlhurd.1 perlintern.1 perlintro.1 perliol.1 \
-	perlipc.1 perlirix.1 perlivp.1 perljp.1 perlko.1 perllexwarn.1 \
-	perllocale.1 perllol.1 perlmachten.1 perlmacos.1 perlmint.1 \
-	perlmod.1 perlmodinstall.1 perlmodlib.1 perlmodstyle.1 \
-	perlmpeix.1 perlnetware.1 perlnewmod.1 perlnumber.1 perlobj.1 \
-	perlop.1 perlopentut.1 perlos2.1 perlos390.1 perlothrtut.1 \
-	perlpacktut.1 perlplan9.1 perlpod.1 perlpodspec.1 perlport.1 \
-	perlqnx.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 \
-	perltooc.1 perltoot.1 perltrap.1 perltru64.1 perltw.1 \
-	perlunicode.1 perluniintro.1 perlutil.1 perluts.1 perlvar.1 \
-	perlvmesa.1 perlvms.1 perlvos.1 perlwin32.1 perlxs.1 perlxstut.1 \
-	piconv.1 pl2pm.1 pod2html.1 pod2latex.1 pod2man.1 pod2text.1 \
-	pod2usage.1 podchecker.1 podselect.1 psed.1 pstruct.1 s2p.1 \
-	splain.1 xsubpp.1 cpan.1  perl573delta.1 perl58delta.1 perl581delta.1 \
-	perlartistic.1 perlcheat.1 perlgpl.1 perlmacosx.1 perlos400.1 \
-	perlreref.1
-
-MAN3=	AnyDBM_File.3 Attribute::Handlers.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::ISA.3 Class::Struct.3 Config.3 Cwd.3 \
-	DB.3 DB_File.3 Data::Dumper.3 Devel::DProf.3 Devel::PPPort.3 \
-	Devel::Peek.3 Devel::SelfStubber.3 Digest.3 Digest::MD5.3 \
-	DirHandle.3 Dumpvalue.3 DynaLoader.3 Encode.3 Encode::Alias.3 \
-	Encode::Byte.3 Encode::CJKConstants.3 Encode::CN.3 \
-	Encode::CN::HZ.3 Encode::Config.3 Encode::EBCDIC.3 \
-	Encode::Encoder.3 Encode::Encoding.3 Encode::Guess.3 \
-	Encode::JP.3 Encode::JP::H2Z.3 Encode::JP::JIS7.3 Encode::KR.3 \
-	Encode::KR::2022_KR.3 Encode::MIME::Header.3 Encode::PerlIO.3 \
-	Encode::Supported.3 Encode::Symbol.3 Encode::TW.3 \
-	Encode::Unicode.3 Encode::Unicode::UTF7.3 English.3 Env.3 Errno.3 \
-	Exporter.3 Exporter::Heavy.3 ExtUtils::Command.3 \
-	ExtUtils::Command::MM.3 ExtUtils::Constant.3 ExtUtils::Embed.3 \
-	ExtUtils::Install.3 ExtUtils::Installed.3 ExtUtils::Liblist.3 \
-	ExtUtils::MM.3 ExtUtils::MM_Any.3 ExtUtils::MM_BeOS.3 \
-	ExtUtils::MM_Cygwin.3 ExtUtils::MM_DOS.3 ExtUtils::MM_MacOS.3 \
-	ExtUtils::MM_NW5.3 ExtUtils::MM_OS2.3 ExtUtils::MM_UWIN.3 \
-	ExtUtils::MM_Unix.3 ExtUtils::MM_VMS.3 ExtUtils::MM_Win32.3 \
-	ExtUtils::MM_Win95.3 ExtUtils::MY.3 ExtUtils::MakeMaker.3 \
-	ExtUtils::MakeMaker::FAQ.3 ExtUtils::MakeMaker::Tutorial.3 \
-	ExtUtils::MakeMaker::bytes.3 ExtUtils::MakeMaker::vmsish.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::Cygwin.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 Filter::Simple.3 \
-	Filter::Util::Call.3 FindBin.3 Getopt::Long.3 Getopt::Std.3 \
-	Hash::Util.3 I18N::Collate.3 I18N::LangTags.3 I18N::LangTags::List.3 \
-	I18N::Langinfo.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 List::Util.3 \
-	Locale::Constants.3 Locale::Country.3 Locale::Currency.3 \
-	Locale::Language.3 Locale::Maketext.3 Locale::Maketext::TPJ13.3 \
-	Locale::Script.3 MIME::Base64.3 MIME::QuotedPrint.3 \
-	Math::BigFloat.3 Math::BigInt.3 Math::BigInt::Calc.3 \
-	Math::BigInt::Scalar.3 Math::BigRat.3 \
-	Math::Complex.3 Math::Trig.3 Memoize.3 Memoize::AnyDBM_File.3 \
-	Memoize::Expire.3 Memoize::ExpireFile.3 Memoize::ExpireTest.3 \
-	Memoize::NDBM_File.3 Memoize::SDBM_File.3 Memoize::Storable.3 \
-	NDBM_File.3 NEXT.3 Net::Cmd.3 Net::Config.3 Net::Domain.3 \
-	Net::FTP.3 Net::NNTP.3 Net::Netrc.3 Net::POP3.3 \
-	Net::Ping.3 Net::SMTP.3 Net::Time.3 Net::hostent.3 \
-	Net::libnetFAQ.3 Net::netent.3 Net::protoent.3 Net::servent.3 \
-	O.3 Opcode.3 POSIX.3 PerlIO.3 PerlIO::encoding.3 PerlIO::scalar.3 \
-	PerlIO::via.3 PerlIO::via::QuotedPrint.3 Pod::Checker.3 \
-	Pod::Find.3 Pod::Html.3 Pod::InputObjects.3 Pod::LaTeX.3 \
-	Pod::Man.3 Pod::ParseLink.3 Pod::ParseUtils.3 Pod::Parser.3 \
-	Pod::Perldoc::ToChecker.3 Pod::Perldoc::ToMan.3 \
-	Pod::Perldoc::ToNroff.3 Pod::Perldoc::ToPod.3 Pod::Perldoc::ToRtf.3 \
-	Pod::Perldoc::ToText.3 Pod::Perldoc::ToTk.3 Pod::Perldoc::ToXml.3 \
-	Pod::PlainText.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 Scalar::Util.3 Search::Dict.3 SelectSaver.3 \
-	SelfLoader.3 Shell.3 Socket.3 Storable.3 Switch.3 Symbol.3 \
-	Sys::Hostname.3 Sys::Syslog.3 Term::ANSIColor.3 Term::Cap.3 \
-	Term::Complete.3 Term::ReadLine.3 Test.3 Test::Builder.3 \
-	Test::Harness.3 Test::Harness::Assert.3 Test::Harness::Iterator.3 \
-	Test::Harness::Straps.3 Test::More.3 Test::Simple.3 Test::Tutorial.3 \
-	Text::Abbrev.3 Text::Balanced.3 Text::ParseWords.3 \
-	Text::Soundex.3 Text::Tabs.3 Text::Wrap.3 Thread.3 Thread::Queue.3 \
-	Thread::Semaphore.3 Tie::Array.3 Tie::File.3 Tie::Handle.3 \
-	Tie::Hash.3 Tie::Memoize.3 Tie::RefHash.3 Tie::Scalar.3 \
-	Tie::SubstrHash.3 Time::HiRes.3 Time::Local.3 Time::gmtime.3 \
-	Time::localtime.3 Time::tm.3 UNIVERSAL.3 Unicode::Collate.3 \
-	Unicode::Normalize.3 Unicode::UCD.3 User::grent.3 User::pwent.3 \
-	Win32.3 XS::APItest.3 XS::Typemap.3 XSLoader.3 attributes.3 \
-	attrs.3 autouse.3 base.3 bigint.3 bignum.3 bigrat.3 blib.3 \
-	bytes.3 charnames.3 constant.3 diagnostics.3 encoding.3 \
-	fields.3 filetest.3 if.3 integer.3 less.3 lib.3 locale.3 \
-	open.3 ops.3 overload.3 re.3 sigtrap.3 sort.3 strict.3 \
-	subs.3 threads.3 threads::shared.3 utf8.3 vars.3 vmsish.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)
@@ -214,8 +102,8 @@ 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
-BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-5.8.0
-BSDPAN_REVISION=1
+BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-5.8.4
+# BSDPAN_REVISION=1
 
 post-patch:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
@@ -240,7 +128,9 @@ post-install:
 		${BSDPAN_WRKSRC}/${files} ${BSDPAN_DEST}/${files}
 .endfor
 	@(cd ${INCLUDEDIR} && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h)
-	${MKDIR} ${SITE_PERL}/${PERL_ARCH}/auto
+	${MKDIR} ${PREFIX}/${SITE_PERL_REL}/auto
+	${MKDIR} ${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto
+	${MKDIR} ${PREFIX}/lib/perl5/${PERL_VER}/man/man3
 .if ${OSVERSION} < 502100
 	@fmt ${PKGMESSAGE}
 .else
diff --git a/lang/perl5.14/Makefile.man b/lang/perl5.14/Makefile.man
new file mode 100644
index 000000000000..30fe98bb0f88
--- /dev/null
+++ b/lang/perl5.14/Makefile.man
@@ -0,0 +1,500 @@
+# $Id$
+
+MAN1+=	a2p.1
+MAN1+=	c2ph.1
+MAN1+=	cpan.1
+MAN1+=	dprofpp.1
+MAN1+=	enc2xs.1
+MAN1+=	find2perl.1
+MAN1+=	h2ph.1
+MAN1+=	h2xs.1
+MAN1+=	libnetcfg.1
+MAN1+=	perl.1
+MAN1+=	perl5004delta.1
+MAN1+=	perl5005delta.1
+MAN1+=	perl561delta.1
+MAN1+=	perl56delta.1
+MAN1+=	perl570delta.1
+MAN1+=	perl571delta.1
+MAN1+=	perl572delta.1
+MAN1+=	perl573delta.1
+MAN1+=	perl581delta.1
+MAN1+=	perl582delta.1
+MAN1+=	perl583delta.1
+MAN1+=	perl584delta.1
+MAN1+=	perl58delta.1
+MAN1+=	perlaix.1
+MAN1+=	perlamiga.1
+MAN1+=	perlapi.1
+MAN1+=	perlapio.1
+MAN1+=	perlapollo.1
+MAN1+=	perlartistic.1
+MAN1+=	perlbeos.1
+MAN1+=	perlbook.1
+MAN1+=	perlboot.1
+MAN1+=	perlbot.1
+MAN1+=	perlbs2000.1
+MAN1+=	perlbug.1
+MAN1+=	perlcall.1
+MAN1+=	perlcc.1
+MAN1+=	perlce.1
+MAN1+=	perlcheat.1
+MAN1+=	perlclib.1
+MAN1+=	perlcn.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+=	perldgux.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+=	perlfreebsd.1
+MAN1+=	perlfunc.1
+MAN1+=	perlgpl.1
+MAN1+=	perlguts.1
+MAN1+=	perlhack.1
+MAN1+=	perlhist.1
+MAN1+=	perlhpux.1
+MAN1+=	perlhurd.1
+MAN1+=	perlintern.1
+MAN1+=	perlintro.1
+MAN1+=	perliol.1
+MAN1+=	perlipc.1
+MAN1+=	perlirix.1
+MAN1+=	perlivp.1
+MAN1+=	perljp.1
+MAN1+=	perlko.1
+MAN1+=	perllexwarn.1
+MAN1+=	perllocale.1
+MAN1+=	perllol.1
+MAN1+=	perlmachten.1
+MAN1+=	perlmacos.1
+MAN1+=	perlmacosx.1
+MAN1+=	perlmint.1
+MAN1+=	perlmod.1
+MAN1+=	perlmodinstall.1
+MAN1+=	perlmodlib.1
+MAN1+=	perlmodstyle.1
+MAN1+=	perlmpeix.1
+MAN1+=	perlnetware.1
+MAN1+=	perlnewmod.1
+MAN1+=	perlnumber.1
+MAN1+=	perlobj.1
+MAN1+=	perlop.1
+MAN1+=	perlopentut.1
+MAN1+=	perlos2.1
+MAN1+=	perlos390.1
+MAN1+=	perlos400.1
+MAN1+=	perlothrtut.1
+MAN1+=	perlpacktut.1
+MAN1+=	perlplan9.1
+MAN1+=	perlpod.1
+MAN1+=	perlpodspec.1
+MAN1+=	perlport.1
+MAN1+=	perlqnx.1
+MAN1+=	perlre.1
+MAN1+=	perlref.1
+MAN1+=	perlreftut.1
+MAN1+=	perlrequick.1
+MAN1+=	perlreref.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+=	perltooc.1
+MAN1+=	perltoot.1
+MAN1+=	perltrap.1
+MAN1+=	perltru64.1
+MAN1+=	perltw.1
+MAN1+=	perlunicode.1
+MAN1+=	perluniintro.1
+MAN1+=	perlutil.1
+MAN1+=	perluts.1
+MAN1+=	perlvar.1
+MAN1+=	perlvmesa.1
+MAN1+=	perlvms.1
+MAN1+=	perlvos.1
+MAN1+=	perlwin32.1
+MAN1+=	perlxs.1
+MAN1+=	perlxstut.1
+MAN1+=	piconv.1
+MAN1+=	pl2pm.1
+MAN1+=	pod2html.1
+MAN1+=	pod2latex.1
+MAN1+=	pod2man.1
+MAN1+=	pod2text.1
+MAN1+=	pod2usage.1
+MAN1+=	podchecker.1
+MAN1+=	podselect.1
+MAN1+=	prove.1
+MAN1+=	psed.1
+MAN1+=	pstruct.1
+MAN1+=	s2p.1
+MAN1+=	splain.1
+MAN1+=	xsubpp.1
+
+MAN3+=	AnyDBM_File.3
+MAN3+=	Attribute::Handlers.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::ISA.3
+MAN3+=	Class::Struct.3
+MAN3+=	Config.3
+MAN3+=	Cwd.3
+MAN3+=	DB.3
+MAN3+=	DBM_Filter.3
+MAN3+=	DBM_Filter::compress.3
+MAN3+=	DBM_Filter::encode.3
+MAN3+=	DBM_Filter::int32.3
+MAN3+=	DBM_Filter::null.3
+MAN3+=	DBM_Filter::utf8.3
+MAN3+=	DB_File.3
+MAN3+=	Data::Dumper.3
+MAN3+=	Devel::DProf.3
+MAN3+=	Devel::PPPort.3
+MAN3+=	Devel::Peek.3
+MAN3+=	Devel::SelfStubber.3
+MAN3+=	Digest.3
+MAN3+=	Digest::MD5.3
+MAN3+=	Digest::base.3
+MAN3+=	DirHandle.3
+MAN3+=	Dumpvalue.3
+MAN3+=	DynaLoader.3
+MAN3+=	Encode.3
+MAN3+=	Encode::Alias.3
+MAN3+=	Encode::Byte.3
+MAN3+=	Encode::CJKConstants.3
+MAN3+=	Encode::CN.3
+MAN3+=	Encode::CN::HZ.3
+MAN3+=	Encode::Config.3
+MAN3+=	Encode::EBCDIC.3
+MAN3+=	Encode::Encoder.3
+MAN3+=	Encode::Encoding.3
+MAN3+=	Encode::Guess.3
+MAN3+=	Encode::JP.3
+MAN3+=	Encode::JP::H2Z.3
+MAN3+=	Encode::JP::JIS7.3
+MAN3+=	Encode::KR.3
+MAN3+=	Encode::KR::2022_KR.3
+MAN3+=	Encode::MIME::Header.3
+MAN3+=	Encode::PerlIO.3
+MAN3+=	Encode::Supported.3
+MAN3+=	Encode::Symbol.3
+MAN3+=	Encode::TW.3
+MAN3+=	Encode::Unicode.3
+MAN3+=	Encode::Unicode::UTF7.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::Constant.3
+MAN3+=	ExtUtils::Embed.3
+MAN3+=	ExtUtils::Install.3
+MAN3+=	ExtUtils::Installed.3
+MAN3+=	ExtUtils::Liblist.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+=	Filter::Simple.3
+MAN3+=	Filter::Util::Call.3
+MAN3+=	FindBin.3
+MAN3+=	Getopt::Long.3
+MAN3+=	Getopt::Std.3
+MAN3+=	Hash::Util.3
+MAN3+=	I18N::Collate.3
+MAN3+=	I18N::LangTags.3
+MAN3+=	I18N::LangTags::List.3
+MAN3+=	I18N::Langinfo.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+=	List::Util.3
+MAN3+=	Locale::Constants.3
+MAN3+=	Locale::Country.3
+MAN3+=	Locale::Currency.3
+MAN3+=	Locale::Language.3
+MAN3+=	Locale::Maketext.3
+MAN3+=	Locale::Maketext::TPJ13.3
+MAN3+=	Locale::Script.3
+MAN3+=	MIME::Base64.3
+MAN3+=	MIME::QuotedPrint.3
+MAN3+=	Math::BigFloat.3
+MAN3+=	Math::BigInt.3
+MAN3+=	Math::BigInt::Calc.3
+MAN3+=	Math::BigInt::CalcEmu.3
+MAN3+=	Math::BigRat.3
+MAN3+=	Math::Complex.3
+MAN3+=	Math::Trig.3
+MAN3+=	Memoize.3
+MAN3+=	Memoize::AnyDBM_File.3
+MAN3+=	Memoize::Expire.3
+MAN3+=	Memoize::ExpireFile.3
+MAN3+=	Memoize::ExpireTest.3
+MAN3+=	Memoize::NDBM_File.3
+MAN3+=	Memoize::SDBM_File.3
+MAN3+=	Memoize::Storable.3
+MAN3+=	NDBM_File.3
+MAN3+=	NEXT.3
+MAN3+=	Net::Cmd.3
+MAN3+=	Net::Config.3
+MAN3+=	Net::Domain.3
+MAN3+=	Net::FTP.3
+MAN3+=	Net::NNTP.3
+MAN3+=	Net::Netrc.3
+MAN3+=	Net::POP3.3
+MAN3+=	Net::Ping.3
+MAN3+=	Net::SMTP.3
+MAN3+=	Net::Time.3
+MAN3+=	Net::hostent.3
+MAN3+=	Net::libnetFAQ.3
+MAN3+=	Net::netent.3
+MAN3+=	Net::protoent.3
+MAN3+=	Net::servent.3
+MAN3+=	O.3
+MAN3+=	Opcode.3
+MAN3+=	POSIX.3
+MAN3+=	PerlIO.3
+MAN3+=	PerlIO::encoding.3
+MAN3+=	PerlIO::scalar.3
+MAN3+=	PerlIO::via.3
+MAN3+=	PerlIO::via::QuotedPrint.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::ParseLink.3
+MAN3+=	Pod::ParseUtils.3
+MAN3+=	Pod::Parser.3
+MAN3+=	Pod::Perldoc::ToChecker.3
+MAN3+=	Pod::Perldoc::ToMan.3
+MAN3+=	Pod::Perldoc::ToNroff.3
+MAN3+=	Pod::Perldoc::ToPod.3
+MAN3+=	Pod::Perldoc::ToRtf.3
+MAN3+=	Pod::Perldoc::ToText.3
+MAN3+=	Pod::Perldoc::ToTk.3
+MAN3+=	Pod::Perldoc::ToXml.3
+MAN3+=	Pod::PlainText.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+=	Scalar::Util.3
+MAN3+=	Search::Dict.3
+MAN3+=	SelectSaver.3
+MAN3+=	SelfLoader.3
+MAN3+=	Shell.3
+MAN3+=	Socket.3
+MAN3+=	Storable.3
+MAN3+=	Switch.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::Balanced.3
+MAN3+=	Text::ParseWords.3
+MAN3+=	Text::Soundex.3
+MAN3+=	Text::Tabs.3
+MAN3+=	Text::Wrap.3
+MAN3+=	Thread.3
+MAN3+=	Thread::Queue.3
+MAN3+=	Thread::Semaphore.3
+MAN3+=	Tie::Array.3
+MAN3+=	Tie::File.3
+MAN3+=	Tie::Handle.3
+MAN3+=	Tie::Hash.3
+MAN3+=	Tie::Memoize.3
+MAN3+=	Tie::RefHash.3
+MAN3+=	Tie::Scalar.3
+MAN3+=	Tie::SubstrHash.3
+MAN3+=	Time::HiRes.3
+MAN3+=	Time::Local.3
+MAN3+=	Time::gmtime.3
+MAN3+=	Time::localtime.3
+MAN3+=	Time::tm.3
+MAN3+=	UNIVERSAL.3
+MAN3+=	Unicode::Collate.3
+MAN3+=	Unicode::Normalize.3
+MAN3+=	Unicode::UCD.3
+MAN3+=	User::grent.3
+MAN3+=	User::pwent.3
+MAN3+=	XS::APItest.3
+MAN3+=	XS::Typemap.3
+MAN3+=	XSLoader.3
+MAN3+=	attributes.3
+MAN3+=	attrs.3
+MAN3+=	autouse.3
+MAN3+=	base.3
+MAN3+=	bigint.3
+MAN3+=	bignum.3
+MAN3+=	bigrat.3
+MAN3+=	blib.3
+MAN3+=	bytes.3
+MAN3+=	charnames.3
+MAN3+=	constant.3
+MAN3+=	diagnostics.3
+MAN3+=	encoding.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+=	sort.3
+MAN3+=	strict.3
+MAN3+=	subs.3
+MAN3+=	threads.3
+MAN3+=	threads::shared.3
+MAN3+=	utf8.3
+MAN3+=	vars.3
+MAN3+=	vmsish.3
+MAN3+=	warnings.3
+MAN3+=	warnings::register.3
diff --git a/lang/perl5.14/distinfo b/lang/perl5.14/distinfo
index 9ddd2a2cb528..e6442b145987 100644
--- a/lang/perl5.14/distinfo
+++ b/lang/perl5.14/distinfo
@@ -1,4 +1,4 @@
-MD5 (perl-5.8.2.tar.gz) = fa356b74f99166b63a68a322c3c68f91
-SIZE (perl-5.8.2.tar.gz) = 11896287
-MD5 (BSDPAN-5.8.0_1.tar.gz) = af9f075e073b14714cfeb8a7582013e7
-SIZE (BSDPAN-5.8.0_1.tar.gz) = 6338
+MD5 (perl-5.8.4.tar.bz2) = 3eb135afd0114f4e1acdd4ad6b8fd947
+SIZE (perl-5.8.4.tar.bz2) = 9598489
+MD5 (BSDPAN-5.8.4.tar.bz2) = 966436256621e247cc1fd7cbbfe5030c
+SIZE (BSDPAN-5.8.4.tar.bz2) = 6301
diff --git a/lang/perl5.14/files/patch-freebsd.sh b/lang/perl5.14/files/patch-freebsd.sh
new file mode 100644
index 000000000000..68ec6d4cd8a1
--- /dev/null
+++ b/lang/perl5.14/files/patch-freebsd.sh
@@ -0,0 +1,20 @@
+--- hints/freebsd.sh.orig	Sun May 30 17:55:47 2004
++++ hints/freebsd.sh	Sun May 30 17:57:16 2004
+@@ -88,6 +88,7 @@ case "$osvers" in
+ 	esac
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
+ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ dl / /'`
+ 	# iconv gone in Perl 5.8.1, but if someone compiles 5.8.0 or earlier.
+ 	libswanted=`echo $libswanted | sed 's/ iconv / /'`
+ 	d_setregid='define'
+@@ -102,6 +103,9 @@ case "$osvers" in
+ 	        ;;
+ 	esac
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
++	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ dl / /'`
++	libswanted=`echo $libswanted | sed 's/ iconv / /'`
+ 	;;
+ esac
+ 
diff --git a/lang/perl5.14/files/use.perl b/lang/perl5.14/files/use.perl
index 354c8e1e59cc..ba6057f1c5db 100644
--- a/lang/perl5.14/files/use.perl
+++ b/lang/perl5.14/files/use.perl
@@ -69,6 +69,7 @@ EOF
 	while (<MPOLD>) {
 		next if m|use.perl generated line|;
 		next if m|^\s*OPTIONAL_MANPATH\s+\S+/lib/perl5/%%PERL_VERSION%%/man\s*$|;
+		next if m|^\s*OPTIONAL_MANPATH\s+\S+/lib/perl5/%%PERL_VERSION%%/perl/man\s*$|;
 		print MPNEW;
 	}
 	close MPNEW;
@@ -112,6 +113,7 @@ EOF
 	my $perl_port_manpath = <<EOF;
 # -- use.perl generated line -- #
 OPTIONAL_MANPATH	%%PREFIX%%/lib/perl5/%%PERL_VERSION%%/man
+OPTIONAL_MANPATH	%%PREFIX%%/lib/perl5/%%PERL_VERSION%%/perl/man
 EOF
 
 	open MPOLD, "< /etc/manpath.config" or die "/etc/manpath.config: $!";
diff --git a/lang/perl5.14/pkg-install b/lang/perl5.14/pkg-install
index eb3fde91af87..a1544bccac42 100644
--- a/lang/perl5.14/pkg-install
+++ b/lang/perl5.14/pkg-install
@@ -6,7 +6,9 @@ fi
 
 INCLUDEDIR=/usr/include
 
-install -d ${PKG_PREFIX}/lib/perl5/site_perl/5.8.2/mach
+install -d ${PKG_PREFIX}/lib/perl5/site_perl/5.8.4/mach
+install -d ${PKG_PREFIX}/lib/perl5/site_perl/5.8.4/auto
+install -d ${PKG_PREFIX}/lib/perl5/5.8.4/man/man3
 cd ${INCLUDEDIR} && ${PKG_PREFIX}/bin/h2ph *.h machine/*.h sys/*.h
 
 if [ -z "${OSVERSION}" ]; then
diff --git a/lang/perl5.14/pkg-plist b/lang/perl5.14/pkg-plist
index 52965e7bbf55..a0cc81e1fc48 100644
--- a/lang/perl5.14/pkg-plist
+++ b/lang/perl5.14/pkg-plist
@@ -6,6 +6,7 @@ bin/enc2xs
 bin/find2perl
 bin/h2ph
 bin/h2xs
+bin/instmodsh
 bin/libnetcfg
 bin/perl
 bin/perl%%PERL_VER%%
@@ -24,6 +25,7 @@ bin/pod2text
 bin/pod2usage
 bin/podchecker
 bin/podselect
+bin/prove
 bin/psed
 bin/pstruct
 bin/s2p
@@ -104,8 +106,17 @@ lib/perl5/%%PERL_VER%%/Carp/Heavy.pm
 lib/perl5/%%PERL_VER%%/Class/ISA.pm
 lib/perl5/%%PERL_VER%%/Class/Struct.pm
 lib/perl5/%%PERL_VER%%/DB.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter.pm
+lib/perl5/%%PERL_VER%%/dbm_filter_util.pl
+lib/perl5/%%PERL_VER%%/DBM_Filter/Changes
+lib/perl5/%%PERL_VER%%/DBM_Filter/compress.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/encode.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/int32.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/null.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/utf8.pm
 lib/perl5/%%PERL_VER%%/Devel/SelfStubber.pm
 lib/perl5/%%PERL_VER%%/Digest.pm
+lib/perl5/%%PERL_VER%%/Digest/base.pm
 lib/perl5/%%PERL_VER%%/DirHandle.pm
 lib/perl5/%%PERL_VER%%/Dumpvalue.pm
 lib/perl5/%%PERL_VER%%/Encode/CN/HZ.pm
@@ -166,7 +177,6 @@ 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/testlib.pm
 lib/perl5/%%PERL_VER%%/ExtUtils/typemap
 lib/perl5/%%PERL_VER%%/ExtUtils/xsubpp
@@ -233,7 +243,7 @@ lib/perl5/%%PERL_VER%%/Math/BigFloat.pm
 lib/perl5/%%PERL_VER%%/Math/BigFloat/Trace.pm
 lib/perl5/%%PERL_VER%%/Math/BigInt.pm
 lib/perl5/%%PERL_VER%%/Math/BigInt/Calc.pm
-lib/perl5/%%PERL_VER%%/Math/BigInt/Scalar.pm
+lib/perl5/%%PERL_VER%%/Math/BigInt/CalcEmu.pm
 lib/perl5/%%PERL_VER%%/Math/BigInt/Trace.pm
 lib/perl5/%%PERL_VER%%/Math/BigRat.pm
 lib/perl5/%%PERL_VER%%/Math/Complex.pm
@@ -374,7 +384,6 @@ lib/perl5/%%PERL_VER%%/Unicode/README
 lib/perl5/%%PERL_VER%%/Unicode/UCD.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
@@ -844,6 +853,7 @@ lib/perl5/%%PERL_VER%%/open2.pl
 lib/perl5/%%PERL_VER%%/open3.pl
 lib/perl5/%%PERL_VER%%/overload.pm
 lib/perl5/%%PERL_VER%%/perl5db.pl
+lib/perl5/%%PERL_VER%%/pod/a2p.pod
 lib/perl5/%%PERL_VER%%/pod/perl.pod
 lib/perl5/%%PERL_VER%%/pod/perl5004delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl5005delta.pod
@@ -854,6 +864,9 @@ lib/perl5/%%PERL_VER%%/pod/perl571delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl572delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl573delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl581delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl582delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl583delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl584delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl58delta.pod
 lib/perl5/%%PERL_VER%%/pod/perlaix.pod
 lib/perl5/%%PERL_VER%%/pod/perlamiga.pod
@@ -1247,6 +1260,7 @@ lib/perl5/%%PERL_VER%%/unicore/lib/InYijing.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Inherite.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/JoinCont.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Kannada.pl
+lib/perl5/%%PERL_VER%%/unicore/lib/Katakan2.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Katakana.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Khmer.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/L.pl
@@ -1311,6 +1325,7 @@ lib/perl5/%%PERL_VER%%/unicore/lib/So.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/SoftDott.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Space.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/SpacePer.pl
+lib/perl5/%%PERL_VER%%/unicore/lib/Sterm.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Syriac.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Tagalog.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Tagbanwa.pl
@@ -1326,6 +1341,7 @@ lib/perl5/%%PERL_VER%%/unicore/lib/Ugaritic.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/UnifiedI.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Upper.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Uppercas.pl
+lib/perl5/%%PERL_VER%%/unicore/lib/Variatio.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/WhiteSpa.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Word.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/XDigit.pl
@@ -1454,7 +1470,9 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Scalar 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/List 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Digest 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VER%%/DBM_Filter 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/CN 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/MIME 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/KR 2>/dev/null || true
@@ -1518,13 +1536,18 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute 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%%/auto 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%% 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%%/auto 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 2>/dev/null || true
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index 90d96bccfaef..9867d4a1752a 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	5
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -15,28 +14,38 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 MASTER_SITE_SUBDIR=	../../src \
 			tobez/:local ./:local
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		BSDPAN-5.8.0_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
+		BSDPAN-${PERL_VER}${EXTRACT_SUFX}:local
+#		BSDPAN-5.8.0_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
 
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Practical Extraction and Report Language
 
-PERL_VER=	5.8.2
+PERL_VER=	5.8.4
 PERL_ARCH=	mach
 PERL_VERSION=	${PERL_VER}
 
+USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 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 \
+	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \
 	-Dman1dir=${PREFIX}/man/man1 \
-	-Dsitearch=${SITE_PERL}/${PERL_ARCH} \
-	-Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \
+	-Duse64bitint \
+	-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}\"
 
+INCLUDEDIR=	/usr/include
+
+.include "Makefile.man"
+.include <bsd.port.pre.mk>
+
 .if defined(ENABLE_SUIDPERL)
 CONFIGURE_ARGS+=	-Dd_dosuid=define
 PLIST_SUB+=		ENABLE_SUIDPERL=""
@@ -76,137 +85,16 @@ CONFIGURE_ARGS+=	-Dusemymalloc=y
 CONFIGURE_ARGS+=	-Dusemymalloc=n
 .endif
 
-INCLUDEDIR=	/usr/include
-
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} < 502100
 LATEST_LINK=	perl5.8
 .else
 PKGMESSAGE=	${PKGDIR}/.not-here
 .endif
 
-MAN1=	a2p.1 c2ph.1 dprofpp.1 enc2xs.1 find2perl.1 h2ph.1 h2xs.1 \
-	libnetcfg.1 perl.1 perl5004delta.1 perl5005delta.1 \
-	perl561delta.1 perl56delta.1 perl570delta.1 perl571delta.1 \
-	perl572delta.1 perlaix.1 perlamiga.1 perlapi.1 perlapio.1 \
-	perlapollo.1 perlbeos.1 perlbook.1 perlboot.1 perlbot.1 \
-	perlbs2000.1 perlbug.1 perlcall.1 perlcc.1 perlce.1 perlclib.1 \
-	perlcn.1 perlcompile.1 perlcygwin.1 perldata.1 perldbmfilter.1 \
-	perldebguts.1 perldebtut.1 perldebug.1 perldelta.1 perldgux.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 \
-	perlfreebsd.1 perlfunc.1 perlguts.1 perlhack.1 perlhist.1 \
-	perlhpux.1 perlhurd.1 perlintern.1 perlintro.1 perliol.1 \
-	perlipc.1 perlirix.1 perlivp.1 perljp.1 perlko.1 perllexwarn.1 \
-	perllocale.1 perllol.1 perlmachten.1 perlmacos.1 perlmint.1 \
-	perlmod.1 perlmodinstall.1 perlmodlib.1 perlmodstyle.1 \
-	perlmpeix.1 perlnetware.1 perlnewmod.1 perlnumber.1 perlobj.1 \
-	perlop.1 perlopentut.1 perlos2.1 perlos390.1 perlothrtut.1 \
-	perlpacktut.1 perlplan9.1 perlpod.1 perlpodspec.1 perlport.1 \
-	perlqnx.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 \
-	perltooc.1 perltoot.1 perltrap.1 perltru64.1 perltw.1 \
-	perlunicode.1 perluniintro.1 perlutil.1 perluts.1 perlvar.1 \
-	perlvmesa.1 perlvms.1 perlvos.1 perlwin32.1 perlxs.1 perlxstut.1 \
-	piconv.1 pl2pm.1 pod2html.1 pod2latex.1 pod2man.1 pod2text.1 \
-	pod2usage.1 podchecker.1 podselect.1 psed.1 pstruct.1 s2p.1 \
-	splain.1 xsubpp.1 cpan.1  perl573delta.1 perl58delta.1 perl581delta.1 \
-	perlartistic.1 perlcheat.1 perlgpl.1 perlmacosx.1 perlos400.1 \
-	perlreref.1
-
-MAN3=	AnyDBM_File.3 Attribute::Handlers.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::ISA.3 Class::Struct.3 Config.3 Cwd.3 \
-	DB.3 DB_File.3 Data::Dumper.3 Devel::DProf.3 Devel::PPPort.3 \
-	Devel::Peek.3 Devel::SelfStubber.3 Digest.3 Digest::MD5.3 \
-	DirHandle.3 Dumpvalue.3 DynaLoader.3 Encode.3 Encode::Alias.3 \
-	Encode::Byte.3 Encode::CJKConstants.3 Encode::CN.3 \
-	Encode::CN::HZ.3 Encode::Config.3 Encode::EBCDIC.3 \
-	Encode::Encoder.3 Encode::Encoding.3 Encode::Guess.3 \
-	Encode::JP.3 Encode::JP::H2Z.3 Encode::JP::JIS7.3 Encode::KR.3 \
-	Encode::KR::2022_KR.3 Encode::MIME::Header.3 Encode::PerlIO.3 \
-	Encode::Supported.3 Encode::Symbol.3 Encode::TW.3 \
-	Encode::Unicode.3 Encode::Unicode::UTF7.3 English.3 Env.3 Errno.3 \
-	Exporter.3 Exporter::Heavy.3 ExtUtils::Command.3 \
-	ExtUtils::Command::MM.3 ExtUtils::Constant.3 ExtUtils::Embed.3 \
-	ExtUtils::Install.3 ExtUtils::Installed.3 ExtUtils::Liblist.3 \
-	ExtUtils::MM.3 ExtUtils::MM_Any.3 ExtUtils::MM_BeOS.3 \
-	ExtUtils::MM_Cygwin.3 ExtUtils::MM_DOS.3 ExtUtils::MM_MacOS.3 \
-	ExtUtils::MM_NW5.3 ExtUtils::MM_OS2.3 ExtUtils::MM_UWIN.3 \
-	ExtUtils::MM_Unix.3 ExtUtils::MM_VMS.3 ExtUtils::MM_Win32.3 \
-	ExtUtils::MM_Win95.3 ExtUtils::MY.3 ExtUtils::MakeMaker.3 \
-	ExtUtils::MakeMaker::FAQ.3 ExtUtils::MakeMaker::Tutorial.3 \
-	ExtUtils::MakeMaker::bytes.3 ExtUtils::MakeMaker::vmsish.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::Cygwin.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 Filter::Simple.3 \
-	Filter::Util::Call.3 FindBin.3 Getopt::Long.3 Getopt::Std.3 \
-	Hash::Util.3 I18N::Collate.3 I18N::LangTags.3 I18N::LangTags::List.3 \
-	I18N::Langinfo.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 List::Util.3 \
-	Locale::Constants.3 Locale::Country.3 Locale::Currency.3 \
-	Locale::Language.3 Locale::Maketext.3 Locale::Maketext::TPJ13.3 \
-	Locale::Script.3 MIME::Base64.3 MIME::QuotedPrint.3 \
-	Math::BigFloat.3 Math::BigInt.3 Math::BigInt::Calc.3 \
-	Math::BigInt::Scalar.3 Math::BigRat.3 \
-	Math::Complex.3 Math::Trig.3 Memoize.3 Memoize::AnyDBM_File.3 \
-	Memoize::Expire.3 Memoize::ExpireFile.3 Memoize::ExpireTest.3 \
-	Memoize::NDBM_File.3 Memoize::SDBM_File.3 Memoize::Storable.3 \
-	NDBM_File.3 NEXT.3 Net::Cmd.3 Net::Config.3 Net::Domain.3 \
-	Net::FTP.3 Net::NNTP.3 Net::Netrc.3 Net::POP3.3 \
-	Net::Ping.3 Net::SMTP.3 Net::Time.3 Net::hostent.3 \
-	Net::libnetFAQ.3 Net::netent.3 Net::protoent.3 Net::servent.3 \
-	O.3 Opcode.3 POSIX.3 PerlIO.3 PerlIO::encoding.3 PerlIO::scalar.3 \
-	PerlIO::via.3 PerlIO::via::QuotedPrint.3 Pod::Checker.3 \
-	Pod::Find.3 Pod::Html.3 Pod::InputObjects.3 Pod::LaTeX.3 \
-	Pod::Man.3 Pod::ParseLink.3 Pod::ParseUtils.3 Pod::Parser.3 \
-	Pod::Perldoc::ToChecker.3 Pod::Perldoc::ToMan.3 \
-	Pod::Perldoc::ToNroff.3 Pod::Perldoc::ToPod.3 Pod::Perldoc::ToRtf.3 \
-	Pod::Perldoc::ToText.3 Pod::Perldoc::ToTk.3 Pod::Perldoc::ToXml.3 \
-	Pod::PlainText.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 Scalar::Util.3 Search::Dict.3 SelectSaver.3 \
-	SelfLoader.3 Shell.3 Socket.3 Storable.3 Switch.3 Symbol.3 \
-	Sys::Hostname.3 Sys::Syslog.3 Term::ANSIColor.3 Term::Cap.3 \
-	Term::Complete.3 Term::ReadLine.3 Test.3 Test::Builder.3 \
-	Test::Harness.3 Test::Harness::Assert.3 Test::Harness::Iterator.3 \
-	Test::Harness::Straps.3 Test::More.3 Test::Simple.3 Test::Tutorial.3 \
-	Text::Abbrev.3 Text::Balanced.3 Text::ParseWords.3 \
-	Text::Soundex.3 Text::Tabs.3 Text::Wrap.3 Thread.3 Thread::Queue.3 \
-	Thread::Semaphore.3 Tie::Array.3 Tie::File.3 Tie::Handle.3 \
-	Tie::Hash.3 Tie::Memoize.3 Tie::RefHash.3 Tie::Scalar.3 \
-	Tie::SubstrHash.3 Time::HiRes.3 Time::Local.3 Time::gmtime.3 \
-	Time::localtime.3 Time::tm.3 UNIVERSAL.3 Unicode::Collate.3 \
-	Unicode::Normalize.3 Unicode::UCD.3 User::grent.3 User::pwent.3 \
-	Win32.3 XS::APItest.3 XS::Typemap.3 XSLoader.3 attributes.3 \
-	attrs.3 autouse.3 base.3 bigint.3 bignum.3 bigrat.3 blib.3 \
-	bytes.3 charnames.3 constant.3 diagnostics.3 encoding.3 \
-	fields.3 filetest.3 if.3 integer.3 less.3 lib.3 locale.3 \
-	open.3 ops.3 overload.3 re.3 sigtrap.3 sort.3 strict.3 \
-	subs.3 threads.3 threads::shared.3 utf8.3 vars.3 vmsish.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)
@@ -214,8 +102,8 @@ 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
-BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-5.8.0
-BSDPAN_REVISION=1
+BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-5.8.4
+# BSDPAN_REVISION=1
 
 post-patch:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
@@ -240,7 +128,9 @@ post-install:
 		${BSDPAN_WRKSRC}/${files} ${BSDPAN_DEST}/${files}
 .endfor
 	@(cd ${INCLUDEDIR} && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h)
-	${MKDIR} ${SITE_PERL}/${PERL_ARCH}/auto
+	${MKDIR} ${PREFIX}/${SITE_PERL_REL}/auto
+	${MKDIR} ${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto
+	${MKDIR} ${PREFIX}/lib/perl5/${PERL_VER}/man/man3
 .if ${OSVERSION} < 502100
 	@fmt ${PKGMESSAGE}
 .else
diff --git a/lang/perl5.16/Makefile.man b/lang/perl5.16/Makefile.man
new file mode 100644
index 000000000000..30fe98bb0f88
--- /dev/null
+++ b/lang/perl5.16/Makefile.man
@@ -0,0 +1,500 @@
+# $Id$
+
+MAN1+=	a2p.1
+MAN1+=	c2ph.1
+MAN1+=	cpan.1
+MAN1+=	dprofpp.1
+MAN1+=	enc2xs.1
+MAN1+=	find2perl.1
+MAN1+=	h2ph.1
+MAN1+=	h2xs.1
+MAN1+=	libnetcfg.1
+MAN1+=	perl.1
+MAN1+=	perl5004delta.1
+MAN1+=	perl5005delta.1
+MAN1+=	perl561delta.1
+MAN1+=	perl56delta.1
+MAN1+=	perl570delta.1
+MAN1+=	perl571delta.1
+MAN1+=	perl572delta.1
+MAN1+=	perl573delta.1
+MAN1+=	perl581delta.1
+MAN1+=	perl582delta.1
+MAN1+=	perl583delta.1
+MAN1+=	perl584delta.1
+MAN1+=	perl58delta.1
+MAN1+=	perlaix.1
+MAN1+=	perlamiga.1
+MAN1+=	perlapi.1
+MAN1+=	perlapio.1
+MAN1+=	perlapollo.1
+MAN1+=	perlartistic.1
+MAN1+=	perlbeos.1
+MAN1+=	perlbook.1
+MAN1+=	perlboot.1
+MAN1+=	perlbot.1
+MAN1+=	perlbs2000.1
+MAN1+=	perlbug.1
+MAN1+=	perlcall.1
+MAN1+=	perlcc.1
+MAN1+=	perlce.1
+MAN1+=	perlcheat.1
+MAN1+=	perlclib.1
+MAN1+=	perlcn.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+=	perldgux.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+=	perlfreebsd.1
+MAN1+=	perlfunc.1
+MAN1+=	perlgpl.1
+MAN1+=	perlguts.1
+MAN1+=	perlhack.1
+MAN1+=	perlhist.1
+MAN1+=	perlhpux.1
+MAN1+=	perlhurd.1
+MAN1+=	perlintern.1
+MAN1+=	perlintro.1
+MAN1+=	perliol.1
+MAN1+=	perlipc.1
+MAN1+=	perlirix.1
+MAN1+=	perlivp.1
+MAN1+=	perljp.1
+MAN1+=	perlko.1
+MAN1+=	perllexwarn.1
+MAN1+=	perllocale.1
+MAN1+=	perllol.1
+MAN1+=	perlmachten.1
+MAN1+=	perlmacos.1
+MAN1+=	perlmacosx.1
+MAN1+=	perlmint.1
+MAN1+=	perlmod.1
+MAN1+=	perlmodinstall.1
+MAN1+=	perlmodlib.1
+MAN1+=	perlmodstyle.1
+MAN1+=	perlmpeix.1
+MAN1+=	perlnetware.1
+MAN1+=	perlnewmod.1
+MAN1+=	perlnumber.1
+MAN1+=	perlobj.1
+MAN1+=	perlop.1
+MAN1+=	perlopentut.1
+MAN1+=	perlos2.1
+MAN1+=	perlos390.1
+MAN1+=	perlos400.1
+MAN1+=	perlothrtut.1
+MAN1+=	perlpacktut.1
+MAN1+=	perlplan9.1
+MAN1+=	perlpod.1
+MAN1+=	perlpodspec.1
+MAN1+=	perlport.1
+MAN1+=	perlqnx.1
+MAN1+=	perlre.1
+MAN1+=	perlref.1
+MAN1+=	perlreftut.1
+MAN1+=	perlrequick.1
+MAN1+=	perlreref.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+=	perltooc.1
+MAN1+=	perltoot.1
+MAN1+=	perltrap.1
+MAN1+=	perltru64.1
+MAN1+=	perltw.1
+MAN1+=	perlunicode.1
+MAN1+=	perluniintro.1
+MAN1+=	perlutil.1
+MAN1+=	perluts.1
+MAN1+=	perlvar.1
+MAN1+=	perlvmesa.1
+MAN1+=	perlvms.1
+MAN1+=	perlvos.1
+MAN1+=	perlwin32.1
+MAN1+=	perlxs.1
+MAN1+=	perlxstut.1
+MAN1+=	piconv.1
+MAN1+=	pl2pm.1
+MAN1+=	pod2html.1
+MAN1+=	pod2latex.1
+MAN1+=	pod2man.1
+MAN1+=	pod2text.1
+MAN1+=	pod2usage.1
+MAN1+=	podchecker.1
+MAN1+=	podselect.1
+MAN1+=	prove.1
+MAN1+=	psed.1
+MAN1+=	pstruct.1
+MAN1+=	s2p.1
+MAN1+=	splain.1
+MAN1+=	xsubpp.1
+
+MAN3+=	AnyDBM_File.3
+MAN3+=	Attribute::Handlers.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::ISA.3
+MAN3+=	Class::Struct.3
+MAN3+=	Config.3
+MAN3+=	Cwd.3
+MAN3+=	DB.3
+MAN3+=	DBM_Filter.3
+MAN3+=	DBM_Filter::compress.3
+MAN3+=	DBM_Filter::encode.3
+MAN3+=	DBM_Filter::int32.3
+MAN3+=	DBM_Filter::null.3
+MAN3+=	DBM_Filter::utf8.3
+MAN3+=	DB_File.3
+MAN3+=	Data::Dumper.3
+MAN3+=	Devel::DProf.3
+MAN3+=	Devel::PPPort.3
+MAN3+=	Devel::Peek.3
+MAN3+=	Devel::SelfStubber.3
+MAN3+=	Digest.3
+MAN3+=	Digest::MD5.3
+MAN3+=	Digest::base.3
+MAN3+=	DirHandle.3
+MAN3+=	Dumpvalue.3
+MAN3+=	DynaLoader.3
+MAN3+=	Encode.3
+MAN3+=	Encode::Alias.3
+MAN3+=	Encode::Byte.3
+MAN3+=	Encode::CJKConstants.3
+MAN3+=	Encode::CN.3
+MAN3+=	Encode::CN::HZ.3
+MAN3+=	Encode::Config.3
+MAN3+=	Encode::EBCDIC.3
+MAN3+=	Encode::Encoder.3
+MAN3+=	Encode::Encoding.3
+MAN3+=	Encode::Guess.3
+MAN3+=	Encode::JP.3
+MAN3+=	Encode::JP::H2Z.3
+MAN3+=	Encode::JP::JIS7.3
+MAN3+=	Encode::KR.3
+MAN3+=	Encode::KR::2022_KR.3
+MAN3+=	Encode::MIME::Header.3
+MAN3+=	Encode::PerlIO.3
+MAN3+=	Encode::Supported.3
+MAN3+=	Encode::Symbol.3
+MAN3+=	Encode::TW.3
+MAN3+=	Encode::Unicode.3
+MAN3+=	Encode::Unicode::UTF7.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::Constant.3
+MAN3+=	ExtUtils::Embed.3
+MAN3+=	ExtUtils::Install.3
+MAN3+=	ExtUtils::Installed.3
+MAN3+=	ExtUtils::Liblist.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+=	Filter::Simple.3
+MAN3+=	Filter::Util::Call.3
+MAN3+=	FindBin.3
+MAN3+=	Getopt::Long.3
+MAN3+=	Getopt::Std.3
+MAN3+=	Hash::Util.3
+MAN3+=	I18N::Collate.3
+MAN3+=	I18N::LangTags.3
+MAN3+=	I18N::LangTags::List.3
+MAN3+=	I18N::Langinfo.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+=	List::Util.3
+MAN3+=	Locale::Constants.3
+MAN3+=	Locale::Country.3
+MAN3+=	Locale::Currency.3
+MAN3+=	Locale::Language.3
+MAN3+=	Locale::Maketext.3
+MAN3+=	Locale::Maketext::TPJ13.3
+MAN3+=	Locale::Script.3
+MAN3+=	MIME::Base64.3
+MAN3+=	MIME::QuotedPrint.3
+MAN3+=	Math::BigFloat.3
+MAN3+=	Math::BigInt.3
+MAN3+=	Math::BigInt::Calc.3
+MAN3+=	Math::BigInt::CalcEmu.3
+MAN3+=	Math::BigRat.3
+MAN3+=	Math::Complex.3
+MAN3+=	Math::Trig.3
+MAN3+=	Memoize.3
+MAN3+=	Memoize::AnyDBM_File.3
+MAN3+=	Memoize::Expire.3
+MAN3+=	Memoize::ExpireFile.3
+MAN3+=	Memoize::ExpireTest.3
+MAN3+=	Memoize::NDBM_File.3
+MAN3+=	Memoize::SDBM_File.3
+MAN3+=	Memoize::Storable.3
+MAN3+=	NDBM_File.3
+MAN3+=	NEXT.3
+MAN3+=	Net::Cmd.3
+MAN3+=	Net::Config.3
+MAN3+=	Net::Domain.3
+MAN3+=	Net::FTP.3
+MAN3+=	Net::NNTP.3
+MAN3+=	Net::Netrc.3
+MAN3+=	Net::POP3.3
+MAN3+=	Net::Ping.3
+MAN3+=	Net::SMTP.3
+MAN3+=	Net::Time.3
+MAN3+=	Net::hostent.3
+MAN3+=	Net::libnetFAQ.3
+MAN3+=	Net::netent.3
+MAN3+=	Net::protoent.3
+MAN3+=	Net::servent.3
+MAN3+=	O.3
+MAN3+=	Opcode.3
+MAN3+=	POSIX.3
+MAN3+=	PerlIO.3
+MAN3+=	PerlIO::encoding.3
+MAN3+=	PerlIO::scalar.3
+MAN3+=	PerlIO::via.3
+MAN3+=	PerlIO::via::QuotedPrint.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::ParseLink.3
+MAN3+=	Pod::ParseUtils.3
+MAN3+=	Pod::Parser.3
+MAN3+=	Pod::Perldoc::ToChecker.3
+MAN3+=	Pod::Perldoc::ToMan.3
+MAN3+=	Pod::Perldoc::ToNroff.3
+MAN3+=	Pod::Perldoc::ToPod.3
+MAN3+=	Pod::Perldoc::ToRtf.3
+MAN3+=	Pod::Perldoc::ToText.3
+MAN3+=	Pod::Perldoc::ToTk.3
+MAN3+=	Pod::Perldoc::ToXml.3
+MAN3+=	Pod::PlainText.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+=	Scalar::Util.3
+MAN3+=	Search::Dict.3
+MAN3+=	SelectSaver.3
+MAN3+=	SelfLoader.3
+MAN3+=	Shell.3
+MAN3+=	Socket.3
+MAN3+=	Storable.3
+MAN3+=	Switch.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::Balanced.3
+MAN3+=	Text::ParseWords.3
+MAN3+=	Text::Soundex.3
+MAN3+=	Text::Tabs.3
+MAN3+=	Text::Wrap.3
+MAN3+=	Thread.3
+MAN3+=	Thread::Queue.3
+MAN3+=	Thread::Semaphore.3
+MAN3+=	Tie::Array.3
+MAN3+=	Tie::File.3
+MAN3+=	Tie::Handle.3
+MAN3+=	Tie::Hash.3
+MAN3+=	Tie::Memoize.3
+MAN3+=	Tie::RefHash.3
+MAN3+=	Tie::Scalar.3
+MAN3+=	Tie::SubstrHash.3
+MAN3+=	Time::HiRes.3
+MAN3+=	Time::Local.3
+MAN3+=	Time::gmtime.3
+MAN3+=	Time::localtime.3
+MAN3+=	Time::tm.3
+MAN3+=	UNIVERSAL.3
+MAN3+=	Unicode::Collate.3
+MAN3+=	Unicode::Normalize.3
+MAN3+=	Unicode::UCD.3
+MAN3+=	User::grent.3
+MAN3+=	User::pwent.3
+MAN3+=	XS::APItest.3
+MAN3+=	XS::Typemap.3
+MAN3+=	XSLoader.3
+MAN3+=	attributes.3
+MAN3+=	attrs.3
+MAN3+=	autouse.3
+MAN3+=	base.3
+MAN3+=	bigint.3
+MAN3+=	bignum.3
+MAN3+=	bigrat.3
+MAN3+=	blib.3
+MAN3+=	bytes.3
+MAN3+=	charnames.3
+MAN3+=	constant.3
+MAN3+=	diagnostics.3
+MAN3+=	encoding.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+=	sort.3
+MAN3+=	strict.3
+MAN3+=	subs.3
+MAN3+=	threads.3
+MAN3+=	threads::shared.3
+MAN3+=	utf8.3
+MAN3+=	vars.3
+MAN3+=	vmsish.3
+MAN3+=	warnings.3
+MAN3+=	warnings::register.3
diff --git a/lang/perl5.16/distinfo b/lang/perl5.16/distinfo
index 9ddd2a2cb528..e6442b145987 100644
--- a/lang/perl5.16/distinfo
+++ b/lang/perl5.16/distinfo
@@ -1,4 +1,4 @@
-MD5 (perl-5.8.2.tar.gz) = fa356b74f99166b63a68a322c3c68f91
-SIZE (perl-5.8.2.tar.gz) = 11896287
-MD5 (BSDPAN-5.8.0_1.tar.gz) = af9f075e073b14714cfeb8a7582013e7
-SIZE (BSDPAN-5.8.0_1.tar.gz) = 6338
+MD5 (perl-5.8.4.tar.bz2) = 3eb135afd0114f4e1acdd4ad6b8fd947
+SIZE (perl-5.8.4.tar.bz2) = 9598489
+MD5 (BSDPAN-5.8.4.tar.bz2) = 966436256621e247cc1fd7cbbfe5030c
+SIZE (BSDPAN-5.8.4.tar.bz2) = 6301
diff --git a/lang/perl5.16/files/patch-freebsd.sh b/lang/perl5.16/files/patch-freebsd.sh
new file mode 100644
index 000000000000..68ec6d4cd8a1
--- /dev/null
+++ b/lang/perl5.16/files/patch-freebsd.sh
@@ -0,0 +1,20 @@
+--- hints/freebsd.sh.orig	Sun May 30 17:55:47 2004
++++ hints/freebsd.sh	Sun May 30 17:57:16 2004
+@@ -88,6 +88,7 @@ case "$osvers" in
+ 	esac
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
+ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ dl / /'`
+ 	# iconv gone in Perl 5.8.1, but if someone compiles 5.8.0 or earlier.
+ 	libswanted=`echo $libswanted | sed 's/ iconv / /'`
+ 	d_setregid='define'
+@@ -102,6 +103,9 @@ case "$osvers" in
+ 	        ;;
+ 	esac
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
++	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ dl / /'`
++	libswanted=`echo $libswanted | sed 's/ iconv / /'`
+ 	;;
+ esac
+ 
diff --git a/lang/perl5.16/files/use.perl b/lang/perl5.16/files/use.perl
index 354c8e1e59cc..ba6057f1c5db 100644
--- a/lang/perl5.16/files/use.perl
+++ b/lang/perl5.16/files/use.perl
@@ -69,6 +69,7 @@ EOF
 	while (<MPOLD>) {
 		next if m|use.perl generated line|;
 		next if m|^\s*OPTIONAL_MANPATH\s+\S+/lib/perl5/%%PERL_VERSION%%/man\s*$|;
+		next if m|^\s*OPTIONAL_MANPATH\s+\S+/lib/perl5/%%PERL_VERSION%%/perl/man\s*$|;
 		print MPNEW;
 	}
 	close MPNEW;
@@ -112,6 +113,7 @@ EOF
 	my $perl_port_manpath = <<EOF;
 # -- use.perl generated line -- #
 OPTIONAL_MANPATH	%%PREFIX%%/lib/perl5/%%PERL_VERSION%%/man
+OPTIONAL_MANPATH	%%PREFIX%%/lib/perl5/%%PERL_VERSION%%/perl/man
 EOF
 
 	open MPOLD, "< /etc/manpath.config" or die "/etc/manpath.config: $!";
diff --git a/lang/perl5.16/pkg-install b/lang/perl5.16/pkg-install
index eb3fde91af87..a1544bccac42 100644
--- a/lang/perl5.16/pkg-install
+++ b/lang/perl5.16/pkg-install
@@ -6,7 +6,9 @@ fi
 
 INCLUDEDIR=/usr/include
 
-install -d ${PKG_PREFIX}/lib/perl5/site_perl/5.8.2/mach
+install -d ${PKG_PREFIX}/lib/perl5/site_perl/5.8.4/mach
+install -d ${PKG_PREFIX}/lib/perl5/site_perl/5.8.4/auto
+install -d ${PKG_PREFIX}/lib/perl5/5.8.4/man/man3
 cd ${INCLUDEDIR} && ${PKG_PREFIX}/bin/h2ph *.h machine/*.h sys/*.h
 
 if [ -z "${OSVERSION}" ]; then
diff --git a/lang/perl5.16/pkg-plist b/lang/perl5.16/pkg-plist
index 52965e7bbf55..a0cc81e1fc48 100644
--- a/lang/perl5.16/pkg-plist
+++ b/lang/perl5.16/pkg-plist
@@ -6,6 +6,7 @@ bin/enc2xs
 bin/find2perl
 bin/h2ph
 bin/h2xs
+bin/instmodsh
 bin/libnetcfg
 bin/perl
 bin/perl%%PERL_VER%%
@@ -24,6 +25,7 @@ bin/pod2text
 bin/pod2usage
 bin/podchecker
 bin/podselect
+bin/prove
 bin/psed
 bin/pstruct
 bin/s2p
@@ -104,8 +106,17 @@ lib/perl5/%%PERL_VER%%/Carp/Heavy.pm
 lib/perl5/%%PERL_VER%%/Class/ISA.pm
 lib/perl5/%%PERL_VER%%/Class/Struct.pm
 lib/perl5/%%PERL_VER%%/DB.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter.pm
+lib/perl5/%%PERL_VER%%/dbm_filter_util.pl
+lib/perl5/%%PERL_VER%%/DBM_Filter/Changes
+lib/perl5/%%PERL_VER%%/DBM_Filter/compress.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/encode.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/int32.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/null.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/utf8.pm
 lib/perl5/%%PERL_VER%%/Devel/SelfStubber.pm
 lib/perl5/%%PERL_VER%%/Digest.pm
+lib/perl5/%%PERL_VER%%/Digest/base.pm
 lib/perl5/%%PERL_VER%%/DirHandle.pm
 lib/perl5/%%PERL_VER%%/Dumpvalue.pm
 lib/perl5/%%PERL_VER%%/Encode/CN/HZ.pm
@@ -166,7 +177,6 @@ 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/testlib.pm
 lib/perl5/%%PERL_VER%%/ExtUtils/typemap
 lib/perl5/%%PERL_VER%%/ExtUtils/xsubpp
@@ -233,7 +243,7 @@ lib/perl5/%%PERL_VER%%/Math/BigFloat.pm
 lib/perl5/%%PERL_VER%%/Math/BigFloat/Trace.pm
 lib/perl5/%%PERL_VER%%/Math/BigInt.pm
 lib/perl5/%%PERL_VER%%/Math/BigInt/Calc.pm
-lib/perl5/%%PERL_VER%%/Math/BigInt/Scalar.pm
+lib/perl5/%%PERL_VER%%/Math/BigInt/CalcEmu.pm
 lib/perl5/%%PERL_VER%%/Math/BigInt/Trace.pm
 lib/perl5/%%PERL_VER%%/Math/BigRat.pm
 lib/perl5/%%PERL_VER%%/Math/Complex.pm
@@ -374,7 +384,6 @@ lib/perl5/%%PERL_VER%%/Unicode/README
 lib/perl5/%%PERL_VER%%/Unicode/UCD.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
@@ -844,6 +853,7 @@ lib/perl5/%%PERL_VER%%/open2.pl
 lib/perl5/%%PERL_VER%%/open3.pl
 lib/perl5/%%PERL_VER%%/overload.pm
 lib/perl5/%%PERL_VER%%/perl5db.pl
+lib/perl5/%%PERL_VER%%/pod/a2p.pod
 lib/perl5/%%PERL_VER%%/pod/perl.pod
 lib/perl5/%%PERL_VER%%/pod/perl5004delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl5005delta.pod
@@ -854,6 +864,9 @@ lib/perl5/%%PERL_VER%%/pod/perl571delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl572delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl573delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl581delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl582delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl583delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl584delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl58delta.pod
 lib/perl5/%%PERL_VER%%/pod/perlaix.pod
 lib/perl5/%%PERL_VER%%/pod/perlamiga.pod
@@ -1247,6 +1260,7 @@ lib/perl5/%%PERL_VER%%/unicore/lib/InYijing.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Inherite.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/JoinCont.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Kannada.pl
+lib/perl5/%%PERL_VER%%/unicore/lib/Katakan2.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Katakana.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Khmer.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/L.pl
@@ -1311,6 +1325,7 @@ lib/perl5/%%PERL_VER%%/unicore/lib/So.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/SoftDott.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Space.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/SpacePer.pl
+lib/perl5/%%PERL_VER%%/unicore/lib/Sterm.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Syriac.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Tagalog.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Tagbanwa.pl
@@ -1326,6 +1341,7 @@ lib/perl5/%%PERL_VER%%/unicore/lib/Ugaritic.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/UnifiedI.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Upper.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Uppercas.pl
+lib/perl5/%%PERL_VER%%/unicore/lib/Variatio.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/WhiteSpa.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Word.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/XDigit.pl
@@ -1454,7 +1470,9 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Scalar 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/List 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Digest 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VER%%/DBM_Filter 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/CN 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/MIME 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/KR 2>/dev/null || true
@@ -1518,13 +1536,18 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute 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%%/auto 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%% 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%%/auto 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 2>/dev/null || true
diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile
index 90d96bccfaef..9867d4a1752a 100644
--- a/lang/perl5.8/Makefile
+++ b/lang/perl5.8/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	5
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -15,28 +14,38 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 MASTER_SITE_SUBDIR=	../../src \
 			tobez/:local ./:local
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		BSDPAN-5.8.0_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
+		BSDPAN-${PERL_VER}${EXTRACT_SUFX}:local
+#		BSDPAN-5.8.0_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
 
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Practical Extraction and Report Language
 
-PERL_VER=	5.8.2
+PERL_VER=	5.8.4
 PERL_ARCH=	mach
 PERL_VERSION=	${PERL_VER}
 
+USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 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 \
+	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \
 	-Dman1dir=${PREFIX}/man/man1 \
-	-Dsitearch=${SITE_PERL}/${PERL_ARCH} \
-	-Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \
+	-Duse64bitint \
+	-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}\"
 
+INCLUDEDIR=	/usr/include
+
+.include "Makefile.man"
+.include <bsd.port.pre.mk>
+
 .if defined(ENABLE_SUIDPERL)
 CONFIGURE_ARGS+=	-Dd_dosuid=define
 PLIST_SUB+=		ENABLE_SUIDPERL=""
@@ -76,137 +85,16 @@ CONFIGURE_ARGS+=	-Dusemymalloc=y
 CONFIGURE_ARGS+=	-Dusemymalloc=n
 .endif
 
-INCLUDEDIR=	/usr/include
-
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} < 502100
 LATEST_LINK=	perl5.8
 .else
 PKGMESSAGE=	${PKGDIR}/.not-here
 .endif
 
-MAN1=	a2p.1 c2ph.1 dprofpp.1 enc2xs.1 find2perl.1 h2ph.1 h2xs.1 \
-	libnetcfg.1 perl.1 perl5004delta.1 perl5005delta.1 \
-	perl561delta.1 perl56delta.1 perl570delta.1 perl571delta.1 \
-	perl572delta.1 perlaix.1 perlamiga.1 perlapi.1 perlapio.1 \
-	perlapollo.1 perlbeos.1 perlbook.1 perlboot.1 perlbot.1 \
-	perlbs2000.1 perlbug.1 perlcall.1 perlcc.1 perlce.1 perlclib.1 \
-	perlcn.1 perlcompile.1 perlcygwin.1 perldata.1 perldbmfilter.1 \
-	perldebguts.1 perldebtut.1 perldebug.1 perldelta.1 perldgux.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 \
-	perlfreebsd.1 perlfunc.1 perlguts.1 perlhack.1 perlhist.1 \
-	perlhpux.1 perlhurd.1 perlintern.1 perlintro.1 perliol.1 \
-	perlipc.1 perlirix.1 perlivp.1 perljp.1 perlko.1 perllexwarn.1 \
-	perllocale.1 perllol.1 perlmachten.1 perlmacos.1 perlmint.1 \
-	perlmod.1 perlmodinstall.1 perlmodlib.1 perlmodstyle.1 \
-	perlmpeix.1 perlnetware.1 perlnewmod.1 perlnumber.1 perlobj.1 \
-	perlop.1 perlopentut.1 perlos2.1 perlos390.1 perlothrtut.1 \
-	perlpacktut.1 perlplan9.1 perlpod.1 perlpodspec.1 perlport.1 \
-	perlqnx.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 \
-	perltooc.1 perltoot.1 perltrap.1 perltru64.1 perltw.1 \
-	perlunicode.1 perluniintro.1 perlutil.1 perluts.1 perlvar.1 \
-	perlvmesa.1 perlvms.1 perlvos.1 perlwin32.1 perlxs.1 perlxstut.1 \
-	piconv.1 pl2pm.1 pod2html.1 pod2latex.1 pod2man.1 pod2text.1 \
-	pod2usage.1 podchecker.1 podselect.1 psed.1 pstruct.1 s2p.1 \
-	splain.1 xsubpp.1 cpan.1  perl573delta.1 perl58delta.1 perl581delta.1 \
-	perlartistic.1 perlcheat.1 perlgpl.1 perlmacosx.1 perlos400.1 \
-	perlreref.1
-
-MAN3=	AnyDBM_File.3 Attribute::Handlers.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::ISA.3 Class::Struct.3 Config.3 Cwd.3 \
-	DB.3 DB_File.3 Data::Dumper.3 Devel::DProf.3 Devel::PPPort.3 \
-	Devel::Peek.3 Devel::SelfStubber.3 Digest.3 Digest::MD5.3 \
-	DirHandle.3 Dumpvalue.3 DynaLoader.3 Encode.3 Encode::Alias.3 \
-	Encode::Byte.3 Encode::CJKConstants.3 Encode::CN.3 \
-	Encode::CN::HZ.3 Encode::Config.3 Encode::EBCDIC.3 \
-	Encode::Encoder.3 Encode::Encoding.3 Encode::Guess.3 \
-	Encode::JP.3 Encode::JP::H2Z.3 Encode::JP::JIS7.3 Encode::KR.3 \
-	Encode::KR::2022_KR.3 Encode::MIME::Header.3 Encode::PerlIO.3 \
-	Encode::Supported.3 Encode::Symbol.3 Encode::TW.3 \
-	Encode::Unicode.3 Encode::Unicode::UTF7.3 English.3 Env.3 Errno.3 \
-	Exporter.3 Exporter::Heavy.3 ExtUtils::Command.3 \
-	ExtUtils::Command::MM.3 ExtUtils::Constant.3 ExtUtils::Embed.3 \
-	ExtUtils::Install.3 ExtUtils::Installed.3 ExtUtils::Liblist.3 \
-	ExtUtils::MM.3 ExtUtils::MM_Any.3 ExtUtils::MM_BeOS.3 \
-	ExtUtils::MM_Cygwin.3 ExtUtils::MM_DOS.3 ExtUtils::MM_MacOS.3 \
-	ExtUtils::MM_NW5.3 ExtUtils::MM_OS2.3 ExtUtils::MM_UWIN.3 \
-	ExtUtils::MM_Unix.3 ExtUtils::MM_VMS.3 ExtUtils::MM_Win32.3 \
-	ExtUtils::MM_Win95.3 ExtUtils::MY.3 ExtUtils::MakeMaker.3 \
-	ExtUtils::MakeMaker::FAQ.3 ExtUtils::MakeMaker::Tutorial.3 \
-	ExtUtils::MakeMaker::bytes.3 ExtUtils::MakeMaker::vmsish.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::Cygwin.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 Filter::Simple.3 \
-	Filter::Util::Call.3 FindBin.3 Getopt::Long.3 Getopt::Std.3 \
-	Hash::Util.3 I18N::Collate.3 I18N::LangTags.3 I18N::LangTags::List.3 \
-	I18N::Langinfo.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 List::Util.3 \
-	Locale::Constants.3 Locale::Country.3 Locale::Currency.3 \
-	Locale::Language.3 Locale::Maketext.3 Locale::Maketext::TPJ13.3 \
-	Locale::Script.3 MIME::Base64.3 MIME::QuotedPrint.3 \
-	Math::BigFloat.3 Math::BigInt.3 Math::BigInt::Calc.3 \
-	Math::BigInt::Scalar.3 Math::BigRat.3 \
-	Math::Complex.3 Math::Trig.3 Memoize.3 Memoize::AnyDBM_File.3 \
-	Memoize::Expire.3 Memoize::ExpireFile.3 Memoize::ExpireTest.3 \
-	Memoize::NDBM_File.3 Memoize::SDBM_File.3 Memoize::Storable.3 \
-	NDBM_File.3 NEXT.3 Net::Cmd.3 Net::Config.3 Net::Domain.3 \
-	Net::FTP.3 Net::NNTP.3 Net::Netrc.3 Net::POP3.3 \
-	Net::Ping.3 Net::SMTP.3 Net::Time.3 Net::hostent.3 \
-	Net::libnetFAQ.3 Net::netent.3 Net::protoent.3 Net::servent.3 \
-	O.3 Opcode.3 POSIX.3 PerlIO.3 PerlIO::encoding.3 PerlIO::scalar.3 \
-	PerlIO::via.3 PerlIO::via::QuotedPrint.3 Pod::Checker.3 \
-	Pod::Find.3 Pod::Html.3 Pod::InputObjects.3 Pod::LaTeX.3 \
-	Pod::Man.3 Pod::ParseLink.3 Pod::ParseUtils.3 Pod::Parser.3 \
-	Pod::Perldoc::ToChecker.3 Pod::Perldoc::ToMan.3 \
-	Pod::Perldoc::ToNroff.3 Pod::Perldoc::ToPod.3 Pod::Perldoc::ToRtf.3 \
-	Pod::Perldoc::ToText.3 Pod::Perldoc::ToTk.3 Pod::Perldoc::ToXml.3 \
-	Pod::PlainText.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 Scalar::Util.3 Search::Dict.3 SelectSaver.3 \
-	SelfLoader.3 Shell.3 Socket.3 Storable.3 Switch.3 Symbol.3 \
-	Sys::Hostname.3 Sys::Syslog.3 Term::ANSIColor.3 Term::Cap.3 \
-	Term::Complete.3 Term::ReadLine.3 Test.3 Test::Builder.3 \
-	Test::Harness.3 Test::Harness::Assert.3 Test::Harness::Iterator.3 \
-	Test::Harness::Straps.3 Test::More.3 Test::Simple.3 Test::Tutorial.3 \
-	Text::Abbrev.3 Text::Balanced.3 Text::ParseWords.3 \
-	Text::Soundex.3 Text::Tabs.3 Text::Wrap.3 Thread.3 Thread::Queue.3 \
-	Thread::Semaphore.3 Tie::Array.3 Tie::File.3 Tie::Handle.3 \
-	Tie::Hash.3 Tie::Memoize.3 Tie::RefHash.3 Tie::Scalar.3 \
-	Tie::SubstrHash.3 Time::HiRes.3 Time::Local.3 Time::gmtime.3 \
-	Time::localtime.3 Time::tm.3 UNIVERSAL.3 Unicode::Collate.3 \
-	Unicode::Normalize.3 Unicode::UCD.3 User::grent.3 User::pwent.3 \
-	Win32.3 XS::APItest.3 XS::Typemap.3 XSLoader.3 attributes.3 \
-	attrs.3 autouse.3 base.3 bigint.3 bignum.3 bigrat.3 blib.3 \
-	bytes.3 charnames.3 constant.3 diagnostics.3 encoding.3 \
-	fields.3 filetest.3 if.3 integer.3 less.3 lib.3 locale.3 \
-	open.3 ops.3 overload.3 re.3 sigtrap.3 sort.3 strict.3 \
-	subs.3 threads.3 threads::shared.3 utf8.3 vars.3 vmsish.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)
@@ -214,8 +102,8 @@ 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
-BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-5.8.0
-BSDPAN_REVISION=1
+BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-5.8.4
+# BSDPAN_REVISION=1
 
 post-patch:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
@@ -240,7 +128,9 @@ post-install:
 		${BSDPAN_WRKSRC}/${files} ${BSDPAN_DEST}/${files}
 .endfor
 	@(cd ${INCLUDEDIR} && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h)
-	${MKDIR} ${SITE_PERL}/${PERL_ARCH}/auto
+	${MKDIR} ${PREFIX}/${SITE_PERL_REL}/auto
+	${MKDIR} ${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto
+	${MKDIR} ${PREFIX}/lib/perl5/${PERL_VER}/man/man3
 .if ${OSVERSION} < 502100
 	@fmt ${PKGMESSAGE}
 .else
diff --git a/lang/perl5.8/Makefile.man b/lang/perl5.8/Makefile.man
new file mode 100644
index 000000000000..30fe98bb0f88
--- /dev/null
+++ b/lang/perl5.8/Makefile.man
@@ -0,0 +1,500 @@
+# $Id$
+
+MAN1+=	a2p.1
+MAN1+=	c2ph.1
+MAN1+=	cpan.1
+MAN1+=	dprofpp.1
+MAN1+=	enc2xs.1
+MAN1+=	find2perl.1
+MAN1+=	h2ph.1
+MAN1+=	h2xs.1
+MAN1+=	libnetcfg.1
+MAN1+=	perl.1
+MAN1+=	perl5004delta.1
+MAN1+=	perl5005delta.1
+MAN1+=	perl561delta.1
+MAN1+=	perl56delta.1
+MAN1+=	perl570delta.1
+MAN1+=	perl571delta.1
+MAN1+=	perl572delta.1
+MAN1+=	perl573delta.1
+MAN1+=	perl581delta.1
+MAN1+=	perl582delta.1
+MAN1+=	perl583delta.1
+MAN1+=	perl584delta.1
+MAN1+=	perl58delta.1
+MAN1+=	perlaix.1
+MAN1+=	perlamiga.1
+MAN1+=	perlapi.1
+MAN1+=	perlapio.1
+MAN1+=	perlapollo.1
+MAN1+=	perlartistic.1
+MAN1+=	perlbeos.1
+MAN1+=	perlbook.1
+MAN1+=	perlboot.1
+MAN1+=	perlbot.1
+MAN1+=	perlbs2000.1
+MAN1+=	perlbug.1
+MAN1+=	perlcall.1
+MAN1+=	perlcc.1
+MAN1+=	perlce.1
+MAN1+=	perlcheat.1
+MAN1+=	perlclib.1
+MAN1+=	perlcn.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+=	perldgux.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+=	perlfreebsd.1
+MAN1+=	perlfunc.1
+MAN1+=	perlgpl.1
+MAN1+=	perlguts.1
+MAN1+=	perlhack.1
+MAN1+=	perlhist.1
+MAN1+=	perlhpux.1
+MAN1+=	perlhurd.1
+MAN1+=	perlintern.1
+MAN1+=	perlintro.1
+MAN1+=	perliol.1
+MAN1+=	perlipc.1
+MAN1+=	perlirix.1
+MAN1+=	perlivp.1
+MAN1+=	perljp.1
+MAN1+=	perlko.1
+MAN1+=	perllexwarn.1
+MAN1+=	perllocale.1
+MAN1+=	perllol.1
+MAN1+=	perlmachten.1
+MAN1+=	perlmacos.1
+MAN1+=	perlmacosx.1
+MAN1+=	perlmint.1
+MAN1+=	perlmod.1
+MAN1+=	perlmodinstall.1
+MAN1+=	perlmodlib.1
+MAN1+=	perlmodstyle.1
+MAN1+=	perlmpeix.1
+MAN1+=	perlnetware.1
+MAN1+=	perlnewmod.1
+MAN1+=	perlnumber.1
+MAN1+=	perlobj.1
+MAN1+=	perlop.1
+MAN1+=	perlopentut.1
+MAN1+=	perlos2.1
+MAN1+=	perlos390.1
+MAN1+=	perlos400.1
+MAN1+=	perlothrtut.1
+MAN1+=	perlpacktut.1
+MAN1+=	perlplan9.1
+MAN1+=	perlpod.1
+MAN1+=	perlpodspec.1
+MAN1+=	perlport.1
+MAN1+=	perlqnx.1
+MAN1+=	perlre.1
+MAN1+=	perlref.1
+MAN1+=	perlreftut.1
+MAN1+=	perlrequick.1
+MAN1+=	perlreref.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+=	perltooc.1
+MAN1+=	perltoot.1
+MAN1+=	perltrap.1
+MAN1+=	perltru64.1
+MAN1+=	perltw.1
+MAN1+=	perlunicode.1
+MAN1+=	perluniintro.1
+MAN1+=	perlutil.1
+MAN1+=	perluts.1
+MAN1+=	perlvar.1
+MAN1+=	perlvmesa.1
+MAN1+=	perlvms.1
+MAN1+=	perlvos.1
+MAN1+=	perlwin32.1
+MAN1+=	perlxs.1
+MAN1+=	perlxstut.1
+MAN1+=	piconv.1
+MAN1+=	pl2pm.1
+MAN1+=	pod2html.1
+MAN1+=	pod2latex.1
+MAN1+=	pod2man.1
+MAN1+=	pod2text.1
+MAN1+=	pod2usage.1
+MAN1+=	podchecker.1
+MAN1+=	podselect.1
+MAN1+=	prove.1
+MAN1+=	psed.1
+MAN1+=	pstruct.1
+MAN1+=	s2p.1
+MAN1+=	splain.1
+MAN1+=	xsubpp.1
+
+MAN3+=	AnyDBM_File.3
+MAN3+=	Attribute::Handlers.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::ISA.3
+MAN3+=	Class::Struct.3
+MAN3+=	Config.3
+MAN3+=	Cwd.3
+MAN3+=	DB.3
+MAN3+=	DBM_Filter.3
+MAN3+=	DBM_Filter::compress.3
+MAN3+=	DBM_Filter::encode.3
+MAN3+=	DBM_Filter::int32.3
+MAN3+=	DBM_Filter::null.3
+MAN3+=	DBM_Filter::utf8.3
+MAN3+=	DB_File.3
+MAN3+=	Data::Dumper.3
+MAN3+=	Devel::DProf.3
+MAN3+=	Devel::PPPort.3
+MAN3+=	Devel::Peek.3
+MAN3+=	Devel::SelfStubber.3
+MAN3+=	Digest.3
+MAN3+=	Digest::MD5.3
+MAN3+=	Digest::base.3
+MAN3+=	DirHandle.3
+MAN3+=	Dumpvalue.3
+MAN3+=	DynaLoader.3
+MAN3+=	Encode.3
+MAN3+=	Encode::Alias.3
+MAN3+=	Encode::Byte.3
+MAN3+=	Encode::CJKConstants.3
+MAN3+=	Encode::CN.3
+MAN3+=	Encode::CN::HZ.3
+MAN3+=	Encode::Config.3
+MAN3+=	Encode::EBCDIC.3
+MAN3+=	Encode::Encoder.3
+MAN3+=	Encode::Encoding.3
+MAN3+=	Encode::Guess.3
+MAN3+=	Encode::JP.3
+MAN3+=	Encode::JP::H2Z.3
+MAN3+=	Encode::JP::JIS7.3
+MAN3+=	Encode::KR.3
+MAN3+=	Encode::KR::2022_KR.3
+MAN3+=	Encode::MIME::Header.3
+MAN3+=	Encode::PerlIO.3
+MAN3+=	Encode::Supported.3
+MAN3+=	Encode::Symbol.3
+MAN3+=	Encode::TW.3
+MAN3+=	Encode::Unicode.3
+MAN3+=	Encode::Unicode::UTF7.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::Constant.3
+MAN3+=	ExtUtils::Embed.3
+MAN3+=	ExtUtils::Install.3
+MAN3+=	ExtUtils::Installed.3
+MAN3+=	ExtUtils::Liblist.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+=	Filter::Simple.3
+MAN3+=	Filter::Util::Call.3
+MAN3+=	FindBin.3
+MAN3+=	Getopt::Long.3
+MAN3+=	Getopt::Std.3
+MAN3+=	Hash::Util.3
+MAN3+=	I18N::Collate.3
+MAN3+=	I18N::LangTags.3
+MAN3+=	I18N::LangTags::List.3
+MAN3+=	I18N::Langinfo.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+=	List::Util.3
+MAN3+=	Locale::Constants.3
+MAN3+=	Locale::Country.3
+MAN3+=	Locale::Currency.3
+MAN3+=	Locale::Language.3
+MAN3+=	Locale::Maketext.3
+MAN3+=	Locale::Maketext::TPJ13.3
+MAN3+=	Locale::Script.3
+MAN3+=	MIME::Base64.3
+MAN3+=	MIME::QuotedPrint.3
+MAN3+=	Math::BigFloat.3
+MAN3+=	Math::BigInt.3
+MAN3+=	Math::BigInt::Calc.3
+MAN3+=	Math::BigInt::CalcEmu.3
+MAN3+=	Math::BigRat.3
+MAN3+=	Math::Complex.3
+MAN3+=	Math::Trig.3
+MAN3+=	Memoize.3
+MAN3+=	Memoize::AnyDBM_File.3
+MAN3+=	Memoize::Expire.3
+MAN3+=	Memoize::ExpireFile.3
+MAN3+=	Memoize::ExpireTest.3
+MAN3+=	Memoize::NDBM_File.3
+MAN3+=	Memoize::SDBM_File.3
+MAN3+=	Memoize::Storable.3
+MAN3+=	NDBM_File.3
+MAN3+=	NEXT.3
+MAN3+=	Net::Cmd.3
+MAN3+=	Net::Config.3
+MAN3+=	Net::Domain.3
+MAN3+=	Net::FTP.3
+MAN3+=	Net::NNTP.3
+MAN3+=	Net::Netrc.3
+MAN3+=	Net::POP3.3
+MAN3+=	Net::Ping.3
+MAN3+=	Net::SMTP.3
+MAN3+=	Net::Time.3
+MAN3+=	Net::hostent.3
+MAN3+=	Net::libnetFAQ.3
+MAN3+=	Net::netent.3
+MAN3+=	Net::protoent.3
+MAN3+=	Net::servent.3
+MAN3+=	O.3
+MAN3+=	Opcode.3
+MAN3+=	POSIX.3
+MAN3+=	PerlIO.3
+MAN3+=	PerlIO::encoding.3
+MAN3+=	PerlIO::scalar.3
+MAN3+=	PerlIO::via.3
+MAN3+=	PerlIO::via::QuotedPrint.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::ParseLink.3
+MAN3+=	Pod::ParseUtils.3
+MAN3+=	Pod::Parser.3
+MAN3+=	Pod::Perldoc::ToChecker.3
+MAN3+=	Pod::Perldoc::ToMan.3
+MAN3+=	Pod::Perldoc::ToNroff.3
+MAN3+=	Pod::Perldoc::ToPod.3
+MAN3+=	Pod::Perldoc::ToRtf.3
+MAN3+=	Pod::Perldoc::ToText.3
+MAN3+=	Pod::Perldoc::ToTk.3
+MAN3+=	Pod::Perldoc::ToXml.3
+MAN3+=	Pod::PlainText.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+=	Scalar::Util.3
+MAN3+=	Search::Dict.3
+MAN3+=	SelectSaver.3
+MAN3+=	SelfLoader.3
+MAN3+=	Shell.3
+MAN3+=	Socket.3
+MAN3+=	Storable.3
+MAN3+=	Switch.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::Balanced.3
+MAN3+=	Text::ParseWords.3
+MAN3+=	Text::Soundex.3
+MAN3+=	Text::Tabs.3
+MAN3+=	Text::Wrap.3
+MAN3+=	Thread.3
+MAN3+=	Thread::Queue.3
+MAN3+=	Thread::Semaphore.3
+MAN3+=	Tie::Array.3
+MAN3+=	Tie::File.3
+MAN3+=	Tie::Handle.3
+MAN3+=	Tie::Hash.3
+MAN3+=	Tie::Memoize.3
+MAN3+=	Tie::RefHash.3
+MAN3+=	Tie::Scalar.3
+MAN3+=	Tie::SubstrHash.3
+MAN3+=	Time::HiRes.3
+MAN3+=	Time::Local.3
+MAN3+=	Time::gmtime.3
+MAN3+=	Time::localtime.3
+MAN3+=	Time::tm.3
+MAN3+=	UNIVERSAL.3
+MAN3+=	Unicode::Collate.3
+MAN3+=	Unicode::Normalize.3
+MAN3+=	Unicode::UCD.3
+MAN3+=	User::grent.3
+MAN3+=	User::pwent.3
+MAN3+=	XS::APItest.3
+MAN3+=	XS::Typemap.3
+MAN3+=	XSLoader.3
+MAN3+=	attributes.3
+MAN3+=	attrs.3
+MAN3+=	autouse.3
+MAN3+=	base.3
+MAN3+=	bigint.3
+MAN3+=	bignum.3
+MAN3+=	bigrat.3
+MAN3+=	blib.3
+MAN3+=	bytes.3
+MAN3+=	charnames.3
+MAN3+=	constant.3
+MAN3+=	diagnostics.3
+MAN3+=	encoding.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+=	sort.3
+MAN3+=	strict.3
+MAN3+=	subs.3
+MAN3+=	threads.3
+MAN3+=	threads::shared.3
+MAN3+=	utf8.3
+MAN3+=	vars.3
+MAN3+=	vmsish.3
+MAN3+=	warnings.3
+MAN3+=	warnings::register.3
diff --git a/lang/perl5.8/distinfo b/lang/perl5.8/distinfo
index 9ddd2a2cb528..e6442b145987 100644
--- a/lang/perl5.8/distinfo
+++ b/lang/perl5.8/distinfo
@@ -1,4 +1,4 @@
-MD5 (perl-5.8.2.tar.gz) = fa356b74f99166b63a68a322c3c68f91
-SIZE (perl-5.8.2.tar.gz) = 11896287
-MD5 (BSDPAN-5.8.0_1.tar.gz) = af9f075e073b14714cfeb8a7582013e7
-SIZE (BSDPAN-5.8.0_1.tar.gz) = 6338
+MD5 (perl-5.8.4.tar.bz2) = 3eb135afd0114f4e1acdd4ad6b8fd947
+SIZE (perl-5.8.4.tar.bz2) = 9598489
+MD5 (BSDPAN-5.8.4.tar.bz2) = 966436256621e247cc1fd7cbbfe5030c
+SIZE (BSDPAN-5.8.4.tar.bz2) = 6301
diff --git a/lang/perl5.8/files/patch-freebsd.sh b/lang/perl5.8/files/patch-freebsd.sh
new file mode 100644
index 000000000000..68ec6d4cd8a1
--- /dev/null
+++ b/lang/perl5.8/files/patch-freebsd.sh
@@ -0,0 +1,20 @@
+--- hints/freebsd.sh.orig	Sun May 30 17:55:47 2004
++++ hints/freebsd.sh	Sun May 30 17:57:16 2004
+@@ -88,6 +88,7 @@ case "$osvers" in
+ 	esac
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
+ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ dl / /'`
+ 	# iconv gone in Perl 5.8.1, but if someone compiles 5.8.0 or earlier.
+ 	libswanted=`echo $libswanted | sed 's/ iconv / /'`
+ 	d_setregid='define'
+@@ -102,6 +103,9 @@ case "$osvers" in
+ 	        ;;
+ 	esac
+ 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
++	libswanted=`echo $libswanted | sed 's/ bind / /'`
++	libswanted=`echo $libswanted | sed 's/ dl / /'`
++	libswanted=`echo $libswanted | sed 's/ iconv / /'`
+ 	;;
+ esac
+ 
diff --git a/lang/perl5.8/files/use.perl b/lang/perl5.8/files/use.perl
index 354c8e1e59cc..ba6057f1c5db 100644
--- a/lang/perl5.8/files/use.perl
+++ b/lang/perl5.8/files/use.perl
@@ -69,6 +69,7 @@ EOF
 	while (<MPOLD>) {
 		next if m|use.perl generated line|;
 		next if m|^\s*OPTIONAL_MANPATH\s+\S+/lib/perl5/%%PERL_VERSION%%/man\s*$|;
+		next if m|^\s*OPTIONAL_MANPATH\s+\S+/lib/perl5/%%PERL_VERSION%%/perl/man\s*$|;
 		print MPNEW;
 	}
 	close MPNEW;
@@ -112,6 +113,7 @@ EOF
 	my $perl_port_manpath = <<EOF;
 # -- use.perl generated line -- #
 OPTIONAL_MANPATH	%%PREFIX%%/lib/perl5/%%PERL_VERSION%%/man
+OPTIONAL_MANPATH	%%PREFIX%%/lib/perl5/%%PERL_VERSION%%/perl/man
 EOF
 
 	open MPOLD, "< /etc/manpath.config" or die "/etc/manpath.config: $!";
diff --git a/lang/perl5.8/pkg-install b/lang/perl5.8/pkg-install
index eb3fde91af87..a1544bccac42 100644
--- a/lang/perl5.8/pkg-install
+++ b/lang/perl5.8/pkg-install
@@ -6,7 +6,9 @@ fi
 
 INCLUDEDIR=/usr/include
 
-install -d ${PKG_PREFIX}/lib/perl5/site_perl/5.8.2/mach
+install -d ${PKG_PREFIX}/lib/perl5/site_perl/5.8.4/mach
+install -d ${PKG_PREFIX}/lib/perl5/site_perl/5.8.4/auto
+install -d ${PKG_PREFIX}/lib/perl5/5.8.4/man/man3
 cd ${INCLUDEDIR} && ${PKG_PREFIX}/bin/h2ph *.h machine/*.h sys/*.h
 
 if [ -z "${OSVERSION}" ]; then
diff --git a/lang/perl5.8/pkg-plist b/lang/perl5.8/pkg-plist
index 52965e7bbf55..a0cc81e1fc48 100644
--- a/lang/perl5.8/pkg-plist
+++ b/lang/perl5.8/pkg-plist
@@ -6,6 +6,7 @@ bin/enc2xs
 bin/find2perl
 bin/h2ph
 bin/h2xs
+bin/instmodsh
 bin/libnetcfg
 bin/perl
 bin/perl%%PERL_VER%%
@@ -24,6 +25,7 @@ bin/pod2text
 bin/pod2usage
 bin/podchecker
 bin/podselect
+bin/prove
 bin/psed
 bin/pstruct
 bin/s2p
@@ -104,8 +106,17 @@ lib/perl5/%%PERL_VER%%/Carp/Heavy.pm
 lib/perl5/%%PERL_VER%%/Class/ISA.pm
 lib/perl5/%%PERL_VER%%/Class/Struct.pm
 lib/perl5/%%PERL_VER%%/DB.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter.pm
+lib/perl5/%%PERL_VER%%/dbm_filter_util.pl
+lib/perl5/%%PERL_VER%%/DBM_Filter/Changes
+lib/perl5/%%PERL_VER%%/DBM_Filter/compress.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/encode.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/int32.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/null.pm
+lib/perl5/%%PERL_VER%%/DBM_Filter/utf8.pm
 lib/perl5/%%PERL_VER%%/Devel/SelfStubber.pm
 lib/perl5/%%PERL_VER%%/Digest.pm
+lib/perl5/%%PERL_VER%%/Digest/base.pm
 lib/perl5/%%PERL_VER%%/DirHandle.pm
 lib/perl5/%%PERL_VER%%/Dumpvalue.pm
 lib/perl5/%%PERL_VER%%/Encode/CN/HZ.pm
@@ -166,7 +177,6 @@ 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/testlib.pm
 lib/perl5/%%PERL_VER%%/ExtUtils/typemap
 lib/perl5/%%PERL_VER%%/ExtUtils/xsubpp
@@ -233,7 +243,7 @@ lib/perl5/%%PERL_VER%%/Math/BigFloat.pm
 lib/perl5/%%PERL_VER%%/Math/BigFloat/Trace.pm
 lib/perl5/%%PERL_VER%%/Math/BigInt.pm
 lib/perl5/%%PERL_VER%%/Math/BigInt/Calc.pm
-lib/perl5/%%PERL_VER%%/Math/BigInt/Scalar.pm
+lib/perl5/%%PERL_VER%%/Math/BigInt/CalcEmu.pm
 lib/perl5/%%PERL_VER%%/Math/BigInt/Trace.pm
 lib/perl5/%%PERL_VER%%/Math/BigRat.pm
 lib/perl5/%%PERL_VER%%/Math/Complex.pm
@@ -374,7 +384,6 @@ lib/perl5/%%PERL_VER%%/Unicode/README
 lib/perl5/%%PERL_VER%%/Unicode/UCD.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
@@ -844,6 +853,7 @@ lib/perl5/%%PERL_VER%%/open2.pl
 lib/perl5/%%PERL_VER%%/open3.pl
 lib/perl5/%%PERL_VER%%/overload.pm
 lib/perl5/%%PERL_VER%%/perl5db.pl
+lib/perl5/%%PERL_VER%%/pod/a2p.pod
 lib/perl5/%%PERL_VER%%/pod/perl.pod
 lib/perl5/%%PERL_VER%%/pod/perl5004delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl5005delta.pod
@@ -854,6 +864,9 @@ lib/perl5/%%PERL_VER%%/pod/perl571delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl572delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl573delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl581delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl582delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl583delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl584delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl58delta.pod
 lib/perl5/%%PERL_VER%%/pod/perlaix.pod
 lib/perl5/%%PERL_VER%%/pod/perlamiga.pod
@@ -1247,6 +1260,7 @@ lib/perl5/%%PERL_VER%%/unicore/lib/InYijing.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Inherite.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/JoinCont.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Kannada.pl
+lib/perl5/%%PERL_VER%%/unicore/lib/Katakan2.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Katakana.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Khmer.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/L.pl
@@ -1311,6 +1325,7 @@ lib/perl5/%%PERL_VER%%/unicore/lib/So.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/SoftDott.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Space.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/SpacePer.pl
+lib/perl5/%%PERL_VER%%/unicore/lib/Sterm.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Syriac.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Tagalog.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Tagbanwa.pl
@@ -1326,6 +1341,7 @@ lib/perl5/%%PERL_VER%%/unicore/lib/Ugaritic.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/UnifiedI.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Upper.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Uppercas.pl
+lib/perl5/%%PERL_VER%%/unicore/lib/Variatio.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/WhiteSpa.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/Word.pl
 lib/perl5/%%PERL_VER%%/unicore/lib/XDigit.pl
@@ -1454,7 +1470,9 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Scalar 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/List 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Digest 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VER%%/DBM_Filter 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/CN 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/MIME 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/KR 2>/dev/null || true
@@ -1518,13 +1536,18 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute 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%%/auto 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VER%% 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%%/auto 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 2>/dev/null || true