Update "phpmyadmin" package to version 3.5.2. Changes since 3.5.1:

- bug #3521416 [interface] JS error when editing index
- bug #3521313 [core] Call to undefined function __()
- bug #3521016 [edit] NOW() function incorrectly selected
- bug [GUI] Invalid HTML code on transformation_overview.php
- bug #3522930 [browse] Missing validation in Ajax mode
- bug Fix popup message on build SQL of import
- bug #3523499 [core] Make X-WebKit-CSP work better
- replace Highcharts with jqplot for query profiling, zoom search
- bug #3531584 [interface] No form validation in change password dialog
- bug #3531585 [interface] Broken password validation in copy user form
- bug #3531586 [unterface] Add user form prints JSON when user presses enter
- bug #3534121 [config] duplicate line in config.sample.inc.php
- bug #3534311 [interface] Grid editing incorrectly parses ENUM/SET values
- bug #3510196 [core] More clever URL rewriting with ForceSSL

4 files changed, 9 insertions, 27 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 1780033307d..546bce4815c 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2012/05/06 09:03:48 tron Exp $
+# $NetBSD: Makefile,v 1.102 2012/07/15 13:02:32 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=	3.5.1
+DIST_VERSION=	3.5.2
 DOC_FILES=	ChangeLog Documentation.txt LICENSE README \
 		RELEASE-DATE-${DIST_VERSION}
 
diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST
index 8573bab9a20..680964f6164 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.27 2012/05/06 09:01:10 tron Exp $
+@comment $NetBSD: PLIST,v 1.28 2012/07/15 13:02:32 tron Exp $
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/Documentation.txt
 share/doc/phpmyadmin/LICENSE
 share/doc/phpmyadmin/README
-share/doc/phpmyadmin/RELEASE-DATE-3.5.1
+share/doc/phpmyadmin/RELEASE-DATE-${DIST_VERSION}
 share/examples/phpmyadmin/apache.conf
 share/examples/phpmyadmin/config.inc.php
 share/phpmyadmin/Documentation.html
@@ -161,7 +161,7 @@ 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/tbl_zoom_plot_jqplot.js
 share/phpmyadmin/js/update-location.js
 share/phpmyadmin/libraries/Advisor.class.php
 share/phpmyadmin/libraries/Config.class.php
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index b98b8708e4e..3d03eb00c54 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.61 2012/05/06 09:01:10 tron Exp $
+$NetBSD: distinfo,v 1.62 2012/07/15 13:02:32 tron Exp $
 
-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
+SHA1 (phpMyAdmin-3.5.2-all-languages.tar.xz) = 0ee13d510c9f673255ca16af3c1c02b4817ff02b
+RMD160 (phpMyAdmin-3.5.2-all-languages.tar.xz) = e53adf2e67c6abe0903c8be1501aa5b6e53f9c38
+Size (phpMyAdmin-3.5.2-all-languages.tar.xz) = 3653780 bytes
diff --git a/databases/phpmyadmin/patches/patch-libraries_header_http.inc.php b/databases/phpmyadmin/patches/patch-libraries_header_http.inc.php
deleted file mode 100644
index 84d043a43f7..00000000000
--- a/databases/phpmyadmin/patches/patch-libraries_header_http.inc.php
+++ /dev/null
@@ -1,17 +0,0 @@
-$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')) {