[93231] trunk/dports/databases/mysql55

pixilla at macports.org pixilla at macports.org
Thu May 17 21:49:37 PDT 2012


Revision: 93231
          https://trac.macports.org/changeset/93231
Author:   pixilla at macports.org
Date:     2012-05-17 21:49:37 -0700 (Thu, 17 May 2012)
Log Message:
-----------
databases/msyql55:
- Fix install layout.
- Remove spaces from empty lines.

Modified Paths:
--------------
    trunk/dports/databases/mysql55/Portfile
    trunk/dports/databases/mysql55/files/patch-cmake-install_layout.cmake.diff

Modified: trunk/dports/databases/mysql55/Portfile
===================================================================
--- trunk/dports/databases/mysql55/Portfile	2012-05-18 03:57:11 UTC (rev 93230)
+++ trunk/dports/databases/mysql55/Portfile	2012-05-18 04:49:37 UTC (rev 93231)
@@ -16,14 +16,14 @@
     PortGroup           archcheck 1.0
     PortGroup           cmake 1.0
     PortGroup           select 1.0
-    
+
     set branch          [join [lrange [split ${version} .] 0 1] .]
 
     license             GPL-2
     description         Multithreaded SQL database server
     long_description    MySQL is an open-source, multi-threaded SQL database with a command \
                         syntax very similar to mSQL.
-    
+
     homepage            http://www.mysql.com/
     master_sites \
         http://mysql.he.net/Downloads/MySQL-${branch}/ \
@@ -34,11 +34,10 @@
 
 # This mirror has a bad distfile for version 5.5.23
 #        http://mysql.mirrors.pair.com/Downloads/MySQL-${branch}/ \
-    
-    
+
     distname            mysql-${version}
     use_parallel_build  yes
-    
+
     patch.pre_args      -p1
     patchfiles          patch-cmake-install_layout.cmake.diff \
                         patch-configure.cmake.diff
@@ -46,27 +45,27 @@
 
     checksums           rmd160  8a6cf0ff40d7b21bb9bb2fab82d0695574e6f2f9 \
                         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
-    
+
     post-patch {
         reinplace "s|@NAME@|${name}|g" ${worksrcpath}/cmake/install_layout.cmake
         reinplace "s|@PREFIX@|${prefix}|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} \
+                        -DCMAKE_INSTALL_NAME_DIR:STRING=${prefix}/lib/${name}/mysql \
                         -DINSTALL_LAYOUT=MACPORTS \
                         -DSYSCONFDIR:PATH=${prefix}/etc/${name} \
                         -DMYSQL_UNIX_ADDR:PATH=${prefix}/var/run/${name}/mysqld.sock \
@@ -79,7 +78,7 @@
                         -DWITH_UNIT_TESTS:BOOL=OFF \
                         -DENABLE_GCOV:BOOL=OFF \
                         -DENABLE_DTRACE:BOOL=OFF
-    
+
     post-build {
         set dirs ${worksrcpath}
         foreach dir ${dirs} {
@@ -88,12 +87,12 @@
                 ${dir}/scripts/mysqlbug
         }
     }
-    
+
     pre-destroot {
         xinstall -m 755 -d ${destroot}${prefix}/etc/${name}
         destroot.keepdirs-append ${destroot}${prefix}/etc/${name}
     }
-    
+
     post-destroot {
         # proc portdestroot::destroot_finish fails to find and compress our man pages
         # so borrow the compress command and run on our files now.
@@ -110,22 +109,22 @@
             reinplace "s|/etc/my.cnf|${prefix}/etc/${name}/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."
         }
     }
-    
+
     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
     }
-    
+
     livecheck.type          regex
     livecheck.version       [lindex [split ${version} -] 0]
     livecheck.url           http://dev.mysql.com/
@@ -138,26 +137,26 @@
     license             BSD
     description         Run ${name_mysql} as server
     long_description    ${description}
-    
+
     supported_archs     noarch
     distfiles
-    
+
     depends_run         port:${name_mysql}
-    
+
     if {"darwin" == ${os.platform} && ${os.major} > 8} {
         set mysqluser       _mysql
     } else {
         set mysqluser       mysql
     }
     add_users ${mysqluser} group=${mysqluser} realname=MySQL\ Server
-    
+
     startupitem.create      yes
     startupitem.executable  ${prefix}/lib/${name_mysql}/bin/mysqld --user=${mysqluser}
-    
+
     use_configure       no
-    
+
     build {}
-    
+
     destroot {
         xinstall -m 755 -o root -d ${destroot}${prefix}/var/run
         xinstall -m 755 -o ${mysqluser} -g ${mysqluser} -d \
@@ -183,7 +182,7 @@
         puts $fp "skip-networking"
         close $fp
     }
-    
+
     post-activate {
         if {![file exists ${prefix}/etc/${name_mysql}/my.cnf]} {
             set fp [open "${prefix}/etc/${name_mysql}/my.cnf" "w"]
@@ -198,6 +197,6 @@
 
 \$ sudo -u ${mysqluser} ${prefix}/lib/${name_mysql}/scripts/mysql_install_db
 "
-    
+
     livecheck.type          none
 }

Modified: trunk/dports/databases/mysql55/files/patch-cmake-install_layout.cmake.diff
===================================================================
--- trunk/dports/databases/mysql55/files/patch-cmake-install_layout.cmake.diff	2012-05-18 03:57:11 UTC (rev 93230)
+++ trunk/dports/databases/mysql55/files/patch-cmake-install_layout.cmake.diff	2012-05-18 04:49:37 UTC (rev 93231)
@@ -27,12 +27,12 @@
 +#
 +SET(INSTALL_BINDIR_MACPORTS             "lib/@NAME@/bin")
 +SET(INSTALL_SBINDIR_MACPORTS            "lib/@NAME@/bin")
-+SET(INSTALL_SCRIPTDIR_MACPORTS          "lib/@NAME@/scripts")
++SET(INSTALL_SCRIPTDIR_MACPORTS          "lib/@NAME@/bin")
 +#
 +SET(INSTALL_LIBDIR_MACPORTS             "lib/@NAME@/mysql")
 +SET(INSTALL_PLUGINDIR_MACPORTS          "lib/@NAME@/plugin")
 +#
-+SET(INSTALL_INCLUDEDIR_MACPORTS         "include/@NAME@")
++SET(INSTALL_INCLUDEDIR_MACPORTS         "include/@NAME@/mysql")
 +#
 +SET(INSTALL_DOCDIR_MACPORTS             "share/docs/@NAME@")
 +SET(INSTALL_DOCREADMEDIR_MACPORTS       "share/docs/@NAME@")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120517/9300912c/attachment.html>


More information about the macports-changes mailing list