Attachment #72446 for bug #105311

View | Details | Raw Unified | Return to bug 105311
Collapse All | Expand All




#

PORTNAME=	Gantry
PORTVERSION=	3.42
CATEGORIES=	www perl5
MASTER_SITES=	CPAN
MASTER_SITE_SUBDIR=	Gantry
PKGNAMEPREFIX=	p5-

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 \

		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::Pages.3 \
		Gantry::Control::C::Users.3 \
		Gantry::Control::Model::GEN::auth_group_members.3 \
		Gantry::Control::Model::GEN::auth_groups.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::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::Validate.3

.include <bsd.port.pre.mk>


Lines 1-3 Link Here

(-)/home/staff/gslin/work/ports/p5-Gantry/distinfo (-3 / +3 lines)
1	MD5 (Gantry-3.40.tar.gz) = 2858266fc97065b39a56e513ab9861bc	1	MD5 (Gantry-3.42.tar.gz) = 02a1c21d77d61c8766337df9d584d977
2	SHA256 (Gantry-3.40.tar.gz) = 680fa6b71044c971d9edfa222ff749a0cf18dddd1ad6abfab15e5db3c4a143ae	2	SHA256 (Gantry-3.42.tar.gz) = 510b46d38d46841b86de5ef3b7cd23d0dbb413a24ba1c0a90ab564b3242b8723
3	SIZE (Gantry-3.40.tar.gz) = 201823	3	SIZE (Gantry-3.42.tar.gz) = 7856362




--- 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;

Return to bug 105311

Lines 6-18 Link Here

