[99823] branches/pixilla-mysqls-55/dports/databases
pixilla at macports.org
pixilla at macports.org
Sun Nov 18 03:23:36 PST 2012
Revision: 99823
https://trac.macports.org/changeset/99823
Author: pixilla at macports.org
Date: 2012-11-18 03:23:36 -0800 (Sun, 18 Nov 2012)
Log Message:
-----------
databases/mariadb:
databases/mariadb55:
- Unify mariadb and mariadb55.
- Obsolete mariadb replaced by mariadb55.
Added Paths:
-----------
branches/pixilla-mysqls-55/dports/databases/mariadb55/
branches/pixilla-mysqls-55/dports/databases/mariadb55/Portfile
branches/pixilla-mysqls-55/dports/databases/mariadb55/files/
branches/pixilla-mysqls-55/dports/databases/mariadb55/files/macports-default.cnf
branches/pixilla-mysqls-55/dports/databases/mariadb55/files/mariadb
branches/pixilla-mysqls-55/dports/databases/mariadb55/files/mariadb55
branches/pixilla-mysqls-55/dports/databases/mariadb55/files/my.cnf
branches/pixilla-mysqls-55/dports/databases/mariadb55/files/patch-CMakeLists.txt.diff
branches/pixilla-mysqls-55/dports/databases/mariadb55/files/patch-cmake-install_layout.cmake.diff
branches/pixilla-mysqls-55/dports/databases/mariadb55/files/patch-storage-maria-CMakeLists.txt.diff
branches/pixilla-mysqls-55/dports/databases/mariadb55/files/patch-storage-perfschema-CMakeLists.txt.diff
Removed Paths:
-------------
branches/pixilla-mysqls-55/dports/databases/mariadb/
Added: branches/pixilla-mysqls-55/dports/databases/mariadb55/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/databases/mariadb55/Portfile (rev 0)
+++ branches/pixilla-mysqls-55/dports/databases/mariadb55/Portfile 2012-11-18 11:23:36 UTC (rev 99823)
@@ -0,0 +1,309 @@
+# -*- 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$
+
+PortSystem 1.0
+
+name mariadb55
+set name_mysql ${name}
+version 5.5.27
+# 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 == $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 MySQL is an open-source, multi-threaded SQL database with a command \
+ syntax very similar to mSQL.
+
+ master_sites \
+ http://ftp.osuosl.org/pub/mariadb/mariadb-${version}/kvm-tarbake-jaunty-x86/ \
+ http://mirror2.hs-esslingen.de/mariadb/mariadb-${version}/kvm-tarbake-jaunty-x86/ \
+ http://mirror3.layerjet.com/mariadb/mariadb-${version}/kvm-tarbake-jaunty-x86/ \
+ http://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/mariadb-${version}/kvm-tarbake-jaunty-x86/ \
+ http://mirrors.supportex.net/mariadb/mariadb-${version}/kvm-tarbake-jaunty-x86/ \
+ http://mirror.switch.ch/mirror/mariadb/mariadb-${version}/kvm-tarbake-jaunty-x86/ \
+ http://mirrors.fe.up.pt/pub/mariadb/mariadb-${version}/kvm-tarbake-jaunty-x86/ \
+ http://gd.tuwien.ac.at/db/mariadb/mariadb-${version}/kvm-tarbake-jaunty-x86/ \
+ http://mirror.aarnet.edu.au/pub/MariaDB/mariadb-${version}/kvm-tarbake-jaunty-x86/ \
+ http://ftp.heanet.ie/mirrors/mariadb/mariadb-${version}/kvm-tarbake-jaunty-x86/
+
+ distname mariadb-${version}
+ dist_subdir mariadb
+ use_parallel_build yes
+
+ patch.pre_args -p1
+ patchfiles patch-cmake-install_layout.cmake.diff \
+ patch-storage-maria-CMakeLists.txt.diff \
+ patch-storage-perfschema-CMakeLists.txt.diff \
+ patch-CMakeLists.txt.diff
+
+ checksums rmd160 6a55dcd3bf14365f7bb06f1a936ac9917ca4dc7f \
+ sha256 013523173e842c6a87729b17d2434bd44dd61215c4c6de7b41132fc065d941f7
+
+ depends_lib-append port:zlib
+ depends_run-append port:mysql_select
+
+ if [variant_isset universal] {
+ archcheck.files-append lib/libevent.dylib
+ depends_build-append port:libevent
+ }
+
+ select.group mysql
+ select.file ${filespath}/${name_mysql}
+
+ archcheck.files lib/libz.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
+ build.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=OFF \
+ -DWITH_ZLIB:STRING=system \
+ -DWITH_UNIT_TESTS:BOOL=ON \
+ -DENABLE_GCOV:BOOL=OFF \
+ -DENABLE_DTRACE:BOOL=OFF \
+ -DWITH_READLINE:BOOL=ON \
+ -DWITH_LIBWRAP:BOOL=ON \
+ -DWITH_SSL:STRING=no
+
+ 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 } {
+
+ set deactivate_proc registry_deactivate_composite
+ if {[info commands registry_deactivate_composite] == {}} {
+ set deactivate_proc registry_deactivate
+ }
+ $deactivate_proc ${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
+ }
+
+ livecheck.type regex
+ livecheck.url http://downloads.mariadb.org/MariaDB/+releases/
+ livecheck.regex "<a 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" == ${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
+}
+
+set name_mysql_old mariadb
+set ver_mysql_old 5.5.25
+set rev_mysql_old 1
+
+subport ${name_mysql_old} {
+
+ set name_mysql_old [lindex [split ${subport} -] 0]
+
+notes "
+
+This port is in the process of being replaced by ${name_mysql}.
+Please install the ${name_mysql} instead.
+
+Steps to move from ${name_mysql_old} to ${name_mysql}:
+1. Unload ${name_mysql_old}-server:
+ \$ sudo port unload ${name_mysql_old}-server
+2. Uninstall ${name_mysql_old} and ${name_mysql_old}-server.
+ \$ sudo port uninstall ${name_mysql_old}-server ${name_mysql_old}
+3. Install ${name_mysql} and ${name_mysql}-server.
+ \$ sudo port install ${name_mysql} ${name_mysql}-server
+4. Move your db files from ${prefix}/var/db/${name_mysql_old} to ${prefix}/var/db/${name_mysql}.
+ \$ sudo mv ${prefix}/var/db/${name_mysql_old}/* ${prefix}/var/db/${name_mysql}/
+5. Load ${name_mysql}-server and verify your databases are available.
+ \$ sudo port load ${name_mysql}-server
+
+"
+
+ replaced_by ${name_mysql}
+ set obsolete.action readme
+ PortGroup obsolete 1.0
+
+ version ${ver_mysql_old}
+ revision ${rev_mysql_old}
+}
+
+subport ${name_mysql_old}-server {
+
+
+notes "
+
+This port is in the process of being replaced by ${name_mysql}.
+Please install the ${name_mysql} instead.
+
+Steps to move from ${name_mysql_old} to ${name_mysql}:
+1. Unload ${name_mysql_old}-server:
+ \$ sudo port unload ${name_mysql_old}-server
+2. Uninstall ${name_mysql_old} and ${name_mysql_old}-server.
+ \$ sudo port uninstall ${name_mysql_old}-server ${name_mysql_old}
+3. Install ${name_mysql} and ${name_mysql}-server.
+ \$ sudo port install ${name_mysql} ${name_mysql}-server
+4. Move your db files from ${prefix}/var/db/${name_mysql_old} to ${prefix}/var/db/${name_mysql}.
+ \$ sudo mv ${prefix}/var/db/${name_mysql_old}/* ${prefix}/var/db/${name_mysql}/
+5. Load ${name_mysql}-server and verify your databases are available.
+ \$ sudo port load ${name_mysql}-server
+
+"
+
+ replaced_by ${name_mysql}-server
+ set obsolete.action readme
+ PortGroup obsolete 1.0
+
+ version ${ver_mysql_old}
+ revision ${rev_mysql_old}
+}
Property changes on: branches/pixilla-mysqls-55/dports/databases/mariadb55/Portfile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: branches/pixilla-mysqls-55/dports/databases/mariadb55/files/macports-default.cnf
===================================================================
--- branches/pixilla-mysqls-55/dports/databases/mariadb55/files/macports-default.cnf (rev 0)
+++ branches/pixilla-mysqls-55/dports/databases/mariadb55/files/macports-default.cnf 2012-11-18 11:23:36 UTC (rev 99823)
@@ -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: branches/pixilla-mysqls-55/dports/databases/mariadb55/files/mariadb
===================================================================
Added: branches/pixilla-mysqls-55/dports/databases/mariadb55/files/mariadb55
===================================================================
--- branches/pixilla-mysqls-55/dports/databases/mariadb55/files/mariadb55 (rev 0)
+++ branches/pixilla-mysqls-55/dports/databases/mariadb55/files/mariadb55 2012-11-18 11:23:36 UTC (rev 99823)
@@ -0,0 +1,141 @@
+-
+-
+-
+-
+-
+lib/mariadb55/bin/innochecksum
+lib/mariadb55/bin/msql2mysql
+lib/mariadb55/bin/my_print_defaults
+lib/mariadb55/bin/myisam_ftdump
+lib/mariadb55/bin/myisamchk
+lib/mariadb55/bin/myisamlog
+lib/mariadb55/bin/myisampack
+lib/mariadb55/bin/mysql
+lib/mariadb55/bin/mysql_client_test
+-
+lib/mariadb55/bin/mysql_config
+lib/mariadb55/bin/mysql_convert_table_format
+lib/mariadb55/bin/mysql_find_rows
+lib/mariadb55/bin/mysql_fix_extensions
+-
+lib/mariadb55/bin/mysql_install_db
+lib/mariadb55/bin/mysql_plugin
+lib/mariadb55/bin/mysql_secure_installation
+lib/mariadb55/bin/mysql_setpermission
+lib/mariadb55/bin/mysql_tzinfo_to_sql
+lib/mariadb55/bin/mysql_upgrade
+lib/mariadb55/bin/mysql_waitpid
+lib/mariadb55/bin/mysql_zap
+lib/mariadb55/bin/mysqlaccess
+-
+lib/mariadb55/bin/mysqladmin
+lib/mariadb55/bin/mysqlbinlog
+lib/mariadb55/bin/mysqlbug
+lib/mariadb55/bin/mysqlcheck
+lib/mariadb55/bin/mysqld
+lib/mariadb55/bin/mysqld_multi
+lib/mariadb55/bin/mysqld_safe
+lib/mariadb55/bin/mysqldump
+lib/mariadb55/bin/mysqldumpslow
+lib/mariadb55/bin/mysqlhotcopy
+lib/mariadb55/bin/mysqlimport
+-
+lib/mariadb55/bin/mysqlshow
+lib/mariadb55/bin/mysqlslap
+lib/mariadb55/bin/mysqltest
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+lib/mariadb55/bin/perror
+lib/mariadb55/bin/replace
+lib/mariadb55/bin/resolve_stack_dump
+lib/mariadb55/bin/resolveip
+-
+-
+share/man/mariadb55/man1/innochecksum.1.gz
+share/man/mariadb55/man1/msql2mysql.1.gz
+share/man/mariadb55/man1/my_print_defaults.1.gz
+share/man/mariadb55/man1/myisam_ftdump.1.gz
+share/man/mariadb55/man1/myisamchk.1.gz
+share/man/mariadb55/man1/myisamlog.1.gz
+share/man/mariadb55/man1/myisampack.1.gz
+share/man/mariadb55/man1/mysql-stress-test.pl.1.gz
+share/man/mariadb55/man1/mysql-test-run.pl.1.gz
+share/man/mariadb55/man1/mysql.1.gz
+share/man/mariadb55/man1/mysql.server.1.gz
+share/man/mariadb55/man1/mysql_client_test.1.gz
+share/man/mariadb55/man1/mysql_client_test_embedded.1.gz
+share/man/mariadb55/man1/mysql_config.1.gz
+share/man/mariadb55/man1/mysql_convert_table_format.1.gz
+share/man/mariadb55/man1/mysql_find_rows.1.gz
+share/man/mariadb55/man1/mysql_fix_extensions.1.gz
+share/man/mariadb55/man1/mysql_fix_privilege_tables.1.gz
+share/man/mariadb55/man1/mysql_install_db.1.gz
+-
+share/man/mariadb55/man1/mysql_secure_installation.1.gz
+share/man/mariadb55/man1/mysql_setpermission.1.gz
+share/man/mariadb55/man1/mysql_tzinfo_to_sql.1.gz
+share/man/mariadb55/man1/mysql_upgrade.1.gz
+share/man/mariadb55/man1/mysql_waitpid.1.gz
+share/man/mariadb55/man1/mysql_zap.1.gz
+share/man/mariadb55/man1/mysqlaccess.1.gz
+share/man/mariadb55/man1/mysqladmin.1.gz
+share/man/mariadb55/man1/mysqlbinlog.1.gz
+-
+share/man/mariadb55/man1/mysqlcheck.1.gz
+share/man/mariadb55/man1/mysqld_multi.1.gz
+share/man/mariadb55/man1/mysqld_safe.1.gz
+share/man/mariadb55/man1/mysqldump.1.gz
+share/man/mariadb55/man1/mysqldumpslow.1.gz
+share/man/mariadb55/man1/mysqlhotcopy.1.gz
+share/man/mariadb55/man1/mysqlimport.1.gz
+share/man/mariadb55/man1/mysqlman.1.gz
+share/man/mariadb55/man1/mysqlshow.1.gz
+share/man/mariadb55/man1/mysqlslap.1.gz
+share/man/mariadb55/man1/mysqltest.1.gz
+share/man/mariadb55/man1/mysqltest_embedded.1.gz
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+share/man/mariadb55/man1/perror.1.gz
+share/man/mariadb55/man1/replace.1.gz
+share/man/mariadb55/man1/resolve_stack_dump.1.gz
+share/man/mariadb55/man1/resolveip.1.gz
+share/man/mariadb55/man8/mysqld.8.gz
+share/man/mariadb55/man8/mysqlmanager.8.gz
+-
+-
+-
Added: branches/pixilla-mysqls-55/dports/databases/mariadb55/files/my.cnf
===================================================================
--- branches/pixilla-mysqls-55/dports/databases/mariadb55/files/my.cnf (rev 0)
+++ branches/pixilla-mysqls-55/dports/databases/mariadb55/files/my.cnf 2012-11-18 11:23:36 UTC (rev 99823)
@@ -0,0 +1,2 @@
+# Use default MacPorts settings
+!include @PREFIX@/etc/@NAME@/macports-default.cnf
Added: branches/pixilla-mysqls-55/dports/databases/mariadb55/files/patch-CMakeLists.txt.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/databases/mariadb55/files/patch-CMakeLists.txt.diff (rev 0)
+++ branches/pixilla-mysqls-55/dports/databases/mariadb55/files/patch-CMakeLists.txt.diff 2012-11-18 11:23:36 UTC (rev 99823)
@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt 2012-10-12 11:06:29.000000000 -0700
++++ b/CMakeLists.txt 2012-10-12 11:05:22.000000000 -0700
+@@ -245,8 +245,8 @@
+ ENDIF()
+ SET(DEFAULT_CHARSET_HOME "${DEFAULT_MYSQL_HOME}")
+ SET(PLUGINDIR "${DEFAULT_MYSQL_HOME}/${INSTALL_PLUGINDIR}")
+-IF(INSTALL_SYSCONFDIR)
+- SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}")
++IF(SYSCONFDIR)
++ SET(DEFAULT_SYSCONFDIR "${SYSCONFDIR}")
+ ENDIF()
+
+
Added: branches/pixilla-mysqls-55/dports/databases/mariadb55/files/patch-cmake-install_layout.cmake.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/databases/mariadb55/files/patch-cmake-install_layout.cmake.diff (rev 0)
+++ branches/pixilla-mysqls-55/dports/databases/mariadb55/files/patch-cmake-install_layout.cmake.diff 2012-11-18 11:23:36 UTC (rev 99823)
@@ -0,0 +1,52 @@
+--- a/cmake/install_layout.cmake 2012-10-12 11:06:29.000000000 -0700
++++ b/cmake/install_layout.cmake 2012-10-12 11:05:22.000000000 -0700
+@@ -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,31 @@
+ 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})
+
+ # Clear cached variables if install layout was changed
+ IF(OLD_INSTALL_LAYOUT)
Added: branches/pixilla-mysqls-55/dports/databases/mariadb55/files/patch-storage-maria-CMakeLists.txt.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/databases/mariadb55/files/patch-storage-maria-CMakeLists.txt.diff (rev 0)
+++ branches/pixilla-mysqls-55/dports/databases/mariadb55/files/patch-storage-maria-CMakeLists.txt.diff 2012-11-18 11:23:36 UTC (rev 99823)
@@ -0,0 +1,11 @@
+--- a/storage/maria/CMakeLists.txt 2012-10-12 11:06:38.000000000 -0700
++++ b/storage/maria/CMakeLists.txt 2012-10-12 11:05:32.000000000 -0700
+@@ -92,4 +92,7 @@
+ CMAKE_DEPENDENT_OPTION(USE_ARIA_FOR_TMP_TABLES "Use Aria for temporary tables" ON
+ "WITH_ARIA_STORAGE_ENGINE" OFF)
+
+-ADD_SUBDIRECTORY(unittest)
++IF(WITH_MARIA_STORAGE_ENGINE)
++ ENABLE_TESTING()
++ ADD_SUBDIRECTORY(unittest)
++ENDIF()
Added: branches/pixilla-mysqls-55/dports/databases/mariadb55/files/patch-storage-perfschema-CMakeLists.txt.diff
===================================================================
--- branches/pixilla-mysqls-55/dports/databases/mariadb55/files/patch-storage-perfschema-CMakeLists.txt.diff (rev 0)
+++ branches/pixilla-mysqls-55/dports/databases/mariadb55/files/patch-storage-perfschema-CMakeLists.txt.diff 2012-11-18 11:23:36 UTC (rev 99823)
@@ -0,0 +1,11 @@
+--- a/storage/perfschema/CMakeLists.txt 2012-10-12 11:06:41.000000000 -0700
++++ b/storage/perfschema/CMakeLists.txt 2012-10-12 11:05:34.000000000 -0700
+@@ -74,6 +74,7 @@
+ )
+
+ MYSQL_ADD_PLUGIN(perfschema ${PERFSCHEMA_SOURCES} STORAGE_ENGINE DEFAULT STATIC_ONLY)
+-IF(WITH_PERFSCHEMA_STORAGE_ENGINE)
++IF(WITH_PERFSCHEMA_STORAGE_ENGINE AND WITH_UNIT_TESTS)
++ ENABLE_TESTING()
+ ADD_SUBDIRECTORY(unittest)
+ ENDIF()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121118/17ca6d91/attachment-0001.html>
More information about the macports-changes
mailing list