Update mysql-{client,server} to 4.0.21 (previously mysql4-*).

19 files changed, 400 insertions, 126 deletions

diff --git a/databases/mysql-server/INSTALL b/databases/mysql-server/INSTALL
deleted file mode 100644
index fc672ca59cd..00000000000
--- a/databases/mysql-server/INSTALL
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: INSTALL,v 1.5 2003/09/19 14:34:57 wiz Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	${ECHO} "-------------------------------"
-	${ECHO} "Initializing MySQL databases..."
-	${ECHO} "-------------------------------"
-	${PKG_PREFIX}/bin/mysql_install_db --force
-	${CHOWN} -R @MYSQL_USER@:@MYSQL_GROUP@ @MYSQL_DATADIR@
-	;;
-esac
diff --git a/databases/mysql-server/MESSAGE b/databases/mysql-server/MESSAGE
index 5a126e9462c..465b38f0220 100644
--- a/databases/mysql-server/MESSAGE
+++ b/databases/mysql-server/MESSAGE
@@ -1,17 +1,25 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.8 2003/10/05 17:55:34 martti Exp $
+$NetBSD: MESSAGE,v 1.9 2004/10/28 01:08:15 xtraeme Exp $
 
-The MySQL directory `${MYSQL_DATADIR}' should be owned by the
-user `${MYSQL_USER}' and group `${MYSQL_GROUP}'.  This can be done with:
-	chown -R ${MYSQL_USER}:${MYSQL_GROUP} ${MYSQL_DATADIR}
+The MySQL directory `${MYSQL_DATADIR}' should be owned by the user
+`${MYSQL_USER}' and group `${MYSQL_GROUP}'.  This can be done with:
+
+  chown -R ${MYSQL_USER}:${MYSQL_GROUP} ${MYSQL_DATADIR}
 
 If this is a new installation, please remember to set a password for
 the MySQL root user!  This is done by running both:
-	${PREFIX}/bin/mysqladmin -u root -p password 'new-password'
-	${PREFIX}/bin/mysqladmin -h `hostname` -u root -p password 'new-password'
-(The "Enter password:" prompt is asking for the existing password.
-As there is no existing password, just press Return.)
 
-See the manual for more instructions.
+  ${PREFIX}/bin/mysqladmin -u root -p password 'new-password'
+  ${PREFIX}/bin/mysqladmin -h `hostname` -u root -p password 'new-password'
+
+The "Enter password:" prompt is asking for the existing password.
+As there is no existing password, just press the Return key.
+
+There is a script distributed with MySQL that can help you lock down
+an installation.  This script has been installed to
+
+  ${PREFIX}/bin/mysql_secure_installation.
+
+Please see the manual and the MySQL web site for more instructions.
 
 ===========================================================================
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index fb6b479832d..dac660bf927 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,41 +1,48 @@
-# $NetBSD: Makefile,v 1.56 2004/10/03 00:13:21 tv Exp $
+# $NetBSD: Makefile,v 1.57 2004/10/28 01:08:15 xtraeme Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 SVR4_PKGNAME=		mysqs
-COMMENT=		MySQL 3, a free SQL database (server)
+COMMENT=		MySQL 4, a free SQL database (server)
 
-.include "../../databases/mysql-client/Makefile.common"
+CONFLICTS=		{mysql-server-[0-9]*,mysql3-server-[0-9]*}
 
-CONFIGURE_ARGS+=	--without-berkeley-db
-USE_BUILDLINK3=		YES
-USE_GNU_TOOLS+=		make
+.include "../mysql4-client/Makefile.common"
 
-USE_PKGINSTALL=		YES
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+USE_BUILDLINK3=		yes
 
-PTHREAD_OPTS=		require
+CONFIGURE_ARGS+=	--with-libwrap
+CONFIGURE_ARGS+=	--with-raid
+CONFIGURE_ARGS+=	--without-berkeley-db
+CONFIGURE_ARGS+=	--without-mysqlfs
+CONFIGURE_ARGS+=	--with-mysqld-user=${MYSQL_USER}
 
+PTHREAD_OPTS+=		require
 CONFIGURE_ARGS+=	--with-pthreads
 
