2 files changed, 73 insertions, 67 deletions

diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile
index 7e2bdbe8743f..cc3075a098ec 100644
--- a/www/p5-Template-Toolkit/Makefile
+++ b/www/p5-Template-Toolkit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Template-Toolkit
 PORTVERSION=	2.26
+PORTREVISION=	1
 CATEGORIES=	www textproc perl5
 MASTER_SITES=	CPAN \
 		http://www.template-toolkit.org/download/
@@ -11,6 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extensive Toolkit for template processing
 
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	p5-AppConfig>=1.56:${PORTSDIR}/devel/p5-AppConfig
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
@@ -39,7 +43,9 @@ POD_POM_BUILD_DEPENDS=	p5-Pod-POM>=0:${PORTSDIR}/textproc/p5-Pod-POM
 POD_POM_RUN_DEPENDS=	p5-Pod-POM>=0:${PORTSDIR}/textproc/p5-Pod-POM
 
 post-patch:
-	@${REINPLACE_CMD} -e '/PREFIX/ s|/usr/local|${PREFIX}/share|' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e '/PREFIX/ s|/usr/local|${PREFIX}/share|' ${WRKSRC}/Makefile.PL
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Template/Stash/XS/XS.so
 
 .include <bsd.port.mk>
diff --git a/www/p5-Template-Toolkit/pkg-plist b/www/p5-Template-Toolkit/pkg-plist
index 66d670a3d1d1..1b126b4a120b 100644
--- a/www/p5-Template-Toolkit/pkg-plist
+++ b/www/p5-Template-Toolkit/pkg-plist
@@ -1,70 +1,5 @@
 bin/tpage
 bin/ttree
