3 files changed, 36 insertions, 28 deletions

diff --git a/textproc/p5-xmltv/Makefile b/textproc/p5-xmltv/Makefile
index ce37572a8af3..d6f1fa0b897b 100644
--- a/textproc/p5-xmltv/Makefile
+++ b/textproc/p5-xmltv/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xmltv
-PORTVERSION=	0.5.45
-PORTREVISION=	1
+PORTVERSION=	0.5.48
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xmltv
@@ -73,18 +72,19 @@ RUN_DEPENDS+=	\
 	${SITE_PERL}/Storable.pm:${PORTSDIR}/devel/p5-Storable
 .endif
 
-MAN1=	tv_cat.1 tv_check.1 tv_extractinfo_en.1 \
-	tv_grab_br.1 tv_grab_br_net.1 tv_grab_ch_bluewin.1 tv_grab_ee.1 \
-	tv_grab_be.1 tv_grab_de_tvtoday.1 tv_grab_dk.1 tv_grab_es.1 tv_grab_es_laguiatv.1\
-	tv_grab_fi.1 tv_grab_fr.1 tv_grab_hr.1 tv_grab_huro.1 tv_grab_il.1 tv_grab_is.1 \
-	tv_grab_it.1 tv_find_grabbers.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_re.1 \
-	tv_grab_se_swedb.1 tv_grab_uk_bleb.1 tv_grab_uk_rt.1 \
-	tv_grab_za.1 tv_grep.1 tv_imdb.1 tv_remove_some_overlapping.1 \
-	tv_sort.1 tv_split.1 tv_to_latex.1 tv_to_potatoe.1 tv_to_text.1 \
-	tv_validate_grabber.1 tv_validate_file.1
+MAN1=	tv_cat.1 tv_check.1 tv_extractinfo_en.1 tv_find_grabbers.1 \
+	tv_grab_ar.1 tv_grab_be.1 tv_grab_br.1 tv_grab_br_net.1 \
+	tv_grab_ch_search.1 tv_grab_combiner.1 tv_grab_dk.1 \
+	tv_grab_dtv_la.1 tv_grab_ee.1 tv_grab_es.1 tv_grab_es_laguiatv.1 \
+	tv_grab_fi.1 tv_grab_fr.1 tv_grab_hr.1 tv_grab_huro.1 \
+	tv_grab_il.1 tv_grab_is.1 tv_grab_it.1 tv_grab_jp.1 \
+	tv_grab_na_dd.1 tv_grab_na_icons.1 tv_grab_nc.1 tv_grab_nl.1 \
+	tv_grab_nl_wolf.1 tv_grab_no.1 tv_grab_no_gfeed.1 tv_grab_pt.1 \
+	tv_grab_re.1 tv_grab_se_swedb.1 tv_grab_uk_bleb.1 \
+	tv_grab_uk_rt.1 tv_grab_za.1 tv_grep.1 tv_imdb.1 \
+	tv_remove_some_overlapping.1 tv_sort.1 tv_split.1 tv_to_latex.1 \
+	tv_to_potatoe.1 tv_to_text.1 tv_validate_file.1 \
+	tv_validate_grabber.1
 MAN3=	Configure.3 Configure::Writer.3 Options.3 PreferredMethod.3 \
 	ValidateFile.3 ValidateGrabber.3 Version.3 \
 	XMLTV.3 XMLTV::Date.3 XMLTV::Grab_XML.3 XMLTV::Gunzip.3 \
diff --git a/textproc/p5-xmltv/distinfo b/textproc/p5-xmltv/distinfo
index ed39dd9bb5b9..90ae10e309da 100644
--- a/textproc/p5-xmltv/distinfo
+++ b/textproc/p5-xmltv/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmltv-0.5.45.tar.bz2) = 8c9426b3b162fe5df82c2c41014d416b
-SHA256 (xmltv-0.5.45.tar.bz2) = 234a039b24603e8ff89740fd977094469421f16c2780bf7dc817b04032f1de70
-SIZE (xmltv-0.5.45.tar.bz2) = 556939
+MD5 (xmltv-0.5.48.tar.bz2) = f13a36640124cba255f4e9d4db7e7fee
+SHA256 (xmltv-0.5.48.tar.bz2) = b893d817c853f5dab797e1e9297f1ded0f55f423b5a66f972bd92e391ab7f572
+SIZE (xmltv-0.5.48.tar.bz2) = 593655
diff --git a/textproc/p5-xmltv/pkg-plist b/textproc/p5-xmltv/pkg-plist
index 7bf4f349cb20..88cb1aa9c96d 100644
--- a/textproc/p5-xmltv/pkg-plist
+++ b/textproc/p5-xmltv/pkg-plist
@@ -2,12 +2,14 @@ bin/tv_cat
 bin/tv_check
 bin/tv_extractinfo_en
 bin/tv_find_grabbers
