[93315] trunk/dports/databases/mysql51/Portfile

[pixilla at macports.org]

Revision: 93315
          https://trac.macports.org/changeset/93315
Author:   pixilla at macports.org
Date:     2012-05-19 13:43:35 -0700 (Sat, 19 May 2012)
Log Message:
-----------
databases/mysql51:
- Make bundled readline the default and system readline a variant.
- Remove openssl variant license.
- Fix path in mysql51-server notes.

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

Modified: trunk/dports/databases/mysql51/Portfile
===================================================================
--- trunk/dports/databases/mysql51/Portfile	2012-05-19 20:41:08 UTC (rev 93314)
+++ trunk/dports/databases/mysql51/Portfile	2012-05-19 20:43:35 UTC (rev 93315)
@@ -6,7 +6,9 @@
 name                mysql51
 set name_mysql      ${name}
 version             5.1.62
-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
@@ -27,6 +29,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 \
@@ -85,13 +88,6 @@
         --with-plugins=all \
         --enable-thread-safe-client
     
-    # Add readline support.
-    # "--without-readline" 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
-    archcheck.files-append  lib/libreadline.dylib
-    configure.args-append   --without-readline
-    
     # Build libmysqld embedded server.
     configure.cflags-append -fPIC
     configure.cxxflags-append -fPIC
@@ -158,6 +154,16 @@
         archcheck.files-append  lib/libssl.dylib
     }
 
+    variant system_readline description {Use system readline instead of bundled readline} {
+    
+        # Add readline support.
+        # "--without-readline" 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   --without-readline
+        archcheck.files-append  lib/libreadline.dylib
+    }
+
     livecheck.type      regex
     livecheck.version   [lindex [split ${version} -] 0]
     livecheck.url       http://dev.mysql.com/
@@ -166,7 +172,7 @@
 
 subport ${name_mysql}-server {
 
-    revision            1
+    revision            ${revision_server}
     license             BSD
     description         Run ${name_mysql} as server
     long_description    ${description}
@@ -228,7 +234,7 @@
     notes "
 If this is a new install you might want to run:
 
-\$ sudo -u ${mysqluser} ${prefix}/lib/${name_mysql}/scripts/mysql_install_db
+\$ sudo -u ${mysqluser} ${prefix}/lib/${name_mysql}/bin/mysql_install_db
 "
     
     livecheck.type          none
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120519/8ba644fb/attachment-0001.html>