Thu May 10 07:12:53 2018 UTC ()
pgadmin3: updated to 1.22.2

1.22.2:
* Include the Negator when reverse engineering SQL for operators
* Fix the psql plugin command on OSX to work more reliably
* Prevent a crash in some situtions where the database connection is lost and needs to be reset.
* Fix display of elapsed query time for queries running longer than 1 hour

1.22.1:
* Don't barf when connecting to Greenplum or Greenplum HAWQ
* Fix selection of conversion functions in the CREATE CONVERSION dialogue
* Properly quote type names in the Type dialogue, and ensure range information is displayed for existing types


(adam)
diff -r1.61 -r1.62 pkgsrc/databases/pgadmin3/Makefile
diff -r1.13 -r1.14 pkgsrc/databases/pgadmin3/PLIST
diff -r1.15 -r1.16 pkgsrc/databases/pgadmin3/distinfo
diff -r1.2 -r1.3 pkgsrc/databases/pgadmin3/options.mk
diff -r1.1 -r0 pkgsrc/databases/pgadmin3/patches/manual-acinclude.m4
diff -r1.3 -r1.4 pkgsrc/databases/pgadmin3/patches/patch-configure
diff -r0 -r1.1 pkgsrc/databases/pgadmin3/patches/patch-pgadmin_Makefile.in
cvs diff -r1.61 -r1.62 pkgsrc/databases/pgadmin3/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/pgadmin3/Makefile 2018/04/29 05:46:36 1.61
+++ pkgsrc/databases/pgadmin3/Makefile 2018/05/10 07:12:53 1.62
@@ -1,35 +1,42 @@ @@ -1,35 +1,42 @@
1# $NetBSD: Makefile,v 1.61 2018/04/29 05:46:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.62 2018/05/10 07:12:53 adam Exp $
2 2
3DISTNAME= pgadmin3-1.22.0 3DISTNAME= pgadmin3-1.22.2
4PKGREVISION= 7 
5CATEGORIES= databases 4CATEGORIES= databases
6MASTER_SITES= ${MASTER_SITE_PGSQL:=pgadmin3/release/v${PKGVERSION_NOREV}/src/} 5MASTER_SITES= ${MASTER_SITE_PGSQL:=pgadmin/pgadmin3/v${PKGVERSION_NOREV}/src/}
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.pgadmin.org/ 8HOMEPAGE= https://www.pgadmin.org/
10COMMENT= Graphical PostgreSQL client and administration tool 9COMMENT= Graphical PostgreSQL client and administration tool
11LICENSE= postgresql-license 10LICENSE= postgresql-license
12 11
13USE_LANGUAGES= c99 c++ 12USE_LANGUAGES= c99 c++
14USE_TOOLS+= echo gmake sed 13USE_TOOLS+= echo gmake sed
15GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
16 15
17REPLACE_SH= pgadmin/ver_svn.sh 16REPLACE_SH= pgadmin/ver_svn.sh
18 17
19.include "options.mk" 18.include "options.mk"
20 19
 20CONFIGURE_ARGS+= --enable-databasedesigner
 21CONFIGURE_ARGS+= --with-libssl-prefix=${BUILDLINK_PREFIX.openssl}
21CONFIGURE_ARGS+= --with-libxml2=${BUILDLINK_PREFIX.libxml2} 22CONFIGURE_ARGS+= --with-libxml2=${BUILDLINK_PREFIX.libxml2}
22CONFIGURE_ARGS+= --with-libxslt=${BUILDLINK_PREFIX.libxslt} 23CONFIGURE_ARGS+= --with-libxslt=${BUILDLINK_PREFIX.libxslt}
 24CONFIGURE_ARGS+= --with-libz
 25CONFIGURE_ARGS+= --with-libz-prefix=${BUILDLINK_PREFIX.zlib}
 26CONFIGURE_ARGS+= --with-openssl
23 27
24.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
25 29
26.if ${OPSYS} == "Darwin" 30.if ${OPSYS} == "Darwin"
27CONFIGURE_ARGS+= --with-arch-${MACHINE_ARCH} 31CONFIGURE_ARGS+= --with-arch-${MACHINE_ARCH}
28.endif 32.endif
29 33
 34.include "../../devel/zlib/buildlink3.mk"
30.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 35.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 36.include "../../security/libssh2/buildlink3.mk"
 37.include "../../security/openssl/buildlink3.mk"
