update to pgadmin3-1.22.0

reset maintainer (ok by joerg@)

Recent changes:
Date       Dev Ver     Change details
---------- --- ------  --------------
2016-01-04 AV  1.22.0  Resolved an issue related to check options selection in
                       the view properties dialog with the check option.
                       [Reported by: Sebastian Albert, Patched by: Neel Patel]
2015-12-08 AV  1.22.0  Merged the libssh2 to the latest version.
                       [Akshay Joshi]
2015-11-19 DP  1.22.0  Properly detect serial columns as such when
                       identifiers have been truncated.
2015-10-23 AV  1.22.0  Fixes an issue related to the column inheritance
                       information properly, when one (or, more) common columns
                       are inherited from multiple tables.
                       [Reported by: Liu Yuanyuan, Patched by: Akshay Joshi]
2015-10-12 AV  1.22.0  Ensure the correct syntax used for moving the objects
                       from one tablespace to another. [Sanket Mehta]
2015-10-07 DP  1.22.0  Ensure the correct line endings are used when copying
                       from the SQL Pane [Nikolai Zhubr]
2015-09-25 AV  1.22.0  Toolbar icons, and menu items for Commit and Rollback
                       actions.  [John Obaterspok]
2015-09-24 DP  1.22.0  Display the connection details for the current browser
                       object in the status bar [Adam Scott]
2015-09-21 AV  1.22.0  Fixed an issue related to different menus enabling in
                       the Query Tool on Ubunutu unity.
                       [Reported by: Vahdet Mert]
2015-09-21 AV  1.22.0  Reset the position (x, y) for dialog(s), and frame(s) to
                       0 (if found negative), while saving its position and
                       size. [Reported By: Mark, Patch: Sanket Mehta,
                       Reworked, and Reviewed: Ashesh]
2015-09-21 AV  1.22.0  Fixes an issue identifying the return type to TABLE in
                       some cases, using pg_get_function_result(..) for the
                       same instead of format_type(..)
                       [Reported By: Guillermo E. Villanueva,
                       PATCH:Sanket Mehta]
2015-09-21 AV  1.22.0  Honour PGPASSFILE environment variable for saving,
                       retrieving the password instead of always works with
                       pgpass.conf (on windows)/.pgpass (on non-windows)
                       [PATCH: Prasad Somwanshi, Reworked by: Sanket Mehta,
                       Reviewed by: Ashesh Vashi, Sanket Mehta]
2015-09-14 AV  1.22.0  Fix a segfault occurs while detecting transaction
                       section requirement, when autocommit has been disabled.
                       [Reported by John Obaterspok, Patch by Sanket Mehta]
2015-09-14 AV  1.22.0  Format execution time in a more readable manner
                       [John Obaterspok]
2015-07-27 AV  1.22.0  Improve sorting in Data editor
                       [J. F. Oster, Reviewed by Sanket Mehta]
2015-07-27 AV  1.22.0  Allow to format the selecte SQL using external tools
                       in Query Editor [J. F. Oster]
2015-05-22 AV  1.22.0  Allow to set auto-commit mode to on/off in the query
                       editor [Sanket Mehta]

4 files changed, 12 insertions, 25 deletions

diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile
index 59ec3cae7d7..d256d22c66f 100644
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.52 2016/03/05 11:28:12 jperkin Exp $
+# $NetBSD: Makefile,v 1.53 2016/03/16 04:46:24 richard Exp $
 
-DISTNAME=	pgadmin3-1.20.0
-PKGREVISION=	1
+DISTNAME=	pgadmin3-1.22.0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=pgadmin3/release/v${PKGVERSION_NOREV}/src/}
 
-MAINTAINER=	joerg@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.pgadmin.org/
 COMMENT=	Graphical PostgreSQL client and administration tool
 LICENSE=	postgresql-license
diff --git a/databases/pgadmin3/PLIST b/databases/pgadmin3/PLIST
index f10ef3a241a..d37b88f6a94 100644
--- a/databases/pgadmin3/PLIST
+++ b/databases/pgadmin3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2013/10/13 12:06:30 richard Exp $
+@comment $NetBSD: PLIST,v 1.12 2016/03/16 04:46:24 richard Exp $
 bin/pgadmin3
 share/pgadmin3/branding/branding.ini
 share/pgadmin3/docs/cs_CZ/hints/autovacuum.html
