3 files changed, 68 insertions, 73 deletions

diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile
index e4ef82d74637..d088246ad6eb 100644
--- a/www/p5-Template-Toolkit/Makefile
+++ b/www/p5-Template-Toolkit/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extensive Toolkit for template processing
 
 BUILD_DEPENDS=	p5-AppConfig>=1.56:${PORTSDIR}/devel/p5-AppConfig
-RUN_DEPENDS=	p5-AppConfig>=1.56:${PORTSDIR}/devel/p5-AppConfig
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
 		p5-Pod-POM>=0:${PORTSDIR}/textproc/p5-Pod-POM
 
@@ -26,9 +26,6 @@ USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_ARGS=	TT_ACCEPT=y
 
-NO_STAGE=	yes
-.include "Makefile.man"
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDATE_CALC}
diff --git a/www/p5-Template-Toolkit/Makefile.man b/www/p5-Template-Toolkit/Makefile.man
deleted file mode 100644
index 06433adea66a..000000000000
--- a/www/p5-Template-Toolkit/Makefile.man
+++ /dev/null
@@ -1,69 +0,0 @@
-# $FreeBSD$
-MAN1+=	tpage.1
-MAN1+=	ttree.1
-
-MAN3+=	Template.3
-MAN3+=	Template::Base.3
-MAN3+=	Template::Config.3
-MAN3+=	Template::Constants.3
-MAN3+=	Template::Context.3
-MAN3+=	Template::Directive.3
-MAN3+=	Template::Document.3
-MAN3+=	Template::Exception.3
-MAN3+=	Template::FAQ.3
-MAN3+=	Template::Filters.3
-MAN3+=	Template::Grammar.3
-MAN3+=	Template::Iterator.3
-MAN3+=	Template::Manual.3
-MAN3+=	Template::Manual::Config.3
-MAN3+=	Template::Manual::Credits.3
-MAN3+=	Template::Manual::Directives.3
-MAN3+=	Template::Manual::Filters.3
-MAN3+=	Template::Manual::Internals.3
-MAN3+=	Template::Manual::Intro.3
-MAN3+=	Template::Manual::Plugins.3
-MAN3+=	Template::Manual::Syntax.3
-MAN3+=	Template::Manual::VMethods.3
-MAN3+=	Template::Manual::Variables.3
-MAN3+=	Template::Manual::Views.3
-MAN3+=	Template::Modules.3
-MAN3+=	Template::Namespace::Constants.3
-MAN3+=	Template::Parser.3
-MAN3+=	Template::Plugin.3
-MAN3+=	Template::Plugin::Assert.3
-MAN3+=	Template::Plugin::CGI.3
-MAN3+=	Template::Plugin::Datafile.3
-MAN3+=	Template::Plugin::Date.3
-MAN3+=	Template::Plugin::Directory.3
-MAN3+=	Template::Plugin::Dumper.3
-MAN3+=	Template::Plugin::File.3
-MAN3+=	Template::Plugin::Filter.3
-MAN3+=	Template::Plugin::Format.3
-MAN3+=	Template::Plugin::HTML.3
-MAN3+=	Template::Plugin::Image.3
-MAN3+=	Template::Plugin::Iterator.3
-MAN3+=	Template::Plugin::Math.3
-MAN3+=	Template::Plugin::Pod.3
-MAN3+=	Template::Plugin::Procedural.3
-MAN3+=	Template::Plugin::Scalar.3
-MAN3+=	Template::Plugin::String.3
-MAN3+=	Template::Plugin::Table.3
-MAN3+=	Template::Plugin::URL.3
-MAN3+=	Template::Plugin::View.3
-MAN3+=	Template::Plugin::Wrap.3
-MAN3+=	Template::Plugins.3
-MAN3+=	Template::Provider.3
-MAN3+=	Template::Service.3
-MAN3+=	Template::Stash.3
-MAN3+=	Template::Stash::Context.3
-MAN3+=	Template::Stash::XS.3
-MAN3+=	Template::Test.3
-MAN3+=	Template::Toolkit.3
-MAN3+=	Template::Tools.3
-MAN3+=	Template::Tools::tpage.3
-MAN3+=	Template::Tools::ttree.3
-MAN3+=	Template::Tutorial.3
-MAN3+=	Template::Tutorial::Datafile.3
-MAN3+=	Template::Tutorial::Web.3
-MAN3+=	Template::VMethods.3
-MAN3+=	Template::View.3
diff --git a/www/p5-Template-Toolkit/pkg-plist b/www/p5-Template-Toolkit/pkg-plist
index 78d022285dbf..59a9f5ceeca3 100644
--- a/www/p5-Template-Toolkit/pkg-plist
+++ b/www/p5-Template-Toolkit/pkg-plist
@@ -1,5 +1,70 @@
 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_PERL%%/%%PERL_ARCH%%/Template.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Base.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Template/Config.pm
@@ -68,6 +133,8 @@ bin/ttree
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/XS/XS.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/XS/XS.so
+man/man1/tpage.1.gz
+man/man1/ttree.1.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash/XS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Stash
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template