<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a4a1162eae29d8f8adb744a1b1f420569d5e03b2">https://github.com/macports/macports-ports/commit/a4a1162eae29d8f8adb744a1b1f420569d5e03b2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a4a1162eae2 mysql4: delete EOL port
</span>a4a1162eae2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a4a1162eae29d8f8adb744a1b1f420569d5e03b2
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sat May 22 21:37:41 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> mysql4: delete EOL port
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Port is not known to currently build; not obsoleting since it is almost
</span><span style='display:block; white-space:pre;color:#404040;'> certainly no longer used. Remove all +mysql4 variants from dependents.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/4115
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/43431
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/58607
</span>---
aqua/qt3-mac/Portfile | 11 +---
databases/mysql4/Portfile | 125 -----------------------------------------
databases/mysql4/files/my.cnf | 53 -----------------
databases/mysql5/Portfile | 1 -
databases/mysqltcl/Portfile | 9 ---
databases/mysqlxx/Portfile | 11 +---
databases/soci/Portfile | 9 +--
lang/php/Portfile | 23 +++-----
mail/exim/Portfile | 14 +----
multimedia/mythtv.28/Portfile | 4 +-
net/mediatomb/Portfile | 9 +--
python/py-mysql/Portfile | 22 +++-----
ruby/rb-mysql/Portfile | 10 +---
ruby/rb19-mysql/Portfile | 10 +---
security/libpreludedb/Portfile | 6 --
15 files changed, 27 insertions(+), 290 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt3-mac/Portfile b/aqua/qt3-mac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b5f2d101241..934c74eda68 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt3-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt3-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,16 +29,7 @@ depends_lib port:libmng \
</span> port:libpng \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql4 conflicts mysql5 description "add MySQL 4 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -no-sql-mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -qt-sql-mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -L${prefix}/lib/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/include/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -plugin-sql-mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql5 conflicts mysql4 description "add MySQL 5 support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mysql5 description "add MySQL 5 support" {
</span> depends_lib-append path:bin/mysql_config5:mysql5
configure.args-delete -no-sql-mysql
configure.args-append -qt-sql-mysql \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql4/Portfile b/databases/mysql4/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 30de1893fb3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,125 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- 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
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup deprecated 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Support for 4.1 ended 2009-12-31
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-deprecated.upstream_support no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name mysql4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts mysql5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.1.22
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.mysql.com/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories databases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname mysql-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Multithreaded SQL database server
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MySQL is an open-source, multi-threaded SQL database \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- with a command syntax very similar to mSQL.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites mysql:MySQL-4.1/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 37b4479951fa0cf052269d27c41ca200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set dbdir ${prefix}/var/db/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s%/etc/my.cnf%${prefix}/etc/${name}/my.cnf%g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/scripts/mysqlaccess.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/scripts/mysqld_multi.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/scripts/mysqldumpslow.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/scripts/mysqlhotcopy.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/sql-bench/bench-init.pl.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/support-files/my-huge.cnf.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/support-files/my-innodb-heavy-4G.cnf.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/support-files/my-large.cnf.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/support-files/my-medium.cnf.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/support-files/my-small.cnf.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/support-files/mysql.server.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s%/etc/%${prefix}/etc/${name}/%g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/mysys/default.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --infodir=${prefix}/share/info \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --localstatedir=${dbdir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --sysconfdir=${prefix}/etc/${name} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-openssl=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-extra-charsets=complex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-innodb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-unix-socket-path=${prefix}/var/run/mysqld/mysqld.sock \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mysqld-user=mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-debug \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-bench \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-thread-safe-client
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant server {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Create a startupitem to start/stop the server
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.create yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.start "${prefix}/share/mysql/mysql.server start"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.stop "${prefix}/share/mysql/mysql.server stop"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/var/log/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.keepdirs ${destroot}${prefix}/var/log/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset server] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- addgroup mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gid [existsgroup mysql]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- adduser mysql gid=${gid} realname=MySQL\ Server
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chown mysql:mysql ${destroot}${prefix}/var/log/mysql"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "rm -rf ${destroot}${prefix}/mysql-test"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 775 -d ${destroot}${dbdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/var/run/mysqld
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.keepdirs-append ${destroot}${dbdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.keepdirs-append ${destroot}${prefix}/var/run/mysqld
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset server] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -o root -m 755 -d ${destroot}${prefix}/etc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -o root -m 644 -c ${filespath}/my.cnf ${destroot}${prefix}/etc/${name}/my.cnf.sample
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PREFIX|${prefix}|g" ${destroot}${prefix}/etc/${name}/my.cnf.sample
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -o mysql -g mysql -m 775 -d ${destroot}${dbdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.keepdirs-append ${destroot}${dbdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chown -R mysql:mysql ${destroot}${dbdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -o mysql -g mysql -m 755 -d ${destroot}${prefix}/var/run/mysqld
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.keepdirs-append ${destroot}${prefix}/var/run/mysqld
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chown -R mysql:mysql ${destroot}${prefix}/var/run/mysqld"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-install {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "******************************************************"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "* You might want to run *"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "* sudo -u mysql mysql_install_db *"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "* if this is a new install *"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "* *"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "* If you did not choose the server variant you may *"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "* add a mysql user and you will need to change the *"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "* ownership to that user for the following: *"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "* ${dbdir} *"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "* ${prefix}/var/run/mysqld *"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "* ${prefix}/var/log/mysql *"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "******************************************************"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type none
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql4/files/my.cnf b/databases/mysql4/files/my.cnf
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a808205630f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql4/files/my.cnf
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,53 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# /etc/mysql/my.cnf: The global mysql configuration file.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This file can be simultaneously placed in three places:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 1. /etc/mysql/my.cnf to set global options.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 2. /var/lib/mysql/my.cnf to set server-specific options.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 3. ~/.my.cnf to set user-specific options.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# One can use all long options that the program supports.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Run the program with --help to get a list of them.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The following values assume you have at least 32M RAM!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[client]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#password = my_password
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-port = 3306
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-socket = __PREFIX/var/run/mysqld/mysqld.sock
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[safe_mysqld]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-err-log = __PREFIX/var/log/mysql/mysql.err
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pid-file = __PREFIX/var/run/mysqld/mysqld.pid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-socket = __PREFIX/var/run/mysqld/mysqld.sock
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[mysqld_safe]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-err-log = __PREFIX/var/log/mysql/mysql.err
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pid-file = __PREFIX/var/run/mysqld/mysqld.pid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-socket = __PREFIX/var/run/mysqld/mysqld.sock
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[mysqld]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#skip-networking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-skip-innodb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-user = mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pid-file = __PREFIX/var/run/mysqld/mysqld.pid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-socket = __PREFIX/var/run/mysqld/mysqld.sock
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-port = 3306
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-log = __PREFIX/var/log/mysql/mysql.log
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-basedir = __PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-datadir = __PREFIX/var/db/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-tmpdir = /tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-language = __PREFIX/share/mysql/english
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-skip-locking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set-variable = key_buffer=16M
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set-variable = max_allowed_packet=1M
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set-variable = thread_stack=128K
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[mysqldump]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-quick
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set-variable = max_allowed_packet=1M
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[mysql]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#no-auto-rehash # faster start of mysql but no tab completition
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[isamchk]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set-variable = key_buffer=16
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql5/Portfile b/databases/mysql5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1738b58862a..a32137380d7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,6 @@ if {${name} eq ${subport}} {
</span> PortGroup muniversal 1.0
revision ${revision_client}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mysql4
</span> depends_lib \
port:zlib \
path:lib/libssl.dylib:openssl \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysqltcl/Portfile b/databases/mysqltcl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c10a43f8343..bf953b7371e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysqltcl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysqltcl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,12 +22,3 @@ configure.args --with-tcl=${prefix}/lib \
</span> --with-mysql-include=${prefix}/include/mysql5/mysql \
--with-mysql-lib=${prefix}/lib/mysql5/mysql \
--mandir=${prefix}/share/man
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql4 description Install against mysql4 instead of mysql5 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace path:bin/mysql_config5:mysql5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mysql4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --with-mysql-include=${prefix}/include/mysql5/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mysql-include=${prefix}/include/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --with-mysql-lib=${prefix}/lib/mysql5/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mysql-lib=${prefix}/lib/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysqlxx/Portfile b/databases/mysqlxx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6cd34bd06d6..da3ac13b544 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysqlxx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysqlxx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,20 +20,13 @@ checksums md5 b977bbf671df08661c15cde051db1513 \
</span> depends_lib port:gettext \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql4 conflicts mysql5 description {Build with MySQL 4 support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args --with-mysql=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql5 conflicts mysql4 description {Build with MySQL 5 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mysql5 description {Build with MySQL 5 support} {
</span> depends_lib-append path:bin/mysql_config5:mysql5
configure.args --with-mysql-lib=${prefix}/lib/mysql5/mysql \
--with-mysql-include=${prefix}/include/mysql5/mysql
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset mysql4]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +mysql5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +mysql5
</span>
livecheck.type regex
livecheck.url [lindex ${master_sites} 0]?C=M&O=D
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/soci/Portfile b/databases/soci/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e6f128e7974..1da2934fd01 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/soci/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/soci/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,14 +40,7 @@ variant boost description {Build with Boost integration} {
</span> configure.args-delete -DWITH_BOOST=OFF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql4 conflicts mysql5 description {Build MySQL 4 backend} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DWITH_MYSQL=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DMYSQL_INCLUDE_DIR=${prefix}/include/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DMYSQL_LIBRARY=${prefix}/lib/mysql/libmysqlclient_r.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql5 conflicts mysql4 description {Build MySQL 5 backend} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mysql5 description {Build MySQL 5 backend} {
</span> depends_lib-append port:mysql5
configure.args-delete -DWITH_MYSQL=OFF
configure.args-append -DMYSQL_INCLUDE_DIR=${prefix}/include/mysql5/mysql
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/Portfile b/lang/php/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6bb035d8803..82e30cf3e58 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1329,7 +1329,7 @@ subport ${php}-mysql {
</span> configure.args-append --with-zlib-dir=${prefix}
if {[vercmp ${branch} 5.3] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysqlnd conflicts mysql4 mysql5 mysql51 mysql55 mysql56 mariadb percona description {Use MySQL Native Driver} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysqlnd conflicts mysql5 mysql51 mysql55 mysql56 mariadb percona description {Use MySQL Native Driver} {
</span> configure.args-append --with-mysql=mysqlnd \
--with-mysqli=mysqlnd \
--with-pdo-mysql=mysqlnd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1352,14 +1352,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql4 conflicts mysqlnd mysql5 mysql51 mysql55 mysql56 mariadb percona description {Use MySQL 4 libraries} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mysql=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pdo-mysql=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql5 conflicts mysqlnd mysql4 mysql51 mysql55 mysql56 mariadb percona description {Use MySQL 5 libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql5 conflicts mysqlnd mysql51 mysql55 mysql56 mariadb percona description {Use MySQL 5 libraries} {
</span> depends_lib-append path:bin/mysql_config5:mysql5
post-extract {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1374,7 +1367,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock
</span> --with-mysql-sock=${prefix}/var/run/mysql5/mysqld.sock
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql51 conflicts mysqlnd mysql4 mysql5 mysql55 mysql56 mariadb percona description {Use MySQL 5.1 libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql51 conflicts mysqlnd mysql5 mysql55 mysql56 mariadb percona description {Use MySQL 5.1 libraries} {
</span> depends_lib-append port:mysql51
post-extract {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1389,7 +1382,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock
</span> --with-mysql-sock=${prefix}/var/run/mysql51/mysqld.sock
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql55 conflicts mysqlnd mysql4 mysql5 mysql51 mysql56 mariadb percona description {Use MySQL 5.5 libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql55 conflicts mysqlnd mysql5 mysql51 mysql56 mariadb percona description {Use MySQL 5.5 libraries} {
</span> depends_lib-append port:mysql55
post-extract {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1404,7 +1397,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock
</span> --with-mysql-sock=${prefix}/var/run/mysql55/mysqld.sock
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql56 conflicts mysqlnd mysql4 mysql5 mysql51 mysql55 mariadb percona description {Use MySQL 5.6 libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql56 conflicts mysqlnd mysql5 mysql51 mysql55 mariadb percona description {Use MySQL 5.6 libraries} {
</span> depends_lib-append port:mysql56
post-extract {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1419,7 +1412,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock
</span> --with-mysql-sock=${prefix}/var/run/mysql56/mysqld.sock
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mariadb conflicts mysqlnd mysql4 mysql5 mysql51 mysql55 mysql56 percona description {Use MariaDB libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb conflicts mysqlnd mysql5 mysql51 mysql55 mysql56 percona description {Use MariaDB libraries} {
</span> depends_lib-append port:mariadb
post-extract {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1434,7 +1427,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock
</span> --with-mysql-sock=${prefix}/var/run/mariadb/mysqld.sock
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant percona conflicts mysqlnd mysql4 mysql5 mysql51 mysql55 mysql56 mariadb description {Use Percona libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant percona conflicts mysqlnd mysql5 mysql51 mysql55 mysql56 mariadb description {Use Percona libraries} {
</span> depends_lib-append port:percona
post-extract {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1449,7 +1442,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock
</span> --with-mysql-sock=${prefix}/var/run/percona/mysqld.sock
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset mysql4] && ![variant_isset mysql5] && ![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mariadb] && ![variant_isset percona]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset mysql5] && ![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mariadb] && ![variant_isset percona]} {
</span> if {[vercmp ${branch} 5.3] >= 0} {
default_variants +mysqlnd
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/exim/Portfile b/mail/exim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 029390c10f5..4a273e503ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/exim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/exim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,11 +95,7 @@ post-destroot {
</span> reinplace "s|__PREFIX|${prefix}|g" ${destroot}${prefix}/share/exim/exim.sh
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql4 conflicts mysql5 description {build exim with support for mysql4 lookups} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql5 conflicts mysql4 description {build exim with support for mysql5 lookups} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mysql5 description {build exim with support for mysql5 lookups} {
</span> depends_lib-append path:bin/mysql_config5:mysql5
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,19 +116,13 @@ post-configure {
</span> reinplace "s|# LDAP_LIB_TYPE=OPENLDAP2|LDAP_LIB_TYPE=OPENLDAP2|g" ${worksrcpath}/Local/Makefile
# settings common to any lookup
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset mysql4]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || [variant_isset mysql5]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset mysql5]
</span> || [variant_isset ldap]
|| [variant_isset macports_ldap]
} then {
reinplace "s|^# LOOKUP_INCLUDE=.*|LOOKUP_INCLUDE=|g" ${worksrcpath}/Local/Makefile
reinplace "s|^# LOOKUP_LIBS=.*|LOOKUP_LIBS=-L${prefix}/lib|g" ${worksrcpath}/Local/Makefile
# lookup specific settings
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset mysql4]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^# LOOKUP_MYSQL=yes|LOOKUP_MYSQL=yes|g" ${worksrcpath}/Local/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^LOOKUP_LIBS=.*|& -L${prefix}/lib/mysql -lmysqlclient|g" ${worksrcpath}/Local/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^LOOKUP_INCLUDE=.*|& -I${prefix}/include/mysql -I ${prefix}/include|g" ${worksrcpath}/Local/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> if {[variant_isset mysql5]} {
reinplace "s|^# LOOKUP_MYSQL=yes|LOOKUP_MYSQL=yes|g" ${worksrcpath}/Local/Makefile
reinplace "s|^LOOKUP_LIBS=.*|& -L${prefix}/lib/mysql5/mysql -lmysqlclient |g" ${worksrcpath}/Local/Makefile
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mythtv.28/Portfile b/multimedia/mythtv.28/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f2a776ad365..de6681940a0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mythtv.28/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mythtv.28/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,9 +117,9 @@ if {$subport eq "mythtv-core${majorversion}"} {
</span> require_active_variants \
qt5-mysql-plugin mariadb55 mysql56
require_active_variants \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- p${perl5.major}-dbd-mysql mariadb {mariadb10_0 mariadb10_1 mysql4 mysql5 mysql51 mysql55 mysql56 mysql57 percona}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p${perl5.major}-dbd-mysql mariadb {mariadb10_0 mariadb10_1 mysql5 mysql51 mysql55 mysql56 mysql57 percona}
</span> require_active_variants \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${pymodver}-mysql mariadb55 {mysql4 mysql51 mysql55 mysql56 percona55}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${pymodver}-mysql mariadb55 {mysql51 mysql55 mysql56 percona55}
</span>
pre-fetch {
if {${os.platform} eq "darwin" && ${os.major} < 13} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/mediatomb/Portfile b/net/mediatomb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aa00b8ca95b..2ea27077a9b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/mediatomb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/mediatomb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,14 +67,7 @@ variant sqlite3 description {Use SQLite 3 database} {
</span>
default_variants +sqlite3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql4 conflicts mysql5 description {Use MySQL 4 database} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mysql-cfg=${prefix}/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql5 conflicts mysql4 description {Use MySQL 5 database} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mysql5 description {Use MySQL 5 database} {
</span> depends_lib-append path:bin/mysql_config5:mysql5
configure.args-append --enable-mysql \
--with-mysql-cfg=${prefix}/bin/mysql_config5
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-mysql/Portfile b/python/py-mysql/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 490c3d3733e..7fe00922348 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-mysql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-mysql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,13 +38,12 @@ if {${name} ne ${subport}} {
</span> }
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset mysql4] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset mysql51] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset mysql51] &&
</span> ![variant_isset mysql55] &&
![variant_isset mysql56] &&
![variant_isset mariadb55] &&
![variant_isset percona55]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "you must select either mysql4, mysql51, mysql55, mysql55, mysql56, mariadb55 or percona55"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "you must select either mysql51, mysql55, mysql55, mysql56, mariadb55 or percona55"
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,32 +56,27 @@ if {${name} ne ${subport}} {
</span>
set mysql_config {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql4 conflicts mysql51 mysql55 mysql56 mariadb55 percona55 description {Build with mysql4} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mysql_config bin/mysql_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql51 conflicts mysql4 mysql55 mysql56 mariadb55 percona55 description {Build with mysql51} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql51 conflicts mysql55 mysql56 mariadb55 percona55 description {Build with mysql51} {
</span> depends_lib-append port:mysql51
set mysql_config lib/mysql51/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql55 conflicts mysql4 mysql51 mysql56 mariadb55 percona55 description {Build with mysql55} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql55 conflicts mysql51 mysql56 mariadb55 percona55 description {Build with mysql55} {
</span> depends_lib-append port:mysql55
set mysql_config lib/mysql55/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mysql56 conflicts mysql4 mysql51 mysql55 mariadb55 percona55 description {Build with mysql56} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mysql56 conflicts mysql51 mysql55 mariadb55 percona55 description {Build with mysql56} {
</span> depends_lib-append port:mysql56
set mysql_config lib/mysql56/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant mariadb55 conflicts mysql4 mysql51 mysql55 mysql56 percona55 description {Build with mariadb55} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mariadb55 conflicts mysql51 mysql55 mysql56 percona55 description {Build with mariadb55} {
</span> depends_lib-append port:mariadb
set mysql_config lib/mariadb/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant percona55 conflicts mysql4 mysql51 mysql55 mysql56 mariadb55 description {Build with percona55} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant percona55 conflicts mysql51 mysql55 mysql56 mariadb55 description {Build with percona55} {
</span> depends_lib-append port:percona
set mysql_config lib/percona/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +86,7 @@ if {${name} ne ${subport}} {
</span> default_variants-append +mysql51
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset mysql4] && ![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mariadb55] && ![variant_isset percona55]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mariadb55] && ![variant_isset percona55]} {
</span> default_variants-append +mariadb55
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ruby/rb-mysql/Portfile b/ruby/rb-mysql/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ca97b3ef847..25281f89cfe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ruby/rb-mysql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ruby/rb-mysql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ maintainers freebsd.org:roberto
</span>
description Ruby API for the Mysql database
long_description This is the Ruby library for accessing Mysql \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- databases from within Ruby. It works with Mysql 4 or 5.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ databases from within Ruby. It works with Mysql 5.
</span> categories-append databases
homepage http://www.tmtm.org/mysql/ruby/
master_sites http://tmtm.org/downloads/mysql/ruby/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,11 +19,3 @@ platforms darwin
</span> depends_lib path:bin/mysql_config5:mysql5
depends_build port:ruby
configure.args --with-mysql-config=${prefix}/bin/mysql_config5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql4 description "Build using MySQL 4.1 client library" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete path:bin/mysql_config5:mysql5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-mysql-config=${prefix}/bin/mysql_config5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:bin/mysql_config:mysql4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mysql-config=${prefix}/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/ruby/rb19-mysql/Portfile b/ruby/rb19-mysql/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 221efcb7318..f448a9ff9cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ruby/rb19-mysql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ruby/rb19-mysql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ maintainers nomaintainer
</span> description Ruby client library for MySQL
long_description Ruby client library for accessing MySQL \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- databases from Ruby. It works with MySQL 4 or 5.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ databases from Ruby. It works with MySQL 5.
</span>
homepage http://www.tmtm.org/mysql/ruby/
master_sites http://tmtm.org/downloads/mysql/ruby/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,11 +26,3 @@ depends_lib-append path:bin/mysql_config5:mysql5
</span> universal_variant no
configure.args --with-mysql-config=${prefix}/bin/mysql_config5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql4 description "Build using MySQL 4.1 client library" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete path:bin/mysql_config5:mysql5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-mysql-config=${prefix}/bin/mysql_config5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mysql-config=${prefix}/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/libpreludedb/Portfile b/security/libpreludedb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a4a883a1ae4..40199adf0cf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/libpreludedb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/libpreludedb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,12 +62,6 @@ variant sqlite3 description {sqlite3 database support} {
</span> depends_lib-append port:sqlite3
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#variant mysql4 description {mysql4 database support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-delete --without-mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-append --with-mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# depends_lib-append port:mysql4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> #variant mysql5 description {mysql5 database support} {
# configure.args-delete --without-mysql
# configure.args-append --with-mysql
</pre><pre style='margin:0'>
</pre>