From: Graham Barr <gbarr@pobox.com>
Date: Mon, 11 May 2009 19:20:34 +0000 (-0500)
Subject: Update IO to CPAN 1.24 release
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=eb1c4873a4d2b3d386b680baf0b251a75d67e654;p=p5sagit%2Fp5-mst-13.2.git

Update IO to CPAN 1.24 release
---

diff --git a/ext/IO/ChangeLog b/ext/IO/ChangeLog
index 0dcb9df..353e5b0 100644
--- a/ext/IO/ChangeLog
+++ b/ext/IO/ChangeLog
@@ -1,3 +1,31 @@
+IO 1.24 -- Mon May 11 14:15:51 CDT 2009
+
+  * Make Makefile.PL usable by core and CPAN
+  * Reorganize files to be under lib/ directory structure now matches core perl
+  * Update with following changes made to core perl distribution
+  * Silence Win32 compiler warning in IO.xs
+  * Make non-blocking mode work on Windows in IO::Socket::INET
+  * fix some missing parts of IO::Handle pod
+  * Implement IO::Handle::say the same way as the builtin say().
+  * Undo io_linenum.t part of #34148. It was io_multihomed.t that I meant (my mistake), and that is now covered by #34155.
+  * watchdog() some IO tests
+  * Some more missing isGV_with_GP()s
+  * IO::Dir destructor
+  * IO::Socket::INET unnecessarily resolves "udp"
+  * IO::Handle->say should ignore $\ (bug #49266)
+  * consting IO.xs
+  * Net::SMTP can't send large messages with bleadperl
+  * Fix for IO::Socket send method
+  * Fixes for the test suite on OS/2
+  * Silence VC++ compiler warnings
+  * IO::Socket's IO.xs fails to compile
+  * IO::Socket::connect returns wrong errno on timeout
+  * Coverity correctly reports that gv might (just) be NULL. So don't derefernece it if it is.
+  * Simplify tests for fork() capabilities
+  * Fix syntax error in io_pipe test
+  * Making IO::Socket pass test on Win32
+  * ext/IO/t/io_unix.t
+
 IO 1.23 -- Sat Mar 25 19:28:28 CST 2006
 
  * Adjust the regression tests to use t/test.pl when $ENV{PERL_CORE} is defined
diff --git a/ext/IO/IO.pm b/ext/IO/IO.pm
index 5f42651..ad22653 100644
--- a/ext/IO/IO.pm
+++ b/ext/IO/IO.pm
@@ -7,7 +7,7 @@ use Carp;
 use strict;
 use warnings;
 
-our $VERSION = "1.23_02";
+our $VERSION = "1.24";
 XSLoader::load 'IO', $VERSION;
 
 sub import {
diff --git a/ext/IO/Makefile.PL b/ext/IO/Makefile.PL
index bc47a1b..2159f43 100644
--- a/ext/IO/Makefile.PL
+++ b/ext/IO/Makefile.PL
@@ -1,7 +1,45 @@
+# This -*- perl -*- script makes the Makefile
+
+BEGIN { require 5.006_001 }
 use ExtUtils::MakeMaker;
+use Config qw(%Config);
+my $PERL_CORE = grep { $_ eq 'PERL_CORE=1' } @ARGV;
+
+#--- Attempt to find <poll.h>
+
+my $define = "";
+
+unless ($PERL_CORE or exists $Config{'i_poll'}) {
+  my @inc = split(/\s+/, join(" ", $Config{'usrinc'}, $Config{'incpth'}, $Config{'locincpth'}));
+  foreach $path (@inc) {
+    if (-f $path . "/poll.h") {
+      $define .= "-DI_POLL ";
+      last;
+    }
+  }
+}
+
+if ($] < 5.008 and !$PERL_CORE) {
+  open(FH,">typemap");
+  print FH "const char *            T_PV\n";
+  close(FH);
+}
+
+#--- Write the Makefile
 
 WriteMakefile(
-	VERSION_FROM	=> "IO.pm",
-	NAME      	=> "IO",
-	OBJECT		=> '$(O_FILES)', 
+  VERSION_FROM => "IO.pm",
+  NAME         => "IO",
+  OBJECT       => '$(O_FILES)',
+  ABSTRACT     => 'Perl core IO modules',
+  AUTHOR       => 'Graham Barr <gbarr@cpan.org>',
+  ( $PERL_CORE
+    ? ()
+    : (
+      INSTALLDIRS => 'perl',
+      clean       => {FILES => 'typemap'},
+    )
+  ),
+  ($define                                    ? (DEFINE    => $define) : ()),
+  ((ExtUtils::MakeMaker->VERSION() gt '6.30') ? ('LICENSE' => 'perl')  : ()),
 );