summaryrefslogtreecommitdiff
path: root/databases/mysql4-client
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mysql4-client')
-rw-r--r--databases/mysql4-client/Makefile.common4
-rw-r--r--databases/mysql4-client/distinfo10
-rw-r--r--databases/mysql4-client/patches/patch-af39
-rw-r--r--databases/mysql4-client/patches/patch-av10
4 files changed, 23 insertions, 40 deletions
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 597fe7d6d1c..c3b85531cdd 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.28 2005/01/10 15:47:18 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.29 2005/01/17 14:42:35 xtraeme Exp $
-DISTNAME= mysql-4.1.8a
+DISTNAME= mysql-4.1.9
CATEGORIES= databases
MASTER_SITES= http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/ \
ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo
index 8a12abd1359..e98f7e1cb81 100644
--- a/databases/mysql4-client/distinfo
+++ b/databases/mysql4-client/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2005/01/11 22:44:34 xtraeme Exp $
+$NetBSD: distinfo,v 1.13 2005/01/17 14:42:35 xtraeme Exp $
-SHA1 (mysql-4.1.8a.tar.gz) = 845555eb6d1f48806e24e66a7a28ae822729cdcf
-Size (mysql-4.1.8a.tar.gz) = 22945198 bytes
-SHA1 (patch-af) = 66ac801ebd289d36a36434c6626cfea09a022713
+SHA1 (mysql-4.1.9.tar.gz) = e526f301704f8fca7c7e9f42d368ffa1fef2a152
+Size (mysql-4.1.9.tar.gz) = 22308321 bytes
+SHA1 (patch-af) = 40c6d8a8a51bad8f0132bf63dbf865e4a5362504
SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
-SHA1 (patch-av) = e2563965cb074c4dbd3b225b98de579dbb1d2b9b
+SHA1 (patch-av) = 4f73104cd3b798103eb2c4f83073dbac02b4db90
SHA1 (patch-aw) = cd03eb6c81a932186370e9ed248d0c7886b7286d
SHA1 (patch-ax) = 9e9176468d6d335617862a4d77a358931d7c8c49
SHA1 (patch-ay) = 9b1dfa213491d8daf82ff8d5ee293d1279c64ce8
diff --git a/databases/mysql4-client/patches/patch-af b/databases/mysql4-client/patches/patch-af
index 2a45b52a844..a86f7c17def 100644
--- a/databases/mysql4-client/patches/patch-af
+++ b/databases/mysql4-client/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2005/01/10 15:47:18 xtraeme Exp $
+$NetBSD: patch-af,v 1.6 2005/01/17 14:42:35 xtraeme Exp $
---- configure.orig 2004-12-27 17:48:08.000000000 +0100
-+++ configure 2005-01-10 15:44:21.000000000 +0100
-@@ -36429,34 +36429,10 @@
+--- configure.orig 2005-01-17 15:03:22.000000000 +0100
++++ configure 2005-01-17 15:05:30.000000000 +0100
+@@ -36436,30 +36436,10 @@
fi;
@@ -23,25 +23,17 @@ $NetBSD: patch-af,v 1.5 2005/01/10 15:47:18 xtraeme Exp $
-_ACEOF
-
-else
-- orbit_exec_prefix=
-- orbit_includes=
-- orbit_libs=
-- orbit_idl=
+ orbit_exec_prefix=
+ orbit_includes=
+ orbit_libs=
+ orbit_idl=
- echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-fi
--
--
--
--
-+orbit_exec_prefix=
-+orbit_includes=
-+orbit_libs=
-+orbit_idl=
- echo "$as_me:$LINENO: checking if we should build MySQLFS" >&5
- echo $ECHO_N "checking if we should build MySQLFS... $ECHO_C" >&6
-@@ -36731,7 +36707,7 @@
+
+
+@@ -36738,7 +36718,7 @@
else
bench_dirs=""
fi
@@ -50,12 +42,3 @@ $NetBSD: patch-af,v 1.5 2005/01/10 15:47:18 xtraeme Exp $
# Don't build readline, i have it already
-@@ -38915,7 +38891,7 @@
- server_scripts=
- thread_dirs=
-
--sql_client_dirs="libmysql client"
-+sql_client_dirs="libmysql regex client"
- linked_client_targets="linked_libmysql_sources"
- CLIENT_LIBS=$NON_THREADED_CLIENT_LIBS
- if test "$THREAD_SAFE_CLIENT" != "no"
diff --git a/databases/mysql4-client/patches/patch-av b/databases/mysql4-client/patches/patch-av
index 4919ef78a03..d6c730e40fd 100644
--- a/databases/mysql4-client/patches/patch-av
+++ b/databases/mysql4-client/patches/patch-av
@@ -1,15 +1,15 @@
-$NetBSD: patch-av,v 1.2 2005/01/10 15:47:18 xtraeme Exp $
+$NetBSD: patch-av,v 1.3 2005/01/17 14:42:35 xtraeme Exp $
---- Makefile.in.orig 2005-01-10 13:38:58.000000000 +0100
-+++ Makefile.in 2005-01-10 13:40:52.000000000 +0100
-@@ -338,12 +338,7 @@
+--- Makefile.in.orig 2005-01-17 15:05:45.000000000 +0100
++++ Makefile.in 2005-01-17 15:06:09.000000000 +0100
+@@ -339,12 +339,7 @@
# These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
- @readline_topdir@ sql-common \
- @thread_dirs@ pstack \
-- @sql_server_dirs@ @sql_client_dirs@ scripts man tests \
+- @sql_union_dirs@ scripts man tests \
- netware @libmysqld_dirs@ \
- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@
+SUBDIRS = . include strings @sql_client_dirs@ scripts man