diff options
author | adam <adam@pkgsrc.org> | 2018-05-10 07:12:53 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2018-05-10 07:12:53 +0000 |
commit | 1730d392b140ed1f0f1d3c9ffc0633e7b8795c4c (patch) | |
tree | b33f6aae614b00a76239ade593bac788cb105f46 /databases/pgadmin3 | |
parent | 9e8139f957dd145b8f365eb3a38c2d0871de9002 (diff) | |
download | pkgsrc-1730d392b140ed1f0f1d3c9ffc0633e7b8795c4c.tar.gz |
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
Diffstat (limited to 'databases/pgadmin3')
-rw-r--r-- | databases/pgadmin3/Makefile | 15 | ||||
-rw-r--r-- | databases/pgadmin3/PLIST | 9 | ||||
-rw-r--r-- | databases/pgadmin3/distinfo | 13 | ||||
-rw-r--r-- | databases/pgadmin3/options.mk | 40 | ||||
-rw-r--r-- | databases/pgadmin3/patches/manual-acinclude.m4 | 44 | ||||
-rw-r--r-- | databases/pgadmin3/patches/patch-configure | 8 | ||||
-rw-r--r-- | databases/pgadmin3/patches/patch-pgadmin_Makefile.in | 90 |
7 files changed, 123 insertions, 96 deletions
diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile index ac88c364ccf..b288d89bc3f 100644 --- a/databases/pgadmin3/Makefile +++ b/databases/pgadmin3/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.61 2018/04/29 05:46:36 wiz Exp $ +# $NetBSD: Makefile,v 1.62 2018/05/10 07:12:53 adam Exp $ -DISTNAME= pgadmin3-1.22.0 -PKGREVISION= 7 +DISTNAME= pgadmin3-1.22.2 CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_PGSQL:=pgadmin3/release/v${PKGVERSION_NOREV}/src/} +MASTER_SITES= ${MASTER_SITE_PGSQL:=pgadmin/pgadmin3/v${PKGVERSION_NOREV}/src/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://www.pgadmin.org/ @@ -18,8 +17,13 @@ REPLACE_SH= pgadmin/ver_svn.sh .include "options.mk" +CONFIGURE_ARGS+= --enable-databasedesigner +CONFIGURE_ARGS+= --with-libssl-prefix=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-libxml2=${BUILDLINK_PREFIX.libxml2} CONFIGURE_ARGS+= --with-libxslt=${BUILDLINK_PREFIX.libxslt} +CONFIGURE_ARGS+= --with-libz +CONFIGURE_ARGS+= --with-libz-prefix=${BUILDLINK_PREFIX.zlib} +CONFIGURE_ARGS+= --with-openssl .include "../../mk/bsd.prefs.mk" @@ -27,7 +31,10 @@ CONFIGURE_ARGS+= --with-libxslt=${BUILDLINK_PREFIX.libxslt} CONFIGURE_ARGS+= --with-arch-${MACHINE_ARCH} .endif +.include "../../devel/zlib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../security/libssh2/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .include "../../x11/wxGTK30/buildlink3.mk" diff --git a/databases/pgadmin3/PLIST b/databases/pgadmin3/PLIST index 78a85d955fe..77427ad677a 100644 --- a/databases/pgadmin3/PLIST +++ b/databases/pgadmin3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2018/01/01 22:29:22 rillig Exp $ +@comment $NetBSD: PLIST,v 1.14 2018/05/10 07:12:53 adam Exp $ bin/pgadmin3 share/pgadmin3/branding/branding.ini share/pgadmin3/docs/cs_CZ/hints/autovacuum.html @@ -37,6 +37,7 @@ 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-5.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 @@ -87,6 +88,7 @@ ${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-5.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 @@ -106,6 +108,7 @@ ${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-5.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 @@ -116,6 +119,7 @@ ${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/documentation_options.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 @@ -126,7 +130,7 @@ ${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-1.11.1.js +${PLIST.doc}share/pgadmin3/docs/en_US/_static/jquery-3.2.1.js ${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 @@ -174,6 +178,7 @@ ${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-5.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 diff --git a/databases/pgadmin3/distinfo b/databases/pgadmin3/distinfo index 7cd3bda4947..a8bb977d86a 100644 --- a/databases/pgadmin3/distinfo +++ b/databases/pgadmin3/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.15 2016/03/16 04:46:24 richard Exp $ +$NetBSD: distinfo,v 1.16 2018/05/10 07:12:53 adam Exp $ -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 (pgadmin3-1.22.2.tar.gz) = 2b62630d3ee90b44c440d673ca8bb3dcfe010e18 +RMD160 (pgadmin3-1.22.2.tar.gz) = 48e732089cd1879f99d1894229a9cc23ed3c0c44 +SHA512 (pgadmin3-1.22.2.tar.gz) = dcfc72cc2e33dbf1c9d1ce287f9d1d46eb047c99a165372cb74ef1716098f90f2ce2a8d0cd21b511a1ac8c0569dc7b3c0593208a74641f5a8f29dc9c04e40bbd +Size (pgadmin3-1.22.2.tar.gz) = 14788481 bytes +SHA1 (patch-configure) = be59b43343ee1811876211b043512758dc3809aa +SHA1 (patch-pgadmin_Makefile.in) = 4496da3b9c5a58e6e634604457c7d03b356703bb diff --git a/databases/pgadmin3/options.mk b/databases/pgadmin3/options.mk index 3696a4cb51b..283f4b91111 100644 --- a/databases/pgadmin3/options.mk +++ b/databases/pgadmin3/options.mk @@ -1,50 +1,18 @@ -# $NetBSD: options.mk,v 1.2 2015/08/05 15:29:00 richard Exp $ +# $NetBSD: options.mk,v 1.3 2018/05/10 07:12:53 adam Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.pgadmin3 -PKG_SUPPORTED_OPTIONS= pgadmin-db-designer doc zlib -PKG_OPTIONS_OPTIONAL_GROUPS= crypto -PKG_SUGGESTED_OPTIONS= pgadmin-db-designer openssl -PKG_OPTIONS_GROUP.crypto= openssl libgcrypt +PKG_OPTIONS_VAR= PKG_OPTIONS.pgadmin3 +PKG_SUPPORTED_OPTIONS= doc .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 -CONFIGURE_ARGS+= --with-sphinx-build=${PREFIX}/bin/sphinx-build${PYVERSSUFFIX} +CONFIGURE_ARGS+= --with-sphinx-build=${PREFIX}/bin/sphinx-build${PYVERSSUFFIX} .else CONFIGURE_ENV+= ac_cv_path_SPHINX_BUILD= .endif - -.if !empty(PKG_OPTIONS:Mlibgcrypt) -CONFIGURE_ARGS+= --with-libgcrypt -CONFIGURE_ARGS+= --with-libgcrypt-prefix=${BUILDLINK_PREFIX.libgcrypt} -.include "../../security/libgcrypt/buildlink3.mk" -.else -CONFIGURE_ARGS+= --without-libgcrypt -.endif - -.if !empty(PKG_OPTIONS:Mopenssl) -CONFIGURE_ARGS+= --with-openssl -CONFIGURE_ARGS+= --with-libssl-prefix=${BUILDLINK_PREFIX.openssl} -.include "../../security/openssl/buildlink3.mk" -.else -CONFIGURE_ARGS+= --without-openssl -.endif - -.if !empty(PKG_OPTIONS:Mzlib) -CONFIGURE_ARGS+= --with-libz -CONFIGURE_ARGS+= --with-libz-prefix=${BUILDLINK_PREFIX.zlib} -.include "../../devel/zlib/buildlink3.mk" -.else -CONFIGURE_ARGS+= --without-libz -.endif diff --git a/databases/pgadmin3/patches/manual-acinclude.m4 b/databases/pgadmin3/patches/manual-acinclude.m4 deleted file mode 100644 index 71e4a812c5f..00000000000 --- a/databases/pgadmin3/patches/manual-acinclude.m4 +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: manual-acinclude.m4,v 1.1 2016/02/16 03:45:19 dbj Exp $ - -Remove code that insists wx-config is in a directory named bin - ---- acinclude.m4.orig 2013-07-19 08:53:33.000000000 +0000 -+++ acinclude.m4 -@@ -87,15 +87,6 @@ AC_DEFUN([LOCATE_WXWIDGETS], - WX_CONFIG=${WX_HOME}/bin/wx-config - ], - [ -- WX_HOME=/usr/local/wx2 -- if test ! -f "${WX_HOME}/bin/wx-config" -- then -- WX_HOME=/usr/local -- if test ! -f "${WX_HOME}/bin/wx-config" -- then -- WX_HOME=/usr -- if test ! -f "${WX_HOME}/bin/wx-config" -- then - # Search the path - AC_PATH_PROGS(WX_CONFIG, wx-config) - if test ! -f "${WX_CONFIG}" -@@ -104,10 +95,6 @@ AC_DEFUN([LOCATE_WXWIDGETS], - else - WX_HOME=`${WX_CONFIG} --prefix` - fi -- fi -- fi -- fi -- WX_CONFIG=${WX_HOME}/bin/wx-config - ]) - ]) - -@@ -730,9 +717,8 @@ AC_SUBST(EDB_LIBPQ) - ################################################ - AC_DEFUN([SETUP_WXWIDGETS], - [ -- if test -n "${WX_HOME}" -+ if test -n "${WX_CONFIG}" - then -- LDFLAGS="$LDFLAGS -L${WX_HOME}/lib" - WX_OLD_LDFLAGS="$LDFLAGS" - WX_OLD_CPPFLAGS="$CPPFLAGS" - diff --git a/databases/pgadmin3/patches/patch-configure b/databases/pgadmin3/patches/patch-configure index 6caeb3aa808..aa8de1fb3af 100644 --- a/databases/pgadmin3/patches/patch-configure +++ b/databases/pgadmin3/patches/patch-configure @@ -1,10 +1,10 @@ -$NetBSD: patch-configure,v 1.3 2016/02/16 03:45:19 dbj Exp $ +$NetBSD: patch-configure,v 1.4 2018/05/10 07:12:53 adam Exp $ Remove code that insists wx-config is in a directory named bin --- configure.orig 2014-12-15 15:10:17.000000000 +0000 +++ configure -@@ -6466,15 +6466,6 @@ if test "${with_wx+set}" = set; then : +@@ -6467,15 +6467,6 @@ if test "${with_wx+set}" = set; then : else @@ -20,7 +20,7 @@ Remove code that insists wx-config is in a directory named bin # Search the path for ac_prog in wx-config do -@@ -6527,10 +6518,6 @@ done +@@ -6528,10 +6519,6 @@ done else WX_HOME=`${WX_CONFIG} --prefix` fi @@ -31,7 +31,7 @@ Remove code that insists wx-config is in a directory named bin fi -@@ -6557,9 +6544,8 @@ $as_echo "failed" >&6; } +@@ -6558,9 +6545,8 @@ $as_echo "failed" >&6; } $as_echo "ok" >&6; } diff --git a/databases/pgadmin3/patches/patch-pgadmin_Makefile.in b/databases/pgadmin3/patches/patch-pgadmin_Makefile.in new file mode 100644 index 00000000000..c66065220f0 --- /dev/null +++ b/databases/pgadmin3/patches/patch-pgadmin_Makefile.in @@ -0,0 +1,90 @@ +$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@ |