summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2005-02-18 00:48:05 +0000
committerxtraeme <xtraeme@pkgsrc.org>2005-02-18 00:48:05 +0000
commit161ba89dff54dcb44bfde1b96025b852ea01b821 (patch)
tree4b89dc1dc90e30f880321bde6920469bbecd8ebd
parentc3437c2014a458041f342cd958beff68c5d9e4ab (diff)
downloadpkgsrc-161ba89dff54dcb44bfde1b96025b852ea01b821.tar.gz
Apply patches from Georg Schwarz to make this build on IRIX 5.
-rw-r--r--databases/mysql4-client/Makefile.common8
-rw-r--r--databases/mysql4-client/distinfo5
-rw-r--r--databases/mysql4-client/patches/patch-ba30
-rw-r--r--databases/mysql4-client/patches/patch-bb15
-rw-r--r--databases/mysql4-client/patches/patch-bc21
5 files changed, 77 insertions, 2 deletions
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 1da6d1f38f9..099bdea00bb 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2005/02/16 02:21:36 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.32 2005/02/18 00:48:05 xtraeme Exp $
DISTNAME= mysql-4.1.10
CATEGORIES= databases
@@ -36,6 +36,12 @@ CONFIGURE_ARGS+= --with-named-z-libs=z
CONFIGURE_ARGS+= --without-libwrap
CONFIGURE_ARGS+= --with-named-curses-libs="-lcurses -ltermcap"
+.if !empty(LOWER_OPSYS:Mirix5*)
+CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H
+# libgen is incorrectly detected
+CONFIGURE_ENV+= ac_cv_lib_gen_p2open="no"
+.endif
+
# We always use our own readline, either system- or pkgsrc-supplied.
CONFIGURE_ARGS+= --without-readline
diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo
index 02be74df088..ed9a59c36f8 100644
--- a/databases/mysql4-client/distinfo
+++ b/databases/mysql4-client/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2005/02/16 02:21:36 xtraeme Exp $
+$NetBSD: distinfo,v 1.16 2005/02/18 00:48:05 xtraeme Exp $
SHA1 (mysql-4.1.10.tar.gz) = 59590d2a067c40d248fa9ef8689ef51ac46ac261
Size (mysql-4.1.10.tar.gz) = 22563415 bytes
@@ -8,3 +8,6 @@ SHA1 (patch-av) = 4f73104cd3b798103eb2c4f83073dbac02b4db90
SHA1 (patch-aw) = cd03eb6c81a932186370e9ed248d0c7886b7286d
SHA1 (patch-ax) = 9e9176468d6d335617862a4d77a358931d7c8c49
SHA1 (patch-ay) = 9b1dfa213491d8daf82ff8d5ee293d1279c64ce8
+SHA1 (patch-ba) = bd34391e522ae12ee63ec6a734f7a31116b2918d
+SHA1 (patch-bb) = 242c97ab4658838a6001d9c288e01209abfcee77
+SHA1 (patch-bc) = 31c933a03e2b05aeaff1d89d3fa542aad663e96a
diff --git a/databases/mysql4-client/patches/patch-ba b/databases/mysql4-client/patches/patch-ba
new file mode 100644
index 00000000000..a4e8b088202
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-ba
@@ -0,0 +1,30 @@
+$NetBSD: patch-ba,v 1.1 2005/02/18 00:48:05 xtraeme Exp $
+
+--- client/mysql.cc.orig 2005-02-18 01:36:23.000000000 +0100
++++ client/mysql.cc 2005-02-18 01:38:00.000000000 +0100
+@@ -39,6 +39,9 @@
+ #include "my_readline.h"
+ #include <signal.h>
+ #include <violite.h>
++#ifdef NEEDS_BSTRING_H // defines bzero()
++#include <bstring.h>
++#endif
+
+ #if defined(USE_LIBEDIT_INTERFACE) && defined(HAVE_LOCALE_H)
+ #include <locale.h>
+@@ -408,8 +411,13 @@
+ if (opt_sigint_ignore)
+ signal(SIGINT, SIG_IGN);
+ else
+- signal(SIGINT, mysql_end); // Catch SIGINT to clean up
+- signal(SIGQUIT, mysql_end); // Catch SIGQUIT to clean up
++#ifdef IRIX5
++#define _MYSQL_END_TYPE (void (*)(...))
++#else
++#define _MYSQL_END_TYPE
++#endif
++ signal(SIGINT, _MYSQL_END_TYPE mysql_end); // Catch SIGINT to clean up
++ signal(SIGQUIT, _MYSQL_END_TYPE mysql_end); // Catch SIGQUIT to clean up
+
+ /*
+ Run in interactive mode like the ingres/postgres monitor
diff --git a/databases/mysql4-client/patches/patch-bb b/databases/mysql4-client/patches/patch-bb
new file mode 100644
index 00000000000..1e9f268558f
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-bb
@@ -0,0 +1,15 @@
+$NetBSD: patch-bb,v 1.1 2005/02/18 00:48:05 xtraeme Exp $
+
+--- client/completion_hash.cc.orig 2005-02-18 01:38:24.000000000 +0100
++++ client/completion_hash.cc 2005-02-18 01:38:47.000000000 +0100
+@@ -23,6 +23,10 @@
+
+ #include <my_global.h>
+ #include <m_string.h>
++#ifdef NEEDS_BSTRING_H // defines bzero()
++#include <bstring.h>
++#endif
++
+ #undef SAFEMALLOC // Speed things up
+ #include <my_sys.h>
+ #include "completion_hash.h"
diff --git a/databases/mysql4-client/patches/patch-bc b/databases/mysql4-client/patches/patch-bc
new file mode 100644
index 00000000000..c1d2aacb448
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-bc
@@ -0,0 +1,21 @@
+$NetBSD: patch-bc,v 1.1 2005/02/18 00:48:05 xtraeme Exp $
+
+--- client/mysqladmin.cc.orig 2005-02-18 01:39:09.000000000 +0100
++++ client/mysqladmin.cc 2005-02-18 01:40:21.000000000 +0100
+@@ -326,8 +326,14 @@
+ if (tty_password)
+ opt_password = get_tty_password(NullS);
+
+- VOID(signal(SIGINT,endprog)); /* Here if abort */
+- VOID(signal(SIGTERM,endprog)); /* Here if abort */
++#ifdef IRIX5
++#define _MYSQL_END_TYPE (void (*)(...))
++#else
++#define _MYSQL_END_TYPE
++#endif
++
++ VOID(signal(SIGINT,_MYSQL_END_TYPE endprog)); /* Here if abort */
++ VOID(signal(SIGTERM,_MYSQL_END_TYPE endprog));/* Here if abort */
+
+ if (opt_compress)
+ mysql_options(&mysql,MYSQL_OPT_COMPRESS,NullS);