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)

1 files changed, 21 insertions, 131 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