+USE_PKGINSTALL=		YES
+DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
+
 PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}::MySQL\\ database\\ administrator:${MYSQL_DATADIR}:${SH}
 PKG_GROUPS=		${MYSQL_GROUP}
 RCD_SCRIPTS=		mysqld
-CONFIGURE_ARGS+=	--with-mysqld-user=${MYSQL_USER}
-FILES_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR}
-FILES_SUBST+=		MYSQL_USER=${MYSQL_USER}
-FILES_SUBST+=		MYSQL_GROUP=${MYSQL_GROUP}
+
+FILES_SUBST+=		HOSTNAME_CMD=${HOSTNAME_CMD} \
+			MYSQL_DATADIR=${MYSQL_DATADIR} \
+			MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
 MESSAGE_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR} \
 			MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
 BUILD_DEFS+=		MYSQL_DATADIR
-OWN_DIRS_PERMS+=	${MYSQL_DATADIR} ${MYSQL_USER} ${MYSQL_GROUP} 0700
+BUILD_DIRS=		${WRKSRC} ${WRKSRC}/man
 
-# XXX TCP wrapper support is broken on (at least) Linux and Solaris.
-# ref: http://bugs.mysql.com/bug.php?id=599
-#      http://mail-index.netbsd.org/tech-pkg/2003/08/07/0003.html
-.if ${OPSYS} != "Linux" && ${OPSYS} != "SunOS"
-CONFIGURE_ARGS+=	--with-libwrap
-.  include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../databases/mysql4-client/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+.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
 
 post-configure:
@@ -43,23 +50,14 @@ post-configure:
 
 post-build:
 	cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}	\
