- Update to upstream version 0.5.65

PR:		191962
Submitted by:	jamie@dyslexicfish.net
Approved by:	mentors (implicit)

5 files changed, 144 insertions, 103 deletions

diff --git a/textproc/p5-xmltv/Makefile b/textproc/p5-xmltv/Makefile
index 0a0fdb88a77c..d935d25aa0c5 100644
--- a/textproc/p5-xmltv/Makefile
+++ b/textproc/p5-xmltv/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmltv
-PORTVERSION=	0.5.61
-PORTREVISION=	2
+PORTVERSION=	0.5.65
 CATEGORIES=	textproc perl5
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	p5-
@@ -43,7 +42,11 @@ XMLTV_DEPENDS=	\
 	p5-HTTP-Cache-Transparent>=0:${PORTSDIR}/www/p5-HTTP-Cache-Transparent \
 	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
 	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
+	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
+	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
+	p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
+	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
+
 BUILD_DEPENDS=	${XMLTV_DEPENDS}
 RUN_DEPENDS=	${XMLTV_DEPENDS}
 
diff --git a/textproc/p5-xmltv/distinfo b/textproc/p5-xmltv/distinfo
index e47ddd393872..8e92da3d26c0 100644
--- a/textproc/p5-xmltv/distinfo
+++ b/textproc/p5-xmltv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xmltv-0.5.61.tar.bz2) = aee8af3612e9f152b7b45ae78c532da7c263255fdafa5010897cebfa2ad4121e
-SIZE (xmltv-0.5.61.tar.bz2) = 884752
+SHA256 (xmltv-0.5.65.tar.bz2) = a3a37ca50b8a930a37a11ba977b26f8ec01d3391a9c9b74647b1d4a3a5c623b6
+SIZE (xmltv-0.5.65.tar.bz2) = 1133288
diff --git a/textproc/p5-xmltv/files/extra-noportdocs-patch-Makefile.PL b/textproc/p5-xmltv/files/extra-noportdocs-patch-Makefile.PL
index e35cc0898e6c..ff1ebdb8e6b1 100644
--- a/textproc/p5-xmltv/files/extra-noportdocs-patch-Makefile.PL
+++ b/textproc/p5-xmltv/files/extra-noportdocs-patch-Makefile.PL
@@ -1,6 +1,6 @@
---- Makefile.PL.orig	Sun Oct 24 22:33:25 2004
-+++ Makefile.PL	Sun Nov 28 12:15:52 2004
-@@ -98,7 +98,7 @@
+--- ./Makefile.PL.orig	2014-07-27 08:08:31.698966885 +0100
++++ ./Makefile.PL	2014-07-27 08:10:38.748963867 +0100
+@@ -103,7 +103,7 @@
  # because it is accessed by some code we add to MakeMaker.
  #
  our @docs;
@@ -9,15 +9,15 @@
  
  # Executables to be installed.
  my @exes
-@@ -385,10 +385,7 @@
+@@ -899,10 +899,7 @@
       { name => 'tv_check',
         blurb => 'Program to report exceptions and changes in a schedule',
         exes => [ 'choose/tv_check/tv_check' ],
 -       docs => [ qw(choose/tv_check/README.tv_check
--		    choose/tv_check/tv_check_doc.html
--		    choose/tv_check/tv_check_doc.jpg
--		   ) ],
+-                    choose/tv_check/tv_check_doc.html
+-                    choose/tv_check/tv_check_doc.jpg
+-                   ) ],
 +       docs => [],
         prereqs => { 'Tk' => 0,
- 		    'Tk::TableMatrix' => 0,
- 		  } },
+                     'Tk::TableMatrix' => 0,
+                   } },
diff --git a/textproc/p5-xmltv/files/patch-Makefile.PL b/textproc/p5-xmltv/files/patch-Makefile.PL
index 68bf0143138c..167d26608c5b 100644
--- a/textproc/p5-xmltv/files/patch-Makefile.PL
+++ b/textproc/p5-xmltv/files/patch-Makefile.PL
@@ -1,34 +1,34 @@
---- Makefile.PL.orig	2010-11-22 07:04:58.000000000 +0100
-+++ Makefile.PL	2011-03-03 14:50:27.000000000 +0100
-@@ -804,14 +804,14 @@
- 	# Guess a default value for {install} based on whether
- 	# prerequisites were found.
- 	#
--	$info->{install} = (not $info->{exclude}) && ($opt_yes || not $info->{missing});
-+	$info->{install} = 1;(not $info->{exclude}) && ($opt_yes || not $info->{missing});
+--- ./Makefile.PL.orig	2014-07-27 08:07:00.036965435 +0100
++++ ./Makefile.PL	2014-07-27 08:05:30.848965659 +0100
+@@ -1031,14 +1031,14 @@
+         # Guess a default value for {install} based on whether
+         # prerequisites were found.
+         #
+-        $info->{install} = (not $info->{exclude}) && ($opt_yes || not $info->{missing});
++        $info->{install} = 1;(not $info->{exclude}) && ($opt_yes || not $info->{missing});
  
