5 files changed, 104 insertions, 82 deletions

diff --git a/www/p5-Maypole/Makefile b/www/p5-Maypole/Makefile
index 1c0f226c32e9..f1052eaaad48 100644
--- a/www/p5-Maypole/Makefile
+++ b/www/p5-Maypole/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	Maypole
-PORTVERSION=	2.10
+PORTVERSION=	2.13
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/T/TE/TEEJAY
@@ -14,27 +14,30 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	MVC web application framework
 
-RUN_DEPENDS=	${SITE_PERL}/Class/DBI/Loader.pm:${PORTSDIR}/databases/p5-Class-DBI-Loader \
-		${SITE_PERL}/Class/DBI/AbstractSearch.pm:${PORTSDIR}/databases/p5-Class-DBI-AbstractSearch \
-		${SITE_PERL}/Class/DBI/Pager.pm:${PORTSDIR}/databases/p5-Class-DBI-Pager \
-		${SITE_PERL}/Class/DBI/Plugin/RetrieveAll.pm:${PORTSDIR}/databases/p5-Class-DBI-Plugin-RetrieveAll \
-		${SITE_PERL}/Class/DBI/AsForm.pm:${PORTSDIR}/databases/p5-Class-DBI-AsForm \
-		${SITE_PERL}/Class/DBI/FromCGI.pm:${PORTSDIR}/databases/p5-Class-DBI-FromCGI \
-		${SITE_PERL}/Class/DBI/Loader/Relationship.pm:${PORTSDIR}/databases/p5-Class-DBI-Loader-Relationship \
-		${SITE_PERL}/CGI/Untaint.pm:${PORTSDIR}/www/p5-CGI-Untaint \
-		${SITE_PERL}/UNIVERSAL/moniker.pm:${PORTSDIR}/devel/p5-UNIVERSAL-moniker \
-		${SITE_PERL}/UNIVERSAL/require.pm:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		${SITE_PERL}/Template/Plugin/Class.pm:${PORTSDIR}/www/p5-Template-Plugin-Class \
-		${SITE_PERL}/Class/Accessor/Fast.pm:${PORTSDIR}/devel/p5-Class-Accessor \
-		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
-		${SITE_PERL}/Lingua/EN/Inflect/Number.pm:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Number \
-		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/Class/Data/Inheritable.pm:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		${SITE_PERL}/CGI/Simple.pm:${PORTSDIR}/www/p5-CGI-Simple \
-		${SITE_PERL}/HTTP/Headers.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+RUN_DEPENDS=	p5-CGI-Simple>0:${PORTSDIR}/www/p5-CGI-Simple \
+		p5-CGI-Untaint-date>0:${PORTSDIR}/www/p5-CGI-Untaint-date \
+		p5-CGI-Untaint-email>0:${PORTSDIR}/www/p5-CGI-Untaint-email \
+		p5-CGI-Untaint>=1.26:${PORTSDIR}/www/p5-CGI-Untaint \
+		p5-Class-DBI-AbstractSearch>0:${PORTSDIR}/databases/p5-Class-DBI-AbstractSearch \
+		p5-Class-DBI-Loader-Relationship>0:${PORTSDIR}/databases/p5-Class-DBI-Loader-Relationship \
+		p5-Class-DBI-Loader>=0.02:${PORTSDIR}/databases/p5-Class-DBI-Loader \
+		p5-Class-DBI-Pager>0:${PORTSDIR}/databases/p5-Class-DBI-Pager \
+		p5-Class-DBI-Plugin-RetrieveAll>0:${PORTSDIR}/databases/p5-Class-DBI-Plugin-RetrieveAll \
+		p5-Class-DBI-Plugin-Type>0:${PORTSDIR}/databases/p5-Class-DBI-Plugin-Type \
+		p5-Class-DBI>=0.96:${PORTSDIR}/databases/p5-Class-DBI \
+		p5-Digest-MD5>0:${PORTSDIR}/security/p5-Digest-MD5 \
+		p5-File-MMagic-XS>=0.08:${PORTSDIR}/devel/p5-File-MMagic-XS \
+		p5-HTML-Tree>0:${PORTSDIR}/www/p5-HTML-Tree \
+		p5-HTTP-Body>=0.5:${PORTSDIR}/www/p5-HTTP-Body \
+		p5-Lingua-EN-Inflect-Number>0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Number \
+		p5-Template-Plugin-Class>0:${PORTSDIR}/www/p5-Template-Plugin-Class \
+		p5-Template-Toolkit>0:${PORTSDIR}/www/p5-Template-Toolkit \
+		p5-UNIVERSAL-moniker>0:${PORTSDIR}/devel/p5-UNIVERSAL-moniker \
+		p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
+		p5-URI>0:${PORTSDIR}/net/p5-URI \
+		p5-libwww>0:${PORTSDIR}/www/p5-libwww
+
 BUILD_DEPENDS=	${RUN_DEPENDS}
