--- install.php.orig	2006-04-21 11:36:44.000000000 -0400
+++ install.php	2006-04-21 11:23:10.000000000 -0400
@@ -0,0 +1,19 @@
+<?php
+
+global $install;
+$install = TRUE;
+
+if (isset($_GET['installed'])) {
+  require_once './includes/bootstrap.inc';
+  require_once './includes/install.inc';
+  drupal_install_profile_post($_GET['profile']);
+  drupal_maintenance_theme();
+  drupal_set_title('Drupal installation complete');
+  print theme('maintenance_page', '<p>Congratulations, Drupal has been successfully installed.  Please review any warnings or errors that you might see above before continuing on to your <a href="/">new website</a>.');
+}
+else {
+  require_once './includes/install.inc';
+  drupal_install(INSTALL_PROFILES);
+}
+
+?>
--- includes/install.inc.orig	2006-04-21 11:51:29.000000000 -0400
+++ includes/install.inc	2006-04-21 11:56:16.000000000 -0400
@@ -4,15 +4,38 @@
 define('SCHEMA_UNINSTALLED', -1);
 define('SCHEMA_INSTALLED', 0);
 
+define('DRUPAL_MINIMUM_PHP',    '4.3.3');
+define('DRUPAL_MINIMUM_MEMORY', '8M');
+define('DRUPAL_MINIMUM_MYSQL',  '3.23.17'); // If using MySQL
+define('DRUPAL_MINIMUM_PGSQL',  '7.3');  // If using PostgreSQL
+define('DRUPAL_MINIMUM_APACHE', '1.3');  // If using Apache
 
-// The system module (Drupal core) is currently a special case
-include_once './database/updates.inc';
+define('FILE_EXIST',          1);
+define('FILE_READABLE',       2);
+define('FILE_WRITABLE',       4);
+define('FILE_WRITEABLE',      4);
+define('FILE_EXECUTABLE',     8);
+define('FILE_NOT_EXIST',      16);
+define('FILE_NOT_READABLE',   32);
+define('FILE_NOT_WRITABLE',   64);
+define('FILE_NOT_WRITEABLE',  64);
+define('FILE_NOT_EXECUTABLE', 128);
 
