[92370] trunk/dports/databases/mysql55
pixilla at macports.org
pixilla at macports.org
Thu Apr 26 11:55:16 PDT 2012
Revision: 92370
https://trac.macports.org/changeset/92370
Author: pixilla at macports.org
Date: 2012-04-26 11:55:16 -0700 (Thu, 26 Apr 2012)
Log Message:
-----------
databases/mysql55:
- Upgrade version to 5.5.23.
- Fix notes. Closes #33775
- No longer conflicts with mysql5.
- Add macports-default.cnf with skip-networking.
Modified Paths:
--------------
trunk/dports/databases/mysql55/Portfile
trunk/dports/databases/mysql55/files/mysql55
Modified: trunk/dports/databases/mysql55/Portfile
===================================================================
--- trunk/dports/databases/mysql55/Portfile 2012-04-26 17:58:29 UTC (rev 92369)
+++ trunk/dports/databases/mysql55/Portfile 2012-04-26 18:55:16 UTC (rev 92370)
@@ -4,13 +4,11 @@
PortSystem 1.0
name mysql55
-# Fixme: Subdir mysql5.
-# Conflict due to mysqld_safe finding mysql5 ports ${prefix}/libexec/mysqld.
-conflicts mysql5
-version 5.5.21
-revision 1
+set name_mysql ${name}
+version 5.5.23
categories databases
platforms darwin
+license GPL-2
maintainers pixilla openmaintainer
if {$subport == $name} {
@@ -37,14 +35,13 @@
distname mysql-${version}
- dist_subdir mysql5
use_parallel_build yes
patch.pre_args -p1
patchfiles patch-cmake-install_layout.cmake.diff
- checksums rmd160 d31c1be22ac80f1c95e8f28c41ec1c82cba995cd \
- sha256 2471fedc42bafb8210f7ff132172f6f57933f9727cc61d98197a91cfbfdf78cd
+ checksums rmd160 1c5b086be0b8f5e1f3128c160e1e4814f68dac95 \
+ sha256 20a6303e281ac7875997c6c5e34b1129a02d1fb3f886b8ccb2c7b958cd67746a
depends_lib-append port:zlib \
port:readline \
@@ -55,7 +52,6 @@
select.file ${filespath}/${name}
archcheck.files lib/libz.dylib \
- lib/libssl.dylib \
lib/libreadline.dylib
post-patch {
@@ -110,13 +106,12 @@
# Fix paths in sample configuration files
reinplace "s|/etc/my.cnf|${prefix}/etc/${name}/my.cnf|g" ${samp_conffile}
}
-
}
post-install {
- if {![file exists ${prefix}/etc/LaunchDaemons/org.macports.${name}/org.macports.${name}.plist]} {
- ui_msg "The MySQL client has been installed."
- ui_msg "If you also want a MySQL server, install the mysql5-server port."
+ if {![file exists ${prefix}/etc/LaunchDaemons/org.macports.${name}/org.macports.${name}-server.plist]} {
+ ui_msg "The ${name} client has been installed."
+ ui_msg "To install the ${name} server, install the ${name}-server port."
}
}
@@ -125,6 +120,7 @@
license-append OpenSSL SSLeay
depends_lib-append port:openssl
configure.args-append -DWITH_SSL:STRING=ON
+ archcheck.files-append lib/libssl.dylib
}
livecheck.type regex
@@ -132,18 +128,18 @@
livecheck.url http://dev.mysql.com/
livecheck.regex "<a href=\"http://dev.mysql.com/downloads/mysql/\[^\"\]+\">(${branch}(\.\[0-9.\]+)?)\[^<\]*</a>"
}
-subport mysql55-server {
- license BSD
- description Multithreaded SQL database server
- long_description MySQL is an open-source, multi-threaded SQL database with a command \
- syntax very similar to mSQL.
+subport ${name_mysql}-server {
+
+ revision 1
+ license BSD
+ description Run ${name_mysql} as server
+ long_description ${description}
- homepage http://www.mysql.com/
- supported_archs noarch
+ supported_archs noarch
distfiles
- depends_run port:${name}
+ depends_run port:${name_mysql}
if {"darwin" == ${os.platform} && ${os.major} > 8} {
set mysqluser _mysql
@@ -153,30 +149,51 @@
add_users ${mysqluser} group=${mysqluser} realname=MySQL\ Server
startupitem.create yes
- startupitem.name ${name}
- startupitem.start "${prefix}/share/${name}/support-files/mysql.server start"
- startupitem.stop "${prefix}/share/${name}/support-files/mysql.server stop"
+ startupitem.executable ${prefix}/lib/${name_mysql}/bin/mysqld --user=${mysqluser}
- use_configure no
+ use_configure no
build {}
destroot {
xinstall -m 755 -o root -d ${destroot}${prefix}/var/run
xinstall -m 755 -o ${mysqluser} -g ${mysqluser} -d \
- ${destroot}${prefix}/var/db/${name} \
- ${destroot}${prefix}/var/log/${name} \
- ${destroot}${prefix}/var/run/${name}
+ ${destroot}${prefix}/etc/${name_mysql} \
+ ${destroot}${prefix}/var/db/${name_mysql} \
+ ${destroot}${prefix}/var/log/${name_mysql} \
+ ${destroot}${prefix}/var/run/${name_mysql}
destroot.keepdirs-append \
- ${destroot}${prefix}/var/db/${name} \
- ${destroot}${prefix}/var/log/${name} \
- ${destroot}${prefix}/var/run/${name}
+ ${destroot}${prefix}/var/db/${name_mysql} \
+ ${destroot}${prefix}/var/log/${name_mysql} \
+ ${destroot}${prefix}/var/run/${name_mysql}
+ set fp [open "${destroot}${prefix}/etc/${name_mysql}/macports-default.cnf" "w"]
+ puts $fp "# WARNING! ANY CHANGES TO THIS FILE WILL BE LOST ON UNINSTALL/UPGRADES!"
+ puts $fp "# Make your changes to ${prefix}/etc/${name_mysql}/my.cnf"
+ puts $fp "# YOU HAVE BEEN WARNED!"
+ puts $fp ""
+ puts $fp "# MacPorts default options"
+ puts $fp "\[mysqld\]"
+ puts $fp "# skip-networking so multple mysql server ports can be loaded"
+ puts $fp "# without each competing for port 3306."
+ puts $fp "# One can always put the servers on different ports and"
+ puts $fp "# remove or comment this option."
+ puts $fp "skip-networking"
+ close $fp
}
+ post-activate {
+ if {![file exists ${prefix}/etc/${name_mysql}/my.cnf]} {
+ set fp [open "${prefix}/etc/${name_mysql}/my.cnf" "w"]
+ puts $fp "# Use default MacPorts settings"
+ puts $fp "!include ${prefix}/etc/${name_mysql}/macports-default.cnf"
+ close $fp
+ }
+ }
+
notes "
If this is a new install you might want to run:
- \$ sudo -u ${mysqluser} mysql_install_db5
+ \$ sudo -u ${mysqluser} ${prefix}/lib/${name_mysql}/scripts/mysql_install_db
"
Modified: trunk/dports/databases/mysql55/files/mysql55
===================================================================
--- trunk/dports/databases/mysql55/files/mysql55 2012-04-26 17:58:29 UTC (rev 92369)
+++ trunk/dports/databases/mysql55/files/mysql55 2012-04-26 18:55:16 UTC (rev 92370)
@@ -17,6 +17,7 @@
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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120426/6604bc98/attachment.html>
More information about the macports-changes
mailing list