This commit was generated by cvs2svn to compensate for changes in r3921,

which included commits to RCS files with non-trunk default branches.

6 files changed, 348 insertions, 139 deletions

diff --git a/rt/sbin/extract-message-catalog b/rt/sbin/extract-message-catalog
index a7ba6335c..c5d4d8953 100644
--- a/rt/sbin/extract-message-catalog
+++ b/rt/sbin/extract-message-catalog
@@ -1,9 +1,15 @@
 #!/usr/bin/perl -w 
-# BEGIN LICENSE BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
-# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# COPYRIGHT:
+#  
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+#                                          <jesse@bestpractical.com>
 # 
-# (Except where explictly superceded by other copyright notices)
+# (Except where explicitly superseded by other copyright notices)
+# 
+# 
+# LICENSE:
 # 
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
@@ -15,14 +21,29 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 # 
-# Unless otherwise specified, all modifications, corrections or
-# extensions to this work which alter its source code become the
-# property of Best Practical Solutions, LLC when submitted for
-# inclusion in the work.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 # 
 # 
-# END LICENSE BLOCK
-
+# CONTRIBUTION SUBMISSION POLICY:
+# 
+# (The following paragraph is not intended to limit the rights granted
+# to you to modify and distribute this software under the terms of
+# the GNU General Public License and is only of importance to you if
+# you choose to contribute your changes and enhancements to the
+# community by submitting them to Best Practical Solutions, LLC.)
+# 
+# By intentionally submitting any modifications, corrections or
+# derivatives to this work, or any other work intended for use with
+# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+# you are the copyright holder for those contributions and you grant
+# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+# royalty-free, perpetual, license to use, copy, create derivative
+# works based on those contributions, and sublicense and distribute
+# those contributions and any derivatives thereof.
+# 
+# }}} END BPS TAGGED BLOCK
 # Portions Copyright 2002 Autrijus Tang <autrijus@autrijus.org>
 
 use strict;
diff --git a/rt/sbin/extract_pod_tests b/rt/sbin/extract_pod_tests
index ed01c7dc2..3987e90c7 100644
--- a/rt/sbin/extract_pod_tests
+++ b/rt/sbin/extract_pod_tests
@@ -1,9 +1,15 @@
 #!/usr/bin/perl
-# BEGIN LICENSE BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
-# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# COPYRIGHT:
+#  
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+#                                          <jesse@bestpractical.com>
 # 
-# (Except where explictly superceded by other copyright notices)
+# (Except where explicitly superseded by other copyright notices)
+# 
+# 
+# LICENSE:
 # 
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
@@ -15,14 +21,29 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 # 
-# Unless otherwise specified, all modifications, corrections or
-# extensions to this work which alter its source code become the
-# property of Best Practical Solutions, LLC when submitted for
-# inclusion in the work.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 # 
 # 
-# END LICENSE BLOCK
-
+# CONTRIBUTION SUBMISSION POLICY:
+# 
+# (The following paragraph is not intended to limit the rights granted
+# to you to modify and distribute this software under the terms of
+# the GNU General Public License and is only of importance to you if
+# you choose to contribute your changes and enhancements to the
+# community by submitting them to Best Practical Solutions, LLC.)
+# 
+# By intentionally submitting any modifications, corrections or
+# derivatives to this work, or any other work intended for use with
+# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+# you are the copyright holder for those contributions and you grant
+# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+# royalty-free, perpetual, license to use, copy, create derivative
+# works based on those contributions, and sublicense and distribute
+# those contributions and any derivatives thereof.
+# 
+# }}} END BPS TAGGED BLOCK
 use strict;
 use vars qw($VERSION);
 $VERSION = '0.06';
diff --git a/rt/sbin/factory b/rt/sbin/factory
index 64b0ae337..882e4a826 100644
--- a/rt/sbin/factory
+++ b/rt/sbin/factory
@@ -1,9 +1,15 @@
 #!/usr/bin/perl
