Changes 1.12.1:

* Fix the debugger invocation code to ensure it handles different combinations
  of server version and libpq builds as cleanly as possible.
* Fix the double line number in the function properties dialog.
* Fix for log_statement in 7.4.
* Lots of fixes on my "sort column" patch.
* Avoid an error when viewing index statistics in languages other than English.
* Fix connection color on the query tool
* Fix the reverse-engineered query for triggers
* Fix the server's property dialog for unpriviledged users
* Fix a crash if pressing escape in the edit grid filter and sorting dialogue.
  Add a tooltip and make RO the queries combobox
* Fix the perspective string parameter

4 files changed, 31 insertions, 8 deletions

diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile
index 8341e6c2ab2..82daecefe71 100644
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2010/09/22 12:53:28 adam Exp $
+# $NetBSD: Makefile,v 1.18 2010/11/05 20:21:17 adam Exp $
 
 .include "../../databases/postgresql84/Makefile.mirrors"
 
-DISTNAME=	pgadmin3-1.12.0
+DISTNAME=	pgadmin3-1.12.1
 CATEGORIES=	databases
-MASTER_SITES=	${PGSQL_MIRRORS:=pgadmin3/release/v1.12.0/src/}
+MASTER_SITES=	${PGSQL_MIRRORS:=pgadmin3/release/v${PKGVERSION_NOREV}/src/}
 
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://www.pgadmin.org/
diff --git a/databases/pgadmin3/PLIST b/databases/pgadmin3/PLIST
index 55cd1c5c1e2..2d13ec4fc33 100644
--- a/databases/pgadmin3/PLIST
+++ b/databases/pgadmin3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2010/09/22 12:53:28 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/11/05 20:21:17 adam Exp $
 bin/pgadmin3
 share/pgadmin3/branding/branding.ini
 share/pgadmin3/docs/cs_CZ/appendices.html
@@ -162,6 +162,9 @@ share/pgadmin3/docs/en_US/hints/pk.html
 share/pgadmin3/docs/en_US/hints/saving-passwords.html
 share/pgadmin3/docs/en_US/hints/vacuum.html
 share/pgadmin3/docs/en_US/hints/view-without-pk.html
+share/pgadmin3/docs/en_US/images/backup-2.png
+share/pgadmin3/docs/en_US/images/backup-3.png
+share/pgadmin3/docs/en_US/images/backup-4.png
 share/pgadmin3/docs/en_US/images/backup.png
 share/pgadmin3/docs/en_US/images/connect.png
 share/pgadmin3/docs/en_US/images/debugger.png
@@ -179,11 +182,15 @@ share/pgadmin3/docs/en_US/images/maintenance.png
 share/pgadmin3/docs/en_US/images/manage-macros.png
 share/pgadmin3/docs/en_US/images/no-hba.png
 share/pgadmin3/docs/en_US/images/not-running.png
+share/pgadmin3/docs/en_US/images/options-browser.png
+share/pgadmin3/docs/en_US/images/options-colours.png
 share/pgadmin3/docs/en_US/images/options-display.png
 share/pgadmin3/docs/en_US/images/options-general.png
 share/pgadmin3/docs/en_US/images/options-logging.png
 share/pgadmin3/docs/en_US/images/options-pref.png
+share/pgadmin3/docs/en_US/images/options-preferences.png
 share/pgadmin3/docs/en_US/images/options-query.png
+share/pgadmin3/docs/en_US/images/options-querytool.png
 share/pgadmin3/docs/en_US/images/password.png
 share/pgadmin3/docs/en_US/images/pgagent-jobdetails.png
 share/pgadmin3/docs/en_US/images/pgagent-jobproperties.png
@@ -199,6 +206,9 @@ share/pgadmin3/docs/en_US/images/query-connect.png
 share/pgadmin3/docs/en_US/images/query.png
 share/pgadmin3/docs/en_US/images/reporttool-html.png
 share/pgadmin3/docs/en_US/images/reporttool-xml.png