-		${MAKE_FLAGS} safe_mysqld mysql_install_db
+		${MAKE_FLAGS} mysqld_safe mysql_install_db
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/safe_mysqld ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysqld_safe ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_install_db ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/support-files/mysql.server ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/mysqld.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/safe_mysqld.1 ${PREFIX}/man/man1
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../databases/mysql-client/buildlink3.mk"
-
-.if ${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
+	${INSTALL_MAN} ${WRKSRC}/man/mysqld_multi.1 ${PREFIX}/man/man1
+	#${INSTALL_MAN} ${WRKSRC}/man/mysqld_safe.1 ${PREFIX}/man/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql-server/PLIST b/databases/mysql-server/PLIST
index 7efe7cbc244..5f418728501 100644
--- a/databases/mysql-server/PLIST
+++ b/databases/mysql-server/PLIST
@@ -1,19 +1,22 @@
-@comment $NetBSD: PLIST,v 1.5 2004/04/23 22:07:53 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/10/28 01:08:15 xtraeme Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
 bin/my_print_defaults
+bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
 bin/mysql.server
+bin/mysql_install
 bin/mysql_install_db
+bin/mysql_waitpid
+bin/mysqld_safe
 bin/pack_isam
 bin/perror
 bin/replace
 bin/resolve_stack_dump
 bin/resolveip
-bin/safe_mysqld
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
@@ -22,9 +25,11 @@ lib/mysql/libmyisammrg.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
+lib/mysql/libvio.a
 libexec/mysqld
 man/man1/mysqld.1
-man/man1/safe_mysqld.1
+man/man1/mysqld_multi.1
+@comment man/man1/mysqld_safe.1
 share/mysql/charsets/Index
 share/mysql/charsets/README
 share/mysql/charsets/cp1251.conf
diff --git a/databases/mysql-server/distinfo b/databases/mysql-server/distinfo
index 6b950def9ef..68b250f9714 100644
--- a/databases/mysql-server/distinfo
+++ b/databases/mysql-server/distinfo
@@ -1,10 +1,17 @@
-$NetBSD: distinfo,v 1.25 2004/01/07 08:02:18 cube Exp $
+$NetBSD: distinfo,v 1.26 2004/10/28 01:08:15 xtraeme Exp $
 
-SHA1 (mysql-3.23.58.tar.gz) = f3383e41e8926c040a295173881414a1e96e0266
-Size (mysql-3.23.58.tar.gz) = 12039843 bytes
-SHA1 (patch-aa) = 3954608e14c5c7996e699dc3dc083cf93d5944c7
-SHA1 (patch-ab) = 026fe468b4d7517084eea74ae14e115861d7d552
-SHA1 (patch-ae) = 127fb44f62f351236e4f36609f8d3af7469e67cd
-SHA1 (patch-af) = 53d0c68891918e9b0a21a9e30bf4b36aec44d2b8
-SHA1 (patch-al) = 4dea01ae58df622706887c59f303ffaf38384393
-SHA1 (patch-am) = 8e4398480701eb38193babdeac59572cdadbd4ea
+SHA1 (mysql-4.0.21.tar.gz) = 1f5059c79e0c3718e005d41c428b83f2755fc7aa
+Size (mysql-4.0.21.tar.gz) = 14107388 bytes
+SHA1 (patch-aa) = 8c47efec1c930fbb3ec655502b1434fc8e58fe40
+SHA1 (patch-ae) = d5dcade3dea37c2f9be12bbddf6091ddb57344ac
+SHA1 (patch-af) = 038b5d570265e1f821de6502d05f94225eba5672
+SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96
+SHA1 (patch-am) = 691e8d492b96a4eec370d8413dcec28c7828c55b
+SHA1 (patch-aq) = 1e09f64374ebc3a9ee4cad2a8f6d7b11ba4b0451
+SHA1 (patch-ar) = 7440bd5082194266652bd17a1a81b3778ab9b760
+SHA1 (patch-as) = 6e034bfe25d60efb852c39a08653510063fac866
+SHA1 (patch-at) = 3a457c3f6b13312cb71b663108abd0ace09f2be4
+SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
+SHA1 (patch-av) = 6ea5b9338d223f1380386288c537f55d4fd7a7d7
+SHA1 (patch-aw) = 6beb03517de678def5631517c8a7db7ea6540137
+SHA1 (patch-ax) = 8e21c394b9cd6f7f2a0cae0c76ac08d224a18420
diff --git a/databases/mysql-server/files/mysqld.sh b/databases/mysql-server/files/mysqld.sh
index 334eab15e81..4f684611294 100644
--- a/databases/mysql-server/files/mysqld.sh
+++ b/databases/mysql-server/files/mysqld.sh
@@ -1,31 +1,103 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: mysqld.sh,v 1.2 2003/10/05 17:55:34 martti Exp $
+# $NetBSD: mysqld.sh,v 1.3 2004/10/28 01:08:15 xtraeme Exp $
 #
-
 # PROVIDE: mysqld
 # REQUIRE: DAEMON LOGIN mountall
 # KEYWORD: shutdown
-
-# Note: this needs NetBSD 1.6 or newer
+#
+# You will need to set some variables in /etc/rc.conf to start MySQL:
+#
+# mysqld=YES
+#
+# The following variables are optional:
+#
+#       mysqld_user="mysql"		# user to run mysqld as
+#       mysqld_datadir="/path/to/home"	# path to MySQL database directory
 #
 
-. /etc/rc.subr
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr
+fi
 
 name="mysqld"
-rcvar=$name
-command="@PREFIX@/bin/safe_mysqld"
+rcvar=${name}
+command="@PREFIX@/bin/mysqld_safe"
 procname="@PREFIX@/libexec/${name}"
-pidfile="@MYSQL_DATADIR@/`hostname`.pid"
+mysqld_user="@MYSQL_USER@"
+mysqld_group="@MYSQL_GROUP@"
+mysqld_datadir="@MYSQL_DATADIR@"
+pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid"
+
+extra_commands="initdb"
+initdb_cmd="mysqld_initdb"
+start_precmd="mysqld_precmd"
 start_cmd="mysqld_start"
-required_files="@MYSQL_DATADIR@/mysql/host.frm"
+
+mysqld_precmd()
+{
+	if [ ! -d ${mysqld_datadir} ]; then
+		mysqld_initdb
+	fi
+}
+
+mysqld_initdb()
+{
+	initdb="@PREFIX@/bin/mysql_install_db"
+	if [ ! -x ${initdb} ]; then
+		return 1
+	fi
+	if [ -f ${mysqld_datadir}/mysql/host.frm ]; then
+		@ECHO@ "The MySQL database has already been initialized."
+		@ECHO@ "Skipping database initialization."
+	else
+		@ECHO@ "Initializing MySQL database system tables."
+		${initdb} --force --user=${mysqld_user} \
+			  --datadir=${mysqld_datadir} || return 1
+		if [ -d ${mysqld_datadir} ]; then
+			@CHOWN@ -R ${mysqld_user}:${mysqld_group} \
+				${mysqld_datadir}
+		fi
+	fi
+}
 
 mysqld_start()
 {
-	echo "Starting mysqld."
+	for f in $required_files; do
+		if [ ! -r "$f" ]; then
+			@ECHO@ 1>&2 "$0: WARNING: $f is not readable"
+			if [ -z $rc_force ]; then
+				return 1
+			fi
+		fi
+	done
+	@ECHO@ "Starting ${name}."
 	ulimit -n 4096
-	${command} ${mysqld_flags} &
+	cd @PREFIX@
+	${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
+		   --pid-file=${pidfile} ${mysqld_flags} &
 }
 
-load_rc_config $name
-run_rc_command "$1"
+if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
+	load_rc_config $name
+	run_rc_command "$1"
+else
+	if [ -f /etc/rc.conf ]; then
+		. /etc/rc.conf
+	fi
+	case "$1" in
+	initdb)
+		eval ${initdb_cmd}
+		;;
+	stop)
+		if [ -r "${pidfile}" ]; then
+			@ECHO@ "Stopping ${name}."
+			kill `@CAT@ ${pidfile}`
+		fi
+		;;
+	*)
+		eval ${start_precmd}
+		eval ${start_cmd}
+		;;
+	esac
+fi
diff --git a/databases/mysql-server/patches/patch-aa b/databases/mysql-server/patches/patch-aa
index d0a8532681b..c7467841e61 100644
--- a/databases/mysql-server/patches/patch-aa
+++ b/databases/mysql-server/patches/patch-aa
@@ -1,16 +1,19 @@
-$NetBSD: patch-aa,v 1.9 2003/10/05 17:55:34 martti Exp $
+$NetBSD: patch-aa,v 1.10 2004/10/28 01:08:15 xtraeme Exp $
 