-# BEGIN LICENSE BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
-# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# COPYRIGHT:
+#  
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+#                                          <jesse@bestpractical.com>
+# 
+# (Except where explicitly superseded by other copyright notices)
 # 
-# (Except where explictly superceded by other copyright notices)
+# 
+# LICENSE:
 # 
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
@@ -15,14 +21,29 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 # 
-# Unless otherwise specified, all modifications, corrections or
-# extensions to this work which alter its source code become the
-# property of Best Practical Solutions, LLC when submitted for
-# inclusion in the work.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 # 
 # 
-# END LICENSE BLOCK
-
+# CONTRIBUTION SUBMISSION POLICY:
+# 
+# (The following paragraph is not intended to limit the rights granted
+# to you to modify and distribute this software under the terms of
+# the GNU General Public License and is only of importance to you if
+# you choose to contribute your changes and enhancements to the
+# community by submitting them to Best Practical Solutions, LLC.)
+# 
+# By intentionally submitting any modifications, corrections or
+# derivatives to this work, or any other work intended for use with
+# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+# you are the copyright holder for those contributions and you grant
+# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+# royalty-free, perpetual, license to use, copy, create derivative
+# works based on those contributions, and sublicense and distribute
+# those contributions and any derivatives thereof.
+# 
+# }}} END BPS TAGGED BLOCK
 use DBI;
 
 my $database  = shift;
@@ -38,7 +59,7 @@ my $password = '';
 
 
 my $LicenseBlock = << '.';
-# BEGIN LICENSE BLOCK
+# BEGIN BPS TAGGED BLOCK
 # 
 # Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
 # 
@@ -60,7 +81,7 @@ my $LicenseBlock = << '.';
 # inclusion in the work.
 # 
 # 
-# END LICENSE BLOCK
+# END BPS TAGGED BLOCK
 
 .
 
