3 files changed, 74 insertions, 27 deletions

diff --git a/textproc/p5-xmltv/Makefile b/textproc/p5-xmltv/Makefile
index c749b0020705..c6bd26149b49 100644
--- a/textproc/p5-xmltv/Makefile
+++ b/textproc/p5-xmltv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmltv
-PORTVERSION=	0.5.8
+PORTVERSION=	0.5.17
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xmltv
@@ -16,22 +16,22 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Set of programs to process TV (tvguide) listings in XML format
 
 BUILD_DEPENDS= \
-	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
-	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
-	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Twig.pm:${PORTSDIR}/textproc/p5-XML-Twig \
-	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer \
-	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
-	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
-	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/TableExtract.pm:${PORTSDIR}/www/p5-HTML-TableExtract \
-	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Tree.pm:${PORTSDIR}/www/p5-HTML-Tree \
-	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk/TableMatrix.pm:${PORTSDIR}/x11-toolkits/p5-Tk-TableMatrix
-BUILD_DEPENDS+=	 \
-	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Lingua/Preferred.pm:${PORTSDIR}/textproc/p5-Lingua-Preferred \
-	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Memoize.pm:${PORTSDIR}/devel/p5-Memoize \
-	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
-	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Lingua/EN/Numbers/Ordinate.pm:${PORTSDIR}/textproc/p5-Lingua-EN-Numbers-Ordinate \
-	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/CharName.pm:${PORTSDIR}/converters/p5-Unicode-String
+	${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}/${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}/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
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 IS_INTERACTIVE=	yes
@@ -40,15 +40,25 @@ USE_REINPLACE=	yes
 PERL_CONFIGURE=	yes
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} <= 500600
+IGNORE=	"perl 5.6 or higher is required to build this port"
+.endif
+
+.if ${OSVERSION} >= 500000
+MAN1PREFIX=	${PREFIX}/share
+.else
 # override bsd.port.mk setting for perl ports
 MAN3PREFIX=	${MANPREFIX}
+.endif
 
-MAN1=	tv_cat.1 tv_extractinfo_en.1 tv_grab_de.1 tv_grab_na.1 \
-	tv_grab_sn.1 tv_grab_uk.1 tv_grab_uk_rt.1 tv_grep.1 tv_sort.1 \
-	tv_grab_fi.1 tv_grab_nz.1 tv_split.1 \
-	tv_check.1 tv_to_text.1 \
-	tv_to_latex.1
-MAN3=	Summarize.3 XMLTV.3
+MAN1=	tv_cat.1 tv_check.1 tv_extractinfo_en.1 tv_grab_de.1 tv_grab_dk.1 \
+	tv_grab_es.1 tv_grab_fi.1 tv_grab_hu.1 tv_grab_it.1 tv_grab_na.1 \
+	tv_grab_nl.1 tv_grab_nl_wolf.1 tv_grab_nz.1 tv_grab_sn.1 tv_grab_uk.1 \
+	tv_grab_uk_rt.1 tv_grep.1 tv_imdb.1 tv_sort.1 tv_split.1 tv_to_latex.1 \
+	tv_to_text.1
+MAN3=	XMLTV.3 XMLTV::Grab_XML.3 XMLTV::Gunzip.3 XMLTV::Summarize.3
 
 # idea taken from devel/cvsweb port
 # Specify these directories in relative paths to ${PREFIX}.
@@ -84,7 +94,8 @@ 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}
+	@${ECHO_CMD} "@unexec ${RMDIR} -p %D/${CGIDIR} 2>/dev/null || true" >> ${TMPPLIST}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
+
diff --git a/textproc/p5-xmltv/distinfo b/textproc/p5-xmltv/distinfo
index 91b89f9063b4..6a29597f9481 100644
--- a/textproc/p5-xmltv/distinfo
+++ b/textproc/p5-xmltv/distinfo
@@ -1 +1 @@
-MD5 (xmltv-0.5.8.tar.bz2) = d8a19e7b27bfc1a64674d02b7f3318cf
+MD5 (xmltv-0.5.17.tar.bz2) = f4274e63de47f2f52bc98494ff5b2196
diff --git a/textproc/p5-xmltv/pkg-plist b/textproc/p5-xmltv/pkg-plist
index 7e2975dbe690..8823dd72a2f5 100644
--- a/textproc/p5-xmltv/pkg-plist
+++ b/textproc/p5-xmltv/pkg-plist
@@ -3,13 +3,20 @@ bin/tv_cat
 bin/tv_check
 bin/tv_extractinfo_en
 bin/tv_grab_de
