[94746] trunk/dports/databases/mysql55
pixilla at macports.org
pixilla at macports.org
Thu Jun 28 07:55:31 PDT 2012
Revision: 94746
https://trac.macports.org/changeset/94746
Author: pixilla at macports.org
Date: 2012-06-28 07:55:30 -0700 (Thu, 28 Jun 2012)
Log Message:
-----------
databases/mysql55:
- Update version to 5.5.25.
- Update mysql select file.
- Move macports-default.cnf file from mysql55-server port to mysql55 port.
Modified Paths:
--------------
trunk/dports/databases/mysql55/Portfile
trunk/dports/databases/mysql55/files/mysql55
trunk/dports/databases/mysql55/files/patch-configure.cmake.diff
Added Paths:
-----------
trunk/dports/databases/mysql55/files/macports-default.cnf
trunk/dports/databases/mysql55/files/my.cnf
Modified: trunk/dports/databases/mysql55/Portfile
===================================================================
--- trunk/dports/databases/mysql55/Portfile 2012-06-28 14:02:16 UTC (rev 94745)
+++ trunk/dports/databases/mysql55/Portfile 2012-06-28 14:55:30 UTC (rev 94746)
@@ -5,10 +5,10 @@
name mysql55
set name_mysql ${name}
-version 5.5.24
+version 5.5.25
# Please set revision_client and revision_server to 0 if you bump version.
-set revision_client 3
-set revision_server 1
+set revision_client 0
+set revision_server 0
categories databases
platforms darwin
license GPL-2
@@ -34,35 +34,49 @@
http://mirrors.sunsite.dk/mysql/Downloads/MySQL-${branch}/ \
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-${branch}/ \
http://mirror.facebook.net/mysql/Downloads/MySQL-${branch}/ \
- http://ftp.plusline.de/mysql/Downloads/MySQL-${branch}/
+ http://ftp.plusline.de/mysql/Downloads/MySQL-${branch}/ \
+ http://mysql.mirrors.pair.com/Downloads/MySQL-${branch}/
-# This mirror has a bad distfile for version 5.5.23
-# http://mysql.mirrors.pair.com/Downloads/MySQL-${branch}/ \
-
distname mysql-${version}
use_parallel_build yes
patch.pre_args -p1
- patchfiles patch-cmake-install_layout.cmake.diff \
- patch-configure.cmake.diff
-# http://bugs.mysql.com/bug.php?id=65050
+ patchfiles patch-cmake-install_layout.cmake.diff
- checksums rmd160 8a6cf0ff40d7b21bb9bb2fab82d0695574e6f2f9 \
- sha256 41e687dfec416a8b50d8d550899346c0e7096fe1200228cce24ed8daf3a779c6
+ checksums rmd160 c1833c1126523a6f9ce2f12d5d407ec897957c64 \
+ sha256 af7c52e0936daf39035f644858ff4db9bea9aa1bbea1a85f7e9476217abd3aed
depends_lib-append port:zlib \
port:cmake
- depends_run port:mysql_select
+ depends_run-append port:mysql_select
select.group mysql
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|@NAME@|${name_mysql}|g" ${worksrcpath}/cmake/install_layout.cmake
+ 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
+ reinplace "s|@PREFIX@|${prefix}|g" \
+ ${worksrcpath}/build_macports/macports/macports-default.cnf \
+ ${worksrcpath}/build_macports/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 \
@@ -75,16 +89,16 @@
-DDEFAULT_COLLATION:STRING=utf8_general_ci \
-DWITH_EMBEDDED_SERVER:BOOL=OFF \
-DWITH_ZLIB:STRING=system \
- -DWITH_UNIT_TESTS:BOOL=OFF \
+ -DWITH_UNIT_TESTS:BOOL=ON \
-DENABLE_GCOV:BOOL=OFF \
-DENABLE_DTRACE:BOOL=OFF \
-DWITH_READLINE:BOOL=ON \
-DWITH_LIBEDIT:BOOL=OFF \
- -DWITH_LIBWRAP:BOOL=ON
+ -DWITH_LIBWRAP:BOOL=ON \
+ -DWITH_SSL:STRING=no
-
post-build {
- set dirs ${worksrcpath}
+ set dirs ${worksrcpath}/build_macports
foreach dir ${dirs} {
reinplace -E {s|-arch [a-z0-9_]+||g} \
${dir}/scripts/mysql_config \
@@ -92,11 +106,6 @@
}
}
- pre-destroot {
- xinstall -m 755 -d ${destroot}${prefix}/etc/${name_mysql}
- destroot.keepdirs-append ${destroot}${prefix}/etc/${name_mysql}
- }
-
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.
@@ -112,6 +121,14 @@
# Fix paths in sample configuration files
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 {
@@ -121,10 +138,31 @@
}
}
+ 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.5.25] < 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} {
depends_lib-append port:openssl
- configure.args-append -DWITH_SSL:STRING=ON
+ configure.args-delete -DWITH_SSL:STRING=no
+ configure.args-append -DWITH_SSL:STRING=system
archcheck.files-append lib/libssl.dylib
}
@@ -172,7 +210,8 @@
build {}
destroot {
- xinstall -m 755 -o root -d ${destroot}${prefix}/var/run
+ 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} \
@@ -182,30 +221,8 @@
${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:
Added: trunk/dports/databases/mysql55/files/macports-default.cnf
===================================================================
--- trunk/dports/databases/mysql55/files/macports-default.cnf (rev 0)
+++ trunk/dports/databases/mysql55/files/macports-default.cnf 2012-06-28 14:55:30 UTC (rev 94746)
@@ -0,0 +1,11 @@
+# WARNING! ANY CHANGES TO THIS FILE WILL BE LOST ON UNINSTALL/UPGRADES!
+# Make your changes to @PREFIX@/etc/@NAME@/my.cnf
+# YOU HAVE BEEN WARNED!
+
+# MacPorts default options
+[mysqld]
+# skip-networking so multple mysql server ports can be loaded
+# without each competing for port 3306.
+# One can always put the servers on different ports and
+# remove or comment this option.
+skip-networking
Added: trunk/dports/databases/mysql55/files/my.cnf
===================================================================
--- trunk/dports/databases/mysql55/files/my.cnf (rev 0)
+++ trunk/dports/databases/mysql55/files/my.cnf 2012-06-28 14:55:30 UTC (rev 94746)
@@ -0,0 +1,2 @@
+# Use default MacPorts settings
+!include @PREFIX@/etc/@NAME@/macports-default.cnf
Modified: trunk/dports/databases/mysql55/files/mysql55
===================================================================
--- trunk/dports/databases/mysql55/files/mysql55 2012-06-28 14:02:16 UTC (rev 94745)
+++ trunk/dports/databases/mysql55/files/mysql55 2012-06-28 14:55:30 UTC (rev 94746)
@@ -17,8 +17,8 @@
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
@@ -32,16 +32,38 @@
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
@@ -65,6 +87,7 @@
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
@@ -89,8 +112,30 @@
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
+-
+-
+-
+-
Modified: trunk/dports/databases/mysql55/files/patch-configure.cmake.diff
===================================================================
--- trunk/dports/databases/mysql55/files/patch-configure.cmake.diff 2012-06-28 14:02:16 UTC (rev 94745)
+++ trunk/dports/databases/mysql55/files/patch-configure.cmake.diff 2012-06-28 14:55:30 UTC (rev 94746)
@@ -1,13 +0,0 @@
---- a/configure.cmake 2012-05-16 14:16:44.000000000 -0700
-+++ b/configure.cmake 2012-05-16 14:17:49.000000000 -0700
-@@ -149,7 +149,9 @@
- SET(CMAKE_REQUIRED_LIBRARIES
- ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
-
-- LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
-+ IF(CMAKE_REQUIRED_LIBRARIES)
-+ LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
-+ ENDIF()
- LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT})
-
- OPTION(WITH_LIBWRAP "Compile with tcp wrappers support" OFF)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120628/4aaf9016/attachment.html>
More information about the macports-changes
mailing list