Fix build with Perl 5.26.0

5 files changed, 60 insertions, 9 deletions

diff --git a/multimedia/p5-xmltv/distinfo b/multimedia/p5-xmltv/distinfo
index 0cedbcca75a..a276c808cdc 100644
--- a/multimedia/p5-xmltv/distinfo
+++ b/multimedia/p5-xmltv/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.11 2015/11/03 23:54:31 agc Exp $
+$NetBSD: distinfo,v 1.12 2017/06/09 16:51:00 ryoon Exp $
 
 SHA1 (xmltv-0.5.56.tar.bz2) = 51bc2b37c00bc1bcab767773d42abf26c9071677
 RMD160 (xmltv-0.5.56.tar.bz2) = 067c3cd231659fb99518947b9e46fca5fcae0c8e
 SHA512 (xmltv-0.5.56.tar.bz2) = ae43d8348b0658485330a6eae4f69278278ba95185c1bc2b3ef1ab18380b8b8c6aabb583fff23601d92a073b65af64a33f37276b83794f5ff5d8ccca79a4f7de
 Size (xmltv-0.5.56.tar.bz2) = 716236 bytes
-SHA1 (patch-aa) = 35d4bc04eb9cf3909e875e94196fcbb340c34b43
+SHA1 (patch-aa) = a1e1fb2c990c980dc9429cf3cd71f7c25cf190ee
+SHA1 (patch-filter_tv__grep.PL) = fc0854c72507309425bda0366607007dd12aed40
+SHA1 (patch-grab_it_tv__grab__it.PL) = af1c588ceb394002f3e128a23a60e14611729a8d
+SHA1 (patch-lib_XMLTV.pm.PL) = 2ad4dbe0536c0889a84d09484de33ea9a235c7f9
diff --git a/multimedia/p5-xmltv/patches/patch-aa b/multimedia/p5-xmltv/patches/patch-aa
index 008e0451409..4d72e97a554 100644
--- a/multimedia/p5-xmltv/patches/patch-aa
+++ b/multimedia/p5-xmltv/patches/patch-aa
@@ -1,13 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2007/02/27 13:28:05 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2017/06/09 16:51:00 ryoon Exp $
 
---- Makefile.PL.orig	2006-12-02 17:11:25.000000000 +0000
+* Fix build with Perl 5.26.0
+
+--- Makefile.PL.orig	2009-08-10 05:22:03.000000000 +0000
 +++ Makefile.PL
-@@ -627,7 +627,7 @@ END
- 		      "\n");
-     }
+@@ -3,2 +3,4 @@
+ 
++use FindBin;
++use lib $FindBin::Bin;
+ use ExtUtils::MakeMaker;
+@@ -750,3 +752,3 @@ END
      print STDERR "\n";
 -    if (not ask(0, 'Do you want to proceed with this configuration?', 1)) {
 +    if (1 == 0) {
  	# Need to set {install} for each component by prompting.
- 	foreach my $info (@opt_components) {
- 	    my $missing = $info->{missing};
diff --git a/multimedia/p5-xmltv/patches/patch-filter_tv__grep.PL b/multimedia/p5-xmltv/patches/patch-filter_tv__grep.PL
new file mode 100644
index 00000000000..e8bae2ca978
--- /dev/null
+++ b/multimedia/p5-xmltv/patches/patch-filter_tv__grep.PL
@@ -0,0 +1,15 @@
+$NetBSD: patch-filter_tv__grep.PL,v 1.1 2017/06/09 16:51:00 ryoon Exp $
+
+* Fix build with Perl 5.26.0
+
+--- filter/tv_grep.PL.orig	2006-06-03 19:33:46.000000000 +0000
++++ filter/tv_grep.PL
+@@ -12,7 +12,7 @@
+ 
+ use IO::File;
+ use XMLTV;
+-require 'filter/Grep.pm';
++require './filter/Grep.pm';
+ 
+ my $out = shift @ARGV; die "no output file given" if not defined $out;
+ my $in = 'filter/tv_grep.in';
diff --git a/multimedia/p5-xmltv/patches/patch-grab_it_tv__grab__it.PL b/multimedia/p5-xmltv/patches/patch-grab_it_tv__grab__it.PL
new file mode 100644
index 00000000000..b1c92401079
--- /dev/null
+++ b/multimedia/p5-xmltv/patches/patch-grab_it_tv__grab__it.PL
@@ -0,0 +1,15 @@
+$NetBSD: patch-grab_it_tv__grab__it.PL,v 1.1 2017/06/09 16:51:00 ryoon Exp $
+
+* Fix build with Perl 5.26.0
+
+--- grab/it/tv_grab_it.PL.orig	2009-05-19 21:03:05.000000000 +0000
++++ grab/it/tv_grab_it.PL
+@@ -357,7 +357,7 @@ close IN_FH or die "cannot close $in: $!
+ 
+ # stuff for setting share dir
+ die "usage: $_ output_file share_dir" if @ARGV != 2;
+-require 'lib/set_share_dir.pl';
++require './lib/set_share_dir.pl';
+ #warn "faccio $ARGV[0] $ARGV[1]\n";
+ #set_share_dir('grab/it/tv_grab_it.in2', $ARGV[0], $ARGV[1]);
+ copy( 'grab/it/tv_grab_it.in2', $ARGV[0] );
diff --git a/multimedia/p5-xmltv/patches/patch-lib_XMLTV.pm.PL b/multimedia/p5-xmltv/patches/patch-lib_XMLTV.pm.PL
new file mode 100644
index 00000000000..46f89f55333
--- /dev/null
+++ b/multimedia/p5-xmltv/patches/patch-lib_XMLTV.pm.PL
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_XMLTV.pm.PL,v 1.1 2017/06/09 16:51:00 ryoon Exp $
+
+* Fix build with Perl 5.26.0
+
+--- lib/XMLTV.pm.PL.orig	2006-06-03 19:26:34.000000000 +0000
++++ lib/XMLTV.pm.PL
+@@ -8,7 +8,7 @@ use strict;
+ sub print_list( $$ );
+ 
+ my $out = shift @ARGV; die "no output file given" if not defined $out;
+-my $in = 'lib/XMLTV.pm.in';
++my $in = './lib/XMLTV.pm.in';
+ require $in;
+ open(IN_FH, $in) or die "cannot read $in: $!";
+ die if not @XMLTV::Channel_Handlers; die if not @XMLTV::Programme_Handlers;