Prepare Socket.pm for dual-life

 * Moved from ext/Socket to cpan/Socket
 * Currently declared as PEVANS/Socket-1.95.tar.gz - which is what it
   will eventually become

diff --git a/MANIFEST b/MANIFEST
index bda0e07..eeadfa9 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -2169,6 +2169,14 @@ cpan/Pod-Simple/t/xhtml05.t                              Pod::Simple test file
 cpan/Pod-Simple/t/xhtml10.t                            Pod::Simple test file
 cpan/Pod-Simple/t/xhtml15.t                            Pod::Simple test file
 cpan/Pod-Simple/t/x_nixer.t                            Pod::Simple test file
+cpan/Socket/Makefile.PL                        Socket extension makefile writer
+cpan/Socket/Socket.pm                  Socket extension Perl module
+cpan/Socket/Socket.xs                  Socket extension external subroutines
+cpan/Socket/t/getaddrinfo.t            See if Socket::getaddrinfo works
+cpan/Socket/t/getnameinfo.t            See if Socket::getnameinfo works
+cpan/Socket/t/ipv6_mreq.t              See if (un)pack_ipv6_mreq work
+cpan/Socket/t/socketpair.t             See if socketpair works
+cpan/Socket/t/Socket.t                 See if Socket works
 cpan/Sys-Syslog/Changes                        Changelog for Sys::Syslog
 cpan/Sys-Syslog/fallback/const-c.inc   Sys::Syslog constants fallback file
 cpan/Sys-Syslog/fallback/const-xs.inc  Sys::Syslog constants fallback file
@@ -3859,14 +3867,6 @@ ext/SDBM_File/sdbm/tune.h        SDBM kit
 ext/SDBM_File/sdbm/util.c      SDBM kit
 ext/SDBM_File/t/sdbm.t         See if SDBM_File works
 ext/SDBM_File/typemap          SDBM extension interface types
-ext/Socket/Makefile.PL         Socket extension makefile writer
-ext/Socket/Socket.pm           Socket extension Perl module
-ext/Socket/Socket.xs           Socket extension external subroutines
-ext/Socket/t/getaddrinfo.t     See if Socket::getaddrinfo works
-ext/Socket/t/getnameinfo.t     See if Socket::getnameinfo works
-ext/Socket/t/ipv6_mreq.t       See if (un)pack_ipv6_mreq work
-ext/Socket/t/socketpair.t      See if socketpair works
-ext/Socket/t/Socket.t          See if Socket works
 ext/Sys-Hostname/Hostname.pm   Sys::Hostname extension Perl module
 ext/Sys-Hostname/Hostname.xs   Sys::Hostname extension external subroutines
 ext/Sys-Hostname/t/Hostname.t  See if Sys::Hostname works

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 97037c7..aa5dfc0 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -65,6 +65,7 @@ use File::Glob qw(:case);
     'p5p'      => 'perl5-porters <perl5-porters@perl.org>',
     'perlfaq'  => 'perlfaq-workers <perlfaq-workers@perl.org>',
     'petdance' => 'Andy Lester <andy@petdance.com>',
+    'pevans'    => 'Paul Evans <leonerd@leonerd.org.uk>',
     'pjf'      => 'Paul Fenwick <pjf@cpan.org>',
     'pmqs'     => 'Paul Marquess <pmqs@cpan.org>',
     'pvhp'     => 'Peter Prymmer <pvhp@best.com>',
@@ -1663,9 +1664,10 @@ use File::Glob qw(:case);
 
     'Socket' =>
        {
-       'MAINTAINER'    => 'p5p',
-       'FILES'         => q[ext/Socket],
-       'UPSTREAM'      => 'blead',
+       'MAINTAINER'    => 'pevans',
+       'DISTRIBUTION'  => 'PEVANS/Socket-1.95.tar.gz',
+       'FILES'         => q[cpan/Socket],
+       'UPSTREAM'      => 'cpan',
        },
 
     'Storable' =>

diff --git a/ext/Socket/.gitignore b/cpan/Socket/.gitignore
similarity index 100%
rename from ext/Socket/.gitignore
rename to cpan/Socket/.gitignore

diff --git a/ext/Socket/Makefile.PL b/cpan/Socket/Makefile.PL
similarity index 99%
rename from ext/Socket/Makefile.PL
rename to cpan/Socket/Makefile.PL
index 8390811..e5daf93 100644 (file)
--- a/ext/Socket/Makefile.PL
+++ b/cpan/Socket/Makefile.PL
@@ -72,7 +72,7 @@ push @names,
            "#endif\n"]}
 foreach qw (MSG_CTRUNC MSG_DONTROUTE MSG_OOB MSG_PEEK MSG_PROXY SCM_RIGHTS);
 
-push @names, 
+push @names,
 {name => $_, type => "SV",
  pre=>"struct in_addr ip_address; ip_address.s_addr = htonl($_);",
  value => "newSVpvn_flags((char *)&ip_address,sizeof(ip_address), SVs_TEMP)",}

diff --git a/ext/Socket/Socket.pm b/cpan/Socket/Socket.pm
similarity index 99%
rename from ext/Socket/Socket.pm
rename to cpan/Socket/Socket.pm
index 20ae15b..5fff0d0 100644 (file)
--- a/ext/Socket/Socket.pm
+++ b/cpan/Socket/Socket.pm
@@ -7,7 +7,7 @@ $VERSION = "1.94_03";
 
 =head1 NAME
 
-Socket, sockaddr_in, sockaddr_un, inet_aton, inet_ntoa, inet_pton, inet_ntop - load the C socket.h defines and structure manipulators 
+Socket, sockaddr_in, sockaddr_un, inet_aton, inet_ntoa, inet_pton, inet_ntop - load the C socket.h defines and structure manipulators
 
 =head1 SYNOPSIS
 
@@ -43,7 +43,7 @@ Socket, sockaddr_in, sockaddr_un, inet_aton, inet_ntoa, inet_pton, inet_ntop - l
 This module is just a translation of the C F<socket.h> file.
 Unlike the old mechanism of requiring a translated F<socket.ph>
 file, this uses the B<h2xs> program (see the Perl source distribution)
-and your native C compiler.  This means that it has a 
+and your native C compiler.  This means that it has a
 far more likely chance of getting the numbers right.  This includes
 all of the commonly used pound-defines like AF_INET, SOCK_STREAM, etc.
 
@@ -210,7 +210,7 @@ have AF_UNIX in the right place.
 
 Takes an address family, either AF_INET or AF_INET6, and a string giving
 the name of a host, and translates that to an opaque string
-(if programming in C, struct in_addr or struct in6_addr depending on the 
+(if programming in C, struct in_addr or struct in6_addr depending on the
 address family passed in).  The host string may be a string hostname, such
 as 'www.perl.org', or an IP address.  If using an IP address, the type of
 IP address must be consistent with the address family passed into the function.
@@ -219,7 +219,7 @@ This function is not exported by default.
 
 =item inet_ntop ADDRESS_FAMILY, IP_ADDRESS
 
-Takes an address family, either AF_INET or AF_INET6, and a string 
+Takes an address family, either AF_INET or AF_INET6, and a string
 (an opaque string as returned by inet_aton() or inet_pton()) and
 translates it to an IPv4 or IPv6 address string.
 
@@ -579,7 +579,7 @@ BEGIN {
 sub sockaddr_in {
     if (@_ == 6 && !wantarray) { # perl5.001m compat; use this && die
        my($af, $port, @quad) = @_;
-       warnings::warn "6-ARG sockaddr_in call is deprecated" 
+       warnings::warn "6-ARG sockaddr_in call is deprecated"
            if warnings::enabled();
        pack_sockaddr_in($port, inet_aton(join('.', @quad)));
     } elsif (wantarray) {

diff --git a/ext/Socket/Socket.xs b/cpan/Socket/Socket.xs
similarity index 99%
rename from ext/Socket/Socket.xs
rename to cpan/Socket/Socket.xs
index d7e7a11..f571ac7 100644 (file)
--- a/ext/Socket/Socket.xs
+++ b/cpan/Socket/Socket.xs
@@ -544,7 +544,7 @@ pack_sockaddr_un(pathname)
 #else
        ST(0) = (SV *) not_here("pack_sockaddr_un");
 #endif
-       
+
        }
 
 void

diff --git a/ext/Socket/t/Socket.t b/cpan/Socket/t/Socket.t
similarity index 99%
rename from ext/Socket/t/Socket.t
rename to cpan/Socket/t/Socket.t
index be15c01..f59c265 100644 (file)
--- a/ext/Socket/t/Socket.t
+++ b/cpan/Socket/t/Socket.t
@@ -2,14 +2,14 @@
 
 BEGIN {
     require Config; import Config;
-    if ($Config{'extensions'} !~ /\bSocket\b/ && 
+    if ($Config{'extensions'} !~ /\bSocket\b/ &&
         !(($^O eq 'VMS') && $Config{d_socket})) {
        print "1..0\n";
        exit 0;
     }
     $has_alarm = $Config{d_alarm};
 }
-       
+
 use Socket qw(:all);
 use Test::More tests => 26;
 

diff --git a/ext/Socket/t/getaddrinfo.t b/cpan/Socket/t/getaddrinfo.t
similarity index 100%
rename from ext/Socket/t/getaddrinfo.t
rename to cpan/Socket/t/getaddrinfo.t

diff --git a/ext/Socket/t/getnameinfo.t b/cpan/Socket/t/getnameinfo.t
similarity index 100%
rename from ext/Socket/t/getnameinfo.t
rename to cpan/Socket/t/getnameinfo.t

diff --git a/ext/Socket/t/ipv6_mreq.t b/cpan/Socket/t/ipv6_mreq.t
similarity index 100%
rename from ext/Socket/t/ipv6_mreq.t
rename to cpan/Socket/t/ipv6_mreq.t

diff --git a/ext/Socket/t/socketpair.t b/cpan/Socket/t/socketpair.t
similarity index 100%
rename from ext/Socket/t/socketpair.t
rename to cpan/Socket/t/socketpair.t