- 	print STDERR ($s, ' ' x (1 + $width - length $s),
- 		      $info->{install} ? '[yes]' : '[no]',
- 		      "\n");
+         print STDERR ($s, ' ' x (1 + $width - length $s),
+                       $info->{install} ? '[yes]' : '[no]',
+                       "\n");
      }
      print STDERR "\n";
 -    if (not ask(0, 'Do you want to proceed with this configuration?', 1)) {
 +    if (1 or not ask(0, 'Do you want to proceed with this configuration?', 1)) {
- 	# Need to set {install} for each component by prompting.
- 	foreach my $info (@opt_components) {
- 	    my $missing = $info->{missing};
-@@ -840,8 +840,8 @@
- 		die;
- 	    }
- 	
--	    $info->{install} =
--	      ask(0, $msg, not $missing);
-+	    $info->{install} = 1;
-+	    #  ask(0, $msg, not $missing);
- 	}
+         # Need to set {install} for each component by prompting.
+         foreach my $info (@opt_components) {
+             my $missing = $info->{missing};
+@@ -1067,8 +1067,8 @@
+                 die;
+             }
+ 
+-            $info->{install} =
+-              ask(0, $msg, not $missing);
++            $info->{install} = 1;
++            #  ask(0, $msg, not $missing);
+         }
      }
  }
-@@ -1045,8 +1045,8 @@
+@@ -1272,8 +1272,8 @@
      }
  
      # Remove existing non-working 'uninstall' target.
diff --git a/textproc/p5-xmltv/pkg-plist b/textproc/p5-xmltv/pkg-plist
index bb0bf6d0e903..959962f36453 100644
--- a/textproc/p5-xmltv/pkg-plist
+++ b/textproc/p5-xmltv/pkg-plist
@@ -1,5 +1,7 @@
+bin/tv_augment_tz
 bin/tv_cat
 bin/tv_check
+bin/tv_count
 bin/tv_extractinfo_ar
 bin/tv_extractinfo_en
 bin/tv_find_grabbers
@@ -8,9 +10,8 @@ bin/tv_grab_ch_search
 bin/tv_grab_combiner
 bin/tv_grab_dk_dr
 bin/tv_grab_dtv_la
-bin/tv_grab_ee
 bin/tv_grab_es_laguiatv
-bin/tv_grab_es_miguiatv
+bin/tv_grab_eu_egon
 bin/tv_grab_eu_epgdata
 bin/tv_grab_fi
 bin/tv_grab_fi_sv
@@ -19,22 +20,26 @@ bin/tv_grab_fr_kazer
 bin/tv_grab_hr
 bin/tv_grab_huro
 bin/tv_grab_il
-bin/tv_grab_in
 bin/tv_grab_is
 bin/tv_grab_it
 bin/tv_grab_it_dvb
 bin/tv_grab_na_dd
-bin/tv_grab_na_icons
+bin/tv_grab_na_dtv
 bin/tv_grab_nl
 bin/tv_grab_no_gfeed
 bin/tv_grab_pt
 bin/tv_grab_pt_meo
 bin/tv_grab_se_swedb
+bin/tv_grab_se_tvzon
+bin/tv_grab_uk_atlas
 bin/tv_grab_uk_bleb
+bin/tv_grab_uk_guardian
 bin/tv_grab_uk_rt
+bin/tv_grab_uk_tvguide
 bin/tv_grab_za
 bin/tv_grep
 bin/tv_imdb
+bin/tv_merge
 bin/tv_remove_some_overlapping
 bin/tv_sort
 bin/tv_split
