4 files changed, 17 insertions, 12 deletions

diff --git a/www/p5-Maypole/Makefile b/www/p5-Maypole/Makefile
index ef7e8d18e220..11a4da535a96 100644
--- a/www/p5-Maypole/Makefile
+++ b/www/p5-Maypole/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	Maypole
-PORTVERSION=	2.09
+PORTVERSION=	2.10
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../by-authors/id/S/SI/SIMONFLK
+MASTER_SITE_SUBDIR=	../by-authors/id/T/TE/TEEJAY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
@@ -31,7 +31,8 @@ BUILD_DEPENDS=	${SITE_PERL}/Class/DBI/Loader.pm:${PORTSDIR}/databases/p5-Class-D
 		${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}/HTTP/Headers.pm:${PORTSDIR}/www/p5-libwww \
+		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 OPTIONS=	MODPERL "mod_perl support" on
@@ -40,8 +41,8 @@ OPTIONS=	MODPERL "mod_perl support" on
 
 .if defined(WITH_MODPERL)
 .if defined(WITH_APACHE2)
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq2
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq2
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2
 .else
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq
@@ -69,6 +70,7 @@ MAN3=		Apache::MVC.3 \
 		Maypole::Manual::BuySpy.3 \
 		Maypole::Manual::Flox.3 \
 		Maypole::Manual::Model.3 \
+		Maypole::Manual::Plugins.3 \
 		Maypole::Manual::Request.3 \
 		Maypole::Manual::StandardTemplates.3 \
 		Maypole::Manual::View.3 \
@@ -76,6 +78,7 @@ MAN3=		Apache::MVC.3 \
 		Maypole::Model::Base.3 \
 		Maypole::Model::CDBI.3 \
 		Maypole::Model::CDBI::Plain.3 \
+		Maypole::Session.3 \
 		Maypole::View::Base.3 \
 		Maypole::View::TT.3
 
@@ -129,7 +132,7 @@ post-install:
 	@ ${CAT} ${PKGMESSAGE}
 
 .if ${PERL_LEVEL} < 500600
-IGNORE=		"Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE=		Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Maypole/distinfo b/www/p5-Maypole/distinfo
index d9c8f0ba0ce0..a6c7cf48c8c8 100644
--- a/www/p5-Maypole/distinfo
+++ b/www/p5-Maypole/distinfo
@@ -1,2 +1,2 @@
-MD5 (Maypole-2.09.tar.gz) = d296e401d3ee493d9d12c71c6724fe8f
-SIZE (Maypole-2.09.tar.gz) = 84242
+MD5 (Maypole-2.10.tar.gz) = 5d908a447d4e6f6364403aa56b1ab211
+SIZE (Maypole-2.10.tar.gz) = 87985
diff --git a/www/p5-Maypole/files/patch-Makefile.PL b/www/p5-Maypole/files/patch-Makefile.PL
index be310c2ab9e5..de760fe2ac6e 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 Dec 24 04:50:50 2004
-+++ Makefile.PL	Sun Dec 26 12:50:10 2004
+--- Makefile.PL.orig	Fri Jul 22 15:06:47 2005
++++ Makefile.PL	Fri Jul 22 15:08:01 2005
 @@ -24,7 +24,6 @@
          HTTP::Headers                    => 1.59,
          Template                         => 0,
          Template::Plugin::Class          => 0,
 -        Test::MockModule                 => 0,
+ 	Digest::MD5			 => 0,
      },    # e.g., Module::Name => 1.1
      (
-         $] >= 5.005
-@@ -50,7 +49,7 @@
+@@ -51,7 +50,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-plist b/www/p5-Maypole/pkg-plist
index c6b8f59d8a13..5e9bf9d24269 100644
--- a/www/p5-Maypole/pkg-plist
+++ b/www/p5-Maypole/pkg-plist
@@ -12,6 +12,7 @@
 %%SITE_PERL%%/Maypole/Manual/BuySpy.pod
 %%SITE_PERL%%/Maypole/Manual/Flox.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
@@ -19,6 +20,7 @@
 %%SITE_PERL%%/Maypole/Model/Base.pm
 %%SITE_PERL%%/Maypole/Model/CDBI.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%%/%%PERL_ARCH%%/auto/Maypole/.packlist