(-)/home/staff/gslin/work/ports/p5-Gantry/Makefile (-15 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= Gantry	8	PORTNAME= Gantry
9	PORTVERSION= 3.40	9	PORTVERSION= 3.42
10	CATEGORIES= www perl5	10	CATEGORIES= www perl5
11	MASTER_SITES= CPAN	11	MASTER_SITES= CPAN
12	MASTER_SITE_SUBDIR= Gantry	12	MASTER_SITE_SUBDIR= Gantry
13	PKGNAMEPREFIX= p5-	13	PKGNAMEPREFIX= p5-
14		14
15	MAINTAINER= gslin@gslin.org	15	MAINTAINER= perl@FreeBSD.org
16	COMMENT= Web application framework for mod_perl, cgi, etc	16	COMMENT= Web application framework for mod_perl, cgi, etc
17		17
18	RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \	18	RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
Lines 47-54 Link Here
47	Gantry::Control::C::AuthzBase.3 \	47	Gantry::Control::C::AuthzBase.3 \
48	Gantry::Control::C::AuthzCDBI.3 \	48	Gantry::Control::C::AuthzCDBI.3 \
49	Gantry::Control::C::AuthzRegular.3 \	49	Gantry::Control::C::AuthzRegular.3 \
50	Gantry::Control::C::Groups.3 \	50	Gantry::Control::C::Groups.3 Gantry::Control::C::Pages.3 \
51	Gantry::Control::C::Pages.3 \
52	Gantry::Control::C::Users.3 \	51	Gantry::Control::C::Users.3 \
53	Gantry::Control::Model::GEN::auth_group_members.3 \	52	Gantry::Control::Model::GEN::auth_group_members.3 \
54	Gantry::Control::Model::GEN::auth_groups.3 \	53	Gantry::Control::Model::GEN::auth_groups.3 \
Lines 72-93 Link Here
72	Gantry::Plugins::AutoCRUDHelper::DBIxClass.3 \	71	Gantry::Plugins::AutoCRUDHelper::DBIxClass.3 \
73	Gantry::Plugins::CRUD.3 Gantry::Plugins::Calendar.3 \	72	Gantry::Plugins::CRUD.3 Gantry::Plugins::Calendar.3 \
74	Gantry::Plugins::DBIxClassConn.3 Gantry::Plugins::Static.3 \	73	Gantry::Plugins::DBIxClassConn.3 Gantry::Plugins::Static.3 \
75	Gantry::Plugins::Validate.3 Gantry::Server.3 \	74	Gantry::Plugins::Validate.3 Gantry::Server.3 Gantry::Stash.3 \
76	Gantry::Stash.3 Gantry::Stash::Controller.3 \	75	Gantry::Stash::Controller.3 Gantry::Stash::View.3 \
77	Gantry::Stash::View.3 Gantry::Stash::View::Form.3 \	76	Gantry::Stash::View::Form.3 Gantry::Template::Default.3 \
78	Gantry::Template::Default.3 Gantry::Template::Framing.3 \	77	Gantry::Template::Framing.3 Gantry::Template::TT.3 \
79	Gantry::Template::TT.3 Gantry::Utils::AuthCDBI.3 \	78	Gantry::Utils::AuthCDBI.3 Gantry::Utils::CDBI.3 \
80	Gantry::Utils::CDBI.3 Gantry::Utils::CRUDHelp.3 \	79	Gantry::Utils::CRUDHelp.3 Gantry::Utils::DB.3 \
81	Gantry::Utils::DB.3 Gantry::Utils::DBConnHelper.3 \	80	Gantry::Utils::DBConnHelper.3 \
82	Gantry::Utils::DBConnHelper::MP13.3 \	81	Gantry::Utils::DBConnHelper::MP13.3 \
83	Gantry::Utils::DBConnHelper::MP20.3 \	82	Gantry::Utils::DBConnHelper::MP20.3 \
84	Gantry::Utils::DBConnHelper::Script.3 \	83	Gantry::Utils::DBConnHelper::Script.3 \
85	Gantry::Utils::DBIxClass.3 Gantry::Utils::HTML.3 \	84	Gantry::Utils::DBIxClass.3 Gantry::Utils::HTML.3 \
86	Gantry::Utils::Model.3 Gantry::Utils::Model::Auth.3 \	85	Gantry::Utils::Model.3 Gantry::Utils::Model::Auth.3 \
87	Gantry::Utils::Model::Regular.3 \	86	Gantry::Utils::Model::Regular.3 Gantry::Utils::ModelHelper.3 \
88	Gantry::Utils::ModelHelper.3 Gantry::Utils::PODViewer.3 \	87	Gantry::Utils::PODViewer.3 Gantry::Utils::PerlbalFixup.3 \
89	Gantry::Utils::PerlbalFixup.3 Gantry::Utils::SQL.3 \	88	Gantry::Utils::SQL.3 Gantry::Utils::Validate.3
90	Gantry::Utils::Validate.3
91		89
92	.include <bsd.port.pre.mk>	90	.include <bsd.port.pre.mk>
93		91

Line 0 Link Here

(-)/home/staff/gslin/work/ports/p5-Gantry/files/patch-Build.PL (+138 lines)
		1	--- Build.PL.orig Thu Nov 9 07:59:16 2006
		2	+++ Build.PL Thu Nov 9 08:01:28 2006
		3	@@ -91,135 +91,6 @@
		4
		5	}
		6
		7	- sub ACTION_install {
		8	- my $self = shift;
		9	-
		10	- my $p = $self->{properties};
		11	-
		12	- my $initf = "$p->{install_sets}{site}{lib}/$p->{dist_name}/Init.pm";
		13	- if ( -e $initf ) {
		14	- require "$initf";
		15	- $p->{install_web_directories}{default} = Gantry::Init::base_root();
		16	- }
		17	-
		18	- $self->SUPER::ACTION_install();
		19	-
		20	- my $DEF_TMPL_DIR = $p->{install_web_directory};
		21	- my $prompt;
		22	- my $count = 0;
		23	- my ( %dir_hash, @choices );
		24	-
		25	- print "\n\nGantry comes with a set of default templates that\n"
		26	- . "need to be written to disk. A typical location for these\n"
		27	- . "templates is your web server document root.\n\n"
		28	- . "Enter a directory [$p->{install_web_directories}{default}]\n";
		29	-
		30	- my $choice = $self->prompt(
		31	- " ",
		32	- $p->{install_web_directories}{default},
		33	- );
		34	-
		35	- my $tmpl_dir;
		36	- if ( $choice =~ /\// ) {
		37	- $tmpl_dir = $choice;
		38	- }
		39	- elsif ( ! defined $p->{install_web_directories}{$choice} ) {
		40	- $tmpl_dir = '__skip__';
		41	- }
		42	- else {
		43	- $tmpl_dir = $p->{install_web_directories}{$choice}
		44	- }
		45	-
		46	- $tmpl_dir =~ s/\/$//g;
		47	-
		48	- if( $tmpl_dir && $tmpl_dir ne '__skip__' ) {
		49	-
		50	- print "\n\nDirectory doesn't exist. Create $tmpl_dir? [y]\n";
		51	-
		52	- if ( ! -d $tmpl_dir ) {
		53	- my $create = $self->y_n( " ", 'y' );
		54	- exit unless $create;
		55	- }
		56	-
		57	- # write Init.pm file with install options
		58	-
		59	- my $init_pkg = << "EO_INIT";
		60	-package Gantry::Init;
		61	-use strict;
		62	-
		63	-sub base_root {
		64	- return "$tmpl_dir";
65	-}
66	-1;
67	-
68	-=head1 NAME
69	-
70	-Gantry::Init - stores things the user provided to Build.PL during install
71	-
72	-=head1 SYNOPSIS
73	-
74	- use Gantry::Init;
75	- my \$base_root = Gantry::Init->base_root();
76	-
77	-=head1 Methods
78	-
79	-=head2 base_root
80	-
81	-Returns the local system path to Gantry's default templates. This usually
82	-becomes the last item in the Template Toolkit template path.
83	-
84	-=head1 AUTHOR
85	-
86	-Auto-generated by Build.PL
87	-
88	-=cut
89	-
90	-EO_INIT
91	-
92	- open( INIT_FILE, "> blib/lib/Gantry/Init.pm" ) or die "$!";
93	- print INIT_FILE $init_pkg;
94	- close INIT_FILE;
95	-
96	- open( INIT_FILE, "> $initf" ) or die "$!";
97	- print INIT_FILE $init_pkg;
98	- close INIT_FILE;
99	-
100	- eval {
101	- File::Path::mkpath( $tmpl_dir );
102	- };
103	- if ( $@ ) {
104	- print "Error: unable to create directory $tmpl_dir\n";
105	- $@ =~ s/ at .+?$//;
106	- die( "$@\n" );
107	- }
108	-
109	- my $blib_tmpl_dir = File::Spec->catdir(
110	- $self->blib, 'web', $p->{build_web_directory}
111	- );
112	-
113	- my $num;
114	- eval {
115	- require File::Copy::Recursive;
116	- import File::Copy::Recursive 'dircopy';
117	-
118	- $num = dircopy($blib_tmpl_dir, $tmpl_dir);
119	- };
120	- if ( $@ ) {
121	- print "\nError coping templates:\n";
122	- print $@ . "\n";
123	- }
124	- else {
125	- print "\n$num Gantry templates copied to $tmpl_dir\n";
126	- }
127	- }
128	- else {
129	- print "SKIPPING WEB CONTENT INSTALL\n";
130	- }
131	-
132	- print "\n";
133	-
134	- } # end ACTION_install
135	-
136	sub process_web_files {
137	my $self = shift;
138	my $files = $self->find_web_files;