Update "phpmyadmin" package to version 4.1.7.

Changes since version 4.0.10:
- This release contains many improvements and bug fixes. With this
  release the minimum supported PHP version is now 5.3 and the minimum
  MySQL version is 5.5.
- Allow specifying a port when connecting to the controlhost
- User interface improvements to server privileges, view creation, the
  Operations tab, Relation View, and when creating new users
- Added support for AES_ENCRYPT on BLOB columns
- Added support for relations with ndbcluser
- Added optional ReCAPTCHA support during login
- Added support for fractional seconds in time, datetime, and timestamp
  columns
- Added find and replace by column
- Added the Error Reporting Component, an optional feature allowing
  users to report certain errors directly to the phpMyAdmin bug team
- Added configurable menus (so an administrator can hide certain features)

3 files changed, 180 insertions, 43 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 8cc00d857df..eb0ee66d087 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2013/12/06 18:34:54 tron Exp $
+# $NetBSD: Makefile,v 1.123 2014/02/22 11:14:57 tron Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}-all-languages
 PKGNAME=	phpmyadmin-${DIST_VERSION:S/-//}
@@ -11,16 +11,16 @@ HOMEPAGE=	http://www.phpmyadmin.net/
 COMMENT=	Set of PHP-scripts to adminstrate MySQL over the WWW
 LICENSE=	gnu-gpl-v2
 
-DEPENDS+=	${PHP_PKG_PREFIX}-bz2>=5.2.0:../../archivers/php-bz2
-DEPENDS+=	${PHP_PKG_PREFIX}-zip>=5.2.0:../../archivers/php-zip
-DEPENDS+=	${PHP_PKG_PREFIX}-zlib>=5.2.0:../../archivers/php-zlib
-DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring
-DEPENDS+=	${PHP_PKG_PREFIX}-gettext>=5.2.0:../../devel/php-gettext
-DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=5.2.0:../../databases/php-mysql
-DEPENDS+=	${PHP_PKG_PREFIX}-mysqli>=5.2.0:../../databases/php-mysqli
-DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd
-DEPENDS+=	${PHP_PKG_PREFIX}-mcrypt>=5.2.0:../../security/php-mcrypt
-DEPENDS+=	${PHP_PKG_PREFIX}-json>=5.2.0:../../textproc/php-json
+DEPENDS+=	${PHP_PKG_PREFIX}-bz2>=5.3.0:../../archivers/php-bz2
+DEPENDS+=	${PHP_PKG_PREFIX}-zip>=5.3.0:../../archivers/php-zip
+DEPENDS+=	${PHP_PKG_PREFIX}-zlib>=5.3.0:../../archivers/php-zlib
+DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.3.0:../../converters/php-mbstring
+DEPENDS+=	${PHP_PKG_PREFIX}-gettext>=5.3.0:../../devel/php-gettext
+DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=5.3.0:../../databases/php-mysql
+DEPENDS+=	${PHP_PKG_PREFIX}-mysqli>=5.3.0:../../databases/php-mysqli
+DEPENDS+=	${PHP_PKG_PREFIX}-gd>=5.3.0:../../graphics/php-gd
+DEPENDS+=	${PHP_PKG_PREFIX}-mcrypt>=5.3.0:../../security/php-mcrypt
+DEPENDS+=	${PHP_PKG_PREFIX}-json>=5.3.0:../../textproc/php-json
 
 FILES_SUBST+=	APACHE_GROUP=${APACHE_GROUP} APACHE_USER=${APACHE_USER}
 FILES_SUBST+=	PMSETUPDIR=${PMSETUPDIR} PMSETUPFILE=${PMSETUPFILE}
@@ -29,7 +29,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.0.10
+DIST_VERSION=	4.1.7
 DOC_FILES=	ChangeLog LICENSE README RELEASE-DATE-${DIST_VERSION}
 
 APACHE_USER?=	www
@@ -58,20 +58,26 @@ INSTALLATION_DIRS+=	${PREFIX}/share/doc/phpmyadmin \
 INSTALL_DIRS=	doc/html
 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/runmode
 INSTALL_DIRS+=	js/codemirror/lib
 INSTALL_DIRS+=	js/codemirror/mode
-INSTALL_DIRS+=	js/codemirror/mode/mysql
-INSTALL_DIRS+=	js/highcharts
+INSTALL_DIRS+=	js/codemirror/mode/sql
 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/ajax
 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+=	js/tracekit
 INSTALL_DIRS+=	libraries
 INSTALL_DIRS+=	libraries/PHPExcel
 INSTALL_DIRS+=	libraries/PHPExcel/PHPExcel
@@ -139,6 +145,7 @@ 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/tcpdf/include
 INSTALL_DIRS+=	libraries/transformations
 INSTALL_DIRS+=	locale
 INSTALL_DIRS+=	locale/ar
diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST
index a0e2853b28d..ffd9c6ddf0d 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2013/09/18 22:20:04 tron Exp $
+@comment $NetBSD: PLIST,v 1.35 2014/02/22 11:14:57 tron Exp $
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/LICENSE
 share/doc/phpmyadmin/README
@@ -50,6 +50,7 @@ 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/error_report.php
 share/phpmyadmin/export.php
 share/phpmyadmin/favicon.ico
 share/phpmyadmin/file_echo.php
@@ -61,18 +62,19 @@ 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/addon/runmode/runmode.js
 share/phpmyadmin/js/codemirror/lib/codemirror.js
-share/phpmyadmin/js/codemirror/mode/mysql/mysql.js
+share/phpmyadmin/js/codemirror/mode/sql/sql.js
 share/phpmyadmin/js/common.js
 share/phpmyadmin/js/config.js
 share/phpmyadmin/js/cross_framing_protection.js
 share/phpmyadmin/js/db_operations.js
 share/phpmyadmin/js/db_search.js
 share/phpmyadmin/js/db_structure.js
+share/phpmyadmin/js/doclinks.js
+share/phpmyadmin/js/error_report.js
 share/phpmyadmin/js/export.js
 share/phpmyadmin/js/functions.js
 share/phpmyadmin/js/get_image.js.php
@@ -80,6 +82,19 @@ 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/jqplot/excanvas.js
+share/phpmyadmin/js/jqplot/jquery.jqplot.js
+share/phpmyadmin/js/jqplot/plugins/jqplot.barRenderer.js
+share/phpmyadmin/js/jqplot/plugins/jqplot.byteFormatter.js
+share/phpmyadmin/js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js
+share/phpmyadmin/js/jqplot/plugins/jqplot.canvasTextRenderer.js
+share/phpmyadmin/js/jqplot/plugins/jqplot.categoryAxisRenderer.js
+share/phpmyadmin/js/jqplot/plugins/jqplot.cursor.js
+share/phpmyadmin/js/jqplot/plugins/jqplot.dateAxisRenderer.js
+share/phpmyadmin/js/jqplot/plugins/jqplot.highlighter.js
+share/phpmyadmin/js/jqplot/plugins/jqplot.pieRenderer.js
+share/phpmyadmin/js/jqplot/plugins/jqplot.pointLabels.js
+share/phpmyadmin/js/jquery/MIT-LICENSE.txt
 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
@@ -95,7 +110,69 @@ 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/src/README
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.accordion.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.autocomplete.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.button.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.core.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.datepicker.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.dialog.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.draggable.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.droppable.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-blind.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-bounce.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-clip.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-drop.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-explode.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-fade.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-fold.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-highlight.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-pulsate.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-scale.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-shake.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-slide.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect-transfer.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.effect.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.menu.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.mouse.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.position.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.progressbar.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.resizable.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.selectable.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.slider.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.sortable.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.spinner.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.tabs.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.tooltip.js
+share/phpmyadmin/js/jquery/src/jquery-ui/jquery.ui.widget.js
+share/phpmyadmin/js/jquery/src/jquery/ajax.js
+share/phpmyadmin/js/jquery/src/jquery/ajax/jsonp.js
+share/phpmyadmin/js/jquery/src/jquery/ajax/script.js
+share/phpmyadmin/js/jquery/src/jquery/ajax/xhr.js
+share/phpmyadmin/js/jquery/src/jquery/attributes.js
+share/phpmyadmin/js/jquery/src/jquery/callbacks.js
+share/phpmyadmin/js/jquery/src/jquery/core.js
+share/phpmyadmin/js/jquery/src/jquery/css.js
+share/phpmyadmin/js/jquery/src/jquery/data.js
+share/phpmyadmin/js/jquery/src/jquery/deferred.js
+share/phpmyadmin/js/jquery/src/jquery/deprecated.js
+share/phpmyadmin/js/jquery/src/jquery/dimensions.js
+share/phpmyadmin/js/jquery/src/jquery/effects.js
+share/phpmyadmin/js/jquery/src/jquery/event-alias.js
+share/phpmyadmin/js/jquery/src/jquery/event.js
+share/phpmyadmin/js/jquery/src/jquery/intro.js
+share/phpmyadmin/js/jquery/src/jquery/manipulation.js
+share/phpmyadmin/js/jquery/src/jquery/offset.js
+share/phpmyadmin/js/jquery/src/jquery/outro.js
+share/phpmyadmin/js/jquery/src/jquery/queue.js
+share/phpmyadmin/js/jquery/src/jquery/selector-native.js
+share/phpmyadmin/js/jquery/src/jquery/serialize.js
+share/phpmyadmin/js/jquery/src/jquery/sizzle-jquery.js
+share/phpmyadmin/js/jquery/src/jquery/support.js
+share/phpmyadmin/js/jquery/src/jquery/traversing.js
+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/messages.php
 share/phpmyadmin/js/navigation.js
@@ -172,24 +249,27 @@ 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_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/sql.js
 share/phpmyadmin/js/tbl_change.js
 share/phpmyadmin/js/tbl_chart.js
+share/phpmyadmin/js/tbl_find_replace.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_jqplot.js
+share/phpmyadmin/js/tracekit/tracekit.js
 share/phpmyadmin/libraries/Advisor.class.php
 share/phpmyadmin/libraries/Config.class.php
 share/phpmyadmin/libraries/DBQbe.class.php
+share/phpmyadmin/libraries/DatabaseInterface.class.php
 share/phpmyadmin/libraries/DbSearch.class.php
 share/phpmyadmin/libraries/DisplayResults.class.php
 share/phpmyadmin/libraries/Error.class.php
@@ -211,6 +291,14 @@ 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/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
 share/phpmyadmin/libraries/TableSearch.class.php
 share/phpmyadmin/libraries/Theme.class.php
@@ -221,6 +309,7 @@ share/phpmyadmin/libraries/Util.class.php
 share/phpmyadmin/libraries/advisory_rules.txt
 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/charset_conversion.lib.php
 share/phpmyadmin/libraries/check_user_privileges.lib.php
@@ -232,30 +321,35 @@ share/phpmyadmin/libraries/config/ConfigFile.class.php
 share/phpmyadmin/libraries/config/Form.class.php
 share/phpmyadmin/libraries/config/FormDisplay.class.php
 share/phpmyadmin/libraries/config/FormDisplay.tpl.php
+share/phpmyadmin/libraries/config/Validator.class.php
 share/phpmyadmin/libraries/config/config_functions.lib.php
 share/phpmyadmin/libraries/config/messages.inc.php
 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/create_addfield.lib.php
 share/phpmyadmin/libraries/data_dictionary_relations.lib.php
-share/phpmyadmin/libraries/database_interface.lib.php
+share/phpmyadmin/libraries/database_interface.inc.php
 share/phpmyadmin/libraries/db_common.inc.php
 share/phpmyadmin/libraries/db_info.inc.php
 share/phpmyadmin/libraries/db_table_exists.lib.php
+share/phpmyadmin/libraries/dbi/DBIDrizzle.class.php
+share/phpmyadmin/libraries/dbi/DBIDummy.class.php
+share/phpmyadmin/libraries/dbi/DBIExtension.int.php
+share/phpmyadmin/libraries/dbi/DBIMysql.class.php
+share/phpmyadmin/libraries/dbi/DBIMysqli.class.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.inc.php
 share/phpmyadmin/libraries/display_export.lib.php
 share/phpmyadmin/libraries/display_git_revision.lib.php
+share/phpmyadmin/libraries/display_import.inc.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_structure.inc.php
 share/phpmyadmin/libraries/engines/bdb.lib.php
 share/phpmyadmin/libraries/engines/berkeleydb.lib.php
 share/phpmyadmin/libraries/engines/binlog.lib.php
@@ -269,6 +363,7 @@ share/phpmyadmin/libraries/engines/ndbcluster.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/error_report.lib.php
 share/phpmyadmin/libraries/file_listing.lib.php
 share/phpmyadmin/libraries/gis/pma_gis_factory.php
 share/phpmyadmin/libraries/gis/pma_gis_geometry.php
@@ -280,7 +375,6 @@ 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/iconv_wrapper.lib.php
 share/phpmyadmin/libraries/import.lib.php
 share/phpmyadmin/libraries/index.lib.php
@@ -293,6 +387,8 @@ share/phpmyadmin/libraries/language_stats.inc.php
 share/phpmyadmin/libraries/logging.lib.php
 share/phpmyadmin/libraries/mime.lib.php
 share/phpmyadmin/libraries/mult_submits.inc.php
+share/phpmyadmin/libraries/mult_submits.lib.php
+share/phpmyadmin/libraries/mysql_charsets.inc.php
 share/phpmyadmin/libraries/mysql_charsets.lib.php
 share/phpmyadmin/libraries/navigation/Navigation.class.php
 share/phpmyadmin/libraries/navigation/NavigationHeader.class.php
@@ -302,6 +398,8 @@ 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_DatabaseChild.class.php
+share/phpmyadmin/libraries/navigation/Nodes/Node_Database_Container.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
@@ -318,7 +416,7 @@ 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/parse_analyze.inc.php
 share/phpmyadmin/libraries/php-gettext/gettext.inc
 share/phpmyadmin/libraries/php-gettext/gettext.php
 share/phpmyadmin/libraries/php-gettext/streams.php
@@ -337,6 +435,7 @@ 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/recaptchalib.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
@@ -416,6 +515,7 @@ 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/NumberPropertyItem.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
@@ -443,31 +543,47 @@ share/phpmyadmin/libraries/schema/Svg_Relation_Schema.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
+share/phpmyadmin/libraries/server_collations.lib.php
 share/phpmyadmin/libraries/server_common.inc.php
+share/phpmyadmin/libraries/server_common.lib.php
+share/phpmyadmin/libraries/server_databases.lib.php
+share/phpmyadmin/libraries/server_engines.lib.php
+share/phpmyadmin/libraries/server_plugins.lib.php
 share/phpmyadmin/libraries/server_privileges.lib.php
-share/phpmyadmin/libraries/server_variables_doc.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_queries.lib.php
+share/phpmyadmin/libraries/server_status_variables.lib.php
+share/phpmyadmin/libraries/server_user_groups.lib.php
+share/phpmyadmin/libraries/server_users.lib.php
+share/phpmyadmin/libraries/server_variables.lib.php
 share/phpmyadmin/libraries/session.inc.php
 share/phpmyadmin/libraries/special_schema_links.lib.php
+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/sqlvalidator.class.php
 share/phpmyadmin/libraries/sqlvalidator.lib.php
-share/phpmyadmin/libraries/string.lib.php
-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/string.inc.php
 share/phpmyadmin/libraries/structure.lib.php
 share/phpmyadmin/libraries/sysinfo.lib.php
+share/phpmyadmin/libraries/tbl_chart.lib.php
 share/phpmyadmin/libraries/tbl_columns_definition_form.inc.php
+share/phpmyadmin/libraries/tbl_columns_definition_form.lib.php
 share/phpmyadmin/libraries/tbl_common.inc.php
+share/phpmyadmin/libraries/tbl_gis_visualization.lib.php
+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
 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
@@ -476,9 +592,13 @@ 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/helvetica.php
-share/phpmyadmin/libraries/tcpdf/htmlcolors.php
+share/phpmyadmin/libraries/tcpdf/include/tcpdf_colors.php
+share/phpmyadmin/libraries/tcpdf/include/tcpdf_font_data.php
+share/phpmyadmin/libraries/tcpdf/include/tcpdf_fonts.php
+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/unicode_data.php
+share/phpmyadmin/libraries/tcpdf/tcpdf_autoconfig.php
 share/phpmyadmin/libraries/transformations.lib.php
 share/phpmyadmin/libraries/url_generating.lib.php
 share/phpmyadmin/libraries/user_preferences.inc.php
@@ -502,7 +622,6 @@ share/phpmyadmin/locale/fi/LC_MESSAGES/phpmyadmin.mo
 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/hr/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/hu/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/id/LC_MESSAGES/phpmyadmin.mo
 share/phpmyadmin/locale/it/LC_MESSAGES/phpmyadmin.mo
@@ -556,6 +675,7 @@ 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_user_groups.php
 share/phpmyadmin/server_variables.php
 share/phpmyadmin/setup/ajax.js
 share/phpmyadmin/setup/config.php
@@ -579,6 +699,7 @@ share/phpmyadmin/tbl_change.php
 share/phpmyadmin/tbl_chart.php
 share/phpmyadmin/tbl_create.php
 share/phpmyadmin/tbl_export.php
+share/phpmyadmin/tbl_find_replace.php
 share/phpmyadmin/tbl_get_field.php
 share/phpmyadmin/tbl_gis_visualization.php
 share/phpmyadmin/tbl_import.php
@@ -619,6 +740,7 @@ 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_find_replace.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
@@ -661,6 +783,7 @@ 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_undo.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
@@ -693,6 +816,8 @@ 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/lightbulb.png
+share/phpmyadmin/themes/original/img/lightbulb_off.png
 share/phpmyadmin/themes/original/img/logo_left.png
 share/phpmyadmin/themes/original/img/logo_right.png
 share/phpmyadmin/themes/original/img/more.png
@@ -717,6 +842,7 @@ 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
@@ -795,6 +921,7 @@ 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_find_replace.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
@@ -843,6 +970,7 @@ 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_undo.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
@@ -880,6 +1008,8 @@ share/phpmyadmin/themes/pmahomme/img/eye.png
 share/phpmyadmin/themes/pmahomme/img/eye_grey.png
 share/phpmyadmin/themes/pmahomme/img/item.png
 share/phpmyadmin/themes/pmahomme/img/left_nav_bg.png
+share/phpmyadmin/themes/pmahomme/img/lightbulb.png
+share/phpmyadmin/themes/pmahomme/img/lightbulb_off.png
 share/phpmyadmin/themes/pmahomme/img/logo_left.png
 share/phpmyadmin/themes/pmahomme/img/logo_right.png
 share/phpmyadmin/themes/pmahomme/img/more.png
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index 96a3a228c37..647060e3a8b 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.79 2013/12/06 18:34:54 tron Exp $
+$NetBSD: distinfo,v 1.80 2014/02/22 11:14:57 tron Exp $
 
-SHA1 (phpMyAdmin-4.0.10-all-languages.tar.xz) = 2002e954471b3c76eddd5ffc14c224089bc08d26
-RMD160 (phpMyAdmin-4.0.10-all-languages.tar.xz) = c78ea8b17fd01472df3eb7d25a8a0ef6a94eb6d0
-Size (phpMyAdmin-4.0.10-all-languages.tar.xz) = 4774280 bytes
+SHA1 (phpMyAdmin-4.1.7-all-languages.tar.xz) = a31116d0c971650938689043a84a22d8c20eb305
+RMD160 (phpMyAdmin-4.1.7-all-languages.tar.xz) = 4a7df2b7cf0bc4f6f8cd802fc81ee42908cf33c5
+Size (phpMyAdmin-4.1.7-all-languages.tar.xz) = 4807196 bytes
 SHA1 (patch-libraries_vendor_config.php) = af587496e999bf1e92d6c5a9ab8053fe6e92a0f2