[60732] trunk/dports/databases

[ryandesign at macports.org]

Revision: 60732
          http://trac.macports.org/changeset/60732
Author:   ryandesign at macports.org
Date:     2009-11-20 23:42:31 -0800 (Fri, 20 Nov 2009)
Log Message:
-----------
mysql5:

 * update to 5.1.41
 * add no_embedded_server variant; use this if you don't need the embedded libmysqld server but do want a universal variant
 * remove innodb_plugin variant; this was integrated into the MySQL source some time ago and is now enabled by editing your my.cnf

Modified Paths:
--------------
    trunk/dports/databases/mysql5/Portfile
    trunk/dports/databases/mysql5-server/Portfile

Modified: trunk/dports/databases/mysql5/Portfile
===================================================================
--- trunk/dports/databases/mysql5/Portfile	2009-11-21 06:54:08 UTC (rev 60731)
+++ trunk/dports/databases/mysql5/Portfile	2009-11-21 07:42:31 UTC (rev 60732)
@@ -4,7 +4,7 @@
 
 name                    mysql5
 conflicts               mysql5-devel mysql4
-version                 5.1.40
+version                 5.1.41
 set branch              [join [lrange [split ${version} .] 0 1] .]
 homepage                http://www.mysql.com/
 categories              databases
@@ -14,9 +14,6 @@
 distname                mysql-${version}
 use_parallel_build      yes
 
-# http://bugs.mysql.com/bug.php?id=47360
-universal_variant       no
-
 description \
     Multithreaded SQL database server
 
@@ -29,14 +26,12 @@
     http://mysql.he.net/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://www.innodb.com/download/innodb_plugin/:plugin
+    http://ftp.plusline.de/mysql/Downloads/MySQL-${branch}/
 
 checksums \
-    [suffix ${distname}] \
-        md5     32e7373c16271606007374396e6742ad \
-        sha1    00b600763b4659d9e0256ea6dcce378175aa8d9e \
-        rmd160  330722fc012777c53933d6803d51a3f1b92d9892
+    md5     b5d39e8789174753f3c782959729e68c \
+    sha1    04f7cf87419ca233c2508c2912d72548767b7e2c \
+    rmd160  f99d17a2bb43fc45222c7015a3b65c6b4f686129
 
 depends_lib \
     port:zlib \
@@ -89,37 +84,21 @@
 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
+variant no_embedded_server description {Don't build the libmysqld embedded server (thereby allowing a universal build)} {}
+if {![variant_isset no_embedded_server]} {
+    # Build libmysqld embedded server.
+    configure.cflags-append -fPIC
+    configure.cxxflags-append -fPIC
+    configure.args-append --with-embedded-server --with-pic
+    
+    # http://bugs.mysql.com/bug.php?id=47360
+    universal_variant no
+}
 
 post-configure {
     reinplace "s;openssl_includes = -I;openssl_includes_includes = -I${prefix}/include/openssl;" ${worksrcpath}/tests/Makefile
 }
 
-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 "Use the InnoDB Plugin ${plugin_version} instead of the built-in InnoDB support" {
-    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}

Modified: trunk/dports/databases/mysql5-server/Portfile
===================================================================
--- trunk/dports/databases/mysql5-server/Portfile	2009-11-21 06:54:08 UTC (rev 60731)
+++ trunk/dports/databases/mysql5-server/Portfile	2009-11-21 07:42:31 UTC (rev 60732)
@@ -3,7 +3,7 @@
 PortSystem              1.0
 
 name                    mysql5-server
-version                 5.1.40
+version                 5.1.41
 set branch              [join [lrange [split ${version} .] 0 1] .]
 homepage                http://www.mysql.com/
 categories              databases
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091120/fa9f5321/attachment.html>