cleanup

6 files changed, 0 insertions, 280 deletions

diff --git a/dev-db/phpmyadmin/files/config.inc.php-2.5.0.patch b/dev-db/phpmyadmin/files/config.inc.php-2.5.0.patch
deleted file mode 100644
index e9fe14beb395..000000000000
--- a/dev-db/phpmyadmin/files/config.inc.php-2.5.0.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- phpMyAdmin-2.5.0/config.inc.php	2003-05-11 11:10:28.000000000 +0100
-+++ phpMyAdmin/config.inc.php	2003-05-12 22:18:44.000000000 +0100
-@@ -66,11 +66,11 @@
- $cfg['Servers'][$i]['connect_type']  = 'tcp';       // How to connect to MySQL server ('tcp' or 'socket')
- $cfg['Servers'][$i]['compress']      = FALSE;       // Use compressed protocol for the MySQL connection
-                                                     // (requires PHP >= 4.3.0)
--$cfg['Servers'][$i]['controluser']   = '';          // MySQL control user settings
-+$cfg['Servers'][$i]['controluser']   = 'pma';       // MySQL control user settings
-                                                     // (this user must have read-only
--$cfg['Servers'][$i]['controlpass']   = '';          // access to the "mysql/user"
-+$cfg['Servers'][$i]['controlpass']   = '@pmapass@'; // access to the "mysql/user"
-                                                     // and "mysql/db" tables)
--$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (config, http or cookie based)?
-+$cfg['Servers'][$i]['auth_type']     = 'http';      // Authentication method (config, http or cookie based)?
- $cfg['Servers'][$i]['user']          = 'root';      // MySQL user
- $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
-                                                     // with 'config' auth_type)
-@@ -81,29 +81,29 @@
-                                                     // of db-names
- $cfg['Servers'][$i]['verbose']       = '';          // Verbose name for this host - leave blank to show the hostname
- 
--$cfg['Servers'][$i]['pmadb']         = '';          // Database used for Relation, Bookmark and PDF Features
-+$cfg['Servers'][$i]['pmadb']         = 'pmadb';     // Database used for Relation, Bookmark and PDF Features
-                                                     // (see scripts/create_tables.sql)
-                                                     //   - leave blank for no support
-                                                     //     DEFAULT: 'phpmyadmin'
--$cfg['Servers'][$i]['bookmarktable'] = '';          // Bookmark table
-+$cfg['Servers'][$i]['bookmarktable'] = 'PMA_bookmark';// Bookmark table
-                                                     //   - leave blank for no bookmark support
-                                                     //     DEFAULT: 'PMA_bookmark'
--$cfg['Servers'][$i]['relation']      = '';          // table to describe the relation between links (see doc)
-+$cfg['Servers'][$i]['relation']      = 'PMA_relation';// table to describe the relation between links (see doc)
-                                                     //   - leave blank for no relation-links support
-                                                     //     DEFAULT: 'PMA_relation'
--$cfg['Servers'][$i]['table_info']    = '';          // table to describe the display fields
-+$cfg['Servers'][$i]['table_info']    = 'PMA_table_info';// table to describe the display fields
-                                                     //   - leave blank for no display fields support
-                                                     //     DEFAULT: 'PMA_table_info'
--$cfg['Servers'][$i]['table_coords']  = '';          // table to describe the tables position for the PDF schema
-+$cfg['Servers'][$i]['table_coords']  = 'PMA_table_coords';// table to describe the tables position for the PDF schema
-                                                     //   - leave blank for no PDF schema support
-                                                     //     DEFAULT: 'PMA_table_coords'
--$cfg['Servers'][$i]['pdf_pages']     = '';          // table to describe pages of relationpdf
-+$cfg['Servers'][$i]['pdf_pages']     = 'PMA_pdf_pages';// table to describe pages of relationpdf
-                                                     //   - leave blank if you don't want to use this
-                                                     //     DEFAULT: 'PMA_pdf_pages'
--$cfg['Servers'][$i]['column_info']   = '';          // table to store column information
-+$cfg['Servers'][$i]['column_info']   = 'PMA_column_info';// table to store column information
-                                                     //   - leave blank for no column comments/mime types
-                                                     //     DEFAULT: 'PMA_column_info'
--$cfg['Servers'][$i]['history']       = '';          // table to store SQL history
-+$cfg['Servers'][$i]['history']       = 'PMA_history';// table to store SQL history
-                                                     //   - leave blank for no SQL query history
-                                                     //     DEFAULT: 'PMA_history'
- $cfg['Servers'][$i]['verbose_check'] = TRUE;        // set to FALSE if you know that your PMA_* tables
diff --git a/dev-db/phpmyadmin/files/config.inc.php-2.5.3.patch b/dev-db/phpmyadmin/files/config.inc.php-2.5.3.patch
deleted file mode 100644
index 43fb325c6a9a..000000000000
--- a/dev-db/phpmyadmin/files/config.inc.php-2.5.3.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- phpMyAdmin-2.5.3/config.inc.php	2003-05-11 11:10:28.000000000 +0100
-+++ phpMyAdmin/config.inc.php	2003-05-12 22:18:44.000000000 +0100
-@@ -66,11 +66,11 @@
- $cfg['Servers'][$i]['connect_type']  = 'tcp';       // How to connect to MySQL server ('tcp' or 'socket')
- $cfg['Servers'][$i]['compress']      = FALSE;       // Use compressed protocol for the MySQL connection
-                                                     // (requires PHP >= 4.3.0)
--$cfg['Servers'][$i]['controluser']   = '';          // MySQL control user settings
-+$cfg['Servers'][$i]['controluser']   = 'pma';       // MySQL control user settings
-                                                     // (this user must have read-only
--$cfg['Servers'][$i]['controlpass']   = '';          // access to the "mysql/user"
-+$cfg['Servers'][$i]['controlpass']   = '@pmapass@'; // access to the "mysql/user"
-                                                     // and "mysql/db" tables)
--$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (config, http or cookie based)?
-+$cfg['Servers'][$i]['auth_type']     = 'http';      // Authentication method (config, http or cookie based)?
- $cfg['Servers'][$i]['user']          = 'root';      // MySQL user
- $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
-                                                     // with 'config' auth_type)
-@@ -81,29 +81,29 @@
-                                                     // of db-names
- $cfg['Servers'][$i]['verbose']       = '';          // Verbose name for this host - leave blank to show the hostname
- 
--$cfg['Servers'][$i]['pmadb']         = '';          // Database used for Relation, Bookmark and PDF Features
-+$cfg['Servers'][$i]['pmadb']         = 'pmadb';     // Database used for Relation, Bookmark and PDF Features
-                                                     // (see scripts/create_tables.sql)
-                                                     //   - leave blank for no support
-                                                     //     DEFAULT: 'phpmyadmin'
--$cfg['Servers'][$i]['bookmarktable'] = '';          // Bookmark table
-+$cfg['Servers'][$i]['bookmarktable'] = 'PMA_bookmark';// Bookmark table
-                                                     //   - leave blank for no bookmark support
-                                                     //     DEFAULT: 'PMA_bookmark'
--$cfg['Servers'][$i]['relation']      = '';          // table to describe the relation between links (see doc)
-+$cfg['Servers'][$i]['relation']      = 'PMA_relation';// table to describe the relation between links (see doc)
-                                                     //   - leave blank for no relation-links support
-                                                     //     DEFAULT: 'PMA_relation'
--$cfg['Servers'][$i]['table_info']    = '';          // table to describe the display fields
-+$cfg['Servers'][$i]['table_info']    = 'PMA_table_info';// table to describe the display fields
-                                                     //   - leave blank for no display fields support
-                                                     //     DEFAULT: 'PMA_table_info'
--$cfg['Servers'][$i]['table_coords']  = '';          // table to describe the tables position for the PDF schema
-+$cfg['Servers'][$i]['table_coords']  = 'PMA_table_coords';// table to describe the tables position for the PDF schema
-                                                     //   - leave blank for no PDF schema support
-                                                     //     DEFAULT: 'PMA_table_coords'
--$cfg['Servers'][$i]['pdf_pages']     = '';          // table to describe pages of relationpdf
-+$cfg['Servers'][$i]['pdf_pages']     = 'PMA_pdf_pages';// table to describe pages of relationpdf
-                                                     //   - leave blank if you don't want to use this
-                                                     //     DEFAULT: 'PMA_pdf_pages'
--$cfg['Servers'][$i]['column_info']   = '';          // table to store column information
-+$cfg['Servers'][$i]['column_info']   = 'PMA_column_info';// table to store column information
-                                                     //   - leave blank for no column comments/mime types
-                                                     //     DEFAULT: 'PMA_column_info'
--$cfg['Servers'][$i]['history']       = '';          // table to store SQL history
-+$cfg['Servers'][$i]['history']       = 'PMA_history';// table to store SQL history
-                                                     //   - leave blank for no SQL query history
-                                                     //     DEFAULT: 'PMA_history'
- $cfg['Servers'][$i]['verbose_check'] = TRUE;        // set to FALSE if you know that your PMA_* tables
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.0 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.0
deleted file mode 100644
index f08ffc18336f..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d64b1e6a630ad8f218196d16c948854e phpMyAdmin-2.5.0-php.tar.bz2 858636
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.3-r1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.3-r1
deleted file mode 100644
index ab151732211a..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1a7848cdb2e004ae07012f2306606e0f phpMyAdmin-2.5.3-php.tar.bz2 1014664
diff --git a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.0 b/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.0
deleted file mode 100644
index 147c07f721b8..000000000000
--- a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.0
+++ /dev/null
@@ -1,84 +0,0 @@
-GRANT USAGE ON mysql.* TO 'pma'@'localhost' IDENTIFIED BY '@pmapass@';
-
-GRANT SELECT (Host, User, Select_priv, Insert_priv, Update_priv, Delete_priv,
-	Create_priv, Drop_priv, Reload_priv, Shutdown_priv, Process_priv,
-	File_priv, Grant_priv, References_priv, Index_priv, Alter_priv)
-	ON mysql.user TO 'pma'@'localhost';
-
-GRANT SELECT ON mysql.db TO 'pma'@'localhost';
-
-GRANT SELECT (Host, Db, User, Table_name, Table_priv, Column_priv)
-	ON mysql.tables_priv TO 'pma'@'localhost';
-
-GRANT SELECT, INSERT, UPDATE, DELETE ON pmadb.* TO 'pma'@'localhost';
-
-CREATE DATABASE IF NOT EXISTS pmadb;
-USE pmadb;
-
-CREATE TABLE IF NOT EXISTS `PMA_bookmark` (
-	`id` int(11) DEFAULT '0' NOT NULL auto_increment,
-	`dbase` varchar(255) NOT NULL,
-	`user` varchar(255) NOT NULL,
-	`label` varchar(255) NOT NULL,
-	`query` text NOT NULL,
-	PRIMARY KEY (id)
-	) TYPE=MyISAM COMMENT='Bookmarks';
-
-CREATE TABLE IF NOT EXISTS `PMA_relation` (
-	`master_db` varchar(64) NOT NULL default '',
-	`master_table` varchar(64) NOT NULL default '',
-	`master_field` varchar(64) NOT NULL default '',
-	`foreign_db` varchar(64) NOT NULL default '',
-	`foreign_table` varchar(64) NOT NULL default '',
-	`foreign_field` varchar(64) NOT NULL default '',
-	PRIMARY KEY (`master_db`, `master_table`, `master_field`),
-	KEY foreign_field (foreign_db, foreign_table)
-	) TYPE=MyISAM COMMENT='Relation table';
-
-CREATE TABLE IF NOT EXISTS `PMA_table_info` (
-	`db_name` varchar(64) NOT NULL default '',
-	`table_name` varchar(64) NOT NULL default '',
-	`display_field` varchar(64) NOT NULL default '',
-	PRIMARY KEY (`db_name`, `table_name`)
-	) TYPE=MyISAM COMMENT='Table information for phpMyAdmin';
-
-CREATE TABLE IF NOT EXISTS `PMA_table_coords` (
-	`db_name` varchar(64) NOT NULL default '',
-	`table_name` varchar(64) NOT NULL default '',
-	`pdf_page_number` int NOT NULL default '0',
-	`x` float unsigned NOT NULL default '0',
-	`y` float unsigned NOT NULL default '0',
-	PRIMARY KEY (`db_name`, `table_name`, `pdf_page_number`)
-	) TYPE=MyISAM COMMENT='Table coordinates for phpMyAdmin PDF output';
-
-CREATE TABLE IF NOT EXISTS `PMA_pdf_pages` (
-	`db_name` varchar(64) NOT NULL default '',
-	`page_nr` int(10) unsigned NOT NULL auto_increment,
-	`page_descr` varchar(50) NOT NULL default '',
-	PRIMARY KEY (page_nr),
-	KEY (db_name)
-	) TYPE=MyISAM COMMENT='PDF Relationpages for PMA';
-
-CREATE TABLE IF NOT EXISTS `PMA_column_info` (
-	id int(5) unsigned NOT NULL auto_increment,
-	db_name varchar(64) NOT NULL default '',
-	table_name varchar(64) NOT NULL default '',
-	column_name varchar(64) NOT NULL default '',
-	`comment` varchar(255) NOT NULL default '',
-	mimetype varchar(255) NOT NULL default '',
-	transformation varchar(255) NOT NULL default '',
-	transformation_options varchar(255) NOT NULL default '',
-	PRIMARY KEY (id),
-	UNIQUE KEY db_name (db_name, table_name, column_name)
-	) TYPE=MyISAM COMMENT='Comments for Columns';
-
-CREATE TABLE IF NOT EXISTS `PMA_history` (
-	`id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-	`username` VARCHAR( 64 ) NOT NULL ,
-	`db` VARCHAR( 64 ) NOT NULL ,
-	`table` VARCHAR( 64 ) NOT NULL ,
-	`timevalue` TIMESTAMP NOT NULL ,
-	`sqlquery` TEXT NOT NULL ,
-	PRIMARY KEY ( `id` ) ,
-	INDEX ( `username` , `db` , `table` , `timevalue` )
-	) TYPE=MyISAM COMMENT='SQL history';
diff --git a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.3 b/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.3
deleted file mode 100644
index 147c07f721b8..000000000000
--- a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.3
+++ /dev/null
@@ -1,84 +0,0 @@
-GRANT USAGE ON mysql.* TO 'pma'@'localhost' IDENTIFIED BY '@pmapass@';
-
-GRANT SELECT (Host, User, Select_priv, Insert_priv, Update_priv, Delete_priv,
-	Create_priv, Drop_priv, Reload_priv, Shutdown_priv, Process_priv,
-	File_priv, Grant_priv, References_priv, Index_priv, Alter_priv)
-	ON mysql.user TO 'pma'@'localhost';
-
-GRANT SELECT ON mysql.db TO 'pma'@'localhost';
-
-GRANT SELECT (Host, Db, User, Table_name, Table_priv, Column_priv)
-	ON mysql.tables_priv TO 'pma'@'localhost';
-
-GRANT SELECT, INSERT, UPDATE, DELETE ON pmadb.* TO 'pma'@'localhost';
-
-CREATE DATABASE IF NOT EXISTS pmadb;
-USE pmadb;
-
-CREATE TABLE IF NOT EXISTS `PMA_bookmark` (
-	`id` int(11) DEFAULT '0' NOT NULL auto_increment,
-	`dbase` varchar(255) NOT NULL,
-	`user` varchar(255) NOT NULL,
-	`label` varchar(255) NOT NULL,
-	`query` text NOT NULL,
-	PRIMARY KEY (id)
-	) TYPE=MyISAM COMMENT='Bookmarks';
-
-CREATE TABLE IF NOT EXISTS `PMA_relation` (
-	`master_db` varchar(64) NOT NULL default '',
-	`master_table` varchar(64) NOT NULL default '',
-	`master_field` varchar(64) NOT NULL default '',
-	`foreign_db` varchar(64) NOT NULL default '',
-	`foreign_table` varchar(64) NOT NULL default '',
-	`foreign_field` varchar(64) NOT NULL default '',
-	PRIMARY KEY (`master_db`, `master_table`, `master_field`),
-	KEY foreign_field (foreign_db, foreign_table)
-	) TYPE=MyISAM COMMENT='Relation table';
-
-CREATE TABLE IF NOT EXISTS `PMA_table_info` (
-	`db_name` varchar(64) NOT NULL default '',
-	`table_name` varchar(64) NOT NULL default '',
-	`display_field` varchar(64) NOT NULL default '',
-	PRIMARY KEY (`db_name`, `table_name`)
-	) TYPE=MyISAM COMMENT='Table information for phpMyAdmin';
-
-CREATE TABLE IF NOT EXISTS `PMA_table_coords` (
-	`db_name` varchar(64) NOT NULL default '',
-	`table_name` varchar(64) NOT NULL default '',
-	`pdf_page_number` int NOT NULL default '0',
-	`x` float unsigned NOT NULL default '0',
-	`y` float unsigned NOT NULL default '0',
-	PRIMARY KEY (`db_name`, `table_name`, `pdf_page_number`)
-	) TYPE=MyISAM COMMENT='Table coordinates for phpMyAdmin PDF output';
-
-CREATE TABLE IF NOT EXISTS `PMA_pdf_pages` (
-	`db_name` varchar(64) NOT NULL default '',
-	`page_nr` int(10) unsigned NOT NULL auto_increment,
-	`page_descr` varchar(50) NOT NULL default '',
-	PRIMARY KEY (page_nr),
-	KEY (db_name)
-	) TYPE=MyISAM COMMENT='PDF Relationpages for PMA';
-
-CREATE TABLE IF NOT EXISTS `PMA_column_info` (
-	id int(5) unsigned NOT NULL auto_increment,
-	db_name varchar(64) NOT NULL default '',
-	table_name varchar(64) NOT NULL default '',
-	column_name varchar(64) NOT NULL default '',
-	`comment` varchar(255) NOT NULL default '',
-	mimetype varchar(255) NOT NULL default '',
-	transformation varchar(255) NOT NULL default '',
-	transformation_options varchar(255) NOT NULL default '',
-	PRIMARY KEY (id),
-	UNIQUE KEY db_name (db_name, table_name, column_name)
-	) TYPE=MyISAM COMMENT='Comments for Columns';
-
-CREATE TABLE IF NOT EXISTS `PMA_history` (
-	`id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-	`username` VARCHAR( 64 ) NOT NULL ,
-	`db` VARCHAR( 64 ) NOT NULL ,
-	`table` VARCHAR( 64 ) NOT NULL ,
-	`timevalue` TIMESTAMP NOT NULL ,
-	`sqlquery` TEXT NOT NULL ,
-	PRIMARY KEY ( `id` ) ,
-	INDEX ( `username` , `db` , `table` , `timevalue` )
-	) TYPE=MyISAM COMMENT='SQL history';