pgAdmin 1.16.1 has been released, offering 19 bug fixes over the previous version.

 The list of bug fixes is available in the CHANGELOG.

 The following are the recent Changes
 ------------------------------------

 Date       Dev Ver     Change details
 ---------- --- ------  --------------
 2012-12-03 DP  1.16.1  Prevent a crash that could happen if further changes
                        were made on a dialogue after using the Apply button.
                        [Akshay Joshi]
 2012-11-29 GL  1.16.1  Save new comments on already existing columns when
                        editing a table. Per a report from Jeff Janes.
 2012-11-29 GL  1.16.1  Fix the query editor behaviour when executing COPY TO
                        stdout and COPY FROM stdin [Heikki Linnakangas]
 2012-11-28 AV  1.16.1  Date picker controls returns a full timestamp by
                        default, which can cause inadvertent date changes
                        on jobs and role validty dates. Ignore the time part.
 2012-11-26 MH  1.16.1  Fix query for database descriptions
 2012-11-15 DP  1.16.1  Avoid querying the catalogs for toast table settings
                        for every table in the database. This gives a huge
                        performance gain with large schemas.
 2012-11-08 DP  1.16.1  Prevent a crash when refreshing a node which has a
                        child with an open dialogue [Dhiraj Chawla]
 2012-11-08 DP  1.16.1  Fix dropping/renaming of indexes [Akshay Joshi]
 2012-11-08 DP  1.16.1  Avoid updating the GQB model on every key press in
                        the query tool [Dhiraj Chawla]
 2012-11-02 DP  1.16.1  Fix a crash that can occur when renaming objects.
                        [Ashesh Vashi/Sachin Srivastava]
 2012-11-01 DP  1.16.1  Fix dropping of constraints [Akshay Joshi]
 2012-10-31 DP  1.16.1  Fix the "blocked by" column in the server status
                        dialogue on 9.2 servers [Sachin Srivastava]
 2012-10-11 DP  1.16.1  Prevent a crash if the query tool is closed whilst a
                        file is loading [Akshay Joshi]
 2012-10-09 AV  1.16.1  Fix setting of comments on PPAS procedures.
 2012-10-08 DP  1.16.1  Don't autosize the search results columns if no
                        results are found [Akshay Joshi]
 2012-10-08 AV  1.16.1  Prevent a crash if opening a second config file in
                        the editor.
 2012-10-08 DP  1.16.1  Prevent the SSL options combo box displaying
                        duplicate options if the server dialogue is
                        reopened [Akshay Joshi]
 2012-09-14 GL  1.16.1  Fix trigger query when connected to PostgreSQL 8.2 or
                        lower, per a report from Jon Roberts.
 2012-09-12 GL  1.16.1  Fix message when executing an empty query, per Marc
                        Mamin.

11 files changed, 365 insertions, 387 deletions

diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile
index 38642446208..0264e97b0f6 100644
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@@ -1,21 +1,50 @@
-# $NetBSD: Makefile,v 1.38 2013/06/06 12:54:11 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2013/07/20 05:10:42 richard Exp $
 
-DISTNAME=	pgadmin3-1.12.1
-PKGREVISION=	17
+DISTNAME=	pgadmin3-1.16.1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=pgadmin3/release/v${PKGVERSION_NOREV}/src/}
 
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://www.pgadmin.org/
 COMMENT=	Graphical PostgreSQL client and administration tool
+LICENSE=	postgresql-license
 
-PGSQL_VERSIONS_ACCEPTED=90 84
-
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake msgfmt
+USE_LANGUAGES=		c99 c++
+USE_TOOLS+=		automake autoreconf gmake msgfmt
 GNU_CONFIGURE=		yes
+
+PKG_OPTIONS_VAR=        PKG_OPTIONS.pgadmin3
+PKG_SUPPORTED_OPTIONS=	pgadmin-db-designer doc
+PKG_SUGGESTED_OPTIONS=	pgadmin-db-designer
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS=	doc
+
+###
+### Database Designer support
+###
+.if !empty(PKG_OPTIONS:Mpgadmin-db-designer)
+CONFIGURE_ARGS+=        --enable-databasedesigner
+.endif
+
+.if !empty(PKG_OPTIONS:Mdoc)
+PLIST.doc=	yes
+PYTHON_FOR_BUILD_ONLY=yes
+.include "../../lang/python/pyversion.mk"
+BUILD_DEPENDS+=		${PYPKGPREFIX}-sphinx>=1.0:../../textproc/py-sphinx
+.else
+CONFIGURE_ENV+=		ac_cv_path_SPHINX_BUILD=
+.endif
+
 CONFIGURE_ARGS+=	--with-wx=${BUILDLINK_PREFIX.wxGTK28}
+CONFIGURE_ARGS+=	--with-libxml2=${BUILDLINK_PREFIX.libxml2}
+CONFIGURE_ARGS+=	--with-libxslt=${BUILDLINK_PREFIX.libxslt}
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf -vfi
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/wxGTK28/buildlink3.mk"
diff --git a/databases/pgadmin3/PLIST b/databases/pgadmin3/PLIST
index 2d13ec4fc33..acee94901d5 100644
--- a/databases/pgadmin3/PLIST
+++ b/databases/pgadmin3/PLIST
@@ -1,22 +1,7 @@
-@comment $NetBSD: PLIST,v 1.8 2010/11/05 20:21:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2013/07/20 05:10:42 richard Exp $
 bin/pgadmin3
+bin/png2c
 share/pgadmin3/branding/branding.ini
-share/pgadmin3/docs/cs_CZ/appendices.html
-share/pgadmin3/docs/cs_CZ/backup.html
-share/pgadmin3/docs/cs_CZ/bugreport.html
-share/pgadmin3/docs/cs_CZ/commandline.html
-share/pgadmin3/docs/cs_CZ/connect-error.html
-share/pgadmin3/docs/cs_CZ/connect.html
-share/pgadmin3/docs/cs_CZ/control-server.html
-share/pgadmin3/docs/cs_CZ/debugger.html
-share/pgadmin3/docs/cs_CZ/default-xsl.html
-share/pgadmin3/docs/cs_CZ/editgrid.html
-share/pgadmin3/docs/cs_CZ/export.html
-share/pgadmin3/docs/cs_CZ/extend.html
-share/pgadmin3/docs/cs_CZ/gqb.html
-share/pgadmin3/docs/cs_CZ/grantwiz.html
-share/pgadmin3/docs/cs_CZ/gridopts.html
-share/pgadmin3/docs/cs_CZ/guruhints.html
 share/pgadmin3/docs/cs_CZ/hints/autovacuum.html
 share/pgadmin3/docs/cs_CZ/hints/conn-hba.html
 share/pgadmin3/docs/cs_CZ/hints/conn-ident.html
