[59788] trunk/dports/databases/mysql5
ryandesign at macports.org
ryandesign at macports.org
Thu Oct 22 01:57:03 PDT 2009
Revision: 59788
http://trac.macports.org/changeset/59788
Author: ryandesign at macports.org
Date: 2009-10-22 01:57:01 -0700 (Thu, 22 Oct 2009)
Log Message:
-----------
mysql5: update to 5.1.40 (closes #19414) and bring over relevant changes from mysql5-devel (closes #14142)
Modified Paths:
--------------
trunk/dports/databases/mysql5/Portfile
Added Paths:
-----------
trunk/dports/databases/mysql5/files/patch-Makefile.in.diff
Modified: trunk/dports/databases/mysql5/Portfile
===================================================================
--- trunk/dports/databases/mysql5/Portfile 2009-10-22 08:54:02 UTC (rev 59787)
+++ trunk/dports/databases/mysql5/Portfile 2009-10-22 08:57:01 UTC (rev 59788)
@@ -4,7 +4,7 @@
name mysql5
conflicts mysql5-devel mysql4
-version 5.0.86
+version 5.1.40
set branch [join [lrange [split ${version} .] 0 1] .]
homepage http://www.mysql.com/
categories databases
@@ -14,6 +14,9 @@
distname mysql-${version}
use_parallel_build yes
+# http://bugs.mysql.com/bug.php?id=47360
+universal_variant no
+
description \
Multithreaded SQL database server
@@ -24,16 +27,16 @@
master_sites \
http://mysql.mirrors.pair.com/Downloads/MySQL-${branch}/ \
http://mysql.he.net/Downloads/MySQL-${branch}/ \
- http://mysql.orst.edu/Downloads/MySQL-${branch} \
- http://mysql.oss.eznetsols.org/Downloads/MySQL-${branch}/ \
http://mirrors.sunsite.dk/mysql/Downloads/MySQL-${branch}/ \
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-${branch}/ \
- http://ftp.plusline.de/mysql/Downloads/MySQL-${branch}/
+ http://ftp.plusline.de/mysql/Downloads/MySQL-${branch}/ \
+ http://www.innodb.com/download/innodb_plugin/:plugin
checksums \
- md5 c1f746bfbc8c2cb3ec1e0427a8a88c55 \
- sha1 b26680b91187165676d75e1d42fe06c8996fd43f \
- rmd160 1b0a0ef878004d7667995a59c884430d4711be68
+ [suffix ${distname}] \
+ md5 32e7373c16271606007374396e6742ad \
+ sha1 00b600763b4659d9e0256ea6dcce378175aa8d9e \
+ rmd160 330722fc012777c53933d6803d51a3f1b92d9892
depends_lib \
port:zlib \
@@ -48,6 +51,7 @@
set mysqluser mysql
patchfiles \
+ patch-Makefile.in.diff \
patch-mysql_secure_installation.sh.diff
post-patch {
@@ -64,13 +68,15 @@
--datadir=${prefix}/share/${mysql} \
--sysconfdir=${sysconfdir} \
--with-zlib-dir=${prefix} \
- --with-openssl=${prefix} \
+ --with-ssl=${prefix} \
--with-extra-charsets=complex \
- --with-federated-storage-engine \
--with-unix-socket-path=${prefix}/var/run/${mysql}/mysqld.sock \
--with-mysqld-user=${mysqluser} \
- --without-bench \
+ --without-docs \
+ --with-plugins=all \
--enable-thread-safe-client
+# the following is in store for future
+# --program-suffix=5
# Add readline support.
# "--without-readline" has the peculiar meaning "do not use the bundled copy
@@ -78,20 +84,49 @@
depends_lib-append port:readline
configure.args-append --without-readline
+# Build libmysqld embedded server
+configure.cflags-append -fPIC
+configure.cxxflags-append -fPIC
+configure.args-append --with-embedded-server --with-pic
+
+post-configure {
+ reinplace "s;openssl_includes = -I;openssl_includes_includes = -I${prefix}/include/openssl;" ${worksrcpath}/tests/Makefile
+}
+
variant server description "Obsolete; install ${mysql}-server port instead" {
pre-configure {
ui_msg "The +server variant is obsolete. Please install the ${mysql}-server port instead."
}
}
+set plugin_version 1.0.4
+set plugin_distname innodb_plugin-${plugin_version}
+set plugin_distfile [suffix ${plugin_distname}]
+set plugin_worksrcdir ${plugin_distname}
+set plugin_worksrcpath ${workpath}/${plugin_worksrcdir}
+set innobase_dir storage/innobase
+
+variant innodb_plugin description "Install the InnoDB plugin Early Adopter release ${plugin_version}" {
+ distfiles-append ${plugin_distfile}:plugin
+
+ checksums-append \
+ ${plugin_distfile} \
+ md5 4350ba7c1520edce35635f982449efb3 \
+ sha1 c39e2a9cfa18b9f103c930d0c4a8edced81ed4ee \
+ rmd160 bd0467a10781677a7a7bb2e58ad38e0a43841d7f
+
+ post-extract {
+ delete ${worksrcpath}/${innobase_dir}
+ move ${plugin_worksrcpath} ${worksrcpath}/${innobase_dir}
+ }
+}
+
pre-destroot {
xinstall -m 755 -d ${destroot}${sysconfdir}
destroot.keepdirs-append ${destroot}${sysconfdir}
}
post-destroot {
- delete ${destroot}${prefix}/mysql-test
-
# Fix paths in manpages and sample configuration files
foreach manpage [glob -type f ${destroot}${prefix}/share/man/man\[1-9\]/*] {
reinplace "s|/etc/my.cnf|${sysconfdir}/my.cnf|g" ${manpage}
@@ -107,5 +142,5 @@
}
livecheck.type regex
-livecheck.url http://dev.mysql.com/doc/refman/${branch}/en/releasenotes-cs-[strsed ${branch} {s/\./-/}].html
-livecheck.regex {Changes in MySQL ([0-9.]+)}
+livecheck.url http://dev.mysql.com/
+livecheck.regex "(5\\.1\\.\[0-9\.\]+)"
Copied: trunk/dports/databases/mysql5/files/patch-Makefile.in.diff (from rev 59782, trunk/dports/databases/mysql5-devel/files/patch-Makefile.in.diff)
===================================================================
--- trunk/dports/databases/mysql5/files/patch-Makefile.in.diff (rev 0)
+++ trunk/dports/databases/mysql5/files/patch-Makefile.in.diff 2009-10-22 08:57:01 UTC (rev 59788)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2009-10-06 12:57:22.000000000 -0500
++++ Makefile.in 2009-10-22 01:36:36.000000000 -0500
+@@ -412,7 +412,7 @@
+ @sql_union_dirs@ unittest \
+ @sql_server@ @man_dirs@ tests \
+ netware @libmysqld_dirs@ \
+- mysql-test support-files sql-bench @tools_dirs@ \
++ support-files @tools_dirs@ \
+ win
+
+ DIST_SUBDIRS = . include Docs zlib \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091022/c5fdfb40/attachment.html>
More information about the macports-changes
mailing list