5 files changed, 54 insertions, 39 deletions

diff --git a/textproc/p5-xmltv/Makefile b/textproc/p5-xmltv/Makefile
index a5c9df5fc56f..7af92089c536 100644
--- a/textproc/p5-xmltv/Makefile
+++ b/textproc/p5-xmltv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmltv
-PORTVERSION=	0.5.34
+PORTVERSION=	0.5.36
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xmltv
@@ -16,27 +16,26 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Set of programs to process TV (tvguide) listings in XML format
 
 BUILD_DEPENDS=	\
+	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
 	${SITE_PERL}/XML/Twig.pm:${PORTSDIR}/textproc/p5-XML-Twig \
 	${SITE_PERL}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer \
 	${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
 	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-	${SITE_PERL}/Memoize.pm:${PORTSDIR}/devel/p5-Memoize \
+	${SITE_PERL}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree \
 	${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
-	${SITE_PERL}/HTML/TableExtract.pm:${PORTSDIR}/www/p5-HTML-TableExtract \
-	${SITE_PERL}/HTML/Tree.pm:${PORTSDIR}/www/p5-HTML-Tree \
 	${SITE_PERL}/${PERL_ARCH}/Tk/TableMatrix.pm:${PORTSDIR}/x11-toolkits/p5-Tk-TableMatrix \
-	${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
-	${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
+	${SITE_PERL}/${PERL_ARCH}/Text/Kakasi.pm:${PORTSDIR}/japanese/p5-Text-Kakasi \
+	${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
+	${SITE_PERL}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite \
+	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
+	${SITE_PERL}/HTML/TableExtract.pm:${PORTSDIR}/www/p5-HTML-TableExtract \
+	${SITE_PERL}/HTML/LinkExtractor.pm:${PORTSDIR}/www/p5-HTML-LinkExtractor \
+	${SITE_PERL}/WWW/Mechanize.pm:${PORTSDIR}/www/p5-WWW-Mechanize \
 	${SITE_PERL}/Term/ProgressBar.pm:${PORTSDIR}/devel/p5-Term-ProgressBar \
-	${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
 	${SITE_PERL}/Lingua/Preferred.pm:${PORTSDIR}/textproc/p5-Lingua-Preferred \
-	${SITE_PERL}/Lingua/EN/Numbers/Ordinate.pm:${PORTSDIR}/textproc/p5-Lingua-EN-Numbers-Ordinate \
 	${SITE_PERL}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \
-	${SITE_PERL}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite \
-	${SITE_PERL}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree \
-	${SITE_PERL}/HTML/LinkExtractor.pm:${PORTSDIR}/www/p5-HTML-LinkExtractor \
-	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
-	${SITE_PERL}/WWW/Mechanize.pm:${PORTSDIR}/www/p5-WWW-Mechanize
+	${SITE_PERL}/Lingua/EN/Numbers/Ordinate.pm:${PORTSDIR}/textproc/p5-Lingua-EN-Numbers-Ordinate \
+	${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_BZIP2=	yes
@@ -45,6 +44,9 @@ PERL_CONFIGURE=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 
+.ifdef(NOPORTDOCS)
+EXTRA_PATCHES+=	${FILESDIR}/extra-noportdocs-patch-Makefile.PL
+.else
 PORTDOCS=	COPYING \
 		QuickStart \
 		README \
@@ -52,9 +54,6 @@ PORTDOCS=	COPYING \
 		README.win32 \
 		tv_check_doc.html \
 		tv_check_doc.jpg
-
-.ifdef(NOPORTDOCS)
-EXTRA_PATCHES+=	${FILESDIR}/extra-noportdocs-patch-Makefile.PL
 .endif
 
 .include <bsd.port.pre.mk>
@@ -63,15 +62,24 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-noportdocs-patch-Makefile.PL
 IGNORE=	"perl 5.6 or higher is required to build this port"
 .endif
 
+.if ${PERL_LEVEL} < 500800
+BUILD_DEPENDS+=	\
+	${SITE_PERL}/Memoize.pm:${PORTSDIR}/devel/p5-Memoize \
+	${SITE_PERL}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+RUN_DEPENDS+=	\
+	${SITE_PERL}/Memoize.pm:${PORTSDIR}/devel/p5-Memoize \
+	${SITE_PERL}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+.endif
+
 MAN1=	tv_cat.1 tv_check.1 tv_extractinfo_en.1 \
 	tv_grab_de_tvtoday.1 tv_grab_dk.1 tv_grab_es.1 \
 	tv_grab_es_digital.1 tv_grab_fi.1 tv_grab_fr.1 tv_grab_huro.1 \
 	tv_grab_it.1 tv_grab_jp.1 tv_grab_na_dd.1 tv_grab_na_icons.1 \
 	tv_grab_nl.1 tv_grab_nl_wolf.1 tv_grab_no.1 \
-	tv_grab_pt.1 tv_grab_se.1 tv_grab_uk_rt.1 tv_grep.1 \
+	tv_grab_se.1 tv_grab_uk_bleb.1 tv_grab_uk_rt.1 tv_grep.1 \
 	tv_imdb.1 tv_remove_some_overlapping.1 tv_sort.1 tv_split.1 \
 	tv_to_latex.1 tv_to_text.1
-MAN3=	XMLTV.3 XMLTV::Date.3 XMLTV::Grab_XML.3 XMLTV::Gunzip.3 \
+MAN3=	GUI.3 XMLTV.3 XMLTV::Date.3 XMLTV::Grab_XML.3 XMLTV::Gunzip.3 \
 	XMLTV::Summarize.3
 
 # idea taken from devel/cvsweb port
@@ -101,8 +109,5 @@ post-patch:
 post-install:
 	@${MKDIR} ${PREFIX}/${CGIDIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/choose/tv_pick/tv_pick_cgi ${PREFIX}/${CGIDIR}/tv_pick.cgi
-.if defined(PACKAGE_BUILDING)
-	@${ECHO_CMD} "@unexec ${RMDIR} -p %D/${CGIDIR} 2>/dev/null || true" >> ${TMPPLIST}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/p5-xmltv/distinfo b/textproc/p5-xmltv/distinfo
index 53c4e5b92adb..894013f225cd 100644
--- a/textproc/p5-xmltv/distinfo
+++ b/textproc/p5-xmltv/distinfo
@@ -1,2 +1,2 @@
-MD5 (xmltv-0.5.34.tar.bz2) = 1bd213630e1916adf9cf0cdfd9bef49e
-SIZE (xmltv-0.5.34.tar.bz2) = 397979
+MD5 (xmltv-0.5.36.tar.bz2) = cc1dde5ff86bbdb7710b2b0962115e87
+SIZE (xmltv-0.5.36.tar.bz2) = 409025
diff --git a/textproc/p5-xmltv/files/extra-noportdocs-patch-Makefile.PL b/textproc/p5-xmltv/files/extra-noportdocs-patch-Makefile.PL
index 2c72a6726a18..e35cc0898e6c 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	Tue Jul 20 22:34:47 2004
-+++ Makefile.PL	Tue Jul 20 22:34:58 2004
-@@ -88,7 +88,7 @@
+--- Makefile.PL.orig	Sun Oct 24 22:33:25 2004
++++ Makefile.PL	Sun Nov 28 12:15:52 2004
+@@ -98,7 +98,7 @@
  # because it is accessed by some code we add to MakeMaker.
  #
  our @docs;
@@ -9,7 +9,7 @@
  
  # Executables to be installed.
  my @exes
-@@ -375,10 +375,7 @@
+@@ -385,10 +385,7 @@
       { name => 'tv_check',
         blurb => 'Program to report exceptions and changes in a schedule',
         exes => [ 'choose/tv_check/tv_check' ],
diff --git a/textproc/p5-xmltv/files/patch-Makefile.PL b/textproc/p5-xmltv/files/patch-Makefile.PL
index 040c10ba1d73..0f1018a64882 100644
--- a/textproc/p5-xmltv/files/patch-Makefile.PL
+++ b/textproc/p5-xmltv/files/patch-Makefile.PL
@@ -1,6 +1,6 @@
---- Makefile.PL.orig	Tue Jul 20 22:32:16 2004
-+++ Makefile.PL	Tue Jul 20 22:34:25 2004
-@@ -456,14 +456,14 @@
+--- Makefile.PL.orig	Mon Oct 25 02:33:47 2004
++++ Makefile.PL	Fri Nov 26 15:29:30 2004
+@@ -466,14 +466,14 @@
  	# Guess a default value for {install} based on whether
  	# prerequisites were found.
  	#
@@ -12,19 +12,19 @@
  		      "\n");
      }
      print STDERR "\n";
--    if (not ask('Do you want to proceed with this configuration?', 1)) {
-+    if (1 or not ask('Do you want to proceed with this configuration?', 1)) {
+-    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};
-@@ -492,8 +492,8 @@
+@@ -502,8 +502,8 @@
  		die;
  	    }
  	
 -	    $info->{install} =
--	      ask($msg, not $missing);
+-	      ask(0, $msg, not $missing);
 +	    $info->{install} = 1;
-+	    #  ask($msg, not $missing);
++	    #  ask(0, $msg, not $missing);
  	}
      }
  }
diff --git a/textproc/p5-xmltv/pkg-plist b/textproc/p5-xmltv/pkg-plist
index 2711e792fab9..8e4c4bab1733 100644
--- a/textproc/p5-xmltv/pkg-plist
+++ b/textproc/p5-xmltv/pkg-plist
@@ -15,8 +15,8 @@ bin/tv_grab_na_icons
 bin/tv_grab_nl
 bin/tv_grab_nl_wolf
 bin/tv_grab_no
-bin/tv_grab_pt
 bin/tv_grab_se
+bin/tv_grab_uk_bleb
 bin/tv_grab_uk_rt
 bin/tv_grep
 bin/tv_imdb
@@ -27,12 +27,13 @@ bin/tv_to_latex
 bin/tv_to_text
 %%SITE_PERL%%/XMLTV.pm
 %%SITE_PERL%%/XMLTV/Ask.pm
-%%SITE_PERL%%/XMLTV/AskTerm.pm
-%%SITE_PERL%%/XMLTV/AskTk.pm
+%%SITE_PERL%%/XMLTV/Ask/Term.pm
+%%SITE_PERL%%/XMLTV/Ask/Tk.pm
 %%SITE_PERL%%/XMLTV/Clumps.pm
 %%SITE_PERL%%/XMLTV/Config_file.pm
 %%SITE_PERL%%/XMLTV/DST.pm
 %%SITE_PERL%%/XMLTV/Date.pm
+%%SITE_PERL%%/XMLTV/GUI.pm
 %%SITE_PERL%%/XMLTV/Get_nice.pm
 %%SITE_PERL%%/XMLTV/Grab_XML.pm
 %%SITE_PERL%%/XMLTV/Grep.pm
@@ -40,6 +41,10 @@ bin/tv_to_text
 %%SITE_PERL%%/XMLTV/IMDB.pm
 %%SITE_PERL%%/XMLTV/Memoize.pm
 %%SITE_PERL%%/XMLTV/Mode.pm
+%%SITE_PERL%%/XMLTV/ProgressBar.pm
+%%SITE_PERL%%/XMLTV/ProgressBar/None.pm
+%%SITE_PERL%%/XMLTV/ProgressBar/Term.pm
+%%SITE_PERL%%/XMLTV/ProgressBar/Tk.pm
 %%SITE_PERL%%/XMLTV/Summarize.pm
 %%SITE_PERL%%/XMLTV/TZ.pm
 %%SITE_PERL%%/XMLTV/Usage.pm
@@ -48,13 +53,18 @@ bin/tv_to_text
 %%DATADIR%%/tv_grab_de_tvtoday/channel_ids
 %%DATADIR%%/tv_grab_it/channel_ids
 %%DATADIR%%/tv_grab_nl/channels
+%%DATADIR%%/tv_grab_uk_bleb/icon_urls
 %%DATADIR%%/tv_grab_uk_rt/channel_ids
 %%CGIDIR%%/tv_pick.cgi
-@dirrm %%CGIDIR%%
 @dirrm %%DATADIR%%/tv_grab_uk_rt
+@dirrm %%DATADIR%%/tv_grab_uk_bleb
 @dirrm %%DATADIR%%/tv_grab_nl
 @dirrm %%DATADIR%%/tv_grab_it
 @dirrm %%DATADIR%%/tv_grab_de_tvtoday
 @dirrm %%DATADIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XMLTV
+@dirrm %%SITE_PERL%%/XMLTV/ProgressBar
+@dirrm %%SITE_PERL%%/XMLTV/Ask
 @dirrm %%SITE_PERL%%/XMLTV
+@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
+@unexec rmdir %D/%%CGIDIR%% 2>/dev/null || true