@@ -31,93 +16,7 @@ share/pgadmin3/docs/cs_CZ/hints/pk.html
 share/pgadmin3/docs/cs_CZ/hints/saving-passwords.html
 share/pgadmin3/docs/cs_CZ/hints/vacuum.html
 share/pgadmin3/docs/cs_CZ/hints/view-without-pk.html
-share/pgadmin3/docs/cs_CZ/images/backup.png
-share/pgadmin3/docs/cs_CZ/images/debugger.png
-share/pgadmin3/docs/cs_CZ/images/editgrid.png
-share/pgadmin3/docs/cs_CZ/images/export.png
-share/pgadmin3/docs/cs_CZ/images/gqb.png
-share/pgadmin3/docs/cs_CZ/images/grantwiz.png
-share/pgadmin3/docs/cs_CZ/images/gridopt-filter.png
-share/pgadmin3/docs/cs_CZ/images/gridopt-sort.png
-share/pgadmin3/docs/cs_CZ/images/guru-connect.png
-share/pgadmin3/docs/cs_CZ/images/main.png
-share/pgadmin3/docs/cs_CZ/images/maintenance.png
-share/pgadmin3/docs/cs_CZ/images/manage-macros.png
-share/pgadmin3/docs/cs_CZ/images/no-hba.png
-share/pgadmin3/docs/cs_CZ/images/not-running.png
-share/pgadmin3/docs/cs_CZ/images/options-display.png
-share/pgadmin3/docs/cs_CZ/images/options-general.png
-share/pgadmin3/docs/cs_CZ/images/options-logging.png
-share/pgadmin3/docs/cs_CZ/images/options-pref.png
-share/pgadmin3/docs/cs_CZ/images/options-query.png
-share/pgadmin3/docs/cs_CZ/images/password.png
-share/pgadmin3/docs/cs_CZ/images/pgagent-jobdetails.png
-share/pgadmin3/docs/cs_CZ/images/pgagent-jobproperties.png
-share/pgadmin3/docs/cs_CZ/images/pgagent-jobstats.png
-share/pgadmin3/docs/cs_CZ/images/pgagent-scheduledetails1.png
-share/pgadmin3/docs/cs_CZ/images/pgagent-scheduledetails2.png
-share/pgadmin3/docs/cs_CZ/images/pgagent-scheduledetails3.png
-share/pgadmin3/docs/cs_CZ/images/pgagent-scheduleproperties.png
-share/pgadmin3/docs/cs_CZ/images/pgagent-stepdetails.png
-share/pgadmin3/docs/cs_CZ/images/pgagent-stepstats.png
-share/pgadmin3/docs/cs_CZ/images/query-analyze.png
-share/pgadmin3/docs/cs_CZ/images/query-connect.png
-share/pgadmin3/docs/cs_CZ/images/query.png
-share/pgadmin3/docs/cs_CZ/images/reporttool-html.png
-share/pgadmin3/docs/cs_CZ/images/reporttool-xml.png
-share/pgadmin3/docs/cs_CZ/images/restore.png
-share/pgadmin3/docs/cs_CZ/images/server.png
-share/pgadmin3/docs/cs_CZ/images/slony-create.png
-share/pgadmin3/docs/cs_CZ/images/slony-execute.png
-share/pgadmin3/docs/cs_CZ/images/slony-join.png
-share/pgadmin3/docs/cs_CZ/images/slony-listen.png
-share/pgadmin3/docs/cs_CZ/images/slony-overview.png
-share/pgadmin3/docs/cs_CZ/images/slony-path.png
-share/pgadmin3/docs/cs_CZ/images/slony-sequence.png
-share/pgadmin3/docs/cs_CZ/images/slony-set.png
-share/pgadmin3/docs/cs_CZ/images/slony-subscription.png
-share/pgadmin3/docs/cs_CZ/images/slony-table.png
-share/pgadmin3/docs/cs_CZ/images/slony-upgrade.png
-share/pgadmin3/docs/cs_CZ/images/status.png
-share/pgadmin3/docs/cs_CZ/index.html
-share/pgadmin3/docs/cs_CZ/kerberos.html
-share/pgadmin3/docs/cs_CZ/licence.html
-share/pgadmin3/docs/cs_CZ/macros.html
-share/pgadmin3/docs/cs_CZ/main.html
-share/pgadmin3/docs/cs_CZ/maintenance.html
-share/pgadmin3/docs/cs_CZ/openssl.html
-share/pgadmin3/docs/cs_CZ/options-tab1.html
-share/pgadmin3/docs/cs_CZ/options-tab2.html
-share/pgadmin3/docs/cs_CZ/options-tab3.html
-share/pgadmin3/docs/cs_CZ/options-tab4.html
-share/pgadmin3/docs/cs_CZ/options-tab5.html
-share/pgadmin3/docs/cs_CZ/options.html
-share/pgadmin3/docs/cs_CZ/password.html
 share/pgadmin3/docs/cs_CZ/pgadmin3.css
