- Prevent install of conflicting bin/corelist under perl 5.8.9 [1]

- Update data to 2.17, not yet on CPAN, but included in perl 5.8.9 distribution

Noticed by:	pointyhat via pav [1]

3 files changed, 457 insertions, 2 deletions

diff --git a/devel/p5-Module-CoreList/Makefile b/devel/p5-Module-CoreList/Makefile
index 991bb7fe8534..8c14ca3d105b 100644
--- a/devel/p5-Module-CoreList/Makefile
+++ b/devel/p5-Module-CoreList/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Module-CoreList
 PORTVERSION=	2.15
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -19,4 +20,15 @@ PERL_CONFIGURE=	yes
 MAN1=		corelist.1
 MAN3=		Module::CoreList.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} >= 5.00809
+.undef MAN1
+PLIST_SUB+=	PL_FILES="@comment "
+pre-patch:
+	@${PERL} -pi -e "s,'corelist',," ${WRKSRC}/Makefile.PL
+.else
+PLIST_SUB+=	PL_FILES=""
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Module-CoreList/files/patch-lib__Module__CoreList.pm b/devel/p5-Module-CoreList/files/patch-lib__Module__CoreList.pm
new file mode 100644
index 000000000000..bb7922acf0e7
--- /dev/null
+++ b/devel/p5-Module-CoreList/files/patch-lib__Module__CoreList.pm
@@ -0,0 +1,443 @@
+--- ./lib/Module/CoreList.pm.orig	2009-01-15 12:41:43.000000000 +0100
++++ ./lib/Module/CoreList.pm	2009-01-15 12:42:15.000000000 +0100
+@@ -1,7 +1,7 @@
+ package Module::CoreList;
+ use strict;
+ use vars qw/$VERSION %released %patchlevel %version %families/;
+-$VERSION = '2.15';
++$VERSION = '2.17';
+ 
+ =head1 NAME
+ 
+@@ -148,7 +148,7 @@ sub find_version {
+ %released = (
+     5.000    => '1994-10-17',
+     5.001    => '1995-03-14',
+-    5.002    => '1996-02-96',
++    5.002    => '1996-02-29',
+     5.00307  => '1996-10-10',
+     5.004    => '1997-05-15',
+     5.005    => '1998-07-22',
+@@ -175,6 +175,7 @@ sub find_version {
+     5.009004 => '2006-08-15',
+     5.009005 => '2007-07-07',
+     5.010000 => '2007-12-18',
++    5.008009 => '2008-12-14',
+    );
+ 
+ # perforce branches and patch levels
+@@ -203,6 +204,7 @@ sub find_version {
+     5.009004 => [perl => 28727],
+     5.009005 => [perl => 31562],
+     5.010000 => [perl => 32642],
++    5.008009 => ['maint-5.8' => 35095],
+ );
+ 
+ for my $version ( sort { $a <=> $b } keys %released ) {
+@@ -8662,6 +8664,406 @@ for my $version ( sort { $a <=> $b } key
+ 	'warnings'              => '1.06',
+ 	'warnings::register'    => '1.01',
+     },
++
++    5.008009 => {
++	'AnyDBM_File'           => '1.00',
++	'Attribute::Handlers'   => '0.78_03',
++	'AutoLoader'            => '5.67',
++	'AutoSplit'             => '1.06',
++	'B'                     => '1.19',
++	'B::Asmdata'            => '1.02',
++	'B::Assembler'          => '0.08',
++	'B::Bblock'             => '1.02_01',
++	'B::Bytecode'           => '1.01_01',
++	'B::C'                  => '1.05',
++	'B::CC'                 => '1.00_01',
++	'B::Concise'            => '0.76',
++	'B::Debug'              => '1.05',
++	'B::Deparse'            => '0.87',
++	'B::Disassembler'       => '1.05',
++	'B::Lint'               => '1.11',
++	'B::Lint::Debug'        => undef,
++	'B::Showlex'            => '1.02',
++	'B::Stackobj'           => '1.00',
++	'B::Stash'              => '1.00',
++	'B::Terse'              => '1.05',
++	'B::Xref'               => '1.01',
++	'Benchmark'             => '1.1',
++	'ByteLoader'            => '0.06',
++	'CGI'                   => '3.42',
++	'CGI::Apache'           => '1.00',
++	'CGI::Carp'             => '1.30_01',
++	'CGI::Cookie'           => '1.29',
++	'CGI::Fast'             => '1.07',
++	'CGI::Pretty'           => '1.08',
++	'CGI::Push'             => '1.04',
++	'CGI::Switch'           => '1.00',
++	'CGI::Util'             => '1.5_01',
++	'CPAN'                  => '1.9301',
++	'CPAN::Debug'           => '5.5',
++	'CPAN::DeferedCode'     => '5.50',
++	'CPAN::Distroprefs'     => '6',
++	'CPAN::FirstTime'       => '5.5_01',
++	'CPAN::HandleConfig'    => '5.5',
++	'CPAN::Kwalify'         => '5.50',
++	'CPAN::Nox'             => '5.50',
++	'CPAN::Queue'           => '5.5',
++	'CPAN::Tarzip'          => '5.5',
++	'CPAN::Version'         => '5.5',
++	'Carp'                  => '1.10',
++	'Carp::Heavy'           => '1.10',
++	'Class::ISA'            => '0.33',
++	'Class::Struct'         => '0.63',
++	'Config'                => undef,
++	'Cwd'                   => '3.29',
++	'DB'                    => '1.01',
++	'DBM_Filter'            => '0.02',
++	'DBM_Filter::compress'  => '0.02',
++	'DBM_Filter::encode'    => '0.02',
++	'DBM_Filter::int32'     => '0.02',
++	'DBM_Filter::null'      => '0.02',
++	'DBM_Filter::utf8'      => '0.02',
++	'DB_File'               => '1.817',
++	'DCLsym'                => '1.03',
++	'Data::Dumper'          => '2.121_17',
++	'Devel::DProf'          => '20080331.00',
++	'Devel::InnerPackage'   => '0.3',
++	'Devel::PPPort'         => '3.14',
++	'Devel::Peek'           => '1.04',
++	'Devel::SelfStubber'    => '1.03',
++	'Digest'                => '1.15',
++	'Digest::MD5'           => '2.37',
++	'Digest::base'          => '1.00',
++	'Digest::file'          => '1.00',
++	'DirHandle'             => '1.02',
++	'Dumpvalue'             => '1.12',
++	'DynaLoader'            => '1.09',
++	'Encode'                => '2.26',
++	'Encode::Alias'         => '2.10',
++	'Encode::Byte'          => '2.03',
++	'Encode::CJKConstants'  => '2.02',
++	'Encode::CN'            => '2.02',
++	'Encode::CN::HZ'        => '2.05',
++	'Encode::Config'        => '2.05',
++	'Encode::EBCDIC'        => '2.02',
++	'Encode::Encoder'       => '2.01',
++	'Encode::Encoding'      => '2.05',
++	'Encode::GSM0338'       => '2.01',
++	'Encode::Guess'         => '2.02',
++	'Encode::JP'            => '2.03',
++	'Encode::JP::H2Z'       => '2.02',
++	'Encode::JP::JIS7'      => '2.04',
++	'Encode::KR'            => '2.02',
++	'Encode::KR::2022_KR'   => '2.02',
++	'Encode::MIME::Header'  => '2.05',
++	'Encode::MIME::Header::ISO_2022_JP'=> '1.03',
++	'Encode::MIME::Name'    => '1.01',
++	'Encode::Symbol'        => '2.02',
++	'Encode::TW'            => '2.02',
++	'Encode::Unicode'       => '2.05',
++	'Encode::Unicode::UTF7' => '2.04',
++	'English'               => '1.03',
++	'Env'                   => '1.00',
++	'Errno'                 => '1.10',
++	'Exporter'              => '5.63',
++	'Exporter::Heavy'       => '5.63',
++	'ExtUtils::Command'     => '1.15',
++	'ExtUtils::Command::MM' => '6.48',
++	'ExtUtils::Constant'    => '0.21',
++	'ExtUtils::Constant::Base'=> '0.04',
++	'ExtUtils::Constant::ProxySubs'=> '0.06',
++	'ExtUtils::Constant::Utils'=> '0.02',
++	'ExtUtils::Constant::XS'=> '0.02',
++	'ExtUtils::Embed'       => '1.28',
++	'ExtUtils::Install'     => '1.50_01',
++	'ExtUtils::Installed'   => '1.43',
++	'ExtUtils::Liblist'     => '6.48',
++	'ExtUtils::Liblist::Kid'=> '6.48',
++	'ExtUtils::MM'          => '6.48',
++	'ExtUtils::MM_AIX'      => '6.48',
++	'ExtUtils::MM_Any'      => '6.48',
++	'ExtUtils::MM_BeOS'     => '6.48',
++	'ExtUtils::MM_Cygwin'   => '6.48',
++	'ExtUtils::MM_DOS'      => '6.48',
++	'ExtUtils::MM_Darwin'   => '6.48',
++	'ExtUtils::MM_MacOS'    => '6.48',
++	'ExtUtils::MM_NW5'      => '6.48',
++	'ExtUtils::MM_OS2'      => '6.48',
++	'ExtUtils::MM_QNX'      => '6.48',
++	'ExtUtils::MM_UWIN'     => '6.48',
++	'ExtUtils::MM_Unix'     => '6.48',
++	'ExtUtils::MM_VMS'      => '6.48',
++	'ExtUtils::MM_VOS'      => '6.48',
++	'ExtUtils::MM_Win32'    => '6.48',
++	'ExtUtils::MM_Win95'    => '6.48',
++	'ExtUtils::MY'          => '6.48',
++	'ExtUtils::MakeMaker'   => '6.48',
++	'ExtUtils::MakeMaker::Config'=> '6.48',
++	'ExtUtils::MakeMaker::bytes'=> '6.48',
++	'ExtUtils::MakeMaker::vmsish'=> '6.48',
++	'ExtUtils::Manifest'    => '1.55',
++	'ExtUtils::Miniperl'    => undef,
++	'ExtUtils::Mkbootstrap' => '6.48',
++	'ExtUtils::Mksymlists'  => '6.48',
++	'ExtUtils::Packlist'    => '1.43',
++	'ExtUtils::ParseXS'     => '2.19',
++	'ExtUtils::testlib'     => '6.48',
++	'Fatal'                 => '1.06',
++	'Fcntl'                 => '1.06',
++	'File::Basename'        => '2.77',
++	'File::CheckTree'       => '4.4',
++	'File::Compare'         => '1.1005',
++	'File::Copy'            => '2.13',
++	'File::DosGlob'         => '1.01',
++	'File::Find'            => '1.13',
++	'File::Glob'            => '1.06',
++	'File::Path'            => '2.07_02',
++	'File::Spec'            => '3.29',
++	'File::Spec::Cygwin'    => '3.29',
++	'File::Spec::Epoc'      => '3.29',
++	'File::Spec::Functions' => '3.29',
++	'File::Spec::Mac'       => '3.29',
++	'File::Spec::OS2'       => '3.29',
++	'File::Spec::Unix'      => '3.29',
++	'File::Spec::VMS'       => '3.29',
++	'File::Spec::Win32'     => '3.29',
++	'File::Temp'            => '0.20',
++	'File::stat'            => '1.01',
++	'FileCache'             => '1.07',
++	'FileHandle'            => '2.01',
++	'Filespec'              => '1.11',
++	'Filter::Simple'        => '0.83',
++	'Filter::Util::Call'    => '1.07',
++	'FindBin'               => '1.49',
++	'GDBM_File'             => '1.09',
++	'Getopt::Long'          => '2.37',
++	'Getopt::Std'           => '1.06',
++	'Hash::Util'            => '0.06',
++	'I18N::Collate'         => '1.00',
++	'I18N::LangTags'        => '0.35',
++	'I18N::LangTags::Detect'=> '1.03',
++	'I18N::LangTags::List'  => '0.35',
++	'I18N::Langinfo'        => '0.02',
++	'IO'                    => '1.23',
++	'IO::Dir'               => '1.06',
++	'IO::File'              => '1.14',
++	'IO::Handle'            => '1.27',
++	'IO::Pipe'              => '1.13',
++	'IO::Poll'              => '0.07',
++	'IO::Seekable'          => '1.10',
++	'IO::Select'            => '1.17',
++	'IO::Socket'            => '1.30',
++	'IO::Socket::INET'      => '1.31',
++	'IO::Socket::UNIX'      => '1.23',
++	'IPC::Msg'              => '2.00',
++	'IPC::Open2'            => '1.03',
++	'IPC::Open3'            => '1.03',
++	'IPC::Semaphore'        => '2.00',
++	'IPC::SharedMem'        => '2.00',
++	'IPC::SysV'             => '2.00',
++	'IPC::lib::IPC::Msg'    => '2.00',
++	'IPC::lib::IPC::Semaphore'=> '2.00',
++	'IPC::lib::IPC::SharedMem'=> '2.00',
++	'List::Util'            => '1.19',
++	'Locale::Constants'     => '2.07',
++	'Locale::Country'       => '2.07',
++	'Locale::Currency'      => '2.07',
++	'Locale::Language'      => '2.07',
++	'Locale::Maketext'      => '1.13',
++	'Locale::Maketext::Guts'=> '1.13',
++	'Locale::Maketext::GutsLoader'=> '1.13',
++	'Locale::Script'        => '2.07',
++	'MIME::Base64'          => '3.07',
++	'MIME::QuotedPrint'     => '3.07',
++	'Math::BigFloat'        => '1.60',
++	'Math::BigFloat::Trace' => '0.01',
++	'Math::BigInt'          => '1.89',
++	'Math::BigInt::Calc'    => '0.52',
++	'Math::BigInt::CalcEmu' => '0.05',
++	'Math::BigInt::Trace'   => '0.01',
++	'Math::BigRat'          => '0.22',
++	'Math::Complex'         => '1.54',
++	'Math::Trig'            => '1.18',
++	'Memoize'               => '1.01',
++	'Memoize::AnyDBM_File'  => '0.65',
++	'Memoize::Expire'       => '1.00',
++	'Memoize::ExpireFile'   => '1.01',
++	'Memoize::ExpireTest'   => '0.65',
++	'Memoize::NDBM_File'    => '0.65',
++	'Memoize::SDBM_File'    => '0.65',
++	'Memoize::Storable'     => '0.65',
++	'Module::CoreList'      => '2.17',
++	'Module::Pluggable'     => '3.8',
++	'Module::Pluggable::Object'=> '3.6',
++	'Module::Pluggable::lib::Devel::InnerPackage'=> '0.3',
++	'NDBM_File'             => '1.07',
++	'NEXT'                  => '0.61',
++	'Net::Cmd'              => '2.29',
++	'Net::Config'           => '1.11',
++	'Net::Domain'           => '2.20',
++	'Net::FTP'              => '2.77',
++	'Net::FTP::A'           => '1.18',
++	'Net::FTP::E'           => '0.01',
++	'Net::FTP::I'           => '1.12',
++	'Net::FTP::L'           => '0.01',
++	'Net::FTP::dataconn'    => '0.11',
++	'Net::NNTP'             => '2.24',
++	'Net::Netrc'            => '2.12',
++	'Net::POP3'             => '2.29',
++	'Net::Ping'             => '2.35',
++	'Net::SMTP'             => '2.31',
++	'Net::Time'             => '2.10',
++	'Net::hostent'          => '1.01',
++	'Net::netent'           => '1.00',
++	'Net::protoent'         => '1.00',
++	'Net::servent'          => '1.01',
++	'O'                     => '1.01',
++	'ODBM_File'             => '1.07',
++	'Opcode'                => '1.0601',
++	'POSIX'                 => '1.15',
++	'PerlIO'                => '1.05',
++	'PerlIO::encoding'      => '0.11',
++	'PerlIO::scalar'        => '0.06',
++	'PerlIO::via'           => '0.05',
++	'PerlIO::via::QuotedPrint'=> '0.06',
++	'Pod::Checker'          => '1.43',
++	'Pod::Find'             => '1.34',
++	'Pod::Functions'        => '1.03',
++	'Pod::Html'             => '1.09',
++	'Pod::InputObjects'     => '1.3',
++	'Pod::LaTeX'            => '0.58',
++	'Pod::Man'              => '1.37',
++	'Pod::ParseLink'        => '1.06',
++	'Pod::ParseUtils'       => '1.35',
++	'Pod::Parser'           => '1.35',
++	'Pod::Perldoc'          => '3.14',
++	'Pod::Perldoc::BaseTo'  => undef,
++	'Pod::Perldoc::GetOptsOO'=> undef,
++	'Pod::Perldoc::ToChecker'=> undef,
++	'Pod::Perldoc::ToMan'   => undef,
++	'Pod::Perldoc::ToNroff' => undef,
++	'Pod::Perldoc::ToPod'   => undef,
++	'Pod::Perldoc::ToRtf'   => undef,
++	'Pod::Perldoc::ToText'  => undef,
++	'Pod::Perldoc::ToTk'    => undef,
++	'Pod::Perldoc::ToXml'   => undef,
++	'Pod::PlainText'        => '2.02',
++	'Pod::Plainer'          => '0.01',
++	'Pod::Select'           => '1.35',
++	'Pod::Text'             => '2.21',
++	'Pod::Text::Color'      => '1.04',
++	'Pod::Text::Overstrike' => '1.1',
++	'Pod::Text::Termcap'    => '1.11',
++	'Pod::Usage'            => '1.35',
++	'SDBM_File'             => '1.06',
++	'Safe'                  => '2.16',
++	'Scalar::Util'          => '1.19',
++	'Search::Dict'          => '1.02',
++	'SelectSaver'           => '1.01',
++	'SelfLoader'            => '1.17',
++	'Shell'                 => '0.72',
++	'Socket'                => '1.81',
++	'Stdio'                 => '2.4',
++	'Storable'              => '2.19',
++	'Switch'                => '2.13',
++	'Symbol'                => '1.06',
++	'Sys::Hostname'         => '1.11',
++	'Sys::Syslog'           => '0.27',
++	'Sys::Syslog::win32::Win32'=> undef,
++	'Term::ANSIColor'       => '1.12',
++	'Term::Cap'             => '1.12',
++	'Term::Complete'        => '1.402',
++	'Term::ReadLine'        => '1.03',
++	'Test'                  => '1.25',
++	'Test::Builder'         => '0.80',
++	'Test::Builder::Module' => '0.80',
++	'Test::Builder::Tester' => '1.13',
++	'Test::Builder::Tester::Color'=> undef,
++	'Test::Harness'         => '2.64',
++	'Test::Harness::Assert' => '0.02',
++	'Test::Harness::Iterator'=> '0.02',
++	'Test::Harness::Point'  => '0.01',
++	'Test::Harness::Results'=> '0.01_01',
++	'Test::Harness::Straps' => '0.26_01',
++	'Test::Harness::Util'   => '0.01',
++	'Test::More'            => '0.80',
++	'Test::Simple'          => '0.80',
++	'Text::Abbrev'          => '1.01',
++	'Text::Balanced'        => '1.98',
++	'Text::ParseWords'      => '3.27',
++	'Text::Soundex'         => '3.03',
++	'Text::Tabs'            => '2007.1117',
++	'Text::Wrap'            => '2006.1117',
++	'Thread'                => '2.01',
++	'Thread::Queue'         => '2.11',
++	'Thread::Semaphore'     => '2.09',
++	'Thread::Signal'        => '1.00',
++	'Thread::Specific'      => '1.00',
++	'Tie::Array'            => '1.03',
++	'Tie::File'             => '0.97',
++	'Tie::Handle'           => '4.2',
++	'Tie::Hash'             => '1.03',
++	'Tie::Memoize'          => '1.1',
++	'Tie::RefHash'          => '1.38',
++	'Tie::Scalar'           => '1.01',
++	'Tie::StdHandle'        => '4.2',
++	'Tie::SubstrHash'       => '1.00',
++	'Time::HiRes'           => '1.9715',
++	'Time::Local'           => '1.1901',
++	'Time::gmtime'          => '1.03',
++	'Time::localtime'       => '1.02',
++	'Time::tm'              => '1.00',
++	'UNIVERSAL'             => '1.01',
++	'Unicode'               => '5.1.0',
++	'Unicode::Collate'      => '0.52',
++	'Unicode::Normalize'    => '1.02',
++	'Unicode::UCD'          => '0.25',
++	'User::grent'           => '1.01',
++	'User::pwent'           => '1.00',
++	'Win32'                 => '0.38',
++	'Win32API::File'        => '0.1001_01',
++	'Win32API::File::ExtUtils::Myconst2perl'=> '1',
++	'Win32CORE'             => '0.02',
++	'XS::APItest'           => '0.15',
++	'XS::Typemap'           => '0.03',
++	'XSLoader'              => '0.10',
++	'XSSymSet'              => '1.1',
++	'attributes'            => '0.09',
++	'attrs'                 => '1.02',
++	'autouse'               => '1.06',
++	'base'                  => '2.13',
++	'bigint'                => '0.23',
++	'bignum'                => '0.23',
++	'bigrat'                => '0.23',
++	'blib'                  => '1.04',
++	'bytes'                 => '1.02',
++	'charnames'             => '1.06',
++	'constant'              => '1.17',
++	'diagnostics'           => '1.16',
++	'encoding'              => '2.6_01',
++	'fields'                => '2.12',
++	'filetest'              => '1.02',
++	'if'                    => '0.05',
++	'integer'               => '1.00',
++	'less'                  => '0.01',
++	'lib'                   => '0.61',
++	'locale'                => '1.00',
++	'open'                  => '1.06',
++	'ops'                   => '1.02',
++	'overload'              => '1.06',
++	're'                    => '0.0601',
++	'sigtrap'               => '1.04',
++	'sort'                  => '1.02',
++	'strict'                => '1.03',
++	'subs'                  => '1.00',
++	'threads'               => '1.71',
++	'threads::shared'       => '1.27',
++	'utf8'                  => '1.07',
++	'vars'                  => '1.01',
++	'vmsish'                => '1.02',
++	'warnings'              => '1.05_01',
++	'warnings::register'    => '1.01',
++    },
+ );
+ 
+ 1;
diff --git a/devel/p5-Module-CoreList/pkg-plist b/devel/p5-Module-CoreList/pkg-plist
index d73f6152508a..b45e1f9d2653 100644
--- a/devel/p5-Module-CoreList/pkg-plist
+++ b/devel/p5-Module-CoreList/pkg-plist
@@ -1,4 +1,4 @@
-bin/corelist
+%%PL_FILES%%bin/corelist
 %%SITE_PERL%%/Module/CoreList.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/CoreList/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/CoreList