diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql-client/Makefile | 13 | ||||
| -rw-r--r-- | databases/mysql-client/files/md5 | 4 | ||||
| -rw-r--r-- | databases/mysql-client/files/patch-sum | 8 | ||||
| -rw-r--r-- | databases/mysql-client/patches/patch-aa | 12 | ||||
| -rw-r--r-- | databases/mysql-client/patches/patch-ab | 20 | ||||
| -rw-r--r-- | databases/mysql-client/patches/patch-ad | 8 | ||||
| -rw-r--r-- | databases/mysql-client/pkg/PLIST | 35 |
7 files changed, 59 insertions, 41 deletions
diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile index 0671fe99ebc..c71bdc942a9 100644 --- a/databases/mysql-client/Makefile +++ b/databases/mysql-client/Makefile @@ -1,20 +1,16 @@ -# $NetBSD: Makefile,v 1.12 2001/02/16 14:17:28 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/03/26 13:26:42 bad Exp $ # -DISTNAME= mysql-3.22.32 +DISTNAME= mysql-3.23.35 PKGNAME= ${DISTNAME:S/-/-client-/} CATEGORIES= databases -MASTER_SITES= ftp://ftp.mysql.com/MySQL-3.22/ \ - ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.22/ +MASTER_SITES= ftp://ftp.mysql.com/MySQL-3.23/ \ + ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.mysql.com/ COMMENT= MySQL, a free SQL database (client) -RESTRICTED= "Restrictive license." -NO_SRC_ON_CDROM= ${RESTRICTED} -NO_BIN_ON_CDROM= ${RESTRICTED} - GNU_CONFIGURE= yes CONFIGURE_ARGS+=--without-perl --without-debug --without-bench \ --without-server --with-named-curses-libs="-lcurses -ltermcap" @@ -27,6 +23,7 @@ CFLAGS+= -Dunix USE_PERL5= yes USE_LIBTOOL= yes +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig INFO_FILES= mysql.info diff --git a/databases/mysql-client/files/md5 b/databases/mysql-client/files/md5 index 9e75fa7befc..8e736b594f1 100644 --- a/databases/mysql-client/files/md5 +++ b/databases/mysql-client/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.3 2000/02/15 04:46:32 bad Exp $ +$NetBSD: md5,v 1.4 2001/03/26 13:26:43 bad Exp $ -MD5 (mysql-3.22.32.tar.gz) = 244e08d9a1f4b2ad799aa40ad3cc897a +SHA1 (mysql-3.23.35.tar.gz) = c1532aa954d613d0a4ebdae046ae23427e4ee327 diff --git a/databases/mysql-client/files/patch-sum b/databases/mysql-client/files/patch-sum index edb2ebca9dc..7731422eb3d 100644 --- a/databases/mysql-client/files/patch-sum +++ b/databases/mysql-client/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.4 1999/12/22 14:59:43 bad Exp $ +$NetBSD: patch-sum,v 1.5 2001/03/26 13:26:43 bad Exp $ -MD5 (patch-aa) = 9c60a2b8c672ac49a009def9ceadaf6a -MD5 (patch-ab) = de2ca559bf97dcd386e31bdf5e8ecd31 -MD5 (patch-ad) = 1a91e8b2a16c7100e41213ae560df4c3 +MD5 (patch-aa) = 1bb3d0e7c2566f3987b01184fd39323e +MD5 (patch-ab) = 7d489d03f163fba2607552466f7d0fb6 +MD5 (patch-ad) = e4742864b59f217846afe54c28a57c53 diff --git a/databases/mysql-client/patches/patch-aa b/databases/mysql-client/patches/patch-aa index 8441b444cf9..ffa6decec89 100644 --- a/databases/mysql-client/patches/patch-aa +++ b/databases/mysql-client/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.2 1999/12/13 20:31:52 bad Exp $ +$NetBSD: patch-aa,v 1.3 2001/03/26 13:26:44 bad Exp $ ---- client/Makefile.in.orig Thu Jul 8 06:33:30 1999 -+++ client/Makefile.in Mon Aug 16 23:15:23 1999 -@@ -174,7 +174,7 @@ - libmysqlclient_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@ - CLEANFILES = $(libmysqlclient_la_LIBADD) $(SHLIBOBJS) libmysqclient.la +--- client/Makefile.in.orig Mon Jan 22 14:44:00 2001 ++++ client/Makefile.in Thu Feb 1 22:50:13 2001 +@@ -190,7 +190,7 @@ + mysqltest_DEPENDENCIES = $(LIBRARIES) $(pkglib_LTLIBRARIES) + # Fix for mit-threads -DEFS = -DUNDEF_THREADS_HACK +DEFS = -DUNDEF_THREADS_HACK -Dunix mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/databases/mysql-client/patches/patch-ab b/databases/mysql-client/patches/patch-ab index 093bdc5027e..d890cd520f0 100644 --- a/databases/mysql-client/patches/patch-ab +++ b/databases/mysql-client/patches/patch-ab @@ -1,16 +1,16 @@ -$NetBSD: patch-ab,v 1.2 1999/12/13 20:31:52 bad Exp $ +$NetBSD: patch-ab,v 1.3 2001/03/26 13:26:44 bad Exp $ ---- configure.orig Thu Jul 8 06:13:39 1999 -+++ configure Mon Aug 16 23:35:52 1999 -@@ -1920,6 +1920,7 @@ - fi - +--- configure.orig Mon Jan 22 14:37:14 2001 ++++ configure Thu Feb 1 22:48:00 2001 +@@ -2050,6 +2050,7 @@ + *) lt_target="$target" ;; + esac +if false; then # Check for any special flags to pass to ltconfig. - libtool_flags="--cache-file=$cache_file" - test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" -@@ -2073,6 +2074,7 @@ + # + # the following will cause an existing older ltconfig to fail, so +@@ -2208,6 +2209,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.2 1999/12/13 20:31:52 bad Exp $ # Redirect the config.log output again, so that the ltconfig log is not # clobbered by the next message. -@@ -7697,7 +7699,7 @@ +@@ -9328,7 +9330,7 @@ # This requires readline to be in a standard place. Mosty for linux # there readline may be a shared library. readline_dir="" diff --git a/databases/mysql-client/patches/patch-ad b/databases/mysql-client/patches/patch-ad index 52683d7a2e0..2bc6dc97476 100644 --- a/databases/mysql-client/patches/patch-ad +++ b/databases/mysql-client/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.2 1999/12/13 20:31:53 bad Exp $ +$NetBSD: patch-ad,v 1.3 2001/03/26 13:26:44 bad Exp $ ---- readline/Makefile.in.orig Sun Dec 5 21:35:26 1999 -+++ readline/Makefile.in Sun Dec 5 21:38:20 1999 -@@ -388,7 +388,8 @@ +--- readline/Makefile.in.orig Mon Jan 22 14:43:57 2001 ++++ readline/Makefile.in Thu Feb 1 22:48:01 2001 +@@ -395,7 +395,8 @@ install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am diff --git a/databases/mysql-client/pkg/PLIST b/databases/mysql-client/pkg/PLIST index 6f6feca6b3c..91f1fbd6951 100644 --- a/databases/mysql-client/pkg/PLIST +++ b/databases/mysql-client/pkg/PLIST @@ -1,17 +1,22 @@ -@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:24 agc Exp $ +@comment $NetBSD: PLIST,v 1.6 2001/03/26 13:26:44 bad Exp $ bin/msql2mysql bin/mysql -bin/mysql_zap +bin/mysql_config +bin/mysql_convert_table_format bin/mysql_find_rows bin/mysql_fix_privilege_tables +bin/mysql_setpermission +bin/mysql_zap bin/mysqlaccess bin/mysqladmin bin/mysqlbug +bin/mysqld_multi bin/mysqldump +bin/mysqldumpslow bin/mysqlhotcopy bin/mysqlimport bin/mysqlshow -bin/mysql_setpermission +bin/mysqltest include/mysql/dbug.h include/mysql/errmsg.h include/mysql/m_ctype.h @@ -26,6 +31,7 @@ include/mysql/mysql.h include/mysql/mysql_com.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 @@ -37,15 +43,30 @@ info/mysql.info lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.6 -lib/mysql/libmysqlclient.so.6.0 +lib/mysql/libmysqlclient.so.10 +lib/mysql/libmysqlclient.so.10.0 share/mysql/binary-configure share/mysql/make_binary_distribution -share/mysql/my-example.cnf -share/mysql/mysql-3.22.32.spec +share/mysql/my-huge.cnf +share/mysql/my-large.cnf +share/mysql/my-medium.cnf +share/mysql/my-small.cnf +share/mysql/mysql-3.23.35.spec share/mysql/mysql-log-rotate share/mysql/mysql.server +man/man1/isamchk.1 +man/man1/isamlog.1 man/man1/mysql.1 +man/man1/mysql_zap.1 +man/man1/mysqlaccess.1 +man/man1/mysqladmin.1 +man/man1/mysqld.1 +man/man1/mysqld_multi.1 +man/man1/mysqldump.1 +man/man1/mysqlshow.1 +man/man1/perror.1 +man/man1/replace.1 +man/man1/safe_mysqld.1 @dirrm include/mysql @dirrm lib/mysql @dirrm share/mysql |