Update "phpmyadmin" package to version 4.0.6.

The major changes since version 3.5.* are:
- HTML frames are gone.
- The navigation panel now presents a tree.
- Javascript now required
- Documentation has a new look.
- Many bug fixes and smaller new features
This update also fixes the security vulnerability reported in PMASA-2013-10.

Approved by Thomas Klausner.

4 files changed, 261 insertions, 196 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 2cc8ee3b06c..4e319a74dac 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.117 2013/07/29 20:01:02 tron Exp $
+# $NetBSD: Makefile,v 1.118 2013/09/18 22:20:04 tron Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}-all-languages
 PKGNAME=	phpmyadmin-${DIST_VERSION:S/-//}
@@ -29,9 +29,8 @@ MESSAGE_SUBST+=	CONF_INC_PHP=${CONF_INC_PHP} PMCONFFILE=${PMCONFFILE:Q} \
 		EXDIR=${EXDIR:Q}
 
 CONF_INC_PHP=	${PREFIX}/share/phpmyadmin/config.inc.php
-DIST_VERSION=	3.5.8.2
-DOC_FILES=	ChangeLog Documentation.txt LICENSE README \
-		RELEASE-DATE-${DIST_VERSION}
+DIST_VERSION=	4.0.6
+DOC_FILES=	ChangeLog LICENSE README RELEASE-DATE-${DIST_VERSION}
 
 APACHE_USER?=	www
 APACHE_GROUP?=	www
@@ -56,7 +55,8 @@ INSTALLATION_DIRS+=	${PREFIX}/share/doc/phpmyadmin \
 			${PREFIX}/share/examples/phpmyadmin \
 			${PMDIR} ${PMDIR}/scripts
 
-INSTALL_DIRS=	js
+INSTALL_DIRS=	doc/html
+INSTALL_DIRS+=	js
 INSTALL_DIRS+=	js/canvg
 INSTALL_DIRS+=	js/codemirror
 INSTALL_DIRS+=	js/codemirror/lib
@@ -110,9 +110,26 @@ INSTALL_DIRS+=	libraries/config
 INSTALL_DIRS+=	libraries/dbi
 INSTALL_DIRS+=	libraries/engines
 INSTALL_DIRS+=	libraries/export
+INSTALL_DIRS+=	libraries/gis
 INSTALL_DIRS+=	libraries/import
 INSTALL_DIRS+=	libraries/import/upload
+INSTALL_DIRS+=	libraries/navigation
+INSTALL_DIRS+=	libraries/navigation/Nodes
 INSTALL_DIRS+=	libraries/php-gettext
+INSTALL_DIRS+=	libraries/phpseclib/Crypt
+INSTALL_DIRS+=	libraries/plugins
+INSTALL_DIRS+=	libraries/plugins/auth
+INSTALL_DIRS+=	libraries/plugins/auth/swekey
+INSTALL_DIRS+=	libraries/plugins/export
+INSTALL_DIRS+=	libraries/plugins/import
+INSTALL_DIRS+=	libraries/plugins/import/upload
+INSTALL_DIRS+=	libraries/plugins/transformations
+INSTALL_DIRS+=	libraries/plugins/transformations/abstract
+INSTALL_DIRS+=	libraries/properties
+INSTALL_DIRS+=	libraries/properties/options
+INSTALL_DIRS+=	libraries/properties/options/groups
+INSTALL_DIRS+=	libraries/properties/options/items
+INSTALL_DIRS+=	libraries/properties/plugins
 INSTALL_DIRS+=	libraries/rte
 INSTALL_DIRS+=	libraries/schema
 INSTALL_DIRS+=	libraries/tcpdf
@@ -249,8 +266,6 @@ do-install:
 	  ${DESTDIR}${EXDIR}/config.inc.php
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${DESTDIR}${EXDIR}
 
-	${INSTALL_DATA} ${WRKSRC}/Documentation.html ${DESTDIR}${PMDIR}
-
 	for dir in ${INSTALL_DIRS}; do					\
 		for file in ${WRKSRC}/$$dir/*; do			\
 			case "$$file" in				\
diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST
index 48cb109f8d7..a0e2853b28d 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.33 2013/07/29 20:01:02 tron Exp $
+@comment $NetBSD: PLIST,v 1.34 2013/09/18 22:20:04 tron Exp $
 share/doc/phpmyadmin/ChangeLog
-share/doc/phpmyadmin/Documentation.txt
 share/doc/phpmyadmin/LICENSE
 share/doc/phpmyadmin/README
 share/doc/phpmyadmin/RELEASE-DATE-${DIST_VERSION}
@@ -14,11 +13,7 @@ share/examples/phpmyadmin/signon-script.php
 share/examples/phpmyadmin/signon.php
 share/examples/phpmyadmin/swekey.sample.conf
 share/examples/phpmyadmin/upgrade_tables_mysql_4_1_2+.sql
-share/phpmyadmin/Documentation.html
-share/phpmyadmin/Documentation.txt
 share/phpmyadmin/browse_foreigners.php
-share/phpmyadmin/bs_disp_as_mime_type.php
-share/phpmyadmin/bs_play_media.php
 share/phpmyadmin/changelog.php
 share/phpmyadmin/chk_rel.php
 share/phpmyadmin/config.inc.php
@@ -36,8 +31,25 @@ share/phpmyadmin/db_sql.php
 share/phpmyadmin/db_structure.php
 share/phpmyadmin/db_tracking.php
 share/phpmyadmin/db_triggers.php
-share/phpmyadmin/docs.css
-share/phpmyadmin/enum_editor.php
+share/phpmyadmin/doc/html/config.html
+share/phpmyadmin/doc/html/copyright.html
+share/phpmyadmin/doc/html/credits.html
+share/phpmyadmin/doc/html/developers.html
+share/phpmyadmin/doc/html/faq.html
+share/phpmyadmin/doc/html/genindex.html
+share/phpmyadmin/doc/html/glossary.html
+share/phpmyadmin/doc/html/index.html
+share/phpmyadmin/doc/html/intro.html
+share/phpmyadmin/doc/html/objects.inv
+share/phpmyadmin/doc/html/other.html
+share/phpmyadmin/doc/html/privileges.html
+share/phpmyadmin/doc/html/require.html
+share/phpmyadmin/doc/html/search.html
+share/phpmyadmin/doc/html/searchindex.js
+share/phpmyadmin/doc/html/setup.html
+share/phpmyadmin/doc/html/transformations.html
+share/phpmyadmin/doc/html/user.html
+share/phpmyadmin/doc/html/vendors.html
 share/phpmyadmin/export.php
 share/phpmyadmin/favicon.ico
 share/phpmyadmin/file_echo.php
@@ -46,39 +58,43 @@ share/phpmyadmin/import.php
 share/phpmyadmin/import_status.php
 share/phpmyadmin/index.php
 share/phpmyadmin/js/OpenStreetMap.js
+share/phpmyadmin/js/ajax.js
 share/phpmyadmin/js/canvg/MIT-LICENSE.txt
 share/phpmyadmin/js/canvg/canvg.js
 share/phpmyadmin/js/canvg/flashcanvas.js
 share/phpmyadmin/js/canvg/flashcanvas.swf
+share/phpmyadmin/js/chart.js
 share/phpmyadmin/js/codemirror/LICENSE
 share/phpmyadmin/js/codemirror/lib/codemirror.js
 share/phpmyadmin/js/codemirror/mode/mysql/mysql.js
 share/phpmyadmin/js/common.js
 share/phpmyadmin/js/config.js
 share/phpmyadmin/js/cross_framing_protection.js
-share/phpmyadmin/js/date.js
 share/phpmyadmin/js/db_operations.js
 share/phpmyadmin/js/db_search.js
 share/phpmyadmin/js/db_structure.js
-share/phpmyadmin/js/dom-drag.js
 share/phpmyadmin/js/export.js
 share/phpmyadmin/js/functions.js
 share/phpmyadmin/js/get_image.js.php
+share/phpmyadmin/js/get_scripts.js.php
 share/phpmyadmin/js/gis_data_editor.js
 share/phpmyadmin/js/import.js
 share/phpmyadmin/js/indexes.js
-share/phpmyadmin/js/jquery/jquery-1.6.2+fix-9521.js
-share/phpmyadmin/js/jquery/jquery-ui-1.8.16.custom.js
+share/phpmyadmin/js/jquery/jquery-1.8.3.min.js
+share/phpmyadmin/js/jquery/jquery-ui-1.9.2.custom.min.js
+share/phpmyadmin/js/jquery/jquery-ui-timepicker-addon.js
+share/phpmyadmin/js/jquery/jquery.ba-hashchange-1.3.js
 share/phpmyadmin/js/jquery/jquery.cookie.js
-share/phpmyadmin/js/jquery/jquery.event.drag-2.0.js
-share/phpmyadmin/js/jquery/jquery.json-2.2.js
+share/phpmyadmin/js/jquery/jquery.debounce-1.0.5.js
+share/phpmyadmin/js/jquery/jquery.event.drag-2.2.js
+share/phpmyadmin/js/jquery/jquery.fullscreen.js
+share/phpmyadmin/js/jquery/jquery.json-2.4.js
+share/phpmyadmin/js/jquery/jquery.menuResizer-1.0.js
 share/phpmyadmin/js/jquery/jquery.mousewheel.js
-share/phpmyadmin/js/jquery/jquery.qtip-1.0.0-rc3.js
 share/phpmyadmin/js/jquery/jquery.sortableTable.js
 share/phpmyadmin/js/jquery/jquery.sprintf.js
 share/phpmyadmin/js/jquery/jquery.svg.js
 share/phpmyadmin/js/jquery/jquery.tablesorter.js
-share/phpmyadmin/js/jquery/timepicker.js
 share/phpmyadmin/js/keyhandler.js
 share/phpmyadmin/js/makegrid.js
 share/phpmyadmin/js/messages.php
@@ -148,18 +164,20 @@ share/phpmyadmin/js/openlayers/theme/default/style.css
 share/phpmyadmin/js/pmd/ajax.js
 share/phpmyadmin/js/pmd/history.js
 share/phpmyadmin/js/pmd/iecanvas.js
+share/phpmyadmin/js/pmd/init.js
 share/phpmyadmin/js/pmd/move.js
 share/phpmyadmin/js/querywindow.js
 share/phpmyadmin/js/replication.js
-share/phpmyadmin/js/rte/common.js
-share/phpmyadmin/js/rte/events.js
-share/phpmyadmin/js/rte/routines.js
-share/phpmyadmin/js/rte/triggers.js
+share/phpmyadmin/js/rte.js
+share/phpmyadmin/js/server_databases.js
 share/phpmyadmin/js/server_plugins.js
 share/phpmyadmin/js/server_privileges.js
 share/phpmyadmin/js/server_status.js
+share/phpmyadmin/js/server_status_advisor.js
 share/phpmyadmin/js/server_status_monitor.js
-share/phpmyadmin/js/server_synchronize.js
+share/phpmyadmin/js/server_status_queries.js
+share/phpmyadmin/js/server_status_sorter.js
+share/phpmyadmin/js/server_status_variables.js
 share/phpmyadmin/js/server_variables.js
 share/phpmyadmin/js/sql.js
 share/phpmyadmin/js/tbl_change.js
@@ -169,44 +187,45 @@ share/phpmyadmin/js/tbl_relation.js
 share/phpmyadmin/js/tbl_select.js
 share/phpmyadmin/js/tbl_structure.js
 share/phpmyadmin/js/tbl_zoom_plot_jqplot.js
-share/phpmyadmin/js/update-location.js
 share/phpmyadmin/libraries/Advisor.class.php
 share/phpmyadmin/libraries/Config.class.php
+share/phpmyadmin/libraries/DBQbe.class.php
+share/phpmyadmin/libraries/DbSearch.class.php
+share/phpmyadmin/libraries/DisplayResults.class.php
 share/phpmyadmin/libraries/Error.class.php
 share/phpmyadmin/libraries/Error_Handler.class.php
 share/phpmyadmin/libraries/File.class.php
+share/phpmyadmin/libraries/Footer.class.php
+share/phpmyadmin/libraries/Header.class.php
 share/phpmyadmin/libraries/Index.class.php
 share/phpmyadmin/libraries/List.class.php
 share/phpmyadmin/libraries/List_Database.class.php
+share/phpmyadmin/libraries/Menu.class.php
 share/phpmyadmin/libraries/Message.class.php
+share/phpmyadmin/libraries/OutputBuffering.class.php
 share/phpmyadmin/libraries/PDF.class.php
 share/phpmyadmin/libraries/PMA.php
 share/phpmyadmin/libraries/Partition.class.php
 share/phpmyadmin/libraries/RecentTable.class.php
+share/phpmyadmin/libraries/Response.class.php
+share/phpmyadmin/libraries/Scripts.class.php
+share/phpmyadmin/libraries/ServerStatusData.class.php
 share/phpmyadmin/libraries/StorageEngine.class.php
 share/phpmyadmin/libraries/Table.class.php
+share/phpmyadmin/libraries/TableSearch.class.php
 share/phpmyadmin/libraries/Theme.class.php
 share/phpmyadmin/libraries/Theme_Manager.class.php
 share/phpmyadmin/libraries/Tracker.class.php
+share/phpmyadmin/libraries/Types.class.php
+share/phpmyadmin/libraries/Util.class.php
 share/phpmyadmin/libraries/advisory_rules.txt
-share/phpmyadmin/libraries/auth/config.auth.lib.php
-share/phpmyadmin/libraries/auth/cookie.auth.lib.php
-share/phpmyadmin/libraries/auth/http.auth.lib.php
-share/phpmyadmin/libraries/auth/signon.auth.lib.php
-share/phpmyadmin/libraries/auth/swekey/authentication.inc.php
-share/phpmyadmin/libraries/auth/swekey/musbe-ca.crt
-share/phpmyadmin/libraries/auth/swekey/swekey.auth.lib.php
-share/phpmyadmin/libraries/auth/swekey/swekey.php
 share/phpmyadmin/libraries/bfShapeFiles/ShapeFile.lib.php
-share/phpmyadmin/libraries/blobstreaming.lib.php
-share/phpmyadmin/libraries/blowfish.php
 share/phpmyadmin/libraries/bookmark.lib.php
 share/phpmyadmin/libraries/build_html_for_db.lib.php
 share/phpmyadmin/libraries/charset_conversion.lib.php
 share/phpmyadmin/libraries/check_user_privileges.lib.php
 share/phpmyadmin/libraries/cleanup.lib.php
 share/phpmyadmin/libraries/common.inc.php
-share/phpmyadmin/libraries/common.lib.php
 share/phpmyadmin/libraries/config.default.php
 share/phpmyadmin/libraries/config.values.php
 share/phpmyadmin/libraries/config/ConfigFile.class.php
@@ -220,26 +239,23 @@ share/phpmyadmin/libraries/config/user_preferences.forms.php
 share/phpmyadmin/libraries/config/validate.lib.php
 share/phpmyadmin/libraries/core.lib.php
 share/phpmyadmin/libraries/data_dictionary_relations.lib.php
-share/phpmyadmin/libraries/data_drizzle.inc.php
-share/phpmyadmin/libraries/data_mysql.inc.php
 share/phpmyadmin/libraries/database_interface.lib.php
 share/phpmyadmin/libraries/db_common.inc.php
 share/phpmyadmin/libraries/db_info.inc.php
-share/phpmyadmin/libraries/db_links.inc.php
-share/phpmyadmin/libraries/db_structure.lib.php
 share/phpmyadmin/libraries/db_table_exists.lib.php
 share/phpmyadmin/libraries/dbi/drizzle-wrappers.lib.php
 share/phpmyadmin/libraries/dbi/drizzle.dbi.lib.php
+share/phpmyadmin/libraries/dbi/dummy.lib.php
 share/phpmyadmin/libraries/dbi/mysql.dbi.lib.php
 share/phpmyadmin/libraries/dbi/mysqli.dbi.lib.php
 share/phpmyadmin/libraries/display_change_password.lib.php
 share/phpmyadmin/libraries/display_create_database.lib.php
 share/phpmyadmin/libraries/display_create_table.lib.php
 share/phpmyadmin/libraries/display_export.lib.php
+share/phpmyadmin/libraries/display_git_revision.lib.php
 share/phpmyadmin/libraries/display_import.lib.php
 share/phpmyadmin/libraries/display_import_ajax.lib.php
 share/phpmyadmin/libraries/display_select_lang.lib.php
-share/phpmyadmin/libraries/display_tbl.lib.php
 share/phpmyadmin/libraries/engines/bdb.lib.php
 share/phpmyadmin/libraries/engines/berkeleydb.lib.php
 share/phpmyadmin/libraries/engines/binlog.lib.php
@@ -250,47 +266,26 @@ share/phpmyadmin/libraries/engines/merge.lib.php
 share/phpmyadmin/libraries/engines/mrg_myisam.lib.php
 share/phpmyadmin/libraries/engines/myisam.lib.php
 share/phpmyadmin/libraries/engines/ndbcluster.lib.php
-share/phpmyadmin/libraries/engines/pbms.lib.php
 share/phpmyadmin/libraries/engines/pbxt.lib.php
+share/phpmyadmin/libraries/engines/performance_schema.lib.php
 share/phpmyadmin/libraries/error.inc.php
-share/phpmyadmin/libraries/export/codegen.php
-share/phpmyadmin/libraries/export/csv.php
-share/phpmyadmin/libraries/export/excel.php
-share/phpmyadmin/libraries/export/htmlword.php
-share/phpmyadmin/libraries/export/json.php
-share/phpmyadmin/libraries/export/latex.php
-share/phpmyadmin/libraries/export/mediawiki.php
-share/phpmyadmin/libraries/export/ods.php
-share/phpmyadmin/libraries/export/odt.php
-share/phpmyadmin/libraries/export/pdf.php
-share/phpmyadmin/libraries/export/php_array.php
-share/phpmyadmin/libraries/export/sql.php
-share/phpmyadmin/libraries/export/texytext.php
-share/phpmyadmin/libraries/export/xml.php
-share/phpmyadmin/libraries/export/yaml.php
-share/phpmyadmin/libraries/file_listing.php
-share/phpmyadmin/libraries/footer.inc.php
+share/phpmyadmin/libraries/file_listing.lib.php
+share/phpmyadmin/libraries/gis/pma_gis_factory.php
+share/phpmyadmin/libraries/gis/pma_gis_geometry.php
+share/phpmyadmin/libraries/gis/pma_gis_geometrycollection.php
+share/phpmyadmin/libraries/gis/pma_gis_linestring.php
+share/phpmyadmin/libraries/gis/pma_gis_multilinestring.php
+share/phpmyadmin/libraries/gis/pma_gis_multipoint.php
+share/phpmyadmin/libraries/gis/pma_gis_multipolygon.php
+share/phpmyadmin/libraries/gis/pma_gis_point.php
+share/phpmyadmin/libraries/gis/pma_gis_polygon.php
+share/phpmyadmin/libraries/gis/pma_gis_visualization.php
 share/phpmyadmin/libraries/gis_visualization.lib.php
-share/phpmyadmin/libraries/grab_globals.lib.php
-share/phpmyadmin/libraries/header.inc.php
-share/phpmyadmin/libraries/header_http.inc.php
-share/phpmyadmin/libraries/header_meta_style.inc.php
-share/phpmyadmin/libraries/header_printview.inc.php
-share/phpmyadmin/libraries/header_scripts.inc.php
 share/phpmyadmin/libraries/iconv_wrapper.lib.php
 share/phpmyadmin/libraries/import.lib.php
-share/phpmyadmin/libraries/import/README
-share/phpmyadmin/libraries/import/csv.php
-share/phpmyadmin/libraries/import/docsql.php
-share/phpmyadmin/libraries/import/ldi.php
-share/phpmyadmin/libraries/import/ods.php
-share/phpmyadmin/libraries/import/shp.php
-share/phpmyadmin/libraries/import/sql.php
-share/phpmyadmin/libraries/import/upload/apc.php
-share/phpmyadmin/libraries/import/upload/noplugin.php
-share/phpmyadmin/libraries/import/upload/uploadprogress.php
-share/phpmyadmin/libraries/import/xml.php
+share/phpmyadmin/libraries/index.lib.php
 share/phpmyadmin/libraries/information_schema_relations.lib.php
+share/phpmyadmin/libraries/insert_edit.lib.php
 share/phpmyadmin/libraries/ip_allow_deny.lib.php
 share/phpmyadmin/libraries/js_escape.lib.php
 share/phpmyadmin/libraries/kanji-encoding.lib.php
@@ -299,15 +294,134 @@ share/phpmyadmin/libraries/logging.lib.php
 share/phpmyadmin/libraries/mime.lib.php
 share/phpmyadmin/libraries/mult_submits.inc.php
 share/phpmyadmin/libraries/mysql_charsets.lib.php
-share/phpmyadmin/libraries/navigation_header.inc.php
-share/phpmyadmin/libraries/ob.lib.php
+share/phpmyadmin/libraries/navigation/Navigation.class.php
+share/phpmyadmin/libraries/navigation/NavigationHeader.class.php
+share/phpmyadmin/libraries/navigation/NavigationTree.class.php
+share/phpmyadmin/libraries/navigation/NodeFactory.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node_Column.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node_Column_Container.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node_Database.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node_Event.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node_Event_Container.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node_Function.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node_Function_Container.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node_Index.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node_Index_Container.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node_Procedure.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node_Procedure_Container.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node_Table.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node_Table_Container.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node_Trigger.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node_Trigger_Container.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node_View.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node_View_Container.class.php
 share/phpmyadmin/libraries/opendocument.lib.php
+share/phpmyadmin/libraries/operations.lib.php
 share/phpmyadmin/libraries/parse_analyze.lib.php
 share/phpmyadmin/libraries/php-gettext/gettext.inc
 share/phpmyadmin/libraries/php-gettext/gettext.php
 share/phpmyadmin/libraries/php-gettext/streams.php
+share/phpmyadmin/libraries/phpseclib/Crypt/AES.php
+share/phpmyadmin/libraries/phpseclib/Crypt/Rijndael.php
 share/phpmyadmin/libraries/plugin_interface.lib.php
+share/phpmyadmin/libraries/plugins/AuthenticationPlugin.class.php
+share/phpmyadmin/libraries/plugins/ExportPlugin.class.php
+share/phpmyadmin/libraries/plugins/ImportPlugin.class.php
+share/phpmyadmin/libraries/plugins/PluginManager.class.php
+share/phpmyadmin/libraries/plugins/PluginObserver.class.php
+share/phpmyadmin/libraries/plugins/TransformationsInterface.int.php
+share/phpmyadmin/libraries/plugins/TransformationsPlugin.class.php
+share/phpmyadmin/libraries/plugins/UploadInterface.int.php
+share/phpmyadmin/libraries/plugins/auth/AuthenticationConfig.class.php
+share/phpmyadmin/libraries/plugins/auth/AuthenticationCookie.class.php
+share/phpmyadmin/libraries/plugins/auth/AuthenticationHttp.class.php
+share/phpmyadmin/libraries/plugins/auth/AuthenticationSignon.class.php
+share/phpmyadmin/libraries/plugins/auth/swekey/authentication.inc.php
+share/phpmyadmin/libraries/plugins/auth/swekey/musbe-ca.crt
+share/phpmyadmin/libraries/plugins/auth/swekey/swekey.auth.lib.php
+share/phpmyadmin/libraries/plugins/auth/swekey/swekey.php
+share/phpmyadmin/libraries/plugins/export/ExportCodegen.class.php
+share/phpmyadmin/libraries/plugins/export/ExportCsv.class.php
+share/phpmyadmin/libraries/plugins/export/ExportExcel.class.php
+share/phpmyadmin/libraries/plugins/export/ExportHtmlword.class.php
+share/phpmyadmin/libraries/plugins/export/ExportJson.class.php
+share/phpmyadmin/libraries/plugins/export/ExportLatex.class.php
+share/phpmyadmin/libraries/plugins/export/ExportMediawiki.class.php
+share/phpmyadmin/libraries/plugins/export/ExportOds.class.php
+share/phpmyadmin/libraries/plugins/export/ExportOdt.class.php
+share/phpmyadmin/libraries/plugins/export/ExportPdf.class.php
+share/phpmyadmin/libraries/plugins/export/ExportPhparray.class.php
+share/phpmyadmin/libraries/plugins/export/ExportSql.class.php
+share/phpmyadmin/libraries/plugins/export/ExportTexytext.class.php
+share/phpmyadmin/libraries/plugins/export/ExportXml.class.php
+share/phpmyadmin/libraries/plugins/export/ExportYaml.class.php
+share/phpmyadmin/libraries/plugins/export/PMA_ExportPdf.class.php
+share/phpmyadmin/libraries/plugins/export/README
+share/phpmyadmin/libraries/plugins/export/TableProperty.class.php
+share/phpmyadmin/libraries/plugins/import/AbstractImportCsv.class.php
+share/phpmyadmin/libraries/plugins/import/ImportCsv.class.php
+share/phpmyadmin/libraries/plugins/import/ImportLdi.class.php
+share/phpmyadmin/libraries/plugins/import/ImportMediawiki.class.php
+share/phpmyadmin/libraries/plugins/import/ImportOds.class.php
+share/phpmyadmin/libraries/plugins/import/ImportShp.class.php
+share/phpmyadmin/libraries/plugins/import/ImportSql.class.php
+share/phpmyadmin/libraries/plugins/import/ImportXml.class.php
+share/phpmyadmin/libraries/plugins/import/README
+share/phpmyadmin/libraries/plugins/import/ShapeFile.class.php
+share/phpmyadmin/libraries/plugins/import/ShapeRecord.class.php
+share/phpmyadmin/libraries/plugins/import/upload/UploadApc.class.php
+share/phpmyadmin/libraries/plugins/import/upload/UploadNoplugin.class.php
+share/phpmyadmin/libraries/plugins/import/upload/UploadProgress.class.php
+share/phpmyadmin/libraries/plugins/import/upload/UploadSession.class.php
+share/phpmyadmin/libraries/plugins/transformations/Application_Octetstream_Download.class.php
+share/phpmyadmin/libraries/plugins/transformations/Application_Octetstream_Hex.class.php
+share/phpmyadmin/libraries/plugins/transformations/Image_JPEG_Inline.class.php
+share/phpmyadmin/libraries/plugins/transformations/Image_JPEG_Link.class.php
+share/phpmyadmin/libraries/plugins/transformations/Image_PNG_Inline.class.php
+share/phpmyadmin/libraries/plugins/transformations/README
+share/phpmyadmin/libraries/plugins/transformations/TEMPLATE
+share/phpmyadmin/libraries/plugins/transformations/TEMPLATE_ABSTRACT
+share/phpmyadmin/libraries/plugins/transformations/Text_Plain_Append.class.php
+share/phpmyadmin/libraries/plugins/transformations/Text_Plain_Dateformat.class.php
+share/phpmyadmin/libraries/plugins/transformations/Text_Plain_External.class.php
+share/phpmyadmin/libraries/plugins/transformations/Text_Plain_Formatted.class.php
+share/phpmyadmin/libraries/plugins/transformations/Text_Plain_Imagelink.class.php
+share/phpmyadmin/libraries/plugins/transformations/Text_Plain_Link.class.php
+share/phpmyadmin/libraries/plugins/transformations/Text_Plain_Longtoipv4.class.php
+share/phpmyadmin/libraries/plugins/transformations/Text_Plain_Sql.class.php
+share/phpmyadmin/libraries/plugins/transformations/Text_Plain_Substring.class.php
+share/phpmyadmin/libraries/plugins/transformations/abstract/AppendTransformationsPlugin.class.php
+share/phpmyadmin/libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
+share/phpmyadmin/libraries/plugins/transformations/abstract/DownloadTransformationsPlugin.class.php
+share/phpmyadmin/libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php
+share/phpmyadmin/libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php
+share/phpmyadmin/libraries/plugins/transformations/abstract/HexTransformationsPlugin.class.php
+share/phpmyadmin/libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php
+share/phpmyadmin/libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php
+share/phpmyadmin/libraries/plugins/transformations/abstract/LongToIPv4TransformationsPlugin.class.php
+share/phpmyadmin/libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php
+share/phpmyadmin/libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
+share/phpmyadmin/libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php
+share/phpmyadmin/libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
 share/phpmyadmin/libraries/pmd_common.php
+share/phpmyadmin/libraries/properties/PropertyItem.class.php
+share/phpmyadmin/libraries/properties/options/OptionsPropertyGroup.class.php
+share/phpmyadmin/libraries/properties/options/OptionsPropertyItem.class.php
+share/phpmyadmin/libraries/properties/options/OptionsPropertyOneItem.class.php
+share/phpmyadmin/libraries/properties/options/groups/OptionsPropertyMainGroup.class.php
+share/phpmyadmin/libraries/properties/options/groups/OptionsPropertyRootGroup.class.php
+share/phpmyadmin/libraries/properties/options/groups/OptionsPropertySubgroup.class.php
+share/phpmyadmin/libraries/properties/options/items/BoolPropertyItem.class.php
+share/phpmyadmin/libraries/properties/options/items/DocPropertyItem.class.php
+share/phpmyadmin/libraries/properties/options/items/HiddenPropertyItem.class.php
+share/phpmyadmin/libraries/properties/options/items/MessageOnlyPropertyItem.class.php
+share/phpmyadmin/libraries/properties/options/items/RadioPropertyItem.class.php
+share/phpmyadmin/libraries/properties/options/items/SelectPropertyItem.class.php
+share/phpmyadmin/libraries/properties/options/items/TextPropertyItem.class.php
+share/phpmyadmin/libraries/properties/plugins/ExportPluginProperties.class.php
+share/phpmyadmin/libraries/properties/plugins/ImportPluginProperties.class.php
+share/phpmyadmin/libraries/properties/plugins/PluginPropertyItem.class.php
 share/phpmyadmin/libraries/relation.lib.php
 share/phpmyadmin/libraries/relation_cleanup.lib.php
 share/phpmyadmin/libraries/replication.inc.php
@@ -327,14 +441,13 @@ share/phpmyadmin/libraries/schema/Export_Relation_Schema.class.php
 share/phpmyadmin/libraries/schema/Pdf_Relation_Schema.class.php
 share/phpmyadmin/libraries/schema/Svg_Relation_Schema.class.php
 share/phpmyadmin/libraries/schema/User_Schema.class.php
-share/phpmyadmin/libraries/schema/Visio_Relation_Schema.class.php
 share/phpmyadmin/libraries/select_lang.lib.php
 share/phpmyadmin/libraries/select_server.lib.php
 share/phpmyadmin/libraries/server_common.inc.php
-share/phpmyadmin/libraries/server_links.inc.php
-share/phpmyadmin/libraries/server_synchronize.lib.php
+share/phpmyadmin/libraries/server_privileges.lib.php
 share/phpmyadmin/libraries/server_variables_doc.php
 share/phpmyadmin/libraries/session.inc.php
+share/phpmyadmin/libraries/special_schema_links.lib.php
 share/phpmyadmin/libraries/sql_query_form.lib.php
 share/phpmyadmin/libraries/sqlparser.data.php
 share/phpmyadmin/libraries/sqlparser.lib.php
@@ -345,13 +458,12 @@ share/phpmyadmin/libraries/string_mb.lib.php
 share/phpmyadmin/libraries/string_native.lib.php
 share/phpmyadmin/libraries/string_type_ctype.lib.php
 share/phpmyadmin/libraries/string_type_native.lib.php
+share/phpmyadmin/libraries/structure.lib.php
 share/phpmyadmin/libraries/sysinfo.lib.php
-share/phpmyadmin/libraries/tbl_common.php
+share/phpmyadmin/libraries/tbl_columns_definition_form.inc.php
+share/phpmyadmin/libraries/tbl_common.inc.php
 share/phpmyadmin/libraries/tbl_info.inc.php
-share/phpmyadmin/libraries/tbl_links.inc.php
-share/phpmyadmin/libraries/tbl_properties.inc.php
-share/phpmyadmin/libraries/tbl_replace_fields.inc.php
-share/phpmyadmin/libraries/tbl_select.lib.php
+share/phpmyadmin/libraries/tbl_views.lib.php
 share/phpmyadmin/libraries/tcpdf/LICENSE.TXT
 share/phpmyadmin/libraries/tcpdf/README.TXT
 share/phpmyadmin/libraries/tcpdf/config/tcpdf_config.php
@@ -368,23 +480,6 @@ share/phpmyadmin/libraries/tcpdf/htmlcolors.php
 share/phpmyadmin/libraries/tcpdf/tcpdf.php
 share/phpmyadmin/libraries/tcpdf/unicode_data.php
 share/phpmyadmin/libraries/transformations.lib.php
-share/phpmyadmin/libraries/transformations/README
-share/phpmyadmin/libraries/transformations/TEMPLATE
-share/phpmyadmin/libraries/transformations/TEMPLATE_MIMETYPE
-share/phpmyadmin/libraries/transformations/application_octetstream__download.inc.php
-share/phpmyadmin/libraries/transformations/application_octetstream__hex.inc.php
-share/phpmyadmin/libraries/transformations/global.inc.php
-share/phpmyadmin/libraries/transformations/image_jpeg__inline.inc.php
-share/phpmyadmin/libraries/transformations/image_jpeg__link.inc.php
-share/phpmyadmin/libraries/transformations/image_png__inline.inc.php
-share/phpmyadmin/libraries/transformations/text_plain__dateformat.inc.php
-share/phpmyadmin/libraries/transformations/text_plain__external.inc.php
-share/phpmyadmin/libraries/transformations/text_plain__formatted.inc.php
-share/phpmyadmin/libraries/transformations/text_plain__imagelink.inc.php
-share/phpmyadmin/libraries/transformations/text_plain__link.inc.php
-share/phpmyadmin/libraries/transformations/text_plain__longToIpv4.inc.php
-share/phpmyadmin/libraries/transformations/text_plain__sql.inc.php
-share/phpmyadmin/libraries/transformations/text_plain__substr.inc.php
 share/phpmyadmin/libraries/url_generating.lib.php
 share/phpmyadmin/libraries/user_preferences.inc.php
 share/phpmyadmin/libraries/user_preferences.lib.php
@@ -394,6 +489,7 @@ share/phpmyadmin/libraries/zip_extension.lib.php
 share/phpmyadmin/license.php
 share/phpmyadmin/locale/ar/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/bg/LC_MESSAGES/phpmyadmin.mo
+share/phpmyadmin/locale/bn/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/ca/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/cs/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/da/LC_MESSAGES/phpmyadmin.mo
@@ -429,7 +525,6 @@ share/phpmyadmin/locale/uz/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/uz@latin/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/zh_CN/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/zh_TW/LC_MESSAGES/phpmyadmin.mo
-share/phpmyadmin/main.php
 share/phpmyadmin/navigation.php
 share/phpmyadmin/phpinfo.php
 share/phpmyadmin/phpmyadmin.css.php
@@ -457,8 +552,12 @@ share/phpmyadmin/server_privileges.php
 share/phpmyadmin/server_replication.php
 share/phpmyadmin/server_sql.php
 share/phpmyadmin/server_status.php
-share/phpmyadmin/server_synchronize.php
+share/phpmyadmin/server_status_advisor.php
+share/phpmyadmin/server_status_monitor.php
+share/phpmyadmin/server_status_queries.php
+share/phpmyadmin/server_status_variables.php
 share/phpmyadmin/server_variables.php
+share/phpmyadmin/setup/ajax.js
 share/phpmyadmin/setup/config.php
 share/phpmyadmin/setup/frames/config.inc.php
 share/phpmyadmin/setup/frames/form.inc.php
@@ -476,7 +575,6 @@ share/phpmyadmin/setup/validate.php
 share/phpmyadmin/show_config_errors.php
 share/phpmyadmin/sql.php
 share/phpmyadmin/tbl_addfield.php
-share/phpmyadmin/tbl_alter.php
 share/phpmyadmin/tbl_change.php
 share/phpmyadmin/tbl_chart.php
 share/phpmyadmin/tbl_create.php
@@ -499,9 +597,8 @@ share/phpmyadmin/tbl_triggers.php
 share/phpmyadmin/tbl_zoom_select.php
 share/phpmyadmin/themes.php
 share/phpmyadmin/themes/dot.gif
-share/phpmyadmin/themes/original/css/theme_left.css.php
-share/phpmyadmin/themes/original/css/theme_print.css.php
-share/phpmyadmin/themes/original/css/theme_right.css.php
+share/phpmyadmin/themes/original/css/common.css.php
+share/phpmyadmin/themes/original/css/navigation.css.php
 share/phpmyadmin/themes/original/img/ajax_clock_small.gif
 share/phpmyadmin/themes/original/img/arrow_ltr.png
 share/phpmyadmin/themes/original/img/arrow_rtl.png
@@ -510,6 +607,7 @@ share/phpmyadmin/themes/original/img/b_browse.png
 share/phpmyadmin/themes/original/img/b_calendar.png
 share/phpmyadmin/themes/original/img/b_chart.png
 share/phpmyadmin/themes/original/img/b_close.png
+share/phpmyadmin/themes/original/img/b_column_add.png
 share/phpmyadmin/themes/original/img/b_comment.png
 share/phpmyadmin/themes/original/img/b_dbstatistics.png
 share/phpmyadmin/themes/original/img/b_deltbl.png
@@ -523,15 +621,18 @@ share/phpmyadmin/themes/original/img/b_events.png
 share/phpmyadmin/themes/original/img/b_export.png
 share/phpmyadmin/themes/original/img/b_ftext.png
 share/phpmyadmin/themes/original/img/b_globe.gif
+share/phpmyadmin/themes/original/img/b_group.png
 share/phpmyadmin/themes/original/img/b_help.png
 share/phpmyadmin/themes/original/img/b_home.png
 share/phpmyadmin/themes/original/img/b_import.png
 share/phpmyadmin/themes/original/img/b_index.png
+share/phpmyadmin/themes/original/img/b_index_add.png
 share/phpmyadmin/themes/original/img/b_info.png
 share/phpmyadmin/themes/original/img/b_inline_edit.png
 share/phpmyadmin/themes/original/img/b_insrow.png
 share/phpmyadmin/themes/original/img/b_minus.png
 share/phpmyadmin/themes/original/img/b_more.png
+share/phpmyadmin/themes/original/img/b_move.png
 share/phpmyadmin/themes/original/img/b_newdb.png
 share/phpmyadmin/themes/original/img/b_newtbl.png
 share/phpmyadmin/themes/original/img/b_nextpage.png
@@ -551,6 +652,7 @@ share/phpmyadmin/themes/original/img/b_snewtbl.png
 share/phpmyadmin/themes/original/img/b_spatial.png
 share/phpmyadmin/themes/original/img/b_sql.png
 share/phpmyadmin/themes/original/img/b_sqlhelp.png
+share/phpmyadmin/themes/original/img/b_table_add.png
 share/phpmyadmin/themes/original/img/b_tblanalyse.png
 share/phpmyadmin/themes/original/img/b_tblexport.png
 share/phpmyadmin/themes/original/img/b_tblimport.png
@@ -566,6 +668,7 @@ share/phpmyadmin/themes/original/img/b_usrdrop.png
 share/phpmyadmin/themes/original/img/b_usredit.png
 share/phpmyadmin/themes/original/img/b_usrlist.png
 share/phpmyadmin/themes/original/img/b_view.png
+share/phpmyadmin/themes/original/img/b_view_add.png
 share/phpmyadmin/themes/original/img/b_views.png
 share/phpmyadmin/themes/original/img/bd_browse.png
 share/phpmyadmin/themes/original/img/bd_deltbl.png
@@ -586,13 +689,10 @@ share/phpmyadmin/themes/original/img/cleardot.gif
 share/phpmyadmin/themes/original/img/col_drop.png
 share/phpmyadmin/themes/original/img/col_pointer.png
 share/phpmyadmin/themes/original/img/col_pointer_ver.png
-share/phpmyadmin/themes/original/img/docs_menu_bg.png
 share/phpmyadmin/themes/original/img/east-mini.png
 share/phpmyadmin/themes/original/img/error.ico
 share/phpmyadmin/themes/original/img/eye.png
 share/phpmyadmin/themes/original/img/eye_grey.png
-share/phpmyadmin/themes/original/img/item_ltr.png
-share/phpmyadmin/themes/original/img/item_rtl.png
 share/phpmyadmin/themes/original/img/logo_left.png
 share/phpmyadmin/themes/original/img/logo_right.png
 share/phpmyadmin/themes/original/img/more.png
@@ -607,61 +707,8 @@ share/phpmyadmin/themes/original/img/new_struct_selected_hovered.png
 share/phpmyadmin/themes/original/img/north-mini.png
 share/phpmyadmin/themes/original/img/pause.png
 share/phpmyadmin/themes/original/img/play.png
-share/phpmyadmin/themes/original/img/pmd/1.png
-share/phpmyadmin/themes/original/img/pmd/2.png
-share/phpmyadmin/themes/original/img/pmd/2leftarrow.png
-share/phpmyadmin/themes/original/img/pmd/2leftarrow_m.png
-share/phpmyadmin/themes/original/img/pmd/2rightarrow.png
-share/phpmyadmin/themes/original/img/pmd/2rightarrow_m.png
-share/phpmyadmin/themes/original/img/pmd/3.png
-share/phpmyadmin/themes/original/img/pmd/4.png
-share/phpmyadmin/themes/original/img/pmd/5.png
-share/phpmyadmin/themes/original/img/pmd/6.png
-share/phpmyadmin/themes/original/img/pmd/7.png
-share/phpmyadmin/themes/original/img/pmd/8.png
-share/phpmyadmin/themes/original/img/pmd/FieldKey_small.png
-share/phpmyadmin/themes/original/img/pmd/Field_small.png
-share/phpmyadmin/themes/original/img/pmd/Field_small_char.png
-share/phpmyadmin/themes/original/img/pmd/Field_small_date.png
-share/phpmyadmin/themes/original/img/pmd/Field_small_int.png
-share/phpmyadmin/themes/original/img/pmd/Header.png
-share/phpmyadmin/themes/original/img/pmd/Header_Linked.png
-share/phpmyadmin/themes/original/img/pmd/and_icon.png
-share/phpmyadmin/themes/original/img/pmd/ang_direct.png
-share/phpmyadmin/themes/original/img/pmd/bord.png
-share/phpmyadmin/themes/original/img/pmd/bottom.png
-share/phpmyadmin/themes/original/img/pmd/def.png
-share/phpmyadmin/themes/original/img/pmd/display_field.png
-share/phpmyadmin/themes/original/img/pmd/downarrow1.png
-share/phpmyadmin/themes/original/img/pmd/downarrow2.png
-share/phpmyadmin/themes/original/img/pmd/downarrow2_m.png
-share/phpmyadmin/themes/original/img/pmd/exec.png
-share/phpmyadmin/themes/original/img/pmd/exec_small.png
-share/phpmyadmin/themes/original/img/pmd/favicon.ico
-share/phpmyadmin/themes/original/img/pmd/grid.png
-share/phpmyadmin/themes/original/img/pmd/help.png
-share/phpmyadmin/themes/original/img/pmd/help_relation.png
-share/phpmyadmin/themes/original/img/pmd/left_panel_butt.png
-share/phpmyadmin/themes/original/img/pmd/left_panel_tab.png
-share/phpmyadmin/themes/original/img/pmd/minus.png
-share/phpmyadmin/themes/original/img/pmd/or_icon.png
-share/phpmyadmin/themes/original/img/pmd/pdf.png
-share/phpmyadmin/themes/original/img/pmd/plus.png
-share/phpmyadmin/themes/original/img/pmd/query_builder.png
-share/phpmyadmin/themes/original/img/pmd/relation.png
-share/phpmyadmin/themes/original/img/pmd/reload.png
-share/phpmyadmin/themes/original/img/pmd/resize.png
-share/phpmyadmin/themes/original/img/pmd/rightarrow1.png
-share/phpmyadmin/themes/original/img/pmd/rightarrow2.png
-share/phpmyadmin/themes/original/img/pmd/save.png
-share/phpmyadmin/themes/original/img/pmd/small_tab.png
-share/phpmyadmin/themes/original/img/pmd/table.png
-share/phpmyadmin/themes/original/img/pmd/toggle_lines.png
-share/phpmyadmin/themes/original/img/pmd/top_panel.png
-share/phpmyadmin/themes/original/img/pmd/uparrow2_m.png
 share/phpmyadmin/themes/original/img/s_asc.png
 share/phpmyadmin/themes/original/img/s_asci.png
-share/phpmyadmin/themes/original/img/s_attention.png
 share/phpmyadmin/themes/original/img/s_cancel.png
 share/phpmyadmin/themes/original/img/s_cog.png
 share/phpmyadmin/themes/original/img/s_db.png
@@ -670,14 +717,11 @@ share/phpmyadmin/themes/original/img/s_error.png
 share/phpmyadmin/themes/original/img/s_error2.png
 share/phpmyadmin/themes/original/img/s_fulltext.png
 share/phpmyadmin/themes/original/img/s_host.png
-share/phpmyadmin/themes/original/img/s_info.png
 share/phpmyadmin/themes/original/img/s_lang.png
 share/phpmyadmin/themes/original/img/s_loggoff.png
 share/phpmyadmin/themes/original/img/s_notice.png
-share/phpmyadmin/themes/original/img/s_okay.png
 share/phpmyadmin/themes/original/img/s_partialtext.png
 share/phpmyadmin/themes/original/img/s_passwd.png
-share/phpmyadmin/themes/original/img/s_process.png
 share/phpmyadmin/themes/original/img/s_really.png
 share/phpmyadmin/themes/original/img/s_reload.png
 share/phpmyadmin/themes/original/img/s_replication.png
@@ -688,6 +732,7 @@ share/phpmyadmin/themes/original/img/s_success.png
 share/phpmyadmin/themes/original/img/s_sync.png
 share/phpmyadmin/themes/original/img/s_tbl.png
 share/phpmyadmin/themes/original/img/s_theme.png
+share/phpmyadmin/themes/original/img/s_top.png
 share/phpmyadmin/themes/original/img/s_vars.png
 share/phpmyadmin/themes/original/img/s_views.png
 share/phpmyadmin/themes/original/img/south-mini.png
@@ -715,13 +760,19 @@ share/phpmyadmin/themes/original/jquery/images/ui-icons_2e83ff_256x240.png
 share/phpmyadmin/themes/original/jquery/images/ui-icons_454545_256x240.png
 share/phpmyadmin/themes/original/jquery/images/ui-icons_888888_256x240.png
 share/phpmyadmin/themes/original/jquery/images/ui-icons_cd0a0a_256x240.png
-share/phpmyadmin/themes/original/jquery/jquery-ui-1.8.16.custom.css
+share/phpmyadmin/themes/original/jquery/jquery-ui-1.9.2.custom.css
 share/phpmyadmin/themes/original/layout.inc.php
 share/phpmyadmin/themes/original/screen.png
 share/phpmyadmin/themes/original/sprites.lib.php
-share/phpmyadmin/themes/pmahomme/css/theme_left.css.php
-share/phpmyadmin/themes/pmahomme/css/theme_print.css.php
-share/phpmyadmin/themes/pmahomme/css/theme_right.css.php
+share/phpmyadmin/themes/pmahomme/css/codemirror.css.php
+share/phpmyadmin/themes/pmahomme/css/common.css.php
+share/phpmyadmin/themes/pmahomme/css/enum_editor.css.php
+share/phpmyadmin/themes/pmahomme/css/gis.css.php
+share/phpmyadmin/themes/pmahomme/css/jqplot.css.php
+share/phpmyadmin/themes/pmahomme/css/navigation.css.php
+share/phpmyadmin/themes/pmahomme/css/pmd.css.php
+share/phpmyadmin/themes/pmahomme/css/resizable-menu.css.php
+share/phpmyadmin/themes/pmahomme/css/rte.css.php
 share/phpmyadmin/themes/pmahomme/img/ajax_clock_small.gif
 share/phpmyadmin/themes/pmahomme/img/arrow_ltr.png
 share/phpmyadmin/themes/pmahomme/img/arrow_rtl.png
@@ -731,6 +782,7 @@ share/phpmyadmin/themes/pmahomme/img/b_browse.png
 share/phpmyadmin/themes/pmahomme/img/b_calendar.png
 share/phpmyadmin/themes/pmahomme/img/b_chart.png
 share/phpmyadmin/themes/pmahomme/img/b_close.png
+share/phpmyadmin/themes/pmahomme/img/b_column_add.png
 share/phpmyadmin/themes/pmahomme/img/b_comment.png
 share/phpmyadmin/themes/pmahomme/img/b_dbstatistics.png
 share/phpmyadmin/themes/pmahomme/img/b_deltbl.png
@@ -746,16 +798,19 @@ share/phpmyadmin/themes/pmahomme/img/b_export.png
 share/phpmyadmin/themes/pmahomme/img/b_firstpage.png
 share/phpmyadmin/themes/pmahomme/img/b_ftext.png
 share/phpmyadmin/themes/pmahomme/img/b_globe.gif
+share/phpmyadmin/themes/pmahomme/img/b_group.png
 share/phpmyadmin/themes/pmahomme/img/b_help.png
 share/phpmyadmin/themes/pmahomme/img/b_home.png
 share/phpmyadmin/themes/pmahomme/img/b_import.png
 share/phpmyadmin/themes/pmahomme/img/b_index.png
+share/phpmyadmin/themes/pmahomme/img/b_index_add.png
 share/phpmyadmin/themes/pmahomme/img/b_info.png
 share/phpmyadmin/themes/pmahomme/img/b_inline_edit.png
 share/phpmyadmin/themes/pmahomme/img/b_insrow.png
 share/phpmyadmin/themes/pmahomme/img/b_lastpage.png
 share/phpmyadmin/themes/pmahomme/img/b_minus.png
 share/phpmyadmin/themes/pmahomme/img/b_more.png
+share/phpmyadmin/themes/pmahomme/img/b_move.png
 share/phpmyadmin/themes/pmahomme/img/b_newdb.png
 share/phpmyadmin/themes/pmahomme/img/b_newtbl.png
 share/phpmyadmin/themes/pmahomme/img/b_nextpage.png
@@ -779,6 +834,7 @@ share/phpmyadmin/themes/pmahomme/img/b_spatial.png
 share/phpmyadmin/themes/pmahomme/img/b_sql.png
 share/phpmyadmin/themes/pmahomme/img/b_sqldoc.png
 share/phpmyadmin/themes/pmahomme/img/b_sqlhelp.png
+share/phpmyadmin/themes/pmahomme/img/b_table_add.png
 share/phpmyadmin/themes/pmahomme/img/b_tblanalyse.png
 share/phpmyadmin/themes/pmahomme/img/b_tblexport.png
 share/phpmyadmin/themes/pmahomme/img/b_tblimport.png
@@ -794,6 +850,7 @@ share/phpmyadmin/themes/pmahomme/img/b_usrdrop.png
 share/phpmyadmin/themes/pmahomme/img/b_usredit.png
 share/phpmyadmin/themes/pmahomme/img/b_usrlist.png
 share/phpmyadmin/themes/pmahomme/img/b_view.png
+share/phpmyadmin/themes/pmahomme/img/b_view_add.png
 share/phpmyadmin/themes/pmahomme/img/b_views.png
 share/phpmyadmin/themes/pmahomme/img/bd_browse.png
 share/phpmyadmin/themes/pmahomme/img/bd_deltbl.png
@@ -813,25 +870,18 @@ share/phpmyadmin/themes/pmahomme/img/bd_sbrowse.png
 share/phpmyadmin/themes/pmahomme/img/bd_select.png
 share/phpmyadmin/themes/pmahomme/img/bd_spatial.png
 share/phpmyadmin/themes/pmahomme/img/bd_unique.png
-share/phpmyadmin/themes/pmahomme/img/body_bg.png
 share/phpmyadmin/themes/pmahomme/img/col_drop.png
 share/phpmyadmin/themes/pmahomme/img/col_pointer.png
 share/phpmyadmin/themes/pmahomme/img/col_pointer_ver.png
 share/phpmyadmin/themes/pmahomme/img/database.png
-share/phpmyadmin/themes/pmahomme/img/database_list_li_hover.png
-share/phpmyadmin/themes/pmahomme/img/docs_menu_bg.png
 share/phpmyadmin/themes/pmahomme/img/east-mini.png
 share/phpmyadmin/themes/pmahomme/img/error.ico
 share/phpmyadmin/themes/pmahomme/img/eye.png
 share/phpmyadmin/themes/pmahomme/img/eye_grey.png
-share/phpmyadmin/themes/pmahomme/img/input_bg.gif
 share/phpmyadmin/themes/pmahomme/img/item.png
-share/phpmyadmin/themes/pmahomme/img/item_ltr.png
-share/phpmyadmin/themes/pmahomme/img/item_rtl.png
 share/phpmyadmin/themes/pmahomme/img/left_nav_bg.png
 share/phpmyadmin/themes/pmahomme/img/logo_left.png
 share/phpmyadmin/themes/pmahomme/img/logo_right.png
-share/phpmyadmin/themes/pmahomme/img/marked_bg.png
 share/phpmyadmin/themes/pmahomme/img/more.png
 share/phpmyadmin/themes/pmahomme/img/new_data.png
 share/phpmyadmin/themes/pmahomme/img/new_data_hovered.png
@@ -876,6 +926,7 @@ share/phpmyadmin/themes/pmahomme/img/pmd/downarrow2.png
 share/phpmyadmin/themes/pmahomme/img/pmd/downarrow2_m.png
 share/phpmyadmin/themes/pmahomme/img/pmd/exec.png
 share/phpmyadmin/themes/pmahomme/img/pmd/exec_small.png
+share/phpmyadmin/themes/pmahomme/img/pmd/exitFullscreen.png
 share/phpmyadmin/themes/pmahomme/img/pmd/favicon.ico
 share/phpmyadmin/themes/pmahomme/img/pmd/grid.png
 share/phpmyadmin/themes/pmahomme/img/pmd/help.png
@@ -898,6 +949,7 @@ share/phpmyadmin/themes/pmahomme/img/pmd/table.png
 share/phpmyadmin/themes/pmahomme/img/pmd/toggle_lines.png
 share/phpmyadmin/themes/pmahomme/img/pmd/top_panel.png
 share/phpmyadmin/themes/pmahomme/img/pmd/uparrow2_m.png
+share/phpmyadmin/themes/pmahomme/img/pmd/viewInFullscreen.png
 share/phpmyadmin/themes/pmahomme/img/s_asc.png
 share/phpmyadmin/themes/pmahomme/img/s_asci.png
 share/phpmyadmin/themes/pmahomme/img/s_attention.png
@@ -928,14 +980,12 @@ share/phpmyadmin/themes/pmahomme/img/s_success.png
 share/phpmyadmin/themes/pmahomme/img/s_sync.png
 share/phpmyadmin/themes/pmahomme/img/s_tbl.png
 share/phpmyadmin/themes/pmahomme/img/s_theme.png
+share/phpmyadmin/themes/pmahomme/img/s_top.png
 share/phpmyadmin/themes/pmahomme/img/s_vars.png
 share/phpmyadmin/themes/pmahomme/img/s_views.png
 share/phpmyadmin/themes/pmahomme/img/south-mini.png
 share/phpmyadmin/themes/pmahomme/img/spacer.png
 share/phpmyadmin/themes/pmahomme/img/sprites.png
-share/phpmyadmin/themes/pmahomme/img/tab_bg.png
-share/phpmyadmin/themes/pmahomme/img/tab_hover_bg.png
-share/phpmyadmin/themes/pmahomme/img/tabactive_bg.png
 share/phpmyadmin/themes/pmahomme/img/toggle-ltr.png
 share/phpmyadmin/themes/pmahomme/img/toggle-rtl.png
 share/phpmyadmin/themes/pmahomme/img/vertical_line.png
@@ -958,7 +1008,7 @@ share/phpmyadmin/themes/pmahomme/jquery/images/ui-icons_2e83ff_256x240.png
 share/phpmyadmin/themes/pmahomme/jquery/images/ui-icons_454545_256x240.png
 share/phpmyadmin/themes/pmahomme/jquery/images/ui-icons_888888_256x240.png
 share/phpmyadmin/themes/pmahomme/jquery/images/ui-icons_cd0a0a_256x240.png
-share/phpmyadmin/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css
+share/phpmyadmin/themes/pmahomme/jquery/jquery-ui-1.9.2.custom.css
 share/phpmyadmin/themes/pmahomme/layout.inc.php
 share/phpmyadmin/themes/pmahomme/screen.png
 share/phpmyadmin/themes/pmahomme/sprites.lib.php
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index 7ca25d92ac1..e9dae3615bb 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.74 2013/07/29 20:01:02 tron Exp $
+$NetBSD: distinfo,v 1.75 2013/09/18 22:20:04 tron Exp $
 
-SHA1 (phpMyAdmin-3.5.8.2-all-languages.tar.xz) = d64d0274881513782fac3ad4fd4096c9842dec52
-RMD160 (phpMyAdmin-3.5.8.2-all-languages.tar.xz) = b507c62bb5d6c962ba6335a13fa7565d4336b6a0
-Size (phpMyAdmin-3.5.8.2-all-languages.tar.xz) = 3743436 bytes
-SHA1 (patch-libraries_vendor_config.php) = 00e60e3ef59f8e4984bab0ad95e8fbdb82decb75
+SHA1 (phpMyAdmin-4.0.6-all-languages.tar.xz) = 9aa00254e3dc8106f4554f361c7eb6c566f7c9fa
+RMD160 (phpMyAdmin-4.0.6-all-languages.tar.xz) = c127a52ef63827b40c0be6c327831e7b2e7c6040
+Size (phpMyAdmin-4.0.6-all-languages.tar.xz) = 4753244 bytes
+SHA1 (patch-libraries_vendor_config.php) = af587496e999bf1e92d6c5a9ab8053fe6e92a0f2
diff --git a/databases/phpmyadmin/patches/patch-libraries_vendor_config.php b/databases/phpmyadmin/patches/patch-libraries_vendor_config.php
index 98bc84a0546..28bf88afde7 100644
--- a/databases/phpmyadmin/patches/patch-libraries_vendor_config.php
+++ b/databases/phpmyadmin/patches/patch-libraries_vendor_config.php
@@ -1,11 +1,11 @@
-$NetBSD: patch-libraries_vendor_config.php,v 1.2 2012/08/28 15:54:54 tron Exp $
+$NetBSD: patch-libraries_vendor_config.php,v 1.3 2013/09/18 22:20:04 tron Exp $
 
 Configure location of the configuration file in the vendor specific section
 as suggested by the phpMyAdmin documentation.
 
---- libraries/vendor_config.php.orig	2012-08-12 14:45:56.000000000 +0100
-+++ libraries/vendor_config.php	2012-08-28 16:44:12.000000000 +0100
-@@ -25,7 +25,7 @@
+--- libraries/vendor_config.php.orig	2013-09-05 17:34:46.000000000 +0100
++++ libraries/vendor_config.php	2013-09-18 21:07:38.000000000 +0100
+@@ -28,7 +28,7 @@
  /**
   * Path to config file generated using setup script.
   */