Re-add mysql4 packages.

Andreas Hallmann graciously agreed to maintain them.

21 files changed, 662 insertions, 0 deletions

diff --git a/databases/mysql4-client/DESCR b/databases/mysql4-client/DESCR
new file mode 100644
index 00000000000..23500c3f7ba
--- /dev/null
+++ b/databases/mysql4-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/mysql4-client/MESSAGE b/databases/mysql4-client/MESSAGE
new file mode 100644
index 00000000000..2b939d7337a
--- /dev/null
+++ b/databases/mysql4-client/MESSAGE
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.4 2008/03/26 13:22:00 wiz 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/mysql4-client/Makefile b/databases/mysql4-client/Makefile
new file mode 100644
index 00000000000..dea9cbcf21f
--- /dev/null
+++ b/databases/mysql4-client/Makefile
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.28 2008/03/26 13:22:00 wiz Exp $
+
+PKGNAME=		${DISTNAME:S/-/-client-/}
+PKGREVISION=		3
+SVR4_PKGNAME=		mysqc
+COMMENT=		MySQL 4, a free SQL database (client)
+
+CONFLICTS=		{mysql-client-[0-9]*,mysql3-client-[0-9]*}
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+.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=		# PLIST
+
+INSTALLATION_DIRS=	${PKGINFODIR}
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info \
+		${DESTDIR}${PREFIX}/${PKGINFODIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/mysql
+.for f in huge large innodb-heavy-4G small medium
+	${INSTALL_DATA} ${WRKSRC}/support-files/my-${f}.cnf.sh \
+		${DESTDIR}${PREFIX}/share/examples/mysql/my-${f}.cnf
+.endfor
+
+# We need the full readline on NetBSD<2.0.
+INCOMPAT_READLINE+=	NetBSD-[0-1].*-*
+.include "../../devel/readline/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
new file mode 100644
index 00000000000..f7681558e5d
--- /dev/null
+++ b/databases/mysql4-client/Makefile.common
@@ -0,0 +1,113 @@
+# $NetBSD: Makefile.common,v 1.64 2008/03/26 13:22:00 wiz Exp $
+
+DISTNAME=		mysql-4.1.22
+CATEGORIES=		databases
+MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-4.1/}
+
+MAINTAINER=		hallmann@ahatec.de
+HOMEPAGE=		http://www.mysql.com/
+
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+
+.include "../../mk/bsd.prefs.mk"
+.include "options.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
+
+PKG_USERS_VARS+=	MYSQL_USER
+PKG_GROUPS_VARS+=	MYSQL_GROUP
+
+# 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:Q}
+CONFIGURE_ARGS+=	--with-named-z-libs=z
+CONFIGURE_ARGS+=	--without-libwrap
+
+.if !empty(MACHINE_PLATFORM:MIRIX-5*)
+CFLAGS+=		-DIRIX5 -DNEEDS_BSTRING_H
+# libgen is incorrectly detected
+CONFIGURE_ENV+=		ac_cv_lib_gen_p2open="no"
+.endif
+
+# We always use our own readline.  Note that these --without-* settings
+# are confusing, but they just mean "don't use the included readline
+# or libedit".
+#
+CONFIGURE_ARGS+=	--without-readline
+CONFIGURE_ARGS+=	--without-libedit
+
+# 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-vio
+
+CONFIGURE_ARGS+=	--with-charset=${MYSQL_CHARSET:Q}
+CONFIGURE_ARGS+=	--with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q}
+
+.if !empty(MACHINE_ARCH:Mi386) && ${OPSYS} != "Interix" && \
+	${OPSYS} != "SunOS" && ${OPSYS} != "Darwin"
+CONFIGURE_ARGS+=	--enable-assembler
+.endif
+
+# Avoid an ICE in gcc2 on sparc64
+CONFIGURE_ENV+=		F77=${FALSE:Q}
+
+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-extract
+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-extract
+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 "../../devel/zlib/buildlink3.mk"
diff --git a/databases/mysql4-client/PLIST b/databases/mysql4-client/PLIST
new file mode 100644
index 00000000000..166dd17912b
--- /dev/null
+++ b/databases/mysql4-client/PLIST
@@ -0,0 +1,79 @@
+@comment $NetBSD: PLIST,v 1.16 2008/03/26 13:22:00 wiz 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/mysqlhotcopy
+bin/mysqlimport
+bin/mysqlmanager-pwgen
+bin/mysqlmanagerc
+bin/mysqlshow
+bin/mysqltest
+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/mysqld_error.h
+include/mysql/raid.h
+include/mysql/sql_common.h
+include/mysql/sql_state.h
+include/mysql/sslopt-case.h
+include/mysql/sslopt-longopts.h
+include/mysql/sslopt-vars.h
+include/mysql/typelib.h
+info/mysql.info
+lib/mysql/libmysqlclient.la
+lib/mysql/libmysqlclient_r.la
+man/man1/msql2mysql.1
+man/man1/mysql.1
+man/man1/mysql_config.1
+man/man1/mysql_fix_privilege_tables.1
+man/man1/mysql_zap.1
+man/man1/mysqlaccess.1
+man/man1/mysqladmin.1
+man/man1/mysqlbinlog.1
+man/man1/mysqlcheck.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/mysql4-client/buildlink3.mk b/databases/mysql4-client/buildlink3.mk
new file mode 100644
index 00000000000..b2e16611dfb
--- /dev/null
+++ b/databases/mysql4-client/buildlink3.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink3.mk,v 1.23 2008/03/26 13:22:00 wiz Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
+
+.if ${BUILDLINK_DEPTH} == "+"
+BUILDLINK_DEPENDS+=	mysql-client
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmysql-client}
+BUILDLINK_PACKAGES+=	mysql-client
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mysql-client
+
+.if ${MYSQL_CLIENT_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.mysql-client+=	mysql-client>=4.1.22<5
+BUILDLINK_ABI_DEPENDS.mysql-client?=	mysql-client>=4.1.22nb1
+BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql4-client
+BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
+BUILDLINK_INCDIRS.mysql-client?=	include/mysql
+.endif	# MYSQL_CLIENT_BUILDLINK3_MK
+
+.include "../../devel/readline/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo
new file mode 100644
index 00000000000..81ce1874015
--- /dev/null
+++ b/databases/mysql4-client/distinfo
@@ -0,0 +1,18 @@
+$NetBSD: distinfo,v 1.31 2008/03/26 13:22:00 wiz Exp $
+
+SHA1 (mysql-4.1.22.tar.gz) = 857e942cc3207caf56e2aa48961fc1ed66d932e6
+RMD160 (mysql-4.1.22.tar.gz) = bfcf5058e4247cf4d7d1550ea54c64ebc8bc615e
+Size (mysql-4.1.22.tar.gz) = 17761101 bytes
+SHA1 (patch-aa) = adc6956d4be304db61aa0323061143fffc1b9751
+SHA1 (patch-ab) = ca126aec7649dbe12663df30fc2223e256df5883
+SHA1 (patch-af) = 0164d5c00600720591cae36b71625660cdb97625
+SHA1 (patch-av) = e1578d1e9742a8317565986bd6ae9a38e0dd5fad
+SHA1 (patch-aw) = 35b3aafe923d44d287abd9d30b2a39b347386102
+SHA1 (patch-ax) = 719c1fdd38f494d097c9340f77e1c3264e084b8c
+SHA1 (patch-ay) = 3edcdd5b6e5a3d9e87f4fc83ff91dfebbeaf3b61
+SHA1 (patch-ba) = 73f89008fc6a1f37c573dce00fdde3965234e211
+SHA1 (patch-bb) = 242c97ab4658838a6001d9c288e01209abfcee77
+SHA1 (patch-bc) = 31c933a03e2b05aeaff1d89d3fa542aad663e96a
+SHA1 (patch-bd) = 32186a1f75d25f4feb95ba9d934dfcb526882681
+SHA1 (patch-be) = 977348504adeea29afb211cf0da8aa42e9c096d9
+SHA1 (patch-bf) = c63133d40c2008ba57a968af693173a1fd97a927
diff --git a/databases/mysql4-client/options.mk b/databases/mysql4-client/options.mk
new file mode 100644
index 00000000000..6d5f8272670
--- /dev/null
+++ b/databases/mysql4-client/options.mk
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.3 2008/03/26 13:22:00 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mysql4-client
+
+PKG_SUPPORTED_OPTIONS=	ssl
+PKG_SUGGESTED_OPTIONS=	ssl
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Enable OpenSSL support
+###
+.if !empty(PKG_OPTIONS:Mssl)
+.	include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+.else
+CONFIGURE_ARGS+=	--without-openssl
+.endif
diff --git a/databases/mysql4-client/patches/patch-aa b/databases/mysql4-client/patches/patch-aa
new file mode 100644
index 00000000000..54b7913904a
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2008/03/26 13:22:00 wiz 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/mysql4-client/patches/patch-ab b/databases/mysql4-client/patches/patch-ab
new file mode 100644
index 00000000000..ffa9ab04e76
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.4 2008/03/26 13:22:00 wiz Exp $
+
+--- sql/mysqld.cc.orig	2006-11-03 04:15:29.000000000 +0200
++++ sql/mysqld.cc	2007-05-23 08:20:22.000000000 +0300
+@@ -183,7 +183,7 @@
+ 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/mysql4-client/patches/patch-af b/databases/mysql4-client/patches/patch-af
new file mode 100644
index 00000000000..b5c91a06aed
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-af
@@ -0,0 +1,73 @@
+$NetBSD: patch-af,v 1.11 2008/03/26 13:22:00 wiz Exp $
+
+--- configure.orig	2006-11-03 04:19:18.000000000 +0200
++++ configure	2007-05-23 08:20:46.000000000 +0300
+@@ -20547,7 +20547,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*)
+@@ -24736,6 +24736,10 @@
+       MAX_C_OPTIMIZE="-O"
+     fi
+     ;;
++  *dragonfly*)
++    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
++    ;;
++    
+   *freebsd*)
+     echo "Adding fix for interrupted reads"
+     OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
+@@ -36636,30 +36640,10 @@
+ fi;
+ 
+ 
+-echo "$as_me:$LINENO: checking for ORBit" >&5
+-echo $ECHO_N "checking for ORBit... $ECHO_C" >&6
+-orbit_config_path=`which orbit-config`
+-if test -n "$orbit_config_path" -a $? = 0
+-then
+-  orbit_exec_prefix=`orbit-config --exec-prefix`
+-  orbit_includes=`orbit-config --cflags server`
+-  orbit_libs=`orbit-config --libs server`
+-  orbit_idl="$orbit_exec_prefix/bin/orbit-idl"
+-  echo "$as_me:$LINENO: result: found!" >&5
+-echo "${ECHO_T}found!" >&6
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ORBIT 1
+-_ACEOF
+-
+-else
+   orbit_exec_prefix=
+   orbit_includes=
+   orbit_libs=
+   orbit_idl=
+-  echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
+-fi
+ 
+ 
+ 
+@@ -36954,7 +36938,7 @@
+ else
+   bench_dirs=""
+ fi
+-bench_dirs="$bench_dirs mysql-test"
++#bench_dirs="$bench_dirs mysql-test"
+ 
+ 
+ # Don't build readline, i have it already
+@@ -37071,7 +37055,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/mysql4-client/patches/patch-av b/databases/mysql4-client/patches/patch-av
new file mode 100644
index 00000000000..a3c6d3f2c53
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-av
@@ -0,0 +1,19 @@
+$NetBSD: patch-av,v 1.8 2008/03/26 13:22:00 wiz Exp $
+
+--- Makefile.in.orig	2006-11-03 04:19:15.000000000 +0200
++++ Makefile.in	2007-05-23 08:21:08.000000000 +0300
+@@ -353,13 +353,7 @@
+ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
+ 			README COPYING EXCEPTIONS-CLIENT
+ 
+-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
+-			@readline_topdir@ sql-common \
+-			@thread_dirs@ pstack \
+-			@sql_union_dirs@ scripts @man_dirs@ tests \
+-			netware @libmysqld_dirs@ \
+-			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
+-
++SUBDIRS = . include strings @sql_client_dirs@ scripts man
+ DIST_SUBDIRS = . include @docs_dirs@ zlib \
+ 			@readline_topdir@ sql-common \
+ 			@thread_dirs@ pstack \
diff --git a/databases/mysql4-client/patches/patch-aw b/databases/mysql4-client/patches/patch-aw
new file mode 100644
index 00000000000..66443e97276
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-aw
@@ -0,0 +1,15 @@
+$NetBSD: patch-aw,v 1.6 2008/03/26 13:22:00 wiz Exp $
+
+--- man/Makefile.in.orig	2006-11-03 04:18:34.000000000 +0200
++++ man/Makefile.in	2007-05-23 08:40:58.000000000 +0300
+@@ -327,8 +327,8 @@
+ vio_dir = @vio_dir@
+ vio_libs = @vio_libs@
+ zlib_dir = @zlib_dir@
+-man1_MANS = @man1_files@
+-man8_MANS = @man8_files@
++man1_MANS = msql2mysql.1 mysql.1 mysql_config.1 mysql_fix_privilege_tables.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlshow.1
++man8_MANS =
+ EXTRA_DIST = $(man1_MANS) $(man8_MANS)
+ all: all-am
+ 
diff --git a/databases/mysql4-client/patches/patch-ax b/databases/mysql4-client/patches/patch-ax
new file mode 100644
index 00000000000..1ee334370a3
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-ax
@@ -0,0 +1,32 @@
+$NetBSD: patch-ax,v 1.8 2008/03/26 13:22:00 wiz Exp $
+
+--- scripts/Makefile.in.orig	2006-11-03 04:19:06.000000000 +0200
++++ scripts/Makefile.in	2007-05-23 08:24:33.000000000 +0300
+@@ -335,23 +335,10 @@
+ vio_dir = @vio_dir@
+ vio_libs = @vio_libs@
+ 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 \
++	mysql_explain_log mysql_tableinfo \
+ 			mysql_create_system_tables
+ 
+ noinst_SCRIPTS = make_binary_distribution \
diff --git a/databases/mysql4-client/patches/patch-ay b/databases/mysql4-client/patches/patch-ay
new file mode 100644
index 00000000000..51df0e3039c
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-ay
@@ -0,0 +1,22 @@
+$NetBSD: patch-ay,v 1.6 2008/03/26 13:22:00 wiz Exp $
+
+--- strings/Makefile.in.orig	2006-11-03 04:19:10.000000000 +0200
++++ strings/Makefile.in	2007-05-23 08:24:57.000000000 +0300
+@@ -584,7 +584,7 @@
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+ 	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
+-	  if test -f $$p; then \
++	  if false; then \
+ 	    f=$(am__strip_dir) \
+ 	    echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+ 	    $(pkglibLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
+@@ -592,7 +592,7 @@
+ 	done
+ 	@$(POST_INSTALL)
+ 	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
+-	  if test -f $$p; then \
++	  if false; then \
+ 	    p=$(am__strip_dir) \
+ 	    echo " $(RANLIB) '$(DESTDIR)$(pkglibdir)/$$p'"; \
+ 	    $(RANLIB) "$(DESTDIR)$(pkglibdir)/$$p"; \
diff --git a/databases/mysql4-client/patches/patch-ba b/databases/mysql4-client/patches/patch-ba
new file mode 100644
index 00000000000..eec23ee6ae6
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-ba
@@ -0,0 +1,30 @@
+$NetBSD: patch-ba,v 1.4 2008/03/26 13:22:00 wiz Exp $
+
+--- client/mysql.cc.orig	2006-11-03 04:15:47.000000000 +0200
++++ client/mysql.cc	2007-05-23 08:25:23.000000000 +0300
+@@ -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>
+@@ -410,8 +413,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..713540ed70f
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-bb
@@ -0,0 +1,15 @@
+$NetBSD: patch-bb,v 1.3 2008/03/26 13:22:00 wiz 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..930a981dbf0
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-bc
@@ -0,0 +1,21 @@
+$NetBSD: patch-bc,v 1.3 2008/03/26 13:22:00 wiz 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);
diff --git a/databases/mysql4-client/patches/patch-bd b/databases/mysql4-client/patches/patch-bd
new file mode 100644
index 00000000000..c31fc762be2
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-bd
@@ -0,0 +1,69 @@
+$NetBSD: patch-bd,v 1.5 2008/03/26 13:22:00 wiz Exp $
+
+--- tests/mysql_client_test.c.orig	2006-11-03 04:15:21.000000000 +0200
++++ tests/mysql_client_test.c	2007-05-23 08:25:53.000000000 +0300
+@@ -22,6 +22,7 @@
+ ***************************************************************************/
+ 
+ #include <my_global.h>
++#include <mysqld_error.h>
+ #include <my_sys.h>
+ #include <mysql.h>
+ #include <errmsg.h>
+@@ -11856,6 +11857,48 @@
+   mysql_stmt_close(stmt);
+ }
+ 
++/*
++  Bug #17667: An attacker has the opportunity to bypass query logging.
++ */
++
++static void test_bug17667()
++{
++  NET *net= &mysql->net;
++  int rc;
++  myheader("test_bug17667");
++
++  /* I. Prepare the table */
++  mysql_real_query(mysql,     "drop table if exists t1", 23);
++
++  rc= mysql_real_query(mysql, "create table t1 (i int)", 23);
++  myquery(rc);
++  DIE_UNLESS(net->last_errno == 0);
++
++  mysql_real_query(mysql,     "insert into t1 (i) values (1)", 29);
++  myquery(rc);
++  DIE_UNLESS(net->last_errno == 0);
++
++  mysql_real_query(mysql,     "insert into /* NUL=\0 */ t1 (i) values (2)", 41);
++  myquery(rc);
++  DIE_UNLESS(net->last_errno == ER_PARSE_ERROR);
++
++  mysql_real_query(mysql,     "/* NUL=\0 */ insert into t1 (i) values (3)", 41);
++  myquery(rc);
++  DIE_UNLESS(net->last_errno == ER_PARSE_ERROR);
++
++  mysql_real_query(mysql,     "insert into /* TAB=\t */ t1 (i) values (4)", 41);
++  myquery(rc);
++  DIE_UNLESS(net->last_errno == 0);
++
++  mysql_real_query(mysql,     "/* TAB=\t */ insert into t1 (i) values (5)", 41);
++  myquery(rc);
++  DIE_UNLESS(net->last_errno == 0);
++
++  /* II. Cleanup */
++  rc= mysql_real_query(mysql, "drop table t1", 13);
++  myquery(rc);
++}
++
+ 
+ /*
+  Bug#20152: mysql_stmt_execute() writes to MYSQL_TYPE_DATE buffer
+@@ -12170,6 +12213,7 @@
+   { "test_bug11718", test_bug11718 },
+   { "test_bug12925", test_bug12925 },
+   { "test_bug15613", test_bug15613 },
++  { "test_bug17667", test_bug17667 },
+   { "test_bug20152", test_bug20152 },
+   { "test_bug21726", test_bug21726 },
+   { 0, 0 }
diff --git a/databases/mysql4-client/patches/patch-be b/databases/mysql4-client/patches/patch-be
new file mode 100644
index 00000000000..89ec7f49835
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-be
@@ -0,0 +1,13 @@
+$NetBSD: patch-be,v 1.4 2008/03/26 13:22:00 wiz Exp $
+
+--- sql/sql_lex.cc.orig	2006-11-03 04:15:21.000000000 +0200
++++ sql/sql_lex.cc	2007-05-23 08:26:27.000000000 +0300
+@@ -894,6 +894,8 @@
+       while (lex->ptr != lex->end_of_query &&
+ 	     ((c=yyGet()) != '*' || yyPeek() != '/'))
+       {
++	if (c == '\0')
++	  return(ABORT_SYM);		// NULLs illegal even in comments
+ 	if (c == '\n')
+ 	  lex->yylineno++;
+       }
diff --git a/databases/mysql4-client/patches/patch-bf b/databases/mysql4-client/patches/patch-bf
new file mode 100644
index 00000000000..71c5ea887b9
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-bf
@@ -0,0 +1,13 @@
+$NetBSD: patch-bf,v 1.3 2008/03/26 13:22:00 wiz Exp $
+
+--- bdb/dist/configure.orig	2006-10-08 15:25:31.000000000 +0200
++++ bdb/dist/configure	2006-10-08 15:26:39.000000000 +0200
+@@ -5038,7 +5038,7 @@ fi
+ # we're using.
+ case "$host_os" in
+ sysv5UnixWare*|sysv5OpenUNIX8*)
+-	if test "$GCC" == "yes"; then
++	if test "$GCC" = "yes"; then
+ 		CPPFLAGS="$CPPFLAGS -pthread"
+ 		LDFLAGS="$LDFLAGS -pthread"
+ 	else