31.include "../../textproc/libxml2/buildlink3.mk" 38.include "../../textproc/libxml2/buildlink3.mk"
32.include "../../textproc/libxslt/buildlink3.mk" 39.include "../../textproc/libxslt/buildlink3.mk"
33.include "../../x11/wxGTK30/buildlink3.mk" 40.include "../../x11/wxGTK30/buildlink3.mk"
34.include "../../mk/pgsql.buildlink3.mk" 41.include "../../mk/pgsql.buildlink3.mk"
35.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/databases/pgadmin3/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/pgadmin3/PLIST 2018/01/01 22:29:22 1.13
+++ pkgsrc/databases/pgadmin3/PLIST 2018/05/10 07:12:53 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.13 2018/01/01 22:29:22 rillig Exp $ 1@comment $NetBSD: PLIST,v 1.14 2018/05/10 07:12:53 adam Exp $
2bin/pgadmin3 2bin/pgadmin3
3share/pgadmin3/branding/branding.ini 3share/pgadmin3/branding/branding.ini
4share/pgadmin3/docs/cs_CZ/hints/autovacuum.html 4share/pgadmin3/docs/cs_CZ/hints/autovacuum.html
5share/pgadmin3/docs/cs_CZ/hints/conn-hba.html 5share/pgadmin3/docs/cs_CZ/hints/conn-hba.html
6share/pgadmin3/docs/cs_CZ/hints/conn-ident.html 6share/pgadmin3/docs/cs_CZ/hints/conn-ident.html
7share/pgadmin3/docs/cs_CZ/hints/conn-listen.html 7share/pgadmin3/docs/cs_CZ/hints/conn-listen.html
8share/pgadmin3/docs/cs_CZ/hints/encoding-ascii.html 8share/pgadmin3/docs/cs_CZ/hints/encoding-ascii.html
9share/pgadmin3/docs/cs_CZ/hints/encoding-unicode.html 9share/pgadmin3/docs/cs_CZ/hints/encoding-unicode.html
10share/pgadmin3/docs/cs_CZ/hints/fki.html 10share/pgadmin3/docs/cs_CZ/hints/fki.html
11share/pgadmin3/docs/cs_CZ/hints/instrumentation.html 11share/pgadmin3/docs/cs_CZ/hints/instrumentation.html
12share/pgadmin3/docs/cs_CZ/hints/instrumentation91_with.html 12share/pgadmin3/docs/cs_CZ/hints/instrumentation91_with.html
13share/pgadmin3/docs/cs_CZ/hints/instrumentation91_without.html 13share/pgadmin3/docs/cs_CZ/hints/instrumentation91_without.html
14share/pgadmin3/docs/cs_CZ/hints/multiple.html 14share/pgadmin3/docs/cs_CZ/hints/multiple.html
@@ -27,26 +27,27 @@ share/pgadmin3/docs/de_DE/hints/encoding @@ -27,26 +27,27 @@ share/pgadmin3/docs/de_DE/hints/encoding
27share/pgadmin3/docs/de_DE/hints/encoding-unicode.html 27share/pgadmin3/docs/de_DE/hints/encoding-unicode.html
28share/pgadmin3/docs/de_DE/hints/fki.html 28share/pgadmin3/docs/de_DE/hints/fki.html
29share/pgadmin3/docs/de_DE/hints/instrumentation.html 29share/pgadmin3/docs/de_DE/hints/instrumentation.html
30share/pgadmin3/docs/de_DE/hints/multiple.html 30share/pgadmin3/docs/de_DE/hints/multiple.html
31share/pgadmin3/docs/de_DE/hints/object-editing.html 31share/pgadmin3/docs/de_DE/hints/object-editing.html
32share/pgadmin3/docs/de_DE/hints/pk.html 32share/pgadmin3/docs/de_DE/hints/pk.html
33share/pgadmin3/docs/de_DE/hints/saving-passwords.html 33share/pgadmin3/docs/de_DE/hints/saving-passwords.html
34share/pgadmin3/docs/de_DE/hints/vacuum.html 34share/pgadmin3/docs/de_DE/hints/vacuum.html
35share/pgadmin3/docs/de_DE/hints/view-without-pk.html 35share/pgadmin3/docs/de_DE/hints/view-without-pk.html
36share/pgadmin3/docs/de_DE/pgadmin3.css 36share/pgadmin3/docs/de_DE/pgadmin3.css
37${PLIST.doc}share/pgadmin3/docs/en_US/_images/backup-2.png 37${PLIST.doc}share/pgadmin3/docs/en_US/_images/backup-2.png
38${PLIST.doc}share/pgadmin3/docs/en_US/_images/backup-3.png 38${PLIST.doc}share/pgadmin3/docs/en_US/_images/backup-3.png
39${PLIST.doc}share/pgadmin3/docs/en_US/_images/backup-4.png 39${PLIST.doc}share/pgadmin3/docs/en_US/_images/backup-4.png
 40${PLIST.doc}share/pgadmin3/docs/en_US/_images/backup-5.png
