[137069] trunk/dports/databases
pixilla at macports.org
pixilla at macports.org
Wed Jun 3 20:49:33 PDT 2015
Revision: 137069
https://trac.macports.org/changeset/137069
Author: pixilla at macports.org
Date: 2015-06-03 20:49:33 -0700 (Wed, 03 Jun 2015)
Log Message:
-----------
databases/mariadb:
- Use cmake.out_of_source. See #47197
- Update mysql select file.
- Update version to 5.5.43.
databases/mariadb-10.0:
- Use cmake.out_of_source. See #47197
- Update mysql select file.
- Update version to 10.0.19.
databases/mariadb-10.1:
- Use cmake.out_of_source. See #47197
- Update mysql select file.
- Update version to 10.1.4.
- Fix build with upstream patch.
databases/mysql51:
- Update mysql select file.
- Update version to 5.1.73.
databases/mysql55:
- Use cmake.out_of_source. See #47197
- Update mysql select file.
- Update version to 5.5.44.
databases/mysql56:
- Use cmake.out_of_source. See #47197
- Update mysql select file.
- Update version to 5.6.25. See #47893
databases/mysql_select:
- Update mysql select files.
databases/percona:
- Use cmake.out_of_source. See #47197
- Update mysql select file.
- Update version to 5.6.24-72.2.
Modified Paths:
--------------
trunk/dports/databases/mariadb/Portfile
trunk/dports/databases/mariadb/files/mariadb
trunk/dports/databases/mariadb-10.0/Portfile
trunk/dports/databases/mariadb-10.0/files/mariadb-10.0
trunk/dports/databases/mariadb-10.1/Portfile
trunk/dports/databases/mariadb-10.1/files/mariadb-10.1
trunk/dports/databases/mysql51/Portfile
trunk/dports/databases/mysql51/files/mysql51
trunk/dports/databases/mysql55/Portfile
trunk/dports/databases/mysql55/files/mysql55
trunk/dports/databases/mysql56/Portfile
trunk/dports/databases/mysql56/files/mysql56
trunk/dports/databases/mysql_select/files/base
trunk/dports/databases/mysql_select/files/none
trunk/dports/databases/percona/Portfile
trunk/dports/databases/percona/files/percona
Added Paths:
-----------
trunk/dports/databases/mariadb-10.1/files/patch-sql-mdl.cc.diff
Modified: trunk/dports/databases/mariadb/Portfile
===================================================================
--- trunk/dports/databases/mariadb/Portfile 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mariadb/Portfile 2015-06-04 03:49:33 UTC (rev 137069)
@@ -5,7 +5,7 @@
name mariadb
set name_mysql ${name}
-version 5.5.41
+version 5.5.43
set version_branch [join [lrange [split ${version} .] 0 1] .]
# Please set revision_client and revision_server to 0 if you bump version.
set revision_client 0
@@ -41,14 +41,15 @@
# Mirrors with bad distfiles
# http://mirror.switch.ch/mirror/mariadb/mariadb-${version}/source/ \
+ cmake.out_of_source yes
use_parallel_build yes
patch.pre_args -p1
patchfiles patch-cmake-install_layout.cmake.diff \
patch-CMakeLists.txt.diff
- checksums rmd160 ac6d8c529efd2dd8c9648459d2fc4eefb23c83b7 \
- sha256 a16dc62e4bcabecd5c483f2f8b657483a8c51934e7be5ad4ab21b8baea1f5332
+ checksums rmd160 93296e8d9e14949d47d4d0195f566891ba83bc76 \
+ sha256 a0709997140549154edb87c9dfab564cd4755b238251acbf42369118f9bb4d01
depends_lib-append port:zlib port:tcp_wrappers port:ncurses
depends_run-append port:mysql_select
@@ -59,27 +60,23 @@
archcheck.files lib/libz.dylib lib/libwrap.dylib
post-extract {
- file mkdir ${worksrcpath}/build_macports/macports
+ file mkdir ${cmake.build_dir}/macports
copy ${filespath}/macports-default.cnf \
${filespath}/my.cnf \
- ${worksrcpath}/build_macports/macports/
+ ${cmake.build_dir}/macports/
}
post-patch {
reinplace "s|@NAME@|${name_mysql}|g" \
${worksrcpath}/cmake/install_layout.cmake
reinplace "s|@NAME@|${name_mysql}|g" \
- ${worksrcpath}/build_macports/macports/macports-default.cnf \
- ${worksrcpath}/build_macports/macports/my.cnf
+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
reinplace "s|@PREFIX@|${prefix}|g" \
- ${worksrcpath}/build_macports/macports/macports-default.cnf \
- ${worksrcpath}/build_macports/macports/my.cnf
+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
}
- configure.cmd cmake ..
- configure.dir ${worksrcpath}/build_macports
- build.dir ${worksrcpath}/build_macports
-
configure.args-delete \
-DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
configure.args-append \
@@ -102,7 +99,7 @@
-DWITH_SSL:STRING=no
post-build {
- set dirs ${worksrcpath}/build_macports
+ set dirs ${cmake.build_dir}
foreach dir ${dirs} {
reinplace -E {s|-arch [a-z0-9_]+||g} \
${dir}/scripts/mysql_config \
@@ -127,11 +124,11 @@
}
xinstall -m 755 -o root -d \
${destroot}${prefix}/etc/${name_mysql}
- copy ${worksrcpath}/build_macports/macports/macports-default.cnf \
+ copy ${cmake.build_dir}/macports/macports-default.cnf \
${destroot}${prefix}/etc/${name_mysql}/
xinstall -m 755 -o root -d \
${destroot}${prefix}/share/${name_mysql}/support-files/macports
- copy ${worksrcpath}/build_macports/macports/my.cnf \
+ copy ${cmake.build_dir}/macports/my.cnf \
${destroot}${prefix}/share/${name_mysql}/support-files/macports/
}
Modified: trunk/dports/databases/mariadb/files/mariadb
===================================================================
--- trunk/dports/databases/mariadb/files/mariadb 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mariadb/files/mariadb 2015-06-04 03:49:33 UTC (rev 137069)
@@ -14,7 +14,9 @@
lib/mariadb/bin/mysql_client_test
-
lib/mariadb/bin/mysql_config
+-
lib/mariadb/bin/mysql_convert_table_format
+lib/mariadb/bin/mysql_embedded
lib/mariadb/bin/mysql_find_rows
lib/mariadb/bin/mysql_fix_extensions
-
Modified: trunk/dports/databases/mariadb-10.0/Portfile
===================================================================
--- trunk/dports/databases/mariadb-10.0/Portfile 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mariadb-10.0/Portfile 2015-06-04 03:49:33 UTC (rev 137069)
@@ -5,7 +5,7 @@
name mariadb-10.0
set name_mysql ${name}
-version 10.0.16
+version 10.0.19
set version_branch [join [lrange [split ${version} .] 0 1] .]
# Please set revision_client and revision_server to 0 if you bump version.
set revision_client 0
@@ -40,14 +40,15 @@
http://mirror.switch.ch/mirror/mariadb/mariadb-${version}/source/
distname mariadb-${version}
+ cmake.out_of_source yes
use_parallel_build yes
patch.pre_args -p1
patchfiles patch-cmake-install_layout.cmake.diff \
patch-CMakeLists.txt.diff
- checksums rmd160 bf2a309c041aae6be0465bd71b0760334328c8a5 \
- sha256 44134a5f3e174e3e8443c1d07916af57f3ffadd4c8846338d41850fedfefcde4
+ checksums rmd160 2f9d70cce15d85654739ca7d64de87997f7db240 \
+ sha256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132
depends_lib-append port:zlib port:tcp_wrappers port:ncurses
depends_run-append port:mysql_select
@@ -58,25 +59,23 @@
archcheck.files lib/libz.dylib lib/libwrap.dylib
post-extract {
- file mkdir ${worksrcpath}/build_macports/macports
+ file mkdir ${cmake.build_dir}/macports
copy ${filespath}/macports-default.cnf \
${filespath}/my.cnf \
- ${worksrcpath}/build_macports/macports/
+ ${cmake.build_dir}/macports/
}
post-patch {
reinplace "s|@NAME@|${name_mysql}|g" \
${worksrcpath}/cmake/install_layout.cmake
reinplace "s|@NAME@|${name_mysql}|g" \
- ${worksrcpath}/build_macports/macports/macports-default.cnf \
- ${worksrcpath}/build_macports/macports/my.cnf
+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
reinplace "s|@PREFIX@|${prefix}|g" \
- ${worksrcpath}/build_macports/macports/macports-default.cnf \
- ${worksrcpath}/build_macports/macports/my.cnf
+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
}
- configure.cmd cmake ..
- configure.dir ${worksrcpath}/build_macports
configure.args-delete \
-DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
configure.args-append \
@@ -99,9 +98,8 @@
-DWITH_SSL:STRING=no \
-DMYSQL_MAINTAINER_MODE:STRING=AUTO
- build.dir ${worksrcpath}/build_macports
post-build {
- set dirs ${worksrcpath}/build_macports
+ set dirs ${cmake.build_dir}
foreach dir ${dirs} {
reinplace -E {s|-arch [a-z0-9_]+||g} \
${dir}/scripts/mysql_config \
@@ -126,11 +124,11 @@
}
xinstall -m 755 -o root -d \
${destroot}${prefix}/etc/${name_mysql}
- copy ${worksrcpath}/build_macports/macports/macports-default.cnf \
+ copy ${cmake.build_dir}/macports/macports-default.cnf \
${destroot}${prefix}/etc/${name_mysql}/
xinstall -m 755 -o root -d \
${destroot}${prefix}/share/${name_mysql}/support-files/macports
- copy ${worksrcpath}/build_macports/macports/my.cnf \
+ copy ${cmake.build_dir}/macports/my.cnf \
${destroot}${prefix}/share/${name_mysql}/support-files/macports/
}
Modified: trunk/dports/databases/mariadb-10.0/files/mariadb-10.0
===================================================================
--- trunk/dports/databases/mariadb-10.0/files/mariadb-10.0 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mariadb-10.0/files/mariadb-10.0 2015-06-04 03:49:33 UTC (rev 137069)
@@ -14,7 +14,9 @@
lib/mariadb-10.0/bin/mysql_client_test
-
lib/mariadb-10.0/bin/mysql_config
+-
lib/mariadb-10.0/bin/mysql_convert_table_format
+lib/mariadb-10.0/bin/mysql_embedded
lib/mariadb-10.0/bin/mysql_find_rows
lib/mariadb-10.0/bin/mysql_fix_extensions
-
Modified: trunk/dports/databases/mariadb-10.1/Portfile
===================================================================
--- trunk/dports/databases/mariadb-10.1/Portfile 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mariadb-10.1/Portfile 2015-06-04 03:49:33 UTC (rev 137069)
@@ -5,7 +5,7 @@
name mariadb-10.1
set name_mysql ${name}
-version 10.1.0
+version 10.1.4
set version_branch [join [lrange [split ${version} .] 0 1] .]
# Please set revision_client and revision_server to 0 if you bump version.
set revision_client 0
@@ -24,8 +24,9 @@
revision ${revision_client}
license GPL-2
- description (Beta version) Multithreaded SQL database server
- long_description (Beta version) Mariadb is a fork of the MySQL server, a multi-threaded SQL database.
+ description (Warning: Alpha version) Multithreaded SQL database server
+ long_description (Warning: Alpha version) Mariadb is a fork of the MySQL server, a \
+ multi-threaded SQL database.
master_sites \
http://ftp.osuosl.org/pub/mariadb/mariadb-${version}/source/ \
@@ -40,15 +41,20 @@
http://mirror.switch.ch/mirror/mariadb/mariadb-${version}/source/
distname mariadb-${version}
+ cmake.out_of_source yes
use_parallel_build yes
patch.pre_args -p1
patchfiles patch-cmake-install_layout.cmake.diff \
patch-CMakeLists.txt.diff
- checksums rmd160 83126e28b37cb51daedc99cacbd30df842fab2f3 \
- sha256 994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521
+ # Upstream issue MDEV-8073 fix
+ # https://mariadb.atlassian.net/browse/MDEV-8073
+ patchfiles-append patch-sql-mdl.cc.diff
+ checksums rmd160 07d5ff5d48cc85093655c6af3579f6be61416df9 \
+ sha256 14cc92414b2c3822923977a6fb544593498dbb5005044db33c193511757d411c
+
depends_lib-append port:zlib port:tcp_wrappers port:ncurses
depends_run-append port:mysql_select
@@ -58,25 +64,23 @@
archcheck.files lib/libz.dylib lib/libwrap.dylib
post-extract {
- file mkdir ${worksrcpath}/build_macports/macports
+ file mkdir ${cmake.build_dir}/macports
copy ${filespath}/macports-default.cnf \
${filespath}/my.cnf \
- ${worksrcpath}/build_macports/macports/
+ ${cmake.build_dir}/macports/
}
post-patch {
reinplace "s|@NAME@|${name_mysql}|g" \
${worksrcpath}/cmake/install_layout.cmake
reinplace "s|@NAME@|${name_mysql}|g" \
- ${worksrcpath}/build_macports/macports/macports-default.cnf \
- ${worksrcpath}/build_macports/macports/my.cnf
+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
reinplace "s|@PREFIX@|${prefix}|g" \
- ${worksrcpath}/build_macports/macports/macports-default.cnf \
- ${worksrcpath}/build_macports/macports/my.cnf
+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
}
- configure.cmd cmake ..
- configure.dir ${worksrcpath}/build_macports
configure.args-delete \
-DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
configure.args-append \
@@ -91,7 +95,7 @@
-DWITH_ZLIB:STRING=system \
-DWITH_UNIT_TESTS:BOOL=ON \
-DWITHOUT_OQGRAPH_STORAGE_ENGINE:BOOL=ON \
- -DWITHOUT_TOKUDB_STORAGE_ENGINE:BOOL=ON \
+ -DPLUGIN_TOKUDB:STRING=NO \
-DENABLE_GCOV:BOOL=OFF \
-DENABLE_DTRACE:BOOL=OFF \
-DWITH_READLINE:BOOL=ON \
@@ -99,9 +103,8 @@
-DWITH_SSL:STRING=no \
-DMYSQL_MAINTAINER_MODE:STRING=AUTO
- build.dir ${worksrcpath}/build_macports
post-build {
- set dirs ${worksrcpath}/build_macports
+ set dirs ${cmake.build_dir}
foreach dir ${dirs} {
reinplace -E {s|-arch [a-z0-9_]+||g} \
${dir}/scripts/mysql_config \
@@ -126,11 +129,11 @@
}
xinstall -m 755 -o root -d \
${destroot}${prefix}/etc/${name_mysql}
- copy ${worksrcpath}/build_macports/macports/macports-default.cnf \
+ copy ${cmake.build_dir}/macports/macports-default.cnf \
${destroot}${prefix}/etc/${name_mysql}/
xinstall -m 755 -o root -d \
${destroot}${prefix}/share/${name_mysql}/support-files/macports
- copy ${worksrcpath}/build_macports/macports/my.cnf \
+ copy ${cmake.build_dir}/macports/my.cnf \
${destroot}${prefix}/share/${name_mysql}/support-files/macports/
}
@@ -200,8 +203,8 @@
"
livecheck.type regex
- livecheck.url https://downloads.mariadb.org/mariadb/
- livecheck.regex "btn-large\" href=\"/mariadb/(\[^/\]+)/\">"
+ livecheck.url https://downloads.mariadb.org
+ livecheck.regex "btn-large\" href=\"/mariadb/(${version_branch}\[^/\]+)/\">"
}
subport ${name_mysql}-server {
Modified: trunk/dports/databases/mariadb-10.1/files/mariadb-10.1
===================================================================
--- trunk/dports/databases/mariadb-10.1/files/mariadb-10.1 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mariadb-10.1/files/mariadb-10.1 2015-06-04 03:49:33 UTC (rev 137069)
@@ -14,7 +14,9 @@
lib/mariadb-10.1/bin/mysql_client_test
-
lib/mariadb-10.1/bin/mysql_config
+-
lib/mariadb-10.1/bin/mysql_convert_table_format
+lib/mariadb-10.1/bin/mysql_embedded
lib/mariadb-10.1/bin/mysql_find_rows
lib/mariadb-10.1/bin/mysql_fix_extensions
-
Added: trunk/dports/databases/mariadb-10.1/files/patch-sql-mdl.cc.diff
===================================================================
--- trunk/dports/databases/mariadb-10.1/files/patch-sql-mdl.cc.diff (rev 0)
+++ trunk/dports/databases/mariadb-10.1/files/patch-sql-mdl.cc.diff 2015-06-04 03:49:33 UTC (rev 137069)
@@ -0,0 +1,44 @@
+diff --git a/sql/mdl.cc b/sql/mdl.cc
+index fcb03d6..55e39d0 100644
+--- a/sql/mdl.cc
++++ b/sql/mdl.cc
+@@ -346,6 +346,7 @@ class MDL_lock
+ */
+ struct MDL_scoped_lock : public MDL_lock_strategy
+ {
++ MDL_scoped_lock() {}
+ virtual const bitmap_t *incompatible_granted_types_bitmap() const
+ { return m_granted_incompatible; }
+ virtual const bitmap_t *incompatible_waiting_types_bitmap() const
+@@ -382,6 +383,7 @@ class MDL_lock
+ */
+ struct MDL_object_lock : public MDL_lock_strategy
+ {
++ MDL_object_lock() {}
+ virtual const bitmap_t *incompatible_granted_types_bitmap() const
+ { return m_granted_incompatible; }
+ virtual const bitmap_t *incompatible_waiting_types_bitmap() const
+@@ -741,8 +743,8 @@ MDL_lock* MDL_map::find_or_insert(LF_PINS *pins, const MDL_key *mdl_key)
+ }
+
+ retry:
+- while (!(lock= (MDL_lock*) lf_hash_search_using_hash_value(&m_locks, pins,
+- mdl_key->hash_value(), mdl_key->ptr(), mdl_key->length())))
++ while (!(lock= (MDL_lock*) lf_hash_search(&m_locks, pins, mdl_key->ptr(),
++ mdl_key->length())))
+ if (lf_hash_insert(&m_locks, pins, (uchar*) mdl_key) == -1)
+ return NULL;
+
+@@ -780,10 +782,8 @@ MDL_map::get_lock_owner(LF_PINS *pins, const MDL_key *mdl_key)
+ }
+ else
+ {
+- lock= (MDL_lock*) lf_hash_search_using_hash_value(&m_locks, pins,
+- mdl_key->hash_value(),
+- mdl_key->ptr(),
+- mdl_key->length());
++ lock= (MDL_lock*) lf_hash_search(&m_locks, pins, mdl_key->ptr(),
++ mdl_key->length());
+ if (lock)
+ {
+ /*
Modified: trunk/dports/databases/mysql51/Portfile
===================================================================
--- trunk/dports/databases/mysql51/Portfile 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mysql51/Portfile 2015-06-04 03:49:33 UTC (rev 137069)
@@ -5,9 +5,9 @@
name mysql51
set name_mysql ${name}
-version 5.1.72
+version 5.1.73
# Set revision_client and revision_server to 0 if you bump version.
-set revision_client 1
+set revision_client 0
set revision_server 0
set version_branch [join [lrange [split ${version} .] 0 1] .]
categories databases
@@ -43,8 +43,8 @@
patchfiles patch-Makefile.in.diff \
patch-scripts-mysql_secure_installation.sh.diff
- checksums rmd160 a5ba8bedf4027af90a4612a1a7f3a848999cfbf5 \
- sha256 c414a64722ffa89d315152a030661d34764894e293e33792809cea61c8a5303e
+ checksums rmd160 ceee36663abbf135d3ddbebe52ebc537ecba25a6 \
+ sha256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5
depends_lib port:zlib port:tcp_wrappers
depends_run port:mysql_select
@@ -208,7 +208,7 @@
livecheck.type regex
livecheck.url http://dev.mysql.com/downloads/mysql/${version_branch}.html
- livecheck.regex "<h1>MySQL Community Server (${version_branch}(\.\[0-9.\]+)?)</h1>"
+ livecheck.regex "MySQL Community Server (${version_branch}(\.\[0-9.\]+)?)"
}
subport ${name_mysql}-server {
Modified: trunk/dports/databases/mysql51/files/mysql51
===================================================================
--- trunk/dports/databases/mysql51/files/mysql51 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mysql51/files/mysql51 2015-06-04 03:49:33 UTC (rev 137069)
@@ -14,7 +14,9 @@
lib/mysql51/bin/mysql_client_test
lib/mysql51/bin/mysql_client_test_embedded
lib/mysql51/bin/mysql_config
+-
lib/mysql51/bin/mysql_convert_table_format
+lib/mysql51/bin/mysql_embedded
lib/mysql51/bin/mysql_find_rows
lib/mysql51/bin/mysql_fix_extensions
lib/mysql51/bin/mysql_fix_privilege_tables
Modified: trunk/dports/databases/mysql55/Portfile
===================================================================
--- trunk/dports/databases/mysql55/Portfile 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mysql55/Portfile 2015-06-04 03:49:33 UTC (rev 137069)
@@ -5,7 +5,7 @@
name mysql55
set name_mysql ${name}
-version 5.5.42
+version 5.5.44
# Set revision_client and revision_server to 0 if you bump version.
set revision_client 0
set revision_server 0
@@ -36,8 +36,8 @@
patch.pre_args -p1
patchfiles patch-cmake-install_layout.cmake.diff
- checksums rmd160 6dc47c5a885439a99585a0a8225a8e234a19e12e \
- sha256 887b12676be4893fa833e4a585c6c8b0c0f18dee30ba7d22cfe860cd85bfc74a
+ checksums rmd160 72faecbd2cae73ac109253e4a512086e74058128 \
+ sha256 85f05b257db39e63c82ff4b5ce4e0c6d2b07560b5fc1646d47d7ae48eab3e5de
depends_lib-append port:zlib port:tcp_wrappers
depends_run-append port:mysql_select
@@ -48,21 +48,21 @@
archcheck.files lib/libz.dylib lib/libwrap.dylib
post-extract {
- file mkdir ${configure.dir}/macports
+ file mkdir ${cmake.build_dir}/macports
copy ${filespath}/macports-default.cnf \
${filespath}/my.cnf \
- ${configure.dir}/macports/
+ ${cmake.build_dir}/macports/
}
post-patch {
reinplace "s|@NAME@|${name_mysql}|g" \
${worksrcpath}/cmake/install_layout.cmake
reinplace "s|@NAME@|${name_mysql}|g" \
- ${configure.dir}/macports/macports-default.cnf \
- ${configure.dir}/macports/my.cnf
+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
reinplace "s|@PREFIX@|${prefix}|g" \
- ${configure.dir}/macports/macports-default.cnf \
- ${configure.dir}/macports/my.cnf
+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
}
configure.args-delete \
@@ -86,7 +86,8 @@
-DWITH_SSL:STRING=no
post-build {
- foreach dir ${configure.dir} {
+ set dirs ${cmake.build_dir}
+ foreach dir ${dirs} {
reinplace -E {s|-arch [a-z0-9_]+||g} \
${dir}/scripts/mysql_config \
${dir}/scripts/mysqlbug
@@ -110,11 +111,11 @@
}
xinstall -m 755 -o root -d \
${destroot}${prefix}/etc/${name_mysql}
- copy ${configure.dir}/macports/macports-default.cnf \
+ copy ${cmake.build_dir}/macports/macports-default.cnf \
${destroot}${prefix}/etc/${name_mysql}/
xinstall -m 755 -o root -d \
${destroot}${prefix}/share/${name_mysql}/support-files/macports
- copy ${configure.dir}/macports/my.cnf \
+ copy ${cmake.build_dir}/macports/my.cnf \
${destroot}${prefix}/share/${name_mysql}/support-files/macports/
}
Modified: trunk/dports/databases/mysql55/files/mysql55
===================================================================
--- trunk/dports/databases/mysql55/files/mysql55 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mysql55/files/mysql55 2015-06-04 03:49:33 UTC (rev 137069)
@@ -14,7 +14,9 @@
lib/mysql55/bin/mysql_client_test
-
lib/mysql55/bin/mysql_config
+-
lib/mysql55/bin/mysql_convert_table_format
+lib/mysql55/bin/mysql_embedded
lib/mysql55/bin/mysql_find_rows
lib/mysql55/bin/mysql_fix_extensions
-
Modified: trunk/dports/databases/mysql56/Portfile
===================================================================
--- trunk/dports/databases/mysql56/Portfile 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mysql56/Portfile 2015-06-04 03:49:33 UTC (rev 137069)
@@ -6,7 +6,7 @@
name mysql56
set name_mysql ${name}
-version 5.6.24
+version 5.6.25
# Set revision_client, revision_server and revision_innodb_memcached_plugin to 0 on
# version bump.
set revision_client 0
@@ -59,8 +59,8 @@
configure.compiler gcc
}
- checksums rmd160 cc1b8e7347e3b0bc0c94a35c1611d1cb82f80799 \
- sha256 37e27305b67d76883c5902dce59c89d596beee9dca7dbadd4a2e117f8101dfeb
+ checksums rmd160 a65b1aa209cb2f08295db7cb7259a7ce294c0713 \
+ sha256 15079c0b83d33a092649cbdf402c9225bcd3f33e87388407be5cdbf1432c7fbd
depends_lib-append port:zlib port:tcp_wrappers
depends_run-append port:mysql_select
@@ -71,21 +71,21 @@
archcheck.files lib/libz.dylib lib/libwrap.dylib
post-extract {
- file mkdir ${configure.dir}/macports
+ file mkdir ${cmake.build_dir}/macports
copy ${filespath}/macports-default.cnf \
${filespath}/my.cnf \
- ${configure.dir}/macports/
+ ${cmake.build_dir}/macports/
}
post-patch {
reinplace "s|@NAME@|${name_mysql}|g" \
${worksrcpath}/cmake/install_layout.cmake
reinplace "s|@NAME@|${name_mysql}|g" \
- ${configure.dir}/macports/macports-default.cnf \
- ${configure.dir}/macports/my.cnf
+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
reinplace "s|@PREFIX@|${prefix}|g" \
- ${configure.dir}/macports/macports-default.cnf \
- ${configure.dir}/macports/my.cnf
+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
reinplace "s|@SYSCONFDIR@|/etc/${name_mysql}|g" \
${worksrcpath}/scripts/mysql_install_db.pl.in
reinplace "s|@SUPPORTFILESDIR@|share/${name_mysql}/support-files|g" \
@@ -133,11 +133,11 @@
}
xinstall -m 755 -o root -d \
${destroot}${prefix}/etc/${name_mysql}
- copy ${configure.dir}/macports/macports-default.cnf \
+ copy ${cmake.build_dir}/macports/macports-default.cnf \
${destroot}${prefix}/etc/${name_mysql}/
xinstall -m 755 -o root -d \
${destroot}${prefix}/share/${name_mysql}/support-files/macports
- copy ${configure.dir}/macports/my.cnf \
+ copy ${cmake.build_dir}/macports/my.cnf \
${destroot}${prefix}/share/${name_mysql}/support-files/macports/
# Remove file supplied by ${name_mysql}-innodb-memcached-plugin subport.
delete ${destroot}${prefix}/share/${name_mysql}/innodb_memcached_config.sql
Modified: trunk/dports/databases/mysql56/files/mysql56
===================================================================
--- trunk/dports/databases/mysql56/files/mysql56 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mysql56/files/mysql56 2015-06-04 03:49:33 UTC (rev 137069)
@@ -14,7 +14,9 @@
lib/mysql56/bin/mysql_client_test
-
lib/mysql56/bin/mysql_config
+lib/mysql56/bin/mysql_config_editor
lib/mysql56/bin/mysql_convert_table_format
+lib/mysql56/bin/mysql_embedded
lib/mysql56/bin/mysql_find_rows
lib/mysql56/bin/mysql_fix_extensions
-
Modified: trunk/dports/databases/mysql_select/files/base
===================================================================
--- trunk/dports/databases/mysql_select/files/base 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mysql_select/files/base 2015-06-04 03:49:33 UTC (rev 137069)
@@ -14,7 +14,9 @@
bin/mysql_client_test
bin/mysql_client_test_embedded
bin/mysql_config
+bin/mysql_config_editor
bin/mysql_convert_table_format
+bin/mysql_embedded
bin/mysql_find_rows
bin/mysql_fix_extensions
bin/mysql_fix_privilege_tables
Modified: trunk/dports/databases/mysql_select/files/none
===================================================================
--- trunk/dports/databases/mysql_select/files/none 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mysql_select/files/none 2015-06-04 03:49:33 UTC (rev 137069)
@@ -139,3 +139,5 @@
-
-
-
+-
+-
Modified: trunk/dports/databases/percona/Portfile
===================================================================
--- trunk/dports/databases/percona/Portfile 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/percona/Portfile 2015-06-04 03:49:33 UTC (rev 137069)
@@ -6,10 +6,10 @@
name percona
set name_mysql ${name}
set name_package ${name}-server
-set version_mysql 5.6.23
-set release 72.1
+set version_mysql 5.6.24
+set release 72.2
# Please set revision_client and revision_server to 0 if you bump version_mysql or release.
-set revision_client 1
+set revision_client 0
set revision_server 0
version ${version_mysql}-${release}
categories databases
@@ -32,27 +32,19 @@
long_description Percona is a fork of the MySQL server, a multi-threaded SQL database.
master_sites \
- http://www.percona.com/redir/downloads/Percona-Server-${version_branch}/Percona-Server-${version}/source/tarball/:src \
- http://form.percona.com/rs/percona/images/:pdf
+ http://www.percona.com/redir/downloads/Percona-Server-${version_branch}/Percona-Server-${version}/source/tarball
distname ${name_package}-${version}
+ cmake.out_of_source yes
distfiles ${distname}${extract.suffix}:src
use_parallel_build yes
patch.pre_args -p1
patchfiles patch-cmake-install_layout.cmake.diff
- checksums ${distname}${extract.suffix} \
- rmd160 bfc92bb84ca8027ecec9fefb9fbadebf0e06c6da \
- sha256 5382630b98dd05f72e372ede5535ddcad2e389b594311a69f03a3d95f68d4907 \
+ checksums rmd160 1309841316b8b2a472d8b862020878271e5635fc \
+ sha256 5aa6469f3a55fe0fd1cfe315f2f9cacb0ce318620086c93821c9000d6e25c0de
-# set manual_distfile "PerconaServer-${version} manual.pdf"
-# extract.only ${distname}${extract.suffix}
-# distfiles-append ${manual_distfile}:pdf
-# checksums-append ${manual_distfile} \
-# rmd160 b8040e186bc12079a2f66e0bd02db2bed8d35712 \
-# sha256 6a0195663e7a1e52ed558e2f814d9f06c5455fbe8cca2abd97a68ac20e384ba5
-
depends_lib-append port:zlib port:tcp_wrappers
depends_run-append port:mysql_select
@@ -62,23 +54,21 @@
archcheck.files lib/libz.dylib lib/libwrap.dylib
post-extract {
- file mkdir ${worksrcpath}/build_macports/macports
+ file mkdir ${cmake.build_dir}/macports
copy ${filespath}/macports-default.cnf \
${filespath}/my.cnf \
- ${worksrcpath}/build_macports/macports/
-# copy ${distpath}/${manual_distfile} \
-# ${worksrcpath}/build_macports/macports/
+ ${cmake.build_dir}/macports/
}
post-patch {
reinplace "s|@NAME@|${name_mysql}|g" \
${worksrcpath}/cmake/install_layout.cmake
reinplace "s|@NAME@|${name_mysql}|g" \
- ${worksrcpath}/build_macports/macports/macports-default.cnf \
- ${worksrcpath}/build_macports/macports/my.cnf
+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
reinplace "s|@PREFIX@|${prefix}|g" \
- ${worksrcpath}/build_macports/macports/macports-default.cnf \
- ${worksrcpath}/build_macports/macports/my.cnf
+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
}
if { (![variant_isset universal] && ${build_arch} eq "i386") || ([variant_isset universal] && [lsearch ${universal_archs} i386] != -1) } {
@@ -86,9 +76,6 @@
# closest to SET(CMAKE_CXX_COMPILER g++) removed in the patchfile
configure.compiler gcc
}
- configure.cmd cmake ..
- configure.dir ${worksrcpath}/build_macports
- build.dir ${worksrcpath}/build_macports
configure.args-delete \
-DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
@@ -104,14 +91,13 @@
-DWITH_UNIT_TESTS:BOOL=ON \
-DENABLE_GCOV:BOOL=OFF \
-DENABLE_DTRACE:BOOL=OFF \
- -DWITH_READLINE:BOOL=ON \
- -DWITH_LIBEDIT:BOOL=OFF \
+ -DWITH_EDITLINE:STRING=bundled \
-DWITH_LIBWRAP:BOOL=ON \
-DWITH_SSL:STRING=bundled \
-DWITH_EMBEDDED_SERVER:BOOL=ON
post-build {
- set dirs ${worksrcpath}/build_macports
+ set dirs ${cmake.build_dir}
foreach dir ${dirs} {
reinplace -E {s|-arch [a-z0-9_]+||g} \
${dir}/scripts/mysql_config \
@@ -136,14 +122,12 @@
}
xinstall -m 755 -o root -d \
${destroot}${prefix}/etc/${name_mysql}
- copy ${worksrcpath}/build_macports/macports/macports-default.cnf \
+ copy ${cmake.build_dir}/macports/macports-default.cnf \
${destroot}${prefix}/etc/${name_mysql}/
xinstall -m 755 -o root -d \
${destroot}${prefix}/share/${name_mysql}/support-files/macports
- copy ${worksrcpath}/build_macports/macports/my.cnf \
+ copy ${cmake.build_dir}/macports/my.cnf \
${destroot}${prefix}/share/${name_mysql}/support-files/macports/
-# copy ${worksrcpath}/build_macports/macports/${manual_distfile} \
-# ${destroot}${prefix}/share/doc/${name_mysql}/
}
post-install {
@@ -190,8 +174,8 @@
# "-DWITH_READLINE:BOOL=OFF" has the peculiar meaning "do not use the bundled copy
# of readline but use the system's (i.e. MacPorts') copy of readline"
depends_lib-append port:readline
- configure.args-delete -DWITH_READLINE:BOOL=ON
- configure.args-append -DWITH_READLINE:BOOL=OFF
+ configure.args-delete -DWITH_EDITLINE:STRING=bundled
+ configure.args-append -DWITH_READLINE:STRING=system
archcheck.files-append lib/libreadline.dylib
}
Modified: trunk/dports/databases/percona/files/percona
===================================================================
--- trunk/dports/databases/percona/files/percona 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/percona/files/percona 2015-06-04 03:49:33 UTC (rev 137069)
@@ -14,7 +14,9 @@
lib/percona/bin/mysql_client_test
-
lib/percona/bin/mysql_config
+lib/percona/bin/mysql_config_editor
lib/percona/bin/mysql_convert_table_format
+lib/percona/bin/mysql_embedded
lib/percona/bin/mysql_find_rows
lib/percona/bin/mysql_fix_extensions
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150603/e9c0f350/attachment-0001.html>
More information about the macports-changes
mailing list