Index: head/textproc/p5-EBook-Tools/Makefile
===================================================================
--- head/textproc/p5-EBook-Tools/Makefile
+++ head/textproc/p5-EBook-Tools/Makefile
@@ -2,14 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	EBook-Tools
-PORTVERSION=	0.4.9
+PORTVERSION=	0.5.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	simond@irrelevant.org
+MAINTAINER=	junovitch@FreeBSD.org
 COMMENT=	Object class for manipulating and generating E-books
 
 LICENSE=	GPLv2
@@ -18,11 +17,18 @@
 		p5-Data-UUID>=0:${PORTSDIR}/devel/p5-Data-UUID \
 		p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
 		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
+		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
+		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
+		p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \
 		p5-File-MimeInfo>=0:${PORTSDIR}/devel/p5-File-MimeInfo \
 		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-Lingua-EN-NameParse>=0:${PORTSDIR}/textproc/p5-Lingua-EN-NameParse \
+		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
+		p5-Mojolicious>=0:${PORTSDIR}/www/p5-Mojolicious \
 		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash \
 		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
 		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
+		p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
 		p5-Palm>=0:${PORTSDIR}/palm/p5-Palm \
 		p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
 		p5-String-CRC32>=0:${PORTSDIR}/devel/p5-String-CRC32 \
@@ -30,9 +36,10 @@
 		p5-Bit-Vector>=0:${PORTSDIR}/math/p5-Bit-Vector \
 		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-RUN_DEPENDS+=	${LOCALBASE}/bin/tidy4:${PORTSDIR}/www/tidy
+RUN_DEPENDS+=	${LOCALBASE}/bin/tidy5:${PORTSDIR}/www/tidy-html5
 
 USES=		perl5
 USE_PERL5=	modbuild
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
Index: head/textproc/p5-EBook-Tools/distinfo
===================================================================
--- head/textproc/p5-EBook-Tools/distinfo
+++ head/textproc/p5-EBook-Tools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (EBook-Tools-v0.4.9.tar.gz) = 8645ff9d0df023481b78f39899806b884fac675080c8b180d25f821e57cc16fb
-SIZE (EBook-Tools-v0.4.9.tar.gz) = 653399
+SHA256 (EBook-Tools-v0.5.4.tar.gz) = 2a94808f611da58086ed151c1348fcf9c9ffab7822fef8457eeac3376fa1a81a
+SIZE (EBook-Tools-v0.5.4.tar.gz) = 725633
Index: head/textproc/p5-EBook-Tools/files/patch-lib_EBook_Tools.pm
===================================================================
--- head/textproc/p5-EBook-Tools/files/patch-lib_EBook_Tools.pm
+++ head/textproc/p5-EBook-Tools/files/patch-lib_EBook_Tools.pm
@@ -0,0 +1,10 @@
+--- lib/EBook/Tools.pm.orig	2014-10-01 22:27:01 UTC
++++ lib/EBook/Tools.pm
+@@ -11710,6 +11710,7 @@ Returns the return value from tidy
+                        '-q','-utf8','--tidy-mark','no',
+                        '--wrap','0',
+                        '-xml',
++                       '-indent',
+                        '--add-xml-decl','yes',
+                        '-f',$tidyxmlerrors,
+                        '-o',$outfile,
Index: head/textproc/p5-EBook-Tools/files/patch-scripts_ebook.pl
===================================================================
--- head/textproc/p5-EBook-Tools/files/patch-scripts_ebook.pl
+++ head/textproc/p5-EBook-Tools/files/patch-scripts_ebook.pl
@@ -0,0 +1,11 @@
+--- scripts/ebook.pl.orig	2014-10-01 22:27:01 UTC
++++ scripts/ebook.pl
+@@ -92,7 +92,7 @@ my %opt = (
+     'raw'         => 0,
+     'subcategory' => undef,
+     'tidy'        => 0,
+-    'tidycmd'     => $config->val('helpers','tidy') || undef,
++    'tidycmd'     => $config->val('helpers','tidy') || 'tidy5',
+     'tidysafety'  => $tidysafety,
+     'title'       => undef,
+     'verbose'     => $config->val('config','debug') || 0,
Index: head/textproc/p5-EBook-Tools/pkg-plist
===================================================================
--- head/textproc/p5-EBook-Tools/pkg-plist
+++ head/textproc/p5-EBook-Tools/pkg-plist
@@ -1,5 +1,6 @@
 man/man1/ebook.1.gz
 %%PERL5_MAN3%%/EBook::Tools.3.gz
+%%PERL5_MAN3%%/EBook::Tools::BISG.3.gz
 %%PERL5_MAN3%%/EBook::Tools::EReader.3.gz
 %%PERL5_MAN3%%/EBook::Tools::IMP.3.gz
 %%PERL5_MAN3%%/EBook::Tools::LZSS.3.gz
@@ -8,6 +9,7 @@
 %%PERL5_MAN3%%/EBook::Tools::PalmDoc.3.gz
 %%PERL5_MAN3%%/EBook::Tools::Unpack.3.gz
 %%SITE_PERL%%/EBook/Tools.pm
+%%SITE_PERL%%/EBook/Tools/BISG.pm
 %%SITE_PERL%%/EBook/Tools/EReader.pm
 %%SITE_PERL%%/EBook/Tools/IMP.pm
 %%SITE_PERL%%/EBook/Tools/LZSS.pm