Update to 0.5.21 with large amounts of bugfixes and updated channel

information.  See ChangeLog for full details.
PR:		ports/58738
Submitted by:	Lars Eggert <larse@isi.edu>
Committed on behalf of lioux@, who is having machine problems.

3 files changed, 14 insertions, 14 deletions

diff --git a/textproc/p5-xmltv/Makefile b/textproc/p5-xmltv/Makefile
index 9a26b4abcedd..bd589defa0d9 100644
--- a/textproc/p5-xmltv/Makefile
+++ b/textproc/p5-xmltv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmltv
-PORTVERSION=	0.5.18
+PORTVERSION=	0.5.21
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xmltv
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Set of programs to process TV (tvguide) listings in XML format
 
-BUILD_DEPENDS= \
+BUILD_DEPENDS=	\
 	${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 \
@@ -52,11 +52,12 @@ MAN1PREFIX=	${PREFIX}/share
 MAN3PREFIX=	${MANPREFIX}
 .endif
 
-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
+MAN1=	tv_cat.1 tv_check.1 tv_extractinfo_en.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_remove_some_overlapping.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
@@ -69,7 +70,7 @@ CGIDIR?=	www/cgi-bin
 ICONSDIR?=	www/icons
 .endif
 #
-PLIST_SUB+=      CGIDIR="${CGIDIR}"
+PLIST_SUB+=	CGIDIR="${CGIDIR}"
 
 post-patch:
 # fix man install location
@@ -91,4 +92,3 @@ post-install:
 .endif
 
 .include <bsd.port.post.mk>
-
diff --git a/textproc/p5-xmltv/distinfo b/textproc/p5-xmltv/distinfo
index b27901096bb6..56ee7a8e89b6 100644
--- a/textproc/p5-xmltv/distinfo
+++ b/textproc/p5-xmltv/distinfo
@@ -1 +1 @@
-MD5 (xmltv-0.5.18.tar.bz2) = eaa467fb6ea009a1adf13fdd0950b087
+MD5 (xmltv-0.5.21.tar.bz2) = aa15d4663e57a8b1a4c0736568a2d447
diff --git a/textproc/p5-xmltv/pkg-plist b/textproc/p5-xmltv/pkg-plist
index 6553cd335077..2defdd3edae5 100644
--- a/textproc/p5-xmltv/pkg-plist
+++ b/textproc/p5-xmltv/pkg-plist
@@ -1,8 +1,6 @@
-%%CGIDIR%%/tv_pick.cgi
 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
@@ -17,11 +15,11 @@ bin/tv_grab_uk
 bin/tv_grab_uk_rt
 bin/tv_grep
 bin/tv_imdb
+bin/tv_remove_some_overlapping
 bin/tv_sort
 bin/tv_split
 bin/tv_to_latex
 bin/tv_to_text
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XMLTV/.packlist
 %%SITE_PERL%%/XMLTV.pm
 %%SITE_PERL%%/XMLTV/Ask.pm
 %%SITE_PERL%%/XMLTV/AskTerm.pm
@@ -41,6 +39,7 @@ bin/tv_to_text
 %%SITE_PERL%%/XMLTV/Usage.pm
 %%SITE_PERL%%/XMLTV/Version.pm
 %%SITE_PERL%%/XMLTV/ZapListings.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XMLTV/.packlist
 share/doc/xmltv-%%VERSION%%/COPYING
 share/doc/xmltv-%%VERSION%%/QuickStart
 share/doc/xmltv-%%VERSION%%/README
@@ -91,6 +90,7 @@ share/xmltv/tv_grab_uk/channel_pkgs/sport
 share/xmltv/tv_grab_uk/channel_pkgs/travel
 share/xmltv/tv_grab_uk/channel_pkgs/wales
 share/xmltv/tv_grab_uk_rt/channel_ids
+%%CGIDIR%%/tv_pick.cgi
 @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
@@ -102,5 +102,5 @@ share/xmltv/tv_grab_uk_rt/channel_ids
 @dirrm share/xmltv/tv_grab_it
 @dirrm share/xmltv
 @dirrm share/doc/xmltv-%%VERSION%%
-@dirrm %%SITE_PERL%%/XMLTV
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XMLTV
+@dirrm %%SITE_PERL%%/XMLTV