5 files changed, 49 insertions, 19 deletions
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index 37bea7909ef..424d238ee03 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2001/05/02 08:22:30 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/07/08 13:59:16 bad Exp $
 #
 
 .include "../../databases/mysql-client/Makefile.common"
 
-PKGNAME=		${DISTNAME:S/-/-server-/}nb1
+PKGNAME=		${DISTNAME:S/-/-server-/}
 COMMENT=		MySQL, a free SQL database (server)
 
 DEPENDS+=		${DISTNAME:S/-/-client-/}:../../databases/mysql-client
diff --git a/databases/mysql-server/distinfo b/databases/mysql-server/distinfo
index 92303a955a4..57fd789c5f6 100644
--- a/databases/mysql-server/distinfo
+++ b/databases/mysql-server/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.4 2001/07/06 15:27:17 bad Exp $
+$NetBSD: distinfo,v 1.5 2001/07/08 13:59:16 bad Exp $
 
-SHA1 (mysql-3.23.35.tar.gz) = c1532aa954d613d0a4ebdae046ae23427e4ee327
-Size (mysql-3.23.35.tar.gz) = 10929885 bytes
+SHA1 (mysql-3.23.39.tar.gz) = bca088128d17f2274cff16bc0c4aaf383d5c27f1
+Size (mysql-3.23.39.tar.gz) = 11211077 bytes
 SHA1 (patch-aa) = 05c56d81e17893dd267fcd5f68d8c378f024a06f
 SHA1 (patch-ab) = 4f10917780d73cb4a58127b27a5d8c1c9f63e0d3
 SHA1 (patch-ac) = 9ac4beb4f53cc4d4fc4ec52cf30716c8269face8
 SHA1 (patch-ad) = 1aecfee152d303b3d65f3866032d2a6d49538f46
-SHA1 (patch-ae) = ae05bb8c369b57b110e2be9c9d85feb23cb0b918
-SHA1 (patch-af) = dd4b7694d0d282acbefb5a0039cf66e4dc40d3a6
+SHA1 (patch-ae) = 91e0c47e1e722cf84463af2c298a17beac56e2e9
+SHA1 (patch-af) = e21b8898e24a1d576f8301b0bf9363f648d81b61
+SHA1 (patch-ag) = 6d908d292cb71459820817153dde87de7242a7f7
diff --git a/databases/mysql-server/patches/patch-ae b/databases/mysql-server/patches/patch-ae
index a1a778f976c..5c2797838cc 100644
--- a/databases/mysql-server/patches/patch-ae
+++ b/databases/mysql-server/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2001/07/06 15:27:18 bad Exp $
+$NetBSD: patch-ae,v 1.6 2001/07/08 13:59:16 bad Exp $
 
---- configure.in.orig	Fri Mar 16 01:51:51 2001
-+++ configure.in	Fri Jul  6 16:37:36 2001
-@@ -581,7 +581,10 @@
+--- configure.in.orig	Tue Jun 12 21:07:23 2001
++++ configure.in	Sat Jul  7 23:37:11 2001
+@@ -629,7 +629,10 @@
          AC_MSG_RESULT(yes)
          AC_DEFINE(LIBWRAP)
          AC_DEFINE(HAVE_LIBWRAP)
@@ -14,7 +14,15 @@ $NetBSD: patch-ae,v 1.5 2001/07/06 15:27:18 bad Exp $
          AC_MSG_RESULT(no)
          CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
        CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
-@@ -1589,7 +1592,11 @@
+@@ -1653,7 +1656,6 @@
+ else
+   bench_dirs=""
+ fi
+-bench_dirs="$bench_dirs mysql-test"
+ AC_SUBST(bench_dirs)
+ 
+ # Don't build readline, i have it already
+@@ -1670,7 +1672,11 @@
    # This requires readline to be in a standard place. Mosty for linux
    # there readline may be a shared library.
    readline_dir=""
@@ -27,7 +35,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/06 15:27:18 bad Exp $
  fi
  AC_SUBST(readline_dir)
  AC_SUBST(readline_link)
-@@ -1951,15 +1958,15 @@
+@@ -2043,15 +2049,15 @@
      AC_DEFINE(HAVE_mit_thread)
      MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
      AC_SUBST(MT_INCLUDES)
diff --git a/databases/mysql-server/patches/patch-af b/databases/mysql-server/patches/patch-af
index fa146ba6af8..b67a808ee4e 100644
--- a/databases/mysql-server/patches/patch-af
+++ b/databases/mysql-server/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2001/07/06 15:27:18 bad Exp $
+$NetBSD: patch-af,v 1.6 2001/07/08 13:59:16 bad Exp $
 
---- configure.orig	Fri Mar 16 01:52:05 2001
-+++ configure	Fri Jul  6 16:37:36 2001
-@@ -5004,7 +5004,10 @@
+--- configure.orig	Tue Jun 12 21:07:37 2001
++++ configure	Sat Jul  7 23:37:20 2001
+@@ -5065,7 +5065,10 @@
  #define HAVE_LIBWRAP 1
  EOF
  
@@ -14,7 +14,15 @@ $NetBSD: patch-af,v 1.5 2001/07/06 15:27:18 bad Exp $
  else
    echo "configure: failed program was:" >&5
    cat conftest.$ac_ext >&5
-@@ -9345,7 +9348,11 @@
+@@ -9554,7 +9557,6 @@
+ else
+   bench_dirs=""
+ fi
+-bench_dirs="$bench_dirs mysql-test"
+ 
+ 
+ # Don't build readline, i have it already
+@@ -9575,7 +9577,11 @@
    # This requires readline to be in a standard place. Mosty for linux
    # there readline may be a shared library.
    readline_dir=""
@@ -27,7 +35,7 @@ $NetBSD: patch-af,v 1.5 2001/07/06 15:27:18 bad Exp $
  fi
  
  
-@@ -10466,15 +10473,15 @@
+@@ -10745,15 +10751,15 @@
  
      MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
      
diff --git a/databases/mysql-server/patches/patch-ag b/databases/mysql-server/patches/patch-ag
new file mode 100644
index 00000000000..2461f6c65f7
--- /dev/null
+++ b/databases/mysql-server/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3 2001/07/08 13:59:16 bad Exp $
+
+--- sql/Makefile.in.orig	Tue Jun 12 21:16:58 2001
++++ sql/Makefile.in	Sat Jul  7 23:59:32 2001
+@@ -198,7 +198,7 @@
+ gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
+ mysqlbinlog_SOURCES = mysqlbinlog.cc mini_client.cc net_serv.cc 			mini_client_errors.c violite.c password.c
+ 
+-mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS) $(mysqld_LDADD)
++mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS 
+ 
+ DEFS = -DMYSQL_SERVER 			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" 			-DDATADIR="\"$(MYSQLDATAdir)\"" 			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" 			@DEFS@
+