Update "phpmyadmin" package to version 3.5.1. Major changes since 3.4.*:

- browse-mode improvements
  -  grid editing
  -  remember recent tables
  -  remember last sort order by table
  -  flexible column width
  -  reorder columns
  -  more compact navigation bar
- AJAXification of many operations
- reorganised server status page, with server monitoring
- improved support for stored routines, events and triggers
- openGIS support
- zoom-search in table search
- Drizzle support
- improved ENUM/SET editor

4 files changed, 387 insertions, 139 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index f9a5419fbb8..1a8d655ade7 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.99 2012/04/15 11:56:27 tron Exp $
+# $NetBSD: Makefile,v 1.100 2012/05/06 09:01:10 tron Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}-all-languages
 PKGNAME=	phpmyadmin-${DIST_VERSION:S/-//}
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=phpmyadmin/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 OWNER=		tron@NetBSD.org
 HOMEPAGE=	http://www.phpmyadmin.net/
@@ -29,10 +29,9 @@ MESSAGE_SUBST+=	CONF_INC_PHP=${CONF_INC_PHP} PMCONFFILE=${PMCONFFILE:Q} \
 USE_TOOLS+=	perl:run
 
 CONF_INC_PHP=	${PREFIX}/share/phpmyadmin/config.inc.php
-DIST_VERSION=	3.4.11
-DOC_FILES=	CREDITS ChangeLog \
-		Documentation.txt INSTALL LICENSE README \
-		RELEASE-DATE-${DIST_VERSION} TODO
+DIST_VERSION=	3.5.1
+DOC_FILES=	ChangeLog Documentation.txt LICENSE README \
+		RELEASE-DATE-${DIST_VERSION}
 
 APACHE_USER?=	www
 APACHE_GROUP?=	www
@@ -46,7 +45,6 @@ PKG_GROUPS_VARS+=	APACHE_GROUP
 EXDIR=		${PREFIX}/share/examples/phpmyadmin
 PMCONFFILE=	${PKG_SYSCONFDIR}/config.inc.php
 PMDIR=		${PREFIX}/share/phpmyadmin
-REPLACE_PERL+=	scripts/convertcfg.pl
 
 PKG_SYSCONFSUBDIR?=	phpmyadmin
 
@@ -57,7 +55,21 @@ INSTALLATION_DIRS+=	${PREFIX}/share/doc/phpmyadmin \
 			${PMDIR} ${PMDIR}/scripts
 
 INSTALL_DIRS=	js
+INSTALL_DIRS+=	js/canvg
+INSTALL_DIRS+=	js/codemirror
+INSTALL_DIRS+=	js/codemirror/lib
+INSTALL_DIRS+=	js/codemirror/mode
+INSTALL_DIRS+=	js/codemirror/mode/mysql
+INSTALL_DIRS+=	js/highcharts
+INSTALL_DIRS+=	js/jquery
+INSTALL_DIRS+=	js/openlayers
+INSTALL_DIRS+=	js/openlayers/img
+INSTALL_DIRS+=	js/openlayers/theme
+INSTALL_DIRS+=	js/openlayers/theme/default
+INSTALL_DIRS+=	js/openlayers/theme/default/img
+INSTALL_DIRS+=	js/pmd
 INSTALL_DIRS+=	js/query
+INSTALL_DIRS+=	js/rte
 INSTALL_DIRS+=	libraries
 INSTALL_DIRS+=	libraries/PHPExcel
 INSTALL_DIRS+=	libraries/PHPExcel/PHPExcel
@@ -88,6 +100,7 @@ INSTALL_DIRS+=	libraries/PHPExcel/PHPExcel/Writer
 INSTALL_DIRS+=	libraries/PHPExcel/PHPExcel/Writer/Excel2007
 INSTALL_DIRS+=	libraries/auth
 INSTALL_DIRS+=	libraries/auth/swekey
+INSTALL_DIRS+=	libraries/bfShapeFiles
 INSTALL_DIRS+=	libraries/chart
 INSTALL_DIRS+=	libraries/chart/pChart
 INSTALL_DIRS+=	libraries/chart/pChart/fonts
@@ -98,6 +111,7 @@ INSTALL_DIRS+=	libraries/export
 INSTALL_DIRS+=	libraries/import
 INSTALL_DIRS+=	libraries/import/upload
 INSTALL_DIRS+=	libraries/php-gettext
+INSTALL_DIRS+=	libraries/rte
 INSTALL_DIRS+=	libraries/schema
 INSTALL_DIRS+=	libraries/tcpdf
 INSTALL_DIRS+=	libraries/tcpdf/cache
@@ -105,6 +119,7 @@ INSTALL_DIRS+=	libraries/tcpdf/config
 INSTALL_DIRS+=	libraries/tcpdf/config/lang
 INSTALL_DIRS+=	libraries/tcpdf/fonts
 INSTALL_DIRS+=	libraries/tcpdf/fonts/dejavu-fonts-ttf-2.32
+INSTALL_DIRS+=	libraries/tcpdf/fonts/dejavu-fonts-ttf-2.33
 INSTALL_DIRS+=	libraries/transformations
 INSTALL_DIRS+=	locale
 INSTALL_DIRS+=	locale/ar
@@ -183,6 +198,8 @@ INSTALL_DIRS+=	locale/sv
 INSTALL_DIRS+=	locale/sv/LC_MESSAGES
 INSTALL_DIRS+=	locale/tr
 INSTALL_DIRS+=	locale/tr/LC_MESSAGES
+INSTALL_DIRS+=	locale/uk
+INSTALL_DIRS+=	locale/uk/LC_MESSAGES
 INSTALL_DIRS+=	locale/uz
 INSTALL_DIRS+=	locale/uz/LC_MESSAGES
 INSTALL_DIRS+=	locale/uz@latin
@@ -191,21 +208,20 @@ INSTALL_DIRS+=	locale/zh_CN
 INSTALL_DIRS+=	locale/zh_CN/LC_MESSAGES
 INSTALL_DIRS+=	locale/zh_TW
 INSTALL_DIRS+=	locale/zh_TW/LC_MESSAGES
-INSTALL_DIRS+=	pmd
-INSTALL_DIRS+=	pmd/images
-INSTALL_DIRS+=	pmd/scripts
-INSTALL_DIRS+=	pmd/styles
-INSTALL_DIRS+=	pmd/styles/default
-INSTALL_DIRS+=	pmd/styles/default/images
+INSTALL_DIRS+=	scripts
+INSTALL_DIRS+=	setup/frames
+INSTALL_DIRS+=	setup/lib
 INSTALL_DIRS+=	themes
 INSTALL_DIRS+=	themes/original
 INSTALL_DIRS+=	themes/original/css
 INSTALL_DIRS+=	themes/original/img
+INSTALL_DIRS+=	themes/original/img/pmd
 INSTALL_DIRS+=	themes/original/jquery
 INSTALL_DIRS+=	themes/original/jquery/images
 INSTALL_DIRS+=	themes/pmahomme
 INSTALL_DIRS+=	themes/pmahomme/css
 INSTALL_DIRS+=	themes/pmahomme/img
+INSTALL_DIRS+=	themes/pmahomme/img/pmd
 INSTALL_DIRS+=	themes/pmahomme/jquery
 INSTALL_DIRS+=	themes/pmahomme/jquery/images
 
@@ -243,10 +259,6 @@ do-install:
 		done							\
 	done
 
-	${INSTALL_DATA} ${WRKSRC}/scripts/*.sql ${DESTDIR}${PMDIR}/scripts
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/convertcfg.pl \
-	  ${DESTDIR}${PMDIR}/scripts
-
 	cd ${WRKSRC} && \
 	${INSTALL_DATA} ${DOC_FILES} ${DESTDIR}${PREFIX}/share/doc/phpmyadmin
 	${INSTALL_DATA} ${WRKDIR}/phpmyadmin.conf ${DESTDIR}${EXDIR}/apache.conf
diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST
index 08095b2ca76..8573bab9a20 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,12 +1,9 @@
-@comment $NetBSD: PLIST,v 1.26 2012/04/15 11:56:27 tron Exp $
-share/doc/phpmyadmin/CREDITS
+@comment $NetBSD: PLIST,v 1.27 2012/05/06 09:01:10 tron Exp $
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/Documentation.txt
-share/doc/phpmyadmin/INSTALL
 share/doc/phpmyadmin/LICENSE
 share/doc/phpmyadmin/README
-share/doc/phpmyadmin/RELEASE-DATE-${DIST_VERSION}
-share/doc/phpmyadmin/TODO
+share/doc/phpmyadmin/RELEASE-DATE-3.5.1
 share/examples/phpmyadmin/apache.conf
 share/examples/phpmyadmin/config.inc.php
 share/phpmyadmin/Documentation.html
@@ -18,47 +15,155 @@ share/phpmyadmin/changelog.php
 share/phpmyadmin/chk_rel.php
 share/phpmyadmin/db_create.php
 share/phpmyadmin/db_datadict.php
+share/phpmyadmin/db_events.php
 share/phpmyadmin/db_export.php
 share/phpmyadmin/db_import.php
 share/phpmyadmin/db_operations.php
 share/phpmyadmin/db_printview.php
 share/phpmyadmin/db_qbe.php
+share/phpmyadmin/db_routines.php
 share/phpmyadmin/db_search.php
 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/export.php
 share/phpmyadmin/favicon.ico
+share/phpmyadmin/file_echo.php
+share/phpmyadmin/gis_data_editor.php
 share/phpmyadmin/import.php
 share/phpmyadmin/import_status.php
 share/phpmyadmin/index.php
+share/phpmyadmin/js/OpenStreetMap.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/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/gis_data_editor.js
+share/phpmyadmin/js/highcharts/exporting.js
+share/phpmyadmin/js/highcharts/highcharts.js
 share/phpmyadmin/js/import.js
 share/phpmyadmin/js/indexes.js
+share/phpmyadmin/js/jquery/jquery-1.6.2.js
+share/phpmyadmin/js/jquery/jquery-ui-1.8.16.custom.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.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
 share/phpmyadmin/js/navigation.js
-share/phpmyadmin/js/pMap.js
+share/phpmyadmin/js/openlayers/OpenLayers.js
+share/phpmyadmin/js/openlayers/img/blank.gif
+share/phpmyadmin/js/openlayers/img/cloud-popup-relative.png
+share/phpmyadmin/js/openlayers/img/drag-rectangle-off.png
+share/phpmyadmin/js/openlayers/img/drag-rectangle-on.png
+share/phpmyadmin/js/openlayers/img/east-mini.png
+share/phpmyadmin/js/openlayers/img/layer-switcher-maximize.png
+share/phpmyadmin/js/openlayers/img/layer-switcher-minimize.png
+share/phpmyadmin/js/openlayers/img/marker-blue.png
+share/phpmyadmin/js/openlayers/img/marker-gold.png
+share/phpmyadmin/js/openlayers/img/marker-green.png
+share/phpmyadmin/js/openlayers/img/marker.png
+share/phpmyadmin/js/openlayers/img/measuring-stick-off.png
+share/phpmyadmin/js/openlayers/img/measuring-stick-on.png
+share/phpmyadmin/js/openlayers/img/north-mini.png
+share/phpmyadmin/js/openlayers/img/panning-hand-off.png
+share/phpmyadmin/js/openlayers/img/panning-hand-on.png
+share/phpmyadmin/js/openlayers/img/slider.png
+share/phpmyadmin/js/openlayers/img/south-mini.png
+share/phpmyadmin/js/openlayers/img/west-mini.png
+share/phpmyadmin/js/openlayers/img/zoom-minus-mini.png
+share/phpmyadmin/js/openlayers/img/zoom-plus-mini.png
+share/phpmyadmin/js/openlayers/img/zoom-world-mini.png
+share/phpmyadmin/js/openlayers/img/zoombar.png
+share/phpmyadmin/js/openlayers/theme/default/framedCloud.css
+share/phpmyadmin/js/openlayers/theme/default/google.css
+share/phpmyadmin/js/openlayers/theme/default/ie6-style.css
+share/phpmyadmin/js/openlayers/theme/default/img/add_point_off.png
+share/phpmyadmin/js/openlayers/theme/default/img/add_point_on.png
+share/phpmyadmin/js/openlayers/theme/default/img/blank.gif
+share/phpmyadmin/js/openlayers/theme/default/img/close.gif
+share/phpmyadmin/js/openlayers/theme/default/img/drag-rectangle-off.png
+share/phpmyadmin/js/openlayers/theme/default/img/drag-rectangle-on.png
+share/phpmyadmin/js/openlayers/theme/default/img/draw_line_off.png
+share/phpmyadmin/js/openlayers/theme/default/img/draw_line_on.png
+share/phpmyadmin/js/openlayers/theme/default/img/draw_point_off.png
+share/phpmyadmin/js/openlayers/theme/default/img/draw_point_on.png
+share/phpmyadmin/js/openlayers/theme/default/img/draw_polygon_off.png
+share/phpmyadmin/js/openlayers/theme/default/img/draw_polygon_on.png
+share/phpmyadmin/js/openlayers/theme/default/img/editing_tool_bar.png
+share/phpmyadmin/js/openlayers/theme/default/img/move_feature_off.png
+share/phpmyadmin/js/openlayers/theme/default/img/move_feature_on.png
+share/phpmyadmin/js/openlayers/theme/default/img/navigation_history.png
+share/phpmyadmin/js/openlayers/theme/default/img/overview_replacement.gif
+share/phpmyadmin/js/openlayers/theme/default/img/pan-panel-NOALPHA.png
+share/phpmyadmin/js/openlayers/theme/default/img/pan-panel.png
+share/phpmyadmin/js/openlayers/theme/default/img/pan_off.png
+share/phpmyadmin/js/openlayers/theme/default/img/pan_on.png
+share/phpmyadmin/js/openlayers/theme/default/img/panning-hand-off.png
+share/phpmyadmin/js/openlayers/theme/default/img/panning-hand-on.png
+share/phpmyadmin/js/openlayers/theme/default/img/remove_point_off.png
+share/phpmyadmin/js/openlayers/theme/default/img/remove_point_on.png
+share/phpmyadmin/js/openlayers/theme/default/img/ruler.png
+share/phpmyadmin/js/openlayers/theme/default/img/save_features_off.png
+share/phpmyadmin/js/openlayers/theme/default/img/save_features_on.png
+share/phpmyadmin/js/openlayers/theme/default/img/view_next_off.png
+share/phpmyadmin/js/openlayers/theme/default/img/view_next_on.png
+share/phpmyadmin/js/openlayers/theme/default/img/view_previous_off.png
+share/phpmyadmin/js/openlayers/theme/default/img/view_previous_on.png
+share/phpmyadmin/js/openlayers/theme/default/img/zoom-panel-NOALPHA.png
+share/phpmyadmin/js/openlayers/theme/default/img/zoom-panel.png
+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/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/server_plugins.js
 share/phpmyadmin/js/server_privileges.js
+share/phpmyadmin/js/server_status.js
+share/phpmyadmin/js/server_status_monitor.js
 share/phpmyadmin/js/server_synchronize.js
+share/phpmyadmin/js/server_variables.js
 share/phpmyadmin/js/sql.js
 share/phpmyadmin/js/tbl_change.js
+share/phpmyadmin/js/tbl_chart.js
+share/phpmyadmin/js/tbl_gis_visualization.js
 share/phpmyadmin/js/tbl_relation.js
 share/phpmyadmin/js/tbl_select.js
 share/phpmyadmin/js/tbl_structure.js
+share/phpmyadmin/js/tbl_zoom_plot.js
 share/phpmyadmin/js/update-location.js
+share/phpmyadmin/libraries/Advisor.class.php
 share/phpmyadmin/libraries/Config.class.php
 share/phpmyadmin/libraries/Error.class.php
 share/phpmyadmin/libraries/Error_Handler.class.php
@@ -67,13 +172,16 @@ share/phpmyadmin/libraries/Index.class.php
 share/phpmyadmin/libraries/List.class.php
 share/phpmyadmin/libraries/List_Database.class.php
 share/phpmyadmin/libraries/Message.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/StorageEngine.class.php
 share/phpmyadmin/libraries/Table.class.php
 share/phpmyadmin/libraries/Theme.class.php
 share/phpmyadmin/libraries/Theme_Manager.class.php
 share/phpmyadmin/libraries/Tracker.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
@@ -82,30 +190,12 @@ 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/chart.lib.php
-share/phpmyadmin/libraries/chart/pChart/fonts/DejaVuSans.ttf
-share/phpmyadmin/libraries/chart/pChart/fonts/LICENSE
-share/phpmyadmin/libraries/chart/pChart/fonts/README
-share/phpmyadmin/libraries/chart/pChart/pCache.class
-share/phpmyadmin/libraries/chart/pChart/pChart.class
-share/phpmyadmin/libraries/chart/pChart/pData.class
-share/phpmyadmin/libraries/chart/pma_chart.php
-share/phpmyadmin/libraries/chart/pma_pchart_chart.php
-share/phpmyadmin/libraries/chart/pma_pchart_multi.php
-share/phpmyadmin/libraries/chart/pma_pchart_multi_bar.php
-share/phpmyadmin/libraries/chart/pma_pchart_multi_line.php
-share/phpmyadmin/libraries/chart/pma_pchart_multi_radar.php
-share/phpmyadmin/libraries/chart/pma_pchart_pie.php
-share/phpmyadmin/libraries/chart/pma_pchart_single.php
-share/phpmyadmin/libraries/chart/pma_pchart_single_bar.php
-share/phpmyadmin/libraries/chart/pma_pchart_single_line.php
-share/phpmyadmin/libraries/chart/pma_pchart_single_radar.php
-share/phpmyadmin/libraries/chart/pma_pchart_stacked_bar.php
 share/phpmyadmin/libraries/check_user_privileges.lib.php
 share/phpmyadmin/libraries/cleanup.lib.php
 share/phpmyadmin/libraries/common.inc.php
@@ -122,14 +212,17 @@ share/phpmyadmin/libraries/config/setup.forms.php
 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_events.inc.php
 share/phpmyadmin/libraries/db_info.inc.php
 share/phpmyadmin/libraries/db_links.inc.php
-share/phpmyadmin/libraries/db_routines.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/mysql.dbi.lib.php
 share/phpmyadmin/libraries/dbi/mysqli.dbi.lib.php
 share/phpmyadmin/libraries/display_change_password.lib.php
@@ -170,6 +263,7 @@ 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/gis_visualization.lib.php
 share/phpmyadmin/libraries/grab_globals.lib.php
 share/phpmyadmin/libraries/header.inc.php
 share/phpmyadmin/libraries/header_http.inc.php
@@ -183,6 +277,7 @@ 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
@@ -205,10 +300,19 @@ share/phpmyadmin/libraries/php-gettext/gettext.inc
 share/phpmyadmin/libraries/php-gettext/gettext.php
 share/phpmyadmin/libraries/php-gettext/streams.php
 share/phpmyadmin/libraries/plugin_interface.lib.php
+share/phpmyadmin/libraries/pmd_common.php
 share/phpmyadmin/libraries/relation.lib.php
 share/phpmyadmin/libraries/relation_cleanup.lib.php
 share/phpmyadmin/libraries/replication.inc.php
 share/phpmyadmin/libraries/replication_gui.lib.php
+share/phpmyadmin/libraries/rte/rte_events.lib.php
+share/phpmyadmin/libraries/rte/rte_export.lib.php
+share/phpmyadmin/libraries/rte/rte_footer.lib.php
+share/phpmyadmin/libraries/rte/rte_list.lib.php
+share/phpmyadmin/libraries/rte/rte_main.inc.php
+share/phpmyadmin/libraries/rte/rte_routines.lib.php
+share/phpmyadmin/libraries/rte/rte_triggers.lib.php
+share/phpmyadmin/libraries/rte/rte_words.lib.php
 share/phpmyadmin/libraries/sanitizing.lib.php
 share/phpmyadmin/libraries/schema/Dia_Relation_Schema.class.php
 share/phpmyadmin/libraries/schema/Eps_Relation_Schema.class.php
@@ -234,28 +338,24 @@ 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/sysinfo.lib.php
 share/phpmyadmin/libraries/tbl_common.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_triggers.lib.php
+share/phpmyadmin/libraries/tbl_select.lib.php
 share/phpmyadmin/libraries/tcpdf/LICENSE.TXT
 share/phpmyadmin/libraries/tcpdf/README.TXT
 share/phpmyadmin/libraries/tcpdf/config/tcpdf_config.php
 share/phpmyadmin/libraries/tcpdf/encodings_maps.php
+share/phpmyadmin/libraries/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
 share/phpmyadmin/libraries/tcpdf/fonts/dejavusans.ctg.z
 share/phpmyadmin/libraries/tcpdf/fonts/dejavusans.php
 share/phpmyadmin/libraries/tcpdf/fonts/dejavusans.z
 share/phpmyadmin/libraries/tcpdf/fonts/dejavusansb.ctg.z
 share/phpmyadmin/libraries/tcpdf/fonts/dejavusansb.php
 share/phpmyadmin/libraries/tcpdf/fonts/dejavusansb.z
-share/phpmyadmin/libraries/tcpdf/fonts/dejavuserif.ctg.z
-share/phpmyadmin/libraries/tcpdf/fonts/dejavuserif.php
-share/phpmyadmin/libraries/tcpdf/fonts/dejavuserif.z
-share/phpmyadmin/libraries/tcpdf/fonts/dejavuserifb.ctg.z
-share/phpmyadmin/libraries/tcpdf/fonts/dejavuserifb.php
-share/phpmyadmin/libraries/tcpdf/fonts/dejavuserifb.z
 share/phpmyadmin/libraries/tcpdf/fonts/helvetica.php
 share/phpmyadmin/libraries/tcpdf/htmlcolors.php
 share/phpmyadmin/libraries/tcpdf/tcpdf.php
@@ -286,8 +386,6 @@ share/phpmyadmin/libraries/zip.lib.php
 share/phpmyadmin/libraries/zip_extension.lib.php
 share/phpmyadmin/license.php
 share/phpmyadmin/locale/ar/LC_MESSAGES/phpmyadmin.mo
-share/phpmyadmin/locale/be/LC_MESSAGES/phpmyadmin.mo
-share/phpmyadmin/locale/be@latin/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/bg/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/ca/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/cs/LC_MESSAGES/phpmyadmin.mo
@@ -316,10 +414,9 @@ share/phpmyadmin/locale/ru/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/si/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/sk/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/sl/LC_MESSAGES/phpmyadmin.mo
-share/phpmyadmin/locale/sr/LC_MESSAGES/phpmyadmin.mo
-share/phpmyadmin/locale/sr@latin/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/sv/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/tr/LC_MESSAGES/phpmyadmin.mo
+share/phpmyadmin/locale/uk/LC_MESSAGES/phpmyadmin.mo
 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
@@ -328,66 +425,8 @@ share/phpmyadmin/main.php
 share/phpmyadmin/navigation.php
 share/phpmyadmin/phpinfo.php
 share/phpmyadmin/phpmyadmin.css.php
-share/phpmyadmin/pmd/images/2leftarrow.png
-share/phpmyadmin/pmd/images/2leftarrow_m.png
-share/phpmyadmin/pmd/images/2rightarrow.png
-share/phpmyadmin/pmd/images/2rightarrow_m.png
-share/phpmyadmin/pmd/images/and_icon.png
-share/phpmyadmin/pmd/images/ang_direct.png
-share/phpmyadmin/pmd/images/bord.png
-share/phpmyadmin/pmd/images/bottom.png
-share/phpmyadmin/pmd/images/def.png
-share/phpmyadmin/pmd/images/display_field.png
-share/phpmyadmin/pmd/images/downarrow1.png
-share/phpmyadmin/pmd/images/downarrow2.png
-share/phpmyadmin/pmd/images/downarrow2_m.png
-share/phpmyadmin/pmd/images/exec.png
-share/phpmyadmin/pmd/images/exec_small.png
-share/phpmyadmin/pmd/images/favicon.ico
-share/phpmyadmin/pmd/images/grid.png
-share/phpmyadmin/pmd/images/help.png
-share/phpmyadmin/pmd/images/help_relation.png
-share/phpmyadmin/pmd/images/or_icon.png
-share/phpmyadmin/pmd/images/pdf.png
-share/phpmyadmin/pmd/images/query_builder.png
-share/phpmyadmin/pmd/images/relation.png
-share/phpmyadmin/pmd/images/reload.png
-share/phpmyadmin/pmd/images/resize.png
-share/phpmyadmin/pmd/images/rightarrow1.png
-share/phpmyadmin/pmd/images/rightarrow2.png
-share/phpmyadmin/pmd/images/save.png
-share/phpmyadmin/pmd/images/table.png
-share/phpmyadmin/pmd/images/uparrow2_m.png
-share/phpmyadmin/pmd/scripts/ajax.js
-share/phpmyadmin/pmd/scripts/history.js
-share/phpmyadmin/pmd/scripts/iecanvas.js
-share/phpmyadmin/pmd/scripts/move.js
-share/phpmyadmin/pmd/styles/default/images/1.png
-share/phpmyadmin/pmd/styles/default/images/2.png
-share/phpmyadmin/pmd/styles/default/images/3.png
-share/phpmyadmin/pmd/styles/default/images/4.png
-share/phpmyadmin/pmd/styles/default/images/5.png
-share/phpmyadmin/pmd/styles/default/images/6.png
-share/phpmyadmin/pmd/styles/default/images/7.png
-share/phpmyadmin/pmd/styles/default/images/8.png
-share/phpmyadmin/pmd/styles/default/images/FieldKey_small.png
-share/phpmyadmin/pmd/styles/default/images/Field_small.png
-share/phpmyadmin/pmd/styles/default/images/Field_small_char.png
-share/phpmyadmin/pmd/styles/default/images/Field_small_date.png
-share/phpmyadmin/pmd/styles/default/images/Field_small_int.png
-share/phpmyadmin/pmd/styles/default/images/Header.png
-share/phpmyadmin/pmd/styles/default/images/Header_Linked.png
-share/phpmyadmin/pmd/styles/default/images/left_panel_butt.png
-share/phpmyadmin/pmd/styles/default/images/left_panel_tab.png
-share/phpmyadmin/pmd/styles/default/images/minus.png
-share/phpmyadmin/pmd/styles/default/images/plus.png
-share/phpmyadmin/pmd/styles/default/images/small_tab.png
-share/phpmyadmin/pmd/styles/default/images/top_panel.png
-share/phpmyadmin/pmd/styles/default/style1.css
-share/phpmyadmin/pmd_common.php
 share/phpmyadmin/pmd_display_field.php
 share/phpmyadmin/pmd_general.php
-share/phpmyadmin/pmd_help.php
 share/phpmyadmin/pmd_pdf.php
 share/phpmyadmin/pmd_relation_new.php
 share/phpmyadmin/pmd_relation_upd.php
@@ -399,22 +438,28 @@ share/phpmyadmin/querywindow.php
 share/phpmyadmin/robots.txt
 share/phpmyadmin/schema_edit.php
 share/phpmyadmin/schema_export.php
-share/phpmyadmin/scripts/convertcfg.pl
-share/phpmyadmin/scripts/create_tables.sql
-share/phpmyadmin/scripts/upgrade_tables_mysql_4_1_2+.sql
 share/phpmyadmin/server_binlog.php
 share/phpmyadmin/server_collations.php
 share/phpmyadmin/server_databases.php
 share/phpmyadmin/server_engines.php
 share/phpmyadmin/server_export.php
 share/phpmyadmin/server_import.php
+share/phpmyadmin/server_plugins.php
 share/phpmyadmin/server_privileges.php
-share/phpmyadmin/server_processlist.php
 share/phpmyadmin/server_replication.php
 share/phpmyadmin/server_sql.php
 share/phpmyadmin/server_status.php
 share/phpmyadmin/server_synchronize.php
 share/phpmyadmin/server_variables.php
+share/phpmyadmin/setup/frames/config.inc.php
+share/phpmyadmin/setup/frames/form.inc.php
+share/phpmyadmin/setup/frames/index.inc.php
+share/phpmyadmin/setup/frames/menu.inc.php
+share/phpmyadmin/setup/frames/servers.inc.php
+share/phpmyadmin/setup/lib/ConfigGenerator.class.php
+share/phpmyadmin/setup/lib/common.inc.php
+share/phpmyadmin/setup/lib/form_processing.lib.php
+share/phpmyadmin/setup/lib/index.lib.php
 share/phpmyadmin/show_config_errors.php
 share/phpmyadmin/sql.php
 share/phpmyadmin/tbl_addfield.php
@@ -424,6 +469,7 @@ share/phpmyadmin/tbl_chart.php
 share/phpmyadmin/tbl_create.php
 share/phpmyadmin/tbl_export.php
 share/phpmyadmin/tbl_get_field.php
+share/phpmyadmin/tbl_gis_visualization.php
 share/phpmyadmin/tbl_import.php
 share/phpmyadmin/tbl_indexes.php
 share/phpmyadmin/tbl_move_copy.php
@@ -436,7 +482,10 @@ share/phpmyadmin/tbl_select.php
 share/phpmyadmin/tbl_sql.php
 share/phpmyadmin/tbl_structure.php
 share/phpmyadmin/tbl_tracking.php
+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
@@ -456,8 +505,11 @@ share/phpmyadmin/themes/original/img/b_drop.png
 share/phpmyadmin/themes/original/img/b_edit.png
 share/phpmyadmin/themes/original/img/b_empty.png
 share/phpmyadmin/themes/original/img/b_engine.png
+share/phpmyadmin/themes/original/img/b_event_add.png
+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_help.png
 share/phpmyadmin/themes/original/img/b_home.png
 share/phpmyadmin/themes/original/img/b_import.png
@@ -469,17 +521,21 @@ share/phpmyadmin/themes/original/img/b_minus.png
 share/phpmyadmin/themes/original/img/b_more.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
 share/phpmyadmin/themes/original/img/b_plus.png
 share/phpmyadmin/themes/original/img/b_primary.png
 share/phpmyadmin/themes/original/img/b_print.png
 share/phpmyadmin/themes/original/img/b_props.png
 share/phpmyadmin/themes/original/img/b_relations.png
+share/phpmyadmin/themes/original/img/b_routine_add.png
+share/phpmyadmin/themes/original/img/b_routines.png
 share/phpmyadmin/themes/original/img/b_save.png
 share/phpmyadmin/themes/original/img/b_sbrowse.png
 share/phpmyadmin/themes/original/img/b_search.png
 share/phpmyadmin/themes/original/img/b_selboard.png
 share/phpmyadmin/themes/original/img/b_select.png
 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_tblanalyse.png
@@ -488,6 +544,8 @@ share/phpmyadmin/themes/original/img/b_tblimport.png
 share/phpmyadmin/themes/original/img/b_tblops.png
 share/phpmyadmin/themes/original/img/b_tbloptimize.png
 share/phpmyadmin/themes/original/img/b_tipp.png
+share/phpmyadmin/themes/original/img/b_trigger_add.png
+share/phpmyadmin/themes/original/img/b_triggers.png
 share/phpmyadmin/themes/original/img/b_unique.png
 share/phpmyadmin/themes/original/img/b_usradd.png
 share/phpmyadmin/themes/original/img/b_usrcheck.png
@@ -499,15 +557,24 @@ share/phpmyadmin/themes/original/img/b_views.png
 share/phpmyadmin/themes/original/img/bd_browse.png
 share/phpmyadmin/themes/original/img/bd_deltbl.png
 share/phpmyadmin/themes/original/img/bd_drop.png
+share/phpmyadmin/themes/original/img/bd_edit.png
 share/phpmyadmin/themes/original/img/bd_empty.png
+share/phpmyadmin/themes/original/img/bd_export.png
 share/phpmyadmin/themes/original/img/bd_ftext.png
 share/phpmyadmin/themes/original/img/bd_index.png
 share/phpmyadmin/themes/original/img/bd_insrow.png
+share/phpmyadmin/themes/original/img/bd_nextpage.png
 share/phpmyadmin/themes/original/img/bd_primary.png
 share/phpmyadmin/themes/original/img/bd_sbrowse.png
 share/phpmyadmin/themes/original/img/bd_select.png
+share/phpmyadmin/themes/original/img/bd_spatial.png
 share/phpmyadmin/themes/original/img/bd_unique.png
+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
@@ -516,26 +583,85 @@ 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
-share/phpmyadmin/themes/original/img/new_data.jpg
-share/phpmyadmin/themes/original/img/new_data_hovered.jpg
-share/phpmyadmin/themes/original/img/new_data_selected.jpg
-share/phpmyadmin/themes/original/img/new_data_selected_hovered.jpg
-share/phpmyadmin/themes/original/img/new_struct.jpg
-share/phpmyadmin/themes/original/img/new_struct_hovered.jpg
-share/phpmyadmin/themes/original/img/new_struct_selected.jpg
-share/phpmyadmin/themes/original/img/new_struct_selected_hovered.jpg
+share/phpmyadmin/themes/original/img/new_data.png
+share/phpmyadmin/themes/original/img/new_data_hovered.png
+share/phpmyadmin/themes/original/img/new_data_selected.png
+share/phpmyadmin/themes/original/img/new_data_selected_hovered.png
+share/phpmyadmin/themes/original/img/new_struct.png
+share/phpmyadmin/themes/original/img/new_struct_hovered.png
+share/phpmyadmin/themes/original/img/new_struct_selected.png
+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
 share/phpmyadmin/themes/original/img/s_desc.png
 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
@@ -543,6 +669,7 @@ share/phpmyadmin/themes/original/img/s_really.png
 share/phpmyadmin/themes/original/img/s_reload.png
 share/phpmyadmin/themes/original/img/s_replication.png
 share/phpmyadmin/themes/original/img/s_rights.png
+share/phpmyadmin/themes/original/img/s_sortable.png
 share/phpmyadmin/themes/original/img/s_status.png
 share/phpmyadmin/themes/original/img/s_success.png
 share/phpmyadmin/themes/original/img/s_sync.png
@@ -550,9 +677,17 @@ share/phpmyadmin/themes/original/img/s_tbl.png
 share/phpmyadmin/themes/original/img/s_theme.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
 share/phpmyadmin/themes/original/img/spacer.png
+share/phpmyadmin/themes/original/img/sprites.png
+share/phpmyadmin/themes/original/img/toggle-ltr.png
+share/phpmyadmin/themes/original/img/toggle-rtl.png
 share/phpmyadmin/themes/original/img/vertical_line.png
+share/phpmyadmin/themes/original/img/west-mini.png
 share/phpmyadmin/themes/original/img/window-new.png
+share/phpmyadmin/themes/original/img/zoom-minus-mini.png
+share/phpmyadmin/themes/original/img/zoom-plus-mini.png
+share/phpmyadmin/themes/original/img/zoom-world-mini.png
 share/phpmyadmin/themes/original/info.inc.php
 share/phpmyadmin/themes/original/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
 share/phpmyadmin/themes/original/jquery/images/ui-bg_flat_75_ffffff_40x100.png
@@ -567,9 +702,10 @@ 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.custom.css
+share/phpmyadmin/themes/original/jquery/jquery-ui-1.8.16.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
@@ -591,9 +727,12 @@ share/phpmyadmin/themes/pmahomme/img/b_drop.png
 share/phpmyadmin/themes/pmahomme/img/b_edit.png
 share/phpmyadmin/themes/pmahomme/img/b_empty.png
 share/phpmyadmin/themes/pmahomme/img/b_engine.png
+share/phpmyadmin/themes/pmahomme/img/b_event_add.png
+share/phpmyadmin/themes/pmahomme/img/b_events.png
 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_help.png
 share/phpmyadmin/themes/pmahomme/img/b_home.png
 share/phpmyadmin/themes/pmahomme/img/b_import.png
@@ -614,6 +753,8 @@ share/phpmyadmin/themes/pmahomme/img/b_primary.png
 share/phpmyadmin/themes/pmahomme/img/b_print.png
 share/phpmyadmin/themes/pmahomme/img/b_props.png
 share/phpmyadmin/themes/pmahomme/img/b_relations.png
+share/phpmyadmin/themes/pmahomme/img/b_routine_add.png
+share/phpmyadmin/themes/pmahomme/img/b_routines.png
 share/phpmyadmin/themes/pmahomme/img/b_save.png
 share/phpmyadmin/themes/pmahomme/img/b_sbrowse.png
 share/phpmyadmin/themes/pmahomme/img/b_sdb.png
@@ -621,6 +762,7 @@ share/phpmyadmin/themes/pmahomme/img/b_search.png
 share/phpmyadmin/themes/pmahomme/img/b_selboard.png
 share/phpmyadmin/themes/pmahomme/img/b_select.png
 share/phpmyadmin/themes/pmahomme/img/b_snewtbl.png
+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
@@ -630,6 +772,8 @@ share/phpmyadmin/themes/pmahomme/img/b_tblimport.png
 share/phpmyadmin/themes/pmahomme/img/b_tblops.png
 share/phpmyadmin/themes/pmahomme/img/b_tbloptimize.png
 share/phpmyadmin/themes/pmahomme/img/b_tipp.png
+share/phpmyadmin/themes/pmahomme/img/b_trigger_add.png
+share/phpmyadmin/themes/pmahomme/img/b_triggers.png
 share/phpmyadmin/themes/pmahomme/img/b_unique.png
 share/phpmyadmin/themes/pmahomme/img/b_usradd.png
 share/phpmyadmin/themes/pmahomme/img/b_usrcheck.png
@@ -641,7 +785,9 @@ share/phpmyadmin/themes/pmahomme/img/b_views.png
 share/phpmyadmin/themes/pmahomme/img/bd_browse.png
 share/phpmyadmin/themes/pmahomme/img/bd_deltbl.png
 share/phpmyadmin/themes/pmahomme/img/bd_drop.png
+share/phpmyadmin/themes/pmahomme/img/bd_edit.png
 share/phpmyadmin/themes/pmahomme/img/bd_empty.png
+share/phpmyadmin/themes/pmahomme/img/bd_export.png
 share/phpmyadmin/themes/pmahomme/img/bd_firstpage.png
 share/phpmyadmin/themes/pmahomme/img/bd_ftext.png
 share/phpmyadmin/themes/pmahomme/img/bd_index.png
@@ -652,11 +798,16 @@ share/phpmyadmin/themes/pmahomme/img/bd_prevpage.png
 share/phpmyadmin/themes/pmahomme/img/bd_primary.png
 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
@@ -669,21 +820,77 @@ 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.jpg
-share/phpmyadmin/themes/pmahomme/img/new_data_hovered.jpg
-share/phpmyadmin/themes/pmahomme/img/new_data_selected.jpg
-share/phpmyadmin/themes/pmahomme/img/new_data_selected_hovered.jpg
-share/phpmyadmin/themes/pmahomme/img/new_struct.jpg
-share/phpmyadmin/themes/pmahomme/img/new_struct_hovered.jpg
-share/phpmyadmin/themes/pmahomme/img/new_struct_selected.jpg
-share/phpmyadmin/themes/pmahomme/img/new_struct_selected_hovered.jpg
+share/phpmyadmin/themes/pmahomme/img/new_data.png
+share/phpmyadmin/themes/pmahomme/img/new_data_hovered.png
+share/phpmyadmin/themes/pmahomme/img/new_data_selected.png
+share/phpmyadmin/themes/pmahomme/img/new_data_selected_hovered.png
+share/phpmyadmin/themes/pmahomme/img/new_struct.png
+share/phpmyadmin/themes/pmahomme/img/new_struct_hovered.png
+share/phpmyadmin/themes/pmahomme/img/new_struct_selected.png
+share/phpmyadmin/themes/pmahomme/img/new_struct_selected_hovered.png
+share/phpmyadmin/themes/pmahomme/img/north-mini.png
+share/phpmyadmin/themes/pmahomme/img/pause.png
 share/phpmyadmin/themes/pmahomme/img/php_sym.png
+share/phpmyadmin/themes/pmahomme/img/play.png
 share/phpmyadmin/themes/pmahomme/img/pma_logo2.png
+share/phpmyadmin/themes/pmahomme/img/pmd/1.png
+share/phpmyadmin/themes/pmahomme/img/pmd/2.png
+share/phpmyadmin/themes/pmahomme/img/pmd/2leftarrow.png
+share/phpmyadmin/themes/pmahomme/img/pmd/2leftarrow_m.png
+share/phpmyadmin/themes/pmahomme/img/pmd/2rightarrow.png
+share/phpmyadmin/themes/pmahomme/img/pmd/2rightarrow_m.png
+share/phpmyadmin/themes/pmahomme/img/pmd/3.png
+share/phpmyadmin/themes/pmahomme/img/pmd/4.png
+share/phpmyadmin/themes/pmahomme/img/pmd/5.png
+share/phpmyadmin/themes/pmahomme/img/pmd/6.png
+share/phpmyadmin/themes/pmahomme/img/pmd/7.png
+share/phpmyadmin/themes/pmahomme/img/pmd/8.png
+share/phpmyadmin/themes/pmahomme/img/pmd/FieldKey_small.png
+share/phpmyadmin/themes/pmahomme/img/pmd/Field_small.png
+share/phpmyadmin/themes/pmahomme/img/pmd/Field_small_char.png
+share/phpmyadmin/themes/pmahomme/img/pmd/Field_small_date.png
+share/phpmyadmin/themes/pmahomme/img/pmd/Field_small_int.png
+share/phpmyadmin/themes/pmahomme/img/pmd/Header.png
+share/phpmyadmin/themes/pmahomme/img/pmd/Header_Linked.png
+share/phpmyadmin/themes/pmahomme/img/pmd/and_icon.png
+share/phpmyadmin/themes/pmahomme/img/pmd/ang_direct.png
+share/phpmyadmin/themes/pmahomme/img/pmd/bord.png
+share/phpmyadmin/themes/pmahomme/img/pmd/bottom.png
+share/phpmyadmin/themes/pmahomme/img/pmd/def.png
+share/phpmyadmin/themes/pmahomme/img/pmd/display_field.png
+share/phpmyadmin/themes/pmahomme/img/pmd/downarrow1.png
+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/favicon.ico
+share/phpmyadmin/themes/pmahomme/img/pmd/grid.png
+share/phpmyadmin/themes/pmahomme/img/pmd/help.png
+share/phpmyadmin/themes/pmahomme/img/pmd/help_relation.png
+share/phpmyadmin/themes/pmahomme/img/pmd/left_panel_butt.png
+share/phpmyadmin/themes/pmahomme/img/pmd/left_panel_tab.png
+share/phpmyadmin/themes/pmahomme/img/pmd/minus.png
+share/phpmyadmin/themes/pmahomme/img/pmd/or_icon.png
+share/phpmyadmin/themes/pmahomme/img/pmd/pdf.png
+share/phpmyadmin/themes/pmahomme/img/pmd/plus.png
+share/phpmyadmin/themes/pmahomme/img/pmd/query_builder.png
+share/phpmyadmin/themes/pmahomme/img/pmd/relation.png
+share/phpmyadmin/themes/pmahomme/img/pmd/reload.png
+share/phpmyadmin/themes/pmahomme/img/pmd/resize.png
+share/phpmyadmin/themes/pmahomme/img/pmd/rightarrow1.png
+share/phpmyadmin/themes/pmahomme/img/pmd/rightarrow2.png
+share/phpmyadmin/themes/pmahomme/img/pmd/save.png
+share/phpmyadmin/themes/pmahomme/img/pmd/small_tab.png
+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/s_asc.png
 share/phpmyadmin/themes/pmahomme/img/s_asci.png
 share/phpmyadmin/themes/pmahomme/img/s_attention.png
 share/phpmyadmin/themes/pmahomme/img/s_cancel.png
 share/phpmyadmin/themes/pmahomme/img/s_cancel2.png
+share/phpmyadmin/themes/pmahomme/img/s_cog.png
 share/phpmyadmin/themes/pmahomme/img/s_db.png
 share/phpmyadmin/themes/pmahomme/img/s_desc.png
 share/phpmyadmin/themes/pmahomme/img/s_error.png
@@ -702,6 +909,7 @@ share/phpmyadmin/themes/pmahomme/img/s_really.png
 share/phpmyadmin/themes/pmahomme/img/s_reload.png
 share/phpmyadmin/themes/pmahomme/img/s_replication.png
 share/phpmyadmin/themes/pmahomme/img/s_rights.png
+share/phpmyadmin/themes/pmahomme/img/s_sortable.png
 share/phpmyadmin/themes/pmahomme/img/s_status.png
 share/phpmyadmin/themes/pmahomme/img/s_success.png
 share/phpmyadmin/themes/pmahomme/img/s_sync.png
@@ -709,12 +917,20 @@ share/phpmyadmin/themes/pmahomme/img/s_tbl.png
 share/phpmyadmin/themes/pmahomme/img/s_theme.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
+share/phpmyadmin/themes/pmahomme/img/west-mini.png
 share/phpmyadmin/themes/pmahomme/img/window-new.png
+share/phpmyadmin/themes/pmahomme/img/zoom-minus-mini.png
+share/phpmyadmin/themes/pmahomme/img/zoom-plus-mini.png
+share/phpmyadmin/themes/pmahomme/img/zoom-world-mini.png
 share/phpmyadmin/themes/pmahomme/info.inc.php
 share/phpmyadmin/themes/pmahomme/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
 share/phpmyadmin/themes/pmahomme/jquery/images/ui-bg_flat_75_ffffff_40x100.png
@@ -729,9 +945,11 @@ 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.custom.css
+share/phpmyadmin/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css
 share/phpmyadmin/themes/pmahomme/layout.inc.php
 share/phpmyadmin/themes/pmahomme/screen.png
+share/phpmyadmin/themes/pmahomme/sprites.lib.php
+share/phpmyadmin/themes/sprites.css.php
 share/phpmyadmin/themes/svg_gradient.php
 share/phpmyadmin/transformation_overview.php
 share/phpmyadmin/transformation_wrapper.php
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index a185c222189..b98b8708e4e 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.60 2012/04/15 11:56:27 tron Exp $
+$NetBSD: distinfo,v 1.61 2012/05/06 09:01:10 tron Exp $
 
-SHA1 (phpMyAdmin-3.4.11-all-languages.tar.bz2) = 2a693f2795e2a403ed67d42bc114970afaf06eb8
-RMD160 (phpMyAdmin-3.4.11-all-languages.tar.bz2) = e74590b3266f27fdab792132a6ef281ca97698fc
-Size (phpMyAdmin-3.4.11-all-languages.tar.bz2) = 4787560 bytes
+SHA1 (phpMyAdmin-3.5.1-all-languages.tar.xz) = f61c477e0ed394a10c10c3c1f8e73d1449432b1b
+RMD160 (phpMyAdmin-3.5.1-all-languages.tar.xz) = a2ebd6ca3e70a5c0f8b4cefa03e508ee0c4fd910
+Size (phpMyAdmin-3.5.1-all-languages.tar.xz) = 3590204 bytes
+SHA1 (patch-libraries_header_http.inc.php) = 523b2d961d1591291c85b9e381a20f59ce332aa1
diff --git a/databases/phpmyadmin/patches/patch-libraries_header_http.inc.php b/databases/phpmyadmin/patches/patch-libraries_header_http.inc.php
new file mode 100644
index 00000000000..84d043a43f7
--- /dev/null
+++ b/databases/phpmyadmin/patches/patch-libraries_header_http.inc.php
@@ -0,0 +1,17 @@
+$NetBSD: patch-libraries_header_http.inc.php,v 1.1 2012/05/06 09:01:10 tron Exp $
+
+Restore compatibility with Safari:
+
+http://sourceforge.net/tracker/?func=detail&aid=3523499&group_id=23067&atid=377408
+
+--- libraries/header_http.inc.php.orig	2012-05-03 17:37:53.000000000 +0100
++++ libraries/header_http.inc.php	2012-05-06 09:54:24.000000000 +0100
+@@ -23,7 +23,7 @@
+ if (!$GLOBALS['cfg']['AllowThirdPartyFraming']) {
+     header('X-Frame-Options: SAMEORIGIN');
+     header('X-Content-Security-Policy: allow \'self\'; options inline-script eval-script; frame-ancestors \'self\'; img-src \'self\' data:; script-src \'self\' http://www.phpmyadmin.net');
+-    header('X-WebKit-CSP: default-src \'self\' \'unsafe-inline\'; img-src \'self\' data:; script-src \'self\' \'unsafe-inline\' \'unsafe-eval\' http://www.phpmyadmin.net');
++/*    header('X-WebKit-CSP: default-src \'self\' \'unsafe-inline\'; img-src \'self\' data:; script-src \'self\' \'unsafe-inline\' \'unsafe-eval\' http://www.phpmyadmin.net');*/
+ }
+ PMA_no_cache_header();
+ if (!defined('IS_TRANSFORMATION_WRAPPER')) {