macports/macports-ports
0
0
Fork 0
mirror of https://github.com/macports/macports-ports.git synced 2026-07-12 18:20:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

databases/mysql51:

Browse Source 
- Consistently use name_mysql.
- Fix port select mysql file.
- Bump revision past what is already on http://packages.macports.org.
- Remove mysql51-server installed macports-default.cnf file.

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@94673 d073be05-634f-4543-b044-5fe20cf6d1d6
This commit is contained in:
Bradley Giesbrecht
2012-06-26 18:27:23 +00:00
parent c04227f5e7
commit 35e5cd40ef
2 changed files with 109 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
databases/mysql51/Portfile
+64 -56
View File
@@ -7,8 +7,8 @@ name mysql51
set name_mysql ${name}
version 5.1.63
# Please set revision_client and revision_server to 0 if you bump version.
set revision_client 0
set revision_server 0
set revision_client 3
set revision_server 2
categories databases
platforms darwin
license GPL-2
@@ -61,29 +61,43 @@ if {$subport == $name} {
depends_run port:mysql_select
select.group mysql
select.file ${filespath}/${name}
select.file ${filespath}/${name_mysql}
archcheck.files lib/libz.dylib
post-extract {
file mkdir ${worksrcpath}/build_macports/macports
copy ${filespath}/macports-default.cnf \
${filespath}/my.cnf \
${worksrcpath}/build_macports/macports/
}
post-patch {
reinplace s%@BINDIR@%${prefix}/lib/${name}/bin%g ${worksrcpath}/scripts/mysql_secure_installation.sh
reinplace "s%@BINDIR@%${prefix}/lib/${name_mysql}/bin%g" \
${worksrcpath}/scripts/mysql_secure_installation.sh
reinplace "s|@NAME@|${name_mysql}|g" \
${worksrcpath}/build_macports/macports/macports-default.cnf \
${worksrcpath}/build_macports/macports/my.cnf
reinplace "s|@PREFIX@|${prefix}|g" \
${worksrcpath}/build_macports/macports/macports-default.cnf \
${worksrcpath}/build_macports/macports/my.cnf
}
configure.args \
--bindir=${prefix}/lib/${name}/bin \
--sbindir=${prefix}/lib/${name}/bin \
--libexecdir=${prefix}/lib/${name}/bin \
--sysconfdir=${prefix}/etc/${name} \
--localstatedir=${prefix}/var/db/${name} \
--libdir=${prefix}/lib/${name} \
--includedir=${prefix}/include/${name} \
--datarootdir=${prefix}/share/${name} \
--infodir=${prefix}/share/info/${name} \
--mandir=${prefix}/share/man/${name} \
--bindir=${prefix}/lib/${name_mysql}/bin \
--sbindir=${prefix}/lib/${name_mysql}/bin \
--libexecdir=${prefix}/lib/${name_mysql}/bin \
--sysconfdir=${prefix}/etc/${name_mysql} \
--localstatedir=${prefix}/var/db/${name_mysql} \
--libdir=${prefix}/lib/${name_mysql} \
--includedir=${prefix}/include/${name_mysql} \
--datarootdir=${prefix}/share/${name_mysql} \
--infodir=${prefix}/share/info/${name_mysql} \
--mandir=${prefix}/share/man/${name_mysql} \
--with-zlib-dir=${prefix} \
--without-ssl \
--with-extra-charsets=complex \
--with-unix-socket-path=${prefix}/var/run/${name}/mysqld.sock \
--with-unix-socket-path=${prefix}/var/run/${name_mysql}/mysqld.sock \
--with-mysqld-user=${mysqluser} \
--without-docs \
--with-plugins=all \
@@ -117,38 +131,60 @@ if {$subport == $name} {
}
}
pre-destroot {
xinstall -m 755 -d ${destroot}${prefix}/etc/${name}
destroot.keepdirs-append ${destroot}${prefix}/etc/${name}
}
post-destroot {
# proc portdestroot::destroot_finish fails to find and compress our man pages
# so borrow the compress command and run on our files now.
set manpath "${destroot}${prefix}/share/man"
set gzip [findBinary gzip ${portutil::autoconf::gzip_path}]
foreach manpage [glob -type f ${destroot}${prefix}/share/man/${name}/man\[1-9\]/*] {
foreach manpage [glob -type f ${destroot}${prefix}/share/man/${name_mysql}/man\[1-9\]/*] {
# Fix paths in manpages
reinplace "s|/etc/|${prefix}/etc/${name}/|g" ${manpage}
reinplace "s|/etc/|${prefix}/etc/${name_mysql}/|g" ${manpage}
# Compress all manpages with gzip
system "$gzip -9vf ${manpage}"
}
foreach samp_conffile [glob -type f ${destroot}${prefix}/share/${name}/mysql/my-*.cnf] {
foreach samp_conffile [glob -type f ${destroot}${prefix}/share/${name_mysql}/mysql/my-*.cnf] {
# Fix paths in sample configuration files
reinplace "s|/etc/my.cnf|${prefix}/etc/${name}/my.cnf|g" ${samp_conffile}
reinplace "s|/etc/my.cnf|${prefix}/etc/${name_mysql}/my.cnf|g" ${samp_conffile}
}
xinstall -m 755 -o root -d \
${destroot}${prefix}/etc/${name_mysql}
copy ${worksrcpath}/build_macports/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 \
${destroot}${prefix}/share/${name_mysql}/support-files/macports/
}
post-install {
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."
if {![file exists ${prefix}/etc/LaunchDaemons/org.macports.${name_mysql}/org.macports.${name_mysql}-server.plist]} {
ui_msg "The ${name_mysql} client has been installed."
ui_msg "To install the ${name_mysql} server, install the ${name_mysql}-server port."
}
}
pre-activate {
if { [file exists ${prefix}/etc/${name_mysql}/macports-default.cnf]
&& ![catch {set vers [lindex [registry_active ${name_mysql}-server] 0]}]
&& [vercmp [lindex $vers 1] 5.1.63] < 0 } {
set deactivate_proc registry_deactivate_composite
if {[info commands registry_deactivate_composite] == {}} {
set deactivate_proc registry_deactivate
}
$deactivate_proc ${name_mysql}-server "" [list ports_nodepcheck 1]
}
}
post-activate {
if {![file exists ${prefix}/etc/${name_mysql}/my.cnf]} {
copy ${prefix}/share/${name_mysql}/support-files/macports/my.cnf \
${prefix}/etc/${name_mysql}/
}
}
variant openssl description {Enable OpenSSL support} {
license-append OpenSSL SSLeay
depends_lib-append port:openssl
configure.args-delete --without-ssl
configure.args-append --with-ssl=${prefix}
@@ -183,11 +219,6 @@ subport ${name_mysql}-server {
depends_run port:${name_mysql}
if {"darwin" == ${os.platform} && ${os.major} > 8} {
set mysqluser _mysql
} else {
set mysqluser mysql
}
add_users ${mysqluser} group=${mysqluser} realname=MySQL\ Server
startupitem.create yes
@@ -198,7 +229,6 @@ subport ${name_mysql}-server {
build {}
destroot {
xinstall -m 755 -o root -d ${destroot}${prefix}/var/run
xinstall -m 755 -o ${mysqluser} -g ${mysqluser} -d \
${destroot}${prefix}/etc/${name_mysql} \
${destroot}${prefix}/var/db/${name_mysql} \
@@ -208,28 +238,6 @@ subport ${name_mysql}-server {
${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 "
databases/mysql51/files/mysql51
+45
View File
@@ -32,16 +32,38 @@ lib/mysql51/bin/mysqladmin
lib/mysql51/bin/mysqlbinlog
lib/mysql51/bin/mysqlbug
lib/mysql51/bin/mysqlcheck
lib/mysql51/bin/mysqld
lib/mysql51/bin/mysqld_multi
lib/mysql51/bin/mysqld_safe
lib/mysql51/bin/mysqldump
lib/mysql51/bin/mysqldumpslow
lib/mysql51/bin/mysqlhotcopy
lib/mysql51/bin/mysqlimport
lib/mysql51/bin/mysqlmanager
lib/mysql51/bin/mysqlshow
lib/mysql51/bin/mysqlslap
lib/mysql51/bin/mysqltest
lib/mysql51/bin/mysqltest_embedded
lib/mysql51/bin/ndb_config
lib/mysql51/bin/ndb_cpcd
lib/mysql51/bin/ndb_delete_all
lib/mysql51/bin/ndb_desc
lib/mysql51/bin/ndb_drop_index
lib/mysql51/bin/ndb_drop_table
lib/mysql51/bin/ndb_error_reporter
lib/mysql51/bin/ndb_mgm
lib/mysql51/bin/ndb_mgmd
lib/mysql51/bin/ndb_print_backup_file
lib/mysql51/bin/ndb_print_schema_file
lib/mysql51/bin/ndb_print_sys_file
lib/mysql51/bin/ndb_restore
lib/mysql51/bin/ndb_select_all
lib/mysql51/bin/ndb_select_count
lib/mysql51/bin/ndb_show_tables
lib/mysql51/bin/ndb_size.pl
lib/mysql51/bin/ndb_test_platform
lib/mysql51/bin/ndb_waiter
lib/mysql51/bin/ndbd
lib/mysql51/bin/perror
lib/mysql51/bin/replace
lib/mysql51/bin/resolve_stack_dump
@@ -65,6 +87,7 @@ share/man/mysql51/man1/mysql_config.1.gz
share/man/mysql51/man1/mysql_convert_table_format.1.gz
share/man/mysql51/man1/mysql_find_rows.1.gz
share/man/mysql51/man1/mysql_fix_extensions.1.gz
share/man/mysql51/man1/mysql_fix_privilege_tables.1.gz
share/man/mysql51/man1/mysql_install_db.1.gz
-
share/man/mysql51/man1/mysql_secure_installation.1.gz
@@ -89,8 +112,30 @@ share/man/mysql51/man1/mysqlshow.1.gz
share/man/mysql51/man1/mysqlslap.1.gz
share/man/mysql51/man1/mysqltest.1.gz
share/man/mysql51/man1/mysqltest_embedded.1.gz
share/man/mysql51/man1/ndb_config.1.gz
share/man/mysql51/man1/ndb_cpcd.1.gz
share/man/mysql51/man1/ndb_delete_all.1.gz
share/man/mysql51/man1/ndb_desc.1.gz
share/man/mysql51/man1/ndb_drop_index.1.gz
share/man/mysql51/man1/ndb_drop_table.1.gz
share/man/mysql51/man1/ndb_error_reporter.1.gz
share/man/mysql51/man1/ndb_mgm.1.gz
share/man/mysql51/man1/ndb_print_backup_file.1.gz
share/man/mysql51/man1/ndb_print_schema_file.1.gz
share/man/mysql51/man1/ndb_print_sys_file.1.gz
share/man/mysql51/man1/ndb_restore.1.gz
share/man/mysql51/man1/ndb_select_all.1.gz
share/man/mysql51/man1/ndb_select_count.1.gz
share/man/mysql51/man1/ndb_show_tables.1.gz
share/man/mysql51/man1/ndb_size.pl.1.gz
share/man/mysql51/man1/ndb_waiter.1.gz
share/man/mysql51/man1/ndbd_redo_log_reader.1.gz
share/man/mysql51/man1/perror.1.gz
share/man/mysql51/man1/replace.1.gz
share/man/mysql51/man1/resolve_stack_dump.1.gz
share/man/mysql51/man1/resolveip.1.gz
share/man/mysql51/man8/mysqld.8.gz
share/man/mysql51/man8/mysqlmanager.8.gz
share/man/mysql51/man8/ndb_mgmd.8.gz
share/man/mysql51/man8/ndbd.8.gz
share/man/mysql51/man8/ndbmtd.8.gz