@@ -108,6 +108,7 @@ ${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup-3.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup-4.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/basic.css
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/classic.css
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment-bright.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment-close.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment.png
@@ -126,6 +127,7 @@ ${PLIST.doc}share/pgadmin3/docs/en_US/_static/gridopt-filter.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/gridopt-sort.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/guru-connect.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/jquery.js
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/jquery-1.11.1.js
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/locks.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/logfile.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/main.png
@@ -191,6 +193,7 @@ ${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-upgrade.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/status.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/transaction.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/underscore.js
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/underscore-1.3.1.js
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/up-pressed.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/up.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/websupport.js
diff --git a/databases/pgadmin3/distinfo b/databases/pgadmin3/distinfo
index 0f26eda8b39..7cd3bda4947 100644
--- a/databases/pgadmin3/distinfo
+++ b/databases/pgadmin3/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.14 2016/02/16 03:45:18 dbj Exp $
+$NetBSD: distinfo,v 1.15 2016/03/16 04:46:24 richard Exp $
 
-SHA1 (pgadmin3-1.20.0.tar.gz) = 70ade343c286ef4413961317d41477b47aac675a
-RMD160 (pgadmin3-1.20.0.tar.gz) = 3f2902b68a915d88bc93c10b897f4c163459b03e
-SHA512 (pgadmin3-1.20.0.tar.gz) = 83521a16d60bf8c9cffb03e4fb401a31e28f764c31608c0b223f7c88a14a09f665c976f3472debd4ad8b6cd54f0fbd2b8de352c296180e6ea6f8088cb45447bc
-Size (pgadmin3-1.20.0.tar.gz) = 14394997 bytes
+SHA1 (pgadmin3-1.22.0.tar.gz) = 3091b0bdc5156e54197f157a86240e47af9becc2
+RMD160 (pgadmin3-1.22.0.tar.gz) = 6c5c8c28c0aaa7cd9720a6089fafe770210f002c
+SHA512 (pgadmin3-1.22.0.tar.gz) = db16ac1b92e95a6da51be973b6833e53aed4c1d8740c8bccbfd778b0c3d3a4158fb13107761e0a39227aea87360be3b297ebc8809ac8ca5102d673935a33727c
+Size (pgadmin3-1.22.0.tar.gz) = 14668096 bytes
 SHA1 (patch-configure) = 52be492c191e3a249bcbf88075f0f2a2f1a0f76a
-SHA1 (patch-pgadmin_ctl_ctlMenuToolbar.cpp) = c3c2ed84d9cd2d06bb1f63af86008c24b2c39d3f
diff --git a/databases/pgadmin3/patches/patch-pgadmin_ctl_ctlMenuToolbar.cpp b/databases/pgadmin3/patches/patch-pgadmin_ctl_ctlMenuToolbar.cpp
deleted file mode 100644
index b7ec48ce8c7..00000000000
--- a/databases/pgadmin3/patches/patch-pgadmin_ctl_ctlMenuToolbar.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-pgadmin_ctl_ctlMenuToolbar.cpp,v 1.1 2015/08/05 15:29:00 richard Exp $
-Resolved an assertion error opening the plugin popup menu
-for wxWidgets 3.0 (upstream commit b75c57f69e4799507622b8d2f9820cda2bf154a3)
---- pgadmin/ctl/ctlMenuToolbar.cpp.orig	2014-01-27 12:11:43.000000000 +0000
-+++ pgadmin/ctl/ctlMenuToolbar.cpp
-@@ -109,7 +109,7 @@ void ctlMenuButton::DoProcessLeftClick(w
- 		menu_pos.y = button_size.GetHeight();
- 	}
- 
--	PopupMenu(m_menu, menu_pos);
-+	DoPopupMenu(m_menu, menu_pos.x, menu_pos.y);
- }
- 
-