Initial import of mysql5-client-5.0.15.

MySQL is a SQL (Structured Query Language) database server.  SQL is the
most popular database language in the world.  MySQL is a client-server
implementation that consists of a server daemon `mysqld' and many
different client programs/libraries.

The main goals of MySQL are speed and robustness.

The base upon which MySQL is built is a set of routines that have been
used in a highly demanding production environment for many years.  While
MySQL is still in development it already offers a rich and highly useful
function set.

The official way to pronounce 'MySQL' is 'My Ess Que Ell' (Not MY-SEQUEL).

This package contains the MySQL client programs and libraries.

17 files changed, 499 insertions, 0 deletions

diff --git a/databases/mysql5-client/DESCR b/databases/mysql5-client/DESCR
new file mode 100644
index 00000000000..23500c3f7ba
--- /dev/null
+++ b/databases/mysql5-client/DESCR
@@ -0,0 +1,15 @@
+MySQL is a SQL (Structured Query Language) database server.  SQL is the
+most popular database language in the world.  MySQL is a client-server
+implementation that consists of a server daemon `mysqld' and many
+different client programs/libraries.
+
+The main goals of MySQL are speed and robustness.
+
+The base upon which MySQL is built is a set of routines that have been
+used in a highly demanding production environment for many years.  While
+MySQL is still in development it already offers a rich and highly useful
+function set.
+
+The official way to pronounce 'MySQL' is 'My Ess Que Ell' (Not MY-SEQUEL).
+
+This package contains the MySQL client programs and libraries.
diff --git a/databases/mysql5-client/MESSAGE b/databases/mysql5-client/MESSAGE
new file mode 100644
index 00000000000..bd6e3bf90db
--- /dev/null
+++ b/databases/mysql5-client/MESSAGE
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+
+To use the ``mysqlhotcopy'' script, you'll have to install the following
+packages:
+
+	databases/p5-DBD-mysql
+	devel/p5-File-Temp
+
+===========================================================================
diff --git a/databases/mysql5-client/Makefile b/databases/mysql5-client/Makefile
new file mode 100644
index 00000000000..ebd41c7547e
--- /dev/null
+++ b/databases/mysql5-client/Makefile
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+
+PKGNAME=		${DISTNAME:S/-/-client-/}
+#PKGREVISION=		1
+SVR4_PKGNAME=		mysqc
+COMMENT=		MySQL 5, a free SQL database (client)
+
+CONFLICTS=		{mysql-client-[0-9]*,mysql3-client-[0-9]*}
+
+.include "Makefile.common"
+
+CONFIGURE_ARGS+=	--without-extra-tools
+CONFIGURE_ARGS+=	--without-server
+CONFIGURE_ARGS+=	--enable-thread-safe-client
+UNWRAP_FILES=		scripts/mysql_config
+
+INFO_FILES=		mysql.info
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mysql
+.for f in huge large innodb-heavy-4G small medium
+	${INSTALL_DATA} ${WRKSRC}/support-files/my-${f}.cnf.sh \
+		${PREFIX}/share/examples/mysql/my-${f}.cnf
+.endfor
+
+.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
new file mode 100644
index 00000000000..f0f284470fe
--- /dev/null
+++ b/databases/mysql5-client/Makefile.common
@@ -0,0 +1,116 @@
+# $NetBSD: Makefile.common,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+
+DISTNAME=		mysql-5.0.15
+CATEGORIES=		databases
+MASTER_SITES=		http://mirrors.sunsite.dk/mysql/Downloads/MySQL-5.0/ \
+			ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-5.0/ \
+			ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-5.0/
+
+MAINTAINER=		xtraeme@NetBSD.org
+HOMEPAGE=		http://www.mysql.com/
+
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+
+.include "../../mk/bsd.prefs.mk"
+
+EXTRACT_USING=		pax
+
+# MYSQL_USER		username of the database administrator
+# MYSQL_GROUP		group of the database administrator
+# MYSQL_DATADIR		home directory of the database administrator and
+#			location of the databases
+MYSQL_USER?=		mysql
+MYSQL_GROUP?=		mysql
+MYSQL_DATADIR?=		${VARBASE}/mysql
+
+# MYSQL_CHARSET		default character set
+# MYSQL_EXTRA_CHARSET	additional character set to be compiled in.
+#
+MYSQL_CHARSET?=		latin1
+MYSQL_EXTRA_CHARSET?=	all
+
+CONFIGURE_ARGS+=	--localstatedir=${MYSQL_DATADIR}
+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
+CONFIGURE_ARGS+=	--without-libedit
+
+# We need the full readline on NetBSD 1.6.x
+.if !empty(MACHINE_PLATFORM:MNetBSD-1.*)
+USE_BUILTIN.readline=	no
+.include "../../devel/readline/buildlink3.mk"
+.endif
+
+# This forces mysql.info _not_ to be rebuilt.
+CONFIGURE_ARGS+=	--without-docs
+
+# Speed up production one-time builds; see "./configure --help" for
+# more information on using or disabling this option.
+CONFIGURE_ARGS+=	--disable-dependency-tracking
+
+CONFIGURE_ARGS+=	--without-debug
+CONFIGURE_ARGS+=	--without-bench
+CONFIGURE_ARGS+=	--with-low-memory
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=	--with-vio
+
+CONFIGURE_ARGS+=	--with-charset=${MYSQL_CHARSET}
+CONFIGURE_ARGS+=	--with-extra-charsets=${MYSQL_EXTRA_CHARSET}
+
+.if !empty(MACHINE_ARCH:Mi386)
+CONFIGURE_ARGS+=	--enable-assembler
+.endif
+
+# Avoid an ICE in gcc2 on sparc64
+CONFIGURE_ENV+=		F77=${FALSE}
+
+CPPFLAGS+=		-Dunix
+CFLAGS+=		-DUSE_OLD_FUNCTIONS # 3.23.x compat
+
+# force HAVE_CURSES_H on Solaris since the configure script is broken
+# and does not properly detect this, breaking the build later on.
+.if ${OPSYS} == "SunOS"
+CFLAGS+=		-DHAVE_CURSES_H
+CXXFLAGS+=		-DHAVE_CURSES_H
+.endif
+
+.include "../../mk/pthread.buildlink3.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
+CFLAGS+=	-DSIGNALS_DONT_BREAK_READ
+CXXFLAGS+=	-DSIGNALS_DONT_BREAK_READ
+CONFIGURE_ENV+=	ac_cv_func_pthread_setschedparam=no
+CONFIGURE_ENV+=	ac_cv_func_pthread_attr_setschedparam=no
+.endif
+
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake perl:run
+LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
+
+SUBST_CLASSES+=		mk scripts
+SUBST_STAGE.mk=		post-patch
+SUBST_FILES.mk=		dbug/Makefile.in heap/Makefile.in isam/Makefile.in \
+			merge/Makefile.in mysys/Makefile.in \
+			strings/Makefile.in
+SUBST_SED.mk=		-e "/^install-exec:/s/install-pkglibLIBRARIES//"
+SUBST_MESSAGE.mk=	"Fixing Makefiles."
+SUBST_STAGE.scripts=	post-patch
+SUBST_FILES.scripts=	scripts/mysql_install_db.sh scripts/mysqld_safe.sh \
+			scripts/mysql_secure_installation.sh \
+			support-files/mysql.server.sh
+SUBST_SED.scripts=	-e "s,chown,${CHOWN},g" \
+			-e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
+SUBST_MESSAGE.scripts=	"Fixing scripts."
+
+.include "../../security/openssl/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
diff --git a/databases/mysql5-client/PLIST b/databases/mysql5-client/PLIST
new file mode 100644
index 00000000000..dfdc4e8b631
--- /dev/null
+++ b/databases/mysql5-client/PLIST
@@ -0,0 +1,73 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+bin/msql2mysql
+bin/mysql
+bin/mysql_config
+bin/mysql_convert_table_format
+bin/mysql_create_system_tables
+bin/mysql_explain_log
+bin/mysql_find_rows
+bin/mysql_fix_privilege_tables
+bin/mysql_setpermission
+bin/mysql_tableinfo
+bin/mysql_zap
+bin/mysqlaccess
+bin/mysqladmin
+bin/mysqlbinlog
+bin/mysqlbug
+bin/mysqlcheck
+bin/mysqldump
+bin/mysqldumpslow
+bin/mysqlhotcopy
+bin/mysqlimport
+bin/mysqlshow
+bin/mysqltest
+bin/mysqltestmanager-pwgen
+bin/mysqltestmanagerc
+include/mysql/errmsg.h
+include/mysql/keycache.h
+include/mysql/m_ctype.h
+include/mysql/m_string.h
+include/mysql/my_alloc.h
+include/mysql/my_config.h
+include/mysql/my_dbug.h
+include/mysql/my_dir.h
+include/mysql/my_getopt.h
+include/mysql/my_global.h
+include/mysql/my_list.h
+include/mysql/my_net.h
+include/mysql/my_no_pthread.h
+include/mysql/my_pthread.h
+include/mysql/my_semaphore.h
+include/mysql/my_sys.h
+include/mysql/my_xml.h
+include/mysql/mysql.h
+include/mysql/mysql_com.h
+include/mysql/mysql_embed.h
+include/mysql/mysql_time.h
+include/mysql/mysql_version.h
+include/mysql/raid.h
+include/mysql/sql_common.h
+include/mysql/sslopt-case.h
+include/mysql/sslopt-longopts.h
+include/mysql/sslopt-vars.h
+include/mysql/typelib.h
+lib/mysql/libmysqlclient.la
+lib/mysql/libmysqlclient_r.la
+man/man1/mysql.1
+man/man1/mysql_fix_privilege_tables.1
+man/man1/mysql_zap.1
+man/man1/mysqlaccess.1
+man/man1/mysqladmin.1
+man/man1/mysqldump.1
+man/man1/mysqlshow.1
+share/examples/mysql/my-huge.cnf
+share/examples/mysql/my-innodb-heavy-4G.cnf
+share/examples/mysql/my-large.cnf
+share/examples/mysql/my-medium.cnf
+share/examples/mysql/my-small.cnf
+share/mysql/fill_help_tables.sql
+share/mysql/mysql_fix_privilege_tables.sql
+@dirrm share/mysql
+@dirrm share/examples/mysql
+@dirrm lib/mysql
+@dirrm include/mysql
diff --git a/databases/mysql5-client/buildlink3.mk b/databases/mysql5-client/buildlink3.mk
new file mode 100644
index 00000000000..62c43e05163
--- /dev/null
+++ b/databases/mysql5-client/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	mysql-client
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmysql-client}
+BUILDLINK_PACKAGES+=	mysql-client
+
+.if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.mysql-client+=	mysql-client>=5.0.15
+BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql5-client
+BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
+BUILDLINK_INCDIRS.mysql-client?=	include/mysql
+.endif	# MYSQL_CLIENT_BUILDLINK3_MK
+
+.include "../../security/openssl/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/mysql5-client/distinfo b/databases/mysql5-client/distinfo
new file mode 100644
index 00000000000..e50499a35f7
--- /dev/null
+++ b/databases/mysql5-client/distinfo
@@ -0,0 +1,15 @@
+$NetBSD: distinfo,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+
+SHA1 (mysql-5.0.15.tar.gz) = b6092615de6ef5f861f91810413007c1c63058cf
+RMD160 (mysql-5.0.15.tar.gz) = 6a8007f5d12b945b8c3560d27abe98d41abecaf5
+Size (mysql-5.0.15.tar.gz) = 18813065 bytes
+SHA1 (patch-aa) = adc6956d4be304db61aa0323061143fffc1b9751
+SHA1 (patch-ab) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f
+SHA1 (patch-ac) = c97ef88d13cba67b79cdb40fc23facf29edbe0b8
+SHA1 (patch-ad) = aab3c8771e398ecab6b7f6c1a85ffaf60f324053
+SHA1 (patch-ae) = 29c830c2eb6cc1ff74cbc4f9d9daa6555734e544
+SHA1 (patch-af) = 6134efe7043eec4cf2acd8eb272108d38bab5be8
+SHA1 (patch-ag) = 9b1dfa213491d8daf82ff8d5ee293d1279c64ce8
+SHA1 (patch-ah) = bd34391e522ae12ee63ec6a734f7a31116b2918d
+SHA1 (patch-ai) = 242c97ab4658838a6001d9c288e01209abfcee77
+SHA1 (patch-aj) = 31c933a03e2b05aeaff1d89d3fa542aad663e96a
diff --git a/databases/mysql5-client/patches/patch-aa b/databases/mysql5-client/patches/patch-aa
new file mode 100644
index 00000000000..5da266e8314
--- /dev/null
+++ b/databases/mysql5-client/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+
+--- mysys/my_gethwaddr.c.orig	2005-10-14 10:21:10.000000000 +0000
++++ mysys/my_gethwaddr.c
+@@ -31,7 +31,7 @@ static my_bool memcpy_and_test(uchar *to
+   return res;
+ }
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ 
+ #include <net/ethernet.h>
+ #include <sys/sysctl.h>
diff --git a/databases/mysql5-client/patches/patch-ab b/databases/mysql5-client/patches/patch-ab
new file mode 100644
index 00000000000..43a4d4ea843
--- /dev/null
+++ b/databases/mysql5-client/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+
+--- sql/mysqld.cc.orig	2005-10-14 10:21:12.000000000 +0000
++++ sql/mysqld.cc
+@@ -182,7 +182,7 @@ static void getvolumeID(BYTE *volumeName
+ int initgroups(const char *,unsigned int);
+ #endif
+ 
+-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H)
++#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H)
+ #include <ieeefp.h>
+ #ifdef HAVE_FP_EXCEPT				// Fix type conflict
+ typedef fp_except fp_except_t;
diff --git a/databases/mysql5-client/patches/patch-ac b/databases/mysql5-client/patches/patch-ac
new file mode 100644
index 00000000000..920e18babc2
--- /dev/null
+++ b/databases/mysql5-client/patches/patch-ac
@@ -0,0 +1,33 @@
+$NetBSD: patch-ac,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+
+--- configure.orig	2005-10-17 03:29:33.000000000 +0200
++++ configure	2005-10-31 09:16:17.000000000 +0100
+@@ -21984,7 +21984,7 @@
+   FIND_PROC="$PS \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
+ else
+   case $SYSTEM_TYPE in
+-    *freebsd*)
++    *freebsd*|*dragonfly*)
+       FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
+       ;;
+     *darwin*)
+@@ -26258,6 +26258,10 @@
+       MAX_C_OPTIMIZE="-O"
+     fi
+     ;;
++  *dragonfly*)
++  	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
++   ;;
++
+   *freebsd*)
+     { echo "$as_me:$LINENO: WARNING: Adding fix for interrupted reads" >&5
+ echo "$as_me: WARNING: Adding fix for interrupted reads" >&2;}
+@@ -39729,7 +39733,7 @@
+ main ()
+ {
+ 
+-		char res= *(*rl_completion_entry_function)(0,0);
++		char res= (*rl_completion_entry_function)(0,0);
+ 		completion_matches(0,0);
+ 
+   ;
diff --git a/databases/mysql5-client/patches/patch-ad b/databases/mysql5-client/patches/patch-ad
new file mode 100644
index 00000000000..cd3c46eb509
--- /dev/null
+++ b/databases/mysql5-client/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+
+--- Makefile.in.orig	2005-10-31 09:11:04.000000000 +0100
++++ Makefile.in	2005-10-31 09:11:33.000000000 +0100
+@@ -359,12 +359,7 @@
+ 
+ # These are built from source in the Docs directory
+ EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
+-SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
+-			@readline_topdir@ sql-common \
+-			@thread_dirs@ pstack \
+-			@sql_union_dirs@ scripts @man_dirs@ tests \
+-			netware @libmysqld_dirs@ \
+-			@bench_dirs@ support-files @tools_dirs@
++SUBDIRS = . include strings @sql_client_dirs@ scripts man
+ 
+ DIST_SUBDIRS = . include @docs_dirs@ zlib \
+ 			@readline_topdir@ sql-common \
diff --git a/databases/mysql5-client/patches/patch-ae b/databases/mysql5-client/patches/patch-ae
new file mode 100644
index 00000000000..9ebeff55fdd
--- /dev/null
+++ b/databases/mysql5-client/patches/patch-ae
@@ -0,0 +1,32 @@
+$NetBSD: patch-ae,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+
+--- scripts/Makefile.in.orig	2005-10-31 09:12:57.000000000 +0100
++++ scripts/Makefile.in	2005-10-31 09:13:33.000000000 +0100
+@@ -337,23 +337,10 @@
+ yassl_dir = @yassl_dir@
+ yassl_integer_extra_cxxflags = @yassl_integer_extra_cxxflags@
+ zlib_dir = @zlib_dir@
+-bin_SCRIPTS = @server_scripts@ \
+-			msql2mysql \
+-			mysql_config \
+-			mysql_fix_privilege_tables \
+-			mysql_fix_extensions \
+-			mysql_setpermission \
+-			mysql_secure_installation \
+-			mysql_zap \
+-			mysqlaccess \
+-			mysqlbug \
+-			mysql_convert_table_format \
+-			mysql_find_rows \
+-			mysqlhotcopy \
+-			mysqldumpslow \
+-			mysql_explain_log \
+-			mysql_tableinfo \
+-			mysqld_multi \
++bin_SCRIPTS = msql2mysql mysql_config mysql_fix_privilege_tables \
++	mysql_setpermission mysql_zap mysqlaccess mysqlbug \
++	mysql_convert_table_format mysql_find_rows mysqlhotcopy \
++	mysqldumpslow mysql_explain_log mysql_tableinfo \
+ 			mysql_create_system_tables
+ 
+ noinst_SCRIPTS = make_binary_distribution \
diff --git a/databases/mysql5-client/patches/patch-af b/databases/mysql5-client/patches/patch-af
new file mode 100644
index 00000000000..37d4f0c1fd4
--- /dev/null
+++ b/databases/mysql5-client/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+
+--- man/Makefile.in.orig	2005-10-31 09:11:58.000000000 +0100
++++ man/Makefile.in	2005-10-31 09:12:27.000000000 +0100
+@@ -334,9 +334,8 @@
+ yassl_dir = @yassl_dir@
+ yassl_integer_extra_cxxflags = @yassl_integer_extra_cxxflags@
+ zlib_dir = @zlib_dir@
+-man_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 \
+-		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
+-		perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1
++man_MANS =	mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \
++		mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1
+ 
+ EXTRA_DIST = mysql.1.in mysql_zap.1.in \
+ 		mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
diff --git a/databases/mysql5-client/patches/patch-ag b/databases/mysql5-client/patches/patch-ag
new file mode 100644
index 00000000000..ad842c60f2f
--- /dev/null
+++ b/databases/mysql5-client/patches/patch-ag
@@ -0,0 +1,28 @@
+$NetBSD: patch-ag,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+
+--- strings/Makefile.in.orig	2004-12-27 17:48:04.000000000 +0100
++++ strings/Makefile.in	2005-01-11 23:29:03.000000000 +0100
+@@ -599,7 +599,6 @@
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+ 	    echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+-	    $(pkglibLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 	@$(POST_INSTALL)
+@@ -607,7 +606,6 @@
+ 	  if test -f $$p; then \
+ 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+ 	    echo " $(RANLIB) '$(DESTDIR)$(pkglibdir)/$$p'"; \
+-	    $(RANLIB) "$(DESTDIR)$(pkglibdir)/$$p"; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -616,7 +614,6 @@
+ 	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
+ 	  p="`echo $$p | sed -e 's|^.*/||'`"; \
+ 	  echo " rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
+-	  rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
+ 	done
+ 
+ clean-pkglibLIBRARIES:
diff --git a/databases/mysql5-client/patches/patch-ah b/databases/mysql5-client/patches/patch-ah
new file mode 100644
index 00000000000..94f62a2a74f
--- /dev/null
+++ b/databases/mysql5-client/patches/patch-ah
@@ -0,0 +1,30 @@
+$NetBSD: patch-ah,v 1.1.1.1 2005/10/31 09:21:40 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/mysql5-client/patches/patch-ai b/databases/mysql5-client/patches/patch-ai
new file mode 100644
index 00000000000..f8031132936
--- /dev/null
+++ b/databases/mysql5-client/patches/patch-ai
@@ -0,0 +1,15 @@
+$NetBSD: patch-ai,v 1.1.1.1 2005/10/31 09:21:40 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/mysql5-client/patches/patch-aj b/databases/mysql5-client/patches/patch-aj
new file mode 100644
index 00000000000..11ced7f7eb8
--- /dev/null
+++ b/databases/mysql5-client/patches/patch-aj
@@ -0,0 +1,21 @@
+$NetBSD: patch-aj,v 1.1.1.1 2005/10/31 09:21:40 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);