40${PLIST.doc}share/pgadmin3/docs/en_US/_images/backup.png 41${PLIST.doc}share/pgadmin3/docs/en_US/_images/backup.png
41${PLIST.doc}share/pgadmin3/docs/en_US/_images/debugger.png 42${PLIST.doc}share/pgadmin3/docs/en_US/_images/debugger.png
42${PLIST.doc}share/pgadmin3/docs/en_US/_images/editgrid.png 43${PLIST.doc}share/pgadmin3/docs/en_US/_images/editgrid.png
43${PLIST.doc}share/pgadmin3/docs/en_US/_images/export.png 44${PLIST.doc}share/pgadmin3/docs/en_US/_images/export.png
44${PLIST.doc}share/pgadmin3/docs/en_US/_images/gqb.png 45${PLIST.doc}share/pgadmin3/docs/en_US/_images/gqb.png
45${PLIST.doc}share/pgadmin3/docs/en_US/_images/grantwiz.png 46${PLIST.doc}share/pgadmin3/docs/en_US/_images/grantwiz.png
46${PLIST.doc}share/pgadmin3/docs/en_US/_images/gridopt-filter.png 47${PLIST.doc}share/pgadmin3/docs/en_US/_images/gridopt-filter.png
47${PLIST.doc}share/pgadmin3/docs/en_US/_images/gridopt-sort.png 48${PLIST.doc}share/pgadmin3/docs/en_US/_images/gridopt-sort.png
48${PLIST.doc}share/pgadmin3/docs/en_US/_images/guru-connect.png 49${PLIST.doc}share/pgadmin3/docs/en_US/_images/guru-connect.png
49${PLIST.doc}share/pgadmin3/docs/en_US/_images/main.png 50${PLIST.doc}share/pgadmin3/docs/en_US/_images/main.png
50${PLIST.doc}share/pgadmin3/docs/en_US/_images/maintenance.png 51${PLIST.doc}share/pgadmin3/docs/en_US/_images/maintenance.png
51${PLIST.doc}share/pgadmin3/docs/en_US/_images/manage-macros.png 52${PLIST.doc}share/pgadmin3/docs/en_US/_images/manage-macros.png
52${PLIST.doc}share/pgadmin3/docs/en_US/_images/no-hba.png 53${PLIST.doc}share/pgadmin3/docs/en_US/_images/no-hba.png
@@ -77,66 +78,69 @@ ${PLIST.doc}share/pgadmin3/docs/en_US/_i @@ -77,66 +78,69 @@ ${PLIST.doc}share/pgadmin3/docs/en_US/_i
77${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-scheduledetails2.png 78${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-scheduledetails2.png
78${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-scheduledetails3.png 79${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-scheduledetails3.png
79${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-scheduleproperties.png 80${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-scheduleproperties.png
80${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-stepdetails.png 81${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-stepdetails.png
81${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-stepstats.png 82${PLIST.doc}share/pgadmin3/docs/en_US/_images/pgagent-stepstats.png
82${PLIST.doc}share/pgadmin3/docs/en_US/_images/query-analyze.png 83${PLIST.doc}share/pgadmin3/docs/en_US/_images/query-analyze.png
83${PLIST.doc}share/pgadmin3/docs/en_US/_images/query-connect.png 84${PLIST.doc}share/pgadmin3/docs/en_US/_images/query-connect.png
84${PLIST.doc}share/pgadmin3/docs/en_US/_images/query.png 85${PLIST.doc}share/pgadmin3/docs/en_US/_images/query.png
85${PLIST.doc}share/pgadmin3/docs/en_US/_images/reporttool-html.png 86${PLIST.doc}share/pgadmin3/docs/en_US/_images/reporttool-html.png
86${PLIST.doc}share/pgadmin3/docs/en_US/_images/reporttool-xml.png 87${PLIST.doc}share/pgadmin3/docs/en_US/_images/reporttool-xml.png
87${PLIST.doc}share/pgadmin3/docs/en_US/_images/restore-2.png 88${PLIST.doc}share/pgadmin3/docs/en_US/_images/restore-2.png
88${PLIST.doc}share/pgadmin3/docs/en_US/_images/restore-3.png 89${PLIST.doc}share/pgadmin3/docs/en_US/_images/restore-3.png
89${PLIST.doc}share/pgadmin3/docs/en_US/_images/restore-4.png 90${PLIST.doc}share/pgadmin3/docs/en_US/_images/restore-4.png
 91${PLIST.doc}share/pgadmin3/docs/en_US/_images/restore-5.png
90${PLIST.doc}share/pgadmin3/docs/en_US/_images/restore.png 92${PLIST.doc}share/pgadmin3/docs/en_US/_images/restore.png
91${PLIST.doc}share/pgadmin3/docs/en_US/_images/search.png 93${PLIST.doc}share/pgadmin3/docs/en_US/_images/search.png
92${PLIST.doc}share/pgadmin3/docs/en_US/_images/server.png 94${PLIST.doc}share/pgadmin3/docs/en_US/_images/server.png
93${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-create.png 95${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-create.png
94${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-execute.png 96${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-execute.png
95${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-join.png 97${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-join.png
96${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-listen.png 98${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-listen.png
97${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-overview.png 99${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-overview.png
98${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-path.png 100${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-path.png
99${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-sequence.png 101${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-sequence.png
100${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-set.png 102${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-set.png
101${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-subscription.png 103${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-subscription.png
102${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-table.png 104${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-table.png
103${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-upgrade.png 105${PLIST.doc}share/pgadmin3/docs/en_US/_images/slony-upgrade.png
104${PLIST.doc}share/pgadmin3/docs/en_US/_images/status.png 106${PLIST.doc}share/pgadmin3/docs/en_US/_images/status.png
105${PLIST.doc}share/pgadmin3/docs/en_US/_static/ajax-loader.gif 107${PLIST.doc}share/pgadmin3/docs/en_US/_static/ajax-loader.gif
106${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup-2.png 108${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup-2.png
107${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup-3.png 109${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup-3.png
108${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup-4.png 110${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup-4.png
 111${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup-5.png
109${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup.png 112${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup.png
110${PLIST.doc}share/pgadmin3/docs/en_US/_static/basic.css 113${PLIST.doc}share/pgadmin3/docs/en_US/_static/basic.css
111${PLIST.doc}share/pgadmin3/docs/en_US/_static/classic.css 114${PLIST.doc}share/pgadmin3/docs/en_US/_static/classic.css
112${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment-bright.png 115${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment-bright.png
113${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment-close.png 116${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment-close.png
114${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment.png 117${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment.png
115${PLIST.doc}share/pgadmin3/docs/en_US/_static/connect.png 118${PLIST.doc}share/pgadmin3/docs/en_US/_static/connect.png
116${PLIST.doc}share/pgadmin3/docs/en_US/_static/debugger.png 119${PLIST.doc}share/pgadmin3/docs/en_US/_static/debugger.png
117${PLIST.doc}share/pgadmin3/docs/en_US/_static/default.css 120${PLIST.doc}share/pgadmin3/docs/en_US/_static/default.css
118${PLIST.doc}share/pgadmin3/docs/en_US/_static/doctools.js 121${PLIST.doc}share/pgadmin3/docs/en_US/_static/doctools.js
 122${PLIST.doc}share/pgadmin3/docs/en_US/_static/documentation_options.js
119${PLIST.doc}share/pgadmin3/docs/en_US/_static/down-pressed.png 123${PLIST.doc}share/pgadmin3/docs/en_US/_static/down-pressed.png
120${PLIST.doc}share/pgadmin3/docs/en_US/_static/down.png 124${PLIST.doc}share/pgadmin3/docs/en_US/_static/down.png
121${PLIST.doc}share/pgadmin3/docs/en_US/_static/editgrid.png 125${PLIST.doc}share/pgadmin3/docs/en_US/_static/editgrid.png
122${PLIST.doc}share/pgadmin3/docs/en_US/_static/export.png 126${PLIST.doc}share/pgadmin3/docs/en_US/_static/export.png
123${PLIST.doc}share/pgadmin3/docs/en_US/_static/file.png 127${PLIST.doc}share/pgadmin3/docs/en_US/_static/file.png
124${PLIST.doc}share/pgadmin3/docs/en_US/_static/gqb.png 128${PLIST.doc}share/pgadmin3/docs/en_US/_static/gqb.png
125${PLIST.doc}share/pgadmin3/docs/en_US/_static/grantwiz.png 129${PLIST.doc}share/pgadmin3/docs/en_US/_static/grantwiz.png
126${PLIST.doc}share/pgadmin3/docs/en_US/_static/gridopt-filter.png 130${PLIST.doc}share/pgadmin3/docs/en_US/_static/gridopt-filter.png
127${PLIST.doc}share/pgadmin3/docs/en_US/_static/gridopt-sort.png 131${PLIST.doc}share/pgadmin3/docs/en_US/_static/gridopt-sort.png
128${PLIST.doc}share/pgadmin3/docs/en_US/_static/guru-connect.png 132${PLIST.doc}share/pgadmin3/docs/en_US/_static/guru-connect.png
129${PLIST.doc}share/pgadmin3/docs/en_US/_static/jquery-1.11.1.js 133${PLIST.doc}share/pgadmin3/docs/en_US/_static/jquery-3.2.1.js
130${PLIST.doc}share/pgadmin3/docs/en_US/_static/jquery.js 134${PLIST.doc}share/pgadmin3/docs/en_US/_static/jquery.js
131${PLIST.doc}share/pgadmin3/docs/en_US/_static/locks.png 135${PLIST.doc}share/pgadmin3/docs/en_US/_static/locks.png
132${PLIST.doc}share/pgadmin3/docs/en_US/_static/logfile.png 136${PLIST.doc}share/pgadmin3/docs/en_US/_static/logfile.png
133${PLIST.doc}share/pgadmin3/docs/en_US/_static/main.png 137${PLIST.doc}share/pgadmin3/docs/en_US/_static/main.png
134${PLIST.doc}share/pgadmin3/docs/en_US/_static/maintenance.png 138${PLIST.doc}share/pgadmin3/docs/en_US/_static/maintenance.png
135${PLIST.doc}share/pgadmin3/docs/en_US/_static/manage-macros.png 139${PLIST.doc}share/pgadmin3/docs/en_US/_static/manage-macros.png
136${PLIST.doc}share/pgadmin3/docs/en_US/_static/minus.png 140${PLIST.doc}share/pgadmin3/docs/en_US/_static/minus.png
137${PLIST.doc}share/pgadmin3/docs/en_US/_static/no-hba.png 141${PLIST.doc}share/pgadmin3/docs/en_US/_static/no-hba.png
138${PLIST.doc}share/pgadmin3/docs/en_US/_static/not-running.png 142${PLIST.doc}share/pgadmin3/docs/en_US/_static/not-running.png
139${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-binary_paths.png 143${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-binary_paths.png
140${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-colours.png 144${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-colours.png
141${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-database_designer.png 145${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-database_designer.png
142${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-display.png 146${PLIST.doc}share/pgadmin3/docs/en_US/_static/options-display.png
@@ -164,26 +168,27 @@ ${PLIST.doc}share/pgadmin3/docs/en_US/_s @@ -164,26 +168,27 @@ ${PLIST.doc}share/pgadmin3/docs/en_US/_s
164${PLIST.doc}share/pgadmin3/docs/en_US/_static/pgagent-scheduleproperties.png 168${PLIST.doc}share/pgadmin3/docs/en_US/_static/pgagent-scheduleproperties.png
165${PLIST.doc}share/pgadmin3/docs/en_US/_static/pgagent-stepdetails.png 169${PLIST.doc}share/pgadmin3/docs/en_US/_static/pgagent-stepdetails.png
166${PLIST.doc}share/pgadmin3/docs/en_US/_static/pgagent-stepstats.png 170${PLIST.doc}share/pgadmin3/docs/en_US/_static/pgagent-stepstats.png
167${PLIST.doc}share/pgadmin3/docs/en_US/_static/plus.png 171${PLIST.doc}share/pgadmin3/docs/en_US/_static/plus.png
168${PLIST.doc}share/pgadmin3/docs/en_US/_static/pygments.css 172${PLIST.doc}share/pgadmin3/docs/en_US/_static/pygments.css
169${PLIST.doc}share/pgadmin3/docs/en_US/_static/query-analyze.png 173${PLIST.doc}share/pgadmin3/docs/en_US/_static/query-analyze.png
170${PLIST.doc}share/pgadmin3/docs/en_US/_static/query-connect.png 174${PLIST.doc}share/pgadmin3/docs/en_US/_static/query-connect.png
171${PLIST.doc}share/pgadmin3/docs/en_US/_static/query.png 175${PLIST.doc}share/pgadmin3/docs/en_US/_static/query.png
172${PLIST.doc}share/pgadmin3/docs/en_US/_static/reporttool-html.png 176${PLIST.doc}share/pgadmin3/docs/en_US/_static/reporttool-html.png
173${PLIST.doc}share/pgadmin3/docs/en_US/_static/reporttool-xml.png 177${PLIST.doc}share/pgadmin3/docs/en_US/_static/reporttool-xml.png
174${PLIST.doc}share/pgadmin3/docs/en_US/_static/restore-2.png 178${PLIST.doc}share/pgadmin3/docs/en_US/_static/restore-2.png
175${PLIST.doc}share/pgadmin3/docs/en_US/_static/restore-3.png 179${PLIST.doc}share/pgadmin3/docs/en_US/_static/restore-3.png
176${PLIST.doc}share/pgadmin3/docs/en_US/_static/restore-4.png 180${PLIST.doc}share/pgadmin3/docs/en_US/_static/restore-4.png
 181${PLIST.doc}share/pgadmin3/docs/en_US/_static/restore-5.png
177${PLIST.doc}share/pgadmin3/docs/en_US/_static/restore.png 182${PLIST.doc}share/pgadmin3/docs/en_US/_static/restore.png
178${PLIST.doc}share/pgadmin3/docs/en_US/_static/search.png 183${PLIST.doc}share/pgadmin3/docs/en_US/_static/search.png
179${PLIST.doc}share/pgadmin3/docs/en_US/_static/searchtools.js 184${PLIST.doc}share/pgadmin3/docs/en_US/_static/searchtools.js
180${PLIST.doc}share/pgadmin3/docs/en_US/_static/server.png 185${PLIST.doc}share/pgadmin3/docs/en_US/_static/server.png
181${PLIST.doc}share/pgadmin3/docs/en_US/_static/sidebar.js 186${PLIST.doc}share/pgadmin3/docs/en_US/_static/sidebar.js
182${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-create.png 187${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-create.png
183${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-execute.png 188${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-execute.png
184${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-join.png 189${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-join.png
185${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-listen.png 190${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-listen.png
186${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-overview.png 191${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-overview.png
187${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-path.png 192${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-path.png
188${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-sequence.png 193${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-sequence.png
189${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-set.png 194${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-set.png
cvs diff -r1.15 -r1.16 pkgsrc/databases/pgadmin3/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/pgadmin3/distinfo 2016/03/16 04:46:24 1.15
+++ pkgsrc/databases/pgadmin3/distinfo 2018/05/10 07:12:53 1.16
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.15 2016/03/16 04:46:24 richard Exp $ 1$NetBSD: distinfo,v 1.16 2018/05/10 07:12:53 adam Exp $
2 2
3SHA1 (pgadmin3-1.22.0.tar.gz) = 3091b0bdc5156e54197f157a86240e47af9becc2 3SHA1 (pgadmin3-1.22.2.tar.gz) = 2b62630d3ee90b44c440d673ca8bb3dcfe010e18
4RMD160 (pgadmin3-1.22.0.tar.gz) = 6c5c8c28c0aaa7cd9720a6089fafe770210f002c 4RMD160 (pgadmin3-1.22.2.tar.gz) = 48e732089cd1879f99d1894229a9cc23ed3c0c44
5SHA512 (pgadmin3-1.22.0.tar.gz) = db16ac1b92e95a6da51be973b6833e53aed4c1d8740c8bccbfd778b0c3d3a4158fb13107761e0a39227aea87360be3b297ebc8809ac8ca5102d673935a33727c 5SHA512 (pgadmin3-1.22.2.tar.gz) = dcfc72cc2e33dbf1c9d1ce287f9d1d46eb047c99a165372cb74ef1716098f90f2ce2a8d0cd21b511a1ac8c0569dc7b3c0593208a74641f5a8f29dc9c04e40bbd
6Size (pgadmin3-1.22.0.tar.gz) = 14668096 bytes 6Size (pgadmin3-1.22.2.tar.gz) = 14788481 bytes
7SHA1 (patch-configure) = 52be492c191e3a249bcbf88075f0f2a2f1a0f76a 7SHA1 (patch-configure) = be59b43343ee1811876211b043512758dc3809aa
 8SHA1 (patch-pgadmin_Makefile.in) = 4496da3b9c5a58e6e634604457c7d03b356703bb
cvs diff -r1.2 -r1.3 pkgsrc/databases/pgadmin3/options.mk (expand / switch to unified diff)

--- pkgsrc/databases/pgadmin3/options.mk 2015/08/05 15:29:00 1.2
+++ pkgsrc/databases/pgadmin3/options.mk 2018/05/10 07:12:53 1.3
@@ -1,50 +1,18 @@ @@ -1,50 +1,18 @@
1# $NetBSD: options.mk,v 1.2 2015/08/05 15:29:00 richard Exp $ 1# $NetBSD: options.mk,v 1.3 2018/05/10 07:12:53 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.pgadmin3 3PKG_OPTIONS_VAR= PKG_OPTIONS.pgadmin3
4PKG_SUPPORTED_OPTIONS= pgadmin-db-designer doc zlib 4PKG_SUPPORTED_OPTIONS= doc
5PKG_OPTIONS_OPTIONAL_GROUPS= crypto 
6PKG_SUGGESTED_OPTIONS= pgadmin-db-designer openssl 
7PKG_OPTIONS_GROUP.crypto= openssl libgcrypt 
8 5
9.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
10 7
11PLIST_VARS= doc 8PLIST_VARS= doc
12 9
13### Database Designer support 
14.if !empty(PKG_OPTIONS:Mpgadmin-db-designer) 
15CONFIGURE_ARGS+= --enable-databasedesigner 
16.endif 
17 
18.if !empty(PKG_OPTIONS:Mdoc) 10.if !empty(PKG_OPTIONS:Mdoc)
19PLIST.doc= yes 11PLIST.doc= yes
20PYTHON_FOR_BUILD_ONLY=yes 12PYTHON_FOR_BUILD_ONLY=yes
21.include "../../lang/python/pyversion.mk" 13.include "../../lang/python/pyversion.mk"
22BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.0:../../textproc/py-sphinx 14BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.0:../../textproc/py-sphinx
23CONFIGURE_ARGS+= --with-sphinx-build=${PREFIX}/bin/sphinx-build${PYVERSSUFFIX} 15CONFIGURE_ARGS+= --with-sphinx-build=${PREFIX}/bin/sphinx-build${PYVERSSUFFIX}
24.else 16.else
25CONFIGURE_ENV+= ac_cv_path_SPHINX_BUILD= 17CONFIGURE_ENV+= ac_cv_path_SPHINX_BUILD=
26.endif 18.endif
27 
28.if !empty(PKG_OPTIONS:Mlibgcrypt) 
29CONFIGURE_ARGS+= --with-libgcrypt 
30CONFIGURE_ARGS+= --with-libgcrypt-prefix=${BUILDLINK_PREFIX.libgcrypt} 
31.include "../../security/libgcrypt/buildlink3.mk" 
32.else 
33CONFIGURE_ARGS+= --without-libgcrypt 
34.endif 
35 
36.if !empty(PKG_OPTIONS:Mopenssl) 
37CONFIGURE_ARGS+= --with-openssl 
38CONFIGURE_ARGS+= --with-libssl-prefix=${BUILDLINK_PREFIX.openssl} 
39.include "../../security/openssl/buildlink3.mk" 
40.else 
41CONFIGURE_ARGS+= --without-openssl 
42.endif 
43 
44.if !empty(PKG_OPTIONS:Mzlib) 
45CONFIGURE_ARGS+= --with-libz 
46CONFIGURE_ARGS+= --with-libz-prefix=${BUILDLINK_PREFIX.zlib} 
47.include "../../devel/zlib/buildlink3.mk" 
48.else 
49CONFIGURE_ARGS+= --without-libz 
50.endif 
File Deleted: pkgsrc/databases/pgadmin3/patches/Attic/manual-acinclude.m4
cvs diff -r1.3 -r1.4 pkgsrc/databases/pgadmin3/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/databases/pgadmin3/patches/patch-configure 2016/02/16 03:45:19 1.3
+++ pkgsrc/databases/pgadmin3/patches/patch-configure 2018/05/10 07:12:53 1.4
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1$NetBSD: patch-configure,v 1.3 2016/02/16 03:45:19 dbj Exp $ 1$NetBSD: patch-configure,v 1.4 2018/05/10 07:12:53 adam Exp $
2 2
3Remove code that insists wx-config is in a directory named bin 3Remove code that insists wx-config is in a directory named bin
4 4
5--- configure.orig 2014-12-15 15:10:17.000000000 +0000 5--- configure.orig 2014-12-15 15:10:17.000000000 +0000
6+++ configure 6+++ configure
7@@ -6466,15 +6466,6 @@ if test "${with_wx+set}" = set; then : 7@@ -6467,15 +6467,6 @@ if test "${with_wx+set}" = set; then :
8  8
9 else 9 else
10  10
11- WX_HOME=/usr/local/wx2 11- WX_HOME=/usr/local/wx2
12- if test ! -f "${WX_HOME}/bin/wx-config" 12- if test ! -f "${WX_HOME}/bin/wx-config"
13- then 13- then
14- WX_HOME=/usr/local 14- WX_HOME=/usr/local
15- if test ! -f "${WX_HOME}/bin/wx-config" 15- if test ! -f "${WX_HOME}/bin/wx-config"
16- then 16- then
17- WX_HOME=/usr 17- WX_HOME=/usr
18- if test ! -f "${WX_HOME}/bin/wx-config" 18- if test ! -f "${WX_HOME}/bin/wx-config"
19- then 19- then
20 # Search the path 20 # Search the path
21 for ac_prog in wx-config 21 for ac_prog in wx-config
22 do 22 do
23@@ -6527,10 +6518,6 @@ done 23@@ -6528,10 +6519,6 @@ done
24 else 24 else
25 WX_HOME=`${WX_CONFIG} --prefix` 25 WX_HOME=`${WX_CONFIG} --prefix`
26 fi 26 fi
27- fi 27- fi
28- fi 28- fi
29- fi 29- fi
30- WX_CONFIG=${WX_HOME}/bin/wx-config 30- WX_CONFIG=${WX_HOME}/bin/wx-config
31  31
32 fi 32 fi
33  33
34@@ -6557,9 +6544,8 @@ $as_echo "failed" >&6; } 34@@ -6558,9 +6545,8 @@ $as_echo "failed" >&6; }
35 $as_echo "ok" >&6; } 35 $as_echo "ok" >&6; }
36  36
37  37
38- if test -n "${WX_HOME}" 38- if test -n "${WX_HOME}"
39+ if test -n "${WX_CONFIG}" 39+ if test -n "${WX_CONFIG}"
40 then 40 then
41- LDFLAGS="$LDFLAGS -L${WX_HOME}/lib" 41- LDFLAGS="$LDFLAGS -L${WX_HOME}/lib"
42 WX_OLD_LDFLAGS="$LDFLAGS" 42 WX_OLD_LDFLAGS="$LDFLAGS"
43 WX_OLD_CPPFLAGS="$CPPFLAGS" 43 WX_OLD_CPPFLAGS="$CPPFLAGS"
44  44
File Added: pkgsrc/databases/pgadmin3/patches/patch-pgadmin_Makefile.in
$NetBSD: patch-pgadmin_Makefile.in,v 1.1 2018/05/10 07:12:53 adam Exp $

Use external libssh2.

--- pgadmin/Makefile.in.orig	2018-05-07 08:47:05.000000000 +0000
+++ pgadmin/Makefile.in
@@ -1006,42 +1006,7 @@ bin_PROGRAMS = pgadmin3$(EXEEXT)
 @BUILD_SSH_TUNNEL_TRUE@am__append_1 = \
 @BUILD_SSH_TUNNEL_TRUE@	include/utils/sshTunnel.h
 
-@BUILD_SSH_TUNNEL_TRUE@am__append_2 = \
-@BUILD_SSH_TUNNEL_TRUE@		include/libssh2/channel.h \
-@BUILD_SSH_TUNNEL_TRUE@        include/libssh2/comp.h \
-@BUILD_SSH_TUNNEL_TRUE@        include/libssh2/crypto.h \
-@BUILD_SSH_TUNNEL_TRUE@        include/libssh2/libgcrypt.h \
-@BUILD_SSH_TUNNEL_TRUE@        include/libssh2/libssh2.h \
-@BUILD_SSH_TUNNEL_TRUE@        include/libssh2/libssh2_priv.h \
-@BUILD_SSH_TUNNEL_TRUE@        include/libssh2/libssh2_publickey.h \
-@BUILD_SSH_TUNNEL_TRUE@        include/libssh2/libssh2_sftp.h \
-@BUILD_SSH_TUNNEL_TRUE@        include/libssh2/mac.h \
-@BUILD_SSH_TUNNEL_TRUE@        include/libssh2/misc.h \
-@BUILD_SSH_TUNNEL_TRUE@        include/libssh2/openssl.h \
-@BUILD_SSH_TUNNEL_TRUE@        include/libssh2/packet.h \
-@BUILD_SSH_TUNNEL_TRUE@        include/libssh2/session.h \
-@BUILD_SSH_TUNNEL_TRUE@        include/libssh2/sftp.h \
-@BUILD_SSH_TUNNEL_TRUE@        include/libssh2/transport.h \
-@BUILD_SSH_TUNNEL_TRUE@        include/libssh2/userauth.h
-
-@BUILD_SSH_TUNNEL_TRUE@am__append_3 = \
-@BUILD_SSH_TUNNEL_TRUE@	include/libssh2/module.mk \
-@BUILD_SSH_TUNNEL_TRUE@	include/libssh2/Win32/libssh2_config.h
-
-@BUILD_SSH_TUNNEL_TRUE@am__append_4 = utils/sshTunnel.cpp \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/agent.c libssh2/channel.c \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/comp.c libssh2/crypt.c \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/global.c libssh2/hostkey.c \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/keepalive.c libssh2/kex.c \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/knownhost.c libssh2/libgcrypt.c \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/mac.c libssh2/misc.c \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/openssl.c libssh2/packet.c \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/pem.c libssh2/publickey.c \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/scp.c libssh2/session.c \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/sftp.c libssh2/transport.c \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/userauth.c libssh2/version.c
-@BUILD_SSH_TUNNEL_TRUE@am__append_5 = \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/module.mk
+@BUILD_SSH_TUNNEL_TRUE@am__append_4 = utils/sshTunnel.cpp
 
 @APPBUNDLE_FALSE@@BUILD_DEBUG_TRUE@am__append_6 = \
 @APPBUNDLE_FALSE@@BUILD_DEBUG_TRUE@	$(TMP_ui)
@@ -1906,29 +1871,7 @@ am__pgadmin3_SOURCES_DIST = pgAdmin3.cpp
 	libssh2/userauth.c libssh2/version.c
 am__dirstamp = $(am__leading_dot)dirstamp
 am__objects_1 =
-@BUILD_SSH_TUNNEL_TRUE@am__objects_2 = utils/sshTunnel.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/agent.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/channel.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/comp.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/crypt.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/global.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/hostkey.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/keepalive.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/kex.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/knownhost.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/libgcrypt.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/mac.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/misc.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/openssl.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/packet.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/pem.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/publickey.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/scp.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/session.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/sftp.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/transport.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/userauth.$(OBJEXT) \
-@BUILD_SSH_TUNNEL_TRUE@	libssh2/version.$(OBJEXT)
+@BUILD_SSH_TUNNEL_TRUE@am__objects_2 = utils/sshTunnel.$(OBJEXT)
 am_pgadmin3_OBJECTS = pgAdmin3.$(OBJEXT) agent/dlgJob.$(OBJEXT) \
 	agent/dlgSchedule.$(OBJEXT) agent/dlgStep.$(OBJEXT) \
 	agent/pgaJob.$(OBJEXT) agent/pgaSchedule.$(OBJEXT) \
@@ -2622,7 +2565,7 @@ mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pgScript_LDADD = @pgScript_LDADD@
-pgadmin3_LDADD = @pgadmin3_LDADD@
+pgadmin3_LDADD = @pgadmin3_LDADD@ -lssh2
 pgsTest_LDADD = @pgsTest_LDADD@
 png2c_LDADD = @png2c_LDADD@
 prefix = @prefix@