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

6 files changed, 69 insertions, 36 deletions

diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile
index 0ddf4199332..c7cd9bebeb2 100644
--- a/databases/mysql-client/Makefile
+++ b/databases/mysql-client/Makefile
@@ -1,21 +1,23 @@
-# $NetBSD: Makefile,v 1.32 2004/10/03 00:13:21 tv Exp $
+# $NetBSD: Makefile,v 1.33 2004/10/28 01:08:15 xtraeme Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
-PKGREVISION=		1
 SVR4_PKGNAME=		mysqc
-COMMENT=		MySQL 3, a free SQL database (client)
+COMMENT=		MySQL 4, a free SQL database (client)
+
+CONFLICTS=		{mysql-client-[0-9]*,mysql3-client-[0-9]*}
 
 .include "Makefile.common"
 
 CONFIGURE_ARGS+=	--without-server
-USE_BUILDLINK3=		YES
+USE_BUILDLINK3=		yes
+UNWRAP_FILES=		scripts/mysql_config
 
-USE_NEW_TEXINFO=	YES
 INFO_FILES=		mysql.info
 
 post-install:
-	cd ${PREFIX}/man/man1; ${RM} -f mysqld.1 safe_mysqld.1
-	cd ${PREFIX}/share/mysql; ${RM} -f mysql.server
+	cd ${PREFIX}/man/man1 && \
+		 ${RM} -f mysqld.1 mysqld_multi.1 mysqld_safe.1 safe_mysqld.1
+	cd ${PREFIX}/share/mysql && ${RM} -f mysql.server
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 
 .include "../../devel/readline/buildlink3.mk"
diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common
index e5bb0fa931c..88241a763ff 100644
--- a/databases/mysql-client/Makefile.common
+++ b/databases/mysql-client/Makefile.common
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile.common,v 1.25 2004/08/27 06:29:07 jlam Exp $
+# $NetBSD: Makefile.common,v 1.26 2004/10/28 01:08:15 xtraeme Exp $
 
-DISTNAME=		mysql-3.23.58
+DISTNAME=		mysql-4.0.21
 CATEGORIES=		databases
-MASTER_SITES=		http://mirrors.sunsite.dk/mysql/Downloads/MySQL-3.23/ \
-			ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-3.23/ \
-			ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/
+MASTER_SITES=		http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.0/ \
+			ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \
+			ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-4.0/
 
-MAINTAINER=		tech-pkg@NetBSD.org
+MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://www.mysql.com/
 
 EXTRACT_USING_PAX=	# defined
-USE_GCC_SHLIB=		# defined
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -28,9 +27,8 @@ MYSQL_DATADIR?=		${VARBASE}/mysql
 MYSQL_CHARSET?=		latin1
 MYSQL_EXTRA_CHARSET?=	all
 
-USE_BUILDLINK3=		# defined
-GNU_CONFIGURE=		# defined
-USE_GNU_TOOLS+=		make
+USE_BUILDLINK3=		yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--localstatedir=${MYSQL_DATADIR}
 CONFIGURE_ARGS+=	--with-named-z-libs=z
 CONFIGURE_ARGS+=	--without-libwrap
@@ -42,13 +40,22 @@ CONFIGURE_ARGS+=	--without-readline
 # 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
+CONFIGURE_ARGS+=	--with-vio
 
 CONFIGURE_ARGS+=	--with-charset=${MYSQL_CHARSET}
 CONFIGURE_ARGS+=	--with-extra-charsets=${MYSQL_EXTRA_CHARSET}
 
+# Avoid an ICE in gcc2 on sparc64
+CONFIGURE_ENV+=		F77=${FALSE}
+
 CPPFLAGS+=		-Dunix
 
 # force HAVE_CURSES_H on Solaris since the configure script is broken
@@ -58,6 +65,8 @@ CFLAGS+=		-DHAVE_CURSES_H
 CXXFLAGS+=		-DHAVE_CURSES_H
 .endif
 
+USE_LANGUAGES=		c c++
+USE_GNU_TOOLS+=		make
 USE_PERL5=		# defined
 USE_LIBTOOL=		# defined
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
@@ -70,11 +79,12 @@ post-extract:
 			$${dir}/Makefile.in.orig > $${dir}/Makefile.in;	\
 	done
 	cd ${WRKSRC}/scripts;						\
-	for file in mysql_install_db.sh safe_mysqld.sh; do		\
+	for file in mysql_install_db.sh mysqld_safe.sh; do		\
 		${MV} $${file} $${file}.orig;				\
 		${SED} -e "s,chown,${CHOWN},g"				\
 			$${file}.orig > $${file};			\
 		${RM} $${file}.orig;					\
 	done
 
