Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 12 Mar 2019 16:56:54 +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: r495471 - in head/lang/perl5-devel: . files
Message-ID:  <201903121656.x2CGusWF054750@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mat
Date: Tue Mar 12 16:56:54 2019
New Revision: 495471
URL: https://svnweb.freebsd.org/changeset/ports/495471

Log:
  Put back a default non dumb pod formatter, and fix a probable bug in
  the mandoc formatter.
  
  PR:		236092 [1]
  Reported by:	Andrew Daugherity

Added:
  head/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc.pm   (contents, props changed)
Modified:
  head/lang/perl5-devel/Makefile   (contents, props changed)
  head/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm   (contents, props changed)

Modified: head/lang/perl5-devel/Makefile
==============================================================================
--- head/lang/perl5-devel/Makefile	Tue Mar 12 16:53:44 2019	(r495470)
+++ head/lang/perl5-devel/Makefile	Tue Mar 12 16:56:54 2019	(r495471)
@@ -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

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	Tue Mar 12 16:56:54 2019	(r495471)
@@ -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;
+ }

Modified: head/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm
==============================================================================
--- head/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm	Tue Mar 12 16:53:44 2019	(r495470)
+++ head/lang/perl5-devel/files/patch-cpan_Pod-Perldoc_lib_Pod_Perldoc_ToMan.pm	Tue Mar 12 16:56:54 2019	(r495471)
@@ -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,

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903121656.x2CGusWF054750>