- Update to 3.49

4 files changed, 39 insertions, 22 deletions

diff --git a/www/p5-Gantry/Makefile b/www/p5-Gantry/Makefile
index 3da2b36b9e70..c0e8e6000b7a 100644
--- a/www/p5-Gantry/Makefile
+++ b/www/p5-Gantry/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Gantry
-PORTVERSION=	3.47
+PORTVERSION=	3.49
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Gantry
@@ -68,9 +68,10 @@ MAN3=		Gantry.3 \
 		Gantry::Control::Model::auth_pages_cdbi.3 \
 		Gantry::Control::Model::auth_users.3 \
 		Gantry::Control::Model::auth_users_cdbi.3 \
+		Gantry::Docs.3 Gantry::Docs::Tutorial.3 \
 		Gantry::Docs::About.3 Gantry::Docs::DBConn.3 \
+		Gantry::Docs::Cookbook.3 \
 		Gantry::Docs::FAQ.3 Gantry::Docs::QuickStart.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 \
@@ -83,8 +84,11 @@ MAN3=		Gantry.3 \
 		Gantry::Plugins::Cache.3 \
 		Gantry::Plugins::Cache::FastMmap.3 \
 		Gantry::Plugins::Cache::Memcached.3 \
+		Gantry::Plugins::Cache::Storable.3 \
 		Gantry::Plugins::DBIxClassConn.3 Gantry::Plugins::Static.3 \
-		Gantry::Plugins::SOAPMP20.3 \
+		Gantry::Plugins::PageCache.3 \
+		Gantry::Plugins::SOAP::Doc.3 \
+		Gantry::Plugins::SOAP::RPC.3 \
 		Gantry::Plugins::Session.3 \
 		Gantry::Plugins::Validate.3 Gantry::Server.3 Gantry::Stash.3 \
 		Gantry::Stash::Controller.3 Gantry::Stash::View.3 \
@@ -97,10 +101,13 @@ MAN3=		Gantry.3 \
 		Gantry::Utils::DBConnHelper::MP20.3 \
 		Gantry::Utils::DBConnHelper::Script.3 \
 		Gantry::Utils::DBIxClass.3 Gantry::Utils::FormErrors.3 Gantry::Utils::HTML.3 \
+		Gantry::Utils::FormMunger.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::TablePerms.3 \
+		Gantry::Utils::Threeway.3 \
 		Template::Plugin::GantryAuthCookie.3
 
 .include <bsd.port.pre.mk>
diff --git a/www/p5-Gantry/distinfo b/www/p5-Gantry/distinfo
index d43f9fa4be57..aab4cdc154d5 100644
--- a/www/p5-Gantry/distinfo
+++ b/www/p5-Gantry/distinfo
@@ -1,3 +1,3 @@
-MD5 (Gantry-3.47.tar.gz) = 19f07b7e5a3f7a7faab3bbe91ce8501d
-SHA256 (Gantry-3.47.tar.gz) = eea4d4eb568f8fa27f7493be00709201a894fd3767cf6e6ad1c2d9579e26ae32
-SIZE (Gantry-3.47.tar.gz) = 192183
+MD5 (Gantry-3.49.tar.gz) = 9ece6ae669d325620c225726ee662818
+SHA256 (Gantry-3.49.tar.gz) = 2ee6f37bacb86daa79e73a2b7813e1496cbb502be887701886f0fe41cc3d0c71
+SIZE (Gantry-3.49.tar.gz) = 1392037
diff --git a/www/p5-Gantry/files/patch-Build.PL b/www/p5-Gantry/files/patch-Build.PL
index c25157eab6e8..1997163baae7 100644
--- a/www/p5-Gantry/files/patch-Build.PL
+++ b/www/p5-Gantry/files/patch-Build.PL
@@ -1,5 +1,5 @@
---- Build.PL.orig	Tue Dec 12 00:12:23 2006
-+++ Build.PL	Wed Jan  3 11:37:09 2007
+--- Build.PL.orig	Tue May  1 05:49:23 2007
++++ Build.PL	Wed May  2 09:23:17 2007
 @@ -36,10 +36,10 @@
      web_files => \@web_dirs,
      build_web_directory => 'root',
@@ -15,7 +15,7 @@
      },
      create_makefile_pl => 'passthrough',
      license            => 'perl',
