diff options
| -rw-r--r-- | databases/mysql55-client/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql55-client/Makefile.common | 4 | ||||
| -rw-r--r-- | databases/mysql55-client/distinfo | 8 | ||||
| -rw-r--r-- | databases/mysql55-server/Makefile | 5 | ||||
| -rw-r--r-- | databases/mysql55-server/PLIST | 5 |
5 files changed, 15 insertions, 11 deletions
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile index ec713667049..b00cb10524d 100644 --- a/databases/mysql55-client/Makefile +++ b/databases/mysql55-client/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2013/05/31 12:39:47 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2013/06/04 13:31:21 adam Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} -PKGREVISION= 1 SVR4_PKGNAME= mysqc COMMENT= MySQL 5, a free SQL database (client) @@ -10,6 +9,7 @@ CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*} .include "Makefile.common" CMAKE_ARGS+= -DWITHOUT_SERVER=ON +CMAKE_ARGS+= -DWITH_UNIT_TESTS=OFF UNWRAP_FILES+= scripts/mysql_config INFO_FILES= yes INSTALL_DIRS+= client include libmysql man scripts tests diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common index 40985ce4268..913161ab0b6 100644 --- a/databases/mysql55-client/Makefile.common +++ b/databases/mysql55-client/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.27 2013/04/20 08:06:56 adam Exp $ +# $NetBSD: Makefile.common,v 1.28 2013/06/04 13:31:21 adam Exp $ # # used by databases/mysql55-client/Makefile # used by databases/mysql55-server/Makefile -DISTNAME= mysql-5.5.31 +DISTNAME= mysql-5.5.32 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/} diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo index 04a714322dc..d96f76e9b68 100644 --- a/databases/mysql55-client/distinfo +++ b/databases/mysql55-client/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.22 2013/04/20 08:06:56 adam Exp $ +$NetBSD: distinfo,v 1.23 2013/06/04 13:31:21 adam Exp $ -SHA1 (mysql-5.5.31.tar.gz) = a65fb40a856b6b9bcd06e39ee7baf6d43a094e2f -RMD160 (mysql-5.5.31.tar.gz) = a0c61199a410ce48058d1668a181bc9811c12ba4 -Size (mysql-5.5.31.tar.gz) = 24608323 bytes +SHA1 (mysql-5.5.32.tar.gz) = 7c42f3e31d9ad961d007394c12fd1b76dfb05eb1 +RMD160 (mysql-5.5.32.tar.gz) = 7d7171de61900150315699f51b8802ba16c7b1f8 +Size (mysql-5.5.32.tar.gz) = 24625029 bytes SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6 SHA1 (patch-CMakeLists.txt) = 0c4263762d2d9fafd84b25038cae57a87fed339d SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index e7b41fb434b..cabfbd3afe6 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2013/05/20 19:33:54 fhajny Exp $ +# $NetBSD: Makefile,v 1.12 2013/06/04 13:31:21 adam Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} -PKGREVISION= 1 SVR4_PKGNAME= mysqs COMMENT= MySQL 5, a free SQL database (server) @@ -58,11 +57,13 @@ REPLACE_PERL+= mysql-test/lib/My/SafeProcess/safe_process.pl REPLACE_PERL+= mysql-test/lib/v1/mysql-test-run.pl REPLACE_PERL+= mysql-test/mysql-stress-test.pl REPLACE_PERL+= mysql-test/mysql-test-run.pl +REPLACE_PERL+= mysql-test/std_data/checkDBI_DBD-mysql.pl REPLACE_PERL+= mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl REPLACE_PERL+= mysql-test/suite/funcs_1/lib/DataGen_local.pl REPLACE_PERL+= mysql-test/suite/funcs_1/lib/DataGen_modify.pl REPLACE_PERL+= mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl REPLACE_PERL+= mysql-test/mtr +REPLACE_PERL+= sql-bench/*.sh INSTALLATION_DIRS= bin diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST index f29832c5299..6472f767e91 100644 --- a/databases/mysql55-server/PLIST +++ b/databases/mysql55-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2013/04/20 08:06:56 adam Exp $ +@comment $NetBSD: PLIST,v 1.23 2013/06/04 13:31:21 adam Exp $ bin/innochecksum bin/my_print_defaults bin/myisam_ftdump @@ -103,6 +103,7 @@ share/mysql/romanian/errmsg.sys share/mysql/russian/errmsg.sys share/mysql/serbian/errmsg.sys share/mysql/slovak/errmsg.sys +share/mysql/solaris/postinstall-solaris share/mysql/spanish/errmsg.sys share/mysql/sql-bench/sql-bench/Data/ATIS/aircraft.txt share/mysql/sql-bench/sql-bench/Data/ATIS/airline.txt @@ -443,6 +444,7 @@ share/mysql/test/include/index_merge_ror_cpk.inc share/mysql/test/include/innodb-index.inc share/mysql/test/include/innodb_rollback_on_timeout.inc share/mysql/test/include/innodb_trx_weight.inc +share/mysql/test/include/install_semisync.inc share/mysql/test/include/io_thd_fault_injection.inc share/mysql/test/include/ipv6.inc share/mysql/test/include/ipv6_clients.inc @@ -578,6 +580,7 @@ share/mysql/test/include/testdb_only.inc share/mysql/test/include/tpcb.inc share/mysql/test/include/tpcb_disk_data.inc share/mysql/test/include/truncate_file.inc +share/mysql/test/include/uninstall_semisync.inc share/mysql/test/include/unsafe_binlog.inc share/mysql/test/include/uses_vardir.inc share/mysql/test/include/varchar.inc |