---- Makefile.in.orig	Thu Mar 13 20:32:20 2003
-+++ Makefile.in	Fri Apr 11 13:57:27 2003
-@@ -195,10 +195,7 @@
- EXTRA_DIST = INSTALL-SOURCE README \
- 			COPYING COPYING.LIB
+--- Makefile.in.orig	2004-10-22 02:34:04.000000000 +0200
++++ Makefile.in	2004-10-22 02:35:05.000000000 +0200
+@@ -279,12 +279,8 @@
  
+ # These are built from source in the Docs directory
+ EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
 -SUBDIRS = . include @docs_dirs@ @readline_dir@ \
--			@thread_dirs@ @sql_client_dirs@ \
--			@sql_server_dirs@ scripts tests man \
--			@bench_dirs@ support-files os2
-+SUBDIRS = @thread_dirs@ @sql_server_dirs@ tests @bench_dirs@ support-files
- 
+-			@thread_dirs@ pstack @sql_client_dirs@ \
+-			@sql_server_dirs@ scripts man tests \
+-			BUILD netware os2 @libmysqld_dirs@ \
+-			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
+-
++SUBDIRS = . include @thread_dirs@ pstack @sql_server_dirs@ tests \
++	  @bench_dirs@ support-files
  
  # Relink after clean
+ linked_sources = linked_client_sources linked_server_sources \
diff --git a/databases/mysql-server/patches/patch-ae b/databases/mysql-server/patches/patch-ae
index 8b5813a9286..6c73b61a515 100644
--- a/databases/mysql-server/patches/patch-ae
+++ b/databases/mysql-server/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.11 2003/10/05 17:55:34 martti Exp $
+$NetBSD: patch-ae,v 1.12 2004/10/28 01:08:15 xtraeme Exp $
 
