Update "phpmyadmin" package to version 4.3.1.

The major changes in version 4.3.* are:
- Smart sorting for int keys
- Confirmation message when dropping user(s)
- Confirm dialog on accidentally leaving a page
- Allow clicking an approximate row count to get a correct one
- Support for editing binary fields in hexadecimal
- MariaDB 10+ multi-master replication support
- Allow saving query charts as images
- Use aliases in SQL export for tables and columns
- Export with table/column name changes
- Dynamic process list
- Drag and Drop SQL import
- Preview SQL instead of executing it
- Run SQL query: Allow rollback for InnoDB tables
- Zeroconf PMA tables support
- Regexp replace
- Avoid session timeout when user is active
- MySQL 5.7.5 compatibility
- Avoid session timeout when user is active
- Multiple-column foreign key relation
- Charts for data in <x-axis, series,="" value=""> format
- Range Search Capability
- Improvements for the table editor (index creation)
- PHP OpenSSL support for cookie encryption/decryption

3 files changed, 131 insertions, 50 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 147dd1d8cfd..f0689fa8925 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.140 2014/12/07 14:27:29 tron Exp $
+# $NetBSD: Makefile,v 1.141 2014/12/10 20:34:34 tron Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}-all-languages
 PKGNAME=	phpmyadmin-${DIST_VERSION:S/-//}
@@ -28,7 +28,7 @@ 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=	4.2.13.1
+DIST_VERSION=	4.3.1
 DOC_FILES=	ChangeLog LICENSE README RELEASE-DATE-${DIST_VERSION}
 
 APACHE_USER?=	www
@@ -60,18 +60,19 @@ INSTALL_DIRS=	doc/html
 INSTALL_DIRS+=	doc/html/_static
 INSTALL_DIRS+=	js
 INSTALL_DIRS+=	js/canvg
-INSTALL_DIRS+=	js/jqplot
-INSTALL_DIRS+=	js/jqplot/plugins
 INSTALL_DIRS+=	js/codemirror
 INSTALL_DIRS+=	js/codemirror/addon
+INSTALL_DIRS+=	js/codemirror/addon/hint
 INSTALL_DIRS+=	js/codemirror/addon/runmode
 INSTALL_DIRS+=	js/codemirror/lib
 INSTALL_DIRS+=	js/codemirror/mode
 INSTALL_DIRS+=	js/codemirror/mode/sql
+INSTALL_DIRS+=	js/jqplot
+INSTALL_DIRS+=	js/jqplot/plugins
 INSTALL_DIRS+=	js/jquery
 INSTALL_DIRS+=	js/jquery/src
-INSTALL_DIRS+=	js/jquery/src/jquery-ui
 INSTALL_DIRS+=	js/jquery/src/jquery
+INSTALL_DIRS+=	js/jquery/src/jquery-ui
 INSTALL_DIRS+=	js/jquery/src/jquery/ajax
 INSTALL_DIRS+=	js/openlayers
 INSTALL_DIRS+=	js/openlayers/img
@@ -127,6 +128,7 @@ INSTALL_DIRS+=	js/openlayers/theme/default
 INSTALL_DIRS+=	js/openlayers/theme/default/img
 INSTALL_DIRS+=	js/pmd
 INSTALL_DIRS+=	js/tracekit
+INSTALL_DIRS+=	js/transformations
 INSTALL_DIRS+=	libraries
 INSTALL_DIRS+=	libraries/PHPExcel
 INSTALL_DIRS+=	libraries/PHPExcel/PHPExcel
@@ -178,8 +180,15 @@ 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/schema
+INSTALL_DIRS+=	libraries/plugins/schema/dia
+INSTALL_DIRS+=	libraries/plugins/schema/eps
+INSTALL_DIRS+=	libraries/plugins/schema/pdf
+INSTALL_DIRS+=	libraries/plugins/schema/svg
 INSTALL_DIRS+=	libraries/plugins/transformations
 INSTALL_DIRS+=	libraries/plugins/transformations/abstract
+INSTALL_DIRS+=	libraries/plugins/transformations/input
+INSTALL_DIRS+=	libraries/plugins/transformations/output
 INSTALL_DIRS+=	libraries/properties
 INSTALL_DIRS+=	libraries/properties/options
 INSTALL_DIRS+=	libraries/properties/options/groups
@@ -199,6 +208,8 @@ INSTALL_DIRS+=	libraries/transformations
 INSTALL_DIRS+=	locale
 INSTALL_DIRS+=	locale/ar
 INSTALL_DIRS+=	locale/ar/LC_MESSAGES
+INSTALL_DIRS+=	locale/az
+INSTALL_DIRS+=	locale/az/LC_MESSAGES
 INSTALL_DIRS+=	locale/be
 INSTALL_DIRS+=	locale/be/LC_MESSAGES
 INSTALL_DIRS+=	locale/be@latin
@@ -235,6 +246,8 @@ INSTALL_DIRS+=	locale/hr
 INSTALL_DIRS+=	locale/hr/LC_MESSAGES
 INSTALL_DIRS+=	locale/hu
 INSTALL_DIRS+=	locale/hu/LC_MESSAGES
+INSTALL_DIRS+=	locale/ia
+INSTALL_DIRS+=	locale/ia/LC_MESSAGES
 INSTALL_DIRS+=	locale/id
 INSTALL_DIRS+=	locale/id/LC_MESSAGES
 INSTALL_DIRS+=	locale/it
@@ -243,6 +256,8 @@ INSTALL_DIRS+=	locale/ja
 INSTALL_DIRS+=	locale/ja/LC_MESSAGES
 INSTALL_DIRS+=	locale/ka
 INSTALL_DIRS+=	locale/ka/LC_MESSAGES
+INSTALL_DIRS+=	locale/ko
+INSTALL_DIRS+=	locale/ko/LC_MESSAGES
 INSTALL_DIRS+=	locale/lt
 INSTALL_DIRS+=	locale/lt/LC_MESSAGES
 INSTALL_DIRS+=	locale/mn
@@ -253,6 +268,7 @@ INSTALL_DIRS+=	locale/nl
 INSTALL_DIRS+=	locale/nl/LC_MESSAGES
 INSTALL_DIRS+=	locale/pl
 INSTALL_DIRS+=	locale/pl/LC_MESSAGES
+INSTALL_DIRS+=	locale/pt/LC_MESSAGES
 INSTALL_DIRS+=	locale/pt_BR
 INSTALL_DIRS+=	locale/pt_BR/LC_MESSAGES
 INSTALL_DIRS+=	locale/ro
@@ -321,6 +337,7 @@ do-install:
 	${MV} ${DESTDIR}${PREFIX}/share/phpmyadmin/config.sample.inc.php \
 	  ${DESTDIR}${EXDIR}/config.inc.php
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${DESTDIR}${EXDIR}
+	${LN} -fs ${EXDIR} ${DESTDIR}${PREFIX}/share/phpmyadmin/examples
 
 	for dir in ${INSTALL_DIRS}; do					\
 		for file in ${WRKSRC}/$$dir/*; do			\
diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST
index c3c7f03d7c7..d278e9c76e2 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2014/09/23 13:47:31 tron Exp $
+@comment $NetBSD: PLIST,v 1.40 2014/12/10 20:34:34 tron Exp $
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/LICENSE
 share/doc/phpmyadmin/README
@@ -12,13 +12,16 @@ share/examples/phpmyadmin/openid.php
 share/examples/phpmyadmin/signon-script.php
 share/examples/phpmyadmin/signon.php
 share/examples/phpmyadmin/swekey.sample.conf
+share/examples/phpmyadmin/upgrade_column_info_4_3_0+.sql
 share/examples/phpmyadmin/upgrade_tables_mysql_4_1_2+.sql
 share/phpmyadmin/browse_foreigners.php
 share/phpmyadmin/changelog.php
 share/phpmyadmin/chk_rel.php
 share/phpmyadmin/config.inc.php
+share/phpmyadmin/db_central_columns.php
 share/phpmyadmin/db_create.php
 share/phpmyadmin/db_datadict.php
+share/phpmyadmin/db_designer.php
 share/phpmyadmin/db_events.php
 share/phpmyadmin/db_export.php
 share/phpmyadmin/db_import.php
@@ -28,6 +31,7 @@ share/phpmyadmin/db_qbe.php
 share/phpmyadmin/db_routines.php
 share/phpmyadmin/db_search.php
 share/phpmyadmin/db_sql.php
+share/phpmyadmin/db_sql_autocomplete.php
 share/phpmyadmin/db_structure.php
 share/phpmyadmin/db_tracking.php
 share/phpmyadmin/db_triggers.php
@@ -71,6 +75,7 @@ share/phpmyadmin/doc/html/transformations.html
 share/phpmyadmin/doc/html/user.html
 share/phpmyadmin/doc/html/vendors.html
 share/phpmyadmin/error_report.php
+share/phpmyadmin/examples
 share/phpmyadmin/export.php
 share/phpmyadmin/favicon.ico
 share/phpmyadmin/file_echo.php
@@ -80,16 +85,21 @@ share/phpmyadmin/import_status.php
 share/phpmyadmin/index.php
 share/phpmyadmin/js/OpenStreetMap.js
 share/phpmyadmin/js/ajax.js
+share/phpmyadmin/js/big_ints.js
 share/phpmyadmin/js/canvg/MIT-LICENSE.txt
 share/phpmyadmin/js/canvg/canvg.js
 share/phpmyadmin/js/chart.js
 share/phpmyadmin/js/codemirror/LICENSE
+share/phpmyadmin/js/codemirror/addon/hint/show-hint.js
+share/phpmyadmin/js/codemirror/addon/hint/sql-hint.js
 share/phpmyadmin/js/codemirror/addon/runmode/runmode.js
 share/phpmyadmin/js/codemirror/lib/codemirror.js
 share/phpmyadmin/js/codemirror/mode/sql/sql.js
 share/phpmyadmin/js/common.js
 share/phpmyadmin/js/config.js
+share/phpmyadmin/js/console.js
 share/phpmyadmin/js/cross_framing_protection.js
+share/phpmyadmin/js/db_central_columns.js
 share/phpmyadmin/js/db_operations.js
 share/phpmyadmin/js/db_qbe.js
 share/phpmyadmin/js/db_search.js
@@ -124,10 +134,8 @@ share/phpmyadmin/js/jquery/jquery.cookie.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.menuResizer-1.0.js
 share/phpmyadmin/js/jquery/jquery.mousewheel.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/jquery.uitablefilter.js
@@ -195,9 +203,11 @@ share/phpmyadmin/js/jquery/src/jquery/wrap.js
 share/phpmyadmin/js/keyhandler.js
 share/phpmyadmin/js/line_counts.php
 share/phpmyadmin/js/makegrid.js
+share/phpmyadmin/js/menu-resizer.js
 share/phpmyadmin/js/messages.php
 share/phpmyadmin/js/multi_column_sort.js
 share/phpmyadmin/js/navigation.js
+share/phpmyadmin/js/normalization.js
 share/phpmyadmin/js/openlayers/OpenLayers.js
 share/phpmyadmin/js/openlayers/img/blank.gif
 share/phpmyadmin/js/openlayers/img/cloud-popup-relative.png
@@ -553,12 +563,13 @@ 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/designer_db.js
+share/phpmyadmin/js/pmd/designer_objects.js
+share/phpmyadmin/js/pmd/designer_page.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.js
 share/phpmyadmin/js/server_databases.js
@@ -566,11 +577,13 @@ share/phpmyadmin/js/server_plugins.js
 share/phpmyadmin/js/server_privileges.js
 share/phpmyadmin/js/server_status_advisor.js
 share/phpmyadmin/js/server_status_monitor.js
+share/phpmyadmin/js/server_status_processes.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_user_groups.js
 share/phpmyadmin/js/server_variables.js
+share/phpmyadmin/js/sprintf.js
 share/phpmyadmin/js/sql.js
 share/phpmyadmin/js/tbl_change.js
 share/phpmyadmin/js/tbl_chart.js
@@ -581,9 +594,11 @@ share/phpmyadmin/js/tbl_select.js
 share/phpmyadmin/js/tbl_structure.js
 share/phpmyadmin/js/tbl_zoom_plot_jqplot.js
 share/phpmyadmin/js/tracekit/tracekit.js
+share/phpmyadmin/js/transformations/image_upload.js
 share/phpmyadmin/js/whitelist.php
 share/phpmyadmin/libraries/Advisor.class.php
 share/phpmyadmin/libraries/Config.class.php
+share/phpmyadmin/libraries/Console.class.php
 share/phpmyadmin/libraries/DBQbe.class.php
 share/phpmyadmin/libraries/DatabaseInterface.class.php
 share/phpmyadmin/libraries/DbSearch.class.php
@@ -613,8 +628,6 @@ share/phpmyadmin/libraries/String.class.php
 share/phpmyadmin/libraries/StringAbstractType.class.php
 share/phpmyadmin/libraries/StringByte.int.php
 share/phpmyadmin/libraries/StringCType.class.php
-share/phpmyadmin/libraries/StringMB.class.php
-share/phpmyadmin/libraries/StringNative.class.php
 share/phpmyadmin/libraries/StringNativeType.class.php
 share/phpmyadmin/libraries/StringType.int.php
 share/phpmyadmin/libraries/Table.class.php
@@ -629,6 +642,7 @@ share/phpmyadmin/libraries/bfShapeFiles/ShapeFile.lib.php
 share/phpmyadmin/libraries/bookmark.lib.php
 share/phpmyadmin/libraries/browse_foreigners.lib.php
 share/phpmyadmin/libraries/build_html_for_db.lib.php
+share/phpmyadmin/libraries/central_columns.lib.php
 share/phpmyadmin/libraries/charset_conversion.lib.php
 share/phpmyadmin/libraries/check_user_privileges.lib.php
 share/phpmyadmin/libraries/cleanup.lib.php
@@ -650,7 +664,9 @@ share/phpmyadmin/libraries/create_addfield.lib.php
 share/phpmyadmin/libraries/data_dictionary_relations.lib.php
 share/phpmyadmin/libraries/database_interface.inc.php
 share/phpmyadmin/libraries/db_common.inc.php
+share/phpmyadmin/libraries/db_designer.lib.php
 share/phpmyadmin/libraries/db_info.inc.php
+share/phpmyadmin/libraries/db_printview.lib.php
 share/phpmyadmin/libraries/db_table_exists.lib.php
 share/phpmyadmin/libraries/dbi/DBIDrizzle.class.php
 share/phpmyadmin/libraries/dbi/DBIDummy.class.php
@@ -734,6 +750,7 @@ 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/normalization.lib.php
 share/phpmyadmin/libraries/opendocument.lib.php
 share/phpmyadmin/libraries/operations.lib.php
 share/phpmyadmin/libraries/parse_analyze.inc.php
@@ -741,13 +758,15 @@ 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/Base.php
+share/phpmyadmin/libraries/phpseclib/Crypt/Random.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/IOTransformationsPlugin.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/SchemaPlugin.class.php
 share/phpmyadmin/libraries/plugins/TransformationsInterface.int.php
 share/phpmyadmin/libraries/plugins/TransformationsPlugin.class.php
 share/phpmyadmin/libraries/plugins/UploadInterface.int.php
@@ -793,23 +812,31 @@ 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/schema/Export_Relation_Schema.class.php
+share/phpmyadmin/libraries/plugins/schema/RelationStats.class.php
+share/phpmyadmin/libraries/plugins/schema/SchemaDia.class.php
+share/phpmyadmin/libraries/plugins/schema/SchemaEps.class.php
+share/phpmyadmin/libraries/plugins/schema/SchemaPdf.class.php
+share/phpmyadmin/libraries/plugins/schema/SchemaSvg.class.php
+share/phpmyadmin/libraries/plugins/schema/TableStats.class.php
+share/phpmyadmin/libraries/plugins/schema/dia/Dia_Relation_Schema.class.php
+share/phpmyadmin/libraries/plugins/schema/dia/RelationStatsDia.class.php
+share/phpmyadmin/libraries/plugins/schema/dia/TableStatsDia.class.php
+share/phpmyadmin/libraries/plugins/schema/eps/Eps_Relation_Schema.class.php
+share/phpmyadmin/libraries/plugins/schema/eps/RelationStatsEps.class.php
+share/phpmyadmin/libraries/plugins/schema/eps/TableStatsEps.class.php
+share/phpmyadmin/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
+share/phpmyadmin/libraries/plugins/schema/pdf/RelationStatsPdf.class.php
+share/phpmyadmin/libraries/plugins/schema/pdf/TableStatsPdf.class.php
+share/phpmyadmin/libraries/plugins/schema/svg/RelationStatsSvg.class.php
+share/phpmyadmin/libraries/plugins/schema/svg/Svg_Relation_Schema.class.php
+share/phpmyadmin/libraries/plugins/schema/svg/TableStatsSvg.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_Bool2text.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_Preappend.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/Bool2TextTransformationsPlugin.class.php
 share/phpmyadmin/libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
@@ -818,13 +845,30 @@ share/phpmyadmin/libraries/plugins/transformations/abstract/ExternalTransformati
 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/ImageUploadTransformationsPlugin.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/PreApPendTransformationsPlugin.class.php
+share/phpmyadmin/libraries/plugins/transformations/abstract/RegexValidationTransformationsPlugin.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/TextFileUploadTransformationsPlugin.class.php
 share/phpmyadmin/libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php
 share/phpmyadmin/libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
+share/phpmyadmin/libraries/plugins/transformations/input/Image_JPEG_Upload.class.php
+share/phpmyadmin/libraries/plugins/transformations/input/Text_Plain_Fileupload.class.php
+share/phpmyadmin/libraries/plugins/transformations/input/Text_Plain_Regexvalidation.class.php
+share/phpmyadmin/libraries/plugins/transformations/output/Application_Octetstream_Download.class.php
+share/phpmyadmin/libraries/plugins/transformations/output/Application_Octetstream_Hex.class.php
+share/phpmyadmin/libraries/plugins/transformations/output/Image_JPEG_Inline.class.php
+share/phpmyadmin/libraries/plugins/transformations/output/Image_JPEG_Link.class.php
+share/phpmyadmin/libraries/plugins/transformations/output/Image_PNG_Inline.class.php
+share/phpmyadmin/libraries/plugins/transformations/output/Text_Plain_Bool2text.class.php
+share/phpmyadmin/libraries/plugins/transformations/output/Text_Plain_Dateformat.class.php
+share/phpmyadmin/libraries/plugins/transformations/output/Text_Plain_External.class.php
+share/phpmyadmin/libraries/plugins/transformations/output/Text_Plain_Formatted.class.php
+share/phpmyadmin/libraries/plugins/transformations/output/Text_Plain_Imagelink.class.php
+share/phpmyadmin/libraries/plugins/transformations/output/Text_Plain_Sql.class.php
 share/phpmyadmin/libraries/pmd_common.php
 share/phpmyadmin/libraries/properties/PropertyItem.class.php
 share/phpmyadmin/libraries/properties/options/OptionsPropertyGroup.class.php
@@ -844,6 +888,7 @@ 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/properties/plugins/SchemaPluginProperties.class.php
 share/phpmyadmin/libraries/relation.lib.php
 share/phpmyadmin/libraries/relation_cleanup.lib.php
 share/phpmyadmin/libraries/replication.inc.php
@@ -851,19 +896,13 @@ 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_general.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
-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/TableStats.class.php
-share/phpmyadmin/libraries/schema/User_Schema.class.php
 share/phpmyadmin/libraries/select_lang.lib.php
 share/phpmyadmin/libraries/select_server.lib.php
 share/phpmyadmin/libraries/server_bin_log.lib.php
@@ -877,6 +916,7 @@ share/phpmyadmin/libraries/server_privileges.lib.php
 share/phpmyadmin/libraries/server_status.lib.php
 share/phpmyadmin/libraries/server_status_advisor.lib.php
 share/phpmyadmin/libraries/server_status_monitor.lib.php
+share/phpmyadmin/libraries/server_status_processes.lib.php
 share/phpmyadmin/libraries/server_status_queries.lib.php
 share/phpmyadmin/libraries/server_status_variables.lib.php
 share/phpmyadmin/libraries/server_user_groups.lib.php
@@ -888,7 +928,9 @@ share/phpmyadmin/libraries/sql.lib.php
 share/phpmyadmin/libraries/sql_query_form.lib.php
 share/phpmyadmin/libraries/sqlparser.data.php
 share/phpmyadmin/libraries/sqlparser.lib.php
-share/phpmyadmin/libraries/string.inc.php
+share/phpmyadmin/libraries/string.lib.php
+share/phpmyadmin/libraries/stringMb.lib.php
+share/phpmyadmin/libraries/stringNative.lib.php
 share/phpmyadmin/libraries/structure.lib.php
 share/phpmyadmin/libraries/sysinfo.lib.php
 share/phpmyadmin/libraries/tbl_chart.lib.php
@@ -900,7 +942,6 @@ share/phpmyadmin/libraries/tbl_indexes.lib.php
 share/phpmyadmin/libraries/tbl_info.inc.php
 share/phpmyadmin/libraries/tbl_printview.lib.php
 share/phpmyadmin/libraries/tbl_relation.lib.php
-share/phpmyadmin/libraries/tbl_tracking.lib.php
 share/phpmyadmin/libraries/tbl_views.lib.php
 share/phpmyadmin/libraries/tcpdf/LICENSE.TXT
 share/phpmyadmin/libraries/tcpdf/README.TXT
@@ -920,6 +961,7 @@ share/phpmyadmin/libraries/tcpdf/include/tcpdf_images.php
 share/phpmyadmin/libraries/tcpdf/include/tcpdf_static.php
 share/phpmyadmin/libraries/tcpdf/tcpdf.php
 share/phpmyadmin/libraries/tcpdf/tcpdf_autoconfig.php
+share/phpmyadmin/libraries/tracking.lib.php
 share/phpmyadmin/libraries/transformations.lib.php
 share/phpmyadmin/libraries/url_generating.lib.php
 share/phpmyadmin/libraries/user_preferences.inc.php
@@ -928,7 +970,7 @@ share/phpmyadmin/libraries/vendor_config.php
 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/az/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
@@ -944,13 +986,16 @@ share/phpmyadmin/locale/fr/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/gl/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/hi/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/hu/LC_MESSAGES/phpmyadmin.mo
+share/phpmyadmin/locale/ia/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/id/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/it/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/ja/LC_MESSAGES/phpmyadmin.mo
+share/phpmyadmin/locale/ko/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/lt/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/nb/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/nl/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/pl/LC_MESSAGES/phpmyadmin.mo
+share/phpmyadmin/locale/pt/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/pt_BR/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/ro/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/ru/LC_MESSAGES/phpmyadmin.mo
@@ -961,25 +1006,16 @@ 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
 share/phpmyadmin/locale/zh_TW/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/navigation.php
+share/phpmyadmin/normalization.php
 share/phpmyadmin/phpinfo.php
 share/phpmyadmin/phpmyadmin.css.php
-share/phpmyadmin/pmd_display_field.php
-share/phpmyadmin/pmd_general.php
-share/phpmyadmin/pmd_pdf.php
-share/phpmyadmin/pmd_relation_new.php
-share/phpmyadmin/pmd_relation_upd.php
-share/phpmyadmin/pmd_save_pos.php
 share/phpmyadmin/prefs_forms.php
 share/phpmyadmin/prefs_manage.php
 share/phpmyadmin/print.css
-share/phpmyadmin/querywindow.php
 share/phpmyadmin/robots.txt
-share/phpmyadmin/schema_edit.php
 share/phpmyadmin/schema_export.php
 share/phpmyadmin/server_binlog.php
 share/phpmyadmin/server_collations.php
@@ -994,6 +1030,7 @@ share/phpmyadmin/server_sql.php
 share/phpmyadmin/server_status.php
 share/phpmyadmin/server_status_advisor.php
 share/phpmyadmin/server_status_monitor.php
+share/phpmyadmin/server_status_processes.php
 share/phpmyadmin/server_status_queries.php
 share/phpmyadmin/server_status_variables.php
 share/phpmyadmin/server_user_groups.php
@@ -1025,9 +1062,9 @@ 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
 share/phpmyadmin/tbl_operations.php
 share/phpmyadmin/tbl_printview.php
+share/phpmyadmin/tbl_recent_favorite.php
 share/phpmyadmin/tbl_relation.php
 share/phpmyadmin/tbl_replace.php
 share/phpmyadmin/tbl_row_action.php
@@ -1089,6 +1126,7 @@ 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_saveimage.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
@@ -1127,14 +1165,19 @@ 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_routine_add.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/centralColumns.png
+share/phpmyadmin/themes/original/img/centralColumns_add.png
+share/phpmyadmin/themes/original/img/centralColumns_delete.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/console.png
 share/phpmyadmin/themes/original/img/east-mini.png
 share/phpmyadmin/themes/original/img/error.ico
 share/phpmyadmin/themes/original/img/eye.png
@@ -1152,6 +1195,7 @@ 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/normalize.png
 share/phpmyadmin/themes/original/img/north-mini.png
 share/phpmyadmin/themes/original/img/pause.png
 share/phpmyadmin/themes/original/img/play.png
@@ -1160,6 +1204,7 @@ 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_collapseall.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
@@ -1168,6 +1213,8 @@ 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_link.png
+share/phpmyadmin/themes/original/img/s_lock.png
 share/phpmyadmin/themes/original/img/s_loggoff.png
 share/phpmyadmin/themes/original/img/s_notice.png
 share/phpmyadmin/themes/original/img/s_partialtext.png
@@ -1183,6 +1230,7 @@ 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_unlink.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
@@ -1277,6 +1325,7 @@ 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_saveimage.png
 share/phpmyadmin/themes/pmahomme/img/b_sbrowse.png
 share/phpmyadmin/themes/pmahomme/img/b_sdb.png
 share/phpmyadmin/themes/pmahomme/img/b_search.png
@@ -1320,13 +1369,18 @@ share/phpmyadmin/themes/pmahomme/img/bd_lastpage.png
 share/phpmyadmin/themes/pmahomme/img/bd_nextpage.png
 share/phpmyadmin/themes/pmahomme/img/bd_prevpage.png
 share/phpmyadmin/themes/pmahomme/img/bd_primary.png
+share/phpmyadmin/themes/pmahomme/img/bd_routine_add.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/centralColumns.png
+share/phpmyadmin/themes/pmahomme/img/centralColumns_add.png
+share/phpmyadmin/themes/pmahomme/img/centralColumns_delete.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/console.png
 share/phpmyadmin/themes/pmahomme/img/database.png
 share/phpmyadmin/themes/pmahomme/img/east-mini.png
 share/phpmyadmin/themes/pmahomme/img/error.ico
@@ -1347,6 +1401,7 @@ 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/normalize.png
 share/phpmyadmin/themes/pmahomme/img/north-mini.png
 share/phpmyadmin/themes/pmahomme/img/pause.png
 share/phpmyadmin/themes/pmahomme/img/php_sym.png
@@ -1383,6 +1438,7 @@ 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/export.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
@@ -1391,6 +1447,9 @@ 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/page_add.png
+share/phpmyadmin/themes/pmahomme/img/pmd/page_delete.png
+share/phpmyadmin/themes/pmahomme/img/pmd/page_edit.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
@@ -1400,6 +1459,7 @@ 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/save_as.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
@@ -1412,6 +1472,7 @@ 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_collapseall.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
@@ -1420,6 +1481,8 @@ share/phpmyadmin/themes/pmahomme/img/s_fulltext.png
 share/phpmyadmin/themes/pmahomme/img/s_host.png
 share/phpmyadmin/themes/pmahomme/img/s_info.png
 share/phpmyadmin/themes/pmahomme/img/s_lang.png
+share/phpmyadmin/themes/pmahomme/img/s_link.png
+share/phpmyadmin/themes/pmahomme/img/s_lock.png
 share/phpmyadmin/themes/pmahomme/img/s_loggoff.png
 share/phpmyadmin/themes/pmahomme/img/s_notice.png
 share/phpmyadmin/themes/pmahomme/img/s_okay.png
@@ -1437,6 +1500,7 @@ 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_unlink.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
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index d140521ee10..97c34da1e6d 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.97 2014/12/07 14:27:29 tron Exp $
+$NetBSD: distinfo,v 1.98 2014/12/10 20:34:34 tron Exp $
 
-SHA1 (phpMyAdmin-4.2.13.1-all-languages.tar.xz) = 5d2d2adb0e4d39dd0a1bab3576ae80ed330d3b3f
-RMD160 (phpMyAdmin-4.2.13.1-all-languages.tar.xz) = c980e24a01a6df87c79597ae848226539c13b7d9
-Size (phpMyAdmin-4.2.13.1-all-languages.tar.xz) = 5205324 bytes
+SHA1 (phpMyAdmin-4.3.1-all-languages.tar.xz) = 6bfc87560990af66951eccff0308fd86de36664f
+RMD160 (phpMyAdmin-4.3.1-all-languages.tar.xz) = 2732fd3d510c528f8e0f7f995cce1c7ba0b81a0e
+Size (phpMyAdmin-4.3.1-all-languages.tar.xz) = 5370420 bytes
 SHA1 (patch-libraries_vendor_config.php) = af587496e999bf1e92d6c5a9ab8053fe6e92a0f2