-%%PERL5_MAN3%%/Template.3.gz
-%%PERL5_MAN3%%/Template::Base.3.gz
-%%PERL5_MAN3%%/Template::Config.3.gz
-%%PERL5_MAN3%%/Template::Constants.3.gz
-%%PERL5_MAN3%%/Template::Context.3.gz
-%%PERL5_MAN3%%/Template::Directive.3.gz
-%%PERL5_MAN3%%/Template::Document.3.gz
-%%PERL5_MAN3%%/Template::Exception.3.gz
-%%PERL5_MAN3%%/Template::FAQ.3.gz
-%%PERL5_MAN3%%/Template::Filters.3.gz
-%%PERL5_MAN3%%/Template::Grammar.3.gz
-%%PERL5_MAN3%%/Template::Iterator.3.gz
-%%PERL5_MAN3%%/Template::Manual.3.gz
-%%PERL5_MAN3%%/Template::Manual::Config.3.gz
-%%PERL5_MAN3%%/Template::Manual::Credits.3.gz
-%%PERL5_MAN3%%/Template::Manual::Directives.3.gz
-%%PERL5_MAN3%%/Template::Manual::Filters.3.gz
-%%PERL5_MAN3%%/Template::Manual::Internals.3.gz
-%%PERL5_MAN3%%/Template::Manual::Intro.3.gz
-%%PERL5_MAN3%%/Template::Manual::Plugins.3.gz
-%%PERL5_MAN3%%/Template::Manual::Syntax.3.gz
-%%PERL5_MAN3%%/Template::Manual::VMethods.3.gz
-%%PERL5_MAN3%%/Template::Manual::Variables.3.gz
-%%PERL5_MAN3%%/Template::Manual::Views.3.gz
-%%PERL5_MAN3%%/Template::Modules.3.gz
-%%PERL5_MAN3%%/Template::Namespace::Constants.3.gz
-%%PERL5_MAN3%%/Template::Parser.3.gz
-%%PERL5_MAN3%%/Template::Plugin.3.gz
-%%PERL5_MAN3%%/Template::Plugin::Assert.3.gz
-%%PERL5_MAN3%%/Template::Plugin::CGI.3.gz
-%%PERL5_MAN3%%/Template::Plugin::Datafile.3.gz
-%%PERL5_MAN3%%/Template::Plugin::Date.3.gz
-%%PERL5_MAN3%%/Template::Plugin::Directory.3.gz
-%%PERL5_MAN3%%/Template::Plugin::Dumper.3.gz
-%%PERL5_MAN3%%/Template::Plugin::File.3.gz
-%%PERL5_MAN3%%/Template::Plugin::Filter.3.gz
-%%PERL5_MAN3%%/Template::Plugin::Format.3.gz
-%%PERL5_MAN3%%/Template::Plugin::HTML.3.gz
-%%PERL5_MAN3%%/Template::Plugin::Image.3.gz
-%%PERL5_MAN3%%/Template::Plugin::Iterator.3.gz
-%%PERL5_MAN3%%/Template::Plugin::Math.3.gz
-%%PERL5_MAN3%%/Template::Plugin::Pod.3.gz
-%%PERL5_MAN3%%/Template::Plugin::Procedural.3.gz
-%%PERL5_MAN3%%/Template::Plugin::Scalar.3.gz
-%%PERL5_MAN3%%/Template::Plugin::String.3.gz
-%%PERL5_MAN3%%/Template::Plugin::Table.3.gz
-%%PERL5_MAN3%%/Template::Plugin::URL.3.gz
-%%PERL5_MAN3%%/Template::Plugin::View.3.gz
-%%PERL5_MAN3%%/Template::Plugin::Wrap.3.gz
-%%PERL5_MAN3%%/Template::Plugins.3.gz
-%%PERL5_MAN3%%/Template::Provider.3.gz
-%%PERL5_MAN3%%/Template::Service.3.gz
-%%PERL5_MAN3%%/Template::Stash.3.gz
-%%PERL5_MAN3%%/Template::Stash::Context.3.gz
-%%PERL5_MAN3%%/Template::Stash::XS.3.gz
-%%PERL5_MAN3%%/Template::Test.3.gz
-%%PERL5_MAN3%%/Template::Toolkit.3.gz
-%%PERL5_MAN3%%/Template::Tools.3.gz
-%%PERL5_MAN3%%/Template::Tools::tpage.3.gz
-%%PERL5_MAN3%%/Template::Tools::ttree.3.gz
-%%PERL5_MAN3%%/Template::Tutorial.3.gz
-%%PERL5_MAN3%%/Template::Tutorial::Datafile.3.gz
-%%PERL5_MAN3%%/Template::Tutorial::Web.3.gz
-%%PERL5_MAN3%%/Template::VMethods.3.gz
-%%PERL5_MAN3%%/Template::View.3.gz
 %%SITE_ARCH%%/Template.pm
 %%SITE_ARCH%%/Template/Base.pm
 %%SITE_ARCH%%/Template/Config.pm
@@ -133,3 +68,68 @@ bin/ttree
 %%SITE_ARCH%%/auto/Template/Stash/XS/XS.so
 %%PERL5_MAN1%%/tpage.1.gz
 %%PERL5_MAN1%%/ttree.1.gz
