[63495] trunk/dports/databases

[ryandesign at macports.org]

Revision: 63495
          http://trac.macports.org/changeset/63495
Author:   ryandesign at macports.org
Date:     2010-02-06 01:40:10 -0800 (Sat, 06 Feb 2010)
Log Message:
-----------
mysql5-devel, mysql5-server-devel: update to 5.5.1-m2; remove no_embedded_server variant and use muniversal portgroup so we can build universal even when building the embedded server (#17300); remove post-configure block that doesn't seem right

Modified Paths:
--------------
    trunk/dports/databases/mysql5-devel/Portfile
    trunk/dports/databases/mysql5-devel/files/patch-Makefile.in.diff
    trunk/dports/databases/mysql5-devel/files/patch-mysql_secure_installation.sh.diff
    trunk/dports/databases/mysql5-server-devel/Portfile

Modified: trunk/dports/databases/mysql5-devel/Portfile
===================================================================
--- trunk/dports/databases/mysql5-devel/Portfile	2010-02-06 05:55:21 UTC (rev 63494)
+++ trunk/dports/databases/mysql5-devel/Portfile	2010-02-06 09:40:10 UTC (rev 63495)
@@ -3,10 +3,12 @@
 PortSystem              1.0
 PortGroup               archcheck 1.0
 
+# http://bugs.mysql.com/bug.php?id=47360
+PortGroup               muniversal 1.0
+
 name                    mysql5-devel
 conflicts               mysql5 mysql4
-version                 5.5.0-m2
-
+version                 5.5.1-m2
 set branch              [join [lrange [split ${version} .] 0 1] .]
 homepage                http://www.mysql.com/
 categories              databases
@@ -31,9 +33,10 @@
     http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-${branch}/ \
     http://ftp.plusline.de/mysql/Downloads/MySQL-${branch}/
 
-checksums           md5     87e5f7455c425df04bab25a3f2de90c8 \
-                    sha1    5e547ee11841f4f5c35141ee365edc6f1e139571 \
-                    rmd160  6472960ccb45eda240dc1a0a4068ad327cde3dde
+checksums \
+    md5     7c4dc17913ef1824e15c97b2a7d4c642 \
+    sha1    6eb787a884523ea30b4a8b900a928a0caa159e3a \
+    rmd160  aa36e78efe6fdbfc020cd1599fa63dd9aa60e91b
 
 depends_lib \
     port:zlib \
@@ -90,19 +93,27 @@
 archcheck.files-append  lib/libreadline.dylib
 configure.args-append   --without-readline
 
-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
-}
+# 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
+post-build {
+    if {[variant_isset universal]} {
+        set dirs {}
+        foreach arch ${universal_archs_to_use} {
+            lappend dirs ${worksrcpath}-${arch}
+        }
+    } else {
+        set dirs ${worksrcpath}
+    }
+    foreach dir ${dirs} {
+        reinplace "s|${dir}/libservices|${libdir}/mysql|g" \
+            ${dir}/plugin/daemon_example/.libs/libdaemon_example.lai \
+            ${dir}/plugin/semisync/.libs/semisync_master.lai \
+            ${dir}/plugin/semisync/.libs/semisync_slave.lai \
+            ${dir}/storage/example/.libs/ha_example.lai
+    }
 }
 
 pre-destroot {

Modified: trunk/dports/databases/mysql5-devel/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/databases/mysql5-devel/files/patch-Makefile.in.diff	2010-02-06 05:55:21 UTC (rev 63494)
+++ trunk/dports/databases/mysql5-devel/files/patch-Makefile.in.diff	2010-02-06 09:40:10 UTC (rev 63495)
@@ -1,7 +1,7 @@
---- Makefile.in	2009-12-13 14:56:45.000000000 +0200
-+++ Makefile.in	2009-12-12 20:35:28.000000000 +0200
-@@ -412,7 +412,7 @@
- 			@sql_union_dirs@ unittest storage plugin \
+--- Makefile.in.orig	2009-12-28 06:10:40.000000000 -0600
++++ Makefile.in	2010-02-05 20:06:18.000000000 -0600
+@@ -415,7 +415,7 @@
+ 			@sql_union_dirs@ unittest \
  			@sql_server@ @man_dirs@ tests \
  			netware @libmysqld_dirs@ \
 -			mysql-test support-files sql-bench \

Modified: trunk/dports/databases/mysql5-devel/files/patch-mysql_secure_installation.sh.diff
===================================================================
--- trunk/dports/databases/mysql5-devel/files/patch-mysql_secure_installation.sh.diff	2010-02-06 05:55:21 UTC (rev 63494)
+++ trunk/dports/databases/mysql5-devel/files/patch-mysql_secure_installation.sh.diff	2010-02-06 09:40:10 UTC (rev 63495)
@@ -1,9 +1,9 @@
---- scripts/mysql_secure_installation.sh	2008-08-04 07:20:02.000000000 -0500
-+++ scripts/mysql_secure_installation.sh	2008-09-13 20:46:27.000000000 -0500
-@@ -39,7 +39,7 @@
- 
+--- scripts/mysql_secure_installation.sh.orig	2009-12-28 06:05:06.000000000 -0600
++++ scripts/mysql_secure_installation.sh	2010-02-05 18:28:13.000000000 -0600
+@@ -40,7 +40,7 @@
  do_query() {
-     echo $1 >$command
+     echo "$1" >$command
+     #sed 's,^,> ,' < $command  # Debugging
 -    mysql --defaults-file=$config <$command
 +    @BINDIR@/mysql --defaults-file=$config <$command
      return $?

Modified: trunk/dports/databases/mysql5-server-devel/Portfile
===================================================================
--- trunk/dports/databases/mysql5-server-devel/Portfile	2010-02-06 05:55:21 UTC (rev 63494)
+++ trunk/dports/databases/mysql5-server-devel/Portfile	2010-02-06 09:40:10 UTC (rev 63495)
@@ -3,7 +3,7 @@
 PortSystem              1.0
 
 name                    mysql5-server-devel
-version                 5.5.0-m2
+version                 5.5.1-m2
 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/20100206/1cdfe699/attachment.html>