[107196] trunk/dports/databases
pixilla at macports.org
pixilla at macports.org
Thu Jun 20 20:32:52 PDT 2013
Revision: 107196
https://trac.macports.org/changeset/107196
Author: pixilla at macports.org
Date: 2013-06-20 20:32:52 -0700 (Thu, 20 Jun 2013)
Log Message:
-----------
databases/mysql56:
- Add new mysql56 and mysql56-server ports. Closes #37976
Modified Paths:
--------------
trunk/dports/databases/mysql56/Portfile
trunk/dports/databases/mysql56/files/patch-cmake-install_layout.cmake.diff
Added Paths:
-----------
trunk/dports/databases/mysql56/
trunk/dports/databases/mysql56/files/mysql56
trunk/dports/databases/mysql56/files/patch-scripts-mysql_install_db.pl.in.diff
Removed Paths:
-------------
trunk/dports/databases/mysql56/files/mysql55
Modified: trunk/dports/databases/mysql56/Portfile
===================================================================
--- trunk/dports/databases/mysql55/Portfile 2012-12-31 05:18:42 UTC (rev 100888)
+++ trunk/dports/databases/mysql56/Portfile 2013-06-21 03:32:52 UTC (rev 107196)
@@ -3,11 +3,11 @@
PortSystem 1.0
-name mysql55
+name mysql56
set name_mysql ${name}
-version 5.5.28
+version 5.6.12
# Please set revision_client and revision_server to 0 if you bump version.
-set revision_client 2
+set revision_client 0
set revision_server 0
categories databases
platforms darwin
@@ -43,9 +43,14 @@
patch.pre_args -p1
patchfiles patch-cmake-install_layout.cmake.diff
- checksums rmd160 dbd2a75a2b55e54f5216d0ea1376b97fd7a107de \
- sha256 f9b2491f1ddd99842a8e75c21958368bebe59c47e84bec778baa915e255cc78f
+ # Fix some mysql_install_db paths.
+ # Using reinplace since mysql_install_db.pl.in appears broken with regard to using SYSCONDIR
+ # and SUPPORTFILESDIR.
+ patchfiles-append patch-scripts-mysql_install_db.pl.in.diff
+ checksums rmd160 0088072e353f21fe0b079fe7c26500c822c76819 \
+ sha256 1153c1e0ae94116c150be5f173c336a80471b5ed4642a682b8462d36d54d5817
+
depends_lib-append port:zlib port:tcp_wrappers
depends_run-append port:mysql_select
@@ -70,6 +75,10 @@
reinplace "s|@PREFIX@|${prefix}|g" \
${worksrcpath}/build_macports/macports/macports-default.cnf \
${worksrcpath}/build_macports/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" \
+ ${worksrcpath}/scripts/mysql_install_db.pl.in
}
configure.cmd cmake ..
@@ -89,12 +98,11 @@
-DWITH_EMBEDDED_SERVER:BOOL=ON \
-DWITH_ZLIB:STRING=system \
-DWITH_UNIT_TESTS:BOOL=ON \
+ -DENABLE_DOWNLOADS:BOOL=OFF \
-DENABLE_GCOV:BOOL=OFF \
-DENABLE_DTRACE:BOOL=OFF \
- -DWITH_READLINE:BOOL=ON \
- -DWITH_LIBEDIT:BOOL=OFF \
-DWITH_LIBWRAP:BOOL=ON \
- -DWITH_SSL:STRING=no
+ -DWITH_SSL:STRING=bundled
post-build {
set dirs ${worksrcpath}/build_macports
@@ -156,28 +164,21 @@
}
}
- variant openssl description {Enable OpenSSL support} {
-
+ variant openssl description {Enable OpenSSL support} {}
+ # Until yassl builds use MacPorts openssl.
+ # Getting mysql56 to build with yassl would make the binaries distributable.
+ # When mysql56 builds with yassl remove "true" from the "if" statement below or
+ # put the contents of the "if" block into the openssl variant block.
+ if { true || [variant_isset openssl] } {
+ configure.args-delete -DWITH_SSL:STRING=bundled
+ configure.args-append -DWITH_SSL:STRING=${prefix}
depends_lib-append port:openssl
- configure.args-delete -DWITH_SSL:STRING=no
- configure.args-append -DWITH_SSL:STRING=system
archcheck.files-append lib/libssl.dylib
}
- variant system_readline description {Use system readline instead of bundled readline} {
-
- # Add readline support.
- # "-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
- archcheck.files-append lib/libreadline.dylib
- }
-
livecheck.type regex
- livecheck.url http://dev.mysql.com/
- livecheck.regex "<a href=\"http://dev.mysql.com/downloads/mysql/\[^\"\]+\">(${version_branch}(\.\[0-9.\]+)?)\[^<\]*</a>"
+ livecheck.url http://dev.mysql.com/downloads/mysql/${version_branch}/?current_os=src
+ livecheck.regex "mysql-(${version_branch}(\.\[0-9.\]+)?)\\${extract.suffix}"
}
subport ${name_mysql}-server {
Deleted: trunk/dports/databases/mysql56/files/mysql55
===================================================================
--- trunk/dports/databases/mysql55/files/mysql55 2012-12-31 05:18:42 UTC (rev 100888)
+++ trunk/dports/databases/mysql56/files/mysql55 2013-06-21 03:32:52 UTC (rev 107196)
@@ -1,141 +0,0 @@
--
--
--
--
--
-lib/mysql55/bin/innochecksum
-lib/mysql55/bin/msql2mysql
-lib/mysql55/bin/my_print_defaults
-lib/mysql55/bin/myisam_ftdump
-lib/mysql55/bin/myisamchk
-lib/mysql55/bin/myisamlog
-lib/mysql55/bin/myisampack
-lib/mysql55/bin/mysql
-lib/mysql55/bin/mysql_client_test
--
-lib/mysql55/bin/mysql_config
-lib/mysql55/bin/mysql_convert_table_format
-lib/mysql55/bin/mysql_find_rows
-lib/mysql55/bin/mysql_fix_extensions
--
-lib/mysql55/bin/mysql_install_db
-lib/mysql55/bin/mysql_plugin
-lib/mysql55/bin/mysql_secure_installation
-lib/mysql55/bin/mysql_setpermission
-lib/mysql55/bin/mysql_tzinfo_to_sql
-lib/mysql55/bin/mysql_upgrade
-lib/mysql55/bin/mysql_waitpid
-lib/mysql55/bin/mysql_zap
-lib/mysql55/bin/mysqlaccess
-lib/mysql55/bin/mysqlaccess.conf
-lib/mysql55/bin/mysqladmin
-lib/mysql55/bin/mysqlbinlog
-lib/mysql55/bin/mysqlbug
-lib/mysql55/bin/mysqlcheck
-lib/mysql55/bin/mysqld
-lib/mysql55/bin/mysqld_multi
-lib/mysql55/bin/mysqld_safe
-lib/mysql55/bin/mysqldump
-lib/mysql55/bin/mysqldumpslow
-lib/mysql55/bin/mysqlhotcopy
-lib/mysql55/bin/mysqlimport
--
-lib/mysql55/bin/mysqlshow
-lib/mysql55/bin/mysqlslap
-lib/mysql55/bin/mysqltest
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-lib/mysql55/bin/perror
-lib/mysql55/bin/replace
-lib/mysql55/bin/resolve_stack_dump
-lib/mysql55/bin/resolveip
--
-share/man/mysql55/man1/comp_err.1.gz
-share/man/mysql55/man1/innochecksum.1.gz
-share/man/mysql55/man1/msql2mysql.1.gz
-share/man/mysql55/man1/my_print_defaults.1.gz
-share/man/mysql55/man1/myisam_ftdump.1.gz
-share/man/mysql55/man1/myisamchk.1.gz
-share/man/mysql55/man1/myisamlog.1.gz
-share/man/mysql55/man1/myisampack.1.gz
-share/man/mysql55/man1/mysql-stress-test.pl.1.gz
-share/man/mysql55/man1/mysql-test-run.pl.1.gz
-share/man/mysql55/man1/mysql.1.gz
-share/man/mysql55/man1/mysql.server.1.gz
-share/man/mysql55/man1/mysql_client_test.1.gz
-share/man/mysql55/man1/mysql_client_test_embedded.1.gz
-share/man/mysql55/man1/mysql_config.1.gz
-share/man/mysql55/man1/mysql_convert_table_format.1.gz
-share/man/mysql55/man1/mysql_find_rows.1.gz
-share/man/mysql55/man1/mysql_fix_extensions.1.gz
--
-share/man/mysql55/man1/mysql_install_db.1.gz
-share/man/mysql55/man1/mysql_plugin.1.gz
-share/man/mysql55/man1/mysql_secure_installation.1.gz
-share/man/mysql55/man1/mysql_setpermission.1.gz
-share/man/mysql55/man1/mysql_tzinfo_to_sql.1.gz
-share/man/mysql55/man1/mysql_upgrade.1.gz
-share/man/mysql55/man1/mysql_waitpid.1.gz
-share/man/mysql55/man1/mysql_zap.1.gz
-share/man/mysql55/man1/mysqlaccess.1.gz
-share/man/mysql55/man1/mysqladmin.1.gz
-share/man/mysql55/man1/mysqlbinlog.1.gz
-share/man/mysql55/man1/mysqlbug.1.gz
-share/man/mysql55/man1/mysqlcheck.1.gz
-share/man/mysql55/man1/mysqld_multi.1.gz
-share/man/mysql55/man1/mysqld_safe.1.gz
-share/man/mysql55/man1/mysqldump.1.gz
-share/man/mysql55/man1/mysqldumpslow.1.gz
-share/man/mysql55/man1/mysqlhotcopy.1.gz
-share/man/mysql55/man1/mysqlimport.1.gz
-share/man/mysql55/man1/mysqlman.1.gz
-share/man/mysql55/man1/mysqlshow.1.gz
-share/man/mysql55/man1/mysqlslap.1.gz
-share/man/mysql55/man1/mysqltest.1.gz
-share/man/mysql55/man1/mysqltest_embedded.1.gz
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-share/man/mysql55/man1/perror.1.gz
-share/man/mysql55/man1/replace.1.gz
-share/man/mysql55/man1/resolve_stack_dump.1.gz
-share/man/mysql55/man1/resolveip.1.gz
-share/man/mysql55/man8/mysqld.8.gz
--
--
--
--
Copied: trunk/dports/databases/mysql56/files/mysql56 (from rev 100888, trunk/dports/databases/mysql55/files/mysql55)
===================================================================
--- trunk/dports/databases/mysql56/files/mysql56 (rev 0)
+++ trunk/dports/databases/mysql56/files/mysql56 2013-06-21 03:32:52 UTC (rev 107196)
@@ -0,0 +1,141 @@
+-
+-
+-
+-
+-
+lib/mysql56/bin/innochecksum
+lib/mysql56/bin/msql2mysql
+lib/mysql56/bin/my_print_defaults
+lib/mysql56/bin/myisam_ftdump
+lib/mysql56/bin/myisamchk
+lib/mysql56/bin/myisamlog
+lib/mysql56/bin/myisampack
+lib/mysql56/bin/mysql
+lib/mysql56/bin/mysql_client_test
+-
+lib/mysql56/bin/mysql_config
+lib/mysql56/bin/mysql_convert_table_format
+lib/mysql56/bin/mysql_find_rows
+lib/mysql56/bin/mysql_fix_extensions
+-
+lib/mysql56/bin/mysql_install_db
+lib/mysql56/bin/mysql_plugin
+lib/mysql56/bin/mysql_secure_installation
+lib/mysql56/bin/mysql_setpermission
+lib/mysql56/bin/mysql_tzinfo_to_sql
+lib/mysql56/bin/mysql_upgrade
+lib/mysql56/bin/mysql_waitpid
+lib/mysql56/bin/mysql_zap
+lib/mysql56/bin/mysqlaccess
+lib/mysql56/bin/mysqlaccess.conf
+lib/mysql56/bin/mysqladmin
+lib/mysql56/bin/mysqlbinlog
+lib/mysql56/bin/mysqlbug
+lib/mysql56/bin/mysqlcheck
+lib/mysql56/bin/mysqld
+lib/mysql56/bin/mysqld_multi
+lib/mysql56/bin/mysqld_safe
+lib/mysql56/bin/mysqldump
+lib/mysql56/bin/mysqldumpslow
+lib/mysql56/bin/mysqlhotcopy
+lib/mysql56/bin/mysqlimport
+-
+lib/mysql56/bin/mysqlshow
+lib/mysql56/bin/mysqlslap
+lib/mysql56/bin/mysqltest
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+lib/mysql56/bin/perror
+lib/mysql56/bin/replace
+lib/mysql56/bin/resolve_stack_dump
+lib/mysql56/bin/resolveip
+-
+share/man/mysql56/man1/comp_err.1.gz
+share/man/mysql56/man1/innochecksum.1.gz
+share/man/mysql56/man1/msql2mysql.1.gz
+share/man/mysql56/man1/my_print_defaults.1.gz
+share/man/mysql56/man1/myisam_ftdump.1.gz
+share/man/mysql56/man1/myisamchk.1.gz
+share/man/mysql56/man1/myisamlog.1.gz
+share/man/mysql56/man1/myisampack.1.gz
+share/man/mysql56/man1/mysql-stress-test.pl.1.gz
+share/man/mysql56/man1/mysql-test-run.pl.1.gz
+share/man/mysql56/man1/mysql.1.gz
+share/man/mysql56/man1/mysql.server.1.gz
+share/man/mysql56/man1/mysql_client_test.1.gz
+share/man/mysql56/man1/mysql_client_test_embedded.1.gz
+share/man/mysql56/man1/mysql_config.1.gz
+share/man/mysql56/man1/mysql_convert_table_format.1.gz
+share/man/mysql56/man1/mysql_find_rows.1.gz
+share/man/mysql56/man1/mysql_fix_extensions.1.gz
+-
+share/man/mysql56/man1/mysql_install_db.1.gz
+share/man/mysql56/man1/mysql_plugin.1.gz
+share/man/mysql56/man1/mysql_secure_installation.1.gz
+share/man/mysql56/man1/mysql_setpermission.1.gz
+share/man/mysql56/man1/mysql_tzinfo_to_sql.1.gz
+share/man/mysql56/man1/mysql_upgrade.1.gz
+share/man/mysql56/man1/mysql_waitpid.1.gz
+share/man/mysql56/man1/mysql_zap.1.gz
+share/man/mysql56/man1/mysqlaccess.1.gz
+share/man/mysql56/man1/mysqladmin.1.gz
+share/man/mysql56/man1/mysqlbinlog.1.gz
+share/man/mysql56/man1/mysqlbug.1.gz
+share/man/mysql56/man1/mysqlcheck.1.gz
+share/man/mysql56/man1/mysqld_multi.1.gz
+share/man/mysql56/man1/mysqld_safe.1.gz
+share/man/mysql56/man1/mysqldump.1.gz
+share/man/mysql56/man1/mysqldumpslow.1.gz
+share/man/mysql56/man1/mysqlhotcopy.1.gz
+share/man/mysql56/man1/mysqlimport.1.gz
+share/man/mysql56/man1/mysqlman.1.gz
+share/man/mysql56/man1/mysqlshow.1.gz
+share/man/mysql56/man1/mysqlslap.1.gz
+share/man/mysql56/man1/mysqltest.1.gz
+share/man/mysql56/man1/mysqltest_embedded.1.gz
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+share/man/mysql56/man1/perror.1.gz
+share/man/mysql56/man1/replace.1.gz
+share/man/mysql56/man1/resolve_stack_dump.1.gz
+share/man/mysql56/man1/resolveip.1.gz
+share/man/mysql56/man8/mysqld.8.gz
+-
+-
+-
+-
Modified: trunk/dports/databases/mysql56/files/patch-cmake-install_layout.cmake.diff
===================================================================
--- trunk/dports/databases/mysql55/files/patch-cmake-install_layout.cmake.diff 2012-12-31 05:18:42 UTC (rev 100888)
+++ trunk/dports/databases/mysql56/files/patch-cmake-install_layout.cmake.diff 2013-06-21 03:32:52 UTC (rev 107196)
@@ -1,6 +1,6 @@
---- a/cmake/install_layout.cmake 2012-03-15 07:14:58.000000000 -0700
-+++ b/cmake/install_layout.cmake 2012-03-17 08:44:13.000000000 -0700
-@@ -68,7 +68,7 @@
+--- a/cmake/install_layout.cmake 2013-06-10 11:26:47.000000000 -0700
++++ b/cmake/install_layout.cmake 2013-06-10 12:37:09.000000000 -0700
+@@ -69,7 +69,7 @@
ENDIF()
SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}"
@@ -9,7 +9,7 @@
IF(UNIX)
IF(INSTALL_LAYOUT MATCHES "RPM")
-@@ -86,7 +86,7 @@
+@@ -87,7 +87,7 @@
SET(CMAKE_INSTALL_PREFIX ${default_prefix}
CACHE PATH "install prefix" FORCE)
ENDIF()
@@ -18,7 +18,7 @@
LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
IF(ind EQUAL -1)
MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
-@@ -214,6 +214,31 @@
+@@ -222,6 +222,31 @@
SET(INSTALL_MYSQLDATADIR_SVR4 "/var/lib/mysql")
SET(INSTALL_PLUGINTESTDIR_SVR4 ${plugin_tests})
Added: trunk/dports/databases/mysql56/files/patch-scripts-mysql_install_db.pl.in.diff
===================================================================
--- trunk/dports/databases/mysql56/files/patch-scripts-mysql_install_db.pl.in.diff (rev 0)
+++ trunk/dports/databases/mysql56/files/patch-scripts-mysql_install_db.pl.in.diff 2013-06-21 03:32:52 UTC (rev 107196)
@@ -0,0 +1,15 @@
+--- a/scripts/mysql_install_db.pl.in 2013-06-20 08:22:33.000000000 -0700
++++ b/scripts/mysql_install_db.pl.in 2013-06-20 19:36:15.000000000 -0700
+@@ -428,10 +428,10 @@
+ # This will be the default config file
+ # ----------------------------------------------------------------------
+
+-$config_file= "$basedir/my.cnf";
++$config_file= '$basedir at SYSCONFDIR@/my.cnf';
+
+ my $cfg_template= find_in_basedir($opt,"file","my-default.cnf",
+- "share","share/mysql","support-files");
++ '@SUPPORTFILESDIR@',"share","share/mysql","support-files");
+ -e $cfg_template or cannot_find_file("my-default.cnf");
+
+ $copy_cfg_file= $config_file;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130620/d0c61450/attachment-0001.html>
More information about the macports-changes
mailing list