@@ -43,54 +48,9 @@ bin/tv_to_potatoe
 bin/tv_to_text
 bin/tv_validate_file
 bin/tv_validate_grabber
-man/man1/tv_cat.1.gz
-man/man1/tv_check.1.gz
-man/man1/tv_extractinfo_ar.1.gz
-man/man1/tv_extractinfo_en.1.gz
-man/man1/tv_find_grabbers.1.gz
-man/man1/tv_grab_ar.1.gz
-man/man1/tv_grab_ch_search.1.gz
-man/man1/tv_grab_combiner.1.gz
-man/man1/tv_grab_dk_dr.1.gz
-man/man1/tv_grab_dtv_la.1.gz
-man/man1/tv_grab_ee.1.gz
-man/man1/tv_grab_es_laguiatv.1.gz
-man/man1/tv_grab_es_miguiatv.1.gz
-man/man1/tv_grab_eu_epgdata.1.gz
-man/man1/tv_grab_fi.1.gz
-man/man1/tv_grab_fi_sv.1.gz
-man/man1/tv_grab_fr.1.gz
-man/man1/tv_grab_fr_kazer.1.gz
-man/man1/tv_grab_hr.1.gz
-man/man1/tv_grab_huro.1.gz
-man/man1/tv_grab_il.1.gz
-man/man1/tv_grab_in.1.gz
-man/man1/tv_grab_is.1.gz
-man/man1/tv_grab_it.1.gz
-man/man1/tv_grab_it_dvb.1.gz
-man/man1/tv_grab_na_dd.1.gz
-man/man1/tv_grab_na_icons.1.gz
-man/man1/tv_grab_nl.1.gz
-man/man1/tv_grab_no_gfeed.1.gz
-man/man1/tv_grab_pt.1.gz
-man/man1/tv_grab_pt_meo.1.gz
-man/man1/tv_grab_se_swedb.1.gz
-man/man1/tv_grab_uk_bleb.1.gz
-man/man1/tv_grab_uk_rt.1.gz
-man/man1/tv_grab_za.1.gz
-man/man1/tv_grep.1.gz
-man/man1/tv_imdb.1.gz
-man/man1/tv_remove_some_overlapping.1.gz
-man/man1/tv_sort.1.gz
-man/man1/tv_split.1.gz
-man/man1/tv_to_latex.1.gz
-man/man1/tv_to_potatoe.1.gz
-man/man1/tv_to_text.1.gz
-man/man1/tv_validate_file.1.gz
-man/man1/tv_validate_grabber.1.gz
 %%PERL5_MAN3%%/Configure.3.gz
 %%PERL5_MAN3%%/Configure::Writer.3.gz
-%%PERL5_MAN3%%/Lineup.3.gz
+%%PERL5_MAN3%%/Data::Recursive::Encode.3.gz
 %%PERL5_MAN3%%/Options.3.gz
 %%PERL5_MAN3%%/PreferredMethod.3.gz
 %%PERL5_MAN3%%/ValidateFile.3.gz
@@ -113,6 +73,7 @@ man/man1/tv_validate_grabber.1.gz
 %%SITE_PERL%%/XMLTV/Configure.pm
 %%SITE_PERL%%/XMLTV/Configure/Writer.pm
 %%SITE_PERL%%/XMLTV/DST.pm
+%%SITE_PERL%%/XMLTV/Data/Recursive/Encode.pm
 %%SITE_PERL%%/XMLTV/Date.pm
 %%SITE_PERL%%/XMLTV/Description.pm
 %%SITE_PERL%%/XMLTV/GUI.pm
@@ -121,7 +82,6 @@ man/man1/tv_validate_grabber.1.gz
 %%SITE_PERL%%/XMLTV/Grep.pm
 %%SITE_PERL%%/XMLTV/Gunzip.pm
 %%SITE_PERL%%/XMLTV/IMDB.pm
-%%SITE_PERL%%/XMLTV/Lineup.pm
 %%SITE_PERL%%/XMLTV/Memoize.pm
 %%SITE_PERL%%/XMLTV/Mode.pm
 %%SITE_PERL%%/XMLTV/Options.pm
@@ -138,6 +98,55 @@ man/man1/tv_validate_grabber.1.gz
 %%SITE_PERL%%/XMLTV/ValidateGrabber.pm
 %%SITE_PERL%%/XMLTV/Version.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/XMLTV/.packlist
