diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2019-03-13 00:56:54 +0800 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2019-03-13 00:56:54 +0800 |
| commit | 8f9668e493ca5b5044769e6be5eb9412f4234af1 (patch) | |
| tree | 05bf8c7d1ba638e306f9fbb0c7f442ff438dbc23 /lang | |
| parent | 250cdde2534ac865b9ae12add1583c0616d6cdb1 (diff) | |
| download | freebsd-ports-gnome-8f9668e493ca5b5044769e6be5eb9412f4234af1.tar.gz freebsd-ports-gnome-8f9668e493ca5b5044769e6be5eb9412f4234af1.tar.zst freebsd-ports-gnome-8f9668e493ca5b5044769e6be5eb9412f4234af1.zip | |
Put back a default non dumb pod formatter, and fix a probable bug in
the mandoc formatter.
PR: 236092 [1]
Reported by: Andrew Daugherity
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/perl5-devel/Makefile | 2 | ||||
| -rw-r--r-- | lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm | 16 | ||||
| -rw-r--r-- | lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm | 15 |
3 files changed, 31 insertions, 2 deletions
diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile index b01755f91eac..92dbe7cf8b75 100644 --- a/lang/perl5-devel/Makefile +++ b/lang/perl5-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= perl DISTVERSIONPREFIX= v DISTVERSION= ${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//} DISTVERSIONSUFFIX= ${GH_TAGNAME:C/.*-g/-g/} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= lang devel perl5 # XXX Leave only CPAN. MASTER_SITES= LOCAL/mat/perl GH 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..8a9479cc7511 --- /dev/null +++ b/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm @@ -0,0 +1,16 @@ +Put back some non dumb outputter by default + +--- cpan/Pod-Perldoc/lib/Pod/Perldoc.pm.orig 2019-03-12 16:47:18 UTC ++++ cpan/Pod-Perldoc/lib/Pod/Perldoc.pm +@@ -486,6 +486,11 @@ sub init_formatter_class_list { + + $self->opt_M_with('Pod::Perldoc::ToPod'); # the always-there fallthru + $self->opt_o_with('text'); ++ $self->opt_o_with('man') ++ unless $self->is_mswin32 || $self->is_dos || $self->is_amigaos ++ || !($ENV{TERM} && ( ++ ($ENV{TERM} || '') !~ /dumb|emacs|none|unknown/i ++ )); + + return; + } 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 index cf800afbf959..d807041754d4 100644 --- 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 @@ -1,4 +1,7 @@ ---- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm.orig 2017-04-03 07:28:44 UTC +- Handle MANWIDTH=tty +- Reset $? before opening mandoc so that the outputter works. + +--- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm.orig 2019-03-11 04:03:26 UTC +++ cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm @@ -108,6 +108,8 @@ sub _get_columns_from_manwidth { @@ -9,3 +12,13 @@ unless( $ENV{MANWIDTH} =~ m/\A\d+\z/ ) { $self->warn( "Ignoring non-numeric MANWIDTH ($ENV{MANWIDTH})\n" ); return 0; +@@ -309,6 +311,9 @@ sub _filter_through_nroff { + require Symbol; + require IPC::Open3; + require IO::Handle; ++ ++ # Reset this??? ++ $?=0; + + my $pid = IPC::Open3::open3( + my $writer, |