[93312] trunk/dports/databases/mysql55/Portfile

[pixilla at macports.org]

Revision: 93312
          https://trac.macports.org/changeset/93312
Author:   pixilla at macports.org
Date:     2012-05-19 12:17:13 -0700 (Sat, 19 May 2012)
Log Message:
-----------
databases/mysql55:
- Make system readline instead of bundled readline a variant.
- Remove openssl variant license.

Modified Paths:
--------------
    trunk/dports/databases/mysql55/Portfile

Modified: trunk/dports/databases/mysql55/Portfile
===================================================================
--- trunk/dports/databases/mysql55/Portfile	2012-05-19 18:11:17 UTC (rev 93311)
+++ trunk/dports/databases/mysql55/Portfile	2012-05-19 19:17:13 UTC (rev 93312)
@@ -6,7 +6,9 @@
 name                mysql55
 set name_mysql      ${name}
 version             5.5.24
-revision            1
+# Please set revision_client and revision_server to 0 if you bump version.
+set revision_client 2
+set revision_server 1
 categories          databases
 platforms           darwin
 license             GPL-2
@@ -20,6 +22,7 @@
 
     set branch          [join [lrange [split ${version} .] 0 1] .]
 
+    revision            ${revision_client}
     license             GPL-2
     description         Multithreaded SQL database server
     long_description    MySQL is an open-source, multi-threaded SQL database with a command \
@@ -48,15 +51,13 @@
                         sha256  41e687dfec416a8b50d8d550899346c0e7096fe1200228cce24ed8daf3a779c6
 
     depends_lib-append  port:zlib \
-                        port:readline \
                         port:cmake
     depends_run         port:mysql_select
 
     select.group        mysql
     select.file         ${filespath}/${name}
 
-    archcheck.files     lib/libz.dylib \
-                        lib/libreadline.dylib
+    archcheck.files     lib/libz.dylib
 
     post-patch {
         reinplace "s|@NAME@|${name}|g" ${worksrcpath}/cmake/install_layout.cmake
@@ -66,14 +67,13 @@
                         -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
     configure.args-append \
                         -DCMAKE_INSTALL_NAME_DIR:STRING=${prefix}/lib/${name}/mysql \
-                        -DINSTALL_LAYOUT=MACPORTS \
+                        -DINSTALL_LAYOUT:STRING=MACPORTS \
                         -DSYSCONFDIR:PATH=${prefix}/etc/${name} \
                         -DMYSQL_UNIX_ADDR:PATH=${prefix}/var/run/${name}/mysqld.sock \
                         -DMYSQL_DATADIR:PATH=${prefix}/var/db/${name} \
                         -DDEFAULT_CHARSET:STRING=utf8 \
                         -DDEFAULT_COLLATION:STRING=utf8_general_ci \
                         -DWITH_EMBEDDED_SERVER:BOOL=OFF \
-                        -DWITH_READLINE:BOOL=ON \
                         -DWITH_ZLIB:STRING=system \
                         -DWITH_UNIT_TESTS:BOOL=OFF \
                         -DENABLE_GCOV:BOOL=OFF \
@@ -119,12 +119,21 @@
 
     variant openssl description {Enable OpenSSL support} {
 
-        license-append          OpenSSL SSLeay
         depends_lib-append      port:openssl
         configure.args-append   -DWITH_SSL:STRING=ON
         archcheck.files-append  lib/libssl.dylib
     }
 
+    variant system_readline description {Use system readline instead of bundled readline} {
+    
+        # Add readline support.
+        # "-DWITH_READLINE:BOOL=ON" has the peculiar meaning "do not use the bundled copy
+        # of readline but use the system's (i.e. MacPorts') copy of readline"
+        depends_lib-append      port:readline
+        configure.args-append   -DWITH_READLINE:BOOL=ON
+        archcheck.files-append  lib/libreadline.dylib
+    }
+
     livecheck.type          regex
     livecheck.version       [lindex [split ${version} -] 0]
     livecheck.url           http://dev.mysql.com/
@@ -133,7 +142,7 @@
 
 subport ${name_mysql}-server {
 
-    revision            1
+    revision            ${revision_server}
     license             BSD
     description         Run ${name_mysql} as server
     long_description    ${description}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120519/11a52bbe/attachment.html>