+man/man1/tv_augment_tz.1.gz
+man/man1/tv_cat.1.gz
+man/man1/tv_check.1.gz
+man/man1/tv_count.1.gz
+man/man1/tv_extractinfo_ar.1.gz
+man/man1/tv_extractinfo_en.1.gz
+man/man1/tv_find_grabbers.1.gz
+man/man1/tv_grab_ar.1.gz
+man/man1/tv_grab_ch_search.1.gz
+man/man1/tv_grab_combiner.1.gz
+man/man1/tv_grab_dtv_la.1.gz
+man/man1/tv_grab_es_laguiatv.1.gz
+man/man1/tv_grab_eu_egon.1.gz
+man/man1/tv_grab_eu_epgdata.1.gz
+man/man1/tv_grab_fi.1.gz
+man/man1/tv_grab_fi_sv.1.gz
+man/man1/tv_grab_fr.1.gz
+man/man1/tv_grab_fr_kazer.1.gz
+man/man1/tv_grab_hr.1.gz
+man/man1/tv_grab_huro.1.gz
+man/man1/tv_grab_il.1.gz
+man/man1/tv_grab_is.1.gz
+man/man1/tv_grab_it.1.gz
+man/man1/tv_grab_it_dvb.1.gz
+man/man1/tv_grab_na_dd.1.gz
+man/man1/tv_grab_na_dtv.1.gz
+man/man1/tv_grab_nl.1.gz
+man/man1/tv_grab_no_gfeed.1.gz
+man/man1/tv_grab_pt.1.gz
+man/man1/tv_grab_pt_meo.1.gz
+man/man1/tv_grab_se_swedb.1.gz
+man/man1/tv_grab_se_tvzon.1.gz
+man/man1/tv_grab_uk_atlas.1.gz
+man/man1/tv_grab_uk_bleb.1.gz
+man/man1/tv_grab_uk_guardian.1.gz
+man/man1/tv_grab_uk_rt.1.gz
+man/man1/tv_grab_uk_tvguide.1.gz
+man/man1/tv_grab_za.1.gz
+man/man1/tv_grep.1.gz
+man/man1/tv_imdb.1.gz
+man/man1/tv_merge.1.gz
+man/man1/tv_remove_some_overlapping.1.gz
+man/man1/tv_sort.1.gz
+man/man1/tv_split.1.gz
+man/man1/tv_to_latex.1.gz
+man/man1/tv_to_potatoe.1.gz
+man/man1/tv_to_text.1.gz
+man/man1/tv_validate_file.1.gz
+man/man1/tv_validate_grabber.1.gz
 %%DATADIR%%/tv_grab_eu_epgdata/channel_ids
 %%DATADIR%%/tv_grab_huro/catmap.cz
 %%DATADIR%%/tv_grab_huro/catmap.hu
@@ -145,31 +154,60 @@ man/man1/tv_validate_grabber.1.gz
 %%DATADIR%%/tv_grab_huro/catmap.sk
 %%DATADIR%%/tv_grab_huro/jobmap
 %%DATADIR%%/tv_grab_it/channel_ids
+%%DATADIR%%/tv_grab_it_dvb/channel_ids
 %%DATADIR%%/tv_grab_it_dvb/sky_it.dict
 %%DATADIR%%/tv_grab_it_dvb/sky_it.themes
-%%DATADIR%%/tv_grab_it_dvb/channel_ids
+%%DATADIR%%/tv_grab_uk_atlas/cgi-bin/getatlas.pl
+%%DATADIR%%/tv_grab_uk_atlas/tv_grab_uk_atlas.map.channels.conf
+%%DATADIR%%/tv_grab_uk_atlas/tv_grab_uk_atlas.map.genres.conf
+%%DATADIR%%/tv_grab_uk_atlas/tv_grab_uk_atlas.pa.genres.conf
+%%DATADIR%%/tv_grab_uk_atlas/tv_grab_uk_atlas.user.map.conf
 %%DATADIR%%/tv_grab_uk_bleb/icon_urls
