4 files changed, 68 insertions, 24 deletions

diff --git a/textproc/p5-PDF-FromHTML/Makefile b/textproc/p5-PDF-FromHTML/Makefile
index ff9b22a1680f..d9520337ce21 100644
--- a/textproc/p5-PDF-FromHTML/Makefile
+++ b/textproc/p5-PDF-FromHTML/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	PDF-FromHTML
-PORTVERSION=	0.12
+PORTVERSION=	0.20
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	PDF
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	gslin@gslin.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert HTML documents to PDF
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/HTML/Tidy.pm:${PORTSDIR}/textproc/p5-HTML-Tidy \
@@ -20,15 +20,37 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/HTML/Tidy.pm:${PORTSDIR}/textproc/p5-HT
 		${SITE_PERL}/Image/Size.pm:${PORTSDIR}/graphics/p5-Image-Size \
 		${SITE_PERL}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/PDF/API2.pm:${PORTSDIR}/textproc/p5-PDF-API2 \
-		${SITE_PERL}/PDF/Template.pm:${PORTSDIR}/print/p5-PDF-Template \
-		${SITE_PERL}/PDF/Writer.pm:${PORTSDIR}/textproc/p5-PDF-Writer \
-		${SITE_PERL}/XML/Twig.pm:${PORTSDIR}/textproc/p5-XML-Twig
-RUN_DEPENDS=	${BUILD_DEPENDS}
+		${SITE_PERL}/XML/Twig.pm:${PORTSDIR}/textproc/p5-XML-Twig \
+		p5-PDF-Writer>=0.05:${PORTSDIR}/textproc/p5-PDF-Writer
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN1=		html2pdf.pl.1
-MAN3=		PDF::FromHTML.3 PDF::FromHTML::Twig.3
+MAN3=		PDF::FromHTML.3 PDF::FromHTML::Twig.3 \
+		PDF::FromHTML::Template.3 \
+		PDF::FromHTML::Template::Container::Always.3 \
+		PDF::FromHTML::Template::Container::Conditional.3 \
+		PDF::FromHTML::Template::Container::Font.3 \
+		PDF::FromHTML::Template::Container::Footer.3 \
+		PDF::FromHTML::Template::Container::Header.3 \
+		PDF::FromHTML::Template::Container::Loop.3 \
+		PDF::FromHTML::Template::Container::Margin.3 \
+		PDF::FromHTML::Template::Container::PageDef.3 \
+		PDF::FromHTML::Template::Container::PdfTemplate.3 \
+		PDF::FromHTML::Template::Container::Row.3 \
+		PDF::FromHTML::Template::Container::Scope.3 \
+		PDF::FromHTML::Template::Container::Section.3 \
+		PDF::FromHTML::Template::Element.3 \
+		PDF::FromHTML::Template::Element::Bookmark.3 \
+		PDF::FromHTML::Template::Element::Circle.3 \
+		PDF::FromHTML::Template::Element::HorizontalRule.3 \
+		PDF::FromHTML::Template::Element::Image.3 \
+		PDF::FromHTML::Template::Element::Line.3 \
+		PDF::FromHTML::Template::Element::PageBreak.3 \
+		PDF::FromHTML::Template::Element::TextBox.3 \
+		PDF::FromHTML::Template::Element::Var.3 \
+		PDF::FromHTML::Template::Element::Weblink.3
 
 .include <bsd.port.pre.mk>
 
diff --git a/textproc/p5-PDF-FromHTML/distinfo b/textproc/p5-PDF-FromHTML/distinfo
index af300d553123..0115d071aa08 100644
--- a/textproc/p5-PDF-FromHTML/distinfo
+++ b/textproc/p5-PDF-FromHTML/distinfo
@@ -1,3 +1,3 @@
-MD5 (PDF-FromHTML-0.12.tar.gz) = 37404ccb649ebb7b5f0a52d80fb7745b
-SHA256 (PDF-FromHTML-0.12.tar.gz) = 73a21685340ad4d0eb201ddf42e6adee5b5dcedd4ae549969613a8e9d7281610
-SIZE (PDF-FromHTML-0.12.tar.gz) = 23320
+MD5 (PDF-FromHTML-0.20.tar.gz) = 68ede06d7af75d3464f357631160abe6
+SHA256 (PDF-FromHTML-0.20.tar.gz) = f8e87094a603cbcd0cdaa824bd957192885918034d215d4a841b33fd81208c49
+SIZE (PDF-FromHTML-0.20.tar.gz) = 51217
diff --git a/textproc/p5-PDF-FromHTML/files/patch-Makefile.PL b/textproc/p5-PDF-FromHTML/files/patch-Makefile.PL
deleted file mode 100644
index 8b74caa14452..000000000000
--- a/textproc/p5-PDF-FromHTML/files/patch-Makefile.PL
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.PL.orig	Tue Jul 11 13:51:40 2006
-+++ Makefile.PL	Tue Jul 11 13:51:47 2006
-@@ -13,7 +13,7 @@
-     LWP::Simple             0
-     Image::Size             0
-     PDF::Writer             0.05
--    PDF::Template           0.30
-+    PDF::Template           0.22
- );
- 
- unless (can_use('PDF::API2') or can_use('pdflib_pl')) {
diff --git a/textproc/p5-PDF-FromHTML/pkg-plist b/textproc/p5-PDF-FromHTML/pkg-plist
index 4b553ff9f78a..f23f35e2639e 100644
--- a/textproc/p5-PDF-FromHTML/pkg-plist
+++ b/textproc/p5-PDF-FromHTML/pkg-plist
@@ -1,9 +1,42 @@
 @comment $FreeBSD$
-bin/html2pdf.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/FromHTML/.packlist
 %%SITE_PERL%%/PDF/FromHTML.pm
+%%SITE_PERL%%/PDF/FromHTML/Template.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Base.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Constants.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Container.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Container/Always.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Container/Conditional.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Container/Font.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Container/Footer.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Container/Header.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Container/Loop.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Container/Margin.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Container/PageDef.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Container/PdfTemplate.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Container/Row.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Container/Scope.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Container/Section.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Context.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Element.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Element/Bookmark.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Element/Circle.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Element/HorizontalRule.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Element/Image.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Element/Line.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Element/PageBreak.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Element/TextBox.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Element/Var.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Element/Weblink.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Factory.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/Iterator.pm
+%%SITE_PERL%%/PDF/FromHTML/Template/TextObject.pm
 %%SITE_PERL%%/PDF/FromHTML/Twig.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/FromHTML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF
+bin/html2pdf.pl
+@dirrmtry %%SITE_PERL%%/PDF/FromHTML/Template/Element
+@dirrmtry %%SITE_PERL%%/PDF/FromHTML/Template/Container
+@dirrmtry %%SITE_PERL%%/PDF/FromHTML/Template
 @dirrmtry %%SITE_PERL%%/PDF/FromHTML
 @dirrmtry %%SITE_PERL%%/PDF
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/FromHTML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF