Date: Tue, 4 Apr 2017 14:06:51 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437735 - in head: lang/perl5-devel lang/perl5-devel/files lang/perl5.20 lang/perl5.20/files lang/perl5.22 lang/perl5.22/files lang/perl5.24 lang/perl5.24/files textproc/p5-Pod-Perldoc ... Message-ID: <201704041406.v34E6pmF006170@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Apr 4 14:06:51 2017 New Revision: 437735 URL: https://svnweb.freebsd.org/changeset/ports/437735 Log: 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 Added: head/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm (contents, props changed) head/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm (contents, props changed) head/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm (contents, props changed) head/lang/perl5.22/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm (contents, props changed) head/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm (contents, props changed) head/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc_ToTerm.pm (contents, props changed) Modified: head/lang/perl5-devel/Makefile (contents, props changed) head/lang/perl5.20/Makefile (contents, props changed) head/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm (contents, props changed) head/lang/perl5.22/Makefile (contents, props changed) head/lang/perl5.22/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm (contents, props changed) head/lang/perl5.24/Makefile (contents, props changed) head/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm (contents, props changed) head/textproc/p5-Pod-Perldoc/Makefile (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-devel/Makefile Tue Apr 4 14:06:41 2017 (r437734) +++ head/lang/perl5-devel/Makefile Tue Apr 4 14:06:51 2017 (r437735) @@ -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]*$//} 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 Tue Apr 4 14:06:51 2017 (r437735) @@ -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; Added: head/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.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_ToTerm.pm Tue Apr 4 14:06:51 2017 (r437735) @@ -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; Modified: head/lang/perl5.20/Makefile ============================================================================== --- head/lang/perl5.20/Makefile Tue Apr 4 14:06:41 2017 (r437734) +++ head/lang/perl5.20/Makefile Tue Apr 4 14:06:51 2017 (r437735) @@ -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 Modified: head/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm ============================================================================== --- head/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm Tue Apr 4 14:06:41 2017 (r437734) +++ head/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm Tue Apr 4 14:06:51 2017 (r437735) @@ -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; Added: head/lang/perl5.20/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.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_ToTerm.pm Tue Apr 4 14:06:51 2017 (r437735) @@ -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; Modified: head/lang/perl5.22/Makefile ============================================================================== --- head/lang/perl5.22/Makefile Tue Apr 4 14:06:41 2017 (r437734) +++ head/lang/perl5.22/Makefile Tue Apr 4 14:06:51 2017 (r437735) @@ -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 Modified: head/lang/perl5.22/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm ============================================================================== --- head/lang/perl5.22/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm Tue Apr 4 14:06:41 2017 (r437734) +++ head/lang/perl5.22/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm Tue Apr 4 14:06:51 2017 (r437735) @@ -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; Added: head/lang/perl5.22/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/perl5.22/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm Tue Apr 4 14:06:51 2017 (r437735) @@ -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; Modified: head/lang/perl5.24/Makefile ============================================================================== --- head/lang/perl5.24/Makefile Tue Apr 4 14:06:41 2017 (r437734) +++ head/lang/perl5.24/Makefile Tue Apr 4 14:06:51 2017 (r437735) @@ -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 Modified: head/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm ============================================================================== --- head/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm Tue Apr 4 14:06:41 2017 (r437734) +++ head/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm Tue Apr 4 14:06:51 2017 (r437735) @@ -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; Added: head/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/perl5.24/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToTerm.pm Tue Apr 4 14:06:51 2017 (r437735) @@ -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; Modified: head/textproc/p5-Pod-Perldoc/Makefile ============================================================================== --- head/textproc/p5-Pod-Perldoc/Makefile Tue Apr 4 14:06:41 2017 (r437734) +++ head/textproc/p5-Pod-Perldoc/Makefile Tue Apr 4 14:06:51 2017 (r437735) @@ -3,7 +3,7 @@ PORTNAME= Pod-Perldoc PORTVERSION= 3.25 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- Modified: head/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc_ToMan.pm ============================================================================== --- head/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc_ToMan.pm Tue Apr 4 14:06:41 2017 (r437734) +++ head/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc_ToMan.pm Tue Apr 4 14:06:51 2017 (r437735) @@ -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; Added: head/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc_ToTerm.pm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/p5-Pod-Perldoc/files/patch-lib_Pod_Perldoc_ToTerm.pm Tue Apr 4 14:06:51 2017 (r437735) @@ -0,0 +1,11 @@ +--- lib/Pod/Perldoc/ToTerm.pm.orig 2015-02-12 03:08:32 UTC ++++ 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704041406.v34E6pmF006170>