+%%DATADIR%%/tv_grab_uk_guardian/tv_grab_uk_guardian.map.conf
+%%DATADIR%%/tv_grab_uk_rt/channel_icons
 %%DATADIR%%/tv_grab_uk_rt/channel_ids
 %%DATADIR%%/tv_grab_uk_rt/channels_platforms
 %%DATADIR%%/tv_grab_uk_rt/lineups/freesat.map
+%%DATADIR%%/tv_grab_uk_rt/lineups/freesat.xml
+%%DATADIR%%/tv_grab_uk_rt/lineups/freesatfromsky.xml
+%%DATADIR%%/tv_grab_uk_rt/lineups/freesathd.xml
 %%DATADIR%%/tv_grab_uk_rt/lineups/freeview.map
+%%DATADIR%%/tv_grab_uk_rt/lineups/freeview.xml
+%%DATADIR%%/tv_grab_uk_rt/lineups/freeviewhd.xml
+%%DATADIR%%/tv_grab_uk_rt/lineups/lineups.xml
+%%DATADIR%%/tv_grab_uk_rt/lineups/saorview.map
+%%DATADIR%%/tv_grab_uk_rt/lineups/saorview.xml
+%%DATADIR%%/tv_grab_uk_rt/lineups/sky.xml
+%%DATADIR%%/tv_grab_uk_rt/lineups/skyhd.xml
+%%DATADIR%%/tv_grab_uk_rt/lineups/upcireland.xml
+%%DATADIR%%/tv_grab_uk_rt/lineups/upcirelandhd.xml
+%%DATADIR%%/tv_grab_uk_rt/lineups/virgin.xml
+%%DATADIR%%/tv_grab_uk_rt/lineups/virginhd.xml
+%%DATADIR%%/tv_grab_uk_rt/lineups/xmltv-lineups.xsl
 %%DATADIR%%/tv_grab_uk_rt/prog_titles_to_process
 %%DATADIR%%/tv_grab_uk_rt/regional_channels_by_postcode
 %%DATADIR%%/tv_grab_uk_rt/utf8_fixups
+%%DATADIR%%/tv_grab_uk_tvguide/tv_grab_uk_tvguide.map.conf
+%%DATADIR%%/xmltv-lineups.xsd
 %%DATADIR%%/xmltv.dtd
-%%DATADIR%%/xmltv-lineup.dtd
-www/cgi-bin/tv_pick.cgi
+%%CGIDIR%%/tv_pick.cgi
+@dirrm %%SITE_PERL%%/XMLTV/Ask
+@dirrm %%SITE_PERL%%/XMLTV/Configure
+@dirrm %%SITE_PERL%%/XMLTV/Data/Recursive
+@dirrm %%SITE_PERL%%/XMLTV/Data
+@dirrm %%SITE_PERL%%/XMLTV/ProgressBar
+@dirrm %%SITE_PERL%%/XMLTV
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XMLTV
+@dirrm %%DATADIR%%/tv_grab_eu_epgdata
+@dirrm %%DATADIR%%/tv_grab_huro
+@dirrm %%DATADIR%%/tv_grab_it
+@dirrm %%DATADIR%%/tv_grab_it_dvb
+@dirrm %%DATADIR%%/tv_grab_uk_atlas/cgi-bin
+@dirrm %%DATADIR%%/tv_grab_uk_atlas
+@dirrm %%DATADIR%%/tv_grab_uk_bleb
+@dirrm %%DATADIR%%/tv_grab_uk_guardian
 @dirrm %%DATADIR%%/tv_grab_uk_rt/lineups
 @dirrm %%DATADIR%%/tv_grab_uk_rt
-@dirrm %%DATADIR%%/tv_grab_uk_bleb
-@dirrm %%DATADIR%%/tv_grab_it_dvb
-@dirrm %%DATADIR%%/tv_grab_it
-@dirrm %%DATADIR%%/tv_grab_huro
-@dirrm %%DATADIR%%/tv_grab_eu_epgdata
+@dirrm %%DATADIR%%/tv_grab_uk_tvguide
 @dirrm %%DATADIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XMLTV
-@dirrm %%SITE_PERL%%/XMLTV/ProgressBar
-@dirrm %%SITE_PERL%%/XMLTV/Configure
-@dirrm %%SITE_PERL%%/XMLTV/Ask
-@dirrm %%SITE_PERL%%/XMLTV
-@dirrmtry www/cgi-bin
+@dirrmtry %%CGIDIR%%