-share/pgadmin3/docs/cs_CZ/pgadmin3.hhc
-share/pgadmin3/docs/cs_CZ/pgadmin3.hhp
-share/pgadmin3/docs/cs_CZ/pgagent-install.html
-share/pgadmin3/docs/cs_CZ/pgagent-jobs.html
-share/pgadmin3/docs/cs_CZ/pgagent-schedules.html
-share/pgadmin3/docs/cs_CZ/pgagent-steps.html
-share/pgadmin3/docs/cs_CZ/pgagent.html
-share/pgadmin3/docs/cs_CZ/pgscript.html
-share/pgadmin3/docs/cs_CZ/query.html
-share/pgadmin3/docs/cs_CZ/reports.html
-share/pgadmin3/docs/cs_CZ/restore.html
-share/pgadmin3/docs/cs_CZ/sample-xml.html
-share/pgadmin3/docs/cs_CZ/slony-example.html
-share/pgadmin3/docs/cs_CZ/slony-execute.html
-share/pgadmin3/docs/cs_CZ/slony-functions.html
-share/pgadmin3/docs/cs_CZ/slony-install.html
-share/pgadmin3/docs/cs_CZ/slony-overview.html
-share/pgadmin3/docs/cs_CZ/slony-path.html
-share/pgadmin3/docs/cs_CZ/slony-set.html
-share/pgadmin3/docs/cs_CZ/slony.html
-share/pgadmin3/docs/cs_CZ/status.html
-share/pgadmin3/docs/cs_CZ/team.html
-share/pgadmin3/docs/cs_CZ/translation_team.html
-share/pgadmin3/docs/cs_CZ/using.html
 share/pgadmin3/docs/de_DE/hints/autovacuum.html
 share/pgadmin3/docs/de_DE/hints/conn-hba.html
 share/pgadmin3/docs/de_DE/hints/conn-ident.html
@@ -132,22 +31,184 @@ share/pgadmin3/docs/de_DE/hints/pk.html
 share/pgadmin3/docs/de_DE/hints/saving-passwords.html
 share/pgadmin3/docs/de_DE/hints/vacuum.html
 share/pgadmin3/docs/de_DE/hints/view-without-pk.html