-BUILD_DEPENDS+=	${SITE_PERL}/Test/MockModule.pm:${PORTSDIR}/devel/p5-Test-MockModule
 
 OPTIONS=	MODPERL "mod_perl support" on
 
@@ -57,25 +60,34 @@ PKGMSG_SUB=	DOCSDIR=${DOCSDIR} \
 
 MAN3=		Apache::MVC.3 \
 		CGI::Maypole.3 \
+		CGI::Untaint::Maypole.3 \
 		Maypole.3 \
 		Maypole::Application.3 \
 		Maypole::CLI.3 \
 		Maypole::Config.3 \
 		Maypole::Constants.3 \
+		Maypole::HTTPD.3 \
+		Maypole::HTTPD::Frontend.3 \
 		Maypole::Headers.3 \
 		Maypole::Manual.3 \
 		Maypole::Manual::About.3 \
 		Maypole::Manual::Beer.3 \
 		Maypole::Manual::BuySpy.3 \
+		Maypole::Manual::Cookbook.3 \
 		Maypole::Manual::Flox.3 \
+		Maypole::Manual::Inheritance.3 \
+		Maypole::Manual::Install.3 \
 		Maypole::Manual::Model.3 \
 		Maypole::Manual::Plugins.3 \
-		Maypole::Manual::Request.3 \
 		Maypole::Manual::StandardTemplates.3 \
 		Maypole::Manual::View.3 \
 		Maypole::Manual::Workflow.3 \
 		Maypole::Model::Base.3 \
 		Maypole::Model::CDBI.3 \
+		Maypole::Model::CDBI::AsForm.3 \
+		Maypole::Model::CDBI::Base.3 \
+		Maypole::Model::CDBI::DFV.3 \
+		Maypole::Model::CDBI::FromCGI.3 \
 		Maypole::Model::CDBI::Plain.3 \
 		Maypole::Session.3 \
 		Maypole::View::Base.3 \
@@ -87,26 +99,9 @@ DOC_FILES=	../Manual.pod \
 		BuySpy.pod \
 		Flox.pod \
 		Model.pod \
-		Request.pod \
 		StandardTemplates.pod \
 		View.pod \
 		Workflow.pod