+bin/tv_grab_ar
 bin/tv_grab_be
 bin/tv_grab_br
 bin/tv_grab_br_net
-bin/tv_grab_ch_bluewin
-bin/tv_grab_de_tvtoday
+bin/tv_grab_ch_search
+bin/tv_grab_combiner
 bin/tv_grab_dk
+bin/tv_grab_dtv_la
 bin/tv_grab_ee
 bin/tv_grab_es
 bin/tv_grab_es_laguiatv
@@ -21,9 +23,11 @@ bin/tv_grab_it
 bin/tv_grab_jp
 bin/tv_grab_na_dd
 bin/tv_grab_na_icons
+bin/tv_grab_nc
 bin/tv_grab_nl
 bin/tv_grab_nl_wolf
 bin/tv_grab_no
+bin/tv_grab_no_gfeed
 bin/tv_grab_pt
 bin/tv_grab_re
 bin/tv_grab_se_swedb
@@ -72,11 +76,17 @@ bin/tv_validate_grabber
 %%SITE_PERL%%/XMLTV/ValidateFile.pm
 %%SITE_PERL%%/XMLTV/ValidateGrabber.pm
 %%SITE_PERL%%/XMLTV/Version.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XMLTV/.packlist
+%%SITE_PERL%%/mach/auto/XMLTV/.packlist
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/QuickStart
+%%DOCSDIR%%/README
+%%DOCSDIR%%/README.tv_check
+%%DOCSDIR%%/README.win32
+%%DOCSDIR%%/tv_check_doc.html
+%%DOCSDIR%%/tv_check_doc.jpg
 %%DATADIR%%/tv_grab_be/channel_ids_fr
 %%DATADIR%%/tv_grab_be/channel_ids_nl
-%%DATADIR%%/tv_grab_ch_bluewin/channel_ids
-%%DATADIR%%/tv_grab_de_tvtoday/channel_ids
+%%DATADIR%%/tv_grab_ch_search/channel_ids
 %%DATADIR%%/tv_grab_huro/catmap.hu
 %%DATADIR%%/tv_grab_huro/catmap.ro
 %%DATADIR%%/tv_grab_huro/jobmap
@@ -85,19 +95,17 @@ bin/tv_validate_grabber
 %%DATADIR%%/tv_grab_uk_rt/channel_ids
 %%DATADIR%%/xmltv.dtd
 %%CGIDIR%%/tv_pick.cgi
+@dirrmtry %%CGIDIR%%
 @dirrm %%DATADIR%%/tv_grab_uk_rt
 @dirrm %%DATADIR%%/tv_grab_uk_bleb
 @dirrm %%DATADIR%%/tv_grab_it
 @dirrm %%DATADIR%%/tv_grab_huro
-@dirrm %%DATADIR%%/tv_grab_de_tvtoday
-@dirrm %%DATADIR%%/tv_grab_ch_bluewin
+@dirrm %%DATADIR%%/tv_grab_ch_search
 @dirrm %%DATADIR%%/tv_grab_be
 @dirrm %%DATADIR%%
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XMLTV
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%
+@dirrm %%DOCSDIR%%
+@dirrm %%SITE_PERL%%/mach/auto/XMLTV
 @dirrm %%SITE_PERL%%/XMLTV/ProgressBar
 @dirrm %%SITE_PERL%%/XMLTV/Configure
 @dirrm %%SITE_PERL%%/XMLTV/Ask
 @dirrm %%SITE_PERL%%/XMLTV
-@dirrmtry %%CGIDIR%%