Attachment 42847 Details for Bug 66715 – p5-xmltv-0.5.33.patch

[patch] p5-xmltv-0.5.33.patch

p5-xmltv-0.5.33.patch (text/plain), 9.51 KB, created by Lars Eggert on 2004-05-16 18:10:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lars Eggert

Created: 2004-05-16 18:10:16 UTC

Size: 9.51 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/textproc/p5-xmltv/Makefile,v
>retrieving revision 1.11
>diff -u -u -r1.11 Makefile
>--- Makefile	8 Feb 2004 01:14:05 -0000	1.11
>+++ Makefile	16 May 2004 17:00:45 -0000
>@@ -2,11 +2,11 @@
> # Date created:		Mon Nov 4 02:56:34 UTC 2002
> # Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
> #
>-# $FreeBSD$
>+# $FreeBSD: ports/textproc/p5-xmltv/Makefile,v 1.11 2004/02/08 01:14:05 lioux Exp $
> #
> 
> PORTNAME=	xmltv
>-PORTVERSION=	0.5.21
>+PORTVERSION=	0.5.33
> CATEGORIES=	textproc perl5
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	xmltv
>@@ -31,14 +31,18 @@
> 	${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}/${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}/WWW/Mechanize.pm:${PORTSDIR}/www/p5-WWW-Mechanize
> RUN_DEPENDS=	${BUILD_DEPENDS}
> 
> USE_BZIP2=	yes
> USE_REINPLACE=	yes
>-USE_SIZE=	yes
> PERL_CONFIGURE=	yes
>-PLIST_SUB=	VERSION="${PORTVERSION}"
>+PLIST_SUB=	PORTVERSION="${PORTVERSION}"
>+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
> 
> .include <bsd.port.pre.mk>
> 
>@@ -46,20 +50,17 @@
> 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_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 \
>+MAN1PREFIX=	${PREFIX}
>+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_hu.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_nz.1 \
>+	tv_grab_pt.1 tv_grab_se.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
>+MAN3=	XMLTV.3 XMLTV::Date.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}.
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/textproc/p5-xmltv/distinfo,v
>retrieving revision 1.8
>diff -u -u -r1.8 distinfo
>--- distinfo	8 Feb 2004 01:14:05 -0000	1.8
>+++ distinfo	16 May 2004 17:00:45 -0000
>@@ -1,2 +1,2 @@
>-MD5 (xmltv-0.5.21.tar.bz2) = aa15d4663e57a8b1a4c0736568a2d447
>-SIZE (xmltv-0.5.21.tar.bz2) = 405588
>+MD5 (xmltv-0.5.33.tar.bz2) = 1bd1a72205696eacffb60f9f2d460b9e
>+SIZE (xmltv-0.5.33.tar.bz2) = 398313
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/textproc/p5-xmltv/pkg-plist,v
>retrieving revision 1.8
>diff -u -u -r1.8 pkg-plist
>--- pkg-plist	5 Dec 2003 05:34:07 -0000	1.8
>+++ pkg-plist	16 May 2004 17:00:46 -0000
>@@ -1,17 +1,23 @@
> bin/tv_cat
> bin/tv_check
> bin/tv_extractinfo_en
>+bin/tv_grab_de_tvtoday
> bin/tv_grab_dk
> bin/tv_grab_es
>+bin/tv_grab_es_digital
> bin/tv_grab_fi
>+bin/tv_grab_fr
> bin/tv_grab_hu
> bin/tv_grab_it
>-bin/tv_grab_na
>+bin/tv_grab_jp
>+bin/tv_grab_na_dd
>+bin/tv_grab_na_icons
> bin/tv_grab_nl
> bin/tv_grab_nl_wolf
>+bin/tv_grab_no
> bin/tv_grab_nz
>-bin/tv_grab_sn
>-bin/tv_grab_uk
>+bin/tv_grab_pt
>+bin/tv_grab_se
> bin/tv_grab_uk_rt
> bin/tv_grep
> bin/tv_imdb
>@@ -26,7 +32,8 @@
> %%SITE_PERL%%/XMLTV/AskTk.pm
> %%SITE_PERL%%/XMLTV/Clumps.pm
> %%SITE_PERL%%/XMLTV/Config_file.pm
>-%%SITE_PERL%%/XMLTV/Europe_TZ.pm
>+%%SITE_PERL%%/XMLTV/DST.pm
>+%%SITE_PERL%%/XMLTV/Date.pm
> %%SITE_PERL%%/XMLTV/Get_nice.pm
> %%SITE_PERL%%/XMLTV/Grab_XML.pm
> %%SITE_PERL%%/XMLTV/Grep.pm
>@@ -38,69 +45,27 @@
> %%SITE_PERL%%/XMLTV/TZ.pm
> %%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
>-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
>-share/xmltv/tv_grab_uk/channel_pkgs/children
>-share/xmltv/tv_grab_uk/channel_pkgs/classics
>-share/xmltv/tv_grab_uk/channel_pkgs/comedy
>-share/xmltv/tv_grab_uk/channel_pkgs/entertainment
>-share/xmltv/tv_grab_uk/channel_pkgs/factual
>-share/xmltv/tv_grab_uk/channel_pkgs/film
>-share/xmltv/tv_grab_uk/channel_pkgs/gratis
>-share/xmltv/tv_grab_uk/channel_pkgs/ireland
>-share/xmltv/tv_grab_uk/channel_pkgs/lifestyle
>-share/xmltv/tv_grab_uk/channel_pkgs/misc
>-share/xmltv/tv_grab_uk/channel_pkgs/music
>-share/xmltv/tv_grab_uk/channel_pkgs/musicchoice
>-share/xmltv/tv_grab_uk/channel_pkgs/national
>-share/xmltv/tv_grab_uk/channel_pkgs/news
>-share/xmltv/tv_grab_uk/channel_pkgs/not_england
>-share/xmltv/tv_grab_uk/channel_pkgs/regional
>-share/xmltv/tv_grab_uk/channel_pkgs/religion
>-share/xmltv/tv_grab_uk/channel_pkgs/scifi
>-share/xmltv/tv_grab_uk/channel_pkgs/scotland
>-share/xmltv/tv_grab_uk/channel_pkgs/shop
>-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
>+%%PORTDOCS%%%%DOCSDIR%%/COPYING
>+%%PORTDOCS%%%%DOCSDIR%%/QuickStart
>+%%PORTDOCS%%%%DOCSDIR%%/README
>+%%PORTDOCS%%%%DOCSDIR%%/README.tv_check
>+%%PORTDOCS%%%%DOCSDIR%%/README.win32
>+%%PORTDOCS%%%%DOCSDIR%%/tv_check_doc.html
>+%%PORTDOCS%%%%DOCSDIR%%/tv_check_doc.jpg
>+%%DATADIR%%/tv_grab_de_tvtoday/channel_ids
>+%%DATADIR%%/tv_grab_it/dud_channels
>+%%DATADIR%%/tv_grab_nl/channels
>+%%DATADIR%%/tv_grab_nz/episode_names
>+%%DATADIR%%/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
>-@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 %%CGIDIR%%
>+@dirrm %%DATADIR%%/tv_grab_uk_rt
>+@dirrm %%DATADIR%%/tv_grab_nz
>+@dirrm %%DATADIR%%/tv_grab_nl
>+@dirrm %%DATADIR%%/tv_grab_it
>+@dirrm %%DATADIR%%/tv_grab_de_tvtoday
>+@dirrm %%DATADIR%%
>+@dirrm %%DOCSDIR%%
> @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XMLTV
> @dirrm %%SITE_PERL%%/XMLTV
>Index: files/patch-Makefile.PL
>===================================================================
>RCS file: /home/ncvs/ports/textproc/p5-xmltv/files/patch-Makefile.PL,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-Makefile.PL
>--- files/patch-Makefile.PL	28 Sep 2003 15:55:47 -0000	1.1
>+++ files/patch-Makefile.PL	16 May 2004 17:00:46 -0000
>@@ -1,11 +1,30 @@
>---- Makefile.PL.orig	Thu Sep 18 11:53:31 2003
>-+++ Makefile.PL	Thu Sep 18 11:53:46 2003
>-@@ -365,7 +365,7 @@
>- 		  "\n");
>+--- m	Sun May 16 18:23:38 2004
>++++ Makefile.PL	Sun May 16 18:25:14 2004
>+@@ -456,14 +456,14 @@
>+ 	# Guess a default value for {install} based on whether
>+ 	# prerequisites were found.
>+ 	#
>+-	$info->{install} = $opt_yes || not $info->{missing};
>++	$info->{install} = 1; #$opt_yes || not $info->{missing};
>+ 
>+ 	print STDERR ($s, ' ' x (1 + $width - length $s),
>+ 		      $info->{install} ? '[yes]' : '[no]',
>+ 		      "\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)) {
>+ 	# Need to set {install} for each component by prompting.
>+ 	foreach my $info (@opt_components) {
>+ 	    my $missing = $info->{missing};
>+@@ -492,8 +492,8 @@
>+ 		die;
>+ 	    }
>+ 	
>+-	    $info->{install} =
>+-	      ask($msg, not $missing);
>++	    $info->{install} = 1;
>++	    #  ask($msg, not $missing);
>+ 	}
>+     }
>  }
>- print STDERR "\n";
>--if (not ask('Do you want to proceed with this configuration?', 1)) {
>-+if (0) {
>-     # Need to set {install} for each component by prompting.
>-     foreach my $info (@opt_components) {
>- 	my $missing = $info->{missing};

Actions: View | Diff

Attachments on bug 66715: 42847 | 42848