@@ -84,7 +105,17 @@ my @tables = $dbh->tables();
 my ( %tablemap, $typemap, %modulemap );
 
 foreach my $table (@tables) {
+    $table =~ s/\`//g;
     next if ($table eq 'sessions');
+        $table = ucfirst($table);
+        $table =~ s/field/Field/;
+        $table =~ s/group/Group/;
+        $table =~ s/custom/Custom/;
+        $table =~ s/member/Member/;
+        $table =~ s/Scripaction/ScripAction/g;
+        $table =~ s/condition/Condition/g;
+        $table =~ s/value/Value/;
+        $table =~ s/Acl/ACL/g;
     $tablemap{$table}  = $table;
     $modulemap{$table} = $table;
     if ( $table =~ /^(.*)s$/ ) {
@@ -348,7 +379,7 @@ $Create
 
 $FieldsPod
 
-sub _ClassAccessible {
+sub _CoreAccessible {
     {
      
 $ClassAccessible
diff --git a/rt/sbin/license_tag b/rt/sbin/license_tag
index 689b246ef..cd1a9716f 100644
--- a/rt/sbin/license_tag
+++ b/rt/sbin/license_tag
@@ -1,12 +1,18 @@
 #!/usr/bin/perl
 
 
-# BEGIN LICENSE BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
-# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# COPYRIGHT:
+#  
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+#                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
 # 
+# 
+# LICENSE:
+# 
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
 # been provided with this software, but in any event can be snarfed
@@ -17,20 +23,41 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 # 
-# Unless otherwise specified, all modifications, corrections or
-# extensions to this work which alter its source code become the
-# property of Best Practical Solutions, LLC when submitted for
-# inclusion in the work.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 # 
 # 
-# END LICENSE BLOCK
-
-my $LICENSE  = <<EOL;
+# CONTRIBUTION SUBMISSION POLICY:
+# 
+# (The following paragraph is not intended to limit the rights granted
+# to you to modify and distribute this software under the terms of
+# the GNU General Public License and is only of importance to you if
+# you choose to contribute your changes and enhancements to the
+# community by submitting them to Best Practical Solutions, LLC.)
+# 
+# By intentionally submitting any modifications, corrections or
+# derivatives to this work, or any other work intended for use with
+# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+# you are the copyright holder for those contributions and you grant
+# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+# royalty-free, perpetual, license to use, copy, create derivative
+# works based on those contributions, and sublicense and distribute
+# those contributions and any derivatives thereof.
+# 
+# }}} END BPS TAGGED BLOCK
+my $LICENSE  = <<'EOL';
 
-Copyright (c) 1996-2003 Jesse Vincent <jesse\@bestpractical.com>
+COPYRIGHT:
+ 
+This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+                                         <jesse@bestpractical.com>
 
 (Except where explicitly superseded by other copyright notices)
 
+
+LICENSE:
+
 This work is made available to you under the terms of Version 2 of
 the GNU General Public License. A copy of that license should have
 been provided with this software, but in any event can be snarfed
@@ -41,11 +68,27 @@ WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 General Public License for more details.
 
-Unless otherwise specified, all modifications, corrections or
-extensions to this work which alter its source code become the
-property of Best Practical Solutions, LLC when submitted for
-inclusion in the work.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+
+CONTRIBUTION SUBMISSION POLICY:
+
+(The following paragraph is not intended to limit the rights granted
+to you to modify and distribute this software under the terms of
+the GNU General Public License and is only of importance to you if
+you choose to contribute your changes and enhancements to the
+community by submitting them to Best Practical Solutions, LLC.)
 
+By intentionally submitting any modifications, corrections or
+derivatives to this work, or any other work intended for use with
+Request Tracker, to Best Practical Solutions, LLC, you confirm that
+you are the copyright holder for those contributions and you grant
+Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+royalty-free, perpetual, license to use, copy, create derivative
+works based on those contributions, and sublicense and distribute
+those contributions and any derivatives thereof.
 
 EOL
 
@@ -73,16 +116,16 @@ sub tag_mason {
 
 
         print "$pm - ";
-        if ($file =~ /^%# BEGIN LICENSE BLOCK/ms) {
+        if ($file =~ /^%# {{{ BEGIN BPS TAGGED BLOCK/ms) {
                 print "has license section";
-             $file =~ s/^%# BEGIN LICENSE BLOCK(.*?)%# END LICENSE BLOCK/%# BEGIN LICENSE BLOCK\n$pmlic%# END LICENSE BLOCK/ms;
+             $file =~ s/^%# {{{ BEGIN BPS TAGGED BLOCK(.*?)%# }}} END BPS TAGGED BLOCK/%# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic%# }}} END BPS TAGGED BLOCK/ms;
              
 
         } else {
                 print "no license section";
-             $file ="%# BEGIN LICENSE BLOCK\n$pmlic%# END LICENSE BLOCK\n". $file;
+             $file ="%# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic%# }}} END BPS TAGGED BLOCK\n". $file;
         }
-        $file =~ s/%# END LICENSE BLOCK(\n+)/%# END LICENSE BLOCK\n/mg;
+        $file =~ s/%# }}} END BPS TAGGED BLOCK(\n+)/%# }}} END BPS TAGGED BLOCK\n/mg;
         print "\n";
         
         
@@ -105,16 +148,16 @@ sub tag_makefile {
 
 
         print "$pm - ";
-        if ($file =~ /^# BEGIN LICENSE BLOCK/ms) {
+        if ($file =~ /^# {{{ BEGIN BPS TAGGED BLOCK/ms) {
                 print "has license section";
-             $file =~ s/^# BEGIN LICENSE BLOCK(.*?)# END LICENSE BLOCK/# BEGIN LICENSE BLOCK\n$pmlic# END LICENSE BLOCK/ms;
+             $file =~ s/^# {{{ BEGIN BPS TAGGED BLOCK(.*?)# }}} END BPS TAGGED BLOCK/# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic# }}} END BPS TAGGED BLOCK/ms;
              
 
         } else {
                 print "no license section";
-             $file ="# BEGIN LICENSE BLOCK\n$pmlic# END LICENSE BLOCK\n". $file;
+             $file ="# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic# }}} END BPS TAGGED BLOCK\n". $file;
         }
-        $file =~ s/# END LICENSE BLOCK(\n+)/# END LICENSE BLOCK\n/mg;
+        $file =~ s/# }}} END BPS TAGGED BLOCK(\n+)/# }}} END BPS TAGGED BLOCK\n/mg;
         print "\n";
         
         
@@ -129,7 +172,7 @@ sub tag_makefile {
 
 sub tag_pm {
         my $pm = $_;
-        next unless $pm =~ /\.pm\z/s;
+        next unless $pm =~ /\.pm/s;
         open(FILE,"<$pm") || die "Failed to open $pm";
         my $file = (join "", <FILE>); 
         close (FILE);
@@ -138,16 +181,16 @@ sub tag_pm {
 
 
         print "$pm - ";
-        if ($file =~ /^# BEGIN LICENSE BLOCK/ms) {
+        if ($file =~ /^# {{{ BEGIN BPS TAGGED BLOCK/ms) {
                 print "has license section";
-             $file =~ s/^# BEGIN LICENSE BLOCK(.*?)# END LICENSE BLOCK/# BEGIN LICENSE BLOCK\n$pmlic# END LICENSE BLOCK/ms;
+             $file =~ s/^# {{{ BEGIN BPS TAGGED BLOCK(.*?)# }}} END BPS TAGGED BLOCK/# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic# }}} END BPS TAGGED BLOCK/ms;
              
 
         } else {
                 print "no license section";
-             $file ="# BEGIN LICENSE BLOCK\n$pmlic# END LICENSE BLOCK\n". $file;
+             $file ="# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic# }}} END BPS TAGGED BLOCK\n". $file;
         }
-        $file =~ s/# END LICENSE BLOCK(\n+)/# END LICENSE BLOCK\n/mg;
+        $file =~ s/# }}} END BPS TAGGED BLOCK(\n+)/# }}} END BPS TAGGED BLOCK\n/mg;
         print "\n";
         
         
@@ -170,21 +213,21 @@ sub tag_script {
         $pmlic =~ s/^/# /msg;
 
         print "$pm - ";
-        if ($file =~ /^# BEGIN LICENSE BLOCK/ms) {
+        if ($file =~ /^# {{{ BEGIN BPS TAGGED BLOCK/ms) {
                 print "has license section";
-             $file =~ s/^# BEGIN LICENSE BLOCK(.*?)# END LICENSE BLOCK/# BEGIN LICENSE BLOCK\n$pmlic# END LICENSE BLOCK/ms;
+             $file =~ s/^# {{{ BEGIN BPS TAGGED BLOCK(.*?)# }}} END BPS TAGGED BLOCK/# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic# }}} END BPS TAGGED BLOCK/ms;
              
 
         } else {
                 print "no license section";
                 if ($file =~ /^(#!.*?)\n/) {
 
-            my  $lic ="# BEGIN LICENSE BLOCK\n$pmlic# END LICENSE BLOCK\n";
+            my  $lic ="# {{{ BEGIN BPS TAGGED BLOCK\n$pmlic# }}} END BPS TAGGED BLOCK\n";
                 $file =~ s/^(#!.*?)\n/$1\n$lic/; 
 
                 } 
         }
-        $file =~ s/# END LICENSE BLOCK(\n+)/# END LICENSE BLOCK\n\n/mg;
+        $file =~ s/# }}} END BPS TAGGED BLOCK(\n+)/# }}} END BPS TAGGED BLOCK\n/mg;
         print "\n";
         
 
diff --git a/rt/sbin/regression_harness b/rt/sbin/regression_harness
index fc1e29304..c10779614 100644
--- a/rt/sbin/regression_harness
+++ b/rt/sbin/regression_harness
@@ -1,9 +1,15 @@
 #!/usr/bin/perl
-# BEGIN LICENSE BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
-# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# COPYRIGHT:
+#  
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+#                                          <jesse@bestpractical.com>
 # 
-# (Except where explictly superceded by other copyright notices)
+# (Except where explicitly superseded by other copyright notices)
+# 
+# 
+# LICENSE:
 # 
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
@@ -15,14 +21,29 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 # 
-# Unless otherwise specified, all modifications, corrections or
-# extensions to this work which alter its source code become the
-# property of Best Practical Solutions, LLC when submitted for
-# inclusion in the work.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 # 
 # 
-# END LICENSE BLOCK
-
+# CONTRIBUTION SUBMISSION POLICY:
+# 
+# (The following paragraph is not intended to limit the rights granted
+# to you to modify and distribute this software under the terms of
+# the GNU General Public License and is only of importance to you if
+# you choose to contribute your changes and enhancements to the
+# community by submitting them to Best Practical Solutions, LLC.)
+# 
+# By intentionally submitting any modifications, corrections or
+# derivatives to this work, or any other work intended for use with
+# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+# you are the copyright holder for those contributions and you grant
+# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+# royalty-free, perpetual, license to use, copy, create derivative
+# works based on those contributions, and sublicense and distribute
+# those contributions and any derivatives thereof.
+# 
+# }}} END BPS TAGGED BLOCK
 open (FH,"make regression|");
 
 my $skip_frontmatter = 1;
diff --git a/rt/sbin/rt-test-dependencies.in b/rt/sbin/rt-test-dependencies.in
index b4cb8c044..6eed51337 100644
--- a/rt/sbin/rt-test-dependencies.in
+++ b/rt/sbin/rt-test-dependencies.in
@@ -1,9 +1,15 @@
 #!@PERL@
-# BEGIN LICENSE BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
-# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# COPYRIGHT:
+#  
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+#                                          <jesse@bestpractical.com>
 # 
-# (Except where explictly superceded by other copyright notices)
+# (Except where explicitly superseded by other copyright notices)
+# 
+# 
+# LICENSE:
 # 
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
@@ -15,14 +21,29 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 # 
-# Unless otherwise specified, all modifications, corrections or
-# extensions to this work which alter its source code become the
-# property of Best Practical Solutions, LLC when submitted for
-# inclusion in the work.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 # 
 # 
-# END LICENSE BLOCK
-
+# CONTRIBUTION SUBMISSION POLICY:
+# 
+# (The following paragraph is not intended to limit the rights granted
+# to you to modify and distribute this software under the terms of
+# the GNU General Public License and is only of importance to you if
+# you choose to contribute your changes and enhancements to the
+# community by submitting them to Best Practical Solutions, LLC.)
+# 
+# By intentionally submitting any modifications, corrections or
+# derivatives to this work, or any other work intended for use with
+# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+# you are the copyright holder for those contributions and you grant
+# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+# royalty-free, perpetual, license to use, copy, create derivative
+# works based on those contributions, and sublicense and distribute
+# those contributions and any derivatives thereof.
+# 
+# }}} END BPS TAGGED BLOCK
 #
 # This is just a basic script that checks to make sure that all
 # the modules needed by RT before you can install it.
@@ -34,7 +55,7 @@ use Getopt::Long;
 use CPAN;
 my %args;
 my %deps;
-GetOptions(\%args,'install', 'with-MYSQL', 'with-POSTGRESQL|with-pg|with-pgsql', 'with-SQLITE', 'with-ORACLE', 'with-FASTCGI', 'with-SPEEDYCGI', 'with-MODPERL1', 'with-MODPERL2' ,'with-DEV');
+GetOptions(\%args, 'v|verbose', 'install', 'with-MYSQL', 'with-POSTGRESQL|with-pg|with-pgsql', 'with-SQLITE', 'with-ORACLE', 'with-FASTCGI', 'with-SPEEDYCGI', 'with-MODPERL1', 'with-MODPERL2' ,'with-DEV', 'download=s');
 
 if (!keys %args) {
     help();
@@ -49,9 +70,6 @@ $args{'with-CORE'} = 1;
 $args{'with-DEV'} =1; 
 $args{'with-CLI'} =1; 
 $args{'with-MAILGATE'} =1; 
-if ($] < 5.007) {
-$args{'with-I18N-COMPAT'} = 1;
-}
 
 sub warn_modperl2 {
     print <<'.';
@@ -86,6 +104,9 @@ The following switches will tell the tool to check for specific dependencies
 	--with-modperl2		Libraries needed to support the modperl 2 handler
 
 	--with-dev		Tools needed for RT development
+
+You can also specify -v or --verbose to list the status of all dependencies,
+rather than just the missing ones.
 .
 }
 
@@ -95,6 +116,7 @@ sub _ {
 }
 
 $deps{'CORE'} = [ _( << '.') ];
+Digest::base
 Digest::MD5 2.27
 DBI 1.37
 Test::Inline
@@ -103,6 +125,7 @@ DBIx::SearchBuilder 1.01
 Text::Template
 File::Spec 0.8
 HTML::Entities 
+HTML::Scrubber 0.08
 Net::Domain
 Log::Dispatch 2.0
 Locale::Maketext 1.06
@@ -117,14 +140,16 @@ File::Temp
 Term::ReadKey
 Text::Autoformat
 Text::Quoted 1.3
+Tree::Simple 1.04
 Scalar::Util
+Module::Versions::Report
 .
 
 $deps{'MASON'} = [ _( << '.') ];
 Params::Validate 0.02
 Cache::Cache
-Exception::Class
-HTML::Mason 1.16
+Exception::Class 1.14
+HTML::Mason 1.23
 MLDBM
 Errno
 FreezeThaw
@@ -132,6 +157,7 @@ Digest::MD5 2.27
 CGI::Cookie 1.20
 Storable 2.08
 Apache::Session 1.53
+XML::RSS
 .
 
 $deps{'MAILGATE'} = [ _( << '.') ];
@@ -149,6 +175,9 @@ $deps{'DEV'} = [ _( << '.') ];
 Regexp::Common
 Time::HiRes 
 Test::Inline 
+Apache::Test
+HTML::Form
+HTML::TokeParser
 WWW::Mechanize
 .
 
@@ -175,11 +204,6 @@ CGI 2.92
 Apache::DBI
 .
 
-$deps{'I18N-COMPAT'} = [ _( << '.') ];
-Text::Iconv
-Encode::compat 0.04
-.
-
 $deps{'MYSQL'} = [ _( << '.') ];
 DBD::mysql 2.1018
 .
@@ -190,67 +214,115 @@ $deps{'POSTGRESQL'} = [ _( << '.') ];
 DBD::Pg
 .
 
+$deps{'SQLITE'} = [ _( << '.') ];
+DBD::SQLite
+.
+
+if ($args{'download'}) {
+
+    my %modules;
+
+    foreach my $key (keys %deps) {
+        my @deps = (@{$deps{$key}});
+        while (@deps) {
+            my $mod = shift @deps;
+            my $ver = shift @deps;
+            next if ($mod =~ /^(DBD-|Apache-Request)/);
+            $modules{$mod} = $ver;
+        }
+    }
+    my @mods = keys %modules;
+    CPAN::get();
+    my $moddir = $args{'download'};
+    foreach my $mod (@mods) {
+        $CPAN::Config->{'build_dir'} = $moddir;
+        CPAN::get($mod);
+    }
+
+    opendir(DIR, $moddir);
+    while ( my $dir = readdir(DIR)) {
+        print "Dir is $dir\n";
+        next if ( $dir =~ /^\.\.?$/);
+
+        if ($dir =~ /^(.*)-(.*?)$/) {
+            print "$1  --  $2\n";
+            `svn_load_dirs.pl file:///Users/jesse/mod-repo $1 $moddir/$dir`;
+            `rm -rf $moddir/$dir`;
+
+        }
+
+    }
+    closedir(DIR);
+    exit;
+}
+
+
 print "perl:\n";
 print "\t5.8.3";
 eval {require 5.008003};
 if ($@) {
-print "...MISSING.\n";
-        eval {require 5.008000};
-        if ($@) {
-            print "\nRT is known to be non-functional on versions of perl older than 5.8.3.\nPlease upgrade to 5.8.3 or newer\n\n";
-            die;
-        } 
-
-        eval {require 5.008003};
-        if ($@) {
-            print "\nRT is known to be non-functional on versions of perl older than 5.8.3.\nPlease upgrade to 5.8.3 or newer\n\n";
-        }
+    print "...MISSING.\n";
+    eval {require 5.008000};
+    if ($@) {
+        print "\nRT is known to be non-functional on versions of perl older than 5.8.3.\nPlease upgrade to 5.8.3 or newer\n\n";
+        die;
+    } 
+
+    eval {require 5.008003};
+    if ($@) {
+        print "\nRT is known to be non-functional on versions of perl older than 5.8.3.\nPlease upgrade to 5.8.3 or newer\n\n";
+    }
 } else {
-        print "...found\n";
-
+    print "...found\n" if $args{'v'};
 }
 
