4 files changed, 32 insertions, 57 deletions

diff --git a/www/p5-Gantry/Makefile b/www/p5-Gantry/Makefile
index a5d333efaa19..46c04fbcb583 100644
--- a/www/p5-Gantry/Makefile
+++ b/www/p5-Gantry/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Gantry
-PORTVERSION=	3.42
+PORTVERSION=	3.45
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Gantry
@@ -24,6 +24,8 @@ RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
 		${SITE_PERL}/HTTP/Server/Simple.pm:${PORTSDIR}/www/p5-HTTP-Server-Simple \
 		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
 		p5-Template-Toolkit>=2.0:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	${RUN_DEPENDS}
+BUILD_DEPENDS+=	${SITE_PERL}/Test/Exception.pm:${PORTSDIR}/devel/p5-Test-Exception
 
 PERL_MODBUILD=	yes
 
@@ -63,12 +65,13 @@ MAN3=		Gantry.3 Gantry::Conf.3 Gantry::Conf::FAQ.3 \
 		Gantry::Control::Model::auth_users_cdbi.3 \
 		Gantry::Docs::About.3 Gantry::Docs::DBConn.3 \
 		Gantry::Docs::FAQ.3 Gantry::Docs::QuickStart.3 \
-		Gantry::Docs::TOC.3 Gantry::Docs::Tutorial.3 \
+		Gantry::Docs.3 Gantry::Docs::Tutorial.3 \
 		Gantry::Docs::Why.3 Gantry::Engine::CGI.3 \
 		Gantry::Engine::MP13.3 Gantry::Engine::MP20.3 \
 		Gantry::Init.3 Gantry::Plugins::AutoCRUD.3 \
 		Gantry::Plugins::AutoCRUDHelper::CDBI.3 \
 		Gantry::Plugins::AutoCRUDHelper::DBIxClass.3 \
+		Gantry::Plugins::AuthCookie.3 \
 		Gantry::Plugins::CRUD.3 Gantry::Plugins::Calendar.3 \
 		Gantry::Plugins::DBIxClassConn.3 Gantry::Plugins::Static.3 \
 		Gantry::Plugins::Validate.3 Gantry::Server.3 Gantry::Stash.3 \
@@ -81,11 +84,12 @@ MAN3=		Gantry.3 Gantry::Conf.3 Gantry::Conf::FAQ.3 \
 		Gantry::Utils::DBConnHelper::MP13.3 \
 		Gantry::Utils::DBConnHelper::MP20.3 \
 		Gantry::Utils::DBConnHelper::Script.3 \
-		Gantry::Utils::DBIxClass.3 Gantry::Utils::HTML.3 \
+		Gantry::Utils::DBIxClass.3 Gantry::Utils::FormErrors.3 Gantry::Utils::HTML.3 \
 		Gantry::Utils::Model.3 Gantry::Utils::Model::Auth.3 \
 		Gantry::Utils::Model::Regular.3 Gantry::Utils::ModelHelper.3 \
 		Gantry::Utils::PODViewer.3 Gantry::Utils::PerlbalFixup.3 \
-		Gantry::Utils::SQL.3 Gantry::Utils::Validate.3
+		Gantry::Utils::SQL.3 Gantry::Utils::Validate.3 \
+		Template::Plugin::GantryAuthCookie.3
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/p5-Gantry/distinfo b/www/p5-Gantry/distinfo
index 3a5f730ee707..0cbfdceb1608 100644
--- a/www/p5-Gantry/distinfo
+++ b/www/p5-Gantry/distinfo
@@ -1,3 +1,3 @@
-MD5 (Gantry-3.42.tar.gz) = 02a1c21d77d61c8766337df9d584d977
-SHA256 (Gantry-3.42.tar.gz) = 510b46d38d46841b86de5ef3b7cd23d0dbb413a24ba1c0a90ab564b3242b8723
-SIZE (Gantry-3.42.tar.gz) = 7856362
+MD5 (Gantry-3.45.tar.gz) = 8e58b7048781c4daf6101511caa145a1
+SHA256 (Gantry-3.45.tar.gz) = 0008595e021374df8499990bb77dad0686a9f986caefc1dde6ebee3c26f63c38
+SIZE (Gantry-3.45.tar.gz) = 171109
diff --git a/www/p5-Gantry/files/patch-Build.PL b/www/p5-Gantry/files/patch-Build.PL
index 3b6d47ef2fac..783ec9deaf88 100644
--- a/www/p5-Gantry/files/patch-Build.PL
+++ b/www/p5-Gantry/files/patch-Build.PL
@@ -1,6 +1,6 @@
---- Build.PL.orig	Thu Nov  9 07:59:16 2006
-+++ Build.PL	Thu Nov  9 08:01:28 2006
-@@ -91,135 +91,6 @@
+--- Build.PL.orig	Tue Dec 19 15:47:23 2006
++++ Build.PL	Tue Dec 19 15:47:48 2006
+@@ -132,101 +132,6 @@
  
      }
  
@@ -10,49 +10,12 @@
 -        my $p = $self->{properties};        
 -        
 -        my $initf = "$p->{install_sets}{site}{lib}/$p->{dist_name}/Init.pm";
--        if ( -e $initf ) {
--            require "$initf";
--            $p->{install_web_directories}{default} = Gantry::Init::base_root();
--        }
 -                
 -        $self->SUPER::ACTION_install();
