From 762933764396716adb4e9e20a7d8d1bc23362fed Mon Sep 17 00:00:00 2001 From: Stuart Henderson Date: Mon, 25 Mar 2013 20:20:39 +0000 Subject: merge 5.16.3 / avoid installing shasum/zipdetails/json_pp --- gnu/usr.bin/perl/utils.lst | 19 +++++++++---------- gnu/usr.bin/perl/utils/Makefile | 19 ++++++++++++++----- gnu/usr.bin/perl/utils/Makefile.SH | 21 +++++++++++++++------ 3 files changed, 38 insertions(+), 21 deletions(-) diff --git a/gnu/usr.bin/perl/utils.lst b/gnu/usr.bin/perl/utils.lst index 6789dbef81c..21428c9ffd2 100644 --- a/gnu/usr.bin/perl/utils.lst +++ b/gnu/usr.bin/perl/utils.lst @@ -1,31 +1,30 @@ -pod/pod2html -pod/pod2latex -pod/pod2man -pod/pod2text -pod/pod2usage -pod/podchecker -pod/podselect +cpan/Pod-LaTeX/blib/script/pod2latex +cpan/podlators/blib/script/pod2man +cpan/podlators/blib/script/pod2text +cpan/Pod-Parser/blib/script/pod2usage +cpan/Pod-Parser/blib/script/podchecker +cpan/Pod-Parser/blib/script/podselect utils/c2ph # link = utils/pstruct utils/cpan utils/config_data utils/corelist -utils/dprofpp utils/enc2xs utils/h2ph utils/h2xs utils/instmodsh utils/libnetcfg utils/perlbug -utils/perldoc # pod = pod/perldoc.pod +utils/perldoc utils/perlivp utils/piconv utils/pl2pm +utils/pod2html utils/prove utils/cpanp-run-perl utils/cpanp utils/cpan2dist utils/splain utils/xsubpp -x2p/a2p # pod = x2p/a2p.pod +x2p/a2p x2p/find2perl x2p/s2p # link = x2p/psed diff --git a/gnu/usr.bin/perl/utils/Makefile b/gnu/usr.bin/perl/utils/Makefile index 4d56bea80cb..bf6bc804a2b 100644 --- a/gnu/usr.bin/perl/utils/Makefile +++ b/gnu/usr.bin/perl/utils/Makefile @@ -1,3 +1,6 @@ +# Generated from utils/Makefile.SH. The generated file is +# shipped with the source kit for systems such as win32 +# which don't do .SH extraction. PERL = ../miniperl REALPERL = ../perl @@ -7,9 +10,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 json_pp.PL perlbug.PL perldoc.PL perlivp.PL pl2pm.PL prove.PL ptar.PL ptardiff.PL ptargrep.PL cpanp-run-perl.PL cpanp.PL cpan2dist.PL shasum.PL splain.PL libnetcfg.PL piconv.PL enc2xs.PL xsubpp.PL pod2html.PL zipdetails.PL +plextract = c2ph config_data corelist cpan h2ph h2xs instmodsh json_pp perlbug perldoc perlivp pl2pm prove ptar ptardiff ptargrep cpanp-run-perl cpanp cpan2dist shasum splain libnetcfg piconv enc2xs xsubpp pod2html zipdetails +plextractexe = ./c2ph ./config_data ./corelist ./cpan ./h2ph ./h2xs ./json_pp ./instmodsh ./perlbug ./perldoc ./perlivp ./pl2pm ./prove ./ptar ./ptardiff ./ptargrep ./cpanp-run-perl ./cpanp ./cpan2dist ./shasum ./splain ./libnetcfg ./piconv ./enc2xs ./xsubpp ./pod2html ./zipdetails all: $(plextract) @@ -30,6 +33,8 @@ h2xs: h2xs.PL ../config.sh instmodsh: instmodsh.PL ../config.sh +json_pp: json_pp.PL ../config.sh + perlbug: perlbug.PL ../config.sh ../patchlevel.h perldoc: perldoc.PL ../config.sh @@ -42,6 +47,8 @@ ptar: ptar.PL ../config.sh ptardiff: ptardiff.PL ../config.sh +ptargrep: ptargrep.PL ../config.sh + cpanp-run-perl: cpanp-run-perl.PL ../config.sh cpanp: cpanp.PL ../config.sh @@ -54,8 +61,6 @@ shasum: shasum.PL ../config.sh splain: splain.PL ../config.sh ../lib/diagnostics.pm -dprofpp: dprofpp.PL ../config.sh - libnetcfg: libnetcfg.PL ../config.sh piconv: piconv.PL ../config.sh @@ -64,6 +69,10 @@ enc2xs: enc2xs.PL ../config.sh xsubpp: xsubpp.PL ../config.sh +zipdetails: zipdetails.PL ../config.sh + +pod2html: pod2html.PL ../config.sh ../ext/Pod-Html/bin/pod2html + clean: realclean: diff --git a/gnu/usr.bin/perl/utils/Makefile.SH b/gnu/usr.bin/perl/utils/Makefile.SH index 5292a96276b..5bfa8c2ed4a 100644 --- a/gnu/usr.bin/perl/utils/Makefile.SH +++ b/gnu/usr.bin/perl/utils/Makefile.SH @@ -26,9 +26,18 @@ esac echo "Extracting utils/Makefile (with variable substitutions)" rm -f Makefile +# These use the Cwd extension. For statically-built perls, we +# need perl, not just miniperl. +case "$usedl" in + define) perl="../miniperl" ;; + *) perl="../perl" ;; +esac cat >Makefile <>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 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 +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 libnetcfg.PL piconv.PL enc2xs.PL xsubpp.PL pod2html.PL +plextract = c2ph config_data corelist cpan h2ph h2xs instmodsh perlbug perldoc perlivp pl2pm prove cpanp-run-perl cpanp cpan2dist splain libnetcfg piconv enc2xs xsubpp pod2html +plextractexe = ./c2ph ./config_data ./corelist ./cpan ./h2ph ./h2xs ./instmodsh ./perlbug ./perldoc ./perlivp ./pl2pm ./prove ./cpanp-run-perl ./cpanp ./cpan2dist ./splain ./libnetcfg ./piconv ./enc2xs ./xsubpp ./pod2html all: $(plextract) @@ -80,8 +89,6 @@ pl2pm: pl2pm.PL ../config.sh splain: splain.PL ../config.sh ../lib/diagnostics.pm -dprofpp: dprofpp.PL ../config.sh - libnetcfg: libnetcfg.PL ../config.sh piconv: piconv.PL ../config.sh @@ -90,6 +97,8 @@ enc2xs: enc2xs.PL ../config.sh xsubpp: xsubpp.PL ../config.sh +pod2html: pod2html.PL ../config.sh ../ext/Pod-Html/bin/pod2html + clean: realclean: -- cgit v1.2.3