svn commit: r384837 - in head: lang/perl5-devel lang/perl5-devel/files lang/perl5.16 lang/perl5.16/files lang/perl5.18 lang/perl5.18/files lang/perl5.20 lang/perl5.20/files textproc/p5-Pod-Perldoc ...
Mathieu Arnold
mat at FreeBSD.org
Mon Apr 27 14:32:15 UTC 2015
Author: mat
Date: Mon Apr 27 14:32:09 2015
New Revision: 384837
URL: https://svnweb.freebsd.org/changeset/ports/384837
Log:
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
Added:
head/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm (contents, props changed)
head/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm (contents, props changed)
head/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm (contents, props changed)
head/lang/perl5.16/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm (contents, props changed)
head/lang/perl5.16/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm (contents, props changed)
head/lang/perl5.16/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm (contents, props changed)
head/lang/perl5.18/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm (contents, props changed)
head/lang/perl5.18/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm (contents, props changed)
head/lang/perl5.18/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm (contents, props changed)
head/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm (contents, props changed)
head/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm (contents, props changed)
head/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm (contents, props changed)
head/textproc/p5-Pod-Perldoc/files/
head/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc.pm (contents, props changed)
head/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc_BaseTo.pm (contents, props changed)
head/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc_ToMan.pm (contents, props changed)
Modified:
head/lang/perl5-devel/Makefile
head/lang/perl5.16/Makefile
head/lang/perl5.18/Makefile
head/lang/perl5.20/Makefile
head/textproc/p5-Pod-Perldoc/Makefile
Modified: head/lang/perl5-devel/Makefile
==============================================================================
--- head/lang/perl5-devel/Makefile Mon Apr 27 14:15:24 2015 (r384836)
+++ head/lang/perl5-devel/Makefile Mon Apr 27 14:32:09 2015 (r384837)
@@ -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
Added: head/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm Mon Apr 27 14:32:09 2015 (r384837)
@@ -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;
+ }
+ }
Added: head/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm Mon Apr 27 14:32:09 2015 (r384837)
@@ -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;
+ }
+
Added: head/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm Mon Apr 27 14:32:09 2015 (r384837)
@@ -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 ) }
+ }
+
Modified: head/lang/perl5.16/Makefile
==============================================================================
--- head/lang/perl5.16/Makefile Mon Apr 27 14:15:24 2015 (r384836)
+++ head/lang/perl5.16/Makefile Mon Apr 27 14:32:09 2015 (r384837)
@@ -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
Added: head/lang/perl5.16/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5.16/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm Mon Apr 27 14:32:09 2015 (r384837)
@@ -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;
+ }
+ }
Added: head/lang/perl5.16/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5.16/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm Mon Apr 27 14:32:09 2015 (r384837)
@@ -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 {
Added: head/lang/perl5.16/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5.16/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm Mon Apr 27 14:32:09 2015 (r384837)
@@ -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 ) }
+ }
+
Modified: head/lang/perl5.18/Makefile
==============================================================================
--- head/lang/perl5.18/Makefile Mon Apr 27 14:15:24 2015 (r384836)
+++ head/lang/perl5.18/Makefile Mon Apr 27 14:32:09 2015 (r384837)
@@ -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
Added: head/lang/perl5.18/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5.18/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm Mon Apr 27 14:32:09 2015 (r384837)
@@ -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;
+ }
+ }
Added: head/lang/perl5.18/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5.18/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm Mon Apr 27 14:32:09 2015 (r384837)
@@ -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 {
Added: head/lang/perl5.18/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5.18/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm Mon Apr 27 14:32:09 2015 (r384837)
@@ -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 ) }
+ }
+
Modified: head/lang/perl5.20/Makefile
==============================================================================
--- head/lang/perl5.20/Makefile Mon Apr 27 14:15:24 2015 (r384836)
+++ head/lang/perl5.20/Makefile Mon Apr 27 14:32:09 2015 (r384837)
@@ -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
Added: head/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm Mon Apr 27 14:32:09 2015 (r384837)
@@ -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;
+ }
+ }
Added: head/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_BaseTo.pm Mon Apr 27 14:32:09 2015 (r384837)
@@ -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;
+ }
+
Added: head/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm Mon Apr 27 14:32:09 2015 (r384837)
@@ -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 ) }
+ }
+
Modified: head/textproc/p5-Pod-Perldoc/Makefile
==============================================================================
--- head/textproc/p5-Pod-Perldoc/Makefile Mon Apr 27 14:15:24 2015 (r384836)
+++ head/textproc/p5-Pod-Perldoc/Makefile Mon Apr 27 14:32:09 2015 (r384837)
@@ -3,6 +3,7 @@
PORTNAME= Pod-Perldoc
PORTVERSION= 3.25
+PORTREVISION= 1
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
Added: head/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc.pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc.pm Mon Apr 27 14:32:09 2015 (r384837)
@@ -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;
+ }
+ }
Added: head/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc_BaseTo.pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc_BaseTo.pm Mon Apr 27 14:32:09 2015 (r384837)
@@ -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;
+ }
+
Added: head/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc_ToMan.pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc_ToMan.pm Mon Apr 27 14:32:09 2015 (r384837)
@@ -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 ) }
+ }
+
More information about the svn-ports-head
mailing list