3 files changed, 16 insertions, 12 deletions

diff --git a/textproc/p5-Excel-Template/Makefile b/textproc/p5-Excel-Template/Makefile
index 3d77e8c39e82..abddef83d571 100644
--- a/textproc/p5-Excel-Template/Makefile
+++ b/textproc/p5-Excel-Template/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Excel-Template
-PORTVERSION=	0.25
+PORTVERSION=	0.26
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Excel
@@ -16,11 +16,11 @@ MAINTAINER=	espen@tagestad.no
 COMMENT=	Perl module for templating Excel files
 
 BUILD_DEPENDS=	${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \
+		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
 		${SITE_PERL}/Spreadsheet/WriteExcel.pm:${PORTSDIR}/textproc/p5-Spreadsheet-WriteExcel
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-PERL_CONFIGURE=	yes
+PERL_MODBUILD=	yes
 
 MAN3=		Excel::Template.3 \
 		Excel::Template::Base.3 \
@@ -45,6 +45,8 @@ MAN3=		Excel::Template.3 \
 		Excel::Template::Element::Backref.3 \
 		Excel::Template::Element::Cell.3 \
 		Excel::Template::Element::Formula.3 \
+		Excel::Template::Element::FreezePanes.3 \
+		Excel::Template::Element::Image.3 \
 		Excel::Template::Element::Range.3 \
 		Excel::Template::Element::Var.3 \
 		Excel::Template::Factory.3 \
@@ -54,8 +56,11 @@ MAN3=		Excel::Template.3 \
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500806
-IGNORE=		needs Perl 5.8.6 or above (lang/perl5.8)
+.if ${PERL_LEVEL} < 500600 # as required by vendor
+IGNORE=		requires at least Perl 5.6.  Please install lang/perl5.8 and try again
+.elif ${PERL_LEVEL} < 500800
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String
+CONFIGURE_ARGS+=	USE_UNICODE=1
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/p5-Excel-Template/distinfo b/textproc/p5-Excel-Template/distinfo
index 8890d6c731d9..1d1e652ec699 100644
--- a/textproc/p5-Excel-Template/distinfo
+++ b/textproc/p5-Excel-Template/distinfo
@@ -1,3 +1,3 @@
-MD5 (Excel-Template-0.25.tar.gz) = 4f4079b1da9dbd6d73fcab35b1cccf3c
-SHA256 (Excel-Template-0.25.tar.gz) = 12bdb07837c68e4460bd6acf5836a55143b7fc6ba9e036959028e76162c4c046
-SIZE (Excel-Template-0.25.tar.gz) = 36832
+MD5 (Excel-Template-0.26.tar.gz) = 25a83142e5029c43006ff0e4f0e8578a
+SHA256 (Excel-Template-0.26.tar.gz) = 2097cd56e8379c5c5f9a84dd90b8c292756ff16770af246247d8e7508d0f37bd
+SIZE (Excel-Template-0.26.tar.gz) = 37753
diff --git a/textproc/p5-Excel-Template/pkg-plist b/textproc/p5-Excel-Template/pkg-plist
index 7cd4e20c0c6c..6d5d70e04c6a 100644
--- a/textproc/p5-Excel-Template/pkg-plist
+++ b/textproc/p5-Excel-Template/pkg-plist
@@ -21,16 +21,15 @@
 %%SITE_PERL%%/Excel/Template/Element/Backref.pm
 %%SITE_PERL%%/Excel/Template/Element/Cell.pm
 %%SITE_PERL%%/Excel/Template/Element/Formula.pm
+%%SITE_PERL%%/Excel/Template/Element/FreezePanes.pm
+%%SITE_PERL%%/Excel/Template/Element/Image.pm
 %%SITE_PERL%%/Excel/Template/Element/Range.pm
 %%SITE_PERL%%/Excel/Template/Element/Var.pm
 %%SITE_PERL%%/Excel/Template/Factory.pm
 %%SITE_PERL%%/Excel/Template/Format.pm
 %%SITE_PERL%%/Excel/Template/Iterator.pm
 %%SITE_PERL%%/Excel/Template/TextObject.pm
-%%SITE_PERL%%/mach/auto/Excel/Template/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/Excel/Template
-@dirrm %%SITE_PERL%%/mach/auto/Excel
 @dirrm %%SITE_PERL%%/Excel/Template/Element
 @dirrm %%SITE_PERL%%/Excel/Template/Container
 @dirrm %%SITE_PERL%%/Excel/Template
-@dirrm %%SITE_PERL%%/Excel
+@dirrmtry %%SITE_PERL%%/Excel