diff options
author | Mathieu Arnold <mat@FreeBSD.org> | 2015-04-27 14:32:09 +0000 |
---|---|---|
committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-04-27 14:32:09 +0000 |
commit | 500e6a241ea84dfddda8b55d5545e37d3f75322b (patch) | |
tree | 50a25394a869ff9cea38172102e9d7afd8ad8367 /lang/perl5.20 | |
parent | 94b7441dd63dc38700643439fa63796b1ee3ea0a (diff) | |
download | ports-500e6a241ea84dfddda8b55d5545e37d3f75322b.tar.gz ports-500e6a241ea84dfddda8b55d5545e37d3f75322b.zip |
Have perldoc use mandoc before *roff. Also, fix perldoc when using more as a
pager.
Differential Revision: https://reviews.freebsd.org/D2373
With hat: perl@
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=384837
Diffstat (limited to 'lang/perl5.20')
4 files changed, 35 insertions, 1 deletions
diff --git a/lang/perl5.20/Makefile b/lang/perl5.20/Makefile index c3efaa391e84..402cdde17bff 100644 --- a/lang/perl5.20/Makefile +++ b/lang/perl5.20/Makefile @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN/../../src/5.0 DIST_SUBDIR= perl diff --git a/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm b/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm new file mode 100644 index 000000000000..c8b7993f4f4a --- /dev/null +++ b/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm @@ -0,0 +1,13 @@ +--- cpan/Pod-Perldoc/lib/Pod/Perldoc.pm.orig 2014-12-27 11:49:22 UTC ++++ cpan/Pod-Perldoc/lib/Pod/Perldoc.pm +@@ -1892,6 +1892,10 @@ sub page { # apply a pager to the outpu + if ($self->is_vms) { + last if system("$pager $output") == 0; + } else { ++ # fix visible escape codes in ToTerm output ++ # https://bugs.debian.org/758689 ++ local $ENV{LESS} = defined $ENV{LESS} ? "$ENV{LESS} -R" : "-R"; ++ local $ENV{MORE} = defined $ENV{MORE} ? "$ENV{MORE} -R" : "-R"; + last if system("$pager \"$output\"") == 0; + } + } diff --git a/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm b/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm new file mode 100644 index 000000000000..327520462512 --- /dev/null +++ b/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm @@ -0,0 +1,10 @@ +--- cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm.orig 2014-12-27 11:49:22 UTC ++++ cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm +@@ -33,6 +33,7 @@ BEGIN { + *is_linux = $^O eq 'linux' ? \&TRUE : \&FALSE unless defined &is_linux; + *is_hpux = $^O =~ m/hpux/ ? \&TRUE : \&FALSE unless defined &is_hpux; + *is_openbsd = $^O =~ m/openbsd/ ? \&TRUE : \&FALSE unless defined &is_openbsd; ++ *is_freebsd = $^O =~ m/freebsd/ ? \&TRUE : \&FALSE unless defined &is_freebsd; + *is_bitrig = $^O =~ m/bitrig/ ? \&TRUE : \&FALSE unless defined &is_bitrig; + } + diff --git a/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm b/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm new file mode 100644 index 000000000000..e24ff6e63cd0 --- /dev/null +++ b/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm @@ -0,0 +1,11 @@ +--- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm.orig 2014-12-27 11:49:22 UTC ++++ cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm +@@ -63,7 +63,7 @@ sub init { + sub _roffer_candidates { + my( $self ) = @_; + +- if( $self->is_openbsd || $self->is_bitrig ) { qw( mandoc groff nroff ) } ++ if( $self->is_openbsd || $self->is_freebsd || $self->is_bitrig ) { qw( mandoc groff nroff ) } + else { qw( groff nroff mandoc ) } + } + |