-EXAMPLE_FILES=	BeerDB.pm
-TEMPLATE_FILES=	maypole.css \
-		beer/addnew \
-		factory/addnew \
-		factory/edit \
-		factory/footer \
-		factory/frontpage \
-		factory/header \
-		factory/list \
-		factory/macros \
-		factory/maypole \
-		factory/navbar \
-		factory/pager \
-		factory/search_form \
-		factory/title \
-		factory/view
 
 pre-patch:
 	@ ${SED} ${PKGMSG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@@ -119,15 +114,8 @@ post-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/lib/Maypole/Manual/${FILE} ${DOCSDIR}
 .endfor
 	@ ${MKDIR} ${EXAMPLESDIR}
-.for FILE in ${EXAMPLE_FILES}
-	@ ${INSTALL_DATA} ${WRKSRC}/ex/${FILE} ${EXAMPLESDIR}
-.endfor
+	@ ${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
 .endif
-	@ ${MKDIR} ${DATADIR}/templates/beer
-	@ ${MKDIR} ${DATADIR}/templates/factory
-.for FILE in ${TEMPLATE_FILES}
-	@ ${INSTALL_DATA} ${WRKSRC}/templates/${FILE} ${DATADIR}/templates/${FILE}
-.endfor
 	@ ${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Maypole/distinfo b/www/p5-Maypole/distinfo
index 3ded98d10a73..62e813b1430a 100644
--- a/www/p5-Maypole/distinfo
+++ b/www/p5-Maypole/distinfo
@@ -1,3 +1,3 @@
-MD5 (Maypole-2.10.tar.gz) = 5d908a447d4e6f6364403aa56b1ab211
-SHA256 (Maypole-2.10.tar.gz) = 8a89c082b0eb9530693076ca595169ed52ed39f749ef3c7b402b972e83d0e3da
-SIZE (Maypole-2.10.tar.gz) = 87985
+MD5 (Maypole-2.13.tar.gz) = a762b7a798d2c4227402fd6b4a04a3c3
+SHA256 (Maypole-2.13.tar.gz) = 5f75a5a710cedcb6276219eb4ce3226c41f5dba72e9cabe68973a66c511ce69c
+SIZE (Maypole-2.13.tar.gz) = 153590
diff --git a/www/p5-Maypole/files/patch-Makefile.PL b/www/p5-Maypole/files/patch-Makefile.PL
index de760fe2ac6e..16b6d9f314ed 100644
--- a/www/p5-Maypole/files/patch-Makefile.PL
+++ b/www/p5-Maypole/files/patch-Makefile.PL
@@ -1,14 +1,14 @@
---- Makefile.PL.orig	Fri Jul 22 15:06:47 2005
-+++ Makefile.PL	Fri Jul 22 15:08:01 2005
-@@ -24,7 +24,6 @@
+--- ./Makefile.PL.orig	Thu Jul 20 13:50:25 2006
++++ ./Makefile.PL	Tue Apr  3 13:12:31 2007
+@@ -27,7 +27,6 @@
          HTTP::Headers                    => 1.59,
          Template                         => 0,
          Template::Plugin::Class          => 0,
 -        Test::MockModule                 => 0,
- 	Digest::MD5			 => 0,
-     },    # e.g., Module::Name => 1.1
-     (
-@@ -51,7 +50,7 @@
+         Digest::MD5			 => 0,
+ 	File::MMagic::XS		 => 0.08,
+ 	Class::DBI::Plugin::Type	 => 0,
+@@ -56,7 +55,7 @@
      eval { require DBD::SQLite } or do {
          print "Error loading DBD::SQLite, trying DBD::SQLite2\n";
          eval {require DBD::SQLite2} ? $driver = 'SQLite2'
diff --git a/www/p5-Maypole/pkg-message b/www/p5-Maypole/pkg-message
index 811ff2c1afdb..7cebb7cf8547 100644
--- a/www/p5-Maypole/pkg-message
+++ b/www/p5-Maypole/pkg-message
@@ -4,7 +4,6 @@ Maypole has now been installed.
 
 Documentation:	%%DOCSDIR%%/
 Examples:	%%EXAMPLESDIR%%/
-Templates:	%%DATADIR%%/templates/
 
 Enjoy!
 
diff --git a/www/p5-Maypole/pkg-plist b/www/p5-Maypole/pkg-plist
index faed5891f2e9..13e2be3748c5 100644
--- a/www/p5-Maypole/pkg-plist
+++ b/www/p5-Maypole/pkg-plist
@@ -1,28 +1,53 @@
 %%SITE_PERL%%/Apache/MVC.pm
 %%SITE_PERL%%/CGI/Maypole.pm
+%%SITE_PERL%%/CGI/Untaint/Maypole.pm
 %%SITE_PERL%%/Maypole.pm
 %%SITE_PERL%%/Maypole/Application.pm
 %%SITE_PERL%%/Maypole/CLI.pm
 %%SITE_PERL%%/Maypole/Config.pm
 %%SITE_PERL%%/Maypole/Constants.pm
+%%SITE_PERL%%/Maypole/HTTPD.pm
+%%SITE_PERL%%/Maypole/HTTPD/Frontend.pm
 %%SITE_PERL%%/Maypole/Headers.pm
 %%SITE_PERL%%/Maypole/Manual.pod
 %%SITE_PERL%%/Maypole/Manual/About.pod
 %%SITE_PERL%%/Maypole/Manual/Beer.pod
 %%SITE_PERL%%/Maypole/Manual/BuySpy.pod
+%%SITE_PERL%%/Maypole/Manual/Cookbook.pod
 %%SITE_PERL%%/Maypole/Manual/Flox.pod
+%%SITE_PERL%%/Maypole/Manual/Inheritance.pod
+%%SITE_PERL%%/Maypole/Manual/Install.pod
 %%SITE_PERL%%/Maypole/Manual/Model.pod
 %%SITE_PERL%%/Maypole/Manual/Plugins.pod
-%%SITE_PERL%%/Maypole/Manual/Request.pod
 %%SITE_PERL%%/Maypole/Manual/StandardTemplates.pod
 %%SITE_PERL%%/Maypole/Manual/View.pod
 %%SITE_PERL%%/Maypole/Manual/Workflow.pod
 %%SITE_PERL%%/Maypole/Model/Base.pm
 %%SITE_PERL%%/Maypole/Model/CDBI.pm
+%%SITE_PERL%%/Maypole/Model/CDBI/AsForm.pm
+%%SITE_PERL%%/Maypole/Model/CDBI/Base.pm
+%%SITE_PERL%%/Maypole/Model/CDBI/DFV.pm
+%%SITE_PERL%%/Maypole/Model/CDBI/FromCGI.pm
 %%SITE_PERL%%/Maypole/Model/CDBI/Plain.pm
 %%SITE_PERL%%/Maypole/Session.pm
 %%SITE_PERL%%/Maypole/View/Base.pm
 %%SITE_PERL%%/Maypole/View/TT.pm
+%%SITE_PERL%%/Maypole/templates/beer/addnew
+%%SITE_PERL%%/Maypole/templates/factory/addnew
+%%SITE_PERL%%/Maypole/templates/factory/edit
+%%SITE_PERL%%/Maypole/templates/factory/footer
+%%SITE_PERL%%/Maypole/templates/factory/frontpage
+%%SITE_PERL%%/Maypole/templates/factory/header
+%%SITE_PERL%%/Maypole/templates/factory/list
+%%SITE_PERL%%/Maypole/templates/factory/login
+%%SITE_PERL%%/Maypole/templates/factory/macros
+%%SITE_PERL%%/Maypole/templates/factory/maypole
+%%SITE_PERL%%/Maypole/templates/factory/maypole.css
+%%SITE_PERL%%/Maypole/templates/factory/navbar
+%%SITE_PERL%%/Maypole/templates/factory/pager
+%%SITE_PERL%%/Maypole/templates/factory/search_form
+%%SITE_PERL%%/Maypole/templates/factory/title
+%%SITE_PERL%%/Maypole/templates/factory/view
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/.packlist
 %%PORTDOCS%%%%DOCSDIR%%/About.pod
 %%PORTDOCS%%%%DOCSDIR%%/Beer.pod
@@ -30,37 +55,47 @@
 %%PORTDOCS%%%%DOCSDIR%%/Flox.pod
 %%PORTDOCS%%%%DOCSDIR%%/Manual.pod
 %%PORTDOCS%%%%DOCSDIR%%/Model.pod
-%%PORTDOCS%%%%DOCSDIR%%/Request.pod
 %%PORTDOCS%%%%DOCSDIR%%/StandardTemplates.pod
 %%PORTDOCS%%%%DOCSDIR%%/View.pod
 %%PORTDOCS%%%%DOCSDIR%%/Workflow.pod
-%%PORTDOCS%%%%EXAMPLESDIR%%/BeerDB.pm
-%%DATADIR%%/templates/maypole.css
-%%DATADIR%%/templates/beer/addnew
-%%DATADIR%%/templates/factory/addnew
-%%DATADIR%%/templates/factory/edit
-%%DATADIR%%/templates/factory/footer
-%%DATADIR%%/templates/factory/frontpage
-%%DATADIR%%/templates/factory/header
-%%DATADIR%%/templates/factory/list
-%%DATADIR%%/templates/factory/macros
-%%DATADIR%%/templates/factory/maypole
-%%DATADIR%%/templates/factory/navbar
-%%DATADIR%%/templates/factory/pager
-%%DATADIR%%/templates/factory/search_form
-%%DATADIR%%/templates/factory/title
-%%DATADIR%%/templates/factory/view
-@dirrm %%DATADIR%%/templates/factory
-@dirrm %%DATADIR%%/templates/beer
-@dirrm %%DATADIR%%/templates
-@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%EXAMPLESDIR%%/BeerDB.pm
+%%PORTDOCS%%%%EXAMPLESDIR%%/BeerDB/Base.pm
+%%PORTDOCS%%%%EXAMPLESDIR%%/BeerDB/Beer.pm
+%%PORTDOCS%%%%EXAMPLESDIR%%/beerdb.sql
+%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/BeerDB.pm
+%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/BeerDB/Base.pm
+%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/BeerDB/Beer.pm
+%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/BeerDB/Brewery.pm
+%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/BeerDB/Drinker.pm
+%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/beerdb.sql
+%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/templates/custom/addnew
+%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/templates/custom/display_inputs
+%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/templates/custom/display_search_inputs
+%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/templates/custom/edit
+%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/templates/custom/header
+%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/templates/custom/maypole.css
+%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/templates/custom/metadata
+%%PORTDOCS%%%%EXAMPLESDIR%%/fancy_example/templates/custom/search_form
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/fancy_example/templates/custom
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/fancy_example/templates
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/fancy_example/BeerDB
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/fancy_example
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/BeerDB
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole
-@dirrmtry %%SITE_PERL%%/Maypole/Manual
+@dirrmtry %%SITE_PERL%%/Maypole/templates/factory
+@dirrmtry %%SITE_PERL%%/Maypole/templates/beer
+@dirrmtry %%SITE_PERL%%/Maypole/templates
+@dirrmtry %%SITE_PERL%%/Maypole/View
+@dirrmtry %%SITE_PERL%%/Maypole/Model/CDBI
 @dirrmtry %%SITE_PERL%%/Maypole/Model/CDBI
 @dirrmtry %%SITE_PERL%%/Maypole/Model
-@dirrmtry %%SITE_PERL%%/Maypole/View
+@dirrmtry %%SITE_PERL%%/Maypole/Model
+@dirrmtry %%SITE_PERL%%/Maypole/Manual
+@dirrmtry %%SITE_PERL%%/Maypole/Manual
+@dirrmtry %%SITE_PERL%%/Maypole/HTTPD
+@dirrmtry %%SITE_PERL%%/Maypole
 @dirrmtry %%SITE_PERL%%/Maypole
 @dirrmtry %%SITE_PERL%%/CGI
 @dirrmtry %%SITE_PERL%%/Apache