+.include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/databases/mysql-client/PLIST b/databases/mysql-client/PLIST
index 08b0bc71e44..b541ad7ae3f 100644
--- a/databases/mysql-client/PLIST
+++ b/databases/mysql-client/PLIST
@@ -1,64 +1,84 @@
-@comment $NetBSD: PLIST,v 1.11 2004/09/22 08:09:22 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/10/28 01:08:15 xtraeme Exp $
+bin/make_win_binary_distribution
+bin/make_win_src_distribution
 bin/msql2mysql
 bin/mysql
-bin/mysqlcheck
 bin/mysql_config
 bin/mysql_convert_table_format
+bin/mysql_explain_log
 bin/mysql_find_rows
+bin/mysql_fix_extensions
 bin/mysql_fix_privilege_tables
+bin/mysql_secure_installation
 bin/mysql_setpermission
+bin/mysql_tableinfo
 bin/mysql_zap
 bin/mysqlaccess
 bin/mysqladmin
 bin/mysqlbinlog
 bin/mysqlbug
+bin/mysqlcheck
 bin/mysqld_multi
 bin/mysqldump
 bin/mysqldumpslow
 bin/mysqlhotcopy
 bin/mysqlimport
+bin/mysqlmanager-pwgen
+bin/mysqlmanagerc
 bin/mysqlshow
 bin/mysqltest
-include/mysql/dbug.h
 include/mysql/errmsg.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/mysql.h
 include/mysql/mysql_com.h
+include/mysql/mysql_embed.h
 include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
-include/mysql/my_no_pthread.h
 include/mysql/raid.h
 include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
-include/mysql/sslopt-usage.h
 include/mysql/sslopt-vars.h
 lib/mysql/libmysqlclient.la
 man/man1/isamchk.1
 man/man1/isamlog.1
 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/mysqld_multi.1
 man/man1/mysqldump.1
 man/man1/mysqlshow.1
 man/man1/perror.1
 man/man1/replace.1
+share/mysql/Description.plist
+share/mysql/Info.plist
+share/mysql/MySQL-shared-compat.spec
+share/mysql/StartupParameters.plist
 share/mysql/binary-configure
 share/mysql/make_binary_distribution
+share/mysql/make_sharedlib_distribution
 share/mysql/my-huge.cnf
+share/mysql/my-innodb-heavy-4G.cnf
 share/mysql/my-large.cnf
 share/mysql/my-medium.cnf
 share/mysql/my-small.cnf
 share/mysql/mysql-${PKGVERSION}.spec
 share/mysql/mysql-log-rotate
+share/mysql/postinstall
+share/mysql/preinstall
 @dirrm share/mysql
 @dirrm lib/mysql
 @dirrm include/mysql
diff --git a/databases/mysql-client/buildlink3.mk b/databases/mysql-client/buildlink3.mk
index dfe181960a0..03d8b455c6a 100644
--- a/databases/mysql-client/buildlink3.mk
+++ b/databases/mysql-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/10/03 00:13:21 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/10/28 01:08:15 xtraeme Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -11,12 +11,13 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmysql-client}
 BUILDLINK_PACKAGES+=	mysql-client
 
 .if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mysql-client+=	mysql-client>=3.23.58
-BUILDLINK_RECOMMENDED.mysql-client+=	mysql-client>=3.23.58nb1
-BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql-client
+BUILDLINK_DEPENDS.mysql-client+=	mysql-client>=4.0.18nb1
+BUILDLINK_RECOMMENDED.mysql-client?=	mysql-client>=4.0.20nb1
+BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql4-client
 BUILDLINK_LIBDIRS.mysql-client?=	lib/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/mysql-client/distinfo b/databases/mysql-client/distinfo
index 6f4aa077d81..916aedb69c8 100644
--- a/databases/mysql-client/distinfo
+++ b/databases/mysql-client/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2003/10/05 17:55:13 martti Exp $
+$NetBSD: distinfo,v 1.14 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-af) = 0ac0172c264b9c9e8f173d29085096bc1c611132
+SHA1 (mysql-4.0.21.tar.gz) = 1f5059c79e0c3718e005d41c428b83f2755fc7aa
+Size (mysql-4.0.21.tar.gz) = 14107388 bytes
+SHA1 (patch-af) = 258c09335a9d675cf2367afc33f5ea0713a0b3fd
diff --git a/databases/mysql-client/patches/patch-af b/databases/mysql-client/patches/patch-af
index f0c5a86ff76..4c8007941c9 100644
--- a/databases/mysql-client/patches/patch-af
+++ b/databases/mysql-client/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.8 2003/10/05 17:55:13 martti Exp $
+$NetBSD: patch-af,v 1.9 2004/10/28 01:08:15 xtraeme Exp $
 
---- configure.orig	Fri Jun  6 14:39:41 2003
-+++ configure	Wed Jul  9 17:15:10 2003
-@@ -19952,7 +19952,6 @@
+--- configure.orig	Tue Feb 10 20:16:56 2004
++++ configure	Sun Mar  7 19:58:04 2004
+@@ -32277,7 +32277,6 @@
  else
    bench_dirs=""
  fi