- Update to 3.42

- Transfer maintainership to perl@

PR:		ports/105311
Submitted by:	Gea-Suan Lin <gslin_AT_gslin dot org>

3 files changed, 154 insertions, 18 deletions

diff --git a/www/p5-Gantry/Makefile b/www/p5-Gantry/Makefile
index 49ec18ee17d5..a5d333efaa19 100644
--- a/www/p5-Gantry/Makefile
+++ b/www/p5-Gantry/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	Gantry
-PORTVERSION=	3.40
+PORTVERSION=	3.42
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Gantry
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	gslin@gslin.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Web application framework for mod_perl, cgi, etc
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
@@ -47,8 +47,7 @@ MAN3=		Gantry.3 Gantry::Conf.3 Gantry::Conf::FAQ.3 \
 		Gantry::Control::C::AuthzBase.3 \
 		Gantry::Control::C::AuthzCDBI.3 \
 		Gantry::Control::C::AuthzRegular.3 \
-		Gantry::Control::C::Groups.3 \
-		Gantry::Control::C::Pages.3 \
+		Gantry::Control::C::Groups.3 Gantry::Control::C::Pages.3 \
 		Gantry::Control::C::Users.3 \
 		Gantry::Control::Model::GEN::auth_group_members.3 \
 		Gantry::Control::Model::GEN::auth_groups.3 \
@@ -72,22 +71,21 @@ MAN3=		Gantry.3 Gantry::Conf.3 Gantry::Conf::FAQ.3 \
 		Gantry::Plugins::AutoCRUDHelper::DBIxClass.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 Gantry::Stash::Controller.3 \
-		Gantry::Stash::View.3 Gantry::Stash::View::Form.3 \
-		Gantry::Template::Default.3 Gantry::Template::Framing.3 \
-		Gantry::Template::TT.3 Gantry::Utils::AuthCDBI.3 \
-		Gantry::Utils::CDBI.3 Gantry::Utils::CRUDHelp.3 \
-		Gantry::Utils::DB.3 Gantry::Utils::DBConnHelper.3 \
+		Gantry::Plugins::Validate.3 Gantry::Server.3 Gantry::Stash.3 \
+		Gantry::Stash::Controller.3 Gantry::Stash::View.3 \
+		Gantry::Stash::View::Form.3 Gantry::Template::Default.3 \
+		Gantry::Template::Framing.3 Gantry::Template::TT.3 \
+		Gantry::Utils::AuthCDBI.3 Gantry::Utils::CDBI.3 \
+		Gantry::Utils::CRUDHelp.3 Gantry::Utils::DB.3 \
+		Gantry::Utils::DBConnHelper.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::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::Model::Regular.3 Gantry::Utils::ModelHelper.3 \
+		Gantry::Utils::PODViewer.3 Gantry::Utils::PerlbalFixup.3 \
+		Gantry::Utils::SQL.3 Gantry::Utils::Validate.3
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/p5-Gantry/distinfo b/www/p5-Gantry/distinfo
index 0ad01da8dfa8..3a5f730ee707 100644
--- a/www/p5-Gantry/distinfo
+++ b/www/p5-Gantry/distinfo
@@ -1,3 +1,3 @@
-MD5 (Gantry-3.40.tar.gz) = 2858266fc97065b39a56e513ab9861bc
-SHA256 (Gantry-3.40.tar.gz) = 680fa6b71044c971d9edfa222ff749a0cf18dddd1ad6abfab15e5db3c4a143ae
-SIZE (Gantry-3.40.tar.gz) = 201823
+MD5 (Gantry-3.42.tar.gz) = 02a1c21d77d61c8766337df9d584d977
+SHA256 (Gantry-3.42.tar.gz) = 510b46d38d46841b86de5ef3b7cd23d0dbb413a24ba1c0a90ab564b3242b8723
+SIZE (Gantry-3.42.tar.gz) = 7856362
diff --git a/www/p5-Gantry/files/patch-Build.PL b/www/p5-Gantry/files/patch-Build.PL
new file mode 100644
index 000000000000..3b6d47ef2fac
--- /dev/null
+++ b/www/p5-Gantry/files/patch-Build.PL
@@ -0,0 +1,138 @@
+--- Build.PL.orig	Thu Nov  9 07:59:16 2006
++++ Build.PL	Thu Nov  9 08:01:28 2006
+@@ -91,135 +91,6 @@
+ 
+     }
+ 
+-    sub ACTION_install {
+-        my $self = shift;
+-        
+-        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";
+-            
+-            if ( ! -d $tmpl_dir ) {
+-                my $create = $self->y_n(  " ", 'y' );
+-                exit unless $create;
+-            }
+-
+-            # write Init.pm file with install options
+-
+-            my $init_pkg = << "EO_INIT";
+-package Gantry::Init;
+-use strict;
+-
+-sub base_root {
+-    return "$tmpl_dir";
+-}
+-1;
+-
+-=head1 NAME
+-
+-Gantry::Init - stores things the user provided to Build.PL during install
+-
+-=head1 SYNOPSIS
+-
+-    use Gantry::Init;
+-    my \$base_root = Gantry::Init->base_root();
+-
+-=head1 Methods
+-
+-=head2 base_root
+-
+-Returns the local system path to Gantry's default templates.  This usually
+-becomes the last item in the Template Toolkit template path.
+-
+-=head1 AUTHOR
+-
+-Auto-generated by Build.PL
+-
+-=cut
+-
+-EO_INIT
+-
+-            open( INIT_FILE, "> blib/lib/Gantry/Init.pm" ) or die "$!";
+-            print INIT_FILE $init_pkg;
+-            close INIT_FILE;
+-
+-            open( INIT_FILE, "> $initf" ) or die "$!";
+-            print INIT_FILE $init_pkg;
+-            close INIT_FILE;
+-            
+-            eval {  
+-                File::Path::mkpath( $tmpl_dir );
+-            };
+-            if ( $@ ) {
+-                print "Error: unable to create directory $tmpl_dir\n";
+-                $@ =~ s/ at .+?$//;
+-                die( "$@\n" );
+-            }
+-            
+-            my $blib_tmpl_dir = File::Spec->catdir(
+-                $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);
+-            };
+-            if ( $@ ) {
+-                print "\nError coping templates:\n";
+-                print $@ . "\n";
+-            }
+-            else {
+-                print "\n$num Gantry templates copied to $tmpl_dir\n";
+-            }
+-        }
+-        else {
+-            print "SKIPPING WEB CONTENT INSTALL\n";
+-        }
+-        
+-        print "\n";
+-
+-    } # end ACTION_install
+-
+     sub process_web_files {
+         my $self = shift;
+         my $files = $self->find_web_files;