-share/pgadmin3/docs/en_US/appendices.html
-share/pgadmin3/docs/en_US/backup.html
-share/pgadmin3/docs/en_US/bugreport.html
-share/pgadmin3/docs/en_US/commandline.html
-share/pgadmin3/docs/en_US/connect-error.html
-share/pgadmin3/docs/en_US/connect.html
-share/pgadmin3/docs/en_US/control-server.html
-share/pgadmin3/docs/en_US/debugger.html
-share/pgadmin3/docs/en_US/default-xsl.html
-share/pgadmin3/docs/en_US/editgrid.html
-share/pgadmin3/docs/en_US/export.html
-share/pgadmin3/docs/en_US/extend.html
-share/pgadmin3/docs/en_US/gqb.html
-share/pgadmin3/docs/en_US/grantwiz.html
-share/pgadmin3/docs/en_US/gridopts.html
-share/pgadmin3/docs/en_US/guruhints.html
+share/pgadmin3/docs/de_DE/pgadmin3.css
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/backup-2.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/backup-3.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/backup-4.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/backup.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/debugger.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/editgrid.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/export.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/gqb.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/grantwiz.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/gridopt-filter.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/gridopt-sort.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/guru-connect.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/main.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/maintenance.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/manage-macros.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/no-hba.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/not-running.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/options-binary_paths.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/options-colours.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/options-database_designer.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/options-display.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/options-favourites.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/options-guru_hints.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/options-help_paths.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/options-history_file.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/options-logging.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/options-macros.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/options-properties.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/options-query_editor.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/options-query_file.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/options-results_grid.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/options-server_status.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/options-ui_miscellaneous.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/options-user_interface.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/options.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/password.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-jobdetails.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-jobproperties.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-jobstats.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-scheduledetails1.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-scheduledetails2.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-scheduledetails3.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-scheduleproperties.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-stepdetails.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-stepstats.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/query-analyze.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/query-connect.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/query.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/reporttool-html.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/reporttool-xml.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/restore-2.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/restore-3.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/restore-4.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/restore.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/search.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/server.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-create.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-execute.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-join.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-listen.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-overview.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-path.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-sequence.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-set.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-subscription.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-table.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-upgrade.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_images/status.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/ajax-loader.gif
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup-2.png
+${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/comment-bright.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment-close.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/connect.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/debugger.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/default.css
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/doctools.js
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/down-pressed.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/down.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/editgrid.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/export.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/file.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/gqb.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/grantwiz.png
+${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/locks.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/logfile.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/main.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/maintenance.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/manage-macros.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/minus.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/no-hba.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/not-running.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-binary_paths.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-colours.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-database_designer.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-display.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-favourites.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-guru_hints.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-help_paths.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-history_file.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-logging.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-macros.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-properties.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-query_editor.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-query_file.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-results_grid.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-server_status.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-ui_miscellaneous.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-user_interface.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/options.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/password.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/pgagent-jobdetails.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/pgagent-jobproperties.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/pgagent-jobstats.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/pgagent-scheduledetails1.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/pgagent-scheduledetails2.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/pgagent-scheduledetails3.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/pgagent-scheduleproperties.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/pgagent-stepdetails.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/pgagent-stepstats.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/plus.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/pygments.css
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/query-analyze.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/query-connect.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/query.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/reporttool-html.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/reporttool-xml.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/restore-2.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/restore-3.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/restore-4.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/restore.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/search.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/searchtools.js
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/server.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/sidebar.js
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-create.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-execute.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-join.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-listen.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-overview.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-path.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-sequence.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-set.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-subscription.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-table.png
+${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/up-pressed.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/up.png
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/websupport.js
+${PLIST.doc}share/pgadmin3/docs/en_US/appendices.html
+${PLIST.doc}share/pgadmin3/docs/en_US/backup.html
+${PLIST.doc}share/pgadmin3/docs/en_US/bugreport.html
+${PLIST.doc}share/pgadmin3/docs/en_US/commandline.html
+${PLIST.doc}share/pgadmin3/docs/en_US/connect-error.html
+${PLIST.doc}share/pgadmin3/docs/en_US/connect.html
+${PLIST.doc}share/pgadmin3/docs/en_US/control-server.html
+${PLIST.doc}share/pgadmin3/docs/en_US/debugger.html
+${PLIST.doc}share/pgadmin3/docs/en_US/default-xsl.html
+${PLIST.doc}share/pgadmin3/docs/en_US/editgrid.html
+${PLIST.doc}share/pgadmin3/docs/en_US/export.html
+${PLIST.doc}share/pgadmin3/docs/en_US/extend.html
+${PLIST.doc}share/pgadmin3/docs/en_US/genindex.html
+${PLIST.doc}share/pgadmin3/docs/en_US/gqb.html
+${PLIST.doc}share/pgadmin3/docs/en_US/grantwiz.html
+${PLIST.doc}share/pgadmin3/docs/en_US/gridopts.html
+${PLIST.doc}share/pgadmin3/docs/en_US/guruhints.html
 share/pgadmin3/docs/en_US/hints/autovacuum.html
 share/pgadmin3/docs/en_US/hints/conn-hba.html
 share/pgadmin3/docs/en_US/hints/conn-ident.html
@@ -156,116 +217,57 @@ share/pgadmin3/docs/en_US/hints/encoding-ascii.html
 share/pgadmin3/docs/en_US/hints/encoding-unicode.html
 share/pgadmin3/docs/en_US/hints/fki.html
 share/pgadmin3/docs/en_US/hints/instrumentation.html
+share/pgadmin3/docs/en_US/hints/instrumentation91_with.html
+share/pgadmin3/docs/en_US/hints/instrumentation91_without.html
 share/pgadmin3/docs/en_US/hints/multiple.html
 share/pgadmin3/docs/en_US/hints/object-editing.html
 share/pgadmin3/docs/en_US/hints/pk.html
 share/pgadmin3/docs/en_US/hints/saving-passwords.html
+share/pgadmin3/docs/en_US/hints/vacuum-full.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
-share/pgadmin3/docs/en_US/images/editgrid.png
-share/pgadmin3/docs/en_US/images/export.png
-share/pgadmin3/docs/en_US/images/gqb.png
-share/pgadmin3/docs/en_US/images/grantwiz.png
-share/pgadmin3/docs/en_US/images/gridopt-filter.png
-share/pgadmin3/docs/en_US/images/gridopt-sort.png
-share/pgadmin3/docs/en_US/images/guru-connect.png
-share/pgadmin3/docs/en_US/images/locks.png
-share/pgadmin3/docs/en_US/images/logfile.png
-share/pgadmin3/docs/en_US/images/main.png
-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
-share/pgadmin3/docs/en_US/images/pgagent-jobstats.png
-share/pgadmin3/docs/en_US/images/pgagent-scheduledetails1.png
-share/pgadmin3/docs/en_US/images/pgagent-scheduledetails2.png
-share/pgadmin3/docs/en_US/images/pgagent-scheduledetails3.png
-share/pgadmin3/docs/en_US/images/pgagent-scheduleproperties.png
-share/pgadmin3/docs/en_US/images/pgagent-stepdetails.png
-share/pgadmin3/docs/en_US/images/pgagent-stepstats.png
-share/pgadmin3/docs/en_US/images/query-analyze.png
-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
-share/pgadmin3/docs/en_US/images/slony-create.png
-share/pgadmin3/docs/en_US/images/slony-execute.png
-share/pgadmin3/docs/en_US/images/slony-join.png
-share/pgadmin3/docs/en_US/images/slony-listen.png
-share/pgadmin3/docs/en_US/images/slony-overview.png
-share/pgadmin3/docs/en_US/images/slony-path.png
-share/pgadmin3/docs/en_US/images/slony-sequence.png
-share/pgadmin3/docs/en_US/images/slony-set.png
-share/pgadmin3/docs/en_US/images/slony-subscription.png
-share/pgadmin3/docs/en_US/images/slony-table.png
-share/pgadmin3/docs/en_US/images/slony-upgrade.png
-share/pgadmin3/docs/en_US/images/status.png
-share/pgadmin3/docs/en_US/images/transaction.png
-share/pgadmin3/docs/en_US/index.html
-share/pgadmin3/docs/en_US/kerberos.html
-share/pgadmin3/docs/en_US/licence.html
-share/pgadmin3/docs/en_US/macros.html
-share/pgadmin3/docs/en_US/main.html
-share/pgadmin3/docs/en_US/maintenance.html
-share/pgadmin3/docs/en_US/openssl.html
-share/pgadmin3/docs/en_US/options-tab1.html
-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
-share/pgadmin3/docs/en_US/pgadmin3.hhc
-share/pgadmin3/docs/en_US/pgadmin3.hhp
-share/pgadmin3/docs/en_US/pgadmin3.hhp.cached
-share/pgadmin3/docs/en_US/pgagent-install.html
-share/pgadmin3/docs/en_US/pgagent-jobs.html
-share/pgadmin3/docs/en_US/pgagent-schedules.html
-share/pgadmin3/docs/en_US/pgagent-steps.html
-share/pgadmin3/docs/en_US/pgagent.html
-share/pgadmin3/docs/en_US/pgscript.html
-share/pgadmin3/docs/en_US/query.html
-share/pgadmin3/docs/en_US/reports.html
-share/pgadmin3/docs/en_US/restore.html
-share/pgadmin3/docs/en_US/sample-xml.html
-share/pgadmin3/docs/en_US/slony-example.html
-share/pgadmin3/docs/en_US/slony-execute.html
-share/pgadmin3/docs/en_US/slony-functions.html
-share/pgadmin3/docs/en_US/slony-install.html
-share/pgadmin3/docs/en_US/slony-overview.html
-share/pgadmin3/docs/en_US/slony-path.html
-share/pgadmin3/docs/en_US/slony-set.html
-share/pgadmin3/docs/en_US/slony.html
-share/pgadmin3/docs/en_US/status.html
-share/pgadmin3/docs/en_US/team.html
-share/pgadmin3/docs/en_US/translation_team.html
-share/pgadmin3/docs/en_US/using.html
+${PLIST.doc}share/pgadmin3/docs/en_US/index.html
+${PLIST.doc}share/pgadmin3/docs/en_US/introduction.html
+${PLIST.doc}share/pgadmin3/docs/en_US/kerberos.html
+${PLIST.doc}share/pgadmin3/docs/en_US/licence.html
+${PLIST.doc}share/pgadmin3/docs/en_US/macros.html
+${PLIST.doc}share/pgadmin3/docs/en_US/main.html
+${PLIST.doc}share/pgadmin3/docs/en_US/maintenance.html
+${PLIST.doc}share/pgadmin3/docs/en_US/openssl.html
+${PLIST.doc}share/pgadmin3/docs/en_US/options-browser.html
+${PLIST.doc}share/pgadmin3/docs/en_US/options-database_designer.html
+${PLIST.doc}share/pgadmin3/docs/en_US/options-miscellaneous.html
+${PLIST.doc}share/pgadmin3/docs/en_US/options-query_tool.html
+${PLIST.doc}share/pgadmin3/docs/en_US/options-server_status.html
+${PLIST.doc}share/pgadmin3/docs/en_US/options.html
+${PLIST.doc}share/pgadmin3/docs/en_US/password.html
+${PLIST.doc}share/pgadmin3/docs/en_US/pgadmin3.hhc
+${PLIST.doc}share/pgadmin3/docs/en_US/pgadmin3.hhk
+${PLIST.doc}share/pgadmin3/docs/en_US/pgadmin3.hhp
+${PLIST.doc}share/pgadmin3/docs/en_US/pgadmin3.stp
+${PLIST.doc}share/pgadmin3/docs/en_US/pgagent-install.html
+${PLIST.doc}share/pgadmin3/docs/en_US/pgagent-jobs.html
+${PLIST.doc}share/pgadmin3/docs/en_US/pgagent-schedules.html
+${PLIST.doc}share/pgadmin3/docs/en_US/pgagent-steps.html
+${PLIST.doc}share/pgadmin3/docs/en_US/pgagent.html
+${PLIST.doc}share/pgadmin3/docs/en_US/pgscript.html
+${PLIST.doc}share/pgadmin3/docs/en_US/query.html
+${PLIST.doc}share/pgadmin3/docs/en_US/reports.html
+${PLIST.doc}share/pgadmin3/docs/en_US/restore.html
+${PLIST.doc}share/pgadmin3/docs/en_US/sample-xml.html
+${PLIST.doc}share/pgadmin3/docs/en_US/search_object.html
+${PLIST.doc}share/pgadmin3/docs/en_US/slony-example.html
+${PLIST.doc}share/pgadmin3/docs/en_US/slony-execute.html
+${PLIST.doc}share/pgadmin3/docs/en_US/slony-functions.html
+${PLIST.doc}share/pgadmin3/docs/en_US/slony-install.html
+${PLIST.doc}share/pgadmin3/docs/en_US/slony-overview.html
+${PLIST.doc}share/pgadmin3/docs/en_US/slony-path.html
+${PLIST.doc}share/pgadmin3/docs/en_US/slony-set.html
+${PLIST.doc}share/pgadmin3/docs/en_US/slony.html
+${PLIST.doc}share/pgadmin3/docs/en_US/status.html
+${PLIST.doc}share/pgadmin3/docs/en_US/team.html
+${PLIST.doc}share/pgadmin3/docs/en_US/translation_team.html
+${PLIST.doc}share/pgadmin3/docs/en_US/using.html
 share/pgadmin3/docs/es_ES/hints/autovacuum.html
 share/pgadmin3/docs/es_ES/hints/conn-hba.html
 share/pgadmin3/docs/es_ES/hints/conn-ident.html
@@ -279,6 +281,7 @@ share/pgadmin3/docs/es_ES/hints/object-editing.html
 share/pgadmin3/docs/es_ES/hints/pk.html
 share/pgadmin3/docs/es_ES/hints/vacuum.html
 share/pgadmin3/docs/es_ES/hints/view-without-pk.html
+share/pgadmin3/docs/es_ES/pgadmin3.css
 share/pgadmin3/docs/fi_FI/hints/autovacuum.html
 share/pgadmin3/docs/fi_FI/hints/conn-hba.html
 share/pgadmin3/docs/fi_FI/hints/conn-ident.html
@@ -293,22 +296,7 @@ share/pgadmin3/docs/fi_FI/hints/pk.html
 share/pgadmin3/docs/fi_FI/hints/saving-passwords.html
 share/pgadmin3/docs/fi_FI/hints/vacuum.html
 share/pgadmin3/docs/fi_FI/hints/view-without-pk.html
-share/pgadmin3/docs/fr_FR/appendices.html
-share/pgadmin3/docs/fr_FR/backup.html
-share/pgadmin3/docs/fr_FR/bugreport.html
-share/pgadmin3/docs/fr_FR/commandline.html
-share/pgadmin3/docs/fr_FR/connect-error.html
-share/pgadmin3/docs/fr_FR/connect.html
-share/pgadmin3/docs/fr_FR/control-server.html
-share/pgadmin3/docs/fr_FR/debugger.html
-share/pgadmin3/docs/fr_FR/default-xsl.html
-share/pgadmin3/docs/fr_FR/editgrid.html
-share/pgadmin3/docs/fr_FR/export.html
-share/pgadmin3/docs/fr_FR/extend.html
-share/pgadmin3/docs/fr_FR/gqb.html
-share/pgadmin3/docs/fr_FR/grantwiz.html
-share/pgadmin3/docs/fr_FR/gridopts.html
-share/pgadmin3/docs/fr_FR/guruhints.html
+share/pgadmin3/docs/fi_FI/pgadmin3.css
 share/pgadmin3/docs/fr_FR/hints/autovacuum.html
 share/pgadmin3/docs/fr_FR/hints/conn-hba.html
 share/pgadmin3/docs/fr_FR/hints/conn-ident.html
@@ -317,103 +305,14 @@ share/pgadmin3/docs/fr_FR/hints/encoding-ascii.html
 share/pgadmin3/docs/fr_FR/hints/encoding-unicode.html
 share/pgadmin3/docs/fr_FR/hints/fki.html
 share/pgadmin3/docs/fr_FR/hints/instrumentation.html
+share/pgadmin3/docs/fr_FR/hints/instrumentation91_with.html
+share/pgadmin3/docs/fr_FR/hints/instrumentation91_without.html
 share/pgadmin3/docs/fr_FR/hints/multiple.html
 share/pgadmin3/docs/fr_FR/hints/pk.html
+share/pgadmin3/docs/fr_FR/hints/vacuum-full.html
 share/pgadmin3/docs/fr_FR/hints/vacuum.html
 share/pgadmin3/docs/fr_FR/hints/view-without-pk.html
-share/pgadmin3/docs/fr_FR/images/backup.png
-share/pgadmin3/docs/fr_FR/images/connect.png
-share/pgadmin3/docs/fr_FR/images/debugger.png
-share/pgadmin3/docs/fr_FR/images/editgrid.png
-share/pgadmin3/docs/fr_FR/images/export.png
-share/pgadmin3/docs/fr_FR/images/gqb.png
-share/pgadmin3/docs/fr_FR/images/grantwiz.png
-share/pgadmin3/docs/fr_FR/images/gridopt-filter.png
-share/pgadmin3/docs/fr_FR/images/gridopt-sort.png
-share/pgadmin3/docs/fr_FR/images/guru-connect.png
-share/pgadmin3/docs/fr_FR/images/locks.png
-share/pgadmin3/docs/fr_FR/images/logfile.png
-share/pgadmin3/docs/fr_FR/images/main.png
-share/pgadmin3/docs/fr_FR/images/maintenance.png
-share/pgadmin3/docs/fr_FR/images/manage-macros.png
-share/pgadmin3/docs/fr_FR/images/no-hba.png
-share/pgadmin3/docs/fr_FR/images/not-running.png
-share/pgadmin3/docs/fr_FR/images/options-display.png
-share/pgadmin3/docs/fr_FR/images/options-general.png
-share/pgadmin3/docs/fr_FR/images/options-logging.png
-share/pgadmin3/docs/fr_FR/images/options-pref.png
-share/pgadmin3/docs/fr_FR/images/options-query.png
-share/pgadmin3/docs/fr_FR/images/password.png
-share/pgadmin3/docs/fr_FR/images/pgagent-jobdetails.png
-share/pgadmin3/docs/fr_FR/images/pgagent-jobproperties.png
-share/pgadmin3/docs/fr_FR/images/pgagent-jobstats.png
-share/pgadmin3/docs/fr_FR/images/pgagent-scheduledetails1.png
-share/pgadmin3/docs/fr_FR/images/pgagent-scheduledetails2.png
-share/pgadmin3/docs/fr_FR/images/pgagent-scheduledetails3.png
-share/pgadmin3/docs/fr_FR/images/pgagent-scheduleproperties.png
-share/pgadmin3/docs/fr_FR/images/pgagent-stepdetails.png
-share/pgadmin3/docs/fr_FR/images/pgagent-stepstats.png
-share/pgadmin3/docs/fr_FR/images/query-analyze.png
-share/pgadmin3/docs/fr_FR/images/query-connect.png
-share/pgadmin3/docs/fr_FR/images/query.png
-share/pgadmin3/docs/fr_FR/images/reporttool-html.png
-share/pgadmin3/docs/fr_FR/images/reporttool-xml.png
-share/pgadmin3/docs/fr_FR/images/restore-content.png
-share/pgadmin3/docs/fr_FR/images/restore.png
-share/pgadmin3/docs/fr_FR/images/server.png
-share/pgadmin3/docs/fr_FR/images/slony-create.png
-share/pgadmin3/docs/fr_FR/images/slony-execute.png
-share/pgadmin3/docs/fr_FR/images/slony-join.png
-share/pgadmin3/docs/fr_FR/images/slony-listen.png
-share/pgadmin3/docs/fr_FR/images/slony-overview.png
-share/pgadmin3/docs/fr_FR/images/slony-path.png
-share/pgadmin3/docs/fr_FR/images/slony-sequence.png
-share/pgadmin3/docs/fr_FR/images/slony-set.png
-share/pgadmin3/docs/fr_FR/images/slony-subscription.png
-share/pgadmin3/docs/fr_FR/images/slony-table.png
-share/pgadmin3/docs/fr_FR/images/slony-upgrade.png
-share/pgadmin3/docs/fr_FR/images/status.png
-share/pgadmin3/docs/fr_FR/images/transaction.png
-share/pgadmin3/docs/fr_FR/index.html
-share/pgadmin3/docs/fr_FR/kerberos.html
-share/pgadmin3/docs/fr_FR/licence.html
-share/pgadmin3/docs/fr_FR/macros.html
-share/pgadmin3/docs/fr_FR/main.html
-share/pgadmin3/docs/fr_FR/maintenance.html
-share/pgadmin3/docs/fr_FR/openssl.html
-share/pgadmin3/docs/fr_FR/options-tab1.html
-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
-share/pgadmin3/docs/fr_FR/pgadmin3.hhc
-share/pgadmin3/docs/fr_FR/pgadmin3.hhp
-share/pgadmin3/docs/fr_FR/pgagent-install.html
-share/pgadmin3/docs/fr_FR/pgagent-jobs.html
-share/pgadmin3/docs/fr_FR/pgagent-schedules.html
-share/pgadmin3/docs/fr_FR/pgagent-steps.html
-share/pgadmin3/docs/fr_FR/pgagent.html
-share/pgadmin3/docs/fr_FR/pgscript.html
-share/pgadmin3/docs/fr_FR/query.html
-share/pgadmin3/docs/fr_FR/reports.html
-share/pgadmin3/docs/fr_FR/restore.html
-share/pgadmin3/docs/fr_FR/sample-xml.html
-share/pgadmin3/docs/fr_FR/slony-example.html
-share/pgadmin3/docs/fr_FR/slony-execute.html
-share/pgadmin3/docs/fr_FR/slony-functions.html
-share/pgadmin3/docs/fr_FR/slony-install.html
-share/pgadmin3/docs/fr_FR/slony-overview.html
-share/pgadmin3/docs/fr_FR/slony-path.html
-share/pgadmin3/docs/fr_FR/slony-set.html
-share/pgadmin3/docs/fr_FR/slony.html
-share/pgadmin3/docs/fr_FR/status.html
-share/pgadmin3/docs/fr_FR/team.html
-share/pgadmin3/docs/fr_FR/translation_team.html
-share/pgadmin3/docs/fr_FR/using.html
 share/pgadmin3/docs/sl_SI/hints/autovacuum.html
 share/pgadmin3/docs/sl_SI/hints/conn-hba.html
 share/pgadmin3/docs/sl_SI/hints/conn-ident.html
@@ -426,6 +325,7 @@ share/pgadmin3/docs/sl_SI/hints/multiple.html
 share/pgadmin3/docs/sl_SI/hints/pk.html
 share/pgadmin3/docs/sl_SI/hints/vacuum.html
 share/pgadmin3/docs/sl_SI/hints/view-without-pk.html
+share/pgadmin3/docs/sl_SI/pgadmin3.css
 share/pgadmin3/docs/zh_CN/hints/autovacuum.html
 share/pgadmin3/docs/zh_CN/hints/conn-hba.html
 share/pgadmin3/docs/zh_CN/hints/conn-ident.html
@@ -440,6 +340,7 @@ share/pgadmin3/docs/zh_CN/hints/pk.html
 share/pgadmin3/docs/zh_CN/hints/saving-passwords.html
 share/pgadmin3/docs/zh_CN/hints/vacuum.html
 share/pgadmin3/docs/zh_CN/hints/view-without-pk.html
+share/pgadmin3/docs/zh_CN/pgadmin3.css
 share/pgadmin3/docs/zh_TW/hints/autovacuum.html
 share/pgadmin3/docs/zh_TW/hints/conn-hba.html
 share/pgadmin3/docs/zh_TW/hints/conn-ident.html
@@ -454,6 +355,7 @@ share/pgadmin3/docs/zh_TW/hints/pk.html
 share/pgadmin3/docs/zh_TW/hints/saving-passwords.html
 share/pgadmin3/docs/zh_TW/hints/vacuum.html
 share/pgadmin3/docs/zh_TW/hints/view-without-pk.html
+share/pgadmin3/docs/zh_TW/pgadmin3.css
 share/pgadmin3/i18n/af_ZA/pgadmin3.mo
 share/pgadmin3/i18n/af_ZA/wxstd.mo
 share/pgadmin3/i18n/ca_ES/pgadmin3.mo
@@ -470,6 +372,10 @@ share/pgadmin3/i18n/it_IT/pgadmin3.mo
 share/pgadmin3/i18n/it_IT/wxstd.mo
 share/pgadmin3/i18n/ja_JP/pgadmin3.mo
 share/pgadmin3/i18n/ja_JP/wxstd.mo
+share/pgadmin3/i18n/ko_KR/pgadmin3.mo
+share/pgadmin3/i18n/ko_KR/wxstd.mo
+share/pgadmin3/i18n/lv_LV/pgadmin3.mo
+share/pgadmin3/i18n/lv_LV/wxstd.mo
 share/pgadmin3/i18n/pg_settings.csv
 share/pgadmin3/i18n/pgadmin3.lng
 share/pgadmin3/i18n/pl_PL/pgadmin3.mo
@@ -485,5 +391,5 @@ share/pgadmin3/i18n/zh_CN/pgadmin3.mo
 share/pgadmin3/i18n/zh_CN/wxstd.mo
 share/pgadmin3/i18n/zh_TW/pgadmin3.mo
 share/pgadmin3/i18n/zh_TW/wxstd.mo
-share/pgadmin3/plugins.ini
+share/pgadmin3/plugins.d/plugins.ini
 share/pgadmin3/settings.ini
diff --git a/databases/pgadmin3/distinfo b/databases/pgadmin3/distinfo
index 9d28364c772..b34acb12e99 100644
--- a/databases/pgadmin3/distinfo
+++ b/databases/pgadmin3/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.8 2010/11/05 20:21:18 adam Exp $
+$NetBSD: distinfo,v 1.9 2013/07/20 05:10:42 richard Exp $
 
-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
+SHA1 (pgadmin3-1.16.1.tar.gz) = f5eaa8184d9e30662eec3a7bf639258eb8a658a3
+RMD160 (pgadmin3-1.16.1.tar.gz) = b2830f6dcc9b22592cc196e27b2e844a3717e1a9
+Size (pgadmin3-1.16.1.tar.gz) = 13783723 bytes
+SHA1 (patch-Makefile.am) = a3a9b705eb74d66fda228c2ce13c61c50d88a84a
+SHA1 (patch-acinclude.m4) = 3402690e3446ed068bceb9ea4711171e851d58df
+SHA1 (patch-configure) = 0803a3d1ef954bedbbb181858b135e622bc1642e
+SHA1 (patch-pgadmin_gqb_gqbView.cpp) = 1a0248ba837f068c7304c97f5f022ae566b6dab9
+SHA1 (patch-xtra_pgscript_file_test_execute.sh) = e0af8b239c9bd1d2b62053224f225acb7fcee17b
diff --git a/databases/pgadmin3/patches/patch-Makefile.am b/databases/pgadmin3/patches/patch-Makefile.am
new file mode 100644
index 00000000000..69952c35598
--- /dev/null
+++ b/databases/pgadmin3/patches/patch-Makefile.am
@@ -0,0 +1,27 @@
+$NetBSD: patch-Makefile.am,v 1.1 2013/07/20 05:10:42 richard Exp $
+
+Suppress hack for creating hhp.cached file in help_dir
+and use pkgsrc supplied $(MAKE) for building sphinx
+
+--- Makefile.am.orig	2012-08-02 14:28:59.000000000 +0000
++++ Makefile.am
+@@ -71,8 +71,8 @@ endif
+ 
+ # We need to ensure the help cache is world writeable
+ install-data-hook:
+-	touch $(help_dir)/docs/en_US/pgadmin3.hhp.cached
+-	chmod 0666 $(help_dir)/docs/en_US/pgadmin3.hhp.cached
++#	touch $(help_dir)/docs/en_US/pgadmin3.hhp.cached
++#	chmod 0666 $(help_dir)/docs/en_US/pgadmin3.hhp.cached
+ if SPHINX_BUILD
+ 	if [ -d $(top_srcdir)/docs/en_US/_build/htmlhelp ]; then cp -R $(top_srcdir)/docs/en_US/_build/htmlhelp/* $(help_dir)/docs/en_US/; fi
+ 
+@@ -94,7 +94,7 @@ style:
+ # Create HTML docs
+ doc:
+ if SPHINX_BUILD
+-	cd $(top_srcdir)/docs/en_US && make -f Makefile.sphinx SPHINXBUILD=${SPHINX_BUILD} htmlhelp
++	cd $(top_srcdir)/docs/en_US && $(MAKE) -f Makefile.sphinx SPHINXBUILD=${SPHINX_BUILD} htmlhelp
+ endif
+ 
+ all: doc
diff --git a/databases/pgadmin3/patches/patch-aa b/databases/pgadmin3/patches/patch-aa
deleted file mode 100644
index ceee60f51af..00000000000
--- a/databases/pgadmin3/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2010/01/25 14:05:22 adam Exp $
-
---- Makefile.in.orig	2010-01-25 08:27:37.000000000 +0000
-+++ Makefile.in
-@@ -879,9 +879,6 @@ uninstall-am: uninstall-nobase_dist_data
- 	uninstall-nobase_dist_pkgdataDATA
- 
- 
--# We need to ensure the help cache is world writeable
--install-data-hook:
--	chmod 0666 $(help_cache)
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/databases/pgadmin3/patches/patch-ac b/databases/pgadmin3/patches/patch-ac
deleted file mode 100644
index afc72f60041..00000000000
--- a/databases/pgadmin3/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2010/04/26 06:14:21 adam Exp $
-
---- configure.orig	2010-04-21 09:15:25.000000000 +0000
-+++ configure
-@@ -6393,8 +6393,6 @@ $as_echo "ok" >&6; }
- 
- 
- 	# CFLAGS/CXXFLAGS may well contain unwanted settings, so clear them.
--	CFLAGS=""
--	CXXFLAGS=""
- 
- 
- ac_config_files="$ac_config_files Makefile branding/Makefile i18n/Makefile pgadmin/Makefile pkg/Makefile pkg/debian/Makefile pkg/mac/Makefile pkg/mandrake/Makefile pkg/redhat/Makefile pkg/slackware/Makefile pkg/src/Makefile pkg/suse/Makefile pkg/win32/Makefile xtra/Makefile xtra/pgscript/Makefile xtra/pgscript/lib/Makefile xtra/pgscript/bin/Makefile xtra/pgscript/test/Makefile xtra/wx-build/Makefile"
diff --git a/databases/pgadmin3/patches/patch-acinclude.m4 b/databases/pgadmin3/patches/patch-acinclude.m4
new file mode 100644
index 00000000000..a41d3e48b4e
--- /dev/null
+++ b/databases/pgadmin3/patches/patch-acinclude.m4
@@ -0,0 +1,17 @@
+$NetBSD: patch-acinclude.m4,v 1.1 2013/07/20 05:10:42 richard Exp $
+
+Fix LDFLAGS problem for sun ld not supporting -as-needed
+
+--- acinclude.m4.orig	2012-08-02 14:28:51.000000000 +0000
++++ acinclude.m4
+@@ -684,7 +684,9 @@ AC_DEFUN([SETUP_POSTGRESQL],
+ 			case "${host}" in
+ 				*-apple-darwin*)
+ 					;;
+- 
++                                *solaris*)
++                                        LDFLAGS="$LDFLAGS"
++                                        ;;
+ 				*)
+ 					LDFLAGS="$LDFLAGS -Wl,-as-needed"
+ 					;;
diff --git a/databases/pgadmin3/patches/patch-ad b/databases/pgadmin3/patches/patch-ad
deleted file mode 100644
index 12b958fd583..00000000000
--- a/databases/pgadmin3/patches/patch-ad
+++ /dev/null
@@ -1,10 +0,0 @@
-$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:
diff --git a/databases/pgadmin3/patches/patch-configure b/databases/pgadmin3/patches/patch-configure
new file mode 100644
index 00000000000..d0b65aecf38
--- /dev/null
+++ b/databases/pgadmin3/patches/patch-configure
@@ -0,0 +1,18 @@
+$NetBSD: patch-configure,v 1.1 2013/07/20 05:10:42 richard Exp $
+
+copy patch details from patch-acinclude.m4 to suppress ld
+option -as-needed which is not supported on solaris.
+
+--- configure.orig	2012-12-03 16:02:14.000000000 +0000
++++ configure
+@@ -6011,6 +6011,10 @@ $as_echo "failed" >&6; }
+ 				*-apple-darwin*)
+ 					;;
+ 
++				*solaris*)
++				LDFLAGS="$LDFLAGS"
++				;;
++
+ 				*)
+ 					LDFLAGS="$LDFLAGS -Wl,-as-needed"
+ 					;;
diff --git a/databases/pgadmin3/patches/patch-pgadmin_gqb_gqbView.cpp b/databases/pgadmin3/patches/patch-pgadmin_gqb_gqbView.cpp
new file mode 100644
index 00000000000..974d6aa9cfd
--- /dev/null
+++ b/databases/pgadmin3/patches/patch-pgadmin_gqb_gqbView.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-pgadmin_gqb_gqbView.cpp,v 1.1 2013/07/20 05:10:42 richard Exp $
+
+patch to quelch g++ warning 
+
+--- pgadmin/gqb/gqbView.cpp.orig	2012-08-02 14:29:01.000000000 +0000
++++ pgadmin/gqb/gqbView.cpp
+@@ -341,7 +341,7 @@ void gqbView::onMotion(wxMouseEvent &eve
+ 		}
+ 		else
+ 		{
+-			anySelected = false;
++			anySelected = NULL;
+ 			mode = pt_normal;
+ 		}
+ 
diff --git a/databases/pgadmin3/patches/patch-ab b/databases/pgadmin3/patches/patch-xtra_pgscript_file_test_execute.sh
index 2c8ba680cab..273ab301971 100644
--- a/databases/pgadmin3/patches/patch-ab
+++ b/databases/pgadmin3/patches/patch-xtra_pgscript_file_test_execute.sh
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.3 2010/01/25 14:05:22 adam Exp $
+$NetBSD: patch-xtra_pgscript_file_test_execute.sh,v 1.1 2013/07/20 05:10:42 richard Exp $
 
---- xtra/pgscript/file/test/execute.sh.orig	2010-01-25 08:09:38.000000000 +0000
+Patch non-portable test for null string
+
+--- xtra/pgscript/file/test/execute.sh.orig	2012-08-02 14:29:10.000000000 +0000
 +++ xtra/pgscript/file/test/execute.sh
 @@ -24,7 +24,7 @@ echo "done"
  echo ""
  
  # Get parameters for database connections
 -if test "$*" == ""
-+if test "$*" = ""
++if test -z "$*"
  then
  	PARAMETERS="$DEFAULTPARAM" # Default if nothing is provided
  else