-@@ -98,7 +98,7 @@
+@@ -105,7 +105,7 @@
  if ( not -d $template_path ) {
      my $make_path = $build->y_n(
          "$template_path does not exist, should I make it?",
@@ -24,11 +24,10 @@
      );
  
      if ( $make_path ) {
-@@ -131,101 +131,6 @@
-         $self->process_web_files( 'web' );
+@@ -139,103 +139,6 @@
  
      }
--
+ 
 -    sub ACTION_install {
 -        my $self = shift;
 -        
@@ -77,14 +76,18 @@
 -
 -EO_INIT
 -
--            open( INIT_FILE, "> blib/lib/Gantry/Init.pm" ) or die "$!";
--            print INIT_FILE $init_pkg;
--            close INIT_FILE;
+-            for my $dst ("blib/lib/Gantry/Init.pm", $initf) {
+-                my $orig_mode = (stat $dst)[2];
+-                my $rw_mode = 0666;
+-                chmod $rw_mode, $dst or die "Can't chmod $rw_mode $dst: $!";
+-                open( INIT_FILE, "> $dst" ) or die "$!";
+-                print INIT_FILE $init_pkg;
+-                close INIT_FILE;
+-
+-                # restore the perms
+-                chmod $orig_mode, $dst or die "Can't chmod $orig_mode $dst: $!";
+-            } 
 -
--            open( INIT_FILE, "> $initf" ) or die "$!";
--            print INIT_FILE $init_pkg;
--            close INIT_FILE;
--            
 -            eval {  
 -                # this should have been done during perl Build.PL
 -                if ( not -d $tmpl_dir ) {
@@ -101,12 +104,11 @@
 -                $self->blib, 'web', $p->{build_web_directory} 
 -            );  
 -            
--            my $num;
 -            eval {
 -                require File::Copy::Recursive;
 -                import File::Copy::Recursive 'dircopy';
 -
--                $num = dircopy($blib_tmpl_dir, $tmpl_dir);
+-                $num = dircopy($blib_tmpl_dir, $tmpl_dir) || 0;
 -            };
 -            if ( $@ ) {
 -                print "\nError coping templates:\n";
diff --git a/www/p5-Gantry/pkg-plist b/www/p5-Gantry/pkg-plist
index f1fb6fb6f2c6..23cf64503f7c 100644
--- a/www/p5-Gantry/pkg-plist
+++ b/www/p5-Gantry/pkg-plist
@@ -40,6 +40,7 @@
 %%SITE_PERL%%/Gantry/Control/Model/auth_users_cdbi.pm
 %%SITE_PERL%%/Gantry/Docs.pod
 %%SITE_PERL%%/Gantry/Docs/About.pod
+%%SITE_PERL%%/Gantry/Docs/Cookbook.pod
 %%SITE_PERL%%/Gantry/Docs/DBConn.pod
 %%SITE_PERL%%/Gantry/Docs/FAQ.pod
 %%SITE_PERL%%/Gantry/Docs/QuickStart.pod
@@ -59,9 +60,12 @@
 %%SITE_PERL%%/Gantry/Plugins/Cache.pm
 %%SITE_PERL%%/Gantry/Plugins/Cache/FastMmap.pm
 %%SITE_PERL%%/Gantry/Plugins/Cache/Memcached.pm
+%%SITE_PERL%%/Gantry/Plugins/Cache/Storable.pm
 %%SITE_PERL%%/Gantry/Plugins/Calendar.pm
 %%SITE_PERL%%/Gantry/Plugins/DBIxClassConn.pm
-%%SITE_PERL%%/Gantry/Plugins/SOAPMP20.pm
+%%SITE_PERL%%/Gantry/Plugins/PageCache.pm
+%%SITE_PERL%%/Gantry/Plugins/SOAP/Doc.pm
+%%SITE_PERL%%/Gantry/Plugins/SOAP/RPC.pm
 %%SITE_PERL%%/Gantry/Plugins/Session.pm
 %%SITE_PERL%%/Gantry/Plugins/Static.pm
 %%SITE_PERL%%/Gantry/Plugins/Validate.pm
@@ -83,6 +87,7 @@
 %%SITE_PERL%%/Gantry/Utils/DBConnHelper/Script.pm
 %%SITE_PERL%%/Gantry/Utils/DBIxClass.pm
 %%SITE_PERL%%/Gantry/Utils/FormErrors.pm
+%%SITE_PERL%%/Gantry/Utils/FormMunger.pm
 %%SITE_PERL%%/Gantry/Utils/HTML.pm
 %%SITE_PERL%%/Gantry/Utils/Model.pm
 %%SITE_PERL%%/Gantry/Utils/Model/Auth.pm
@@ -91,6 +96,8 @@
 %%SITE_PERL%%/Gantry/Utils/PODViewer.pm
 %%SITE_PERL%%/Gantry/Utils/PerlbalFixup.pm
 %%SITE_PERL%%/Gantry/Utils/SQL.pm
+%%SITE_PERL%%/Gantry/Utils/TablePerms.pm
+%%SITE_PERL%%/Gantry/Utils/Threeway.pm
 %%SITE_PERL%%/Gantry/Utils/Validate.pm
 %%SITE_PERL%%/Template/Plugin/GantryAuthCookie.pm
 @dirrmtry %%SITE_PERL%%/Template/Plugin
@@ -101,6 +108,7 @@
 @dirrmtry %%SITE_PERL%%/Gantry/Template
 @dirrmtry %%SITE_PERL%%/Gantry/Stash/View
 @dirrmtry %%SITE_PERL%%/Gantry/Stash
+@dirrmtry %%SITE_PERL%%/Gantry/Plugins/SOAP
 @dirrmtry %%SITE_PERL%%/Gantry/Plugins/Cache
 @dirrmtry %%SITE_PERL%%/Gantry/Plugins/AutoCRUDHelper
 @dirrmtry %%SITE_PERL%%/Gantry/Plugins