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

[pixilla at macports.org]

Revision: 93521
          https://trac.macports.org/changeset/93521
Author:   pixilla at macports.org
Date:     2012-05-25 09:12:14 -0700 (Fri, 25 May 2012)
Log Message:
-----------
databases/mysql55:
- Fix readline bundled and system_readline variant.
- Consistently use name_mysql.

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

Modified: trunk/dports/databases/mysql55/Portfile
===================================================================
--- trunk/dports/databases/mysql55/Portfile	2012-05-25 15:47:41 UTC (rev 93520)
+++ trunk/dports/databases/mysql55/Portfile	2012-05-25 16:12:14 UTC (rev 93521)
@@ -7,7 +7,7 @@
 set name_mysql      ${name}
 version             5.5.24
 # Please set revision_client and revision_server to 0 if you bump version.
-set revision_client 2
+set revision_client 3
 set revision_server 1
 categories          databases
 platforms           darwin
@@ -55,30 +55,34 @@
     depends_run         port:mysql_select
 
     select.group        mysql
-    select.file         ${filespath}/${name}
+    select.file         ${filespath}/${name_mysql}
 
     archcheck.files     lib/libz.dylib
 
     post-patch {
-        reinplace "s|@NAME@|${name}|g" ${worksrcpath}/cmake/install_layout.cmake
+        reinplace "s|@NAME@|${name_mysql}|g" ${worksrcpath}/cmake/install_layout.cmake
     }
 
     configure.args-delete \
                         -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
     configure.args-append \
-                        -DCMAKE_INSTALL_NAME_DIR:STRING=${prefix}/lib/${name}/mysql \
+                        -DCMAKE_INSTALL_NAME_DIR:STRING=${prefix}/lib/${name_mysql}/mysql \
                         -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} \
+                        -DSYSCONFDIR:PATH=${prefix}/etc/${name_mysql} \
+                        -DMYSQL_UNIX_ADDR:PATH=${prefix}/var/run/${name_mysql}/mysqld.sock \
+                        -DMYSQL_DATADIR:PATH=${prefix}/var/db/${name_mysql} \
                         -DDEFAULT_CHARSET:STRING=utf8 \
                         -DDEFAULT_COLLATION:STRING=utf8_general_ci \
                         -DWITH_EMBEDDED_SERVER:BOOL=OFF \
                         -DWITH_ZLIB:STRING=system \
                         -DWITH_UNIT_TESTS:BOOL=OFF \
                         -DENABLE_GCOV:BOOL=OFF \
-                        -DENABLE_DTRACE:BOOL=OFF
+                        -DENABLE_DTRACE:BOOL=OFF \
+                        -DWITH_READLINE:BOOL=ON \
+                        -DWITH_LIBEDIT:BOOL=OFF \
+                        -DWITH_LIBWRAP:BOOL=ON
 
+
     post-build {
         set dirs ${worksrcpath}
         foreach dir ${dirs} {
@@ -89,8 +93,8 @@
     }
 
     pre-destroot {
-        xinstall -m 755 -d ${destroot}${prefix}/etc/${name}
-        destroot.keepdirs-append ${destroot}${prefix}/etc/${name}
+        xinstall -m 755 -d ${destroot}${prefix}/etc/${name_mysql}
+        destroot.keepdirs-append ${destroot}${prefix}/etc/${name_mysql}
     }
 
     post-destroot {
@@ -98,22 +102,22 @@
         # so borrow the compress command and run on our files now.
         set manpath "${destroot}${prefix}/share/man"
         set gzip [findBinary gzip ${portutil::autoconf::gzip_path}]
-        foreach manpage [glob -type f ${destroot}${prefix}/share/man/${name}/man\[1-9\]/*] {
+        foreach manpage [glob -type f ${destroot}${prefix}/share/man/${name_mysql}/man\[1-9\]/*] {
             # Fix paths in manpages
-            reinplace "s|/etc/|${prefix}/etc/${name}/|g" ${manpage}
+            reinplace "s|/etc/|${prefix}/etc/${name_mysql}/|g" ${manpage}
             # Compress all manpages with gzip
             system "$gzip -9vf ${manpage}"
         }
-        foreach samp_conffile [glob -type f ${destroot}${prefix}/share/${name}/support-files/my-*.cnf] {
+        foreach samp_conffile [glob -type f ${destroot}${prefix}/share/${name_mysql}/support-files/my-*.cnf] {
             # Fix paths in sample configuration files
-            reinplace "s|/etc/my.cnf|${prefix}/etc/${name}/my.cnf|g" ${samp_conffile}
+            reinplace "s|/etc/my.cnf|${prefix}/etc/${name_mysql}/my.cnf|g" ${samp_conffile}
         }
     }
 
     post-install {
-        if {![file exists ${prefix}/etc/LaunchDaemons/org.macports.${name}/org.macports.${name}-server.plist]} {
-            ui_msg "The ${name} client has been installed."
-            ui_msg "To install the ${name} server, install the ${name}-server port."
+        if {![file exists ${prefix}/etc/LaunchDaemons/org.macports.${name_mysql}/org.macports.${name_mysql}-server.plist]} {
+            ui_msg "The ${name_mysql} client has been installed."
+            ui_msg "To install the ${name_mysql} server, install the ${name_mysql}-server port."
         }
     }
 
@@ -127,10 +131,11 @@
     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
+        # "-DWITH_READLINE:BOOL=OFF" 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
+        configure.args-delete   -DWITH_READLINE:BOOL=ON
+        configure.args-append   -DWITH_READLINE:BOOL=OFF
         archcheck.files-append  lib/libreadline.dylib
     }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120525/4f467656/attachment-0001.html>