---- configure.in.orig	Thu Aug 28 13:20:55 2003
-+++ configure.in	Thu Aug 28 13:23:04 2003
-@@ -1846,7 +1846,6 @@
+--- configure.in.orig	2003-12-14 21:23:49.000000000 +0000
++++ configure.in	2003-12-20 12:08:47.000000000 +0000
+@@ -2159,7 +2159,6 @@
  else
    bench_dirs=""
  fi
diff --git a/databases/mysql-server/patches/patch-af b/databases/mysql-server/patches/patch-af
index 823e2a1122c..dc43b2ca3cb 100644
--- a/databases/mysql-server/patches/patch-af
+++ b/databases/mysql-server/patches/patch-af
@@ -1,8 +1,36 @@
-$NetBSD: patch-af,v 1.12 2003/10/05 17:55:34 martti Exp $
+$NetBSD: patch-af,v 1.13 2004/10/28 01:08:15 xtraeme Exp $
 
---- configure.orig	Thu Aug 28 13:24:42 2003
-+++ configure	Thu Aug 28 13:25:36 2003
-@@ -19952,7 +19952,6 @@
+--- configure.orig	Tue Feb 10 20:16:56 2004
++++ configure	Sun Mar  7 20:20:28 2004
+@@ -32023,27 +32023,11 @@
+ 
+ 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
+ 
+ 
+ 
+@@ -32277,7 +32261,6 @@
  else
    bench_dirs=""
  fi
diff --git a/databases/mysql-server/patches/patch-al b/databases/mysql-server/patches/patch-al
index 2aa6537b71c..ad87d6c8f0c 100644
--- a/databases/mysql-server/patches/patch-al
+++ b/databases/mysql-server/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.5 2004/01/07 08:02:18 cube Exp $
+$NetBSD: patch-al,v 1.6 2004/10/28 01:08:15 xtraeme Exp $
 
---- include/my_pthread.h.orig	Thu Aug 28 13:26:47 2003
-+++ include/my_pthread.h	Thu Aug 28 13:28:45 2003
-@@ -20,7 +20,13 @@
+--- include/my_pthread.h.orig	2003-12-14 21:23:47.000000000 +0000
++++ include/my_pthread.h	2003-12-20 12:09:31.000000000 +0000
+@@ -19,7 +19,13 @@
  #ifndef _my_pthread_h
  #define _my_pthread_h
  
@@ -16,7 +16,7 @@ $NetBSD: patch-al,v 1.5 2004/01/07 08:02:18 cube Exp $
  #ifndef ETIME
  #define ETIME ETIMEDOUT				/* For FreeBSD */
  #endif
-@@ -294,7 +300,11 @@
+@@ -301,7 +307,11 @@
  #endif
  
  #ifndef HAVE_NONPOSIX_SIGWAIT
diff --git a/databases/mysql-server/patches/patch-am b/databases/mysql-server/patches/patch-am
index 5e23752e9e2..cedd02a3f09 100644
--- a/databases/mysql-server/patches/patch-am
+++ b/databases/mysql-server/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.4 2003/10/05 17:55:34 martti Exp $
+$NetBSD: patch-am,v 1.5 2004/10/28 01:08:15 xtraeme Exp $
 
---- scripts/safe_mysqld.sh.orig	Fri Apr 11 13:57:14 2003
-+++ scripts/safe_mysqld.sh	Fri Apr 11 13:58:02 2003
-@@ -195,6 +195,14 @@
+--- scripts/mysqld_safe.sh.orig	2004-10-22 02:35:28.000000000 +0200
++++ scripts/mysqld_safe.sh	2004-10-22 02:38:30.000000000 +0200
+@@ -253,6 +253,14 @@
    fi
  fi
  
@@ -17,13 +17,13 @@ $NetBSD: patch-am,v 1.4 2003/10/05 17:55:34 martti Exp $
  #
  # If there exists an old pid file, check if the daemon is already running
  # Note: The switches to 'ps' may depend on your operating system
-@@ -205,18 +213,16 @@
+@@ -263,18 +271,16 @@
    then
      if @FIND_PROC@
      then    # The pid contains a mysqld process
 -      echo "A mysqld process already exists"
 -      echo "A mysqld process already exists at " `date` >> $err_log
-+      datemsg "A mysqld process already exists"
++	datemsg "A mysqld process already exists"
        exit 1
      fi
    fi