--        
--        my $DEF_TMPL_DIR = $p->{install_web_directory};
--        my $prompt;
--        my $count = 0;
--        my ( %dir_hash, @choices );
--
--        print "\n\nGantry comes with a set of default templates that\n"
--            . "need to be written to disk. A typical location for these\n"
--            . "templates is your web server document root.\n\n"
--            . "Enter a directory [$p->{install_web_directories}{default}]\n";
--
--        my $choice = $self->prompt(
--            " ",
--            $p->{install_web_directories}{default},
--        );
--        
--        my $tmpl_dir;
--        if ( $choice =~ /\// ) {
--            $tmpl_dir = $choice;
--        }
--        elsif ( ! defined $p->{install_web_directories}{$choice} ) {
--            $tmpl_dir = '__skip__';
--        }
--        else {
--            $tmpl_dir = $p->{install_web_directories}{$choice}
--        }
--        
--        $tmpl_dir =~ s/\/$//g;
--            
--        if( $tmpl_dir && $tmpl_dir ne '__skip__' ) {
 -
--            print "\n\nDirectory doesn't exist. Create $tmpl_dir? [y]\n";
+-        my $tmpl_dir = $self->notes( 'install_web_directory' );
 -            
--            if ( ! -d $tmpl_dir ) {
--                my $create = $self->y_n(  " ", 'y' );
--                exit unless $create;
--            }
+-        if( $tmpl_dir && $tmpl_dir ne '__skip__' ) {
 -
 -            # write Init.pm file with install options
 -
@@ -98,7 +61,10 @@
 -            close INIT_FILE;
 -            
 -            eval {  
--                File::Path::mkpath( $tmpl_dir );
+-                # this should have been done during perl Build.PL
+-                if ( not -d $tmpl_dir ) {
+-                    File::Path::mkpath( $tmpl_dir );
+-                }
 -            };
 -            if ( $@ ) {
 -                print "Error: unable to create directory $tmpl_dir\n";
diff --git a/www/p5-Gantry/pkg-plist b/www/p5-Gantry/pkg-plist
index 2978938f7224..c4b253039dc0 100644
--- a/www/p5-Gantry/pkg-plist
+++ b/www/p5-Gantry/pkg-plist
@@ -37,17 +37,18 @@
 %%SITE_PERL%%/Gantry/Control/Model/auth_pages_cdbi.pm
 %%SITE_PERL%%/Gantry/Control/Model/auth_users.pm
 %%SITE_PERL%%/Gantry/Control/Model/auth_users_cdbi.pm
-%%SITE_PERL%%/Gantry/Docs/About.pm
-%%SITE_PERL%%/Gantry/Docs/DBConn.pm
-%%SITE_PERL%%/Gantry/Docs/FAQ.pm
-%%SITE_PERL%%/Gantry/Docs/QuickStart.pm
-%%SITE_PERL%%/Gantry/Docs/TOC.pm
-%%SITE_PERL%%/Gantry/Docs/Tutorial.pm
-%%SITE_PERL%%/Gantry/Docs/Why.pm
+%%SITE_PERL%%/Gantry/Docs.pod
+%%SITE_PERL%%/Gantry/Docs/About.pod
+%%SITE_PERL%%/Gantry/Docs/DBConn.pod
+%%SITE_PERL%%/Gantry/Docs/FAQ.pod
+%%SITE_PERL%%/Gantry/Docs/QuickStart.pod
+%%SITE_PERL%%/Gantry/Docs/Tutorial.pod
+%%SITE_PERL%%/Gantry/Docs/Why.pod
 %%SITE_PERL%%/Gantry/Engine/CGI.pm
 %%SITE_PERL%%/Gantry/Engine/MP13.pm
 %%SITE_PERL%%/Gantry/Engine/MP20.pm
 %%SITE_PERL%%/Gantry/Init.pm
+%%SITE_PERL%%/Gantry/Plugins/AuthCookie.pm
 %%SITE_PERL%%/Gantry/Plugins/AutoCRUD.pm
 %%SITE_PERL%%/Gantry/Plugins/AutoCRUDHelper/CDBI.pm
 %%SITE_PERL%%/Gantry/Plugins/AutoCRUDHelper/DBIxClass.pm
@@ -73,6 +74,7 @@
 %%SITE_PERL%%/Gantry/Utils/DBConnHelper/MP20.pm
 %%SITE_PERL%%/Gantry/Utils/DBConnHelper/Script.pm
 %%SITE_PERL%%/Gantry/Utils/DBIxClass.pm
+%%SITE_PERL%%/Gantry/Utils/FormErrors.pm
 %%SITE_PERL%%/Gantry/Utils/HTML.pm
 %%SITE_PERL%%/Gantry/Utils/Model.pm
 %%SITE_PERL%%/Gantry/Utils/Model/Auth.pm
@@ -82,6 +84,9 @@
 %%SITE_PERL%%/Gantry/Utils/PerlbalFixup.pm
 %%SITE_PERL%%/Gantry/Utils/SQL.pm
 %%SITE_PERL%%/Gantry/Utils/Validate.pm
+%%SITE_PERL%%/Template/Plugin/GantryAuthCookie.pm
+@dirrmtry %%SITE_PERL%%/Template/Plugin
+@dirrmtry %%SITE_PERL%%/Template
 @dirrmtry %%SITE_PERL%%/Gantry/Utils/Model
 @dirrmtry %%SITE_PERL%%/Gantry/Utils/DBConnHelper
 @dirrmtry %%SITE_PERL%%/Gantry/Utils