Attachment #159033 for bug #201703

Lines 2-15 Link Here

(-)Makefile (-4 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= EBook-Tools	4	PORTNAME= EBook-Tools
5	PORTVERSION= 0.4.9	5	PORTVERSION= 0.5.4
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 2
8	CATEGORIES= textproc perl5	7	CATEGORIES= textproc perl5
9	MASTER_SITES= CPAN	8	MASTER_SITES= CPAN
10	PKGNAMEPREFIX= p5-	9	PKGNAMEPREFIX= p5-
11		10
12	MAINTAINER= simond@irrelevant.org	11	MAINTAINER= perl@FreeBSD.org
13	COMMENT= Object class for manipulating and generating E-books	12	COMMENT= Object class for manipulating and generating E-books
14		13
15	LICENSE= GPLv2	14	LICENSE= GPLv2
Lines 18-28 Link Here
18	p5-Data-UUID>=0:${PORTSDIR}/devel/p5-Data-UUID \	17	p5-Data-UUID>=0:${PORTSDIR}/devel/p5-Data-UUID \
19	p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \	18	p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
20	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \	19	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
		20	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
		21	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
		22	p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \
21	p5-File-MimeInfo>=0:${PORTSDIR}/devel/p5-File-MimeInfo \	23	p5-File-MimeInfo>=0:${PORTSDIR}/devel/p5-File-MimeInfo \
22	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \	24	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
		25	p5-Lingua-EN-NameParse>=0:${PORTSDIR}/textproc/p5-Lingua-EN-NameParse \
		26	p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
		27	p5-Mojolicious>=0:${PORTSDIR}/www/p5-Mojolicious \
23	p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash \	28	p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash \
24	p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \	29	p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
25	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \	30	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
		31	p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
26	p5-Palm>=0:${PORTSDIR}/palm/p5-Palm \	32	p5-Palm>=0:${PORTSDIR}/palm/p5-Palm \
27	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \	33	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
28	p5-String-CRC32>=0:${PORTSDIR}/devel/p5-String-CRC32 \	34	p5-String-CRC32>=0:${PORTSDIR}/devel/p5-String-CRC32 \
Lines 30-38 Link Here
30	p5-Bit-Vector>=0:${PORTSDIR}/math/p5-Bit-Vector \	36	p5-Bit-Vector>=0:${PORTSDIR}/math/p5-Bit-Vector \
31	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils	37	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
32	RUN_DEPENDS:= ${BUILD_DEPENDS}	38	RUN_DEPENDS:= ${BUILD_DEPENDS}
33	RUN_DEPENDS+= ${LOCALBASE}/bin/tidy4:${PORTSDIR}/www/tidy	39	RUN_DEPENDS+= ${LOCALBASE}/bin/tidy5:${PORTSDIR}/www/tidy-html5
34		40
35	USES= perl5	41	USES= perl5
36	USE_PERL5= modbuild	42	USE_PERL5= modbuild
		43	NO_ARCH= yes
37		44
38	.include <bsd.port.mk>	45	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (EBook-Tools-v0.4.9.tar.gz) = 8645ff9d0df023481b78f39899806b884fac675080c8b180d25f821e57cc16fb	1	SHA256 (EBook-Tools-v0.5.4.tar.gz) = 2a94808f611da58086ed151c1348fcf9c9ffab7822fef8457eeac3376fa1a81a
2	SIZE (EBook-Tools-v0.4.9.tar.gz) = 653399	2	SIZE (EBook-Tools-v0.5.4.tar.gz) = 725633

Line 0 Link Here

(-)files/patch-lib_EBook_Tools.pm (+10 lines)
	1	--- lib/EBook/Tools.pm.orig 2014-10-01 22:27:01 UTC
	2	+++ lib/EBook/Tools.pm
	3	@@ -11710,6 +11710,7 @@ Returns the return value from tidy
	4	'-q','-utf8','--tidy-mark','no',
	5	'--wrap','0',
	6	'-xml',
	7	+ '-indent',
	8	'--add-xml-decl','yes',
	9	'-f',$tidyxmlerrors,
	10	'-o',$outfile,

Line 0 Link Here

(-)files/patch-scripts_ebook.pl (+11 lines)
	1	--- scripts/ebook.pl.orig 2014-10-01 22:27:01 UTC
	2	+++ scripts/ebook.pl
	3	@@ -92,7 +92,7 @@ my %opt = (
	4	'raw' => 0,
	5	'subcategory' => undef,
	6	'tidy' => 0,
	7	- 'tidycmd' => $config->val('helpers','tidy') \|\| undef,
	8	+ 'tidycmd' => $config->val('helpers','tidy') \|\| 'tidy5',
	9	'tidysafety' => $tidysafety,
	10	'title' => undef,
	11	'verbose' => $config->val('config','debug') \|\| 0,

Return to bug 201703

Lines 1-5 Link Here

(-)pkg-plist (+2 lines)
1	man/man1/ebook.1.gz	1	man/man1/ebook.1.gz
2	%%PERL5_MAN3%%/EBook::Tools.3.gz	2	%%PERL5_MAN3%%/EBook::Tools.3.gz
		3	%%PERL5_MAN3%%/EBook::Tools::BISG.3.gz
3	%%PERL5_MAN3%%/EBook::Tools::EReader.3.gz	4	%%PERL5_MAN3%%/EBook::Tools::EReader.3.gz
4	%%PERL5_MAN3%%/EBook::Tools::IMP.3.gz	5	%%PERL5_MAN3%%/EBook::Tools::IMP.3.gz
5	%%PERL5_MAN3%%/EBook::Tools::LZSS.3.gz	6	%%PERL5_MAN3%%/EBook::Tools::LZSS.3.gz
Lines 8-13 Link Here
8	%%PERL5_MAN3%%/EBook::Tools::PalmDoc.3.gz	9	%%PERL5_MAN3%%/EBook::Tools::PalmDoc.3.gz
9	%%PERL5_MAN3%%/EBook::Tools::Unpack.3.gz	10	%%PERL5_MAN3%%/EBook::Tools::Unpack.3.gz
10	%%SITE_PERL%%/EBook/Tools.pm	11	%%SITE_PERL%%/EBook/Tools.pm
		12	%%SITE_PERL%%/EBook/Tools/BISG.pm
11	%%SITE_PERL%%/EBook/Tools/EReader.pm	13	%%SITE_PERL%%/EBook/Tools/EReader.pm
12	%%SITE_PERL%%/EBook/Tools/IMP.pm	14	%%SITE_PERL%%/EBook/Tools/IMP.pm
13	%%SITE_PERL%%/EBook/Tools/LZSS.pm	15	%%SITE_PERL%%/EBook/Tools/LZSS.pm