@@ -34,27 +34,27 @@ $NetBSD: patch-am,v 1.4 2003/10/05 17:55:34 martti Exp $
 -    echo "Fatal error: Can't remove the pid file: $pid_file at " `date` >> $err_log
 -    echo "Please remove it manually and start $0 again"
 -    echo "mysqld daemon not started"
-+    datemsg "Fatal error: Can't remove the pid file: $pid_file"
-+    datemsg "Please remove it manually and start $0 again"
-+    datemsg "mysqld daemon not started"
++	datemsg "Fatal error: Can't remove the pid file: $pid_file"
++	datemsg "Please remove it manually and start $0 again"
++	datemsg "mysqld daemon not started"
      exit 1
    fi
  fi
-@@ -225,11 +231,11 @@
- # Uncomment the following lines if you want all tables to be automaticly
- # checked and repaired at start
+@@ -287,11 +293,11 @@
+ # Alternatively, you can start mysqld with the "myisam-recover" option. See
+ # the manual for details.
  #
 -# echo "Checking tables in $DATADIR"
 +# datemsg "Checking tables in $DATADIR"
- # $MY_BASEDIR_VERSION/bin/myisamchk --silent --force --fast --medium-check -O key_buffer=64M -O sort_buffer=64M $DATADIR/*/*.MYI
- # $MY_BASEDIR_VERSION/bin/isamchk --silent --force -O sort_buffer=64M $DATADIR/*/*.ISM
+ # $MY_BASEDIR_VERSION/bin/myisamchk --silent --force --fast --medium-check $DATADIR/*/*.MYI
+ # $MY_BASEDIR_VERSION/bin/isamchk --silent --force $DATADIR/*/*.ISM
  
 -echo "Starting $MYSQLD daemon with databases from $DATADIR"
 +datemsg "Starting $MYSQLD daemon with databases from $DATADIR"
  
  # Does this work on all systems?
  #if type ulimit | grep "shell builtin" > /dev/null
-@@ -237,7 +243,7 @@
+@@ -299,7 +305,7 @@
  #  ulimit -n 256 > /dev/null 2>&1		# Fix for BSD and FreeBSD systems
  #fi
  
@@ -62,22 +62,41 @@ $NetBSD: patch-am,v 1.4 2003/10/05 17:55:34 martti Exp $
 +datemsg "mysqld started"
  while true
  do
-   rm -f $MYSQL_UNIX_PORT $pid_file	# Some extra safety
-@@ -260,7 +266,7 @@
-     # The only thing is ps x => redhat 5 gives warnings when using ps -x.
-     # kill -9 is used or the process won't react on the kill.
-     numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD`
+   rm -f $safe_mysql_unix_port $pid_file	# Some extra safety
+@@ -311,7 +317,7 @@
+   fi
+   if test ! -f $pid_file		# This is removed if normal shutdown
+   then
+-    echo "STOPPING server from pid file $pid_file"
++    datemsg "STOPPING server from pid file $pid_file"
+     break
+   fi
+ 
+@@ -329,7 +335,7 @@
+       numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD`
+     fi
+ 
 -    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
-+    datemsg "Number of processes running now: $numofproces"
++	datemsg -e "\nNumber of processes running now: $numofproces"
      I=1
      while test "$I" -le "$numofproces"
      do 
-@@ -272,7 +278,7 @@
+@@ -347,15 +353,14 @@
  	#    echo "TEST $I - $T **"
  	if kill -9 $T
  	then
 -	  echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log
-+	  datemsg "$MYSQLD process hanging, pid $T - killed"
++		datemsg "$MYSQLD process hanging, pid $T - killed"
  	else 
  	  break
  	fi