+bin/tv_grab_dk
+bin/tv_grab_es
 bin/tv_grab_fi
+bin/tv_grab_hu
+bin/tv_grab_it
 bin/tv_grab_na
+bin/tv_grab_nl
+bin/tv_grab_nl_wolf
 bin/tv_grab_nz
 bin/tv_grab_sn
 bin/tv_grab_uk
 bin/tv_grab_uk_rt
 bin/tv_grep
+bin/tv_imdb
 bin/tv_sort
 bin/tv_split
 bin/tv_to_latex
@@ -18,11 +25,19 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XMLTV/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/XMLTV.pm
 lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Ask.pm
 lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Clumps.pm
+lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Config_file.pm
+lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Europe_TZ.pm
+lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Get_nice.pm
+lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Grab_XML.pm
+lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Grep.pm
+lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Gunzip.pm
+lib/perl5/site_perl/%%PERL_VER%%/XMLTV/IMDB.pm
 lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Memoize.pm
+lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Mode.pm
 lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Summarize.pm
 lib/perl5/site_perl/%%PERL_VER%%/XMLTV/TZ.pm
-lib/perl5/site_perl/%%PERL_VER%%/XMLTV/UK_TZ.pm
 lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Usage.pm
+lib/perl5/site_perl/%%PERL_VER%%/XMLTV/Version.pm
 lib/perl5/site_perl/%%PERL_VER%%/XMLTV/ZapListings.pm
 share/doc/xmltv-%%VERSION%%/COPYING
 share/doc/xmltv-%%VERSION%%/QuickStart
@@ -31,7 +46,22 @@ share/doc/xmltv-%%VERSION%%/README.tv_check
 share/doc/xmltv-%%VERSION%%/README.win32
 share/doc/xmltv-%%VERSION%%/tv_check_doc.html
 share/doc/xmltv-%%VERSION%%/tv_check_doc.jpg
+share/xmltv/tv_grab_it/dud_channels
+share/xmltv/tv_grab_nz/episode_names
 share/xmltv/tv_grab_uk/channel_ids
+share/xmltv/tv_grab_uk/channel_pkgs/Freeview
+share/xmltv/tv_grab_uk/channel_pkgs/NTL/analogue
+share/xmltv/tv_grab_uk/channel_pkgs/NTL/digital/Base
+share/xmltv/tv_grab_uk/channel_pkgs/NTL/digital/Disney
+share/xmltv/tv_grab_uk/channel_pkgs/NTL/digital/Family
+share/xmltv/tv_grab_uk/channel_pkgs/NTL/digital/Sports
+share/xmltv/tv_grab_uk/channel_pkgs/NTL/digital/movies
+share/xmltv/tv_grab_uk/channel_pkgs/Sky/Family
+share/xmltv/tv_grab_uk/channel_pkgs/Sky/Movies_World
+share/xmltv/tv_grab_uk/channel_pkgs/Sky/Sports
+share/xmltv/tv_grab_uk/channel_pkgs/Sky/Value
+share/xmltv/tv_grab_uk/channel_pkgs/Telewest/Essential
+share/xmltv/tv_grab_uk/channel_pkgs/Telewest/Supreme
 share/xmltv/tv_grab_uk/channel_pkgs/adult
 share/xmltv/tv_grab_uk/channel_pkgs/arts
 share/xmltv/tv_grab_uk/channel_pkgs/asia
@@ -60,8 +90,14 @@ share/xmltv/tv_grab_uk/channel_pkgs/travel
 share/xmltv/tv_grab_uk/channel_pkgs/wales
 share/xmltv/tv_grab_uk_rt/channel_ids
 @dirrm share/xmltv/tv_grab_uk_rt
+@dirrm share/xmltv/tv_grab_uk/channel_pkgs/Telewest
+@dirrm share/xmltv/tv_grab_uk/channel_pkgs/Sky
+@dirrm share/xmltv/tv_grab_uk/channel_pkgs/NTL/digital
+@dirrm share/xmltv/tv_grab_uk/channel_pkgs/NTL
 @dirrm share/xmltv/tv_grab_uk/channel_pkgs
 @dirrm share/xmltv/tv_grab_uk
+@dirrm share/xmltv/tv_grab_nz
+@dirrm share/xmltv/tv_grab_it
 @dirrm share/xmltv
 @dirrm share/doc/xmltv-%%VERSION%%
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/XMLTV