-
-foreach my $type (keys %args)  {
-next unless ($type =~ /^with-(.*?)$/);
-my $type = $1;
-print "$type dependencies:\n";
-	my @deps = (@{$deps{$type}});
-	while (@deps) {
-		my $module = shift @deps;
-		my $version = shift @deps;
-my $ret;
-	$ret =test_dep($module, $version);	
-
-if ($args{'install'} && !$ret) {
-	resolve_dep($module);		
-}
-}
+print "users:\n";
+print "\trt group (@RTGROUP@)...",      (defined getgrnam("@RTGROUP@")    ? "found" : "MISSING"), "\n";
+print "\tbin owner (@BIN_OWNER@)...",   (defined getpwnam("@BIN_OWNER@")  ? "found" : "MISSING"), "\n";
+print "\tlibs owner (@LIBS_OWNER@)...", (defined getpwnam("@LIBS_OWNER@") ? "found" : "MISSING"), "\n";
+print "\tlibs group (@LIBS_GROUP@)...", (defined getgrnam("@LIBS_GROUP@") ? "found" : "MISSING"), "\n";
+print "\tweb owner (@WEB_USER@)...",    (defined getpwnam("@WEB_USER@")   ? "found" : "MISSING"), "\n";
+print "\tweb group (@WEB_GROUP@)...",   (defined getgrnam("@WEB_GROUP@")  ? "found" : "MISSING"), "\n";
+
+foreach my $type (keys %args) {
+    next unless ($type =~ /^with-(.*?)$/);
+    my $type = $1;
+    print "$type dependencies:\n";
+    my @deps = (@{$deps{$type}});
+    while (@deps) {
+        my $module = shift @deps;
+        my $version = shift @deps;
+        my $ret = test_dep($module, $version);	
+
+        if ($args{'install'} && !$ret) {
+            resolve_dep($module);		
+        }
+    }
 }
+
 sub test_dep {
-	my $module = shift;
-	my $version = shift;
-
-	print "\t$module $version";
-	eval "use $module $version" ;
-	if ($@) {
-		my $error = $@;
-		$error =~ s/\n(.*)$//s;
-		print "...MISSING\n";
-			print "\t\t$error\n" if $error =~ /this is only/;
-
-		return undef;
-	} else {
-		print "...found\n";
-return 1;
-	}
+    my $module = shift;
+    my $version = shift;
+
+    eval "use $module $version ()";
+    if ($@) {
+        my $error = $@;
+        $error =~ s/\n(.*)$//s;
+        print "\t$module $version";
+        print "...MISSING\n";
+        print "\t\t$error\n" if $error =~ /this is only/;
+
+        return undef;
+    } else {
+        print "\t$module $version...found\n" if $args{'v'};
+        return 1;
+    }
 }
 
 sub resolve_dep {
-	my $module = shift;
-	use CPAN;
-	CPAN::Shell->install($module);		
-	
+    my $module = shift;
+    use CPAN;
+    CPAN::Shell->install($module);		
 }