diff options
| author | mat <mat@FreeBSD.org> | 2015-04-27 22:32:09 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2015-04-27 22:32:09 +0800 |
| commit | ed87bc69ca7e1ab7b6c7635b1c47d6f4d7d28a51 (patch) | |
| tree | 50a25394a869ff9cea38172102e9d7afd8ad8367 | |
| parent | 6cf18ac4d0cb3f9d866cbe60bd6104cd442258ce (diff) | |
| download | freebsd-ports-gnome-ed87bc69ca7e1ab7b6c7635b1c47d6f4d7d28a51.tar.gz freebsd-ports-gnome-ed87bc69ca7e1ab7b6c7635b1c47d6f4d7d28a51.tar.zst freebsd-ports-gnome-ed87bc69ca7e1ab7b6c7635b1c47d6f4d7d28a51.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
20 files changed, 169 insertions, 4 deletions
diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile index 33f0814f39c9..0b91ce22b75b 100644 --- a/lang/perl5-devel/Makefile +++ b/lang/perl5-devel/Makefile @@ -4,7 +4,7 @@ PORTNAME= perl #PORTVERSION= ${PERL_VERSION} # XXX PORTVERSION= ${GH_TAGNAME:C/^v//:C/-(.*)-.*/.\1/} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= lang devel perl5 # XXX MASTER_SITES= LOCAL/mat/perl GH CPAN/../../src/5.0 diff --git a/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm b/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm new file mode 100644 index 000000000000..767222c08a17 --- /dev/null +++ b/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm @@ -0,0 +1,10 @@ +--- cpan/Pod-Perldoc/lib/Pod/Perldoc.pm.orig 2015-04-27 14:10:52 UTC ++++ cpan/Pod-Perldoc/lib/Pod/Perldoc.pm +@@ -1920,6 +1920,7 @@ sub page { # apply a pager to the outpu + # 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-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm b/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm new file mode 100644 index 000000000000..600fdf77a4e8 --- /dev/null +++ b/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm @@ -0,0 +1,10 @@ +--- cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm.orig 2015-04-26 15:40:21 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-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm b/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm new file mode 100644 index 000000000000..7b13e4d0a034 --- /dev/null +++ b/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm @@ -0,0 +1,11 @@ +--- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm.orig 2015-04-26 15:40:21 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 ) } + } + diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile index ee81c14158c6..32fd482e5f95 100644 --- a/lang/perl5.16/Makefile +++ b/lang/perl5.16/Makefile @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN/../../src/5.0 DIST_SUBDIR= perl diff --git a/lang/perl5.16/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm b/lang/perl5.16/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm new file mode 100644 index 000000000000..3bad7f0d406e --- /dev/null +++ b/lang/perl5.16/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm @@ -0,0 +1,13 @@ +--- cpan/Pod-Perldoc/lib/Pod/Perldoc.pm.orig 2013-03-04 15:16:21 UTC ++++ cpan/Pod-Perldoc/lib/Pod/Perldoc.pm +@@ -1754,6 +1754,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.16/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm b/lang/perl5.16/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm new file mode 100644 index 000000000000..56c82c0fd3e9 --- /dev/null +++ b/lang/perl5.16/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm @@ -0,0 +1,10 @@ +--- cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm.orig 2013-03-04 15:16:21 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; + } + + sub _perldoc_elem { diff --git a/lang/perl5.16/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm b/lang/perl5.16/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm new file mode 100644 index 000000000000..505778fca544 --- /dev/null +++ b/lang/perl5.16/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm @@ -0,0 +1,11 @@ +--- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm.orig 2013-03-04 15:16:21 UTC ++++ cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm +@@ -63,7 +63,7 @@ sub init { + sub _roffer_candidates { + my( $self ) = @_; + +- if( $self->is_openbsd ) { qw( mandoc groff nroff ) } ++ if( $self->is_openbsd || $self->is_freebsd ) { qw( mandoc groff nroff ) } + else { qw( groff nroff mandoc ) } + } + diff --git a/lang/perl5.18/Makefile b/lang/perl5.18/Makefile index efdc7ac63031..04aae83cf872 100644 --- a/lang/perl5.18/Makefile +++ b/lang/perl5.18/Makefile @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN/../../src/5.0 DIST_SUBDIR= perl diff --git a/lang/perl5.18/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm b/lang/perl5.18/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm new file mode 100644 index 000000000000..628f52f4893d --- /dev/null +++ b/lang/perl5.18/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm @@ -0,0 +1,13 @@ +--- cpan/Pod-Perldoc/lib/Pod/Perldoc.pm.orig 2014-10-01 01:32:59 UTC ++++ cpan/Pod-Perldoc/lib/Pod/Perldoc.pm +@@ -1754,6 +1754,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.18/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm b/lang/perl5.18/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm new file mode 100644 index 000000000000..92dc28c18985 --- /dev/null +++ b/lang/perl5.18/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm @@ -0,0 +1,10 @@ +--- cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm.orig 2014-10-01 01:32:59 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; + } + + sub _perldoc_elem { diff --git a/lang/perl5.18/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm b/lang/perl5.18/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm new file mode 100644 index 000000000000..f947c43b5760 --- /dev/null +++ b/lang/perl5.18/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm @@ -0,0 +1,11 @@ +--- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm.orig 2014-10-01 01:32:59 UTC ++++ cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm +@@ -63,7 +63,7 @@ sub init { + sub _roffer_candidates { + my( $self ) = @_; + +- if( $self->is_openbsd ) { qw( mandoc groff nroff ) } ++ if( $self->is_freebsd || $self->is_openbsd ) { qw( mandoc groff nroff ) } + else { qw( groff nroff mandoc ) } + } + 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 ) } + } + diff --git a/textproc/p5-Pod-Perldoc/Makefile b/textproc/p5-Pod-Perldoc/Makefile index 6771391cf0e8..fd693e68fa52 100644 --- a/textproc/p5-Pod-Perldoc/Makefile +++ b/textproc/p5-Pod-Perldoc/Makefile @@ -3,6 +3,7 @@ PORTNAME= Pod-Perldoc PORTVERSION= 3.25 +PORTREVISION= 1 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc.pm b/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc.pm new file mode 100644 index 000000000000..397613e5ba17 --- /dev/null +++ b/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc.pm @@ -0,0 +1,10 @@ +--- lib/Pod/Perldoc.pm.orig 2015-02-12 03:07:39 UTC ++++ lib/Pod/Perldoc.pm +@@ -1920,6 +1920,7 @@ sub page { # apply a pager to the outpu + # 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/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc_BaseTo.pm b/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc_BaseTo.pm new file mode 100644 index 000000000000..40c58d506b16 --- /dev/null +++ b/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc_BaseTo.pm @@ -0,0 +1,10 @@ +--- lib/Pod/Perldoc/BaseTo.pm.orig 2015-02-12 03:07:51 UTC ++++ 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/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc_ToMan.pm b/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc_ToMan.pm new file mode 100644 index 000000000000..759005fec40b --- /dev/null +++ b/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc_ToMan.pm @@ -0,0 +1,11 @@ +--- lib/Pod/Perldoc/ToMan.pm.orig 2015-02-12 03:08:10 UTC ++++ 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 ) } + } + |