[122194] trunk/dports/databases

pixilla at macports.org pixilla at macports.org
Thu Jul 17 09:22:17 PDT 2014


Revision: 122194
          https://trac.macports.org/changeset/122194
Author:   pixilla at macports.org
Date:     2014-07-17 09:22:17 -0700 (Thu, 17 Jul 2014)
Log Message:
-----------
databases/mariadb-10.0:
- New port for MariaDB 10.0.12
databases/mariadb-10.1:
- New port for MariaDB 10.1.0.

Added Paths:
-----------
    trunk/dports/databases/mariadb-10.0/
    trunk/dports/databases/mariadb-10.0/Portfile
    trunk/dports/databases/mariadb-10.0/files/
    trunk/dports/databases/mariadb-10.0/files/macports-default.cnf
    trunk/dports/databases/mariadb-10.0/files/mariadb-10.0
    trunk/dports/databases/mariadb-10.0/files/my.cnf
    trunk/dports/databases/mariadb-10.0/files/patch-CMakeLists.txt.diff
    trunk/dports/databases/mariadb-10.0/files/patch-cmake-install_layout.cmake.diff
    trunk/dports/databases/mariadb-10.1/
    trunk/dports/databases/mariadb-10.1/Portfile
    trunk/dports/databases/mariadb-10.1/files/
    trunk/dports/databases/mariadb-10.1/files/macports-default.cnf
    trunk/dports/databases/mariadb-10.1/files/mariadb-10.1
    trunk/dports/databases/mariadb-10.1/files/my.cnf
    trunk/dports/databases/mariadb-10.1/files/patch-CMakeLists.txt.diff
    trunk/dports/databases/mariadb-10.1/files/patch-cmake-install_layout.cmake.diff