+%%PERL5_MAN3%%/Template.3.gz
+%%PERL5_MAN3%%/Template::Base.3.gz
+%%PERL5_MAN3%%/Template::Config.3.gz
+%%PERL5_MAN3%%/Template::Constants.3.gz
+%%PERL5_MAN3%%/Template::Context.3.gz
+%%PERL5_MAN3%%/Template::Directive.3.gz
+%%PERL5_MAN3%%/Template::Document.3.gz
+%%PERL5_MAN3%%/Template::Exception.3.gz
+%%PERL5_MAN3%%/Template::FAQ.3.gz
+%%PERL5_MAN3%%/Template::Filters.3.gz
+%%PERL5_MAN3%%/Template::Grammar.3.gz
+%%PERL5_MAN3%%/Template::Iterator.3.gz
+%%PERL5_MAN3%%/Template::Manual.3.gz
+%%PERL5_MAN3%%/Template::Manual::Config.3.gz
+%%PERL5_MAN3%%/Template::Manual::Credits.3.gz
+%%PERL5_MAN3%%/Template::Manual::Directives.3.gz
+%%PERL5_MAN3%%/Template::Manual::Filters.3.gz
+%%PERL5_MAN3%%/Template::Manual::Internals.3.gz
+%%PERL5_MAN3%%/Template::Manual::Intro.3.gz
+%%PERL5_MAN3%%/Template::Manual::Plugins.3.gz
+%%PERL5_MAN3%%/Template::Manual::Syntax.3.gz
+%%PERL5_MAN3%%/Template::Manual::VMethods.3.gz
+%%PERL5_MAN3%%/Template::Manual::Variables.3.gz
+%%PERL5_MAN3%%/Template::Manual::Views.3.gz
+%%PERL5_MAN3%%/Template::Modules.3.gz
+%%PERL5_MAN3%%/Template::Namespace::Constants.3.gz
+%%PERL5_MAN3%%/Template::Parser.3.gz
+%%PERL5_MAN3%%/Template::Plugin.3.gz
+%%PERL5_MAN3%%/Template::Plugin::Assert.3.gz
+%%PERL5_MAN3%%/Template::Plugin::CGI.3.gz
+%%PERL5_MAN3%%/Template::Plugin::Datafile.3.gz
+%%PERL5_MAN3%%/Template::Plugin::Date.3.gz
+%%PERL5_MAN3%%/Template::Plugin::Directory.3.gz
+%%PERL5_MAN3%%/Template::Plugin::Dumper.3.gz
+%%PERL5_MAN3%%/Template::Plugin::File.3.gz
+%%PERL5_MAN3%%/Template::Plugin::Filter.3.gz
+%%PERL5_MAN3%%/Template::Plugin::Format.3.gz
+%%PERL5_MAN3%%/Template::Plugin::HTML.3.gz
+%%PERL5_MAN3%%/Template::Plugin::Image.3.gz
+%%PERL5_MAN3%%/Template::Plugin::Iterator.3.gz
+%%PERL5_MAN3%%/Template::Plugin::Math.3.gz
+%%PERL5_MAN3%%/Template::Plugin::Pod.3.gz
+%%PERL5_MAN3%%/Template::Plugin::Procedural.3.gz
+%%PERL5_MAN3%%/Template::Plugin::Scalar.3.gz
+%%PERL5_MAN3%%/Template::Plugin::String.3.gz
+%%PERL5_MAN3%%/Template::Plugin::Table.3.gz
+%%PERL5_MAN3%%/Template::Plugin::URL.3.gz
+%%PERL5_MAN3%%/Template::Plugin::View.3.gz
+%%PERL5_MAN3%%/Template::Plugin::Wrap.3.gz
+%%PERL5_MAN3%%/Template::Plugins.3.gz
+%%PERL5_MAN3%%/Template::Provider.3.gz
+%%PERL5_MAN3%%/Template::Service.3.gz
+%%PERL5_MAN3%%/Template::Stash.3.gz
+%%PERL5_MAN3%%/Template::Stash::Context.3.gz
+%%PERL5_MAN3%%/Template::Stash::XS.3.gz
+%%PERL5_MAN3%%/Template::Test.3.gz
+%%PERL5_MAN3%%/Template::Toolkit.3.gz
+%%PERL5_MAN3%%/Template::Tools.3.gz
+%%PERL5_MAN3%%/Template::Tools::tpage.3.gz
+%%PERL5_MAN3%%/Template::Tools::ttree.3.gz
+%%PERL5_MAN3%%/Template::Tutorial.3.gz
+%%PERL5_MAN3%%/Template::Tutorial::Datafile.3.gz
+%%PERL5_MAN3%%/Template::Tutorial::Web.3.gz
+%%PERL5_MAN3%%/Template::VMethods.3.gz
+%%PERL5_MAN3%%/Template::View.3.gz