+ 	I=`expr $I + 1`
+     done
+   fi
+-  echo "`date +'%y%m%d %H:%M:%S'`  mysqld restarted" | tee -a $err_log
++  datemsg "mysqld restarted"
+ done
+ 
+-echo "`date +'%y%m%d %H:%M:%S'`  mysqld ended" | tee -a $err_log
+-echo "" | tee -a $err_log
++datemsg "mysqld ended"
diff --git a/databases/mysql-server/patches/patch-aq b/databases/mysql-server/patches/patch-aq
new file mode 100644
index 00000000000..6e98da777f0
--- /dev/null
+++ b/databases/mysql-server/patches/patch-aq
@@ -0,0 +1,20 @@
+$NetBSD: patch-aq,v 1.3 2004/10/28 01:08:15 xtraeme Exp $
+
+--- include/Makefile.in.orig	Tue Feb 10 20:16:49 2004
++++ include/Makefile.in	Sun Mar  7 20:21:23 2004
+@@ -272,13 +272,8 @@
+ vio_dir = @vio_dir@
+ vio_libs = @vio_libs@
+ 
+-BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h
+-pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h \
+-			mysql.h mysql_com.h mysqld_error.h mysql_embed.h \
+-		  	my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
+-			errmsg.h my_global.h my_net.h my_alloc.h \
+-			my_getopt.h sslopt-longopts.h my_dir.h \
+-			sslopt-vars.h sslopt-case.h $(BUILT_SOURCES)
++BUILT_SOURCES = 
++pkginclude_HEADERS = $(BUILT_SOURCES)
+ 
+ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
+ 			nisam.h heap.h merge.h my_bitmap.h\
diff --git a/databases/mysql-server/patches/patch-ar b/databases/mysql-server/patches/patch-ar
new file mode 100644
index 00000000000..882db49d69d
--- /dev/null
+++ b/databases/mysql-server/patches/patch-ar
@@ -0,0 +1,23 @@
+$NetBSD: patch-ar,v 1.7 2004/10/28 01:08:15 xtraeme Exp $
+
+--- man/Makefile.in.orig	2004-10-22 02:58:47.000000000 +0200
++++ man/Makefile.in	2004-10-22 02:59:40.000000000 +0200
+@@ -274,16 +274,8 @@
+ vio_dir = @vio_dir@
+ vio_libs = @vio_libs@
+ 
+-man_MANS = mysql.1 isamchk.1 isamlog.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
+-
+-
+-EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
+-		mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
+-		mysqldump.1.in mysqlshow.1.in perror.1.in replace.1.in mysqlman.1.in \
+-		mysqld_safe.1.in mysql_fix_privilege_tables.1.in
+-
++man_MANS = mysqld.1 mysqld_multi.1
++EXTRA_DITS = mysqld.1.in mysqld_multi.1.in
+ 
+ CLEANFILES = $(man_MANS)
+ 
diff --git a/databases/mysql-server/patches/patch-as b/databases/mysql-server/patches/patch-as
new file mode 100644
index 00000000000..01ad570be75
--- /dev/null
+++ b/databases/mysql-server/patches/patch-as
@@ -0,0 +1,22 @@
+$NetBSD: patch-as,v 1.4 2004/10/28 01:08:15 xtraeme Exp $
+
+--- support-files/Makefile.in.orig	2004-10-22 02:39:03.000000000 +0200
++++ support-files/Makefile.in	2004-10-22 02:39:24.000000000 +0200
+@@ -289,16 +289,7 @@
+ 
+ SUBDIRS = MacOSX
+ 
+-pkgdata_DATA = my-small.cnf \
+-			my-medium.cnf \
+-			my-large.cnf \
+-			my-huge.cnf \
+-      my-innodb-heavy-4G.cnf \
+-			mysql-log-rotate \
+-			mysql-@VERSION@.spec \
+-			binary-configure \
+-			MySQL-shared-compat.spec
+-
++pkgdata_DATA =
+ 
+ pkgdata_SCRIPTS = mysql.server
+ 
diff --git a/databases/mysql-server/patches/patch-at b/databases/mysql-server/patches/patch-at
new file mode 100644
index 00000000000..281f60b2305
--- /dev/null
+++ b/databases/mysql-server/patches/patch-at
@@ -0,0 +1,17 @@
+$NetBSD: patch-at,v 1.3 2004/10/28 01:08:15 xtraeme Exp $
+
+--- support-files/MacOSX/Makefile.in.orig	Tue Feb 10 20:16:53 2004
++++ support-files/MacOSX/Makefile.in	Sun Mar  7 20:22:21 2004
+@@ -284,11 +284,7 @@
+ 		StartupItem.postinstall
+ 
+ 
+-pkgdata_DATA = Info.plist \
+-		Description.plist \
+-		StartupParameters.plist \
+-		postinstall \
+-		preinstall
++pkgdata_DATA =
+ 
+ 
+ CLEANFILES = Info.plist \
diff --git a/databases/mysql-server/patches/patch-au b/databases/mysql-server/patches/patch-au
new file mode 100644
index 00000000000..039ac4a2940
--- /dev/null
+++ b/databases/mysql-server/patches/patch-au
@@ -0,0 +1,13 @@
+$NetBSD: patch-au,v 1.4 2004/10/28 01:08:15 xtraeme Exp $
+
+--- include/my_global.h.orig	2003-10-17 07:29:15.000000000 +0200
++++ include/my_global.h	2003-12-11 15:13:14.000000000 +0100
+@@ -250,7 +250,7 @@
+ # endif
+ #endif /* TIME_WITH_SYS_TIME */
+ #ifdef HAVE_UNISTD_H
+-#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)
++#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #define crypt unistd_crypt
+ #endif
+ #include <unistd.h>
diff --git a/databases/mysql-server/patches/patch-av b/databases/mysql-server/patches/patch-av
new file mode 100644
index 00000000000..b7741117e42
--- /dev/null
+++ b/databases/mysql-server/patches/patch-av
@@ -0,0 +1,24 @@
+$NetBSD: patch-av,v 1.4 2004/10/28 01:08:15 xtraeme Exp $
+
+--- sql/mysqld.cc.orig	2003-12-15 08:23:47.000000000 +1100
++++ sql/mysqld.cc
+@@ -106,7 +106,18 @@ extern "C" {					// Because of SCO 3.2V4
+ int allow_severity = LOG_INFO;
+ int deny_severity = LOG_WARNING;
+ 
+-#ifdef __STDC__
++#ifdef __FreeBSD__
++#  include <osreldate.h>
++#  if defined(__STDC__) && __FreeBSD_version < 500000
++#    define my_fromhost(A)	   fromhost(A)
++#    define my_hosts_access(A) hosts_access(A)
++#    define my_eval_client(A)  eval_client(A)
++#  else
++#    define my_fromhost(A)	   fromhost()
++#    define my_hosts_access(A) hosts_access()
++#    define my_eval_client(A)  eval_client()
++#  endif
++#elif defined(__STDC__)
+ #define my_fromhost(A)	   fromhost(A)
+ #define my_hosts_access(A) hosts_access(A)
+ #define my_eval_client(A)  eval_client(A)
diff --git a/databases/mysql-server/patches/patch-aw b/databases/mysql-server/patches/patch-aw
new file mode 100644
index 00000000000..8ccdb79eaae
--- /dev/null
+++ b/databases/mysql-server/patches/patch-aw
@@ -0,0 +1,13 @@
+$NetBSD: patch-aw,v 1.3 2004/10/28 01:08:15 xtraeme Exp $
+
+--- isam/Makefile.in.orig	2004-02-10 19:16:49.000000000 +0100
++++ isam/Makefile.in	2004-03-13 12:26:18.000000000 +0100
+@@ -370,7 +370,7 @@
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
++CCLD = $(CXX)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES = $(libnisam_a_SOURCES) $(isamchk_SOURCES) isamlog.c \
diff --git a/databases/mysql-server/patches/patch-ax b/databases/mysql-server/patches/patch-ax
new file mode 100644
index 00000000000..246b9bd99cc
--- /dev/null
+++ b/databases/mysql-server/patches/patch-ax
@@ -0,0 +1,13 @@
+$NetBSD: patch-ax,v 1.3 2004/10/28 01:08:15 xtraeme Exp $
+
+--- myisam/Makefile.in.orig	2004-03-13 12:38:20.000000000 +0100
++++ myisam/Makefile.in	2004-03-13 12:38:46.000000000 +0100
+@@ -407,7 +407,7 @@
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
++CCLD = $(CXX)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES = $(libmyisam_a_SOURCES) mi_test1.c mi_test2.c mi_test3.c \