-// Include install files for each module
-foreach (module_list() as $module) {
-  $install_file = './'. drupal_get_path('module', $module) .'/'. $module .'.install';
-  if (is_file($install_file)) {
-    include_once $install_file;
+define('INSTALL_BOOTSTRAP_ENVIRONMENT', 0);
+define('INSTALL_BOOTSTRAP_SETTINGS', 1);
+define('INSTALL_BOOTSTRAP_DATABASE', 2);
+define('INSTALL_PROFILES', 3);
+
+if (!$install) {
+  // The system module (Drupal core) is currently a special case
+  include_once './database/updates.inc';
+
+  // Include install files for each module
+  foreach (module_list() as $module) {
+    $install_file = './'. drupal_get_path('module', $module) .'/'. $module .'.install';
+    if (is_file($install_file)) {
+      include_once $install_file;
+    }
   }
 }
 
@@ -79,3 +102,1000 @@
 function drupal_set_installed_schema_version($module, $version) {
   db_query("UPDATE {system} SET schema_version = %d WHERE name = '%s'", $version, $module);
 }
+
+/**
+ * The Drupal installation happens in a series of steps. We begin by verifying
+ * that the current environment meets our minimum requirements. We then go
+ * on to verify that settings.php is properly configured. From there we
+ * connect to the configured database and verify that it meets our minimum
+ * requirements. Finally we can allow the user to select an installation 
+ * profile and complete the installation process.
+ *
+ * @param $phase
+ *  The installation phase we should proceed to.
+ */
+function drupal_install($phase) {
+  static $phases = array(INSTALL_BOOTSTRAP_ENVIRONMENT, INSTALL_BOOTSTRAP_SETTINGS, INSTALL_BOOTSTRAP_DATABASE, INSTALL_PROFILES);
+
+  while (!is_null($current_phase = array_shift($phases))) {
+    _drupal_install($current_phase);
+    if ($phase == $current_phase) {
+      return;
+    }
+  }
+}
+
+/**
+ * The individual Drupal installation phase definitions.
+ *
+ * @param $phase
+ *   The current phase.
+ */
+function _drupal_install($phase) {
+  switch ($phase) {
+    case INSTALL_BOOTSTRAP_ENVIRONMENT:
+      _already_installed();
+      // Initial install environment tests
+      require_once './modules/system.install';
+      drupal_verify_install(system_requirements_bootstrap());
+      if (_install_errors()) {
+        drupal_maintenance_theme();
+        drupal_set_title('Verify your install environment');
+        print theme('install_page', '<p>The errors above must be resolved before you can install Drupal. Find additional information about Drupal\'s minimum system requirements <a href="http://drupal.org/node/270">here</a>.</p>');
+        exit;
+      }
+      break;
+
+    case INSTALL_BOOTSTRAP_SETTINGS:
+      // Configure/verify settings.php
+      install_verify_settings();
+      if (_install_errors()) {
+        drupal_maintenance_theme();
+        drupal_set_title('Site configuration');
+        print theme('install_page', '<p>Please fill out the following information to configure your Drupal site.</p>'. drupal_install_settings_form());
+        exit;
+      }
+
+      break;
+
+    case INSTALL_BOOTSTRAP_DATABASE:
+      // Establish connection to the database
+      require_once './includes/database.inc';
+      $parts = parse_url($base_url);
+      $base_path = (isset($parts['path']) ? $parts['path'] . '/' : '/');
+      install_verify_db();
+      if (_install_errors()) {
+        drupal_maintenance_theme();
+        drupal_set_title('Database configuration');
+        print theme('install_page', drupal_install_settings_form('database'));
+        exit;
+      }
+      db_set_active();
+      break;
+
+    case INSTALL_PROFILES:
+      // Select from install profiles and/or specific modules/themes
+      // (gets instructions from *.install and *.profile files)
+      $profile = drupal_select_profile();
+      drupal_install_profile($profile);
+      _install_goto("install.php?profile=$profile&installed=TRUE");
+      break;
+
+  }
+}
+
+/**
+ * Check if there are any errors at this point in the installation process.
+ *
+ * @return
+ *  An array of errors, if any.
+ */
+function _install_errors() {
+  $messages = drupal_set_message();
+  return $messages['error'];
+}
+
+/**
+ * Test for the existence of $installed in settings.php.
+ *
+ * @return
+ *  TRUE/FALSE if $installed exists.
+ */
+function _already_installed() {
+  global $installed, $base_url;
+
+  require_once './includes/bootstrap.inc';
+  include './'. conf_path() .'/settings.php';
+
+  if ($installed) {
+    _install_goto("$base_url");
+  }
+  return FALSE;
+}
+
+/**
+ * Redirect
+ */
+function _install_goto($path) {
+  header ('Location: '. $path);
+  exit();
+}
+
+/**
+ * Auto detect the base_url with PHP predefined variables.
+ *
+ * @param $file
+ *  The name of the file calling this function so we can strip it out of 
+ *  the URI when generating the base_url.
+ *
+ * @return
+ *  The auto-detected $base_url that should be configured in settings.php
+ */
+function drupal_detect_baseurl($file = 'install.php') {
+  $proto = $_SERVER['HTTPS'] ? 'https://' : 'http://';
+  $host = $_SERVER['SERVER_NAME'];
+  $port = ($_SERVER['SERVER_PORT'] == 80 ? '' : ':'. $_SERVER['SERVER_PORT']);
+  $dir = str_replace("/$file", '', $_SERVER['REQUEST_URI']);
+  return "$proto$host$port$dir";
+}
+
+/**
+ * Detect all databases supported by Drupal that are compiled into the current
+ * PHP installation.
+ *
+ * @return
+ *  An array of database types compiled into PHP.
+ */
+function drupal_detect_database_types() {
+  $databases = array();
+
+  if (file_exists('./includes/install.mysql.inc')) {
+    include_once './includes/install.mysql.inc';
+    if (mysql_is_available()) {
+      $databases[] = 'mysql';
+    }
+  }
+  if (file_exists('./includes/install.mysqli.inc')) {
+    include_once './includes/install.mysqli.inc';
+    if (mysqli_is_available()) {
+      $databases[] = 'mysqli';
+    }
+  }
+  if (file_exists('./includes/install.pgsql.inc')) {
+    include_once './includes/install.pgsql.inc';
+    if (pgsql_is_available()) {
+      $databases[] = 'pgsql';
+    }
+  }
+
+  return $databases;
+}
+
+/**
+ *
+ */
+function install_verify_db() {
+  global $db_url, $db_type;
+
+  $function = 'drupal_test_'. $db_type;
+  if (function_exists("$function")) {
+    return $function($db_url);
+  }
+  else {
+    drupal_set_message(strtr('Installation error: function "%function" does not exist.', array('%function' => $function)), 'error');
+  }
+  return FALSE;
+}
+
+/**
+ * Read settings.php into a buffer line by line, changing values specified in
+ * $settings array, then over-writing the old settings.php file.
+ *
+ * @param $settings
+ *  An array of settings that need to be updated.
+ */
+function drupal_rewrite_settings($settings = array()) {
+  $settings_file = './'. conf_path() .'/settings.php';
+
+  $keys = array();
+  foreach ($settings as $setting => $data) {
+    $keys[] = $setting;
+  }
+
+  $buffer = NULL;
+  if($fp = @fopen($settings_file, 'r+')) {
+    // Step line by line through settings.php
+    while (!feof($fp)) {
+      $line = fgets($fp);
+      if (substr($line, 0, 1) == '$') {
+        preg_match('/\$(.*) /U', $line, $variable);
+        if (in_array($variable[1], $keys)) {
+          // Write new value to settings.php in the following format:
+          //    $'setting' = 'value'; // 'comment'
+          $setting = $settings[$variable[1]];
+          $buffer .= '$'. $variable[1] ." = '". $setting['value'] ."';". ($setting['comment'] ? ' // '. $setting['comment'] ."\n" : "\n");
+          unset($settings[$variable[1]]);
+        }
+        else {
+          $buffer .= $line;
+        }
+      }
+      else {
+        $buffer .= $line;
+      }
+    }
+    fclose($fp);
+
+    // Add required settings that were missing from settings.php
+    foreach ($settings as $setting => $data) {
+      if ($data['required']) {
+        $buffer .= "\$$setting = '". $data['value'] ."';\n";
+      }
+    }
+
+    $fp = fopen($settings_file, 'w');
+    if ($fp && fwrite($fp, $buffer) === FALSE) {
+        drupal_set_message('Failed to modify settings.php, please verify the file permissions.', 'error');
+    }
+  }
+  else {
+    drupal_set_message('Failed to open settings.php, please verify the file permissions.', 'error');
+  }
+}
+
+/**
+ * Verify settings.php, rewriting if necessary.
+ */
+function install_verify_settings() {
+  global $db_url, $db_prefix, $base_url, $db_type, $installed;
+  $settings_file = './'. conf_path() .'/settings.php';
+
+  $detected_base_url = drupal_detect_baseurl();
+
+  if (isset($_POST['save'])) {
+    $settings['db_url'] = array(
+      'value'    => $_POST['db_type'] .'://'. $_POST['db_user'] .($_POST['db_pass'] ? ':'. $_POST['db_pass'] : '') .'@'. ($_POST['db_host'] ? $_POST['db_host'] : 'localhost') .'/'. $_POST['db_path'],
+      'required' => TRUE,
+    );
+    if (isset($_POST['db_prefix']) && eregi('[^A-Za-z0-9_]+', $_POST['db_prefix'])) {
+      drupal_set_message('You database prefix you have entered, <code>'. $_POST['db_prefix'] .'</code>, is invalid.  The database prefix can only contain alphanumeric characters and underscores.', 'error');
+    }
+    $settings['db_prefix'] = array(
+      'value'    => $_POST['db_prefix'],
+      'required' => TRUE,
+    );
+    $settings['base_url'] = array(
+      'value'    => empty($_POST['base_url']) ?  rtrim($detected_base_url, '/') : rtrim($_POST['base_url'], '/'),
+      'comment'  => 'NO trailing slash!',
+      'required' => TRUE,
+    );
+    drupal_rewrite_settings($settings);
+  }
+
+  include $settings_file;
+
+  // Verify base_url
+  if ($base_url == 'http://www.example.com') {
+    drupal_set_message("Your Base URL was automatically changed from the example 'http://www.example.com' to the detected URL '$detected_base_url'.", 'status');
+    $base_url = $detected_base_url;
+  }
+  elseif ($detected_base_url != $base_url) {
+    drupal_set_message("You have entered a Base URL of '$base_url' which does not match the detected Base URL of '$detected_base_url', please be sure that '$base_url' is correct.", 'status');
+  }
+
+  // Verify database settings
+  $db_type = substr($db_url, 0, strpos($db_url, '://'));
+  $databases = drupal_detect_database_types();
+  if (!in_array($db_type, $databases)) {
+    drupal_set_message("In your $settings_file file you have configured Drupal to use a $db_type database server, however your PHP installation currently does not support this database type.", 'error');
+  }
+  $url = parse_url($db_url);
+  $db_user = urldecode($url['user']);
+  $db_pass = urldecode($url['pass']);
+  if ($db_user == 'username' && $db_pass == 'password') {
+    if (isset($_POST['save'])) {
+      drupal_set_message('You have configured Drupal to use the default username and password. This is not allowed for security reasons.', 'error');
+    }
+    else {
+      drupal_maintenance_theme();
+      drupal_set_title('Site configuration');
+      print theme('install_page', '<p>Please fill out the following information to configure your Drupal site.</p>'. drupal_install_settings_form());
+      exit;
+    }
+  }
+}
+
+function drupal_install_settings_form($section = 'all') {
+  global $base_url, $db_url, $db_type, $db_prefix;
+  if (!isset($base_url)) {
+    $base_url = drupal_detect_baseurl();
+  }
+  $url = parse_url($db_url);
+  $db_user = urldecode($url['user']);
+  $db_pass = urldecode($url['pass']);
+  $db_host = urldecode($url['host']);
+  $db_path = ltrim(urldecode($url['path']), '/');
+
+  if ($section == 'all' || $section == 'database') {
+    $form = '<fieldset><legend>Database configuration</legend>';
+
+    // Database type
+    $element = '<select name="db_type">';
+    foreach (drupal_detect_database_types() as $type) {
+      if ($_POST['db_type'] == $type) {
+        $element .= "<option value='$type' selected>$type";
+      }
+      else {
+        $element .= "<option value='$type'>$type";
+      }
+    }
+    $element .= '</select>';
+    $form .= theme('form_element', 'Database type', $element, 'Select the type of database you would like to use with your Drupal installation. If you do not find your preferred database type listed here, verify that the database type is <a href="http://drupal.org/node/270#database">supported by Drupal</a> then confirm that it is properly installed and accessible from PHP. Only properly installed databases that are accessible from PHP and recognized by Drupal are displayed in this menu.');
+  
+    // Database username
+    $element = '<input type="text" name="db_user" size="45" value="'. $db_user .'">';
+    $form .= theme('form_element', 'Database username', $element, 'The database username that your Drupal installation will use to connect to your database server.');
+  
+    // Database password
+    $element = '<input type="text" name="db_pass" size="45" value="'. $db_pass .'">';
+    $form .= theme('form_element', 'Database password', $element, 'The database password that your Drupal installation will use to connect to your database server.');
+  
+    // Database name
+    $element = '<input type="text" name="db_path" size="45" value="'. $db_path .'">';
+    $form .= theme('form_element', 'Database name', $element, 'The name of the database where Drupal can install its database tables.');
+  
+    // Database host
+    $element = '<input type="text" name="db_host" size="45" value="'. $db_host .'">';
+    $form .= theme('form_element', 'Database host', $element, 'The hostname or IP address of your database server. If your database server is on the same machine as you are installing Drupal, you should probably enter "localhost".');
+  
+    // Database prefix
+    $element = '<input type="text" name="db_prefix" size="45" value="'. $db_prefix .'">';
+    $form .= theme('form_element', 'Database prefix', $element, 'Optionally set a prefix for all database table names.  If a prefix is specified, all table names will be prepended with this value.  Only alphanumeric characters and the underscore are allowed.  If you do not wish to use a prefix, leave this field empty.  If you wish to only prefix specific tables, you will need to manually edit your <code>settings.php</code> configuration file.');
+  
+    $form .= '</fieldset>';
+  }
+
+  if ($section == 'all' || $section == 'webserver') {
+    $form .= '<fieldset><legend>Webserver configuration</legend>';
+
+    // Base URL
+    $element = '<input type="text" name="base_url" size="45" value="'. $base_url .'">';
+    $form .= theme('form_element', 'Base URL', $element, 'Please verify the base URL for your Drupal installation. This is the fully qualified URL that users will enter to access the front page of your website. For example, "http://www.example.com".');
+  
+    $form .= '</fieldset>';
+  }
+
+  $form .= '<input type="submit" class="form-submit" name="save" value="Save configuration" />';
+
+  return '<form action="install.php" method="post">'. $form .'</form>';
+}
+
+/**
+ * Find all .profile's and allow admin to select which to install.
+ * 
+ * @return
+ *  The selected profile.
+ */
+function drupal_select_profile() {
+  include_once './includes/file.inc';
+  $profiles = file_scan_directory('./profiles', '\.profile$', array('.', '..', 'CVS'), 0, TRUE, 'name', 0);
+  // Don't need to choose profile if only one available
+  if (sizeof($profiles) == 1) {
+    $profile = array_pop($profiles);
+    require_once $profile->filename;
+    return $profile->name;
+  }
+  elseif (sizeof($profiles) > 1) {
+    drupal_maintenance_theme();
+    $element = '';
+    foreach ($profiles as $profile) {
+      include_once($profile->filename);
+      if ($_POST['profile'] == "$profile->name") {
+        return "$profile->name";
+      }
+      $element .= "<fieldset>";
+      $element .= "<input type='radio' name='profile' value='$profile->name'>$profile->name";
+      $function = $profile->name .'_profile_description';
+      if (function_exists($function)) {
+        $element .= '<div class="description">'. $function() .'</div>';
+      }
+      $element .= "</fieldset>";
+    }
+    $form = theme('form_element', 'Profiles', $element);
+    $form .= '<input type="submit" class="form-submit" name="select" value="Select profile" />';
+
+    drupal_set_title('Select a profile');
+    print theme('install_page', '<form action="install.php" method="post">'. $form .'</form>');
+    exit;
+  }
+  else {
+    return NULL;
+  }
+}
+
+/**
+ * Merge requirements arrays.
+ */
+function _merge_requirements($requirements_old, $requirements_new) {
+  foreach ($requirements_new as $new => $data) {
+    if (isset($requirements_old["$new"])) {
+      // Use largest version
+      if (isset($data['required_version'])) {
+        if (version_compare($requirements_old["$new"]['required_version'], $data['required_version']) < 0) {
+          $requirements_old["$new"] = $data;
+        }
+      }
+      // Use largest value
+      elseif (isset($data['required_value'])) {
+        if ($requirements_old["$new"]['required_value'] < $data['required_value']) {
+          $requirements_old["$new"] = $data;
+        }
+      }
+      elseif (is_array($data)) {
+        $requirements_old["$new"] = _merge_requirements($requirements_old["$new"], $data);
+      }
+    }
+    else {
+      $requirements_old["$new"] = $data;
+    }
+  }
+  return $requirements_old;
+}
+
+/**
+ * Merge table creation scripts. If the same table is defined multiple times,
+ * use the latest version of the schema.
+ */
+function _merge_tables($tables_old, $tables_new) {
+  foreach ($tables_new as $new => $data) {
+    if (isset($tables_old["$new"])) {
+      if ($tables_old["$new"]['schema'] < $data['schema']) {
+        $tables_old["$new"] = $data;
+      }
+    }
+    else {
+      $tables_old["$new"] = $data;
+    }
+  }
+  return $tables_old;
+}
+
+/**
+ * Get list of all .install files.
+ *
+ * @param $module_list
+ *  An array of modules to search for their .install files.
+ */
+function drupal_get_install_files($module_list = array()) {
+  $installs = array();
+  foreach ($module_list as $module) {
+    $installs = array_merge($installs, file_scan_directory('./modules', "^$module.install$", array('.', '..', 'CVS'), 0, TRUE, 'name', 0));
+  }
+  return $installs;
+}
+
+/**
+ * Installed profile.
+ *
+ * @param profile
+ *  Name of profile to install.
+ */
+function drupal_install_profile($profile) {
+  global $db_type;
+
+  if (!isset($profile)) {
+    drupal_maintenance_theme();
+    drupal_set_title('No profiles available');
+    print theme('install_page', '<p>We were unable to find any installer profiles. Installer profiles tell us what modules to enable, and what schema to install in the database. A profile is necessary to continue with the installation process.</p>');
+    exit;
+  }
+
+  // Get a list of modules required by this profile
+  $function = $profile .'_enabled_modules';
+  $module_list = $function();
+
+  // Verify that all required modules exist
+  $modules = array();
+  foreach ($module_list as $current) {
+    $module = file_scan_directory('./modules', "^$current.module$", array('.', '..', 'CVS'), 0, TRUE, 'name', 0);
+    if (empty($module)) {
+      drupal_set_message("The <em>$current</em> module is required but was not found. Please move the file <em>$current.module</em> into the <em>modules</em> subdirectory.", 'error');
+    }
+    else {
+      $modules = array_merge($modules, $module);
+    }
+  }
+
+  // Get a list of all .install files
+  $installs = drupal_get_install_files($module_list);
+
+  // Verify the _requirements_pre for this profile and all its modules
+  $requirements = array();
+  $function = $profile .'_requirements_pre';
+  if (function_exists("$function")) {
+    $requirements = $function();
+  }
+  foreach ($installs as $install) {
+    require_once $install->filename;
+    $function = $install->name .'_requirements_pre';
+    if (function_exists("$function")) {
+      $requirements = _merge_requirements($requirements, $function());
+    }
+  }
+  drupal_verify_install($requirements);
+  if (_install_errors()) {
+    drupal_maintenance_theme();
+    drupal_set_title('Verify your install environment');
+    print theme('install_page', '<p>The errors above must be resolved before you can install Drupal. Find additional information about Drupal\'s minimum system requirements <a href="http://drupal.org/node/270">here</a>.</p>');
+    exit;
+  }
+
+  // Install schemas for profile and all its modules
+  $tables = array();
+  $function = $profile .'_create_tables';
+  if (function_exists("$function")) {
+    $tables = $function();
+  }
+  foreach ($installs as $install) {
+    $function = $install->name .'_create_tables';
+    if (function_exists("$function")) {
+      $tables = _merge_tables($tables, $function());
+    }
+  }
+  foreach ($tables as $table => $data) {
+    $result = @db_query("DESCRIBE {$table}");
+    if (!db_num_rows($result)) {
+      db_query($data['create']);
+      if (is_array($data['default_value'])) {
+        foreach ($data['default_value'] as $query) {
+          db_query($query);
+        }
+      }
+      elseif (isset($data['default_value'])) {
+        db_query($data['default_value']);
+      }
+    }
+    else {
+      drupal_set_message("Failed to create database table <code>$table</code>, the table already exists.", 'status');
+    }
+  }
+
+  // Enable the modules required by the profile
+  db_query("DELETE FROM {system} WHERE type = 'module'");
+  foreach ($modules as $module) {
+    switch ($db_type) {
+      case 'mysql':
+      case 'mysqli':
+        db_query("INSERT INTO {system} (filename, name, type, description, status, throttle, bootstrap, schema_version) VALUES('". $module->filename ."', '". $module->name ."', 'module', '', 1, 0, 0, 0)");
+        break;
+      case 'pgsql':
+        break;
+    }   
+  }
+
+  // Update settings.php to show that the installer has already been run
+  $settings = array();
+  $settings['installed'] = array(
+    'value'    => $profile,
+    'required' => TRUE
+  );
+  drupal_rewrite_settings($settings);
+}
+
+function drupal_install_profile_post($profile = NULL) {
+  if (!isset($profile)) {
+    // Nothing to do, exit
+    return;
+  }
+  require_once "./profiles/$profile.profile";
+  require_once "./includes/file.inc";
+
+  // Get a list of modules required by this profile
+  $function = $profile .'_enabled_modules';
+  $module_list = $function();
+
+  // Get a list of all .install files
+  $installs = drupal_get_install_files($module_list);
+
+  // Verify the _requirements_post for this profile and all its modules
+  $requirements = array();
+  $function = $profile .'_requirements_post';
+  if (function_exists("$function")) {
+    $requirements = $function();
+  }
+  foreach ($installs as $install) {
+    require_once $install->filename;
+    $function = $install->name .'_requirements_post';
+    if (function_exists("$function")) {
+      $requirements = _merge_requirements($requirements, $function());
+    }
+  }
+  drupal_verify_install($requirements);
+}
+
+/**
+ * Call the appropriate installation function. If the function is not 
+ * available, attempt to load the appropriate include file then try again.
+ *
+ * @param $requirements
+ *  An array of requirements.
+ */
+function drupal_verify_install($requirements = array()) {
+  foreach ($requirements as $type => $data) {
+    $function = "drupal_verify_install_$type";
+    if (function_exists("$function")) {
+      $function($data);
+    }
+    else {
+      switch ($type) {
+        case 'mysql':
+        case 'mysqli':
+        case 'pgsql':
+          // The include files for all available database types have already
+          // been included. Thus, we are not using this database type and this
+          // requirement does not apply to the current installation.
+          continue;
+        case 'apache':
+        default:
+          $include = './includes/install.'. $type .'.inc';
+          if (file_exists($include)) {
+            require_once($include);
+            if (function_exists("$function")) {
+              $function($data);
+            }
+            else {
+              drupal_set_message(strtr('Installation error: function "%function" does not exist.', array('%function' => $function)), 'error');
+            }
+          }
+          else {
+            drupal_set_message(strtr('Installation error: unable to find file "%file", function "%function" does not exist.', array('%file' => $include, '%function' => $function)), 'error');
+          }
+      }
+    }
+  }
+}
+
+/**
+ * Some php.ini options are written in shorthand (ie 1K instead of 1024 bytes).
+ * This function converts php.ini shorthand into bytes.
+ *
+ * @param $shorthand
+ *  A memory string in php.ini shorthand notation (ie 1K, 8M, 10G)
+ *
+ * @return
+ *  The shorthand value converted to bytes.
+ */
+function drupal_shorthand_to_bytes($shorthand) {
+  $result = trim($shorthand);
+  $modifier = strtolower($result{strlen($result)-1});
+  switch ($modifier) {
+    case 'g':
+      $result *= 1024;
+    case 'm':
+      $result *= 1024;
+    case 'k':
+      $result *= 1024;
+  }
+  return $result;
+}
+
+/**
+ * Verify that the installed version of PHP meets our minimum requirements.
+ *
+ * @param $version
+ *   An array with some or all of the following directives:
+ *    'required_version' = the required version of PHP
+ *    'message'        = message to display if version is invalid
+ *                       ("%required_version" and "%installed_version" will be
+ *                        automatically replaced if included in the message
+ *                        text.)
+ *    'message_type'   = message type (ie, 'error', 'status')
+ */
+function drupal_verify_version_php($version = array()) {
+  if (!function_exists(version_compare) || 
+      version_compare(phpversion(), $version['required_version'], '<')) {
+    // version_compare() was added in PHP 4.1.
+    $message_type = $version['message_type'] ? $version['message_type'] : 'status';
+    drupal_set_message(strtr($version['message'], array('%required_version' => $version['required_version'], '%installed_version' => phpversion())), $message_type);
+  }
+}
+
+/**
+ * Verify the value of the specified configuration option as found in php.ini.
+ *
+ * @param $setting
+ *   An array with some or all of the following directives:
+ *    'required_value' = the required value of the configuration option
+ *    'shorthand'      = TRUE/FALSE whether the option is in shorthand notation
+ *    'operator'       = optional comparison operator
+ *    'message'        = message to display if comparison fails
+ *                       ("%required_value" and "%current_value" will be
+ *                        automatically replaced if included in the message
+ *                        text.)
+ *    'message_type'   = message type (ie, 'error', 'status')
+ */
+function drupal_verify_install_php($requirements = array()) {
+  foreach ($requirements as $requirement => $data) {
+    // Handle special case (not from php.ini)
+    if ($requirement == 'version') {
+      drupal_verify_version_php($data);
+    }
+    else {
+      if ($data['shorthand']) {
+        $required = drupal_shorthand_to_bytes($data['required_value']);
+        $current = drupal_shorthand_to_bytes(ini_get($requirement));
+      }
+      else {
+        $required = $data['required_value'];
+        $current = ini_get($requirement);
+      }
+  
+      switch ($data['operator']) {
+        case '<':
+          $valid = ($current < $required);
+          break;
+        case '<=':
+          $valid = ($current <= $required);
+          break;
+        case '==':
+        default:
+          $valid = ($current == $required);
+          break;
+        case '>=':
+          $valid = ($current >= $required);
+          break;
+        case '>':
+          $valid = ($current > $required);
+          break;
+        case '!=':
+        case '<>':
+          $valid = ($current != $required);
+          break;
+        case '===':
+          $valid = ($current === $required);
+          break;
+        case '!==':
+          $valid = ($current !== $required);
+          break;
+      }
+
+      if (!$valid && isset($data['message'])) {
+        $message_type = $data['message_type'] ? $data['message_type'] : 'status';
+        drupal_set_message(strtr($data['message'], array('%current_value' => ini_get($requirement), '%required_value' => $data['required_value'])), $message_type);
+      }
+    }
+  }
+}
+
+/**
+ * Verify the state of the specified file.
+ *
+ * @param $requirements
+ *   An array with some or all of the following directives:
+ *    'required'     = whether or not this file is required
+ *    'mask'         = permissions information about the file
+ *    'type'         = file type (file, directory, link)
+ *    'message'      = message to display if something is wrong with file
+ *                     ("%required_value" and "%current_value" will be
+ *                      automatically replaced if included in the message
+ *                      text.)
+ *    'message_type' = message type (ie, 'error', 'status')
+ */
+function drupal_verify_install_file($requirements = array()) {
+  foreach ($requirements as $file => $data) {
+    // Handle special case files (ie settings.php)
+    switch ($file) {
+      case '%settings.php':
+        $file = './'. conf_path() .'/settings.php';
+        break;
+    }
+
+    $err = FALSE;
+    $message_type = ($data['required'] ? 'error' : 'status');
+    // Check for files that shouldn't be there
+    if (isset($data['mask']) && $data['mask'] & FILE_NOT_EXIST) {
+      if (file_exists($file)) {
+        drupal_set_message(strtr('%type <em>%file</em> exists but should not.', array('%type' => $data['type'], '%file' => $file)), $message_type);
+        $err = TRUE;
+      }
+    }
+    else {
+      // Verfiy that the file is the type of file it is supposed to be
+      if (isset($data['type']) && file_exists($file)) {
+        switch ($data['type']) {
+          case 'file':
+            if (!is_file($file)) {
+              $err = TRUE;
+            }
+            break;
+          case 'directory':
+            if (!is_dir($file)) {
+              $err = TRUE;
+            }
+            break;
+          case 'link':
+            if (!is_link($file)) {
+              $err = TRUE;
+            }
+            break;
+        }
+        if ($err) {
+          drupal_set_message(strtr('<em>%file</em> exists but is not a %type.', array('%type' => $data['type'], '%file' => $file)), $message_type);
+        }
+      }
+
+      // Verify file permissions
+      if (isset($data['mask'])) {
+        $filetype = ucfirst($data['type']);
+        $masks = array(FILE_EXIST, FILE_READABLE, FILE_WRITABLE, FILE_EXECUTABLE, FILE_NOT_EXIST, FILE_NOT_READABLE, FILE_NOT_WRITABLE, FILE_NOT_EXECUTABLE);
+        foreach ($masks as $mask) {
+          if ($data['mask'] & $mask && !$err) {
+            switch ($mask) {
+              case FILE_EXIST:
+                if (!file_exists($file)) {
+                  if ($filetype == 'Directory') {
+                    drupal_install_mkdir($file, $data['mask']);
+                  }
+                  if (!file_exists($file)) {
+                    drupal_set_message(strtr('%type <em>%file</em> does not exist.', array('%type' => $filetype, '%file' => $file)), $message_type);
+                    $err = TRUE;
+                  }
+                }
+                break;
+              case FILE_READABLE:
+                if (!is_readable($file) && !drupal_install_fix_file($file, $data['mask'])) {
+                  drupal_set_message(strtr('%type <em>%file</em> is not readable.', array('%type' => $filetype, '%file' => $file)), $message_type);
+                  $err = TRUE;
+                }
+                break;
+              case FILE_WRITABLE:
+                if (!is_writable($file) && !drupal_install_fix_file($file, $data['mask'])) {
+                  drupal_set_message(strtr('%type <em>%file</em> is not writable.', array('%type' => $filetype, '%file' => $file)), $message_type);
+                  $err = TRUE;
+                }
+                break;
+              case FILE_EXECUTABLE:
+                if (!is_executable($file) && !drupal_install_fix_file($file, $data['mask'])) {
+                  drupal_set_message(strtr('%type <em>%file</em> is not executable.', array('%type' => $filetype, '%file' => $file)), $message_type);
+                  $err = TRUE;
+                }
+                break;
+              case FILE_NOT_READABLE:
+                if (is_readable($file) && !drupal_install_fix_file($file, $data['mask'])) {
+                  drupal_set_message(strtr('%type <em>%file</em> is readable but should not be.', array('%type' => $filetype, '%file' => $file)), $message_type);
+                  $err = TRUE;
+                }
+                break;
+              case FILE_NOT_WRITABLE:
+                if (is_writable($file) && !drupal_install_fix_file($file, $data['mask'])) {
+                  drupal_set_message(strtr('%type <em>%file</em> is writable but should not be.', array('%type' => $filetype, '%file' => $file)), $message_type);
+                  $err = TRUE;
+                }
+                break;
+              case FILE_NOT_EXECUTABLE:
+                if (is_executable($file) && !drupal_install_fix_file($file, $data['mask'])) {
+                  drupal_set_message(strtr('%type <em>%file</em> is executable but should not be.', array('%type' => $filetype, '%file' => $file)), $message_type);
+                  $err = TRUE;
+                }
+                break;
+            }
+          }
+        }
+      }
+    }
+    if ($err && isset($data['message'])) {
+      $message_type = $data['message_type'] ? $data['message_type'] : 'status';
+      drupal_set_message($data['message'], $message_type);
+    }
+  }
+}
+
+function drupal_install_mkdir($file, $mask) {
+  $mod = 0;
+  $masks = array(FILE_READABLE, FILE_WRITABLE, FILE_EXECUTABLE, FILE_NOT_READABLE, FILE_NOT_WRITABLE, FILE_NOT_EXECUTABLE);
+  foreach ($masks as $m) {
+    if ($mask & $m) {
+      switch ($m) {
+        case FILE_READABLE:
+          $mod += 444;
+          break;
+        case FILE_WRITABLE:
+          $mod += 222;
+          break;
+        case FILE_EXECUTABLE:
+          $mod += 111;
+          break;
+      }
+    }
+  }
+
+  if (@mkdir($file, intval("0$mod", 8))) {
+    drupal_set_message("Automatically created directory <em>$file</em>.", 'status');
+    return TRUE;
+  }
+  else {
+    drupal_set_message("Failed to automatically create directory <em>$file</em>, insufficient privileges.", 'status');
+  }
+}
+
+/**
+ * Attempt to fix file permissions.
+ *
+ * @param $file
+ *  The name of the file with permissions to fix.
+ * @param $mask
+ *  The desired permissions for the file.
+ *
+ * @return
+ *  TRUE/FALSE whether or not we were able to fix the file's permissions.
+ */
+function drupal_install_fix_file($file, $mask) {
+  $mod = substr(sprintf('%o', fileperms($file)), -4);
+  $prefix = substr($mod, 0, 1);
+  $mod = substr($mod, 1 ,4);
+  $masks = array(FILE_READABLE, FILE_WRITABLE, FILE_EXECUTABLE, FILE_NOT_READABLE, FILE_NOT_WRITABLE, FILE_NOT_EXECUTABLE);
+  foreach ($masks as $m) {
+    if ($mask & $m) {
+      switch ($m) {
+        case FILE_READABLE:
+          if (!is_readable($file)) {
+            $mod += 444;
+          }
+          break;
+        case FILE_WRITABLE:
+          if (!is_writable($file)) {
+            $mod += 222;
+          }
+          break;
+        case FILE_EXECUTABLE:
+          if (!is_executable($file)) {
+            $mod += 111;
+          }
+          break;
+        case FILE_NOT_READABLE:
+          if (is_readable($file)) {
+            $mod -= 444;
+          }
+          break;
+        case FILE_NOT_WRITABLE:
+          if (is_writable($file)) {
+            $mod -= 222;
+          }
+          break;
+        case FILE_NOT_EXECUTABLE:
+          if (is_executable($file)) {
+            $mod -= 111;
+          }
+          break;
+      }
+    }
+  }
+
+  if (@chmod($file, intval("$prefix$mod", 8))) {
+    drupal_set_message("Automatically fixed the permissions of file <em>$file</em>.", 'status');
+    return TRUE;
+  }
+  else {
+    drupal_set_message("Failed to automatically fix permissions of file <em>$file</em>, insufficient privileges.", 'status');
+    return FALSE;
+  }
+}
+
+/**
+ * Verify that a function exists.
+ *
+ * @param $requirements
+ *   An array with some or all of the following directives:
+ *    'message'      = message to display if the function does not exist.
+ *    'message_type' = message type (ie, 'error', 'status')
+ */
+function drupal_verify_install_function($requirements = array()) {
+  foreach ($requirements as $function => $data) {
+    if (!function_exists("$function")) {
+      $message_type = $data['message_type'] ? $data['message_type'] : 'status';
+      drupal_set_message($data['message'], $message_type);
+    }
+  }
+}
+
+?>
--- includes/theme.inc.orig	2006-04-21 11:22:53.000000000 -0400
+++ includes/theme.inc	2006-04-21 11:23:10.000000000 -0400
@@ -453,17 +453,63 @@
   return $output;
 }
 
+function theme_install_page($content) {
+  drupal_set_header('Content-Type: text/html; charset=utf-8');
+  theme('add_style', 'misc/maintenance.css');
+  drupal_set_html_head('<link rel="shortcut icon" href="'. base_path() .'misc/favicon.ico" type="image/x-icon" />');
+  $output = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
+  $output .= '<html xmlns="http://www.w3.org/1999/xhtml">';
+  $output .= '<head>';
+  $output .= ' <title>'. drupal_get_title() .'</title>';
+  $output .= drupal_get_html_head();
+  $output .= theme_get_styles();
+  $output .= '</head>';
+  $output .= '<body>';
+  $output .= '<h1>' . drupal_get_title() . '</h1>';
+
+  $messages = drupal_set_message();
+  if (isset($messages['error'])) {
+    $output .= '<h3>The following errors must be resolved before you can continue the installation process:</h3>';
+    $output .= theme('status_messages', 'error');
+  }
+
+  $output .= "\n<!-- begin content -->\n";
+  $output .= $content;
+  $output .= "\n<!-- end content -->\n";
+
+  if (isset($messages['status'])) {
+    $output .= '<h4>The following installation warnings should be carefully reviewed, but in most cases may be safely ignored:</h4>';
+    $output .= theme('status_messages', 'status');
+  }
+
+  $output .= '</body></html>';
+
+  return $output;
+}
+
 /**
  * Returns themed set of status and/or error messages.  The messages are grouped
  * by type.
  *
+ * @param $display
+ *   Optional string if wish to display only 'error' or 'status' messages.
+ *
  * @return
  *   A string containing the messages.
  */
-function theme_status_messages() {
-  if ($data = drupal_get_messages()) {
+function theme_status_messages($display = NULL) {
+  static $data;
+
+  if (!$data) {
+    $data = drupal_get_messages();
+  }
+
+  if ($data) {
     $output = '';
     foreach ($data as $type => $messages) {
+      if ($display && $display != $type) {
+        continue;
+      }
       $output .= "<div class=\"messages $type\">\n";
       if (count($messages) > 1) {
         $output .= " <ul>\n";
@@ -476,6 +522,7 @@
         $output .= $messages[0];
       }
       $output .= "</div>\n";
+      unset($data["$type"]);
     }
 
     return $output;
--- includes/install.mysql.inc.orig	2006-04-21 11:39:01.000000000 -0400
+++ includes/install.mysql.inc	2006-04-21 11:23:10.000000000 -0400
@@ -0,0 +1,195 @@
+<?php
+
+// MySQL specific install functions
+
+/**
+ * Verify the current MySQL installation.
+ *
+ * @param $requirements
+ *  An array containing MySQL requirements. Supported arguments:
+ *   'version':  the required version of MySQL
+ */
+function drupal_verify_install_mysql($requirements = array()) {
+  foreach ($requirements as $requirement => $data) {
+    switch ($requirement) {
+      case 'version':
+        drupal_verify_version_mysql($data);
+      break;
+    }
+  }
+}
+
+/**
+ * Check if MySQL is available.
+ *
+ * @return
+ *  TRUE/FALSE
+ */
+function mysql_is_available() {
+  if (function_exists('mysql_connect')) {
+    return TRUE;
+  }
+  return FALSE;
+}
+
+/**
+ * Check if we can connect to MySQL.
+ *
+ * @return
+ *  TRUE/FALSE
+ */
+function drupal_test_mysql($url) {
+  if (!mysql_is_available()) {
+    drupal_set_message('PHP MySQL support not enabled.', 'error');
+  }
+
+  $url = parse_url($url);
+
+  // Decode url-encoded information in the db connection string
+  $url['user'] = urldecode($url['user']);
+  $url['pass'] = urldecode($url['pass']);
+  $url['host'] = urldecode($url['host']);
+  $url['path'] = urldecode($url['path']);
+
+  // Allow for non-standard MySQL port.
+  if (isset($url['port'])) {
+     $url['host'] = $url['host'] .':'. $url['port'];
+  }
+
+  if ($connection = @mysql_connect($url['host'], $url['user'], $url['pass'], TRUE, 2)) {
+    // Test selecting the database
+    if (!mysql_select_db(substr($url['path'], 1))) {
+      drupal_set_message('We were able to connect to the MySQL database server (which means your username and password are valid) but not able to select your database. MySQL reports the following message: <em>'. mysql_error() .'</em><ul><li>Are you sure you have the correct database name?</li><li>Are you sure the database exists?</li><li>Are you sure the username has permission to access the database?</li></ul>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.', 'error');
+      return FALSE;
+    }
+
+    // Test CREATE
+    $query = 'CREATE TABLE drupal_install_test (id int(1) NULL);';
+    $result = mysql_query("$query");
+    if ($error = mysql_error()) {
+      drupal_set_message('We were unable to create a test table on your MySQL database server. MySQL reports the following message: "<em>'. $error .'</em>"<ul><li>Are you sure the configured username has the necessary MySQL permissions to create tables in the database?</li></ul>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.', 'error');
+      return FALSE;
+    }
+    $err = FALSE;
+    $success = array('SELECT', 'CREATE');
+
+    // Test INSERT
+    $query = 'INSERT INTO drupal_install_test (id) VALUES(1);';
+    $result = mysql_query("$query");
+    if ($error = mysql_error()) {
+      drupal_set_message('We were unable to insert a value into a test table on your MySQL database server. We tried inserting a value with the command "<code>'. $query .'</code>" and MySQL reported the following error: "<em>'. $error .'</em>".', 'error');
+      $err = TRUE;
+    }
+    else {
+      $success[] = 'INSERT';
+    }
+
+    // Test UPDATE
+    $query = 'UPDATE drupal_install_test SET id = 2;';
+    $result = mysql_query("$query");
+    if ($error = mysql_error()) {
+      drupal_set_message('We were unable to update a value in a test table on your MySQL database server. We tried updating a value with the command "<code>'. $query .'</code>" and MySQL reported the following error: "<em>'. $error .'</em>".', 'error');
+      $err = TRUE;
+    }
+    else {
+      $success[] = 'UPDATE';
+    }
+
+    // Test LOCK
+    $query = 'LOCK TABLES drupal_install_test WRITE;';
+    $result = mysql_query("$query");
+    if ($error = mysql_error()) {
+      drupal_set_message('We were unable to lock a test table on your MySQL database server. We tried locking a table with the command "<code>'. $query .'</code>" and MySQL reported the following error: "<em>'. $error .'</em>".', 'error');
+      $err = TRUE;
+    }
+    else {
+      $success[] = 'LOCK';
+    }
+    
+    // Test UNLOCK
+    $query = 'UNLOCK TABLES;';
+    $result = mysql_query("$query");
+    if ($error = mysql_error()) {
+      drupal_set_message('We were unable to unlock a test table on your MySQL database server. We tried unlocking a table with the command "<code>'. $query .'</code>" and MySQL reported the following error: "<em>'. $error .'</em>".', 'error');
+      $err = TRUE;
+    }
+    else {
+      $success[] = 'UNLOCK';
+    }
+    
+    // Test DELETE
+    $query = 'DELETE FROM drupal_install_test;';
+    $result = mysql_query("$query");
+    if ($error = mysql_error()) {
+      drupal_set_message('We were unable to delete a value from a test table on your MySQL database server. We tried deleting a value with the command "<code>'. $query .'</code>" and MySQL reported the following error: "<em>'. $error .'</em>".', 'error');
+      $err = TRUE;
+    }
+    else {
+      $success[] = 'DELETE';
+    }
+    
+    // Test DROP
+    $query = 'DROP TABLE drupal_install_test;';
+    $result = mysql_query("$query");
+    if ($error = mysql_error()) {
+      drupal_set_message('We were unable to drop a test table from your MySQL database server. We tried dropping a table with the command "<code>'. $query .'</code>" and MySQL reported the following error: "<em>'. $error .'</em>".', 'error');
+      $err = TRUE;
+    }
+    else {
+      $success[] = 'DROP';
+    }
+
+    if ($err) {
+      drupal_set_message('In order for Drupal to work and to proceed with the installation process you must resolve all MySQL permission issues reported above. We were able to verify that we have permission for the following MySQL commands: '. implode($success, ', ') .'. For more help with configuring your MySQL database server, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what any of this means you should probably contact your hosting provider.', 'error');
+      return FALSE;
+    }
+    
+    mysql_close($connection);
+    return TRUE;
+  }
+  else {
+    drupal_set_message('Failure to connect to your MySQL database server. MySQL reports the following message: <em>'. mysql_error() .'</em><ul><li>Are you sure you have the correct username and password?</li><li>Are you sure that you have typed the correct database hostname?</li><li>Are you sure that the database server is running?</li></ul>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.', 'error');
+  }
+  return FALSE;
+}
+
+/**
+ * Check if MySQL is currently being used.
+ *
+ * @return
+ *  0 = not MySQL, 1 = MySQL
+ */
+function _using_mysql() {
+  global $db_type;
+
+  if ($db_type == 'mysql') {
+    return 1;
+  }
+  else {
+    return 0;
+  }
+}
+
+/**
+ * Retrieve the version of MySQL that is currently being used.
+ *
+ * @param $version
+ *  An array containing version information and a message if the installed
+ *  version of MySQL doesn't meet the minimum requirements.
+ *   Recognized options:
+ *    - 'required_version': the required version of MySQL
+ *    - 'message': message to display if insufficient version of MySQL
+ *    - 'message_type': 'error' if critical, 'status' if warning
+ */
+function drupal_verify_version_mysql($version = array()) {
+  global $active_db;
+
+  if (!isset($active_db)) {
+    drupal_set_message('No connection to MySQL database, unable to verify MySQL version.', 'error');
+  }
+  elseif (version_compare(mysql_get_server_info($active_db), $version['required_version'], '<')) {
+    drupal_set_message(strtr($version['message'], array('%required_version' => $version['required_version'], '%installed_version' => mysql_get_server_info($active_db))), $version['message_type']);
+  }
+}
+
+?>
--- includes/install.pgsql.inc.orig	2006-04-21 11:39:57.000000000 -0400
+++ includes/install.pgsql.inc	2006-04-21 11:23:10.000000000 -0400
@@ -0,0 +1,117 @@
+<?php
+
+// PostgreSQL specific install functions
+
+/**
+ * Verify the current PostgreSQL installation.
+ *
+ * @param $requirements
+ *  An array containing PostgreSQL requirements. Supported arguments:
+ *   'version':  the required version of PostgreSQL
+ */
+function drupal_verify_install_pgsql($requirements = array()) {
+  foreach ($requirements as $requirement => $data) {
+    switch ($requirement) {
+      case 'version':
+        drupal_verify_version_pgsql($data);
+      break;
+    }
+  }
+}
+
+/**
+ * Check if PostgreSQL is available.
+ *
+ * @return
+ *  TRUE/FALSE
+ */
+function pgsql_is_available() {
+  if (function_exists('pgsql_connect')) {
+    return TRUE;
+  }
+  return FALSE;
+}
+
+/**
+ * Check if we can connect to PostgreSQL.
+ *
+ * @return
+ *  TRUE/FALSE
+ */
+function drupal_test_pgsql($url) {
+  if (!pgsql_is_available()) {
+    drupal_set_message('PHP PostgreSQL support not enabled.', 'error');
+  }
+
+  $url = parse_url($url);
+
+  // Decode url-encoded information in the db connection string
+  $url['user'] = urldecode($url['user']);
+  $url['pass'] = urldecode($url['pass']);
+  $url['host'] = urldecode($url['host']);
+  $url['path'] = urldecode($url['path']);
+
+  $conn_string = ' user='. $url['user'] .' dbname='. substr($url['path'], 1) .' password='. $url['pass'] . ' host=' . $url['host'];
+  $conn_string .= isset($url['port']) ? ' port=' . $url['port'] : '';
+
+  // pg_last_error() does not return a useful error message for database
+  // connection errors. We must turn on error tracking to get at a good error
+  // message, which will be stored in $php_errormsg.
+  $track_errors_previous = ini_get('track_errors');
+  ini_set('track_errors', 1);
+
+  if ($connection = @pg_connect($conn_string)) {
+    pg_close($connection);
+    return TRUE;
+  }
+  else {
+    drupal_set_message('Failure to connect to your PostgreSQL database server. PostgreSQL reports the following message: <em>'. decode_entities($php_errormsg) .'</em><ul><li>Are you sure you have the correct username and password?</li><li>Are you sure that you have typed the correct database hostname?</li><li>Are you sure that the database server is running?</li></ul>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.', 'error');
+  }
+  return FALSE;
+}
+
+/**
+ * Check if PostgreSQL is currently being used.
+ *
+ * @return
+ *  0 = not PostgreSQL, 1 = PostgreSQL
+ */
+function _using_pgsql() {
+  global $db_type;
+
+  if ($db_type == 'pgsql') {
+    return 1;
+  }
+  else {
+    return 0;
+  }
+}
+
+/**
+ * Retrieve the version of PostgreSQL that is currently being used.
+ *
+ * @param $version
+ *  An array containing version information and a message if the installed
+ *  version of PostgreSQL doesn't meet the minimum requirements.
+ *   Recognized options:
+ *    - 'required_version': the required version of PostgreSQL
+ *    - 'message': message to display if insufficient version of PostgreSQL
+ *    - 'message_type': 'error' if critical, 'status' if warning
+ */
+function drupal_verify_version_pgsql($version = array()) {
+  global $active_db;
+
+  if (!isset($active_db)) {
+    drupal_set_message('No connection to PostgreSQL database, unable to verify PostgreSQL version.', 'error');
+  }
+  elseif (function_exists('pg_version')) {
+    // pg_version() was added in PHP 5
+    $pg_version = pg_version();
+    if (version_compare($pg_version['server_version'], $version['required_version'], '<')) {
+      drupal_set_message(strtr($version['message'], array('%required_version' => $version['required_version'], '%installed_version' => $pg_version['server_version'])), $version['message_type']);
+    }
+  }
+  // TODO: how can we detect pgsql version pre-PHP5?
+}
+
+?>
--- includes/install.apache.inc.orig	2006-04-21 11:39:05.000000000 -0400
+++ includes/install.apache.inc	2006-04-21 11:23:10.000000000 -0400
@@ -0,0 +1,78 @@
+<?php
+
+// Apache specific install functions
+
+/**
+ * Verify the current Apache installation.
+ *
+ * @param $requirements
+ *  An array containing Apache requirements. Supported arguments:
+ *   'version':  the required version of Apache
+ */
+function drupal_verify_install_apache($requirements = array()) {
+  if (!_using_apache()) {
+    // Don't perform Apache validations -- we're not using Apache
+    return;
+  }
+  foreach ($requirements as $requirement => $data) {
+    switch ($requirement) {
+      case 'version':
+        _drupal_verify_version_apache($data);
+        break;
+      case 'module':
+        _drupal_verify_modules_apache($data);
+        break;
+    }
+  }
+}
+
+/**
+ * Check if Apache is currently being used to serve Drupal pages.
+ *
+ * @return
+ *  0 = not Apache, 1 = Apache
+ */
+function _using_apache() {
+  return preg_match('/apache/i', $_SERVER['SERVER_SOFTWARE']);
+}
+
+/**
+ * Verify that the version of Apache that is currently being used meets our
+ * minimum requirements.
+ *
+ * @param $version
+ *  An array containing version information and a message if the installed
+ *  version of Apache doesn't meet the minimum requirements.
+ *   Recognized options:
+ *    - 'required_version':  the required version of Apache
+ *    - 'message': message to display if insufficient version of Apache
+ *    - 'message_type': 'error' if critical, 'status' if warning
+ */
+function _drupal_verify_version_apache($version = array()) {
+  preg_match('!Apache/(.*) !U', apache_get_version(), $v);
+  $installed_version = $v[1];
+  if (version_compare($installed_version, $version['required_version'], '<')) {
+    $message_type = $data['message_type'] ? $version['message_type'] : 'status';
+    drupal_set_message(strtr($version['message'], array('%required_version' => $version['required_version'], '%installed_version' => $installed_version)), $message_type);
+  }
+}
+
+/**
+ * Check to see if the required Apache modules are installed.
+ *
+ * @param @modules
+ *  An array of required modules.
+ */
+function _drupal_verify_modules_apache($modules = array()) {
+  // TODO: Is it possible to verify Apache modules without using the function
+  //       apache_get_modules()?
+  if (function_exists('apache_get_modules')) {
+    foreach ($modules as $module => $data) {
+      if (!in_array($module, apache_get_modules())) {
+        $message_type = $data['message_type'] ? $data['message_type'] : 'status';
+        drupal_set_message($data['message'], $message_type);
+      }
+    }
+  }
+}
+?>
--- modules/system.install.orig	2006-04-21 11:40:03.000000000 -0400
+++ modules/system.install	2006-04-21 11:23:10.000000000 -0400
@@ -0,0 +1,935 @@
+<?php
+
+/**
+ * The install _requirements_bootstrap hook is called before any installation
+ * begins. This is a special hook for the system module as it is used to
+ * install the Drupal core. Non-core modules and profiles will just use the 
+ * _pre and _post install hooks.
+ * Profiles can use the _bootstrap hook.
+ */
+function system_requirements_bootstrap() {
+  $requirements = array();
+
+  // Verify version of PHP
+  $requirements['php']['version'] = array(
+    'required_version' => DRUPAL_MINIMUM_PHP,
+    'message'        => 'Drupal requires PHP version %required_version or greater. You are using PHP version %installed_version so Drupal will not work properly on this installation.',
+    'message_type'   => 'error'
+  );
+
+  // Verify safe_mode
+  $requirements['php']['safe_mode'] = array(
+    'required_value' => 0,
+    'message'        => 'PHP safe_mode is currently enabled. You must disable safe_mode for Drupal to properly function.',
+    'message_type'   => 'error'
+  );
+
+  // Verify register_globals
+  $requirements['php']['register_globals'] = array(
+    'required_value' => 0,
+    'message'        => 'PHP register_globals is currently enabled. As of Drupal 4.2.0 it is advised that you disable register_globals.'
+  );
+
+  // Verify PHP memory limits
+  if (function_exists(memory_get_usage)) {
+    // memory_get_usage() will only be defined if PHP is compiled with 
+    // the --enable-memory-limit configuration option.
+    $requirements['php']['memory_limit'] = array(
+      'required_value' => DRUPAL_MINIMUM_MEMORY,
+      'operator'       => '>=',
+      'message'        => 'Your PHP installation limits Drupal to using only %current_value of RAM. It is suggested that you modify the memory_limit directive to allow at least %required_value of RAM.',
+      'shorthand'      => TRUE
+    );
+  }
+
+  $requirements['file']['./cron.php'] = array(
+      'type'           => 'file',
+      'mask'           => FILE_EXIST|FILE_READABLE|FILE_NOT_WRITEABLE,
+      'message'        => 'The cron.php file provides automation for Drupal functionality. Most installations will want this file properly installed. The file should be readable not writeable (The file must not be writeable as that would be a security risk).',
+      'message_type'   => 'error'
+  );
+
+  $requirements['file']['./index.php'] = array(
+      'type'           => 'file',
+      'mask'           => FILE_EXIST|FILE_READABLE|FILE_NOT_WRITEABLE,
+      'required'       => TRUE,
+      'message'        => 'The index.php file is Drupal\'s main interface with the world. This file must be readable and not writeable. (The file must not be writeable as that would be a security risk).',
+      'message_type'   => 'error'
+  );
+
+  $requirements['file']['./xmlrpc.php'] = array(
+      'type'           => 'file',
+      'mask'           => FILE_EXIST|FILE_READABLE|FILE_NOT_WRITEABLE,
+      'required'       => TRUE
+  );
+
+  // %settings.php is a special case, Drupal will search for it...
+  $requirements['file']['%settings.php'] = array(
+      'type'           => 'file',
+      'mask'           => FILE_EXIST|FILE_READABLE|FILE_WRITEABLE,
+      'required'       => TRUE,
+      'message'        => 'The Drupal installer requires write permissions to settings.php during the installation process.',
+      'message_type'   => 'error'
+  );
+
+  $requirements['file']['./files'] = array(
+      'type'           => 'directory',
+      'mask'           => FILE_EXIST|FILE_READABLE|FILE_WRITEABLE,
+      'required'       => FALSE,
+      'message'        => 'The "files" subdirectory can be created in your installation directory to store files such as custom logos, user avatars, and other media associated with your new site. The sub-directory requires "read and write" permission by the Drupal server process if you wish to provide this functionality.',
+  );
+
+  // If using Apache to serve pages
+  $requirements['apache']['version'] = array(
+    'required_version' => DRUPAL_MINIMUM_APACHE,
+    'message'          => 'Drupal requires Apache version %required_version or greater. You are using Apache version %installed_version so Drupal will not work properly on this installation.',
+    'message_type'     => 'error'
+  );
+
+  $requirements['apache']['module']['mod_rewrite'] = array(
+    'message' => 'Apache\'s mod_rewrite is not enabled. You will need to enable mod_rewrite if you wish to use Drupal\'s Clean URL functionality.'
+  );
+
+  $requirements['function']['gzencode4'] = array(
+    'message' => 'For improved Drupal performance and reduced bandwidth consumption you can enable the PHP zlib extension. If enabled, Drupal will compress cached pages and serve these pre-compressed pages to web browsers that support gzip.'
+  );
+
+  return $requirements;
+}
+
+/**
+ * The install _requirements_pre hook is called after we have a established a
+ * connection to the database. This hook will be called in non-core modules
+ * after Drupal core has been successfully installed.
+ */
+function system_requirements_pre() {
+  $requirements = array();
+
+  $requirements['mysql']['version'] = array(
+    'required_version' => DRUPAL_MINIMUM_MYSQL,
+    'message'          => 'Drupal requires MySQL version %required_version or greater. You are using MySQL version %installed_version so Drupal will not work properly on this installation.',
+    'message_type'     => 'error'
+  );
+  $requirements['pgsql']['version'] = array(
+    'required_version' => DRUPAL_MINIMUM_PGSQL,
+    'message'          => 'Drupal requires PostgreSQL version %required_version or greater. You are using PostgreSQL version %installed_version so Drupal will not work properly on this installation.',
+    'message_type'     => 'error'
+  );
+
+  return $requirements;
+}
+
+/**
+ * Install _requirements_post hook is called after the installation process
+ * is complete.
+ */
+function system_requirements_post() {
+  $requirements['file']['%settings.php'] = array(
+      'type'           => 'file',
+      'mask'           => FILE_EXIST|FILE_READABLE|FILE_NOT_WRITEABLE,
+      'required'       => TRUE,
+      'message'        => 'All necessary changes to <code>settings.php</code> have been made, so you should now remove write permissions to this file. Failure to remove write permissions to this file is a security risk.',
+      'message_type'   => 'error'
+  );
+
+  return $requirements;
+}
+
+function system_create_tables() {
+  global $db_type;
+  $tables = array();
+
+  if ($db_type == 'mysql') {
+    $tables['access'] = array(
+      'schema' => 0,
+      'create' => "CREATE TABLE {access} (
+                    aid tinyint(10) NOT NULL auto_increment,
+                    mask varchar(255) NOT NULL default '',
+                    type varchar(255) NOT NULL default '',
+                    status tinyint(2) NOT NULL default '0',
+                    PRIMARY KEY (aid)
+                  ) TYPE=MyISAM;",
+    );
+
+    $tables['accesslog'] = array(
+      'schema' => 0,
+      'create' => "CREATE TABLE {accesslog} (
+                    aid int(10) NOT NULL auto_increment,
+                    sid varchar(32) NOT NULL default '',
+                    title varchar(255) default NULL,
+                    path varchar(255) default NULL,
+                    url varchar(255) default NULL,
+                    hostname varchar(128) default NULL,
+                    uid int(10) unsigned default '0',
+                    timer int(10) unsigned NOT NULL default '0',
+                    timestamp int(11) unsigned NOT NULL default '0',
+                    KEY accesslog_timestamp (timestamp),
+                    PRIMARY KEY (aid)
+                  ) TYPE=MyISAM;",
+    );
+
+    $tables['aggregator_category'] = array(
+      'schema' => 0,
+      'create' => "CREATE TABLE {aggregator_category} (
+                    cid int(10) NOT NULL auto_increment,
+                    title varchar(255) NOT NULL default '',
+                    description longtext NOT NULL,
+                    block tinyint(2) NOT NULL default '0',
+                    PRIMARY KEY (cid),
+                    UNIQUE KEY title (title)
+                  ) TYPE=MyISAM;",
+    );
+
+    $tables['aggregator_category_feed'] = array(
+      'schema' => 0,
+      'create' => "CREATE TABLE {aggregator_category_feed} (
+                    fid int(10) NOT NULL default '0',
+                    cid int(10) NOT NULL default '0',
+                    PRIMARY KEY (fid,cid)
+                  ) TYPE=MyISAM;",
+    );
+  
+    $tables['aggregator_category_item'] = array(
+      'schema' => 0,
+      'create' => "CREATE TABLE {aggregator_category_item} (
+                    iid int(10) NOT NULL default '0',
+                    cid int(10) NOT NULL default '0',
+                    PRIMARY KEY (iid,cid)
+                  ) TYPE=MyISAM;",
+    );
+
+    $tables['aggregator_feed'] = array(
+      'schema' => 0,
+      'create' => "CREATE TABLE {aggregator_feed} (
+                    fid int(10) NOT NULL auto_increment,
+                    title varchar(255) NOT NULL default '',
+                    url varchar(255) NOT NULL default '',
+                    refresh int(10) NOT NULL default '0',
+                    checked int(10) NOT NULL default '0',
+                    link varchar(255) NOT NULL default '',
+                    description longtext NOT NULL,
+                    image longtext NOT NULL,
+                    etag varchar(255) NOT NULL default '',
+                    modified int(10) NOT NULL default '0',
+                    block tinyint(2) NOT NULL default '0',
+                    PRIMARY KEY (fid),
+                    UNIQUE KEY link (url),
+                    UNIQUE KEY title (title)
+                  ) TYPE=MyISAM;",
+      );
+
+      $tables['aggregator_item'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {aggregator_item} (
+                      iid int(10) NOT NULL auto_increment,
+                      fid int(10) NOT NULL default '0',
+                      title varchar(255) NOT NULL default '',
+                      link varchar(255) NOT NULL default '',
+                      author varchar(255) NOT NULL default '',
+                      description longtext NOT NULL,
+                      timestamp int(11) default NULL,
+                      PRIMARY KEY (iid)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['authmap'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {authmap} (
+                      aid int(10) unsigned NOT NULL auto_increment,
+                      uid int(10) NOT NULL default '0',
+                      authname varchar(128) NOT NULL default '',
+                      module varchar(128) NOT NULL default '',
+                      PRIMARY KEY (aid),
+                      UNIQUE KEY authname (authname)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['blocks'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {blocks} (
+                      module varchar(64) DEFAULT '' NOT NULL,
+                      delta varchar(32) NOT NULL default '0',
+                      theme varchar(255) NOT NULL default '',
+                      status tinyint(2) DEFAULT '0' NOT NULL,
+                      weight tinyint(1) DEFAULT '0' NOT NULL,
+                      region varchar(64) DEFAULT 'left' NOT NULL,
+                      custom tinyint(2) DEFAULT '0' NOT NULL,
+                      throttle tinyint(1) DEFAULT '0' NOT NULL,
+                      visibility tinyint(1) DEFAULT '0' NOT NULL,
+                      pages text DEFAULT '' NOT NULL
+                    ) TYPE=MyISAM;",
+        'default_value' => array(
+          "REPLACE {blocks} SET module = 'user', delta = '0', theme = 'bluemarine', status = '1';",
+          "REPLACE {blocks} SET module = 'user', delta = '1', theme = 'bluemarine', status = '1';")
+
+      );
+
+      $tables['book'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {book} (
+                      vid int(10) unsigned NOT NULL default '0',
+                      nid int(10) unsigned NOT NULL default '0',
+                      parent int(10) NOT NULL default '0',
+                      weight tinyint(3) NOT NULL default '0',
+                      PRIMARY KEY (vid),
+                      KEY nid (nid),
+                      KEY parent (parent)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['boxes'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {boxes} (
+                      bid tinyint(4) NOT NULL auto_increment,
+                      title varchar(64) NOT NULL default '',
+                      body longtext,
+                      info varchar(128) NOT NULL default '',
+                      format int(4) NOT NULL default '0',
+                      PRIMARY KEY (bid),
+                      UNIQUE KEY info (info)
+                    ) TYPE=MyISAM;",
+       );
+
+       $tables['cache'] = array(
+         'schema' => 0,
+         'create' => "CREATE TABLE {cache} (
+                      cid varchar(255) NOT NULL default '',
+                      data longblob,
+                      expire int(11) NOT NULL default '0',
+                      created int(11) NOT NULL default '0',
+                      headers text,
+                      PRIMARY KEY (cid),
+                      INDEX expire (expire)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['comments'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {comments} (
+                      cid int(10) NOT NULL auto_increment,
+                      pid int(10) NOT NULL default '0',
+                      nid int(10) NOT NULL default '0',
+                      uid int(10) NOT NULL default '0',
+                      subject varchar(64) NOT NULL default '',
+                      comment longtext NOT NULL,
+                      hostname varchar(128) NOT NULL default '',
+                      timestamp int(11) NOT NULL default '0',
+                      score mediumint(9) NOT NULL default '0',
+                      status tinyint(3) unsigned NOT NULL default '0',
+                      format int(4) NOT NULL default '0',
+                      thread varchar(255) NOT NULL,
+                      users longtext,
+                      name varchar(60) default NULL,
+                      mail varchar(64) default NULL,
+                      homepage varchar(255) default NULL,
+                      PRIMARY KEY (cid),
+                      KEY lid (nid)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['contact'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {contact} (
+                      cid int(10) unsigned NOT NULL auto_increment,
+                      category varchar(255) NOT NULL default '',
+                      recipients longtext NOT NULL default '',
+                      reply longtext NOT NULL default '',
+                      weight tinyint(3) NOT NULL default '0',
+                      selected tinyint(1) NOT NULL default '0',
+                      PRIMARY KEY (cid),
+                      UNIQUE KEY category (category)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['node_comment_statistics'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {node_comment_statistics} (
+                      nid int(10) unsigned NOT NULL auto_increment,
+                      last_comment_timestamp int(11) NOT NULL default '0',
+                      last_comment_name varchar(60) default NULL,
+                      last_comment_uid int(10) NOT NULL default '0',
+                      comment_count int(10) unsigned NOT NULL default '0',
+                      PRIMARY KEY (nid),
+                      KEY node_comment_timestamp (last_comment_timestamp)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['client'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {client} (
+                      cid int(10) unsigned NOT NULL auto_increment,
+                      link varchar(255) NOT NULL default '',
+                      name varchar(128) NOT NULL default '',
+                      mail varchar(128) NOT NULL default '',
+                      slogan longtext NOT NULL,
+                      mission longtext NOT NULL,
+                      users int(10) NOT NULL default '0',
+                      nodes int(10) NOT NULL default '0',
+                      version varchar(35) NOT NULL default'',
+                      created int(11) NOT NULL default '0',
+                      changed int(11) NOT NULL default '0',
+                      PRIMARY KEY (cid)
+                    ) TYPE=MyISAM;",
+      );
+
+
+      $tables['client_system'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {client_system} (
+                      cid int(10) NOT NULL default '0',
+                      name varchar(255) NOT NULL default '',
+                      type varchar(255) NOT NULL default '',
+                      PRIMARY KEY (cid,name)
+                    ) TYPE=MyISAM;",
+      );
+
+
+      $tables['files'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {files} (
+                      fid int(10) unsigned NOT NULL default '0',
+                      nid int(10) unsigned NOT NULL default '0',
+                      vid int(10) unsigned NOT NULL default '0',
+                      filename varchar(255) NOT NULL default '',
+                      description varchar(255) NOT NULL default '',
+                      filepath varchar(255) NOT NULL default '',
+                      filemime varchar(255) NOT NULL default '',
+                      filesize int(10) unsigned NOT NULL default '0',
+                      list tinyint(1) unsigned NOT NULL default '0',
+                      KEY vid (vid),
+                      KEY fid (fid)
+                    ) TYPE=MyISAM;",
+      );
+
+
+      $tables['filter_formats'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {filter_formats} (
+                      format int(4) NOT NULL auto_increment,
+                      name varchar(255) NOT NULL default '',
+                      roles varchar(255) NOT NULL default '',
+                      cache tinyint(2) NOT NULL default '0',
+                      PRIMARY KEY (format)
+                    ) TYPE=MyISAM;",
+        'default_value' => array(
+          "INSERT INTO {filter_formats} VALUES (1,'Filtered HTML',',1,2,',1);",
+          "INSERT INTO {filter_formats} VALUES (3,'Full HTML','',1);")
+      );
+
+      $tables['filters'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {filters} (
+                      format int(4) NOT NULL default '0',
+                      module varchar(64) NOT NULL default '',
+                      delta tinyint(2) DEFAULT '0' NOT NULL,
+                      weight tinyint(2) DEFAULT '0' NOT NULL,
+                      INDEX (weight)
+                    ) TYPE=MyISAM;",
+        'default_value' => array(
+          "INSERT INTO {filters} VALUES (1,'filter',0,0);",
+          "INSERT INTO {filters} VALUES (1,'filter',2,1);",
+          "INSERT INTO {filters} VALUES (2,'filter',1,0);",
+          "INSERT INTO {filters} VALUES (3,'filter',2,0);")
+      );
+
+      $tables['flood'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {flood} (
+                      event varchar(64) NOT NULL default '',
+                      hostname varchar(128) NOT NULL default '',
+                      timestamp int(11) NOT NULL default '0'
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['forum'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {forum} (
+                      nid int(10) unsigned NOT NULL default '0',
+                      vid int(10) unsigned NOT NULL default '0',
+                      tid int(10) unsigned NOT NULL default '0',
+                      PRIMARY KEY (vid),
+                      KEY nid (nid),
+                      KEY tid (tid)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['history'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {history} (
+                      uid int(10) NOT NULL default '0',
+                      nid int(10) NOT NULL default '0',
+                      timestamp int(11) NOT NULL default '0',
+                      PRIMARY KEY (uid,nid)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['locales_meta'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {locales_meta} (
+                      locale varchar(12) NOT NULL default '',
+                      name varchar(64) NOT NULL default '',
+                      enabled int(2) NOT NULL default '0',
+                      isdefault int(2) NOT NULL default '0',
+                      plurals int(1) NOT NULL default '0',
+                      formula varchar(128) NOT NULL default '',
+                      PRIMARY KEY (locale)
+                    ) TYPE=MyISAM;",
+        'default_value' => array(
+          "INSERT INTO {locales_meta} (locale, name, enabled, isdefault) VALUES ('en', 'English', '1', '1');")
+      );
+
+      $tables['locales_source'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {locales_source} (
+                      lid int(11) NOT NULL auto_increment,
+                      location varchar(255) NOT NULL default '',
+                      source blob NOT NULL,
+                      PRIMARY KEY (lid)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['locales_target'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {locales_target} (
+                      lid int(11) NOT NULL default '0',
+                      translation blob NOT NULL,
+                      locale varchar(12) NOT NULL default '',
+                      plid int(11) NOT NULL default '0',
+                      plural int(1) NOT NULL default '0',
+                      KEY lid (lid),
+                      KEY lang (locale),
+                      KEY plid (plid),
+                      KEY plural (plural)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['menu'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {menu} (
+                      mid int(10) unsigned NOT NULL default '0',
+                      pid int(10) unsigned NOT NULL default '0',
+                      path varchar(255) NOT NULL default '',
+                      title varchar(255) NOT NULL default '',
+                      description varchar(255) NOT NULL default '',
+                      weight tinyint(4) NOT NULL default '0',
+                      type int(2) unsigned NOT NULL default '0',
+                      PRIMARY KEY (mid)
+                    ) TYPE=MyISAM;",
+        'default_value' => "INSERT INTO {menu} VALUES (2, 0, '', 'Primary links', '', 0, 115);"
+      );
+
+      $tables['node'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {node} (
+                      nid int(10) unsigned NOT NULL auto_increment,
+                      vid int(10) unsigned NOT NULL default '0',
+                      type varchar(32) NOT NULL default '',
+                      title varchar(128) NOT NULL default '',
+                      uid int(10) NOT NULL default '0',
+                      status int(4) NOT NULL default '1',
+                      created int(11) NOT NULL default '0',
+                      changed int(11) NOT NULL default '0',
+                      comment int(2) NOT NULL default '0',
+                      promote int(2) NOT NULL default '0',
+                      moderate int(2) NOT NULL default '0',
+                      sticky int(2) NOT NULL default '0',
+                      PRIMARY KEY (nid),
+                      KEY node_type (type(4)),
+                      KEY node_title_type (title,type(4)),
+                      KEY status (status),
+                      KEY uid (uid),
+                      KEY vid (vid),
+                      KEY node_moderate (moderate),
+                      KEY node_promote_status (promote, status),
+                      KEY node_created (created),
+                      KEY node_changed (changed),
+                      KEY node_status_type (status, type, nid)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['node_access'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {node_access} (
+                      nid int(10) unsigned NOT NULL default '0',
+                      gid int(10) unsigned NOT NULL default '0',
+                      realm varchar(255) NOT NULL default '',
+                      grant_view tinyint(1) unsigned NOT NULL default '0',
+                      grant_update tinyint(1) unsigned NOT NULL default '0',
+                      grant_delete tinyint(1) unsigned NOT NULL default '0',
+                      PRIMARY KEY (nid,gid,realm)
+                    ) TYPE=MyISAM;",
+        'default_value' => "INSERT INTO {node_access} VALUES (0, 0, 'all', 1, 0, 0);"
+      );
+
+      $tables['node_revisions'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {node_revisions} (
+                      nid int(10) unsigned NOT NULL,
+                      vid int(10) unsigned NOT NULL,
+                      uid int(10) NOT NULL default '0',
+                      title varchar(128) NOT NULL default '',
+                      body longtext NOT NULL default '',
+                      teaser longtext NOT NULL default '',
+                      log longtext NOT NULL default '',
+                      timestamp int(11) NOT NULL default '0',
+                      format int(4) NOT NULL default '0',
+                      PRIMARY KEY  (nid,vid),
+                      KEY uid (uid)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['profile_fields'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {profile_fields} (
+                      fid int(10) NOT NULL auto_increment,
+                      title varchar(255) default NULL,
+                      name varchar(128) default NULL,
+                      explanation TEXT default NULL,
+                      category varchar(255) default NULL,
+                      page varchar(255) default NULL,
+                      type varchar(128) default NULL,
+                      weight tinyint(1) DEFAULT '0' NOT NULL,
+                      required tinyint(1) DEFAULT '0' NOT NULL,
+                      register tinyint(1) DEFAULT '0' NOT NULL,
+                      visibility tinyint(1) DEFAULT '0' NOT NULL,
+                      options text,
+                      KEY category (category),
+                      UNIQUE KEY name (name),
+                      PRIMARY KEY (fid)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['profile_values'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {profile_values} (
+                      fid int(10) unsigned default '0',
+                      uid int(10) unsigned default '0',
+                      value text,
+                      KEY uid (uid),
+                      KEY fid (fid)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['url_alias'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {url_alias} (
+                      pid int(10) unsigned NOT NULL auto_increment,
+                      src varchar(128) NOT NULL default '',
+                      dst varchar(128) NOT NULL default '',
+                      PRIMARY KEY (pid),
+                      UNIQUE KEY dst (dst),
+                      KEY src (src)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['permission'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {permission} (
+                      rid int(10) unsigned NOT NULL default '0',
+                      perm longtext,
+                      tid int(10) unsigned NOT NULL default '0',
+                      KEY rid (rid)
+                    ) TYPE=MyISAM;",
+         'default_value' => array(
+           "INSERT INTO {permission} VALUES (1,'access content',0);",
+           "INSERT INTO {permission} VALUES (2,'access comments, access content, post comments, post comments without approval',0);")
+      );
+
+      $tables['poll'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {poll} (
+                      nid int(10) unsigned NOT NULL default '0',
+                      runtime int(10) NOT NULL default '0',
+                      active int(2) unsigned NOT NULL default '0',
+                      PRIMARY KEY (nid)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['poll_votes'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {poll_votes} (
+                      nid int(10) unsigned NOT NULL,
+                      uid int(10) unsigned NOT NULL default 0,
+                      hostname varchar(128) NOT NULL default '',
+                      INDEX (nid),
+                      INDEX (uid),
+                      INDEX (hostname)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['poll_choices'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {poll_choices} (
+                      chid int(10) unsigned NOT NULL auto_increment,
+                      nid int(10) unsigned NOT NULL default '0',
+                      chtext varchar(128) NOT NULL default '',
+                      chvotes int(6) NOT NULL default '0',
+                      chorder int(2) NOT NULL default '0',
+                      PRIMARY KEY (chid),
+                      KEY nid (nid)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['role'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {role} (
+                      rid int(10) unsigned NOT NULL auto_increment,
+                      name varchar(32) NOT NULL default '',
+                      PRIMARY KEY (rid),
+                      UNIQUE KEY name (name)
+                    ) TYPE=MyISAM;",
+        'default_value' => array(
+          "INSERT INTO {role} (rid, name) VALUES (1, 'anonymous user');",
+          "INSERT INTO {role} (rid, name) VALUES (2, 'authenticated user');")
+      );
+
+      $tables['search_dataset'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {search_dataset} (
+                      sid int(10) unsigned NOT NULL default '0',
+                      type varchar(16) default NULL,
+                      data longtext NOT NULL,
+                      KEY sid_type (sid, type)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['search_index'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {search_index} (
+                      word varchar(50) NOT NULL default '',
+                      sid int(10) unsigned NOT NULL default '0',
+                      type varchar(16) default NULL,
+                      fromsid int(10) unsigned NOT NULL default '0',
+                      fromtype varchar(16) default NULL,
+                      score float default NULL,
+                      KEY sid_type (sid, type),
+                      KEY from_sid_type (fromsid, fromtype),
+                      KEY word (word)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['search_total'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {search_total} (
+                      word varchar(50) NOT NULL default '',
+                      count float default NULL,
+                      PRIMARY KEY (word)
+                    ) TYPE=MyISAM;",
+      );
+
+
+      $tables['sessions'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {sessions} (
+                      uid int(10) unsigned NOT NULL,
+                      sid varchar(32) NOT NULL default '',
+                      hostname varchar(128) NOT NULL default '',
+                      timestamp int(11) NOT NULL default '0',
+                      cache int(11) NOT NULL default '0',
+                      session longtext,
+                      KEY uid (uid),
+                      PRIMARY KEY (sid),
+                      KEY timestamp (timestamp)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['sequences'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {sequences} (
+                      name varchar(255) NOT NULL default '',
+                      id int(10) unsigned NOT NULL default '0',
+                      PRIMARY KEY (name)
+                    ) TYPE=MyISAM;",
+        'default_value' => "INSERT INTO {sequences} (name, id) VALUES ('menu_mid', 2);"
+      );
+
+      $tables['node_counter'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {node_counter} (
+                      nid int(11) NOT NULL default '0',
+                      totalcount bigint(20) unsigned NOT NULL default '0',
+                      daycount mediumint(8) unsigned NOT NULL default '0',
+                      timestamp int(11) unsigned NOT NULL default '0',
+                      PRIMARY KEY (nid),
+                      KEY totalcount (totalcount),
+                      KEY daycount (daycount),
+                      KEY timestamp (timestamp)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['system'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {system} (
+                      filename varchar(255) NOT NULL default '',
+                      name varchar(255) NOT NULL default '',
+                      type varchar(255) NOT NULL default '',
+                      description varchar(255) NOT NULL default '',
+                      status int(2) NOT NULL default '0',
+                      throttle tinyint(1) DEFAULT '0' NOT NULL,
+                      bootstrap int(2) NOT NULL default '0',
+                      schema_version smallint(3) NOT NULL default -1,
+                      weight int(2) NOT NULL default '0',
+                      PRIMARY KEY (filename),
+                      KEY (weight)
+                    ) TYPE=MyISAM;",
+        'default_value' =>  array(
+          "INSERT INTO {system} (filename, name, type, description, status, throttle, bootstrap, schema_version) VALUES ('themes/engines/phptemplate/phptemplate.engine', 'phptemplate', 'theme_engine', '', 1, 0, 0, 0);",
+          "INSERT INTO {system} (filename, name, type, description, status, throttle, bootstrap, schema_version) VALUES ('themes/bluemarine/page.tpl.php', 'bluemarine', 'theme', 'themes/engines/phptemplate/phptemplate.engine', 1, 0, 0, 0);")
+      );
+
+      $tables['term_data'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {term_data} (
+                      tid int(10) unsigned NOT NULL auto_increment,
+                      vid int(10) unsigned NOT NULL default '0',
+                      name varchar(255) NOT NULL default '',
+                      description longtext,
+                      weight tinyint(4) NOT NULL default '0',
+                      PRIMARY KEY (tid),
+                      KEY vid (vid)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['term_hierarchy'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {term_hierarchy} (
+                      tid int(10) unsigned NOT NULL default '0',
+                      parent int(10) unsigned NOT NULL default '0',
+                      KEY tid (tid),
+                      KEY parent (parent),
+                      PRIMARY KEY (tid, parent)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['term_node'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {term_node} (
+                      nid int(10) unsigned NOT NULL default '0',
+                      tid int(10) unsigned NOT NULL default '0',
+                      KEY nid (nid),
+                      KEY tid (tid),
+                      PRIMARY KEY (tid,nid)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['term_relation'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {term_relation} (
+                      tid1 int(10) unsigned NOT NULL default '0',
+                      tid2 int(10) unsigned NOT NULL default '0',
+                      KEY tid1 (tid1),
+                      KEY tid2 (tid2)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['term_synonym'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {term_synonym} (
+                      tid int(10) unsigned NOT NULL default '0',
+                      name varchar(255) NOT NULL default '',
+                      KEY tid (tid),
+                      KEY name (name(3))
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['users'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {users} (
+                      uid int(10) unsigned NOT NULL default '0',
+                      name varchar(60) NOT NULL default '',
+                      pass varchar(32) NOT NULL default '',
+                      mail varchar(64) default '',
+                      mode tinyint(1) NOT NULL default '0',
+                      sort tinyint(1) default '0',
+                      threshold tinyint(1) default '0',
+                      theme varchar(255) NOT NULL default '',
+                      signature varchar(255) NOT NULL default '',
+                      created int(11) NOT NULL default '0',
+                      access int(11) NOT NULL default '0',
+                      login int(11) NOT NULL default '0',
+                      status tinyint(4) NOT NULL default '0',
+                      timezone varchar(8) default NULL,
+                      language varchar(12) NOT NULL default '',
+                      picture varchar(255) NOT NULL DEFAULT '',
+                      init varchar(64) default '',
+                      data longtext,
+                      PRIMARY KEY (uid),
+                      UNIQUE KEY name (name),
+                      KEY access (access)
+                    ) TYPE=MyISAM;",
+        'default_value' => "INSERT INTO {users} (uid, name, mail) VALUES ('0', '', '');"
+      );
+
+      $tables['users_roles'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {users_roles} (
+                      uid int(10) unsigned NOT NULL default '0',
+                      rid int(10) unsigned NOT NULL default '0',
+                      PRIMARY KEY (uid, rid)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['variable'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {variable} (
+                      name varchar(48) NOT NULL default '',
+                      value longtext NOT NULL,
+                      PRIMARY KEY (name)
+                    ) TYPE=MyISAM;",
+        'default_value' => array(
+          "REPLACE {variable} SET name='theme_default', value='s:10:\"bluemarine\";';",
+          "INSERT INTO {variable} (name,value) VALUES ('filter_html_1','i:1;');",
+          "INSERT INTO {variable} (name, value) VALUES ('node_options_forum', 'a:1:{i:0;s:6:\"status\";}');",
+          "INSERT INTO {variable} VALUES ('menu_primary_menu', 'i:2;');",
+          "INSERT INTO {variable} VALUES ('menu_secondary_menu', 'i:2;');")
+      );
+
+      $tables['vocabulary'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {vocabulary} (
+                      vid int(10) unsigned NOT NULL auto_increment,
+                      name varchar(255) NOT NULL default '',
+                      description longtext,
+                      help varchar(255) NOT NULL default '',
+                      relations tinyint(3) unsigned NOT NULL default '0',
+                      hierarchy tinyint(3) unsigned NOT NULL default '0',
+                      multiple tinyint(3) unsigned NOT NULL default '0',
+                      required tinyint(3) unsigned NOT NULL default '0',
+                      tags tinyint(3) unsigned NOT NULL default '0',
+                      module varchar(255) NOT NULL default '',
+                      weight tinyint(4) NOT NULL default '0',
+                      PRIMARY KEY (vid)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['vocabulary_node_types'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {vocabulary_node_types} (
+                      vid int(10) unsigned NOT NULL DEFAULT '0',
+                      type varchar(32) NOT NULL DEFAULT '',
+                      PRIMARY KEY (vid, type)
+                    ) TYPE=MyISAM;",
+      );
+
+      $tables['watchdog'] = array(
+        'schema' => 0,
+        'create' => "CREATE TABLE {watchdog} (
+                      wid int(5) NOT NULL auto_increment,
+                      uid int(10) NOT NULL default '0',
+                      type varchar(16) NOT NULL default '',
+                      message longtext NOT NULL,
+                      severity tinyint(3) unsigned NOT NULL default '0',
+                      link varchar(255) NOT NULL default '',
+                      location varchar(128) NOT NULL default '',
+                      referer varchar(128) NOT NULL default '',
+                      hostname varchar(128) NOT NULL default '',
+                      timestamp int(11) NOT NULL default '0',
+                      PRIMARY KEY (wid)
+                    ) TYPE=MyISAM;",
+      );
+  }
+
+  return $tables;
+}
+
+?>
--- profiles/default.profile.orig	2006-04-21 11:40:15.000000000 -0400
+++ profiles/default.profile	2006-04-21 11:23:10.000000000 -0400
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * The modules that are enabled when this profile is installed.
+ *
+ * @return
+ *  An array of modules to be enabled.
+ */
+function default_enabled_modules() {
+  return array('block', 'comment', 'filter', 'help', 'menu', 'node', 'page', 'story', 'system', 'taxonomy', 'user', 'watchdog');
+}
+
+function default_profile_description() {
+  return 'Select this profile to enable some basic Drupal functionality and the default theme.';
+}
+
+?>