diff options
22 files changed, 211 insertions, 198 deletions
diff --git a/databases/mysql4-client/Makefile b/databases/mysql4-client/Makefile index 7516960b9da..1ad48edaf62 100644 --- a/databases/mysql4-client/Makefile +++ b/databases/mysql4-client/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2005/01/01 00:37:56 minskim Exp $ +# $NetBSD: Makefile,v 1.19 2005/01/10 15:47:18 xtraeme Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} -PKGREVISION= 6 +#PKGREVISION= 1 SVR4_PKGNAME= mysqc COMMENT= MySQL 4, a free SQL database (client) diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common index 1845c98ac4b..597fe7d6d1c 100644 --- a/databases/mysql4-client/Makefile.common +++ b/databases/mysql4-client/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.27 2004/12/17 17:48:08 wiz Exp $ +# $NetBSD: Makefile.common,v 1.28 2005/01/10 15:47:18 xtraeme Exp $ -DISTNAME= mysql-4.1.7 +DISTNAME= mysql-4.1.8a CATEGORIES= databases MASTER_SITES= http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/ \ ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \ @@ -51,6 +51,7 @@ CONFIGURE_ARGS+= --without-bench CONFIGURE_ARGS+= --with-low-memory CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-vio +CONFIGURE_ARGS+= --without-mysqlfs CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET} CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET} diff --git a/databases/mysql4-client/PLIST b/databases/mysql4-client/PLIST index cb6442fbd1f..bb0aa3b9d45 100644 --- a/databases/mysql4-client/PLIST +++ b/databases/mysql4-client/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2004/11/23 16:07:02 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.11 2005/01/10 15:47:18 xtraeme Exp $ bin/msql2mysql bin/mysql bin/mysql_config @@ -70,6 +70,6 @@ share/examples/mysql/my-small.cnf share/mysql/fill_help_tables.sql share/mysql/mysql_fix_privilege_tables.sql @dirrm share/mysql -@dirrm lib/mysql @dirrm share/examples/mysql +@dirrm lib/mysql @dirrm include/mysql diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo index ac60fa5a802..0d27913db4c 100644 --- a/databases/mysql4-client/distinfo +++ b/databases/mysql4-client/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.10 2004/11/08 18:19:41 xtraeme Exp $ +$NetBSD: distinfo,v 1.11 2005/01/10 15:47:18 xtraeme Exp $ -SHA1 (mysql-4.1.7.tar.gz) = 11c1c3a3004175d8b9ac710f9c7815cf759e6293 -Size (mysql-4.1.7.tar.gz) = 19849046 bytes -SHA1 (patch-af) = 890b096c132339660cff33128d410a99646f49e1 +SHA1 (mysql-4.1.8a.tar.gz) = 845555eb6d1f48806e24e66a7a28ae822729cdcf +Size (mysql-4.1.8a.tar.gz) = 22945198 bytes +SHA1 (patch-af) = 66ac801ebd289d36a36434c6626cfea09a022713 SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91 -SHA1 (patch-av) = bc68c2e72d41e920f981c2ac277bcd5c8ff91611 -SHA1 (patch-aw) = d431580785ecddda8af80e6b816f5eabcba55a27 -SHA1 (patch-ax) = 5421a348d7a43ea30c570a09d1250a7e25ec00f9 +SHA1 (patch-av) = e2563965cb074c4dbd3b225b98de579dbb1d2b9b +SHA1 (patch-aw) = cd03eb6c81a932186370e9ed248d0c7886b7286d +SHA1 (patch-ax) = 9e9176468d6d335617862a4d77a358931d7c8c49 +SHA1 (patch-ay) = 5cb2f32bd1a0dfb0cc9d94c08736dceeac799d12 diff --git a/databases/mysql4-client/patches/patch-af b/databases/mysql4-client/patches/patch-af index 371d9920718..2a45b52a844 100644 --- a/databases/mysql4-client/patches/patch-af +++ b/databases/mysql4-client/patches/patch-af @@ -1,26 +1,8 @@ -$NetBSD: patch-af,v 1.4 2004/11/01 08:30:25 grant Exp $ +$NetBSD: patch-af,v 1.5 2005/01/10 15:47:18 xtraeme Exp $ ---- configure.orig 2004-10-23 17:29:20.000000000 +1000 -+++ configure -@@ -23040,7 +23040,7 @@ cat >>conftest.$ac_ext <<_ACEOF - int - main () - { --int link_test() { return compress(0, (unsigned long*) 0, "", 0); } -+return compress(0, (unsigned long*) 0, "", 0); - ; - return 0; - } -@@ -23109,7 +23109,7 @@ cat >>conftest.$ac_ext <<_ACEOF - int - main () - { --int link_test() { return compress(0, (unsigned long*) 0, "", 0); } -+return compress(0, (unsigned long*) 0, "", 0); - ; - return 0; - } -@@ -34120,30 +34120,10 @@ else +--- configure.orig 2004-12-27 17:48:08.000000000 +0100 ++++ configure 2005-01-10 15:44:21.000000000 +0100 +@@ -36429,34 +36429,10 @@ fi; @@ -41,17 +23,25 @@ $NetBSD: patch-af,v 1.4 2004/11/01 08:30:25 grant 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= - - -@@ -34422,7 +34402,7 @@ then + 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 @@ else bench_dirs="" fi @@ -60,3 +50,12 @@ $NetBSD: patch-af,v 1.4 2004/11/01 08:30:25 grant 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 2ad46461b8a..4919ef78a03 100644 --- a/databases/mysql4-client/patches/patch-av +++ b/databases/mysql4-client/patches/patch-av @@ -1,20 +1,18 @@ -$NetBSD: patch-av,v 1.1 2004/11/08 18:19:41 xtraeme Exp $ +$NetBSD: patch-av,v 1.2 2005/01/10 15:47:18 xtraeme Exp $ ---- Makefile.in.orig 2004-11-08 17:03:55.000000000 +0100 -+++ Makefile.in 2004-11-08 17:05:09.000000000 +0100 -@@ -301,14 +301,7 @@ +--- 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 @@ # 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_client_dirs@ \ -- @sql_server_dirs@ scripts man tests \ +- @thread_dirs@ pstack \ +- @sql_server_dirs@ @sql_client_dirs@ scripts man tests \ - netware @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ -- -- -+SUBDIRS = . include @sql_client_dirs@ scripts man ++SUBDIRS = . include strings @sql_client_dirs@ scripts man + DIST_SUBDIRS = . include @docs_dirs@ zlib \ @readline_topdir@ sql-common \ - @thread_dirs@ pstack @sql_client_dirs@ \ diff --git a/databases/mysql4-client/patches/patch-aw b/databases/mysql4-client/patches/patch-aw index 87391005a7a..2fabaa3c178 100644 --- a/databases/mysql4-client/patches/patch-aw +++ b/databases/mysql4-client/patches/patch-aw @@ -1,15 +1,14 @@ -$NetBSD: patch-aw,v 1.1 2004/11/08 18:19:41 xtraeme Exp $ +$NetBSD: patch-aw,v 1.2 2005/01/10 15:47:18 xtraeme Exp $ ---- man/Makefile.in.orig 2004-11-08 17:27:29.000000000 +0100 -+++ man/Makefile.in 2004-11-08 17:28:09.000000000 +0100 -@@ -296,10 +296,8 @@ +--- man/Makefile.in.orig 2005-01-10 13:41:15.000000000 +0100 ++++ man/Makefile.in 2005-01-10 13:41:46.000000000 +0100 +@@ -313,9 +313,8 @@ + vio_dir = @vio_dir@ vio_libs = @vio_libs@ zlib_dir = @zlib_dir@ - -man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \ - mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ - perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1 -- +man_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \ + mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1 diff --git a/databases/mysql4-client/patches/patch-ax b/databases/mysql4-client/patches/patch-ax index de0ce5b3558..c0f1dd05e86 100644 --- a/databases/mysql4-client/patches/patch-ax +++ b/databases/mysql4-client/patches/patch-ax @@ -1,11 +1,11 @@ -$NetBSD: patch-ax,v 1.1 2004/11/08 18:19:41 xtraeme Exp $ +$NetBSD: patch-ax,v 1.2 2005/01/10 15:47:18 xtraeme Exp $ ---- scripts/Makefile.in.orig 2004-11-08 17:28:31.000000000 +0100 -+++ scripts/Makefile.in 2004-11-08 17:30:26.000000000 +0100 -@@ -295,28 +295,12 @@ +--- scripts/Makefile.in.orig 2005-01-10 13:42:12.000000000 +0100 ++++ scripts/Makefile.in 2005-01-10 13:43:10.000000000 +0100 +@@ -316,25 +316,10 @@ + vio_dir = @vio_dir@ vio_libs = @vio_libs@ zlib_dir = @zlib_dir@ - -bin_SCRIPTS = @server_scripts@ \ - msql2mysql \ - mysql_config \ @@ -31,7 +31,4 @@ $NetBSD: patch-ax,v 1.1 2004/11/08 18:19:41 xtraeme Exp $ + mysqldumpslow mysql_explain_log mysql_tableinfo \ mysql_create_system_tables -- EXTRA_SCRIPTS = make_binary_distribution.sh \ - make_sharedlib_distribution.sh \ - make_win_src_distribution.sh \ diff --git a/databases/mysql4-client/patches/patch-ay b/databases/mysql4-client/patches/patch-ay new file mode 100644 index 00000000000..3e94fb987d8 --- /dev/null +++ b/databases/mysql4-client/patches/patch-ay @@ -0,0 +1,20 @@ +$NetBSD: patch-ay,v 1.1 2005/01/10 15:47:18 xtraeme Exp $ + +--- strings/Makefile.in.orig 2005-01-10 15:59:35.000000000 +0100 ++++ strings/Makefile.in 2005-01-10 16:00:49.000000000 +0100 +@@ -599,7 +599,6 @@ + if test -f $$p; then \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \ +- $(pkglibLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \ + else :; fi; \ + done + @$(POST_INSTALL) +@@ -616,7 +615,6 @@ + @list='$(pkglib_LIBRARIES)'; for p in $$list; do \ + p="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \ +- rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \ + done + + clean-pkglibLIBRARIES: diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile index e5c251a1edd..57ad51a9ef4 100644 --- a/databases/mysql4-server/Makefile +++ b/databases/mysql4-server/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2005/01/01 00:37:56 minskim Exp $ +# $NetBSD: Makefile,v 1.16 2005/01/10 15:47:18 xtraeme Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} -PKGREVISION= 3 +#PKGREVISION= 1 SVR4_PKGNAME= mysqs COMMENT= MySQL 4, a free SQL database (server) diff --git a/databases/mysql4-server/PLIST b/databases/mysql4-server/PLIST index fb715ec6c42..c8fcbce5d9a 100644 --- a/databases/mysql4-server/PLIST +++ b/databases/mysql4-server/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.6 2004/11/09 06:44:32 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.7 2005/01/10 15:47:18 xtraeme Exp $ +bin/client_test bin/comp_err bin/isamchk bin/isamlog @@ -35,6 +36,8 @@ share/mysql-test/cacert.pem share/mysql-test/client-cert.pem share/mysql-test/client-key.pem share/mysql-test/include/check_var_limit.inc +share/mysql-test/include/ctype_common.inc +share/mysql-test/include/endspace.inc share/mysql-test/include/have_archive.inc share/mysql-test/include/have_bdb.inc share/mysql-test/include/have_big5.inc @@ -91,6 +94,7 @@ share/mysql-test/r/check_var_limit.require share/mysql-test/r/comments.result share/mysql-test/r/compare.result share/mysql-test/r/connect.result +share/mysql-test/r/consistent_snapshot.result share/mysql-test/r/constraints.result share/mysql-test/r/count_distinct.result share/mysql-test/r/count_distinct2.result @@ -183,6 +187,7 @@ share/mysql-test/r/have_geometry.require share/mysql-test/r/have_innodb.require share/mysql-test/r/have_isam.require share/mysql-test/r/have_met_timezone.require +share/mysql-test/r/have_moscow_leap_timezone.require share/mysql-test/r/have_ndb.require share/mysql-test/r/have_openssl.require share/mysql-test/r/have_openssl_1.require @@ -248,6 +253,7 @@ share/mysql-test/r/ndb_basic.result share/mysql-test/r/ndb_blob.result share/mysql-test/r/ndb_cache.result share/mysql-test/r/ndb_charset.result +share/mysql-test/r/ndb_grant.result share/mysql-test/r/ndb_index.result share/mysql-test/r/ndb_index_ordered.result share/mysql-test/r/ndb_index_unique.result @@ -260,6 +266,7 @@ share/mysql-test/r/ndb_subquery.result share/mysql-test/r/ndb_transaction.result share/mysql-test/r/ndb_truncate.result share/mysql-test/r/ndb_types.result +share/mysql-test/r/ndb_update.result share/mysql-test/r/negation_elimination.result share/mysql-test/r/not_embedded.require share/mysql-test/r/null.result @@ -313,11 +320,13 @@ share/mysql-test/r/rpl_chain_temp_table.result share/mysql-test/r/rpl_change_master.result share/mysql-test/r/rpl_charset.result share/mysql-test/r/rpl_commit_after_flush.result +share/mysql-test/r/rpl_create_database.result share/mysql-test/r/rpl_delete_all.result share/mysql-test/r/rpl_do_grant.result share/mysql-test/r/rpl_drop.result share/mysql-test/r/rpl_empty_master_crash.result share/mysql-test/r/rpl_error_ignored_table.result +share/mysql-test/r/rpl_failed_optimize.result share/mysql-test/r/rpl_failsafe.result share/mysql-test/r/rpl_flush_log_loop.result share/mysql-test/r/rpl_flush_tables.result @@ -348,12 +357,14 @@ share/mysql-test/r/rpl_relayrotate.result share/mysql-test/r/rpl_relayspace.result share/mysql-test/r/rpl_replicate_do.result share/mysql-test/r/rpl_reset_slave.result +share/mysql-test/r/rpl_rewrite_db.result share/mysql-test/r/rpl_rotate_logs.result share/mysql-test/r/rpl_server_id1.result share/mysql-test/r/rpl_server_id2.result share/mysql-test/r/rpl_set_charset.result share/mysql-test/r/rpl_skip_error.result share/mysql-test/r/rpl_sporadic_master.result +share/mysql-test/r/rpl_start_stop_slave.result share/mysql-test/r/rpl_temporary.result share/mysql-test/r/rpl_timezone.result share/mysql-test/r/rpl_trunc_binlog.result @@ -379,6 +390,7 @@ share/mysql-test/r/tablelock.result share/mysql-test/r/temp_table.result share/mysql-test/r/timezone.result share/mysql-test/r/timezone2.result +share/mysql-test/r/timezone3.result share/mysql-test/r/true.require share/mysql-test/r/truncate.result share/mysql-test/r/type_blob.result @@ -400,6 +412,7 @@ share/mysql-test/r/user_var.result share/mysql-test/r/varbinary.result share/mysql-test/r/variables.result share/mysql-test/r/warnings.result +share/mysql-test/std_data/Moscow_leap share/mysql-test/std_data/cacert.pem share/mysql-test/std_data/client-cert.pem share/mysql-test/std_data/client-key.pem @@ -443,6 +456,7 @@ share/mysql-test/t/client_test.test share/mysql-test/t/comments.test share/mysql-test/t/compare.test share/mysql-test/t/connect.test +share/mysql-test/t/consistent_snapshot.test share/mysql-test/t/constraints.test share/mysql-test/t/count_distinct.test share/mysql-test/t/count_distinct2-master.opt @@ -540,7 +554,6 @@ share/mysql-test/t/init_connect.test share/mysql-test/t/init_file-master.opt share/mysql-test/t/init_file.test share/mysql-test/t/innodb-deadlock.test -share/mysql-test/t/innodb-lock-master.opt share/mysql-test/t/innodb-lock.test share/mysql-test/t/innodb-master.opt share/mysql-test/t/innodb.test @@ -576,6 +589,7 @@ share/mysql-test/t/lowercase_table_qcache-master.opt share/mysql-test/t/lowercase_table_qcache.test share/mysql-test/t/merge.test share/mysql-test/t/metadata.test +share/mysql-test/t/mix_innodb_myisam_binlog-master.opt share/mysql-test/t/mix_innodb_myisam_binlog.test share/mysql-test/t/multi_statement.test share/mysql-test/t/multi_update-master.opt @@ -609,6 +623,7 @@ share/mysql-test/t/ndb_subquery.test share/mysql-test/t/ndb_transaction.test share/mysql-test/t/ndb_truncate.test share/mysql-test/t/ndb_types.test +share/mysql-test/t/ndb_update.test share/mysql-test/t/negation_elimination.test share/mysql-test/t/null.test share/mysql-test/t/null_key.test @@ -672,12 +687,17 @@ share/mysql-test/t/rpl_chain_temp_table.test share/mysql-test/t/rpl_change_master.test share/mysql-test/t/rpl_charset.test share/mysql-test/t/rpl_commit_after_flush.test +share/mysql-test/t/rpl_create_database-master.opt +share/mysql-test/t/rpl_create_database-slave.opt +share/mysql-test/t/rpl_create_database.test share/mysql-test/t/rpl_delete_all.test share/mysql-test/t/rpl_do_grant.test share/mysql-test/t/rpl_drop.test share/mysql-test/t/rpl_empty_master_crash.test share/mysql-test/t/rpl_error_ignored_table-slave.opt share/mysql-test/t/rpl_error_ignored_table.test +share/mysql-test/t/rpl_failed_optimize-master.opt +share/mysql-test/t/rpl_failed_optimize.test share/mysql-test/t/rpl_failsafe.test share/mysql-test/t/rpl_flush_log_loop-master.opt share/mysql-test/t/rpl_flush_log_loop-master.sh @@ -726,6 +746,8 @@ share/mysql-test/t/rpl_relayspace.test share/mysql-test/t/rpl_replicate_do-slave.opt share/mysql-test/t/rpl_replicate_do.test share/mysql-test/t/rpl_reset_slave.test +share/mysql-test/t/rpl_rewrite_db-slave.opt +share/mysql-test/t/rpl_rewrite_db.test share/mysql-test/t/rpl_rotate_logs-master.opt share/mysql-test/t/rpl_rotate_logs-slave.sh share/mysql-test/t/rpl_rotate_logs.slave-mi @@ -738,6 +760,7 @@ share/mysql-test/t/rpl_skip_error-slave.opt share/mysql-test/t/rpl_skip_error.test share/mysql-test/t/rpl_sporadic_master-master.opt share/mysql-test/t/rpl_sporadic_master.test +share/mysql-test/t/rpl_start_stop_slave.test share/mysql-test/t/rpl_temporary.test share/mysql-test/t/rpl_timezone-master.opt share/mysql-test/t/rpl_timezone-slave.opt @@ -766,6 +789,8 @@ share/mysql-test/t/temp_table.test share/mysql-test/t/timezone-master.opt share/mysql-test/t/timezone.test share/mysql-test/t/timezone2.test +share/mysql-test/t/timezone3-master.opt +share/mysql-test/t/timezone3.test share/mysql-test/t/truncate.test share/mysql-test/t/type_blob.test share/mysql-test/t/type_date.test diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo index 0de85df7f83..7cfa94f6d44 100644 --- a/databases/mysql4-server/distinfo +++ b/databases/mysql4-server/distinfo @@ -1,18 +1,18 @@ -$NetBSD: distinfo,v 1.10 2004/11/08 18:19:41 xtraeme Exp $ +$NetBSD: distinfo,v 1.11 2005/01/10 15:47:18 xtraeme Exp $ -SHA1 (mysql-4.1.7.tar.gz) = 11c1c3a3004175d8b9ac710f9c7815cf759e6293 -Size (mysql-4.1.7.tar.gz) = 19849046 bytes -SHA1 (patch-aa) = 54d4f8cc3aa80fa49d7330873d41e13f0bb42100 -SHA1 (patch-ab) = fa03cc4b5fe58a3436687d24dd5120d48388f721 -SHA1 (patch-ac) = 184919dfda45836f0c7ad7c80e27624961ab6fea -SHA1 (patch-af) = 270755264242a436047c749c5a3eb3aba2b6a25b +SHA1 (mysql-4.1.8a.tar.gz) = 845555eb6d1f48806e24e66a7a28ae822729cdcf +Size (mysql-4.1.8a.tar.gz) = 22945198 bytes +SHA1 (patch-aa) = cb11b0461c88d3ded9be63f8fcf28c0759441a72 +SHA1 (patch-ab) = 8521d07034428de396ed56529b6c18af50739b9d +SHA1 (patch-ac) = ba78b6168d79520cc6bee8e06e89ca3fe90d92a1 +SHA1 (patch-af) = 2accaca59821f0e82944690f41f905f6560bd76f SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96 SHA1 (patch-am) = 2279653e5ee3df2f19242e9d4212d3666188b1d2 -SHA1 (patch-aq) = 235893947fcfdcb9f5660ade38b0b6e8423529dc -SHA1 (patch-ar) = 13851730d9118f80e16137bca2d68c116e2e17a3 -SHA1 (patch-as) = 6c5eba588576acfed721fef20a1b568c447fe0c9 -SHA1 (patch-at) = 3a457c3f6b13312cb71b663108abd0ace09f2be4 +SHA1 (patch-aq) = b971690206b416e75046cca3e53f6222b55725c5 +SHA1 (patch-ar) = bb3329100655d99484934e69d5c8a7e3dc459542 +SHA1 (patch-as) = 2cf503e557eb6a8534221f6e576f055b9f4b68ce +SHA1 (patch-at) = b8a4ad4d4ff8cf04b300c147a68847d1476e607e SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91 SHA1 (patch-av) = 6ea5b9338d223f1380386288c537f55d4fd7a7d7 -SHA1 (patch-aw) = 6beb03517de678def5631517c8a7db7ea6540137 -SHA1 (patch-ax) = 8e21c394b9cd6f7f2a0cae0c76ac08d224a18420 +SHA1 (patch-aw) = 79b9afbcb16a868c193cded23a50e53987579f27 +SHA1 (patch-ax) = b2f76b2d4e6aca649f975eba0f9c18316d4d4c17 diff --git a/databases/mysql4-server/patches/patch-aa b/databases/mysql4-server/patches/patch-aa index bb3c0267cf2..6910bb9d064 100644 --- a/databases/mysql4-server/patches/patch-aa +++ b/databases/mysql4-server/patches/patch-aa @@ -1,20 +1,19 @@ -$NetBSD: patch-aa,v 1.5 2004/10/28 01:12:44 xtraeme Exp $ +$NetBSD: patch-aa,v 1.6 2005/01/10 15:47:18 xtraeme Exp $ ---- Makefile.in.orig 2004-10-27 23:20:22.000000000 +0200 -+++ Makefile.in 2004-10-27 23:20:52.000000000 +0200 -@@ -301,13 +301,8 @@ +--- Makefile.in.orig 2005-01-10 16:09:00.000000000 +0100 ++++ Makefile.in 2005-01-10 16:09:25.000000000 +0100 +@@ -338,12 +338,8 @@ # 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_client_dirs@ \ -- @sql_server_dirs@ scripts man tests \ +- @thread_dirs@ pstack \ +- @sql_server_dirs@ @sql_client_dirs@ scripts man tests \ - netware @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ -- +SUBDIRS = . include @thread_dirs@ pstack @sql_server_dirs@ tests \ -+ @bench_dirs@ support-files ++ @bench_dirs@ support-files DIST_SUBDIRS = . include @docs_dirs@ zlib \ @readline_topdir@ sql-common \ diff --git a/databases/mysql4-server/patches/patch-ab b/databases/mysql4-server/patches/patch-ab index 1587732d0a5..91dc12afb6b 100644 --- a/databases/mysql4-server/patches/patch-ab +++ b/databases/mysql4-server/patches/patch-ab @@ -1,31 +1,31 @@ -$NetBSD: patch-ab,v 1.1 2004/10/28 01:12:44 xtraeme Exp $ +$NetBSD: patch-ab,v 1.2 2005/01/10 15:47:18 xtraeme Exp $ ---- tests/Makefile.in.orig 2004-10-27 23:47:23.000000000 +0200 -+++ tests/Makefile.in 2004-10-27 23:47:53.000000000 +0200 -@@ -315,7 +315,7 @@ - # C Test for 4.1 protocol - # - INCLUDES = -I$(top_srcdir)/include $(openssl_includes) --LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la -+LDADD = @CLIENT_EXTRA_LDFLAGS@ -lmysqlclient - client_test_LDADD = $(LDADD) $(CXXLDFLAGS) - client_test_SOURCES = client_test.c - insert_test_DEPENDENCIES = $(LIBRARIES) $(pkglib_LTLIBRARIES) -@@ -332,7 +332,7 @@ - +--- tests/Makefile.in.orig 2005-01-10 16:09:56.000000000 +0100 ++++ tests/Makefile.in 2005-01-10 16:11:05.000000000 +0100 +@@ -74,7 +74,7 @@ + PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am_client_test_OBJECTS = client_test.$(OBJEXT) client_test_OBJECTS = $(am_client_test_OBJECTS) --client_test_DEPENDENCIES = ../libmysql/libmysqlclient.la -+client_test_DEPENDENCIES = - client_test_LDFLAGS = +-am__DEPENDENCIES_1 = ../libmysql/libmysqlclient.la ++am__DEPENDENCIES_1 = + am__DEPENDENCIES_2 = + client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) insert_test_SOURCES = insert_test.c - insert_test_OBJECTS = insert_test.$(OBJEXT) -@@ -345,7 +345,7 @@ +@@ -86,7 +86,7 @@ thread_test_SOURCES = thread_test.c thread_test_OBJECTS = thread_test.$(OBJEXT) thread_test_LDADD = $(LDADD) -thread_test_DEPENDENCIES = ../libmysql/libmysqlclient.la +thread_test_DEPENDENCIES = - thread_test_LDFLAGS = - - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -368,7 +368,7 @@ + # C Test for 4.1 protocol + # + INCLUDES = -I$(top_srcdir)/include $(openssl_includes) +-LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la ++LDADD = @CLIENT_EXTRA_LDFLAGS@ -lmysqlclient + client_test_LDADD = $(LDADD) $(CXXLDFLAGS) + client_test_SOURCES = client_test.c + insert_test_DEPENDENCIES = $(LIBRARIES) $(pkglib_LTLIBRARIES) diff --git a/databases/mysql4-server/patches/patch-ac b/databases/mysql4-server/patches/patch-ac index 3b1d710b4ad..5e974d72aac 100644 --- a/databases/mysql4-server/patches/patch-ac +++ b/databases/mysql4-server/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.1 2004/10/28 01:12:44 xtraeme Exp $ +$NetBSD: patch-ac,v 1.2 2005/01/10 15:47:18 xtraeme Exp $ ---- mysql-test/Makefile.in.orig 2004-10-27 23:51:22.000000000 +0200 -+++ mysql-test/Makefile.in 2004-10-27 23:51:48.000000000 +0200 -@@ -305,7 +305,7 @@ +--- mysql-test/Makefile.in.orig 2005-01-10 16:11:33.000000000 +0100 ++++ mysql-test/Makefile.in 2005-01-10 16:11:53.000000000 +0100 +@@ -355,7 +355,7 @@ + @HAVE_NDBCLUSTER_DB_FALSE@DIST_SUBDIRS = @HAVE_NDBCLUSTER_DB_TRUE@DIST_SUBDIRS = ndb - benchdir_root = $(prefix) -testdir = $(benchdir_root)/mysql-test +testdir = $(benchdir_root)/share/mysql-test diff --git a/databases/mysql4-server/patches/patch-af b/databases/mysql4-server/patches/patch-af index 8a76a1162af..83bd13628df 100644 --- a/databases/mysql4-server/patches/patch-af +++ b/databases/mysql4-server/patches/patch-af @@ -1,26 +1,8 @@ -$NetBSD: patch-af,v 1.6 2004/11/08 18:19:41 xtraeme Exp $ +$NetBSD: patch-af,v 1.7 2005/01/10 15:47:18 xtraeme Exp $ ---- configure.orig 2004-10-23 17:29:20.000000000 +1000 -+++ configure -@@ -23040,7 +23040,7 @@ cat >>conftest.$ac_ext <<_ACEOF - int - main () - { --int link_test() { return compress(0, (unsigned long*) 0, "", 0); } -+return compress(0, (unsigned long*) 0, "", 0); - ; - return 0; - } -@@ -23109,7 +23109,7 @@ cat >>conftest.$ac_ext <<_ACEOF - int - main () - { --int link_test() { return compress(0, (unsigned long*) 0, "", 0); } -+return compress(0, (unsigned long*) 0, "", 0); - ; - return 0; - } -@@ -34120,30 +34120,10 @@ else +--- configure.orig 2005-01-10 16:12:40.000000000 +0100 ++++ configure 2005-01-10 16:12:52.000000000 +0100 +@@ -36429,33 +36429,10 @@ fi; @@ -48,15 +30,9 @@ $NetBSD: patch-af,v 1.6 2004/11/08 18:19:41 xtraeme Exp $ - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 -fi +- +- +- - -@@ -34422,7 +34402,7 @@ then - else - bench_dirs="" - fi --bench_dirs="$bench_dirs mysql-test" -+bench_dirs="$bench_dirs mysql-test" - - - # Don't build readline, i have it already + echo "$as_me:$LINENO: checking if we should build MySQLFS" >&5 diff --git a/databases/mysql4-server/patches/patch-aq b/databases/mysql4-server/patches/patch-aq index 2728505edde..de3fd65629b 100644 --- a/databases/mysql4-server/patches/patch-aq +++ b/databases/mysql4-server/patches/patch-aq @@ -1,11 +1,11 @@ -$NetBSD: patch-aq,v 1.4 2004/10/28 01:12:44 xtraeme Exp $ +$NetBSD: patch-aq,v 1.5 2005/01/10 15:47:18 xtraeme Exp $ ---- include/Makefile.in.orig 2004-10-27 23:27:39.000000000 +0200 -+++ include/Makefile.in 2004-10-27 23:28:13.000000000 +0200 -@@ -296,14 +296,8 @@ +--- include/Makefile.in.orig 2005-01-10 16:13:53.000000000 +0100 ++++ include/Makefile.in 2005-01-10 16:14:24.000000000 +0100 +@@ -317,14 +317,8 @@ + vio_dir = @vio_dir@ vio_libs = @vio_libs@ zlib_dir = @zlib_dir@ - -BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h -pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \ - mysql.h mysql_com.h mysqld_error.h mysql_embed.h \ @@ -14,8 +14,8 @@ $NetBSD: patch-aq,v 1.4 2004/10/28 01:12:44 xtraeme Exp $ - my_getopt.h sslopt-longopts.h my_dir.h typelib.h \ - sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ - sql_state.h mysql_time.h $(BUILT_SOURCES) -+BUILT_SOURCES = -+pkginclude_HEADERS = $(BUILT_SOURCES) ++BUILT_SOURCES = ++pkginclude_HEADERS = noinst_HEADERS = config-win.h config-os2.h config-netware.h \ nisam.h heap.h merge.h my_bitmap.h\ diff --git a/databases/mysql4-server/patches/patch-ar b/databases/mysql4-server/patches/patch-ar index 711485ea276..f86841eb9f3 100644 --- a/databases/mysql4-server/patches/patch-ar +++ b/databases/mysql4-server/patches/patch-ar @@ -1,23 +1,21 @@ -$NetBSD: patch-ar,v 1.5 2004/10/28 01:12:44 xtraeme Exp $ +$NetBSD: patch-ar,v 1.6 2005/01/10 15:47:18 xtraeme Exp $ ---- man/Makefile.in.orig 2004-10-27 23:28:38.000000000 +0200 -+++ man/Makefile.in 2004-10-27 23:29:04.000000000 +0200 -@@ -296,16 +296,8 @@ +--- man/Makefile.in.orig 2005-01-10 16:14:50.000000000 +0100 ++++ man/Makefile.in 2005-01-10 16:15:51.000000000 +0100 +@@ -313,14 +313,8 @@ + vio_dir = @vio_dir@ vio_libs = @vio_libs@ zlib_dir = @zlib_dir@ - -man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \ - mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ - perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1 - -- -EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \ - mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \ - mysqldump.1.in mysqlshow.1.in perror.1.in replace.1.in mysqlman.1.in \ - mysqld_safe.1.in mysql_fix_privilege_tables.1.in -- +man_MANS = mysqld.1 mysqld_multi.1 -+EXTRA_DITS = mysqld.1.in mysqld_multi.1.in ++EXTRA_DIST = mysqld.1.in mysqld_multi.1.in CLEANFILES = $(man_MANS) - + SUFFIXES = .in diff --git a/databases/mysql4-server/patches/patch-as b/databases/mysql4-server/patches/patch-as index b9b4db954ac..feb80200a3d 100644 --- a/databases/mysql4-server/patches/patch-as +++ b/databases/mysql4-server/patches/patch-as @@ -1,11 +1,11 @@ -$NetBSD: patch-as,v 1.5 2004/10/28 01:12:44 xtraeme Exp $ +$NetBSD: patch-as,v 1.6 2005/01/10 15:47:18 xtraeme Exp $ ---- support-files/Makefile.in.orig 2004-10-27 23:29:31.000000000 +0200 -+++ support-files/Makefile.in 2004-10-27 23:29:50.000000000 +0200 -@@ -311,15 +311,7 @@ +--- support-files/Makefile.in.orig 2005-01-10 16:16:28.000000000 +0100 ++++ support-files/Makefile.in 2005-01-10 16:16:50.000000000 +0100 +@@ -338,14 +338,7 @@ + MySQL-shared-compat.spec.sh SUBDIRS = MacOSX - -pkgdata_DATA = my-small.cnf \ - my-medium.cnf \ - my-large.cnf \ @@ -14,8 +14,7 @@ $NetBSD: patch-as,v 1.5 2004/10/28 01:12:44 xtraeme Exp $ - mysql-log-rotate \ - mysql-@VERSION@.spec \ - MySQL-shared-compat.spec -- -+pkgdata_DATA = ++pkgdata_DATA = pkgdata_SCRIPTS = mysql.server - + CLEANFILES = my-small.cnf \ diff --git a/databases/mysql4-server/patches/patch-at b/databases/mysql4-server/patches/patch-at index ef0127e9b69..b6975fe6615 100644 --- a/databases/mysql4-server/patches/patch-at +++ b/databases/mysql4-server/patches/patch-at @@ -1,17 +1,18 @@ -$NetBSD: patch-at,v 1.2 2004/03/07 19:42:55 martti Exp $ +$NetBSD: patch-at,v 1.3 2005/01/10 15:47:18 xtraeme Exp $ ---- support-files/MacOSX/Makefile.in.orig Tue Feb 10 20:16:53 2004 -+++ support-files/MacOSX/Makefile.in Sun Mar 7 20:22:21 2004 -@@ -284,11 +284,7 @@ +--- support-files/MacOSX/Makefile.in.orig 2005-01-10 16:17:30.000000000 +0100 ++++ support-files/MacOSX/Makefile.in 2005-01-10 16:17:48.000000000 +0100 +@@ -324,12 +324,7 @@ + StartupItem.Info.plist \ StartupItem.postinstall - -pkgdata_DATA = Info.plist \ - Description.plist \ - StartupParameters.plist \ - postinstall \ - preinstall -+pkgdata_DATA = - - +- ++pkgdata_DATA = CLEANFILES = Info.plist \ + Description.plist \ + StartupParameters.plist \ diff --git a/databases/mysql4-server/patches/patch-aw b/databases/mysql4-server/patches/patch-aw index db5cafd47f6..b08ef246d8c 100644 --- a/databases/mysql4-server/patches/patch-aw +++ b/databases/mysql4-server/patches/patch-aw @@ -1,13 +1,13 @@ -$NetBSD: patch-aw,v 1.1 2004/03/13 12:09:37 recht Exp $ +$NetBSD: patch-aw,v 1.2 2005/01/10 15:47:18 xtraeme Exp $ ---- isam/Makefile.in.orig 2004-02-10 19:16:49.000000000 +0100 -+++ isam/Makefile.in 2004-03-13 12:26:18.000000000 +0100 -@@ -370,7 +370,7 @@ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +--- isam/Makefile.in.orig 2005-01-10 16:18:20.000000000 +0100 ++++ isam/Makefile.in 2005-01-10 16:18:31.000000000 +0100 +@@ -134,7 +134,7 @@ + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) +CCLD = $(CXX) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - DIST_SOURCES = $(libnisam_a_SOURCES) $(isamchk_SOURCES) isamlog.c \ + SOURCES = $(libnisam_a_SOURCES) $(isamchk_SOURCES) isamlog.c \ diff --git a/databases/mysql4-server/patches/patch-ax b/databases/mysql4-server/patches/patch-ax index f3afd82bb8c..bee839f38c3 100644 --- a/databases/mysql4-server/patches/patch-ax +++ b/databases/mysql4-server/patches/patch-ax @@ -1,13 +1,13 @@ -$NetBSD: patch-ax,v 1.1 2004/03/13 12:09:37 recht Exp $ +$NetBSD: patch-ax,v 1.2 2005/01/10 15:47:18 xtraeme Exp $ ---- myisam/Makefile.in.orig 2004-03-13 12:38:20.000000000 +0100 -+++ myisam/Makefile.in 2004-03-13 12:38:46.000000000 +0100 -@@ -407,7 +407,7 @@ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +--- myisam/Makefile.in.orig 2005-01-10 16:19:12.000000000 +0100 ++++ myisam/Makefile.in 2005-01-10 16:19:21.000000000 +0100 +@@ -172,7 +172,7 @@ + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) +CCLD = $(CXX) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - DIST_SOURCES = $(libmyisam_a_SOURCES) mi_test1.c mi_test2.c mi_test3.c \ + SOURCES = $(libmyisam_a_SOURCES) mi_test1.c mi_test2.c mi_test3.c \ |