+share/pgadmin3/docs/en_US/images/restore-2.png
+share/pgadmin3/docs/en_US/images/restore-3.png
+share/pgadmin3/docs/en_US/images/restore-4.png
 share/pgadmin3/docs/en_US/images/restore-content.png
 share/pgadmin3/docs/en_US/images/restore.png
 share/pgadmin3/docs/en_US/images/server.png
@@ -227,6 +237,7 @@ share/pgadmin3/docs/en_US/options-tab2.html
 share/pgadmin3/docs/en_US/options-tab3.html
 share/pgadmin3/docs/en_US/options-tab4.html
 share/pgadmin3/docs/en_US/options-tab5.html
+share/pgadmin3/docs/en_US/options-tab6.html
 share/pgadmin3/docs/en_US/options.html
 share/pgadmin3/docs/en_US/password.html
 share/pgadmin3/docs/en_US/pgadmin3.css
@@ -375,6 +386,7 @@ share/pgadmin3/docs/fr_FR/options-tab2.html
 share/pgadmin3/docs/fr_FR/options-tab3.html
 share/pgadmin3/docs/fr_FR/options-tab4.html
 share/pgadmin3/docs/fr_FR/options-tab5.html
+share/pgadmin3/docs/fr_FR/options-tab6.html
 share/pgadmin3/docs/fr_FR/options.html
 share/pgadmin3/docs/fr_FR/password.html
 share/pgadmin3/docs/fr_FR/pgadmin3.css
diff --git a/databases/pgadmin3/distinfo b/databases/pgadmin3/distinfo
index 57525d28174..9d28364c772 100644
--- a/databases/pgadmin3/distinfo
+++ b/databases/pgadmin3/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.7 2010/09/22 12:53:28 adam Exp $
+$NetBSD: distinfo,v 1.8 2010/11/05 20:21:18 adam Exp $
 
-SHA1 (pgadmin3-1.12.0.tar.gz) = edceaa1556db4e894a9337309248cb7a32e83602
-RMD160 (pgadmin3-1.12.0.tar.gz) = d14b4cf0b9ff409e6e054187e0f34b00c8a90806
-Size (pgadmin3-1.12.0.tar.gz) = 13258032 bytes
+SHA1 (pgadmin3-1.12.1.tar.gz) = 6b8b09cdbd76d09bc8a84f6f6ebd852d5a76c575
+RMD160 (pgadmin3-1.12.1.tar.gz) = 26b7bafcf72c0ee9ac6f153ac02535626f4c7bcf
+Size (pgadmin3-1.12.1.tar.gz) = 15106786 bytes
 SHA1 (patch-aa) = 53bb8be237acce254d50a9b7a33bdc054a5a9b4a
 SHA1 (patch-ab) = 266fcf43dbb507a920d3b2c4446ea86d4cc599af
 SHA1 (patch-ac) = debdeb377a4496001fdc535bdc4039aa74088c3c
+SHA1 (patch-ad) = 140b014beee22447a5cf10d86767f099eb378222
diff --git a/databases/pgadmin3/patches/patch-ad b/databases/pgadmin3/patches/patch-ad
new file mode 100644
index 00000000000..12b958fd583
--- /dev/null
+++ b/databases/pgadmin3/patches/patch-ad
@@ -0,0 +1,10 @@
+$NetBSD: patch-ad,v 1.1 2010/11/05 20:21:18 adam Exp $
+
+--- pgadmin/Makefile.deps.orig	2010-11-05 19:57:04.000000000 +0000
++++ pgadmin/Makefile.deps
+@@ -1,5 +1,3 @@
+ frmAbout.o: $(srcdir)/include/svnversion.h
+-$(srcdir)/include/svnversion.h: fake-update-svn-target
+-	./ver_svn.sh
+ 
+ fake-update-svn-target: