diff options
Diffstat (limited to 'gnu/usr.bin')
31 files changed, 103 insertions, 76 deletions
diff --git a/gnu/usr.bin/perl/ext/DynaLoader/Makefile.PL b/gnu/usr.bin/perl/ext/DynaLoader/Makefile.PL index 2a9aa7b3405..29d66a715b8 100644 --- a/gnu/usr.bin/perl/ext/DynaLoader/Makefile.PL +++ b/gnu/usr.bin/perl/ext/DynaLoader/Makefile.PL @@ -34,8 +34,8 @@ test-xs: sub MY::static { ' $(PERL_SRC)/$(OBJECT) : $(FIRST_MAKEFILE) $(OBJECT) - $(RM_RF) $(PERL_SRC)/$(OBJECT) - $(CP) $(OBJECT) $(PERL_SRC)/$(OBJECT) + #$(RM_RF) $(PERL_SRC)/$(OBJECT) + #$(CP) $(OBJECT) $(PERL_SRC)/$(OBJECT) static :: $(PERL_SRC)/$(OBJECT) '; diff --git a/gnu/usr.bin/perl/ext/Encode/lib/Encode/Alias.pm b/gnu/usr.bin/perl/ext/Encode/lib/Encode/Alias.pm index f142403ca9c..7de77eb4986 100644 --- a/gnu/usr.bin/perl/ext/Encode/lib/Encode/Alias.pm +++ b/gnu/usr.bin/perl/ext/Encode/lib/Encode/Alias.pm @@ -152,6 +152,7 @@ sub init_aliases { define_alias( qr/^(?:US-?)ascii$/i => '"ascii"' ); define_alias( 'C' => 'ascii' ); define_alias( qr/\b(?:ISO[-_]?)?646(?:[-_]?US)?$/i => '"ascii"' ); + define_alias( '646' => 'ascii' ); # Allow variants of iso-8859-1 etc. define_alias( qr/\biso[-_]?(\d+)[-_](\d+)$/i => '"iso-$1-$2"' ); diff --git a/gnu/usr.bin/perl/ext/NDBM_File/Makefile.PL b/gnu/usr.bin/perl/ext/NDBM_File/Makefile.PL index a8adbf01218..a48c039fa88 100644 --- a/gnu/usr.bin/perl/ext/NDBM_File/Makefile.PL +++ b/gnu/usr.bin/perl/ext/NDBM_File/Makefile.PL @@ -1,7 +1,7 @@ use ExtUtils::MakeMaker; WriteMakefile( NAME => 'NDBM_File', - LIBS => ["-L/usr/local/lib -lndbm", "-ldbm -lucb"], + #LIBS => ["-L/usr/local/lib -lndbm", "-ldbm -lucb"], XSPROTOARG => '-noprototypes', # XXX remove later? VERSION_FROM => 'NDBM_File.pm', INC => ($^O eq "MacOS" ? "-i ::::db:include" : "") diff --git a/gnu/usr.bin/perl/hints/openbsd.sh b/gnu/usr.bin/perl/hints/openbsd.sh index e4b1360d9ad..d4f45def2cd 100644 --- a/gnu/usr.bin/perl/hints/openbsd.sh +++ b/gnu/usr.bin/perl/hints/openbsd.sh @@ -11,11 +11,6 @@ # OpenBSD has a better malloc than perl... test "$usemymalloc" || usemymalloc='n' -# malloc wrap works -case "$usemallocwrap" in -'') usemallocwrap='define' ;; -esac - # Currently, vfork(2) is not a real win over fork(2). usevfork="$undef" @@ -40,7 +35,7 @@ esac # ARCH=`arch | sed 's/^OpenBSD.//'` case "${ARCH}-${osvers}" in -alpha-2.[0-8]|mips-2.[0-8]|powerpc-2.[0-7]|m88k-*|hppa-*|vax-*) +alpha-2.[0-8]|mips-2.[0-8]|powerpc-2.[0-7]|m88k-*|hppa-3.[0-5]|vax-*) test -z "$usedl" && usedl=$undef ;; *) @@ -80,6 +75,14 @@ case "$osvers" in ;; esac +# malloc wrap causes problems on m68k +if [ X"$usemallocwrap" = X"" ]; then + case "${ARCH}" in + m68k) usemallocwrap="$undef" ;; + *) usemallocwrap="define" ;; + esac +fi + # OpenBSD doesn't need libcrypt but many folks keep a stub lib # around for old NetBSD binaries. libswanted=`echo $libswanted | sed 's/ crypt / /'` @@ -89,12 +92,12 @@ d_suidsafe=$define # cc is gcc so we can do better than -O # Allow a command-line override, such as -Doptimize=-g -case ${ARCH} in -m88k) - optimize='-O0' +case "${ARCH}-${osvers}" in +hppa-3.3|m88k-2.*|m88k-3.[0-3]) + test "$optimize" || optimize='-O0' ;; -hppa) - optimize='-O0' +m88k-3.4) + test "$optimize" || optimize='-O1' ;; *) test "$optimize" || optimize='-O2' @@ -118,8 +121,8 @@ $define|true|[yY]*) ;; esac case "$osvers" in - [012].*|3.[0-6]) - # Broken at least up to OpenBSD 3.6, we'll see about 3.7 + [012].*|3.[0-5]) + # Broken up to OpenBSD 3.6, fixed in OpenBSD 3.7 d_getservbyname_r=$undef ;; esac esac @@ -202,9 +205,9 @@ case "$openbsd_distribution" in locincpth='/usr/local/include' loclibpth='/usr/local/lib' # Link perl with shared libperl - if [ "$usedl" = "$define" -a -r shlib_version ]; then + if [ "$usedl" = "$define" -a -r $src/shlib_version ]; then useshrplib=true - libperl=`. ./shlib_version; echo libperl.so.${major}.${minor}` + libperl=`. $src/shlib_version; echo libperl.so.${major}.${minor}` fi ;; esac diff --git a/gnu/usr.bin/perl/installperl b/gnu/usr.bin/perl/installperl index 5eec39e8bd8..ca0af8a2068 100644 --- a/gnu/usr.bin/perl/installperl +++ b/gnu/usr.bin/perl/installperl @@ -197,7 +197,7 @@ my $installprivlib = "$opts{destdir}$Config{installprivlib}"; my $installarchlib = "$opts{destdir}$Config{installarchlib}"; my $installsitelib = "$opts{destdir}$Config{installsitelib}"; my $installsitearch = "$opts{destdir}$Config{installsitearch}"; -my $installman1dir = "$opts{destdir}$Config{installman1dir}"; +my $installman1dir = "none"; my $man1ext = $Config{man1ext}; my $libperl = $Config{libperl}; # Shared library and dynamic loading suffixes. @@ -255,9 +255,9 @@ else { } -x 'suidperl' . $exe_ext|| die "suidperl isn't executable!\n" if $d_dosuid; --f 't/rantests' || $Is_W32 - || warn "WARNING: You've never run 'make test' or", - " some tests failed! (Installing anyway.)\n"; +#-f 't/rantests' || $Is_W32 +# || warn "WARNING: You've never run 'make test' or", +# " some tests failed! (Installing anyway.)\n"; } #if (!$Is_NetWare) # This will be used to store the packlist @@ -283,6 +283,10 @@ if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) { $packlist->{"$installbin/$perldll"} = { type => 'file' }; } # if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) +# Get the install command and flags from the environment +my @installcmd = $ENV{"INSTALL"} || "install"; +push(@installcmd, $ENV{"INSTALL_COPY"} || "-c"); + # First we install the version-numbered executables. if ($Is_VMS) { @@ -316,10 +320,8 @@ elsif ($^O eq 'mpeix') { } elsif ($^O ne 'dos') { if (!$Is_NetWare) { - safe_unlink("$installbin/$perl_verbase$ver$exe_ext"); - copy("perl$exe_ext", "$installbin/$perl_verbase$ver$exe_ext"); - strip("$installbin/$perl_verbase$ver$exe_ext"); - chmod(0755, "$installbin/$perl_verbase$ver$exe_ext"); + install("perl$exe_ext", "$installbin/$perl_verbase$ver$exe_ext", + "0755", $dostrip); } else { # If installing onto a NetWare server @@ -343,8 +345,8 @@ else { safe_unlink("$installbin/s$perl_verbase$ver$exe_ext"); if ($d_dosuid) { - copy("suidperl$exe_ext", "$installbin/s$perl_verbase$ver$exe_ext"); - chmod(04711, "$installbin/s$perl_verbase$ver$exe_ext"); + install("perl$exe_ext", "$installbin/s$perl_verbase$ver$exe_ext", + "04711", $dostrip); } # Install library files. @@ -400,7 +402,9 @@ elsif ($Is_Cygwin) { # On Cygwin symlink it to CORE to make Makefile happy ) } else { # [als] hard-coded 'libperl' name... not good! - @corefiles = <*.h libperl*.* perl*$Config{lib_ext}>; + #@corefiles = <*.h libperl*.* perl*$Config{lib_ext}>; + @corefiles = <*.h *.inc perl*$Config{lib_ext}>; + push(@corefiles,<libperl*.*>) unless defined($ENV{"NOLIBINSTALL"}); # AIX needs perl.exp installed as well. push(@corefiles,'perl.exp') if $^O eq 'aix'; @@ -711,6 +715,23 @@ sub copy { $packlist->{$xto} = { type => 'file' }; } +sub install { + my($from,$to,$mode,$strip) = @_; + + my $xto = $to; + my $cmd = join(' ', @installcmd); + $cmd .= " -m $mode" if $mode; + $cmd .= " -s" if $strip; + $cmd .= " $from $to"; + $xto =~ s/^\Q$destdir\E// if $destdir; + print $verbose ? " install $from $xto\n" : " $xto\n" unless $silent; + unless ($nonono) { + system($cmd); + warn "Couldn't $cmd\n" if $?; + } + $packlist->{$xto} = { type => 'file' }; +} + sub installlib { my $dir = $File::Find::dir; $dir =~ s#^\.(?![^/])/?##; diff --git a/gnu/usr.bin/perl/lib/AnyDBM_File.pm b/gnu/usr.bin/perl/lib/AnyDBM_File.pm index d73abab0f9e..f89100e09f4 100644 --- a/gnu/usr.bin/perl/lib/AnyDBM_File.pm +++ b/gnu/usr.bin/perl/lib/AnyDBM_File.pm @@ -19,8 +19,6 @@ die "No DBM package was successfully found or installed"; AnyDBM_File - provide framework for multiple DBMs -NDBM_File, DB_File, GDBM_File, SDBM_File, ODBM_File - various DBM implementations - =head1 SYNOPSIS use AnyDBM_File; diff --git a/gnu/usr.bin/perl/lib/CGI/Fast.pm b/gnu/usr.bin/perl/lib/CGI/Fast.pm index 594cad75013..1cf6eb43976 100644 --- a/gnu/usr.bin/perl/lib/CGI/Fast.pm +++ b/gnu/usr.bin/perl/lib/CGI/Fast.pm @@ -170,7 +170,7 @@ documentation for C<FCGI::OpenSocket> for more information.) =item FCGI_SOCKET_PATH The address (TCP/IP) or path (UNIX Domain) of the socket the external FastCGI -script to which bind an listen for incoming connections from the web server. +script to which bind can listen for incoming connections from the web server. =item FCGI_LISTEN_QUEUE diff --git a/gnu/usr.bin/perl/lib/ExtUtils/MM_Any.pm b/gnu/usr.bin/perl/lib/ExtUtils/MM_Any.pm index a7afe2069cf..4d6c1169b3a 100644 --- a/gnu/usr.bin/perl/lib/ExtUtils/MM_Any.pm +++ b/gnu/usr.bin/perl/lib/ExtUtils/MM_Any.pm @@ -717,8 +717,9 @@ END my @man_cmds; foreach my $section (qw(1 3)) { my $pods = $self->{"MAN${section}PODS"}; + my $s = $section eq '3' ? '3p' : $section; push @man_cmds, $self->split_command(<<CMD, %$pods); - \$(NOECHO) \$(POD2MAN) --section=$section --perm_rw=\$(PERM_RW) + \$(NOECHO) \$(POD2MAN) --section=$s --perm_rw=\$(PERM_RW) CMD } diff --git a/gnu/usr.bin/perl/lib/ExtUtils/MM_Unix.pm b/gnu/usr.bin/perl/lib/ExtUtils/MM_Unix.pm index ad28b22b823..c4c61bc4e4e 100644 --- a/gnu/usr.bin/perl/lib/ExtUtils/MM_Unix.pm +++ b/gnu/usr.bin/perl/lib/ExtUtils/MM_Unix.pm @@ -289,7 +289,7 @@ sub const_cccmd { return '' unless $self->needs_linking(); return $self->{CONST_CCCMD} = q{CCCMD = $(CC) -c $(PASTHRU_INC) $(INC) \\ - $(CCFLAGS) $(OPTIMIZE) \\ + $(CCFLAGS) $(OPTIMIZE) $(COPTS) \\ $(PERLTYPE) $(MPOLLUTE) $(DEFINE_VERSION) \\ $(XS_DEFINE_VERSION)}; } diff --git a/gnu/usr.bin/perl/lib/Getopt/Std.pm b/gnu/usr.bin/perl/lib/Getopt/Std.pm index 823bc4dd910..d7ad96c44a8 100644 --- a/gnu/usr.bin/perl/lib/Getopt/Std.pm +++ b/gnu/usr.bin/perl/lib/Getopt/Std.pm @@ -4,7 +4,7 @@ require Exporter; =head1 NAME -getopt, getopts - Process single-character switches with switch clustering +Getopt::Std, getopt, getopts - Process single-character switches with switch clustering =head1 SYNOPSIS diff --git a/gnu/usr.bin/perl/lib/Module/Build/ModuleInfo.pm b/gnu/usr.bin/perl/lib/Module/Build/ModuleInfo.pm index 8df58b3bfa7..151c9d20b86 100644 --- a/gnu/usr.bin/perl/lib/Module/Build/ModuleInfo.pm +++ b/gnu/usr.bin/perl/lib/Module/Build/ModuleInfo.pm @@ -375,7 +375,7 @@ __END__ =head1 NAME -ModuleInfo - Gather package and POD information from a perl module file +Module::Build::ModuleInfo - Gather package and POD information from a perl module file =head1 DESCRIPTION diff --git a/gnu/usr.bin/perl/lib/NEXT.pm b/gnu/usr.bin/perl/lib/NEXT.pm index 1e59280241e..7420b0a6d82 100644 --- a/gnu/usr.bin/perl/lib/NEXT.pm +++ b/gnu/usr.bin/perl/lib/NEXT.pm @@ -190,7 +190,7 @@ __END__ =head1 NAME -NEXT.pm - Provide a pseudo-class NEXT (et al) that allows method redispatch +NEXT - Provide a pseudo-class NEXT (et al) that allows method redispatch =head1 SYNOPSIS diff --git a/gnu/usr.bin/perl/lib/Net/libnetFAQ.pod b/gnu/usr.bin/perl/lib/Net/libnetFAQ.pod index e6ec362f36a..dd7c9318f33 100644 --- a/gnu/usr.bin/perl/lib/Net/libnetFAQ.pod +++ b/gnu/usr.bin/perl/lib/Net/libnetFAQ.pod @@ -1,6 +1,6 @@ =head1 NAME -libnetFAQ - libnet Frequently Asked Questions +Net::libnetFAQ - libnet Frequently Asked Questions =head1 DESCRIPTION diff --git a/gnu/usr.bin/perl/lib/Pod/Checker.pm b/gnu/usr.bin/perl/lib/Pod/Checker.pm index a2305423b23..2e00d0d0963 100644 --- a/gnu/usr.bin/perl/lib/Pod/Checker.pm +++ b/gnu/usr.bin/perl/lib/Pod/Checker.pm @@ -18,7 +18,7 @@ use Pod::ParseUtils; ## for hyperlinks and lists =head1 NAME -Pod::Checker, podchecker() - check pod documents for syntax errors +Pod::Checker, podchecker - check pod documents for syntax errors =head1 SYNOPSIS diff --git a/gnu/usr.bin/perl/lib/Pod/Perldoc.pm b/gnu/usr.bin/perl/lib/Pod/Perldoc.pm index 9ed66e80917..8330a05d248 100644 --- a/gnu/usr.bin/perl/lib/Pod/Perldoc.pm +++ b/gnu/usr.bin/perl/lib/Pod/Perldoc.pm @@ -492,7 +492,7 @@ sub find_good_formatter_class { } else { $^W = 0; # The average user just has no reason to be seeing - # $^W-suppressable warnings from the the require! + # $^W-suppressible warnings from the require! } eval "require $c"; diff --git a/gnu/usr.bin/perl/lib/Pod/PlainText.pm b/gnu/usr.bin/perl/lib/Pod/PlainText.pm index cf64323655d..310d57d8bb3 100644 --- a/gnu/usr.bin/perl/lib/Pod/PlainText.pm +++ b/gnu/usr.bin/perl/lib/Pod/PlainText.pm @@ -1,5 +1,5 @@ # Pod::PlainText -- Convert POD data to formatted ASCII text. -# $Id: PlainText.pm,v 1.6 2009/10/12 18:24:42 millert Exp $ +# $Id: PlainText.pm,v 1.7 2009/10/13 01:25:48 millert Exp $ # # Copyright 1999-2000 by Russ Allbery <rra@stanford.edu> # @@ -592,6 +592,11 @@ sub pod2text { } } +sub begin_pod { + my $self = shift; + $$self{EXCLUDE} = 0; + $$self{VERBATIM} = 0; +} ############################################################################ # Module return value and documentation diff --git a/gnu/usr.bin/perl/lib/Pod/Select.pm b/gnu/usr.bin/perl/lib/Pod/Select.pm index 4724cb79cf9..2d16d54fad9 100644 --- a/gnu/usr.bin/perl/lib/Pod/Select.pm +++ b/gnu/usr.bin/perl/lib/Pod/Select.pm @@ -18,7 +18,7 @@ require 5.005; ## requires this Perl version or later =head1 NAME -Pod::Select, podselect() - extract selected sections of POD from input +Pod::Select, podselect - extract selected sections of POD from input =head1 SYNOPSIS diff --git a/gnu/usr.bin/perl/lib/Pod/Text.pm b/gnu/usr.bin/perl/lib/Pod/Text.pm index 533c4cf4fe2..cbab0f09d29 100644 --- a/gnu/usr.bin/perl/lib/Pod/Text.pm +++ b/gnu/usr.bin/perl/lib/Pod/Text.pm @@ -654,6 +654,12 @@ sub parse_from_filehandle { $self->parse_from_file (@_); } +sub begin_pod { + my $self = shift; + $$self{EXCLUDE} = 0; + $$self{VERBATIM} = 0; +} + ############################################################################## # Module return value and documentation ############################################################################## diff --git a/gnu/usr.bin/perl/lib/Pod/Usage.pm b/gnu/usr.bin/perl/lib/Pod/Usage.pm index f463fb9c468..cff00e608e3 100644 --- a/gnu/usr.bin/perl/lib/Pod/Usage.pm +++ b/gnu/usr.bin/perl/lib/Pod/Usage.pm @@ -16,7 +16,7 @@ require 5.005; ## requires this Perl version or later =head1 NAME -Pod::Usage, pod2usage() - print a usage message from embedded pod documentation +Pod::Usage, pod2usage - print a usage message from embedded pod documentation =head1 SYNOPSIS diff --git a/gnu/usr.bin/perl/lib/Text/Abbrev.pm b/gnu/usr.bin/perl/lib/Text/Abbrev.pm index c6be63bcc60..07a6e4f464f 100644 --- a/gnu/usr.bin/perl/lib/Text/Abbrev.pm +++ b/gnu/usr.bin/perl/lib/Text/Abbrev.pm @@ -6,7 +6,7 @@ our $VERSION = '1.01'; =head1 NAME -abbrev - create an abbreviation table from a list +Text::Abbrev - create an abbreviation table from a list =head1 SYNOPSIS diff --git a/gnu/usr.bin/perl/lib/Text/Balanced.pm b/gnu/usr.bin/perl/lib/Text/Balanced.pm index 7316cc83ffd..6d000e1de81 100644 --- a/gnu/usr.bin/perl/lib/Text/Balanced.pm +++ b/gnu/usr.bin/perl/lib/Text/Balanced.pm @@ -1524,7 +1524,7 @@ C<extract_tagged> returns the complete text up to the point of failure. If the string is "PARA", C<extract_tagged> returns only the first paragraph after the tag (up to the first line that is either empty or contains only whitespace characters). -If the string is "", the the default behaviour (i.e. failure) is reinstated. +If the string is "", the default behaviour (i.e. failure) is reinstated. For example, suppose the start tag "/para" introduces a paragraph, which then continues until the next "/endpara" tag or until another "/para" tag is diff --git a/gnu/usr.bin/perl/lib/perl5db.pl b/gnu/usr.bin/perl/lib/perl5db.pl index ee1708cdc60..cfe5252ad35 100644 --- a/gnu/usr.bin/perl/lib/perl5db.pl +++ b/gnu/usr.bin/perl/lib/perl5db.pl @@ -3008,7 +3008,7 @@ Same as for C</>, except the loop runs backwards. =head4 C<$rc> - Recall command Manages the commands in C<@hist> (which is created if C<Term::ReadLine> reports -that the terminal supports history). It find the the command required, puts it +that the terminal supports history). It find the command required, puts it into C<$cmd>, and redoes the loop to execute it. =cut diff --git a/gnu/usr.bin/perl/perl.c b/gnu/usr.bin/perl/perl.c index 94f2b131643..b1557b1336d 100644 --- a/gnu/usr.bin/perl/perl.c +++ b/gnu/usr.bin/perl/perl.c @@ -1939,6 +1939,10 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) } } #endif +#ifdef __OpenBSD__ + Perl_sv_catpvf(aTHX_ opts_prog, + "\" Built under OpenBSD\\n\""); +#else Perl_sv_catpvf(aTHX_ opts_prog, "\" Built under %s\\n",OSNAME); #ifdef __DATE__ @@ -1949,6 +1953,7 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) sv_catpvs(opts_prog, " Compiled on " __DATE__ "\\n\""); # endif #endif +#endif sv_catpvs(opts_prog, "; $\"=\"\\n \"; " "@env = map { \"$_=\\\"$ENV{$_}\\\"\" } " "sort grep {/^PERL/} keys %ENV; "); diff --git a/gnu/usr.bin/perl/pod/perlmodinstall.pod b/gnu/usr.bin/perl/pod/perlmodinstall.pod index 8352bff474f..36ea18a2879 100644 --- a/gnu/usr.bin/perl/pod/perlmodinstall.pod +++ b/gnu/usr.bin/perl/pod/perlmodinstall.pod @@ -79,11 +79,11 @@ You can get gzip from ftp://prep.ai.mit.edu/pub/gnu/ Or, you can combine this step with the next to save disk space: - gzip -dc yourmodule.tar.gz | tar -xof - + gzip -dc yourmodule.tar.gz | tar -xf - B. UNPACK -Unpack the result with C<tar -xof yourmodule.tar> +Unpack the result with C<tar -xf yourmodule.tar> C. BUILD diff --git a/gnu/usr.bin/perl/pod/perlop.pod b/gnu/usr.bin/perl/pod/perlop.pod index fe995259c52..ffbca4f80a9 100644 --- a/gnu/usr.bin/perl/pod/perlop.pod +++ b/gnu/usr.bin/perl/pod/perlop.pod @@ -951,6 +951,7 @@ from the next line. This allows you to write: The following escape sequences are available in constructs that interpolate and in transliterations. X<\t> X<\n> X<\r> X<\f> X<\b> X<\a> X<\e> X<\x> X<\0> X<\c> X<\N> +X<\t> X<\r> X<\f> X<\b> X<\a> X<\e> X<\x> X<\0> X<\c> X<\N> \t tab (HT, TAB) \n newline (NL) @@ -1008,7 +1009,7 @@ and although they often accept just C<"\012">, they seldom tolerate just C<"\015">. If you get in the habit of using C<"\n"> for networking, you may be burned some day. X<newline> X<line terminator> X<eol> X<end of line> -X<\n> X<\r> X<\r\n> +X<\r> For constructs that do interpolate, variables beginning with "C<$>" or "C<@>" are interpolated. Subscripted variables such as C<$a[3]> or diff --git a/gnu/usr.bin/perl/pod/perlre.pod b/gnu/usr.bin/perl/pod/perlre.pod index a076d3ad66a..b3581706cec 100644 --- a/gnu/usr.bin/perl/pod/perlre.pod +++ b/gnu/usr.bin/perl/pod/perlre.pod @@ -212,7 +212,7 @@ instance the above example could also be written as follows: Because patterns are processed as double quoted strings, the following also work: -X<\t> X<\n> X<\r> X<\f> X<\e> X<\a> X<\l> X<\u> X<\L> X<\U> X<\E> X<\Q> +X<\t> X<\r> X<\f> X<\e> X<\a> X<\l> X<\u> X<\L> X<\U> X<\E> X<\Q> X<\0> X<\c> X<\N> X<\x> \t tab (HT, TAB) diff --git a/gnu/usr.bin/perl/pod/perlxstut.pod b/gnu/usr.bin/perl/pod/perlxstut.pod index 090b14a9e76..d9bc0e297fd 100644 --- a/gnu/usr.bin/perl/pod/perlxstut.pod +++ b/gnu/usr.bin/perl/pod/perlxstut.pod @@ -1,6 +1,6 @@ =head1 NAME -perlXStut - Tutorial for writing XSUBs +perlxstut - Tutorial for writing XSUBs =head1 DESCRIPTION @@ -252,7 +252,7 @@ Now perform the same steps as before, generating a Makefile from the Makefile.PL file, and running make. In order to test that our extension works, we now need to look at the -file Mytest.t. This file is set up to imitate the same kind of testing +file t/Mytest.t. This file is set up to imitate the same kind of testing structure that Perl itself has. Within the test script, you perform a number of tests to confirm the behavior of the extension, printing "ok" when the test is correct, "not ok" when it is not. diff --git a/gnu/usr.bin/perl/utils.lst b/gnu/usr.bin/perl/utils.lst index b92c51318bd..9be4322aeec 100644 --- a/gnu/usr.bin/perl/utils.lst +++ b/gnu/usr.bin/perl/utils.lst @@ -21,13 +21,11 @@ utils/perlivp utils/piconv utils/pl2pm utils/prove -utils/ptar -utils/ptardiff utils/cpanp-run-perl utils/cpanp utils/cpan2dist -utils/shasum utils/splain +utils/shasum utils/xsubpp x2p/a2p # pod = x2p/a2p.pod x2p/find2perl diff --git a/gnu/usr.bin/perl/utils/Makefile b/gnu/usr.bin/perl/utils/Makefile index 4d56bea80cb..2d741387888 100644 --- a/gnu/usr.bin/perl/utils/Makefile +++ b/gnu/usr.bin/perl/utils/Makefile @@ -7,9 +7,9 @@ RUN = # Used mainly cross-compilation setups. # Files to be built with variable substitution after miniperl is # available. Dependencies handled manually below (for now). -pl = c2ph.PL config_data.PL corelist.PL cpan.PL h2ph.PL h2xs.PL instmodsh.PL perlbug.PL perldoc.PL perlivp.PL pl2pm.PL prove.PL ptar.PL ptardiff.PL cpanp-run-perl.PL cpanp.PL cpan2dist.PL shasum.PL splain.PL dprofpp.PL libnetcfg.PL piconv.PL enc2xs.PL xsubpp.PL -plextract = c2ph config_data corelist cpan h2ph h2xs instmodsh perlbug perldoc perlivp pl2pm prove ptar ptardiff cpanp-run-perl cpanp cpan2dist shasum splain dprofpp libnetcfg piconv enc2xs xsubpp -plextractexe = ./c2ph ./config_data ./corelist ./cpan ./h2ph ./h2xs ./instmodsh ./perlbug ./perldoc ./perlivp ./pl2pm ./prove ./ptar ./ptardiff ./cpanp-run-perl ./cpanp ./cpan2dist ./shasum ./splain ./dprofpp ./libnetcfg ./piconv ./enc2xs ./xsubpp +pl = c2ph.PL config_data.PL corelist.PL cpan.PL h2ph.PL h2xs.PL instmodsh.PL perlbug.PL perldoc.PL perlivp.PL pl2pm.PL prove.PL cpanp-run-perl.PL cpanp.PL cpan2dist.PL splain.PL dprofpp.PL libnetcfg.PL piconv.PL enc2xs.PL xsubpp.PL +plextract = c2ph config_data corelist cpan h2ph h2xs instmodsh perlbug perldoc perlivp pl2pm prove cpanp-run-perl cpanp cpan2dist splain dprofpp libnetcfg piconv enc2xs xsubpp +plextractexe = ./c2ph ./config_data ./corelist ./cpan ./h2ph ./h2xs ./instmodsh ./perlbug ./perldoc ./perlivp ./pl2pm ./prove ./cpanp-run-perl ./cpanp ./cpan2dist ./splain ./dprofpp ./libnetcfg ./piconv ./enc2xs ./xsubpp all: $(plextract) @@ -38,10 +38,6 @@ perlivp: perlivp.PL ../config.sh prove: prove.PL ../config.sh -ptar: ptar.PL ../config.sh - -ptardiff: ptardiff.PL ../config.sh - cpanp-run-perl: cpanp-run-perl.PL ../config.sh cpanp: cpanp.PL ../config.sh @@ -50,8 +46,6 @@ cpan2dist: cpan2dist.PL ../config.sh pl2pm: pl2pm.PL ../config.sh -shasum: shasum.PL ../config.sh - splain: splain.PL ../config.sh ../lib/diagnostics.pm dprofpp: dprofpp.PL ../config.sh diff --git a/gnu/usr.bin/perl/utils/Makefile.SH b/gnu/usr.bin/perl/utils/Makefile.SH index b5a2f12bb1f..5292a96276b 100644 --- a/gnu/usr.bin/perl/utils/Makefile.SH +++ b/gnu/usr.bin/perl/utils/Makefile.SH @@ -39,9 +39,9 @@ cat >>Makefile <<'!NO!SUBS!' # Files to be built with variable substitution after miniperl is # available. Dependencies handled manually below (for now). -pl = c2ph.PL config_data.PL corelist.PL cpan.PL h2ph.PL h2xs.PL instmodsh.PL perlbug.PL perldoc.PL perlivp.PL pl2pm.PL prove.PL ptar.PL ptardiff.PL cpanp-run-perl.PL cpanp.PL cpan2dist.PL shasum.PL splain.PL dprofpp.PL libnetcfg.PL piconv.PL enc2xs.PL xsubpp.PL -plextract = c2ph config_data corelist cpan h2ph h2xs instmodsh perlbug perldoc perlivp pl2pm prove ptar ptardiff cpanp-run-perl cpanp cpan2dist shasum splain dprofpp libnetcfg piconv enc2xs xsubpp -plextractexe = ./c2ph ./config_data ./corelist ./cpan ./h2ph ./h2xs ./instmodsh ./perlbug ./perldoc ./perlivp ./pl2pm ./prove ./ptar ./ptardiff ./cpanp-run-perl ./cpanp ./cpan2dist ./shasum ./splain ./dprofpp ./libnetcfg ./piconv ./enc2xs ./xsubpp +pl = c2ph.PL config_data.PL corelist.PL cpan.PL h2ph.PL h2xs.PL instmodsh.PL perlbug.PL perldoc.PL perlivp.PL pl2pm.PL prove.PL cpanp-run-perl.PL cpanp.PL cpan2dist.PL splain.PL dprofpp.PL libnetcfg.PL piconv.PL enc2xs.PL xsubpp.PL +plextract = c2ph config_data corelist cpan h2ph h2xs instmodsh perlbug perldoc perlivp pl2pm prove cpanp-run-perl cpanp cpan2dist splain dprofpp libnetcfg piconv enc2xs xsubpp +plextractexe = ./c2ph ./config_data ./corelist ./cpan ./h2ph ./h2xs ./instmodsh ./perlbug ./perldoc ./perlivp ./pl2pm ./prove ./cpanp-run-perl ./cpanp ./cpan2dist ./splain ./dprofpp ./libnetcfg ./piconv ./enc2xs ./xsubpp all: $(plextract) @@ -70,10 +70,6 @@ perlivp: perlivp.PL ../config.sh prove: prove.PL ../config.sh -ptar: ptar.PL ../config.sh - -ptardiff: ptardiff.PL ../config.sh - cpanp-run-perl: cpanp-run-perl.PL ../config.sh cpanp: cpanp.PL ../config.sh @@ -82,8 +78,6 @@ cpan2dist: cpan2dist.PL ../config.sh pl2pm: pl2pm.PL ../config.sh -shasum: shasum.PL ../config.sh - splain: splain.PL ../config.sh ../lib/diagnostics.pm dprofpp: dprofpp.PL ../config.sh diff --git a/gnu/usr.bin/perl/utils/h2ph.PL b/gnu/usr.bin/perl/utils/h2ph.PL index cd4b5a0b2cc..23f25a3d432 100644 --- a/gnu/usr.bin/perl/utils/h2ph.PL +++ b/gnu/usr.bin/perl/utils/h2ph.PL @@ -558,7 +558,7 @@ sub next_line $in =~ s/\?\?</{/g; # | ??<| {| $in =~ s/\?\?>/}/g; # | ??>| }| } - if ($in =~ /^\#ifdef __LANGUAGE_PASCAL__/) { + if ($in =~ s/^\#ifdef __LANGUAGE_PASCAL__//) { # Tru64 disassembler.h evilness: mixed C and Pascal. while (<IN>) { last if /^\#endif/; @@ -566,8 +566,8 @@ sub next_line $in = ""; next READ; } - if ($in =~ /^extern inline / && # Inlined assembler. - $^O eq 'linux' && $file =~ m!(?:^|/)asm/[^/]+\.h$!) { + # Skip inlined functions in headers + if ($in =~ s/^(extern|static) (__inline__|inline) .*[^;]\s*$//) { while (<IN>) { last if /^}/; } |