One half of a client/server-split version of the mysql pkg. This part

(client) works on all architectures.  Updated to 3.22.22 and adapted to use
libedit on 1.4 systems.

9 files changed, 182 insertions, 0 deletions

diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile
new file mode 100644
index 00000000000..e6b98a58b00
--- /dev/null
+++ b/databases/mysql-client/Makefile
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.1.1.1 1999/05/06 23:22:27 tv Exp $
+#
+
+DISTNAME=	mysql-3.22.22
+PKGNAME=	${DISTNAME:S/-/-client-/}
+CATEGORIES=	databases
+MASTER_SITES=	ftp://ftp.mysql.com/pub/mysql/Downloads/MySQL-3.22/ \
+		ftp://ftp.netcasting.net/pub/mysql/Downloads/MySQL-3.22/
+
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.mysql.com/
+
+NO_CDROM=	"Restrictive license."
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--without-perl --without-debug --without-bench \
+		--without-server
+
+.if exists(/usr/include/readline.h)
+CONFIGURE_ARGS+=--without-readline
+.endif
+
+CONFIGURE_ENV=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+		INSTALL_DATA="${INSTALL_DATA}" \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CFLAGS+=	-Dunix
+
+USE_GMAKE=	yes
+USE_PERL5=	yes
+USE_LIBTOOL=	yes
+
+INFO_FILES=	mysql.info
+
+pre-install:
+	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql-client/files/md5 b/databases/mysql-client/files/md5
new file mode 100644
index 00000000000..8d9a4b3d98e
--- /dev/null
+++ b/databases/mysql-client/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 1999/05/06 23:22:27 tv Exp $
+
+MD5 (mysql-3.22.22.tar.gz) = 1a0eedbe7cda20845ec2e767b96ade5c
diff --git a/databases/mysql-client/patches/patch-aa b/databases/mysql-client/patches/patch-aa
new file mode 100644
index 00000000000..b625a3a97ed
--- /dev/null
+++ b/databases/mysql-client/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 1999/05/06 23:22:27 tv Exp $
+
+--- client/Makefile.in.orig	Mon Mar 15 15:49:57 1999
++++ client/Makefile.in	Sun Mar 21 23:11:42 1999
+@@ -181,7 +181,7 @@
+ libmysqlclient_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@
+ CLEANFILES =		$(libmysqlclient_la_LIBADD) $(SHLIBOBJS) \
+ 			libmysqclient.la
+-DEFS =			-DUNDEF_THREADS_HACK
++DEFS =			-DUNDEF_THREADS_HACK -Dunix
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/databases/mysql-client/patches/patch-ab b/databases/mysql-client/patches/patch-ab
new file mode 100644
index 00000000000..7c219573214
--- /dev/null
+++ b/databases/mysql-client/patches/patch-ab
@@ -0,0 +1,29 @@
+$NetBSD: patch-ab,v 1.1.1.1 1999/05/06 23:22:27 tv Exp $
+
+--- configure.orig	Wed Apr 28 21:03:38 1999
++++ configure	Mon May  3 18:27:59 1999
+@@ -1691,6 +1691,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++if false; then
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+@@ -1736,6 +1737,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++fi
+ 
+ # AC_PROG_INSTALL We should only need a AM_PROG_INSTALL
+ 
+@@ -6950,7 +6952,7 @@
+   # This requires readline to be in a standard place. Mosty for linux
+   # there readline may be a shared library.
+   readline_dir=""
+-  readline_link="-lreadline"
++  readline_link="-ledit"
+ fi
+ 
+ 
diff --git a/databases/mysql-client/patches/patch-ac b/databases/mysql-client/patches/patch-ac
new file mode 100644
index 00000000000..1e6f0d687f1
--- /dev/null
+++ b/databases/mysql-client/patches/patch-ac
@@ -0,0 +1,35 @@
+$NetBSD: patch-ac,v 1.1.1.1 1999/05/06 23:22:27 tv Exp $
+
+--- client/get_password.c.orig	Sun Jun 14 16:26:27 1998
++++ client/get_password.c	Sun Jun 14 19:25:24 1998
+@@ -18,8 +18,8 @@
+ #include	<termio.h>
+ #define TERMIO	struct termio
+ #else
+-#include	<sgtty.h>
+-#define TERMIO	struct sgttyb
++#include	<termios.h>
++#define TERMIO	struct termios
+ #endif
+ #ifdef alpha_linux_port
+ #include <asm/ioctls.h>				/* QQ; Fix this in configure */
+@@ -92,13 +92,14 @@
+   get_password(buff,sizeof(buff)-1,fileno(stdin),isatty(fileno(stdout)));
+   ioctl(fileno(stdin),(int) TCSETA, &org);
+ #else
+-  gtty(fileno(stdin), &org);
++  tcgetattr(fileno(stdin), &org);
+   tmp=org;
+-  tmp.sg_flags &= ~ECHO;
+-  tmp.sg_flags |= RAW;
+-  stty(fileno(stdin), &tmp);
++  tmp.c_lflag &= ~(ECHO | ISIG | ICANON);
++  tmp.c_cc[VMIN] = 1;
++  tmp.c_cc[VTIME]= 0;
++  tcsetattr(fileno(stdin), TCSAFLUSH, &tmp);
+   get_password(buff,sizeof(buff)-1,fileno(stdin),isatty(fileno(stdout)));
+-  stty(fileno(stdin), &org);
++  tcsetattr(fileno(stdin), TCSAFLUSH, &org);
+ #endif
+   if (isatty(fileno(stdout)))
+     fputc('\n',stdout);
diff --git a/databases/mysql-client/patches/patch-ad b/databases/mysql-client/patches/patch-ad
new file mode 100644
index 00000000000..f9235ccfee5
--- /dev/null
+++ b/databases/mysql-client/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.1.1 1999/05/06 23:22:28 tv Exp $
+
+--- readline/Makefile.in.orig	Mon May  3 18:47:25 1999
++++ readline/Makefile.in	Mon May  3 18:47:36 1999
+@@ -377,7 +377,7 @@
+ install-data: install-pkgincludeHEADERS
+ 	@$(NORMAL_INSTALL)
+ 
+-install: install-exec install-data all
++install: all
+ 	@:
+ 
+ uninstall: uninstall-pkgincludeHEADERS
diff --git a/databases/mysql-client/pkg/COMMENT b/databases/mysql-client/pkg/COMMENT
new file mode 100644
index 00000000000..dd1538327d7
--- /dev/null
+++ b/databases/mysql-client/pkg/COMMENT
@@ -0,0 +1 @@
+MySQL, a free SQL database (client)
diff --git a/databases/mysql-client/pkg/DESCR b/databases/mysql-client/pkg/DESCR
new file mode 100644
index 00000000000..4693dde9acf
--- /dev/null
+++ b/databases/mysql-client/pkg/DESCR
@@ -0,0 +1,14 @@
+*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).
diff --git a/databases/mysql-client/pkg/PLIST b/databases/mysql-client/pkg/PLIST
new file mode 100644
index 00000000000..fc34ca5469b
--- /dev/null
+++ b/databases/mysql-client/pkg/PLIST
@@ -0,0 +1,37 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 1999/05/06 23:22:28 tv Exp $
+bin/msql2mysql
+bin/mysql
+bin/mysql_zap
+bin/mysql_fix_privilege_tables
+bin/mysqlaccess
+bin/mysqladmin
+bin/mysqlbug
+bin/mysqldump
+bin/mysqlimport
+bin/mysqlshow
+bin/mysql_setpermission
+include/mysql/dbug.h
+include/mysql/errmsg.h
+include/mysql/m_ctype.h.in
+include/mysql/m_string.h
+include/mysql/my_list.h
+include/mysql/my_sys.h
+include/mysql/mysql.h
+include/mysql/mysql_com.h
+include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
+@unexec install-info --delete %D/info/mysql.info %D/info/dir
+info/mysql.info
+@exec install-info %D/info/mysql.info %D/info/dir
+lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.so.6.0
+share/mysql/binary-configure
+share/mysql/make_binary_distribution
+share/mysql/my-example.cnf
+share/mysql/mysql-3.22.22.spec
+share/mysql/mysql-log-rotate
+share/mysql/mysql.server
+man/man1/mysql.1
+@dirrm include/mysql
+@dirrm lib/mysql
+@dirrm share/mysql