diff options
| author | tron <tron> | 2007-03-12 12:33:12 +0000 |
|---|---|---|
| committer | tron <tron> | 2007-03-12 12:33:12 +0000 |
| commit | e774b85beb1881037fcee2a249c56c27543b0424 (patch) | |
| tree | ad49808753f5c2c6c03f5403c3c4eed7446d9217 /databases/mysql5-client | |
| parent | 4e5103fd5cba72fc0a8822d9e031039dc9fad092 (diff) | |
| download | pkgsrc-e774b85beb1881037fcee2a249c56c27543b0424.tar.gz | |
Fix build problem under NetBSD (-i386 3.1).
Diffstat (limited to 'databases/mysql5-client')
| -rw-r--r-- | databases/mysql5-client/distinfo | 4 | ||||
| -rw-r--r-- | databases/mysql5-client/patches/patch-au | 22 |
2 files changed, 19 insertions, 7 deletions
diff --git a/databases/mysql5-client/distinfo b/databases/mysql5-client/distinfo index 71ab9884b05..6dfa34c57ec 100644 --- a/databases/mysql5-client/distinfo +++ b/databases/mysql5-client/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2007/03/11 18:42:27 adam Exp $ +$NetBSD: distinfo,v 1.17 2007/03/12 12:33:12 tron Exp $ SHA1 (mysql-5.0.37.tar.gz) = 7c957d4337156c7f98b0617fd5a63f3a838a9bc4 RMD160 (mysql-5.0.37.tar.gz) = 132d3886a81fcec9be50cdc8d97c868928f5424f @@ -23,5 +23,5 @@ SHA1 (patch-aq) = 18ed036f2df801124b8c717822ffc9c1224b27e3 SHA1 (patch-ar) = b55373d58540975e24af14b13640e26c4c756923 SHA1 (patch-as) = d301a449e67d786f9155673fdbb5e8bc2f19ee7d SHA1 (patch-at) = 626c0f6926893aa05e261ca1921fb6a352819156 -SHA1 (patch-au) = 1bdfa4599f92d5911e321e19b29593f971beb561 +SHA1 (patch-au) = e5494174b9ed7d5bbca0fe4bd706f7301d331a46 SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299 diff --git a/databases/mysql5-client/patches/patch-au b/databases/mysql5-client/patches/patch-au index d3f831b0cb7..ccd0d2b1233 100644 --- a/databases/mysql5-client/patches/patch-au +++ b/databases/mysql5-client/patches/patch-au @@ -1,7 +1,7 @@ -$NetBSD: patch-au,v 1.2 2007/03/11 18:42:29 adam Exp $ +$NetBSD: patch-au,v 1.3 2007/03/12 12:33:12 tron Exp $ ---- client/mysql.cc.orig 2007-03-05 20:21:21.000000000 +0100 -+++ client/mysql.cc +--- client/mysql.cc.orig 2007-03-05 19:21:21.000000000 +0000 ++++ client/mysql.cc 2007-03-12 11:42:08.000000000 +0000 @@ -37,7 +37,15 @@ #endif #include "my_readline.h" @@ -18,7 +18,7 @@ $NetBSD: patch-au,v 1.2 2007/03/11 18:42:29 adam Exp $ #if defined(USE_LIBEDIT_INTERFACE) && defined(HAVE_LOCALE_H) #include <locale.h> -@@ -438,10 +446,10 @@ int main(int argc,char *argv[]) +@@ -438,10 +446,10 @@ ignore_errors=1; // Don't abort monitor if (opt_sigint_ignore) @@ -32,7 +32,7 @@ $NetBSD: patch-au,v 1.2 2007/03/11 18:42:29 adam Exp $ /* Run in interactive mode like the ingres/postgres monitor -@@ -513,7 +521,7 @@ sig_handler mysql_sigint(int sig) +@@ -513,7 +521,7 @@ char kill_buffer[40]; MYSQL *kill_mysql= NULL; @@ -41,3 +41,15 @@ $NetBSD: patch-au,v 1.2 2007/03/11 18:42:29 adam Exp $ /* terminate if no query being executed, or we already tried interrupting */ if (!executing_query || interrupted_query++) +@@ -1418,7 +1426,11 @@ + */ + + #if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE) ++#ifdef __NetBSD__ ++int no_completion(const char*,int) ++#else + char *no_completion(const char*,int) ++#endif + #else + char *no_completion() + #endif |