Added: trunk/dports/databases/mariadb-10.0/Portfile
===================================================================
--- trunk/dports/databases/mariadb-10.0/Portfile	                        (rev 0)
+++ trunk/dports/databases/mariadb-10.0/Portfile	2014-07-17 16:22:17 UTC (rev 122194)
@@ -0,0 +1,254 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id: Portfile 114690 2013-12-13 23:09:43Z pixilla at macports.org $
+
+PortSystem          1.0
+
+name                mariadb-10.0
+set name_mysql      ${name}
+version             10.0.12
+set version_branch  [join [lrange [split ${version} .] 0 1] .]
+# Please set revision_client and revision_server to 0 if you bump version.
+set revision_client 0
+set revision_server 0
+categories          databases
+platforms           darwin
+license             GPL-2
+maintainers         pixilla openmaintainer
+homepage            http://mariadb.org/
+
+if {$subport eq $name} {
+
+    PortGroup           archcheck 1.0
+    PortGroup           cmake 1.0
+    PortGroup           select 1.0
+
+    revision            ${revision_client}
+    license             GPL-2
+    description         Multithreaded SQL database server
+    long_description    Mariadb is a fork of the MySQL server, a multi-threaded SQL database.
+
+    master_sites \
+        http://ftp.osuosl.org/pub/mariadb/mariadb-${version}/source/ \
+        http://mirror2.hs-esslingen.de/mariadb/mariadb-${version}/source/ \
+        http://mirror3.layerjet.com/mariadb/mariadb-${version}/source/ \
+        http://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/mariadb-${version}/source/ \
+        http://mirrors.supportex.net/mariadb/mariadb-${version}/source/ \
+        http://mirrors.fe.up.pt/pub/mariadb/mariadb-${version}/source/ \
+        http://gd.tuwien.ac.at/db/mariadb/mariadb-${version}/source/ \
+        http://mirror.aarnet.edu.au/pub/MariaDB/mariadb-${version}/source/ \
+        http://ftp.heanet.ie/mirrors/mariadb/mariadb-${version}/source/ \
+        http://mirror.switch.ch/mirror/mariadb/mariadb-${version}/source/
+
+    distname            mariadb-${version}
+    use_parallel_build  yes
+
+    patch.pre_args      -p1
+    patchfiles          patch-cmake-install_layout.cmake.diff \
+                        patch-CMakeLists.txt.diff
+
+    checksums           rmd160  c14823beb58b9b4824e919c7bd09b6bf3cfec6de \
+                        sha256  612bc7360997173d536b79d744e8418d3910924775cbb0614d0843d609be162d
+
+    depends_lib-append  port:zlib port:tcp_wrappers port:ncurses
+    depends_run-append  port:mysql_select
+
+    select.group        mysql
+    select.file         ${filespath}/${name_mysql}
+
+    archcheck.files     lib/libz.dylib lib/libwrap.dylib
+
+    post-extract {
+        file mkdir ${worksrcpath}/build_macports/macports
+        copy ${filespath}/macports-default.cnf \
+            ${filespath}/my.cnf \
+            ${worksrcpath}/build_macports/macports/
+    }
+
+    post-patch {
+        reinplace "s|@NAME@|${name_mysql}|g" \
+            ${worksrcpath}/cmake/install_layout.cmake
+        reinplace "s|@NAME@|${name_mysql}|g" \
+            ${worksrcpath}/build_macports/macports/macports-default.cnf \
+            ${worksrcpath}/build_macports/macports/my.cnf
+        reinplace "s|@PREFIX@|${prefix}|g" \
+            ${worksrcpath}/build_macports/macports/macports-default.cnf \
+            ${worksrcpath}/build_macports/macports/my.cnf
+    }
+
+    configure.cmd       cmake ..
+    configure.dir       ${worksrcpath}/build_macports
+    configure.args-delete \
+                        -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
+    configure.args-append \
+                        -DCMAKE_INSTALL_NAME_DIR:STRING=${prefix}/lib/${name_mysql}/mysql \
+                        -DINSTALL_LAYOUT:STRING=MACPORTS \
+                        -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=ON \
+                        -DWITH_ZLIB:STRING=system \
+                        -DWITH_UNIT_TESTS:BOOL=ON \
+                        -DWITHOUT_OQGRAPH_STORAGE_ENGINE:BOOL=ON \
+                        -DWITHOUT_TOKUDB_STORAGE_ENGINE:BOOL=ON \
+                        -DENABLE_GCOV:BOOL=OFF \
+                        -DENABLE_DTRACE:BOOL=OFF \
+                        -DWITH_READLINE:BOOL=ON \
+                        -DWITH_LIBWRAP:BOOL=ON \
+                        -DWITH_SSL:STRING=no \
+                        -DMYSQL_MAINTAINER_MODE:STRING=AUTO
+
+    build.dir           ${worksrcpath}/build_macports
+    post-build {
+        set dirs ${worksrcpath}/build_macports
+        foreach dir ${dirs} {
+            reinplace -E {s|-arch [a-z0-9_]+||g} \
+                ${dir}/scripts/mysql_config \
+                ${dir}/scripts/mysqlbug
+        }
+    }
+
+    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.
+        set manpath "${destroot}${prefix}/share/man"
+        set gzip [findBinary gzip ${portutil::autoconf::gzip_path}]
+        foreach manpage [glob -type f ${destroot}${prefix}/share/man/${name_mysql}/man\[1-9\]/*] {
+            # Fix paths in manpages
+            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_mysql}/support-files/my-*.cnf] {
+            # Fix paths in sample configuration files
+            reinplace "s|/etc/my.cnf|${prefix}/etc/${name_mysql}/my.cnf|g" ${samp_conffile}
+        }
+        xinstall -m 755 -o root -d \
+            ${destroot}${prefix}/etc/${name_mysql}
+        copy ${worksrcpath}/build_macports/macports/macports-default.cnf \
+            ${destroot}${prefix}/etc/${name_mysql}/
+        xinstall -m 755 -o root -d \
+            ${destroot}${prefix}/share/${name_mysql}/support-files/macports
+        copy ${worksrcpath}/build_macports/macports/my.cnf \
+            ${destroot}${prefix}/share/${name_mysql}/support-files/macports/
+    }
+
+    post-install {
+        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."
+        }
+    }
+
+    pre-activate {
+        # The macports-default.cnf is installed by ${name_mysql}.
+        # Early versions of ${name_mysql}-server installed macports-default.cnf so for a
+        # reasonable period we need to deactivate older versions of the ${name_mysql}-server.
+        if { [file exists ${prefix}/etc/${name_mysql}/macports-default.cnf]
+            && ![catch {set vers [lindex [registry_active ${name_mysql}-server] 0]}]
+            && [vercmp [lindex $vers 1] 5.5.24] < 0 } {
+
+            registry_deactivate_composite ${name_mysql}-server "" [list ports_nodepcheck 1]
+        }
+    }
+
+    post-activate {
+        if {![file exists ${prefix}/etc/${name_mysql}/my.cnf]} {
+            copy ${prefix}/share/${name_mysql}/support-files/macports/my.cnf \
+                ${prefix}/etc/${name_mysql}/
+        }
+    }
+
+    variant openssl description {Enable OpenSSL support} {
+
+        depends_lib-append      port:openssl
+        configure.args-delete   -DWITH_SSL:STRING=no
+        configure.args-append   -DWITH_SSL:STRING=system
+        archcheck.files-append  lib/libssl.dylib
+    }
+
+    variant system_readline description {Use system readline instead of bundled readline} {
+    
+        # Add readline support.
+        # "-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-delete   -DWITH_READLINE:BOOL=ON
+        configure.args-append   -DWITH_READLINE:BOOL=OFF
+        archcheck.files-append  lib/libreadline.dylib
+    }
+
+    notes "
+On activation if no ${prefix}/etc/${name_mysql}/my.cnf file exists one
+will be created which loads
+${prefix}/etc/${name_mysql}/macports-default.cnf.
+
+If a ${prefix}/etc/${name_mysql}/my.cnf file exists MacPorts does not
+touch it and any changes you make to ${prefix}/etc/${name_mysql}/my.cnf
+will be preserved (e.g., during port upgrades, deactivations or
+activations). ${prefix}/etc/${name_mysql}/my.cnf is a good place to
+customize your ${name_mysql} installation.
+
+Any changes made to ${prefix}/etc/${name_mysql}/macports-default.cnf
+will be lost during port upgrades, deactivations or activations so you
+are advised to not make changes here. Currently
+${prefix}/etc/${name_mysql}/macports-default.cnf contains only one
+directive; to disable networking. With disabled networking it is
+possible to install and have running all the MacPorts mysql ports
+simultaneously.
+"
+
+    livecheck.type      regex
+    livecheck.url       https://downloads.mariadb.org/mariadb/
+    livecheck.regex     "btn-large\" href=\"/mariadb/(\[^/\]+)/\">"
+}
+
+subport ${name_mysql}-server {
+
+    revision            ${revision_server}
+    license             BSD
+    description         Run ${name_mysql} as server
+    long_description    ${description}
+
+    supported_archs     noarch
+    distfiles
+
+    depends_run         port:${name_mysql}
+
+    if {"darwin" eq ${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 \
+            ${destroot}${prefix}/etc/${name_mysql} \
+            ${destroot}${prefix}/var/db/${name_mysql} \
+            ${destroot}${prefix}/var/log/${name_mysql} \
+            ${destroot}${prefix}/var/run/${name_mysql}
+        destroot.keepdirs-append  \
+            ${destroot}${prefix}/var/db/${name_mysql} \
+            ${destroot}${prefix}/var/log/${name_mysql} \
+            ${destroot}${prefix}/var/run/${name_mysql}
+    }
+
+    notes "
+If this is a new install you might want to run:
+
+\$ sudo -u ${mysqluser} ${prefix}/lib/${name_mysql}/bin/mysql_install_db
+"
+
+    livecheck.type          none
+}

Added: trunk/dports/databases/mariadb-10.0/files/macports-default.cnf
===================================================================
--- trunk/dports/databases/mariadb-10.0/files/macports-default.cnf	                        (rev 0)
+++ trunk/dports/databases/mariadb-10.0/files/macports-default.cnf	2014-07-17 16:22:17 UTC (rev 122194)
@@ -0,0 +1,9 @@
+# WARNING! ANY CHANGES TO THIS FILE WILL BE LOST ON UNINSTALL/UPGRADES!
+# Make your changes to @PREFIX@/etc/@NAME@/my.cnf
+# YOU HAVE BEEN WARNED!
+
+# MacPorts default options
+[mysqld]
+# skip-networking so multple mysql server ports can be loaded
+# without each competing for port 3306.
+skip-networking

Added: trunk/dports/databases/mariadb-10.0/files/mariadb-10.0
===================================================================
--- trunk/dports/databases/mariadb-10.0/files/mariadb-10.0	                        (rev 0)
+++ trunk/dports/databases/mariadb-10.0/files/mariadb-10.0	2014-07-17 16:22:17 UTC (rev 122194)
@@ -0,0 +1,141 @@
+-
+-
+-
+-
+-
+lib/mariadb-10.0/bin/innochecksum
+lib/mariadb-10.0/bin/msql2mysql
+lib/mariadb-10.0/bin/my_print_defaults
+lib/mariadb-10.0/bin/myisam_ftdump
+lib/mariadb-10.0/bin/myisamchk
+lib/mariadb-10.0/bin/myisamlog
+lib/mariadb-10.0/bin/myisampack
+lib/mariadb-10.0/bin/mysql
+lib/mariadb-10.0/bin/mysql_client_test
+-
+lib/mariadb-10.0/bin/mysql_config
+lib/mariadb-10.0/bin/mysql_convert_table_format
+lib/mariadb-10.0/bin/mysql_find_rows
+lib/mariadb-10.0/bin/mysql_fix_extensions
+-
+lib/mariadb-10.0/bin/mysql_install_db
+lib/mariadb-10.0/bin/mysql_plugin
+lib/mariadb-10.0/bin/mysql_secure_installation
+lib/mariadb-10.0/bin/mysql_setpermission
+lib/mariadb-10.0/bin/mysql_tzinfo_to_sql
+lib/mariadb-10.0/bin/mysql_upgrade
+lib/mariadb-10.0/bin/mysql_waitpid
+lib/mariadb-10.0/bin/mysql_zap
+lib/mariadb-10.0/bin/mysqlaccess
+-
+lib/mariadb-10.0/bin/mysqladmin
+lib/mariadb-10.0/bin/mysqlbinlog
+lib/mariadb-10.0/bin/mysqlbug
+lib/mariadb-10.0/bin/mysqlcheck
+lib/mariadb-10.0/bin/mysqld
+lib/mariadb-10.0/bin/mysqld_multi
+lib/mariadb-10.0/bin/mysqld_safe
+lib/mariadb-10.0/bin/mysqldump
+lib/mariadb-10.0/bin/mysqldumpslow
+lib/mariadb-10.0/bin/mysqlhotcopy
+lib/mariadb-10.0/bin/mysqlimport
+-
+lib/mariadb-10.0/bin/mysqlshow
+lib/mariadb-10.0/bin/mysqlslap
+lib/mariadb-10.0/bin/mysqltest
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+lib/mariadb-10.0/bin/perror
+lib/mariadb-10.0/bin/replace
+lib/mariadb-10.0/bin/resolve_stack_dump
+lib/mariadb-10.0/bin/resolveip
+-
+-
+share/man/mariadb-10.0/man1/innochecksum.1.gz
+share/man/mariadb-10.0/man1/msql2mysql.1.gz
+share/man/mariadb-10.0/man1/my_print_defaults.1.gz
+share/man/mariadb-10.0/man1/myisam_ftdump.1.gz
+share/man/mariadb-10.0/man1/myisamchk.1.gz
+share/man/mariadb-10.0/man1/myisamlog.1.gz
+share/man/mariadb-10.0/man1/myisampack.1.gz
+share/man/mariadb-10.0/man1/mysql-stress-test.pl.1.gz
+share/man/mariadb-10.0/man1/mysql-test-run.pl.1.gz
+share/man/mariadb-10.0/man1/mysql.1.gz
+share/man/mariadb-10.0/man1/mysql.server.1.gz
+share/man/mariadb-10.0/man1/mysql_client_test.1.gz
+share/man/mariadb-10.0/man1/mysql_client_test_embedded.1.gz
+share/man/mariadb-10.0/man1/mysql_config.1.gz
+share/man/mariadb-10.0/man1/mysql_convert_table_format.1.gz
+share/man/mariadb-10.0/man1/mysql_find_rows.1.gz
+share/man/mariadb-10.0/man1/mysql_fix_extensions.1.gz
+-
+share/man/mariadb-10.0/man1/mysql_install_db.1.gz
+-
+share/man/mariadb-10.0/man1/mysql_secure_installation.1.gz
+share/man/mariadb-10.0/man1/mysql_setpermission.1.gz
+share/man/mariadb-10.0/man1/mysql_tzinfo_to_sql.1.gz
+share/man/mariadb-10.0/man1/mysql_upgrade.1.gz
+share/man/mariadb-10.0/man1/mysql_waitpid.1.gz
+share/man/mariadb-10.0/man1/mysql_zap.1.gz
+share/man/mariadb-10.0/man1/mysqlaccess.1.gz
+share/man/mariadb-10.0/man1/mysqladmin.1.gz
+share/man/mariadb-10.0/man1/mysqlbinlog.1.gz
+-
+share/man/mariadb-10.0/man1/mysqlcheck.1.gz
+share/man/mariadb-10.0/man1/mysqld_multi.1.gz
+share/man/mariadb-10.0/man1/mysqld_safe.1.gz
+share/man/mariadb-10.0/man1/mysqldump.1.gz
+share/man/mariadb-10.0/man1/mysqldumpslow.1.gz
+share/man/mariadb-10.0/man1/mysqlhotcopy.1.gz
+share/man/mariadb-10.0/man1/mysqlimport.1.gz
+-
+share/man/mariadb-10.0/man1/mysqlshow.1.gz
+share/man/mariadb-10.0/man1/mysqlslap.1.gz
+share/man/mariadb-10.0/man1/mysqltest.1.gz
+share/man/mariadb-10.0/man1/mysqltest_embedded.1.gz
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+share/man/mariadb-10.0/man1/perror.1.gz
+share/man/mariadb-10.0/man1/replace.1.gz
+share/man/mariadb-10.0/man1/resolve_stack_dump.1.gz
+share/man/mariadb-10.0/man1/resolveip.1.gz
+share/man/mariadb-10.0/man8/mysqld.8.gz
+-
+-
+-
+-

Added: trunk/dports/databases/mariadb-10.0/files/my.cnf
===================================================================
--- trunk/dports/databases/mariadb-10.0/files/my.cnf	                        (rev 0)
+++ trunk/dports/databases/mariadb-10.0/files/my.cnf	2014-07-17 16:22:17 UTC (rev 122194)
@@ -0,0 +1,2 @@
+# Use default MacPorts settings
+!include @PREFIX@/etc/@NAME@/macports-default.cnf

Added: trunk/dports/databases/mariadb-10.0/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/databases/mariadb-10.0/files/patch-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/databases/mariadb-10.0/files/patch-CMakeLists.txt.diff	2014-07-17 16:22:17 UTC (rev 122194)
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt	2014-01-29 12:25:15.000000000 -0800
++++ b/CMakeLists.txt	2014-01-30 13:39:26.000000000 -0800
+@@ -28,6 +28,7 @@
+ 
+ MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
+ 
++SET(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
+ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
+ 
+ # Distinguish between community and non-community builds, with the
+@@ -242,6 +243,9 @@
+   SET(DEFAULT_MYSQL_HOME ${CMAKE_INSTALL_PREFIX})
+   SET(SHAREDIR ${DEFAULT_MYSQL_HOME}/${INSTALL_MYSQLSHAREDIR})
+ ENDIF()
++IF(SYSCONFDIR)
++  SET(DEFAULT_SYSCONFDIR "${SYSCONFDIR}")
++ENDIF()
+ 
+ SET(DEFAULT_BASEDIR "${DEFAULT_MYSQL_HOME}")
+ IF(INSTALL_MYSQLDATADIR MATCHES "^/.*")

Added: trunk/dports/databases/mariadb-10.0/files/patch-cmake-install_layout.cmake.diff
===================================================================
--- trunk/dports/databases/mariadb-10.0/files/patch-cmake-install_layout.cmake.diff	                        (rev 0)
+++ trunk/dports/databases/mariadb-10.0/files/patch-cmake-install_layout.cmake.diff	2014-07-17 16:22:17 UTC (rev 122194)
@@ -0,0 +1,56 @@
+--- a/cmake/install_layout.cmake	2012-12-05 07:50:37.000000000 -0800
++++ b/cmake/install_layout.cmake	2012-12-05 07:48:31.000000000 -0800
+@@ -71,7 +71,7 @@
+ ENDIF()
+ 
+ SET(INSTALL_LAYOUT "${INSTALL_LAYOUT}"
+-CACHE STRING "Installation directory layout. Options are: STANDALONE (as in zip or tar.gz installer) RPM DEB SVR4")
++CACHE STRING "Installation directory layout. Options are: STANDALONE (as in zip or tar.gz installer) RPM DEB SVR4 MACPORTS")
+ 
+ IF(UNIX)
+   IF(INSTALL_LAYOUT MATCHES "RPM")
+@@ -87,7 +87,7 @@
+     SET(CMAKE_INSTALL_PREFIX ${default_prefix}
+       CACHE PATH "install prefix" FORCE)
+   ENDIF()
+-  SET(VALID_INSTALL_LAYOUTS "RPM" "STANDALONE" "DEB" "SVR4")
++  SET(VALID_INSTALL_LAYOUTS "RPM" "STANDALONE" "DEB" "SVR4" "MACPORTS")
+   LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
+   IF(ind EQUAL -1)
+     MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
+@@ -217,6 +217,35 @@
+ SET(INSTALL_PLUGINTESTDIR_SVR4          ${plugin_tests})
+ 
+ SET(INSTALL_UNIX_ADDRDIR_SVR            "/tmp/mysql.sock")
++#
++# MACPORTS layout
++#
++SET(INSTALL_BINDIR_MACPORTS             "lib/@NAME@/bin")
++SET(INSTALL_SBINDIR_MACPORTS            "lib/@NAME@/bin")
++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@/mysql")
++#
++SET(INSTALL_DOCDIR_MACPORTS             "share/doc/@NAME@")
++SET(INSTALL_DOCREADMEDIR_MACPORTS       "share/doc/@NAME@")
++SET(INSTALL_MANDIR_MACPORTS             "share/man/@NAME@")
++SET(INSTALL_INFODIR_MACPORTS            "share/doc/@NAME@")
++#
++SET(INSTALL_SHAREDIR_MACPORTS           "share/@NAME@")
++SET(INSTALL_MYSQLSHAREDIR_MACPORTS      "share/@NAME@")
++SET(INSTALL_MYSQLTESTDIR_MACPORTS       "share/@NAME@/mysql-test")
++SET(INSTALL_SQLBENCHDIR_MACPORTS        "share/@NAME@")
++SET(INSTALL_SUPPORTFILESDIR_MACPORTS    "share/@NAME@/support-files")
++#
++SET(INSTALL_MYSQLDATADIR_MACPORTS       "var/db/@NAME@")
++SET(INSTALL_PLUGINTESTDIR_MACPORTS      ${plugin_tests})
++#
++# SUID /bin/ps is not in MacPorts sandbox causing scripts/CMakeLists.txt tests to fail so we set FIND_PROC here.
++#
++SET(FIND_PROC "ps -ef | grep -v mysqld_safe | grep -- $MYSQLD | grep $PID > /dev/null")
+ 
+ # Clear cached variables if install layout was changed
+ IF(OLD_INSTALL_LAYOUT)

Added: trunk/dports/databases/mariadb-10.1/Portfile
===================================================================
--- trunk/dports/databases/mariadb-10.1/Portfile	                        (rev 0)
+++ trunk/dports/databases/mariadb-10.1/Portfile	2014-07-17 16:22:17 UTC (rev 122194)
@@ -0,0 +1,254 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id: Portfile 114690 2013-12-13 23:09:43Z pixilla at macports.org $
+
+PortSystem          1.0
+
+name                mariadb-10.1
+set name_mysql      ${name}
+version             10.1.0
+set version_branch  [join [lrange [split ${version} .] 0 1] .]
+# Please set revision_client and revision_server to 0 if you bump version.
+set revision_client 0
+set revision_server 0
+categories          databases
+platforms           darwin
+license             GPL-2
+maintainers         pixilla openmaintainer
+homepage            http://mariadb.org/
+
+if {$subport eq $name} {
+
+    PortGroup           archcheck 1.0
+    PortGroup           cmake 1.0
+    PortGroup           select 1.0
+
+    revision            ${revision_client}
+    license             GPL-2
+    description         (Beta version) Multithreaded SQL database server
+    long_description    (Beta version) Mariadb is a fork of the MySQL server, a multi-threaded SQL database.
+
+    master_sites \
+        http://ftp.osuosl.org/pub/mariadb/mariadb-${version}/source/ \
+        http://mirror2.hs-esslingen.de/mariadb/mariadb-${version}/source/ \
+        http://mirror3.layerjet.com/mariadb/mariadb-${version}/source/ \
+        http://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/mariadb-${version}/source/ \
+        http://mirrors.supportex.net/mariadb/mariadb-${version}/source/ \
+        http://mirrors.fe.up.pt/pub/mariadb/mariadb-${version}/source/ \
+        http://gd.tuwien.ac.at/db/mariadb/mariadb-${version}/source/ \
+        http://mirror.aarnet.edu.au/pub/MariaDB/mariadb-${version}/source/ \
+        http://ftp.heanet.ie/mirrors/mariadb/mariadb-${version}/source/ \
+        http://mirror.switch.ch/mirror/mariadb/mariadb-${version}/source/
+
+    distname            mariadb-${version}
+    use_parallel_build  yes
+
+    patch.pre_args      -p1
+    patchfiles          patch-cmake-install_layout.cmake.diff \
+                        patch-CMakeLists.txt.diff
+
+    checksums           rmd160  83126e28b37cb51daedc99cacbd30df842fab2f3 \
+                        sha256  994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521
+
+    depends_lib-append  port:zlib port:tcp_wrappers port:ncurses
+    depends_run-append  port:mysql_select
+
+    select.group        mysql
+    select.file         ${filespath}/${name_mysql}
+
+    archcheck.files     lib/libz.dylib lib/libwrap.dylib
+
+    post-extract {
+        file mkdir ${worksrcpath}/build_macports/macports
+        copy ${filespath}/macports-default.cnf \
+            ${filespath}/my.cnf \
+            ${worksrcpath}/build_macports/macports/
+    }
+
+    post-patch {
+        reinplace "s|@NAME@|${name_mysql}|g" \
+            ${worksrcpath}/cmake/install_layout.cmake
+        reinplace "s|@NAME@|${name_mysql}|g" \
+            ${worksrcpath}/build_macports/macports/macports-default.cnf \
+            ${worksrcpath}/build_macports/macports/my.cnf
+        reinplace "s|@PREFIX@|${prefix}|g" \
+            ${worksrcpath}/build_macports/macports/macports-default.cnf \
+            ${worksrcpath}/build_macports/macports/my.cnf
+    }
+
+    configure.cmd       cmake ..
+    configure.dir       ${worksrcpath}/build_macports
+    configure.args-delete \
+                        -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
+    configure.args-append \
+                        -DCMAKE_INSTALL_NAME_DIR:STRING=${prefix}/lib/${name_mysql}/mysql \
+                        -DINSTALL_LAYOUT:STRING=MACPORTS \
+                        -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=ON \
+                        -DWITH_ZLIB:STRING=system \
+                        -DWITH_UNIT_TESTS:BOOL=ON \
+                        -DWITHOUT_OQGRAPH_STORAGE_ENGINE:BOOL=ON \
+                        -DWITHOUT_TOKUDB_STORAGE_ENGINE:BOOL=ON \
+                        -DENABLE_GCOV:BOOL=OFF \
+                        -DENABLE_DTRACE:BOOL=OFF \
+                        -DWITH_READLINE:BOOL=ON \
+                        -DWITH_LIBWRAP:BOOL=ON \
+                        -DWITH_SSL:STRING=no \
+                        -DMYSQL_MAINTAINER_MODE:STRING=AUTO
+
+    build.dir           ${worksrcpath}/build_macports
+    post-build {
+        set dirs ${worksrcpath}/build_macports
+        foreach dir ${dirs} {
+            reinplace -E {s|-arch [a-z0-9_]+||g} \
+                ${dir}/scripts/mysql_config \
+                ${dir}/scripts/mysqlbug
+        }
+    }
+
+    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.
+        set manpath "${destroot}${prefix}/share/man"
+        set gzip [findBinary gzip ${portutil::autoconf::gzip_path}]
+        foreach manpage [glob -type f ${destroot}${prefix}/share/man/${name_mysql}/man\[1-9\]/*] {
+            # Fix paths in manpages
+            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_mysql}/support-files/my-*.cnf] {
+            # Fix paths in sample configuration files
+            reinplace "s|/etc/my.cnf|${prefix}/etc/${name_mysql}/my.cnf|g" ${samp_conffile}
+        }
+        xinstall -m 755 -o root -d \
+            ${destroot}${prefix}/etc/${name_mysql}
+        copy ${worksrcpath}/build_macports/macports/macports-default.cnf \
+            ${destroot}${prefix}/etc/${name_mysql}/
+        xinstall -m 755 -o root -d \
+            ${destroot}${prefix}/share/${name_mysql}/support-files/macports
+        copy ${worksrcpath}/build_macports/macports/my.cnf \
+            ${destroot}${prefix}/share/${name_mysql}/support-files/macports/
+    }
+
+    post-install {
+        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."
+        }
+    }
+
+    pre-activate {
+        # The macports-default.cnf is installed by ${name_mysql}.
+        # Early versions of ${name_mysql}-server installed macports-default.cnf so for a
+        # reasonable period we need to deactivate older versions of the ${name_mysql}-server.
+        if { [file exists ${prefix}/etc/${name_mysql}/macports-default.cnf]
+            && ![catch {set vers [lindex [registry_active ${name_mysql}-server] 0]}]
+            && [vercmp [lindex $vers 1] 5.5.24] < 0 } {
+
+            registry_deactivate_composite ${name_mysql}-server "" [list ports_nodepcheck 1]
+        }
+    }
+
+    post-activate {
+        if {![file exists ${prefix}/etc/${name_mysql}/my.cnf]} {
+            copy ${prefix}/share/${name_mysql}/support-files/macports/my.cnf \
+                ${prefix}/etc/${name_mysql}/
+        }
+    }
+
+    variant openssl description {Enable OpenSSL support} {
+
+        depends_lib-append      port:openssl
+        configure.args-delete   -DWITH_SSL:STRING=no
+        configure.args-append   -DWITH_SSL:STRING=system
+        archcheck.files-append  lib/libssl.dylib
+    }
+
+    variant system_readline description {Use system readline instead of bundled readline} {
+    
+        # Add readline support.
+        # "-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-delete   -DWITH_READLINE:BOOL=ON
+        configure.args-append   -DWITH_READLINE:BOOL=OFF
+        archcheck.files-append  lib/libreadline.dylib
+    }
+
+    notes "
+On activation if no ${prefix}/etc/${name_mysql}/my.cnf file exists one
+will be created which loads
+${prefix}/etc/${name_mysql}/macports-default.cnf.
+
+If a ${prefix}/etc/${name_mysql}/my.cnf file exists MacPorts does not
+touch it and any changes you make to ${prefix}/etc/${name_mysql}/my.cnf
+will be preserved (e.g., during port upgrades, deactivations or
+activations). ${prefix}/etc/${name_mysql}/my.cnf is a good place to
+customize your ${name_mysql} installation.
+
+Any changes made to ${prefix}/etc/${name_mysql}/macports-default.cnf
+will be lost during port upgrades, deactivations or activations so you
+are advised to not make changes here. Currently
+${prefix}/etc/${name_mysql}/macports-default.cnf contains only one
+directive; to disable networking. With disabled networking it is
+possible to install and have running all the MacPorts mysql ports
+simultaneously.
+"
+
+    livecheck.type      regex
+    livecheck.url       https://downloads.mariadb.org/mariadb/
+    livecheck.regex     "btn-large\" href=\"/mariadb/(\[^/\]+)/\">"
+}
+
+subport ${name_mysql}-server {
+
+    revision            ${revision_server}
+    license             BSD
+    description         (Beta version) Run ${name_mysql} as server
+    long_description    ${description}
+
+    supported_archs     noarch
+    distfiles
+
+    depends_run         port:${name_mysql}
+
+    if {"darwin" eq ${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 \
+            ${destroot}${prefix}/etc/${name_mysql} \
+            ${destroot}${prefix}/var/db/${name_mysql} \
+            ${destroot}${prefix}/var/log/${name_mysql} \
+            ${destroot}${prefix}/var/run/${name_mysql}
+        destroot.keepdirs-append  \
+            ${destroot}${prefix}/var/db/${name_mysql} \
+            ${destroot}${prefix}/var/log/${name_mysql} \
+            ${destroot}${prefix}/var/run/${name_mysql}
+    }
+
+    notes "
+If this is a new install you might want to run:
+
+\$ sudo -u ${mysqluser} ${prefix}/lib/${name_mysql}/bin/mysql_install_db
+"
+
+    livecheck.type          none
+}

Added: trunk/dports/databases/mariadb-10.1/files/macports-default.cnf
===================================================================
--- trunk/dports/databases/mariadb-10.1/files/macports-default.cnf	                        (rev 0)
+++ trunk/dports/databases/mariadb-10.1/files/macports-default.cnf	2014-07-17 16:22:17 UTC (rev 122194)
@@ -0,0 +1,9 @@
+# WARNING! ANY CHANGES TO THIS FILE WILL BE LOST ON UNINSTALL/UPGRADES!
+# Make your changes to @PREFIX@/etc/@NAME@/my.cnf
+# YOU HAVE BEEN WARNED!
+
+# MacPorts default options
+[mysqld]
+# skip-networking so multple mysql server ports can be loaded
+# without each competing for port 3306.
+skip-networking

Added: trunk/dports/databases/mariadb-10.1/files/mariadb-10.1
===================================================================
--- trunk/dports/databases/mariadb-10.1/files/mariadb-10.1	                        (rev 0)
+++ trunk/dports/databases/mariadb-10.1/files/mariadb-10.1	2014-07-17 16:22:17 UTC (rev 122194)
@@ -0,0 +1,141 @@
+-
+-
+-
+-
+-
+lib/mariadb-10.1/bin/innochecksum
+lib/mariadb-10.1/bin/msql2mysql
+lib/mariadb-10.1/bin/my_print_defaults
+lib/mariadb-10.1/bin/myisam_ftdump
+lib/mariadb-10.1/bin/myisamchk
+lib/mariadb-10.1/bin/myisamlog
+lib/mariadb-10.1/bin/myisampack
+lib/mariadb-10.1/bin/mysql
+lib/mariadb-10.1/bin/mysql_client_test
+-
+lib/mariadb-10.1/bin/mysql_config
+lib/mariadb-10.1/bin/mysql_convert_table_format
+lib/mariadb-10.1/bin/mysql_find_rows
+lib/mariadb-10.1/bin/mysql_fix_extensions
+-
+lib/mariadb-10.1/bin/mysql_install_db
+lib/mariadb-10.1/bin/mysql_plugin
+lib/mariadb-10.1/bin/mysql_secure_installation
+lib/mariadb-10.1/bin/mysql_setpermission
+lib/mariadb-10.1/bin/mysql_tzinfo_to_sql
+lib/mariadb-10.1/bin/mysql_upgrade
+lib/mariadb-10.1/bin/mysql_waitpid
+lib/mariadb-10.1/bin/mysql_zap
+lib/mariadb-10.1/bin/mysqlaccess
+-
+lib/mariadb-10.1/bin/mysqladmin
+lib/mariadb-10.1/bin/mysqlbinlog
+lib/mariadb-10.1/bin/mysqlbug
+lib/mariadb-10.1/bin/mysqlcheck
+lib/mariadb-10.1/bin/mysqld
+lib/mariadb-10.1/bin/mysqld_multi
+lib/mariadb-10.1/bin/mysqld_safe
+lib/mariadb-10.1/bin/mysqldump
+lib/mariadb-10.1/bin/mysqldumpslow
+lib/mariadb-10.1/bin/mysqlhotcopy
+lib/mariadb-10.1/bin/mysqlimport
+-
+lib/mariadb-10.1/bin/mysqlshow
+lib/mariadb-10.1/bin/mysqlslap
+lib/mariadb-10.1/bin/mysqltest
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+lib/mariadb-10.1/bin/perror
+lib/mariadb-10.1/bin/replace
+lib/mariadb-10.1/bin/resolve_stack_dump
+lib/mariadb-10.1/bin/resolveip
+-
+-
+share/man/mariadb-10.1/man1/innochecksum.1.gz
+share/man/mariadb-10.1/man1/msql2mysql.1.gz
+share/man/mariadb-10.1/man1/my_print_defaults.1.gz
+share/man/mariadb-10.1/man1/myisam_ftdump.1.gz
+share/man/mariadb-10.1/man1/myisamchk.1.gz
+share/man/mariadb-10.1/man1/myisamlog.1.gz
+share/man/mariadb-10.1/man1/myisampack.1.gz
+share/man/mariadb-10.1/man1/mysql-stress-test.pl.1.gz
+share/man/mariadb-10.1/man1/mysql-test-run.pl.1.gz
+share/man/mariadb-10.1/man1/mysql.1.gz
+share/man/mariadb-10.1/man1/mysql.server.1.gz
+share/man/mariadb-10.1/man1/mysql_client_test.1.gz
+share/man/mariadb-10.1/man1/mysql_client_test_embedded.1.gz
+share/man/mariadb-10.1/man1/mysql_config.1.gz
+share/man/mariadb-10.1/man1/mysql_convert_table_format.1.gz
+share/man/mariadb-10.1/man1/mysql_find_rows.1.gz
+share/man/mariadb-10.1/man1/mysql_fix_extensions.1.gz
+-
+share/man/mariadb-10.1/man1/mysql_install_db.1.gz
+-
+share/man/mariadb-10.1/man1/mysql_secure_installation.1.gz
+share/man/mariadb-10.1/man1/mysql_setpermission.1.gz
+share/man/mariadb-10.1/man1/mysql_tzinfo_to_sql.1.gz
+share/man/mariadb-10.1/man1/mysql_upgrade.1.gz
+share/man/mariadb-10.1/man1/mysql_waitpid.1.gz
+share/man/mariadb-10.1/man1/mysql_zap.1.gz
+share/man/mariadb-10.1/man1/mysqlaccess.1.gz
+share/man/mariadb-10.1/man1/mysqladmin.1.gz
+share/man/mariadb-10.1/man1/mysqlbinlog.1.gz
+-
+share/man/mariadb-10.1/man1/mysqlcheck.1.gz
+share/man/mariadb-10.1/man1/mysqld_multi.1.gz
+share/man/mariadb-10.1/man1/mysqld_safe.1.gz
+share/man/mariadb-10.1/man1/mysqldump.1.gz
+share/man/mariadb-10.1/man1/mysqldumpslow.1.gz
+share/man/mariadb-10.1/man1/mysqlhotcopy.1.gz
+share/man/mariadb-10.1/man1/mysqlimport.1.gz
+-
+share/man/mariadb-10.1/man1/mysqlshow.1.gz
+share/man/mariadb-10.1/man1/mysqlslap.1.gz
+share/man/mariadb-10.1/man1/mysqltest.1.gz
+share/man/mariadb-10.1/man1/mysqltest_embedded.1.gz
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+share/man/mariadb-10.1/man1/perror.1.gz
+share/man/mariadb-10.1/man1/replace.1.gz
+share/man/mariadb-10.1/man1/resolve_stack_dump.1.gz
+share/man/mariadb-10.1/man1/resolveip.1.gz
+share/man/mariadb-10.1/man8/mysqld.8.gz
+-
+-
+-
+-

Added: trunk/dports/databases/mariadb-10.1/files/my.cnf
===================================================================
--- trunk/dports/databases/mariadb-10.1/files/my.cnf	                        (rev 0)
+++ trunk/dports/databases/mariadb-10.1/files/my.cnf	2014-07-17 16:22:17 UTC (rev 122194)
@@ -0,0 +1,2 @@
+# Use default MacPorts settings
+!include @PREFIX@/etc/@NAME@/macports-default.cnf

Added: trunk/dports/databases/mariadb-10.1/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/databases/mariadb-10.1/files/patch-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/databases/mariadb-10.1/files/patch-CMakeLists.txt.diff	2014-07-17 16:22:17 UTC (rev 122194)
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt	2014-01-29 12:25:15.000000000 -0800
++++ b/CMakeLists.txt	2014-01-30 13:39:26.000000000 -0800
+@@ -28,6 +28,7 @@
+ 
+ MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
+ 
++SET(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
+ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
+ 
+ # Distinguish between community and non-community builds, with the
+@@ -242,6 +243,9 @@
+   SET(DEFAULT_MYSQL_HOME ${CMAKE_INSTALL_PREFIX})
+   SET(SHAREDIR ${DEFAULT_MYSQL_HOME}/${INSTALL_MYSQLSHAREDIR})
+ ENDIF()
++IF(SYSCONFDIR)
++  SET(DEFAULT_SYSCONFDIR "${SYSCONFDIR}")
++ENDIF()
+ 
+ SET(DEFAULT_BASEDIR "${DEFAULT_MYSQL_HOME}")
+ IF(INSTALL_MYSQLDATADIR MATCHES "^/.*")

Added: trunk/dports/databases/mariadb-10.1/files/patch-cmake-install_layout.cmake.diff
===================================================================
--- trunk/dports/databases/mariadb-10.1/files/patch-cmake-install_layout.cmake.diff	                        (rev 0)
+++ trunk/dports/databases/mariadb-10.1/files/patch-cmake-install_layout.cmake.diff	2014-07-17 16:22:17 UTC (rev 122194)
@@ -0,0 +1,56 @@
+--- a/cmake/install_layout.cmake	2012-12-05 07:50:37.000000000 -0800
++++ b/cmake/install_layout.cmake	2012-12-05 07:48:31.000000000 -0800
+@@ -71,7 +71,7 @@
+ ENDIF()
+ 
+ SET(INSTALL_LAYOUT "${INSTALL_LAYOUT}"
+-CACHE STRING "Installation directory layout. Options are: STANDALONE (as in zip or tar.gz installer) RPM DEB SVR4")
++CACHE STRING "Installation directory layout. Options are: STANDALONE (as in zip or tar.gz installer) RPM DEB SVR4 MACPORTS")
+ 
+ IF(UNIX)
+   IF(INSTALL_LAYOUT MATCHES "RPM")
+@@ -87,7 +87,7 @@
+     SET(CMAKE_INSTALL_PREFIX ${default_prefix}
+       CACHE PATH "install prefix" FORCE)
+   ENDIF()
+-  SET(VALID_INSTALL_LAYOUTS "RPM" "STANDALONE" "DEB" "SVR4")
++  SET(VALID_INSTALL_LAYOUTS "RPM" "STANDALONE" "DEB" "SVR4" "MACPORTS")
+   LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
+   IF(ind EQUAL -1)
+     MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
+@@ -217,6 +217,35 @@
+ SET(INSTALL_PLUGINTESTDIR_SVR4          ${plugin_tests})
+ 
+ SET(INSTALL_UNIX_ADDRDIR_SVR            "/tmp/mysql.sock")
++#
++# MACPORTS layout
++#
++SET(INSTALL_BINDIR_MACPORTS             "lib/@NAME@/bin")
++SET(INSTALL_SBINDIR_MACPORTS            "lib/@NAME@/bin")
++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@/mysql")
++#
++SET(INSTALL_DOCDIR_MACPORTS             "share/doc/@NAME@")
++SET(INSTALL_DOCREADMEDIR_MACPORTS       "share/doc/@NAME@")
++SET(INSTALL_MANDIR_MACPORTS             "share/man/@NAME@")
++SET(INSTALL_INFODIR_MACPORTS            "share/doc/@NAME@")
++#
++SET(INSTALL_SHAREDIR_MACPORTS           "share/@NAME@")
++SET(INSTALL_MYSQLSHAREDIR_MACPORTS      "share/@NAME@")
++SET(INSTALL_MYSQLTESTDIR_MACPORTS       "share/@NAME@/mysql-test")
++SET(INSTALL_SQLBENCHDIR_MACPORTS        "share/@NAME@")
++SET(INSTALL_SUPPORTFILESDIR_MACPORTS    "share/@NAME@/support-files")
++#
++SET(INSTALL_MYSQLDATADIR_MACPORTS       "var/db/@NAME@")
++SET(INSTALL_PLUGINTESTDIR_MACPORTS      ${plugin_tests})
++#
++# SUID /bin/ps is not in MacPorts sandbox causing scripts/CMakeLists.txt tests to fail so we set FIND_PROC here.
++#
++SET(FIND_PROC "ps -ef | grep -v mysqld_safe | grep -- $MYSQLD | grep $PID > /dev/null")
+ 
+ # Clear cached variables if install layout was changed
+ IF(OLD_INSTALL_LAYOUT)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140717/840fa59b/attachment-0001.html>


More information about the macports-changes mailing list