diff options
author | mat <mat@FreeBSD.org> | 2017-04-04 22:06:51 +0800 |
---|---|---|
committer | mat <mat@FreeBSD.org> | 2017-04-04 22:06:51 +0800 |
commit | 084310e713e10c446d905cfa6a41b8060bf25028 (patch) | |
tree | 065cfac3f8396f5055e76a2fcf56968f5bc15fcc /lang | |
parent | dee32c110dba6b52087aac8dc4ab7d51e8ee48db (diff) | |
download | freebsd-ports-gnome-084310e713e10c446d905cfa6a41b8060bf25028.tar.gz freebsd-ports-gnome-084310e713e10c446d905cfa6a41b8060bf25028.tar.zst freebsd-ports-gnome-084310e713e10c446d905cfa6a41b8060bf25028.zip |
Explain perldoc how to handle MANWIDTH=tty in the environment, and stop
it from reporting tty being an invalid version.
With hat: perl@
Sponsored by: Absolight
Diffstat (limited to 'lang')
12 files changed, 86 insertions, 4 deletions
diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile index eeacbe96033a..e9fa7903988a 100644 --- a/lang/perl5-devel/Makefile +++ b/lang/perl5-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= perl -PORTREVISION= 1 +PORTREVISION= 2 # XXX Remove second line, uncomment first #DISTVERSION= ${PERL_VERSION} DISTVERSION= ${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//} 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..cf800afbf959 --- /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 2017-04-03 07:28:44 UTC ++++ cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm +@@ -108,6 +108,8 @@ sub _get_columns_from_manwidth { + + return 0 unless defined $ENV{MANWIDTH}; + ++ if ($ENV{MANWIDTH} eq 'tty') { return 0; } ++ + unless( $ENV{MANWIDTH} =~ m/\A\d+\z/ ) { + $self->warn( "Ignoring non-numeric MANWIDTH ($ENV{MANWIDTH})\n" ); + return 0; diff --git a/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm b/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm new file mode 100644 index 000000000000..7fe2fa241d9a --- /dev/null +++ b/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm @@ -0,0 +1,11 @@ +--- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm.orig 2017-04-03 07:28:44 UTC ++++ cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm +@@ -69,6 +69,8 @@ sub _get_columns_from_manwidth { + + return 0 unless defined $ENV{MANWIDTH}; + ++ if ($ENV{MANWIDTH} eq 'tty') { return 0; } ++ + unless( $ENV{MANWIDTH} =~ m/\A\d+\z/ ) { + $self->warn( "Ignoring non-numeric MANWIDTH ($ENV{MANWIDTH})\n" ); + return 0; diff --git a/lang/perl5.20/Makefile b/lang/perl5.20/Makefile index 59e8fd011426..25effc49099a 100644 --- a/lang/perl5.20/Makefile +++ b/lang/perl5.20/Makefile @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 15 +PORTREVISION= 16 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_ToMan.pm b/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm index e24ff6e63cd0..fb86560438e3 100644 --- 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 @@ -9,3 +9,12 @@ else { qw( groff nroff mandoc ) } } +@@ -108,6 +108,8 @@ sub _get_columns_from_manwidth { + + return 0 unless defined $ENV{MANWIDTH}; + ++ if ($ENV{MANWIDTH} eq 'tty') { return 0; } ++ + unless( $ENV{MANWIDTH} =~ m/\A\d+\z/ ) { + $self->warn( "Ignoring non-numeric MANWIDTH ($ENV{MANWIDTH})\n" ); + return 0; diff --git a/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm b/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm new file mode 100644 index 000000000000..75362a105066 --- /dev/null +++ b/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm @@ -0,0 +1,11 @@ +--- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm.orig 2017-04-04 13:14:41 UTC ++++ cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm +@@ -41,6 +41,8 @@ sub _get_columns_from_manwidth { + + return 0 unless defined $ENV{MANWIDTH}; + ++ if ($ENV{MANWIDTH} eq 'tty') { return 0; } ++ + unless( $ENV{MANWIDTH} =~ m/\A\d+\z/ ) { + $self->warn( "Ignoring non-numeric MANWIDTH ($ENV{MANWIDTH})\n" ); + return 0; diff --git a/lang/perl5.22/Makefile b/lang/perl5.22/Makefile index c3419d3a58c9..3ab2c748f7e8 100644 --- a/lang/perl5.22/Makefile +++ b/lang/perl5.22/Makefile @@ -3,7 +3,7 @@ PORTNAME= perl DISTVERSION= ${PERL_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN/../../src/5.0 CPAN/../by-authors/id/S/SH/SHAY DIST_SUBDIR= perl diff --git a/lang/perl5.22/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm b/lang/perl5.22/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm index 7b13e4d0a034..5d414069d836 100644 --- a/lang/perl5.22/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm +++ b/lang/perl5.22/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm @@ -9,3 +9,12 @@ else { qw( groff nroff mandoc ) } } +@@ -108,6 +108,8 @@ sub _get_columns_from_manwidth { + + return 0 unless defined $ENV{MANWIDTH}; + ++ if ($ENV{MANWIDTH} eq 'tty') { return 0; } ++ + unless( $ENV{MANWIDTH} =~ m/\A\d+\z/ ) { + $self->warn( "Ignoring non-numeric MANWIDTH ($ENV{MANWIDTH})\n" ); + return 0; diff --git a/lang/perl5.22/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm b/lang/perl5.22/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm new file mode 100644 index 000000000000..fd401d4e3660 --- /dev/null +++ b/lang/perl5.22/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm @@ -0,0 +1,11 @@ +--- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm.orig 2017-04-04 13:18:08 UTC ++++ cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm +@@ -41,6 +41,8 @@ sub _get_columns_from_manwidth { + + return 0 unless defined $ENV{MANWIDTH}; + ++ if ($ENV{MANWIDTH} eq 'tty') { return 0; } ++ + unless( $ENV{MANWIDTH} =~ m/\A\d+\z/ ) { + $self->warn( "Ignoring non-numeric MANWIDTH ($ENV{MANWIDTH})\n" ); + return 0; diff --git a/lang/perl5.24/Makefile b/lang/perl5.24/Makefile index 2ab38cbfe16a..f7a957eeefdb 100644 --- a/lang/perl5.24/Makefile +++ b/lang/perl5.24/Makefile @@ -3,7 +3,7 @@ PORTNAME= perl DISTVERSION= ${PERL_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN/../../src/5.0 CPAN/../by-authors/id/S/SH/SHAY DIST_SUBDIR= perl diff --git a/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm b/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm index 7b13e4d0a034..5d414069d836 100644 --- a/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm +++ b/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm @@ -9,3 +9,12 @@ else { qw( groff nroff mandoc ) } } +@@ -108,6 +108,8 @@ sub _get_columns_from_manwidth { + + return 0 unless defined $ENV{MANWIDTH}; + ++ if ($ENV{MANWIDTH} eq 'tty') { return 0; } ++ + unless( $ENV{MANWIDTH} =~ m/\A\d+\z/ ) { + $self->warn( "Ignoring non-numeric MANWIDTH ($ENV{MANWIDTH})\n" ); + return 0; diff --git a/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm b/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm new file mode 100644 index 000000000000..fd401d4e3660 --- /dev/null +++ b/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm @@ -0,0 +1,11 @@ +--- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm.orig 2017-04-04 13:18:08 UTC ++++ cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm +@@ -41,6 +41,8 @@ sub _get_columns_from_manwidth { + + return 0 unless defined $ENV{MANWIDTH}; + ++ if ($ENV{MANWIDTH} eq 'tty') { return 0; } ++ + unless( $ENV{MANWIDTH} =~ m/\A\d+\z/ ) { + $self->warn( "Ignoring non-numeric MANWIDTH ($ENV{MANWIDTH})\n" ); + return 0; |