Index: head/Mk/Uses/mysql.mk =================================================================== --- head/Mk/Uses/mysql.mk (revision 434623) +++ head/Mk/Uses/mysql.mk (revision 434624) @@ -1,142 +1,149 @@ # $FreeBSD$ # # Provide support for MySQL # Feature: mysql # Usage: USES=mysql or USES=mysql:args # Valid ARGS: , client, server, embedded # # version If no version is given (by the maintainer via the port), try to # find the currently installed version. Fall back to default if # necessary (MySQL-5.6 = 56). # client Depends on the libmysqlclient library (default) # server/embedded # Depend on the server at run/build time. If none of these is # set, depends on the client. # # IGNORE_WITH_MYSQL # This variable can be defined if the ports does not support one # or more versions of MySQL. # WITH_MYSQL_VER # User defined variable to set MySQL version. # MYSQL_VER # Detected MySQL version. # # MAINTAINER: ports@FreeBSD.org .if !defined(_INCLUDE_USES_MYSQL_MK) _INCLUDE_USES_MYSQL_MK= yes .if !empty(mysql_ARGS) .undef _WANT_MYSQL_VER .undef _WANT_MYSQL_SERVER .undef _WANT_MYSQL_EMBEDDED _MYSQL_ARGS= ${mysql_ARGS:S/,/ /g} .if ${_MYSQL_ARGS:Mserver} _WANT_MYSQL_SERVER= yes _MYSQL_ARGS:= ${_MYSQL_ARGS:Nserver} .endif .if ${_MYSQL_ARGS:Membedded} _WANT_MYSQL_EMBEDDED= yes _MYSQL_ARGS:= ${_MYSQL_ARGS:Nembedded} .endif .if ${_MYSQL_ARGS:Mclient} _WANT_MYSQL_CLIENT= yes _MYSQL_ARGS:= ${_MYSQL_ARGS:Nclient} .endif # Port requested a version .if !empty(_MYSQL_ARGS) _WANT_MYSQL_VER= ${_MYSQL_ARGS} .endif .endif # !empty(mysql_ARGS) .if defined(DEFAULT_MYSQL_VER) WARNING+= "DEFAULT_MYSQL_VER is defined, consider using DEFAULT_VERSIONS=mysql=${DEFAULT_MYSQL_VER} instead" .endif DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//} # MySQL client version currently supported. # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. MYSQL55_LIBVER= 18 MYSQL55m_LIBVER= 18 MYSQL55p_LIBVER= 18 MYSQL56_LIBVER= 18 MYSQL56p_LIBVER= 18 +MYSQL56w_LIBVER= 18 MYSQL57_LIBVER= 20 MYSQL57p_LIBVER= 20 MYSQL80_LIBVER= 21 MYSQL100m_LIBVER= 18 MYSQL101m_LIBVER= 18 # Setting/finding MySQL version we want. .if exists(${LOCALBASE}/bin/mysql) _MYSQL!= ${LOCALBASE}/bin/mysql --version | ${SED} -e 's/.*Distrib \([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/' _PERCONA!= ${LOCALBASE}/bin/mysql --version | ${GREP} Percona | wc -l _MARIADB!= ${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB | wc -l .if ${_PERCONA} == 1 _MYSQL_VER= ${_MYSQL}p .elif ${_MARIADB} == 1 _MYSQL_VER= ${_MYSQL}m .else _MYSQL_VER= ${_MYSQL} .endif .endif .if defined(_WANT_MYSQL_VER) .if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${_WANT_MYSQL_VER} IGNORE= cannot install: the port wants mysql${_WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client .endif MYSQL_VER= ${_WANT_MYSQL_VER} .elif defined(WITH_MYSQL_VER) MYSQL_VER= ${WITH_MYSQL_VER} .else .if defined(_MYSQL_VER) MYSQL_VER= ${_MYSQL_VER} .else MYSQL_VER= ${DEFAULT_MYSQL_VER} .endif .endif # _WANT_MYSQL_VER .if defined(_MYSQL_VER) .if ${_MYSQL_VER} != ${MYSQL_VER} IGNORE= cannot install: MySQL versions mismatch: mysql${_MYSQL_VER}-client is installed and wanted version is mysql${MYSQL_VER}-client .endif .endif .if (${MYSQL_VER:C/[0-9]*//} == "m") -_MYSQL_FLAVOUR= mariadb +_MYSQL_SERVER_FLAVOUR= mariadb +_MYSQL_CLIENT_FLAVOUR= mariadb .elif (${MYSQL_VER:C/[0-9]*//} == "p") -_MYSQL_FLAVOUR= percona +_MYSQL_SERVER_FLAVOUR= percona +_MYSQL_CLIENT_FLAVOUR= percona +.elif (${MYSQL_VER:C/[0-9]*//} == "w") +_MYSQL_SERVER_FLAVOUR= mysqlwsrep +_MYSQL_CLIENT_FLAVOUR= mysql .else -_MYSQL_FLAVOUR= mysql +_MYSQL_SERVER_FLAVOUR= mysql +_MYSQL_CLIENT_FLAVOUR= mysql .endif -_MYSQL_CLIENT= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-client -_MYSQL_SERVER= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-server +_MYSQL_CLIENT= databases/${_MYSQL_CLIENT_FLAVOUR}${MYSQL_VER:C/[mp]//}-client +_MYSQL_SERVER= databases/${_MYSQL_SERVER_FLAVOUR}${MYSQL_VER:C/[mp]//}-server # And now we are checking if we can use it .if defined(MYSQL${MYSQL_VER}_LIBVER) .if defined(IGNORE_WITH_MYSQL) . for VER in ${IGNORE_WITH_MYSQL} . if (${MYSQL_VER} == "${VER}") IGNORE= cannot install: does not work with MySQL version ${MYSQL_VER} (MySQL ${IGNORE_WITH_MYSQL} not supported) . endif . endfor .endif # IGNORE_WITH_MYSQL .if defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED) RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER} .if defined(_WANT_MYSQL_EMBEDDED) BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqld.a:${_MYSQL_SERVER} .endif .endif .if defined(_WANT_MYSQL_CLIENT) || \ !(defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED)) LIB_DEPENDS+= libmysqlclient.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT} .endif .else IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER} .endif # Check for correct libs .endif Index: head/Mk/bsd.default-versions.mk =================================================================== --- head/Mk/bsd.default-versions.mk (revision 434623) +++ head/Mk/bsd.default-versions.mk (revision 434624) @@ -1,144 +1,144 @@ # $FreeBSD$ # # MAINTAINER: ports@FreeBSD.org # # Provide default versions for ports with multiple versions selectable # by the user. # # Users who want to override these defaults can easily do so by defining # DEFAULT_VERSIONS in their make.conf as follows: # # DEFAULT_VERSIONS= perl5=5.20 ruby=2.0 .if !defined(_INCLUDE_BSD_DEFAULT_VERSIONS_MK) _INCLUDE_BSD_DEFAULT_VERSIONS_MK= yes LOCALBASE?= /usr/local .for lang in APACHE BDB FIREBIRD FPC GCC GHOSTSCRIPT LINUX LUA MYSQL PERL5 \ PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY SSL TCLTK .if defined(${lang}_DEFAULT) WARNING+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf" WARNING+= "This behaviour has never been supported and will be removed on 2017-01-31" .endif #.undef ${lang}_DEFAULT .endfor .for lang in ${DEFAULT_VERSIONS} _l= ${lang:C/=.*//g} ${_l:tu}_DEFAULT= ${lang:C/.*=//g} .endfor # Possible values: 2.2, 2.4 APACHE_DEFAULT?= 2.4 # Possible values: 48, 5, 6 BDB_DEFAULT?= 5 # Possible values: 2.5 FIREBIRD_DEFAULT?= 2.5 # Possible values: 3.0.0 FPC_DEFAULT?= 3.0.0 # Possible values: 4.7, 4.8, 4.9, 5, 6 GCC_DEFAULT?= 4.9 # Possible values: 7, 8, 9, agpl GHOSTSCRIPT_DEFAULT?= agpl .if ${ARCH} == amd64 # Possible values: c6, c6_64, c7 LINUX_DEFAULT?= c6_64 .else # Possible values: c6 LINUX_DEFAULT?= c6 .endif .if defined(OVERRIDE_LINUX_BASE_PORT) LINUX_DEFAULT:= ${OVERRIDE_LINUX_BASE_PORT} WARNING+= "OVERRIDE_LINUX_BASE_PORT is deprecated, please use DEFAULT_VERSIONS+=linux=${OVERRIDE_LINUX_BASE_PORT}." .endif # Possible values: 5.1, 5.2, 5.3 LUA_DEFAULT?= 5.2 -# Possible values: 5.1, 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 5.5p, 5.6p, 5.7p +# Possible values: 5.1, 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 5.5p, 5.6p, 5.7p, 5.6w MYSQL_DEFAULT?= 5.6 # Possible values: 5.20, 5.22, 5.24, devel .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \ defined(PACKAGE_BUILDING)) PERL5_DEFAULT?= 5.24 .elif !defined(PERL5_DEFAULT) # There's no need to replace development versions, like "5.23" with "devel" # because 1) nobody is supposed to use it outside of poudriere, and 2) it must # be set manually in /etc/make.conf in the first place, and we're never getting # in here. .if !defined(_PERL5_FROM_BIN) _PERL5_FROM_BIN!= perl -e 'printf "%vd\n", $$^V;' .endif _EXPORTED_VARS+= _PERL5_FROM_BIN PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} .endif # Possible values: 9.2, 9.3, 9.4, 9.5, 9.6 PGSQL_DEFAULT?= 9.3 # Possible values: 5.6, 7.0, 7.1 PHP_DEFAULT?= 5.6 # Possible values: 2.7, 3.3, 3.4, 3.5, 3.6 PYTHON_DEFAULT?= 2.7 # Possible values: 2.7 PYTHON2_DEFAULT?= 2.7 # Possible values: 3.3, 3.4, 3.5, 3.6 PYTHON3_DEFAULT?= 3.5 # Possible values: 2.1, 2.2, 2.3, 2.4 RUBY_DEFAULT?= 2.3 # Possible values: base, openssl, openssl-devel, libressl, libressl-devel .if !defined(SSL_DEFAULT) # If no preference was set, check for an installed base version # but give an installed port preference over it. . if defined(WITH_OPENSSL_PORT) . if defined(OPENSSL_PORT) SSL_DEFAULT:=${OPENSSL_PORT:T} WARNING+= "Using WITH_OPENSSL_PORT and OPENSSL_PORT in make.conf is deprecated, replace them with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} in your make.conf" . else SSL_DEFAULT=openssl WARNING+= "Using WITH_OPENSSL_PORT in make.conf is deprecated, replace it with DEFAULT_VERSIONS+=ssl=openssl in your make.conf" . endif . elif defined(WITH_OPENSSL_BASE) SSL_DEFAULT=base WARNING+= "Using WITH_OPENSSL_BASE in make.conf is deprecated, replace it with DEFAULT_VERSIONS+=ssl=base in your make.conf" . elif !defined(WITH_OPENSSL_BASE) && \ !defined(WITH_OPENSSL_PORT) && \ !defined(SSL_DEFAULT) && \ !exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \ exists(${DESTDIR}/usr/include/openssl/opensslv.h) SSL_DEFAULT= base . else . if exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) . if defined(PKG_BIN) # find installed port and use it for dependency . if !defined(OPENSSL_INSTALLED) . if defined(DESTDIR) PKGARGS= -c ${DESTDIR} . else PKGARGS= . endif OPENSSL_INSTALLED!= ${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so || : . endif . if defined(OPENSSL_INSTALLED) && !empty(OPENSSL_INSTALLED) SSL_DEFAULT:= ${OPENSSL_INSTALLED:T} WARNING+= "You have ${OPENSSL_INSTALLED} installed but do not have DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} set in your make.conf" . endif . else check-makevars:: @${ECHO_MSG} "You have a ${LOCALBASE}/lib/libcrypto.so file installed, but the framework is unable" @${ECHO_MSG} "to determine what port it comes from." @${ECHO_MSG} "Add DEFAULT_VERSIONS+=ssl= to your /etc/make.conf and try again." @${FALSE} . endif . endif . endif # Make sure we have a default in the end SSL_DEFAULT?= base .endif # Possible values: 8.4, 8.5, 8.6, 8.7 TCLTK_DEFAULT?= 8.6 # Possible values: 4, 5 VARNISH_DEFAULT?= 4 # Version of lang/gcc. Do not override! LANG_GCC_IS= 4.9 .endif Index: head/databases/Makefile =================================================================== --- head/databases/Makefile (revision 434623) +++ head/databases/Makefile (revision 434624) @@ -1,1003 +1,1004 @@ # $FreeBSD$ # COMMENT = Databases and related software SUBDIR += R-cran-DBI SUBDIR += R-cran-RMySQL SUBDIR += R-cran-RSQLite SUBDIR += R-cran-RSQLite.extfuns SUBDIR += R-cran-sqldf SUBDIR += WWWdb SUBDIR += adabase SUBDIR += adminer SUBDIR += adodb SUBDIR += adodb5 SUBDIR += akonadi SUBDIR += akonadi-googledata SUBDIR += animenfo-client SUBDIR += animenfo-client-gtk SUBDIR += apq SUBDIR += apq-mysql SUBDIR += apq-odbc SUBDIR += apq-pgsql SUBDIR += ateam_mysql_ldap_auth SUBDIR += autobackupmysql SUBDIR += bbdb SUBDIR += beansdb SUBDIR += buzhug SUBDIR += c3p0 SUBDIR += cassandra-cpp-driver SUBDIR += cassandra2 SUBDIR += casstcl SUBDIR += cdb SUBDIR += cego SUBDIR += cegobridge SUBDIR += couchdb SUBDIR += courier-authlib-mysql SUBDIR += courier-authlib-pgsql SUBDIR += courier-authlib-userdb SUBDIR += courier-authlib-usergdbm SUBDIR += cppdb SUBDIR += credis SUBDIR += dalmp SUBDIR += datamodeler SUBDIR += db SUBDIR += db48 SUBDIR += db5 SUBDIR += db6 SUBDIR += dbconnect SUBDIR += dbf SUBDIR += dbf2mysql SUBDIR += dbh SUBDIR += dbow SUBDIR += dbtool SUBDIR += dbview SUBDIR += elixir-calecto SUBDIR += elixir-db_connection SUBDIR += elixir-ecto SUBDIR += elixir-ecto_migrate SUBDIR += elixir-exredis SUBDIR += elixir-geo SUBDIR += elixir-mariaex SUBDIR += elixir-mongo SUBDIR += elixir-postgrex SUBDIR += elixir-timex_ecto SUBDIR += emma SUBDIR += erlang-couchbeam SUBDIR += erlang-epgsql SUBDIR += erlang-eredis SUBDIR += evolution-data-server SUBDIR += fastdb SUBDIR += firebird25-client SUBDIR += firebird25-server SUBDIR += flamerobin SUBDIR += fortytwo-bdb SUBDIR += fpc-dblib SUBDIR += fpc-fpindexer SUBDIR += fpc-gdbm SUBDIR += fpc-ibase SUBDIR += fpc-mysql SUBDIR += fpc-odbc SUBDIR += fpc-oracle SUBDIR += fpc-postgres SUBDIR += fpc-pxlib SUBDIR += fpc-sqlite SUBDIR += freetds SUBDIR += freetds-devel SUBDIR += frontbase-jdbc SUBDIR += gadfly SUBDIR += galera SUBDIR += gdbm SUBDIR += geoserver-mysql-plugin SUBDIR += gigabase SUBDIR += glom SUBDIR += gnats4 SUBDIR += gnatsweb4 SUBDIR += godis SUBDIR += gomdb SUBDIR += gosqlite3 SUBDIR += gqlplus SUBDIR += grass SUBDIR += gtksql SUBDIR += hamsterdb SUBDIR += hashtypes SUBDIR += hbase SUBDIR += hiredis SUBDIR += hs-esqueleto SUBDIR += hs-hedis SUBDIR += hs-mysql SUBDIR += hs-persistent SUBDIR += hs-persistent-sqlite SUBDIR += hs-persistent-template SUBDIR += hsqldb SUBDIR += influxdb SUBDIR += innotop SUBDIR += ip4r SUBDIR += ipa_sdb SUBDIR += iplike SUBDIR += isql-viewer SUBDIR += jakarta-commons-dbutils SUBDIR += jasperreports SUBDIR += jdb SUBDIR += jdbc-oracle10g SUBDIR += jdbc-oracle11g SUBDIR += jdbc-oracle8i SUBDIR += jdbc-oracle9i SUBDIR += jdbm2 SUBDIR += jlog SUBDIR += jrobin SUBDIR += jrrd SUBDIR += kbibtex SUBDIR += kyotocabinet SUBDIR += kyototycoon SUBDIR += ldb SUBDIR += leo_center SUBDIR += leofs SUBDIR += leveldb SUBDIR += levigo SUBDIR += libcouchbase SUBDIR += libdbi SUBDIR += libdbi-drivers SUBDIR += libdrizzle SUBDIR += libdrizzle-redux SUBDIR += libgda4 SUBDIR += libgda4-bdb SUBDIR += libgda4-jdbc SUBDIR += libgda4-ldap SUBDIR += libgda4-mdb SUBDIR += libgda4-mysql SUBDIR += libgda4-postgresql SUBDIR += libgda4-reference SUBDIR += libgda5 SUBDIR += libgda5-bdb SUBDIR += libgda5-jdbc SUBDIR += libgda5-ldap SUBDIR += libgda5-mdb SUBDIR += libgda5-mysql SUBDIR += libgda5-postgresql SUBDIR += libgda5-ui SUBDIR += libgdamm SUBDIR += libgdamm5 SUBDIR += libhsclient SUBDIR += libiodbc SUBDIR += libmemcache SUBDIR += libmemcached SUBDIR += libmongo-client SUBDIR += libnvpair SUBDIR += libodbc++ SUBDIR += libpbl SUBDIR += libpqtypes SUBDIR += libsdb SUBDIR += libzbxpgsql SUBDIR += libzdb SUBDIR += linux-c6-sqlite3 SUBDIR += linux-c7-sqlite3 SUBDIR += linux-oracle-instantclient-basic SUBDIR += linux-oracle-instantclient-sdk SUBDIR += linux-oracle-instantclient-sqlplus SUBDIR += liquibase SUBDIR += lmdb SUBDIR += luadbi SUBDIR += luasql-firebird SUBDIR += luasql-mysql SUBDIR += luasql-odbc SUBDIR += luasql-postgres SUBDIR += luasql-sqlite3 SUBDIR += mantis SUBDIR += mariadb-connector-c SUBDIR += mariadb100-client SUBDIR += mariadb100-server SUBDIR += mariadb101-client SUBDIR += mariadb101-server SUBDIR += mariadb55-client SUBDIR += mariadb55-server SUBDIR += mdbtools SUBDIR += mdcached SUBDIR += memcached SUBDIR += memcacheq SUBDIR += metakit SUBDIR += monetdb SUBDIR += mongodb SUBDIR += mongodb32 SUBDIR += mongodb32-tools SUBDIR += mrtg-mysql-load SUBDIR += mtools-mongodb SUBDIR += mtop SUBDIR += mydbf2mysql SUBDIR += mydumper SUBDIR += mysac SUBDIR += mysql++1 SUBDIR += mysql++3 SUBDIR += mysql-connector-c SUBDIR += mysql-connector-c++ SUBDIR += mysql-connector-java SUBDIR += mysql-connector-odbc SUBDIR += mysql-proxy SUBDIR += mysql-q4m SUBDIR += mysql-udf SUBDIR += mysql2odbc SUBDIR += mysql2pgsql SUBDIR += mysql55-client SUBDIR += mysql55-server SUBDIR += mysql56-client SUBDIR += mysql56-server SUBDIR += mysql57-client SUBDIR += mysql57-server SUBDIR += mysql80-client SUBDIR += mysql80-server + SUBDIR += mysqlwsrep56-server SUBDIR += mysqlbackup SUBDIR += mysqlbigram SUBDIR += mysqldump-secure SUBDIR += mysqldumper SUBDIR += mysqlidxchk SUBDIR += mysqlreport SUBDIR += mysqlsla SUBDIR += mysqlsniffer SUBDIR += mysqltcl SUBDIR += mysqltuner SUBDIR += mytop SUBDIR += nagios-check_mongodb SUBDIR += nagios-check_postgres_replication SUBDIR += nagios-check_redis SUBDIR += namazu2 SUBDIR += neo4j SUBDIR += ntdb SUBDIR += ocaml-dbm SUBDIR += ocaml-mysql SUBDIR += ocaml-sqlite3 SUBDIR += openark-kit SUBDIR += opendbx SUBDIR += opentsdb SUBDIR += oracle7-client SUBDIR += oracle8-client SUBDIR += p5-Amazon-SimpleDB SUBDIR += p5-Amon2-DBI SUBDIR += p5-AnyEvent-BDB SUBDIR += p5-AnyEvent-CouchDB SUBDIR += p5-AnyEvent-DBD-Pg SUBDIR += p5-AnyEvent-Memcached SUBDIR += p5-AnyEvent-Redis SUBDIR += p5-App-Sqitch SUBDIR += p5-AsciiDB-TagFile SUBDIR += p5-BDB SUBDIR += p5-BSON SUBDIR += p5-BerkeleyDB SUBDIR += p5-Bucardo SUBDIR += p5-CDB_File SUBDIR += p5-CDB_File-Generator SUBDIR += p5-CGI-Session-Driver-memcached SUBDIR += p5-Cache-BDB SUBDIR += p5-Cache-Memcached SUBDIR += p5-Cache-Memcached-Fast SUBDIR += p5-Cache-Memcached-Managed SUBDIR += p5-Cache-Memcached-XS SUBDIR += p5-Cache-Memcached-libmemcached SUBDIR += p5-Class-DBI SUBDIR += p5-Class-DBI-AbstractSearch SUBDIR += p5-Class-DBI-AsForm SUBDIR += p5-Class-DBI-AutoLoader SUBDIR += p5-Class-DBI-BaseDSN SUBDIR += p5-Class-DBI-DATA-Schema SUBDIR += p5-Class-DBI-DDL SUBDIR += p5-Class-DBI-FromCGI SUBDIR += p5-Class-DBI-LazyInflate SUBDIR += p5-Class-DBI-Loader SUBDIR += p5-Class-DBI-Loader-Relationship SUBDIR += p5-Class-DBI-Oracle SUBDIR += p5-Class-DBI-Pager SUBDIR += p5-Class-DBI-Pg SUBDIR += p5-Class-DBI-Plugin SUBDIR += p5-Class-DBI-Plugin-AbstractCount SUBDIR += p5-Class-DBI-Plugin-DeepAbstractSearch SUBDIR += p5-Class-DBI-Plugin-Iterator SUBDIR += p5-Class-DBI-Plugin-Pager SUBDIR += p5-Class-DBI-Plugin-RetrieveAll SUBDIR += p5-Class-DBI-Plugin-Senna SUBDIR += p5-Class-DBI-Plugin-Type SUBDIR += p5-Class-DBI-Replication SUBDIR += p5-Class-DBI-SAK SUBDIR += p5-Class-DBI-SQLite SUBDIR += p5-Class-DBI-Sweet SUBDIR += p5-Class-DBI-ToSax SUBDIR += p5-Class-DBI-Untaint SUBDIR += p5-Class-DBI-mysql SUBDIR += p5-Class-Inflate SUBDIR += p5-CouchDB-View SUBDIR += p5-DBD-AnyData SUBDIR += p5-DBD-CSV SUBDIR += p5-DBD-Excel SUBDIR += p5-DBD-Google SUBDIR += p5-DBD-InterBase SUBDIR += p5-DBD-LDAP SUBDIR += p5-DBD-Mock SUBDIR += p5-DBD-Multi SUBDIR += p5-DBD-ODBC SUBDIR += p5-DBD-Oracle SUBDIR += p5-DBD-Pg SUBDIR += p5-DBD-PgLite SUBDIR += p5-DBD-PgPP SUBDIR += p5-DBD-SQLite SUBDIR += p5-DBD-SQLite2 SUBDIR += p5-DBD-Sybase SUBDIR += p5-DBD-XBase SUBDIR += p5-DBD-cego SUBDIR += p5-DBD-mysql SUBDIR += p5-DBI SUBDIR += p5-DBI-Shell SUBDIR += p5-DBICx-Deploy SUBDIR += p5-DBICx-MapMaker SUBDIR += p5-DBICx-Sugar SUBDIR += p5-DBICx-TestDatabase SUBDIR += p5-DBICx-TxnInsert SUBDIR += p5-DBIWrapper SUBDIR += p5-DBIx-Abstract SUBDIR += p5-DBIx-Admin-CreateTable SUBDIR += p5-DBIx-Admin-DSNManager SUBDIR += p5-DBIx-Admin-TableInfo SUBDIR += p5-DBIx-AnyDBD SUBDIR += p5-DBIx-Browse SUBDIR += p5-DBIx-Class SUBDIR += p5-DBIx-Class-AsFdat SUBDIR += p5-DBIx-Class-BitField SUBDIR += p5-DBIx-Class-Candy SUBDIR += p5-DBIx-Class-Cursor-Cached SUBDIR += p5-DBIx-Class-CustomPrefetch SUBDIR += p5-DBIx-Class-DateTime-Epoch SUBDIR += p5-DBIx-Class-DeploymentHandler SUBDIR += p5-DBIx-Class-DigestColumns SUBDIR += p5-DBIx-Class-DynamicDefault SUBDIR += p5-DBIx-Class-DynamicSubclass SUBDIR += p5-DBIx-Class-EncodeColumns SUBDIR += p5-DBIx-Class-EncodedColumn SUBDIR += p5-DBIx-Class-Fixtures SUBDIR += p5-DBIx-Class-FrozenColumns SUBDIR += p5-DBIx-Class-Helpers SUBDIR += p5-DBIx-Class-InflateColumn-Authen-Passphrase SUBDIR += p5-DBIx-Class-InflateColumn-FS SUBDIR += p5-DBIx-Class-InflateColumn-IP SUBDIR += p5-DBIx-Class-IntrospectableM2M SUBDIR += p5-DBIx-Class-Loader SUBDIR += p5-DBIx-Class-Migration SUBDIR += p5-DBIx-Class-MooseColumns SUBDIR += p5-DBIx-Class-PassphraseColumn SUBDIR += p5-DBIx-Class-QueryLog SUBDIR += p5-DBIx-Class-QueryProfiler SUBDIR += p5-DBIx-Class-ResultSet-HashRef SUBDIR += p5-DBIx-Class-ResultSet-RecursiveUpdate SUBDIR += p5-DBIx-Class-Schema-Config SUBDIR += p5-DBIx-Class-Schema-Loader SUBDIR += p5-DBIx-Class-Schema-PopulateMore SUBDIR += p5-DBIx-Class-TimeStamp SUBDIR += p5-DBIx-Class-Tree SUBDIR += p5-DBIx-Class-Tree-NestedSet SUBDIR += p5-DBIx-Class-UUIDColumns SUBDIR += p5-DBIx-Class-VirtualColumns SUBDIR += p5-DBIx-Class-WebForm SUBDIR += p5-DBIx-Connector SUBDIR += p5-DBIx-ContextualFetch SUBDIR += p5-DBIx-Custom SUBDIR += p5-DBIx-DBHResolver SUBDIR += p5-DBIx-DBSchema SUBDIR += p5-DBIx-DataSource SUBDIR += p5-DBIx-Dump SUBDIR += p5-DBIx-Ease SUBDIR += p5-DBIx-HA SUBDIR += p5-DBIx-Handler SUBDIR += p5-DBIx-Inspector SUBDIR += p5-DBIx-Introspector SUBDIR += p5-DBIx-Log4perl SUBDIR += p5-DBIx-MySQLSequence SUBDIR += p5-DBIx-NoSQL SUBDIR += p5-DBIx-Password SUBDIR += p5-DBIx-Perlish SUBDIR += p5-DBIx-QueryLog SUBDIR += p5-DBIx-Recordset SUBDIR += p5-DBIx-RetryOverDisconnects SUBDIR += p5-DBIx-SQLEngine SUBDIR += p5-DBIx-SQLite-Simple SUBDIR += p5-DBIx-Safe SUBDIR += p5-DBIx-SearchBuilder SUBDIR += p5-DBIx-Sequence SUBDIR += p5-DBIx-Simple SUBDIR += p5-DBIx-Skinny SUBDIR += p5-DBIx-Skinny-InflateColumn-DateTime SUBDIR += p5-DBIx-Skinny-Mixin-DBHResolver SUBDIR += p5-DBIx-Skinny-Pager SUBDIR += p5-DBIx-Skinny-Schema-Loader SUBDIR += p5-DBIx-Sunny SUBDIR += p5-DBIx-TableHash SUBDIR += p5-DBIx-TransactionManager SUBDIR += p5-DBIx-Tree SUBDIR += p5-DBIx-VersionedDDL SUBDIR += p5-DBIx-Wrapper SUBDIR += p5-DBIx-XHTML_Table SUBDIR += p5-DBIx-XML_RDB SUBDIR += p5-DBM-Deep SUBDIR += p5-DMOZ-ParseRDF SUBDIR += p5-DR-Tarantool SUBDIR += p5-DWH_File SUBDIR += p5-Dancer-Plugin-DBIC SUBDIR += p5-Dancer-Plugin-Database SUBDIR += p5-Dancer-Plugin-Database-Core SUBDIR += p5-Dancer-Plugin-Redis SUBDIR += p5-Dancer-Session-Memcached SUBDIR += p5-Dancer2-Plugin-DBIC SUBDIR += p5-Dancer2-Plugin-Database SUBDIR += p5-Dancer2-Session-DBIC SUBDIR += p5-Data-Page SUBDIR += p5-Data-Pageset SUBDIR += p5-Exception-Class-DBI SUBDIR += p5-File-Locate SUBDIR += p5-GDBM SUBDIR += p5-Genezzo SUBDIR += p5-GitDDL SUBDIR += p5-GitDDL-Migrator SUBDIR += p5-GraphViz-DBI SUBDIR += p5-HTML-FormHandler-Model-DBIC SUBDIR += p5-Ima-DBI SUBDIR += p5-Interchange6-Schema SUBDIR += p5-Iterator-DBI SUBDIR += p5-Jifty-DBI SUBDIR += p5-KyotoCabinet SUBDIR += p5-LMDB_File SUBDIR += p5-MLDBM SUBDIR += p5-MLDBM-Sync SUBDIR += p5-MR-Tarantool SUBDIR += p5-Mango SUBDIR += p5-Memcached-libmemcached SUBDIR += p5-Metadata SUBDIR += p5-Mojo-Pg SUBDIR += p5-MongoDB SUBDIR += p5-MySQL-Diff SUBDIR += p5-Net-Async-CassandraCQL SUBDIR += p5-ORLite SUBDIR += p5-ORLite-Migrate SUBDIR += p5-Oryx SUBDIR += p5-POE-Component-DBIAgent SUBDIR += p5-POE-Component-EasyDBI SUBDIR += p5-POE-Component-LaDBI SUBDIR += p5-POE-Component-RRDTool SUBDIR += p5-Pg SUBDIR += p5-PostgreSQL-PLPerl-Call SUBDIR += p5-PostgreSQL-PLPerl-Trace SUBDIR += p5-Prophet SUBDIR += p5-Protocol-CassandraCQL SUBDIR += p5-RRD-Simple SUBDIR += p5-Redis SUBDIR += p5-Redis-hiredis SUBDIR += p5-RedisDB SUBDIR += p5-RedisDB-Parser SUBDIR += p5-Relations SUBDIR += p5-Relations-Query SUBDIR += p5-ResourcePool-Resource-DBI SUBDIR += p5-Rose-DB SUBDIR += p5-Rose-DB-Object SUBDIR += p5-Rose-DBx-Object-MoreHelpers SUBDIR += p5-Rose-DBx-Object-Renderer SUBDIR += p5-SQL-Abstract SUBDIR += p5-SQL-Abstract-Limit SUBDIR += p5-SQL-Abstract-More SUBDIR += p5-SQL-Abstract-Plugin-InsertMulti SUBDIR += p5-SQL-Interp SUBDIR += p5-SQL-Maker SUBDIR += p5-SQL-ReservedWords SUBDIR += p5-SQL-Statement SUBDIR += p5-SQL-Translator SUBDIR += p5-SQLite-Work SUBDIR += p5-Search-InvertedIndex SUBDIR += p5-Search-Namazu SUBDIR += p5-Search-Xapian SUBDIR += p5-Search-Xapian10 SUBDIR += p5-T2 SUBDIR += p5-Tangram SUBDIR += p5-Template-DBI SUBDIR += p5-Teng SUBDIR += p5-Test-Cukes SUBDIR += p5-Test-Database SUBDIR += p5-Test-DatabaseRow SUBDIR += p5-Test-Fixture-DBI SUBDIR += p5-Test-mysqld SUBDIR += p5-Test-postgresql SUBDIR += p5-Text-Query-SQL SUBDIR += p5-Text-xSV SUBDIR += p5-Tie-DBI SUBDIR += p5-Tie-LevelDB SUBDIR += p5-Time-Piece-MySQL SUBDIR += p5-TokyoCabinet SUBDIR += p5-mysql-genocide SUBDIR += p5-tokyotyrant SUBDIR += pear-DB SUBDIR += pear-DBA SUBDIR += pear-DBA_Relational SUBDIR += pear-DB_DataObject SUBDIR += pear-DB_DataObject_FormBuilder SUBDIR += pear-DB_Pager SUBDIR += pear-DB_QueryTool SUBDIR += pear-DB_Sqlite_Tools SUBDIR += pear-DB_Table SUBDIR += pear-DB_ldap SUBDIR += pear-DB_ldap2 SUBDIR += pear-DoctrineCommon SUBDIR += pear-DoctrineDBAL SUBDIR += pear-DoctrineORM SUBDIR += pear-Horde_Db SUBDIR += pear-Horde_HashTable SUBDIR += pear-Horde_Imsp SUBDIR += pear-Horde_Memcache SUBDIR += pear-Horde_Mongo SUBDIR += pear-MDB SUBDIR += pear-MDB2 SUBDIR += pear-MDB2_Driver_mysql SUBDIR += pear-MDB2_Driver_mysqli SUBDIR += pear-MDB2_Driver_pgsql SUBDIR += pear-MDB2_Schema SUBDIR += pear-MDB_QueryTool SUBDIR += pear-Structures_DataGrid_DataSource_Array SUBDIR += pear-Structures_DataGrid_DataSource_CSV SUBDIR += pear-Structures_DataGrid_DataSource_DB SUBDIR += pear-Structures_DataGrid_DataSource_DBQuery SUBDIR += pear-Structures_DataGrid_DataSource_DBTable SUBDIR += pear-Structures_DataGrid_DataSource_DataObject SUBDIR += pear-Structures_DataGrid_DataSource_MDB2 SUBDIR += pear-Structures_DataGrid_DataSource_PDO SUBDIR += pear-XML_Query2XML SUBDIR += pecl-chdb SUBDIR += pecl-dbase SUBDIR += pecl-drizzle SUBDIR += pecl-leveldb SUBDIR += pecl-memcache SUBDIR += pecl-memcached SUBDIR += pecl-memcached2 SUBDIR += pecl-mongo SUBDIR += pecl-mongodb SUBDIR += pecl-pdo_user SUBDIR += pecl-redis SUBDIR += pecl-rrd SUBDIR += pecl-tokyo_tyrant SUBDIR += percona-pam-for-mysql SUBDIR += percona-toolkit SUBDIR += percona55-client SUBDIR += percona55-server SUBDIR += percona56-client SUBDIR += percona56-server SUBDIR += percona57-client SUBDIR += percona57-pam-for-mysql SUBDIR += percona57-server SUBDIR += pg_activity SUBDIR += pg_citus SUBDIR += pg_qualstats SUBDIR += pg_reorg SUBDIR += pg_rman SUBDIR += pg_stat_kcache SUBDIR += pg_statsinfo SUBDIR += pgaccess SUBDIR += pgadmin3 SUBDIR += pgagent SUBDIR += pgbadger SUBDIR += pgbarman SUBDIR += pgbouncer SUBDIR += pgdbf SUBDIR += pgespresso SUBDIR += pgfouine SUBDIR += pglesslog SUBDIR += pgloader SUBDIR += pglogical SUBDIR += pgmodeler SUBDIR += pgpool SUBDIR += pgpool-II SUBDIR += pgpool-II-22 SUBDIR += pgpool-II-23 SUBDIR += pgpool-II-30 SUBDIR += pgpool-II-33 SUBDIR += pgpoolAdmin SUBDIR += pgreplay SUBDIR += pgrouting SUBDIR += pgsphere SUBDIR += pgtcl SUBDIR += pgtop SUBDIR += pgtune SUBDIR += pguri SUBDIR += pgworksheet SUBDIR += php-mdcached SUBDIR += php5-pdo_cassandra SUBDIR += php5-tarantool SUBDIR += php56-dba SUBDIR += php56-interbase SUBDIR += php56-mssql SUBDIR += php56-mysql SUBDIR += php56-mysqli SUBDIR += php56-odbc SUBDIR += php56-pdo SUBDIR += php56-pdo_dblib SUBDIR += php56-pdo_firebird SUBDIR += php56-pdo_mysql SUBDIR += php56-pdo_odbc SUBDIR += php56-pdo_pgsql SUBDIR += php56-pdo_sqlite SUBDIR += php56-pgsql SUBDIR += php56-sqlite3 SUBDIR += php56-sybase_ct SUBDIR += php70-dba SUBDIR += php70-interbase SUBDIR += php70-memcache SUBDIR += php70-memcached SUBDIR += php70-mysqli SUBDIR += php70-odbc SUBDIR += php70-pdo SUBDIR += php70-pdo_dblib SUBDIR += php70-pdo_firebird SUBDIR += php70-pdo_mysql SUBDIR += php70-pdo_odbc SUBDIR += php70-pdo_pgsql SUBDIR += php70-pdo_sqlite SUBDIR += php70-pgsql SUBDIR += php70-sqlite3 SUBDIR += php71-dba SUBDIR += php71-interbase SUBDIR += php71-memcache SUBDIR += php71-mysqli SUBDIR += php71-odbc SUBDIR += php71-pdo SUBDIR += php71-pdo_dblib SUBDIR += php71-pdo_firebird SUBDIR += php71-pdo_mysql SUBDIR += php71-pdo_odbc SUBDIR += php71-pdo_pgsql SUBDIR += php71-pdo_sqlite SUBDIR += php71-pgsql SUBDIR += php71-sqlite3 SUBDIR += phpminiadmin SUBDIR += phpmyadmin SUBDIR += phppgadmin SUBDIR += postgis-jdbc SUBDIR += postgis20 SUBDIR += postgis21 SUBDIR += postgis22 SUBDIR += postgis23 SUBDIR += postgresql-jdbc SUBDIR += postgresql-libpgeasy SUBDIR += postgresql-libpqxx SUBDIR += postgresql-libpqxx3 SUBDIR += postgresql-odbc SUBDIR += postgresql-plproxy SUBDIR += postgresql-plruby SUBDIR += postgresql-plv8js SUBDIR += postgresql-relay SUBDIR += postgresql-repmgr SUBDIR += postgresql-repmgr2 SUBDIR += postgresql92-client SUBDIR += postgresql92-contrib SUBDIR += postgresql92-docs SUBDIR += postgresql92-pgtcl SUBDIR += postgresql92-plperl SUBDIR += postgresql92-plpython SUBDIR += postgresql92-pltcl SUBDIR += postgresql92-server SUBDIR += postgresql93-client SUBDIR += postgresql93-contrib SUBDIR += postgresql93-docs SUBDIR += postgresql93-pgtcl SUBDIR += postgresql93-plperl SUBDIR += postgresql93-plpython SUBDIR += postgresql93-pltcl SUBDIR += postgresql93-server SUBDIR += postgresql94-client SUBDIR += postgresql94-contrib SUBDIR += postgresql94-docs SUBDIR += postgresql94-pgtcl SUBDIR += postgresql94-plperl SUBDIR += postgresql94-plpython SUBDIR += postgresql94-pltcl SUBDIR += postgresql94-server SUBDIR += postgresql95-client SUBDIR += postgresql95-contrib SUBDIR += postgresql95-docs SUBDIR += postgresql95-pgtcl SUBDIR += postgresql95-plperl SUBDIR += postgresql95-plpython SUBDIR += postgresql95-pltcl SUBDIR += postgresql95-server SUBDIR += postgresql96-client SUBDIR += postgresql96-contrib SUBDIR += postgresql96-docs SUBDIR += postgresql96-pgtcl SUBDIR += postgresql96-plperl SUBDIR += postgresql96-plpython SUBDIR += postgresql96-pltcl SUBDIR += postgresql96-server SUBDIR += powa-archivist SUBDIR += powa-web SUBDIR += powerarchitect SUBDIR += proftpd-mod_sql_mysql SUBDIR += proftpd-mod_sql_odbc SUBDIR += proftpd-mod_sql_postgres SUBDIR += proftpd-mod_sql_sqlite SUBDIR += proftpd-mod_sql_tds SUBDIR += puppetdb SUBDIR += puppetdb-terminus SUBDIR += puppetdb-terminus3 SUBDIR += puppetdb-terminus4 SUBDIR += puppetdb3 SUBDIR += puppetdb4 SUBDIR += pure-sql3 SUBDIR += puredb SUBDIR += pxlib SUBDIR += pxtools SUBDIR += py-Elixir SUBDIR += py-MySQLdb SUBDIR += py-MySQLdb55 SUBDIR += py-MySQLdb56 SUBDIR += py-PyGreSQL SUBDIR += py-Pyrseas SUBDIR += py-agate-sql SUBDIR += py-alembic SUBDIR += py-apsw SUBDIR += py-bsddb SUBDIR += py-bsddb3 SUBDIR += py-carbon SUBDIR += py-cdb SUBDIR += py-couchdb SUBDIR += py-cql SUBDIR += py-dbf SUBDIR += py-dbutils SUBDIR += py-django-transaction-hooks SUBDIR += py-fakeredis SUBDIR += py-fdb SUBDIR += py-firebirdsql SUBDIR += py-flask-sqlalchemy SUBDIR += py-forgetsql SUBDIR += py-gdbm SUBDIR += py-geoalchemy SUBDIR += py-geoalchemy2 SUBDIR += py-hiredis SUBDIR += py-htsql SUBDIR += py-htsql-mysql SUBDIR += py-htsql-pgsql SUBDIR += py-kyotocabinet SUBDIR += py-leveldb SUBDIR += py-motor SUBDIR += py-mycli SUBDIR += py-mysql-connector-python SUBDIR += py-mysql-connector-python2 SUBDIR += py-mysql2pgsql SUBDIR += py-mysqlclient SUBDIR += py-odbc SUBDIR += py-oops SUBDIR += py-oursql SUBDIR += py-peewee SUBDIR += py-pg8000 SUBDIR += py-pg_pqueue SUBDIR += py-pgcli SUBDIR += py-pgspecial SUBDIR += py-pgxnclient SUBDIR += py-pickledb SUBDIR += py-pickleshare SUBDIR += py-postgresql SUBDIR += py-psycogreen SUBDIR += py-psycopg2 SUBDIR += py-psycopg2cffi SUBDIR += py-pyPgSQL SUBDIR += py-pyhs SUBDIR += py-pylibmc SUBDIR += py-pymssql SUBDIR += py-pymysql SUBDIR += py-pypuppetdb SUBDIR += py-pypuppetdb03 SUBDIR += py-pytc SUBDIR += py-python-memcached SUBDIR += py-python-rrdtool SUBDIR += py-python-sql SUBDIR += py-python-swiftclient SUBDIR += py-qt4-sql SUBDIR += py-qt5-sql SUBDIR += py-queries SUBDIR += py-rb SUBDIR += py-redis SUBDIR += py-riak SUBDIR += py-rrdtool_lgpl SUBDIR += py-south SUBDIR += py-sqlalchemy-migrate SUBDIR += py-sqlalchemy08 SUBDIR += py-sqlalchemy09 SUBDIR += py-sqlalchemy10 SUBDIR += py-sqlalchemy11 SUBDIR += py-sqlite3 SUBDIR += py-sqlite3dbm SUBDIR += py-sqlobject SUBDIR += py-sqlparse SUBDIR += py-sqlparse01 SUBDIR += py-sqlrelay SUBDIR += py-swift SUBDIR += py-sybase SUBDIR += py-tarantool SUBDIR += py-umemcache SUBDIR += py-unqlite SUBDIR += py-whisper SUBDIR += py3-bsddb3 SUBDIR += py3-mysqlclient SUBDIR += py3-psycopg2 SUBDIR += py33-gdbm SUBDIR += py33-sqlite3 SUBDIR += py34-gdbm SUBDIR += py34-sqlite3 SUBDIR += py35-gdbm SUBDIR += py35-sqlite3 SUBDIR += py36-gdbm SUBDIR += py36-sqlite3 SUBDIR += pydbx SUBDIR += pymongo SUBDIR += pypy-gdbm SUBDIR += pypy-sqlite3 SUBDIR += pyspatialite SUBDIR += qdbm SUBDIR += qdbm-plus SUBDIR += qof SUBDIR += qt4-ibase-plugin SUBDIR += qt4-mysql-plugin SUBDIR += qt4-odbc-plugin SUBDIR += qt4-pgsql-plugin SUBDIR += qt4-sql SUBDIR += qt4-sqlite-plugin SUBDIR += qt4-sqlite3-plugin SUBDIR += qt5-sql SUBDIR += qt5-sqldrivers-ibase SUBDIR += qt5-sqldrivers-mysql SUBDIR += qt5-sqldrivers-odbc SUBDIR += qt5-sqldrivers-pgsql SUBDIR += qt5-sqldrivers-sqlite2 SUBDIR += qt5-sqldrivers-sqlite3 SUBDIR += qt5-sqldrivers-tds SUBDIR += radix.v2 SUBDIR += rdb SUBDIR += rdfdb SUBDIR += recutils SUBDIR += redigo SUBDIR += redis SUBDIR += redis-devel SUBDIR += riak SUBDIR += riak2 SUBDIR += rocksdb SUBDIR += rrdman SUBDIR += rrdmerge SUBDIR += rrdtool SUBDIR += rrdtool12 SUBDIR += ruby-bdb SUBDIR += ruby-gdbm SUBDIR += ruby-mysql SUBDIR += ruby-odbc SUBDIR += ruby-qdbm SUBDIR += ruby-tokyocabinet SUBDIR += rubygem-activemodel4 SUBDIR += rubygem-activemodel5 SUBDIR += rubygem-activerecord-import SUBDIR += rubygem-activerecord-jdbc-adapter SUBDIR += rubygem-activerecord-jdbcmysql-adapter SUBDIR += rubygem-activerecord-session_store SUBDIR += rubygem-activerecord4 SUBDIR += rubygem-activerecord5 SUBDIR += rubygem-after_commit_queue SUBDIR += rubygem-amalgalite SUBDIR += rubygem-arel SUBDIR += rubygem-arel-helpers SUBDIR += rubygem-arel6 SUBDIR += rubygem-awesome_nested_set SUBDIR += rubygem-bdb1 SUBDIR += rubygem-bigrecord SUBDIR += rubygem-couchrest SUBDIR += rubygem-data_objects SUBDIR += rubygem-datamapper SUBDIR += rubygem-dbd-mysql SUBDIR += rubygem-dbd-odbc SUBDIR += rubygem-dbd-pg SUBDIR += rubygem-dbd-sqlite3 SUBDIR += rubygem-dbi SUBDIR += rubygem-dm-aggregates SUBDIR += rubygem-dm-chunked_query SUBDIR += rubygem-dm-constraints SUBDIR += rubygem-dm-core SUBDIR += rubygem-dm-do-adapter SUBDIR += rubygem-dm-migrations SUBDIR += rubygem-dm-mysql-adapter SUBDIR += rubygem-dm-observer SUBDIR += rubygem-dm-pager SUBDIR += rubygem-dm-paperclip SUBDIR += rubygem-dm-postgres-adapter SUBDIR += rubygem-dm-serializer SUBDIR += rubygem-dm-timestamps SUBDIR += rubygem-dm-transactions SUBDIR += rubygem-dm-types SUBDIR += rubygem-dm-validations SUBDIR += rubygem-do_mysql SUBDIR += rubygem-do_postgres SUBDIR += rubygem-do_sqlite3 SUBDIR += rubygem-em-redis-unified SUBDIR += rubygem-familia SUBDIR += rubygem-globalid SUBDIR += rubygem-her SUBDIR += rubygem-hiredis SUBDIR += rubygem-jdbc-mysql SUBDIR += rubygem-leo_manager_client SUBDIR += rubygem-memcache SUBDIR += rubygem-memcache-client SUBDIR += rubygem-mysql SUBDIR += rubygem-mysql2 SUBDIR += rubygem-openid-redis-store SUBDIR += rubygem-paranoia SUBDIR += rubygem-pg SUBDIR += rubygem-pg_array_parser SUBDIR += rubygem-postgres_ext SUBDIR += rubygem-rbase SUBDIR += rubygem-redis SUBDIR += rubygem-redis-actionpack SUBDIR += rubygem-redis-actionpack4 SUBDIR += rubygem-redis-namespace SUBDIR += rubygem-seed-fu SUBDIR += rubygem-sqlite3 SUBDIR += rubygem-sqlite3-ruby SUBDIR += rubygem-state_machines-activemodel SUBDIR += rubygem-state_machines-activerecord SUBDIR += rubygem-tarantool SUBDIR += sfcgal SUBDIR += sharedance SUBDIR += skytools SUBDIR += slony1v2 SUBDIR += soci SUBDIR += spatialite SUBDIR += spatialite-tools SUBDIR += spatialite_gui SUBDIR += speedtables SUBDIR += sql-workbench SUBDIR += sqlbuddy SUBDIR += sqlcached SUBDIR += sqlcipher SUBDIR += sqlclient SUBDIR += sqldeveloper SUBDIR += sqlite-ext-miscfuncs SUBDIR += sqlite-ext-pcre SUBDIR += sqlite-ext-regexp SUBDIR += sqlite-ext-spellfix SUBDIR += sqlite2 SUBDIR += sqlite3 SUBDIR += sqlitebrowser SUBDIR += sqlitebrowser-qt5 SUBDIR += sqliteman SUBDIR += sqlitemanager SUBDIR += sqliteodbc SUBDIR += sqliteodbc-sqlite2 SUBDIR += sqlitestudio SUBDIR += sqlrelay SUBDIR += sqsh SUBDIR += squirrel-sql SUBDIR += tablelog SUBDIR += tarantool SUBDIR += tarantool-c SUBDIR += tcl-Mysql SUBDIR += tcl-lmdb SUBDIR += tcl-sqlite3 SUBDIR += tdb SUBDIR += tdbc SUBDIR += tile38 SUBDIR += tinycdb SUBDIR += tokyocabinet SUBDIR += tokyotyrant SUBDIR += tora SUBDIR += tsearch_extras SUBDIR += tuning-primer SUBDIR += twemproxy SUBDIR += unixODBC SUBDIR += useracc SUBDIR += vfront SUBDIR += virtualpg SUBDIR += virtuoso SUBDIR += vsqlite SUBDIR += wfb2sql SUBDIR += wmjsql SUBDIR += xapian-bindings SUBDIR += xapian-core SUBDIR += xapian-core10 SUBDIR += xtrabackup SUBDIR += yasql SUBDIR += zodb3 .include Index: head/databases/mysqlwsrep56-server/Makefile =================================================================== --- head/databases/mysqlwsrep56-server/Makefile (nonexistent) +++ head/databases/mysqlwsrep56-server/Makefile (revision 434624) @@ -0,0 +1,79 @@ +# Created by: Philip Stoev +# $FreeBSD$ + +PORTNAME= mysqlwsrep +PORTVERSION= 5.6.35 +CATEGORIES= databases ipv6 +MASTER_SITES= http://releases.galeracluster.com/source/ +PKGNAMESUFFIX= 56-server +DISTNAME= mysql-wsrep-5.6.35-25.19 + +MAINTAINER= info@galeracluster.com +COMMENT= MySQL database enhanced with Galera replication (server package) + +LICENSE= GPLv2 + +BUILD_DEPENDS= bison:devel/bison +RUN_DEPENDS= socat:net/socat lsof:sysutils/lsof netcat:net/netcat rsync:net/rsync + +DATADIR= ${PREFIX}/share/mysql + +BROKEN_powerpc64= Does not build + +USES= cmake:outsource libedit shebangfix perl5 +USE_PERL5= run +USE_LDCONFIG= yes + +MY_DBDIR= /var/db/mysql + +CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ + -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ + -DINSTALL_INCLUDEDIR="include/mysql" \ + -DINSTALL_INFODIR="info" \ + -DINSTALL_LIBDIR="lib/mysql" \ + -DINSTALL_MANDIR="man" \ + -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \ + -DINSTALL_MYSQLSHAREDIR="share/mysql" \ + -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ + -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ + -DINSTALL_SBINDIR="libexec" \ + -DINSTALL_SCRIPTDIR="bin" \ + -DINSTALL_SHAREDIR="share" \ + -DINSTALL_SQLBENCHDIR="share/mysql" \ + -DINSTALL_SUPPORTFILESDIR="share/mysql" \ + -DWITH_EDITLINE=system \ + -DWITH_LIBWRAP=1 \ + -DWITH_WSREP=1 + +SHEBANG_FILES= scripts/*.pl* scripts/*.sh scripts/wsrep_sst_* + +.ifdef USE_MYSQL +.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. +.endif + +CONFLICTS_INSTALL= mysql5[0-9]-server-* \ + mariadb*-server-* \ + percona*-server-* + +USE_RC_SUBR= mysql-server + +USERS= mysql +GROUPS= mysql + +MMAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \ + mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \ + mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \ + mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ + mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ + mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 + +post-patch: + @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt + +.include + +.if ${ARCH} == "armv6" +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake +.endif + +.include Property changes on: head/databases/mysqlwsrep56-server/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/distinfo =================================================================== --- head/databases/mysqlwsrep56-server/distinfo (nonexistent) +++ head/databases/mysqlwsrep56-server/distinfo (revision 434624) @@ -0,0 +1,3 @@ +TIMESTAMP = 1486024045 +SHA256 (mysql-wsrep-5.6.35-25.19.tar.gz) = f7bf200c5d5379cf616d901fcf701c8bad11658e06b1d8e25cb50d7164ee229c +SIZE (mysql-wsrep-5.6.35-25.19.tar.gz) = 33180905 Property changes on: head/databases/mysqlwsrep56-server/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/mysql-server.in =================================================================== --- head/databases/mysqlwsrep56-server/files/mysql-server.in (nonexistent) +++ head/databases/mysqlwsrep56-server/files/mysql-server.in (revision 434624) @@ -0,0 +1,97 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: mysql +# REQUIRE: LOGIN +# KEYWORD: shutdown + +# +# Add the following line to /etc/rc.conf to enable mysql: +# mysql_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable MySQL. +# mysql_limits (bool): Set to "NO" by default. +# Set it to yes to run `limits -e -U mysql` +# just before mysql starts. +# mysql_dbdir (str): Default to "/var/db/mysql" +# Base database directory. +# mysql_optfile (str): Server-specific option file. +# Default to "${mysql_dbdir}/my.cnf". +# mysql_pidfile (str): Custum PID file path and name. +# Default to "${mysql_dbdir}/${hostname}.pid". +# mysql_args (str): Custom additional arguments to be passed +# to mysqld_safe (default empty). +# + +. /etc/rc.subr + +name="mysql" +rcvar=mysql_enable + +load_rc_config $name + +: ${mysql_enable="NO"} +: ${mysql_limits="NO"} +: ${mysql_dbdir="/var/db/mysql"} +: ${mysql_optfile="${mysql_dbdir}/my.cnf"} + +mysql_user="mysql" +mysql_limits_args="-e -U ${mysql_user}" +: ${hostname:=`/bin/hostname`} +pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} +command="/usr/sbin/daemon" +command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" +procname="%%PREFIX%%/libexec/mysqld" +start_precmd="${name}_prestart" +start_postcmd="${name}_poststart" +mysql_install_db="%%PREFIX%%/bin/mysql_install_db" +mysql_install_db_args="--basedir=%%PREFIX%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force" +service_startup_timeout=900 +startup_sleep=1 +sst_progress_file=${mysql_dbdir}/sst_in_progress +extra_commands="bootstrap" +bootstrap_cmd="mysql_bootstrap" + +mysql_bootstrap() +{ + # Bootstrap the cluster, start the first node that initiate the cluster + check_startmsgs && echo "Bootstrapping cluster" + shift + command_args="$command_args --wsrep-new-cluster" + run_rc_command ${_rc_prefix}start +} + +mysql_create_auth_tables() +{ + eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null + [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir} +} + +mysql_prestart() +{ + if [ ! -d "${mysql_dbdir}/mysql/." ]; then + mysql_create_auth_tables || return 1 + fi + if checkyesno mysql_limits; then + eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null + else + return 0 + fi +} + +mysql_poststart() +{ + local timeout=${service_startup_timeout} + while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do + if test -e $sst_progress_file && [ $startup_sleep -ne 100 ]; then + check_startmsgs && echo "SST in progress, setting sleep higher" + startup_sleep=100 + fi + timeout=$(( timeout - 1 )) + sleep $startup_sleep + done + return 0 +} + +run_rc_command "$1" Property changes on: head/databases/mysqlwsrep56-server/files/mysql-server.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt (revision 434624) @@ -0,0 +1,42 @@ +--- CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ CMakeLists.txt +@@ -499,12 +499,10 @@ IF(UNIX) + ENDIF() + + IF(NOT WITHOUT_SERVER) +- ADD_SUBDIRECTORY(tests) + ADD_SUBDIRECTORY(sql) + OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) + IF(WITH_EMBEDDED_SERVER) + ADD_SUBDIRECTORY(libmysqld) +- ADD_SUBDIRECTORY(libmysqld/examples) + ENDIF(WITH_EMBEDDED_SERVER) + ENDIF() + +@@ -513,10 +511,7 @@ ENDIF() + ADD_SUBDIRECTORY(scripts) + + IF(NOT WITHOUT_SERVER) +- ADD_SUBDIRECTORY(mysql-test) +- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) + ADD_SUBDIRECTORY(support-files) +- ADD_SUBDIRECTORY(sql-bench) + IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) + ADD_SUBDIRECTORY(internal) + ENDIF() +@@ -574,6 +569,7 @@ ENDIF() + # + # RPM installs documentation directly from the source tree + # ++IF(FALSE) + IF(NOT INSTALL_LAYOUT MATCHES "RPM") + INSTALL(FILES COPYING LICENSE.mysql + DESTINATION ${INSTALL_DOCREADMEDIR} +@@ -597,6 +593,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") + PATTERN "sp-imp-spec.txt" EXCLUDE + ) + ENDIF() ++ENDIF() + + INCLUDE(CPack) + Property changes on: head/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt (revision 434624) @@ -0,0 +1,65 @@ +--- client/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ client/CMakeLists.txt +@@ -31,17 +31,20 @@ INCLUDE_DIRECTORIES( + COPY_OPENSSL_DLLS(copy_openssl_client) + + ADD_DEFINITIONS(${SSL_DEFINES}) ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) + TARGET_LINK_LIBRARIES(mysql mysqlclient) + IF(UNIX) + TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) + ENDIF(UNIX) ++ENDIF() + + MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) + SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") + TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) + + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) + TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) + +@@ -51,17 +54,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli + MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) + SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") + TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) ++ENDIF() + + MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) + TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) + ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) + TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) ++ENDIF() + + MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) + TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) + TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) + +@@ -74,6 +81,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli + + MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) + TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) ++ENDIF() + + # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". + IF(WIN32) +@@ -83,11 +91,6 @@ ENDIF(WIN32) + SET_TARGET_PROPERTIES ( + mysql_plugin + mysql_upgrade +- mysqlcheck +- mysqldump +- mysqlimport +- mysqlshow +- mysqlslap + PROPERTIES HAS_CXX TRUE) + + ADD_DEFINITIONS(-DHAVE_DLOPEN) Property changes on: head/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake (revision 434624) @@ -0,0 +1,10 @@ +--- cmake/plugin.cmake.orig 2017-01-25 07:58:07 UTC ++++ cmake/plugin.cmake +@@ -205,7 +205,6 @@ MACRO(MYSQL_ADD_PLUGIN) + OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}") + # Install dynamic library + MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT Server) +- INSTALL_DEBUG_TARGET(${target} DESTINATION ${INSTALL_PLUGINDIR}/debug) + # Add installed files to list for RPMs + FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files + "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" Property changes on: head/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-cmake_ssl.cmake =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-cmake_ssl.cmake (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-cmake_ssl.cmake (revision 434624) @@ -0,0 +1,11 @@ +--- cmake/ssl.cmake.orig 2017-01-25 07:58:07 UTC ++++ cmake/ssl.cmake +@@ -176,7 +176,7 @@ MACRO (MYSQL_CHECK_SSL) + IF(OPENSSL_INCLUDE_DIR AND + OPENSSL_LIBRARY AND + CRYPTO_LIBRARY AND +- OPENSSL_MAJOR_VERSION STREQUAL "1" ++ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1" + ) + SET(OPENSSL_FOUND TRUE) + ELSE() Property changes on: head/databases/mysqlwsrep56-server/files/patch-cmake_ssl.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt (revision 434624) @@ -0,0 +1,13 @@ +--- extra/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ extra/CMakeLists.txt +@@ -101,8 +101,10 @@ IF(UNIX) + MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc) + TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) + TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl) + SET_TARGET_PROPERTIES(mysql_waitpid PROPERTIES LINKER_LANGUAGE CXX) + ENDIF() ++ENDIF() + Property changes on: head/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-include_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-include_CMakeLists.txt (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-include_CMakeLists.txt (revision 434624) @@ -0,0 +1,15 @@ +--- include/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ include/CMakeLists.txt +@@ -65,10 +65,12 @@ SET(HEADERS + ${HEADERS_GEN_CONFIGURE} + ) + ++IF(FALSE) + INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) + INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development + PATTERN "*.h" + PATTERN "psi_abi*" EXCLUDE + ) ++ENDIF() + + Property changes on: head/databases/mysqlwsrep56-server/files/patch-include_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-include_my__compare.h =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-include_my__compare.h (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-include_my__compare.h (revision 434624) @@ -0,0 +1,11 @@ +--- include/my_compare.h.orig 2011-05-10 09:46:46.000000000 +0200 ++++ include/my_compare.h 2011-05-10 09:47:01.000000000 +0200 +@@ -39,7 +39,7 @@ + But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. + */ + +-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ ++#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ + #define HA_MAX_KEY_SEG 16 /* Max segments for key */ + + #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) Property changes on: head/databases/mysqlwsrep56-server/files/patch-include_my__compare.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-include_myisam.h =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-include_myisam.h (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-include_myisam.h (revision 434624) @@ -0,0 +1,11 @@ +--- include/myisam.h.orig 2017-01-25 07:58:07 UTC ++++ include/myisam.h +@@ -49,7 +49,7 @@ extern "C" { + The following defines can be increased if necessary. + But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH. + */ +-#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */ ++#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */ + #define MI_MAX_KEY_SEG 16 /* Max segments for key */ + + #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8) Property changes on: head/databases/mysqlwsrep56-server/files/patch-include_myisam.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt (revision 434624) @@ -0,0 +1,41 @@ +--- libmysql/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ libmysql/CMakeLists.txt +@@ -180,7 +180,7 @@ IF(WIN32) + ENDIF() + + # Merge several convenience libraries into one big mysqlclient +-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) ++MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) + + # Visual Studio users need debug static library for debug projects + IF(MSVC) +@@ -208,19 +208,22 @@ IF(UNIX) + ENDMACRO() + ENDIF() + ++IF(FALSE) + IF(UNIX) + GET_TARGET_NAME(mysqlclient lib_name) + INSTALL_SYMLINK(mysqlclient + ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a + ${INSTALL_LIBDIR} Development) + ENDIF() ++ENDIF() + + IF(NOT DISABLE_SHARED) + # Merge several convenience libraries into one big mysqlclient + # and link them together into shared library. + MERGE_LIBRARIES(libmysql SHARED ${LIBS} + EXPORTS ${CLIENT_API_FUNCTIONS} +- COMPONENT SharedLibraries) ++ COMPONENT SharedLibraries NOINSTALL) ++ IF(FALSE) + IF(UNIX) + # libtool compatability + IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) +@@ -289,4 +292,5 @@ IF(NOT DISABLE_SHARED) + ${INSTALL_LIBDIR} SharedLibraries) + ENDFOREACH() + ENDIF() ++ ENDIF() + ENDIF() Property changes on: head/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-libservices_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-libservices_CMakeLists.txt (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-libservices_CMakeLists.txt (revision 434624) @@ -0,0 +1,9 @@ +--- libservices/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ libservices/CMakeLists.txt +@@ -24,4 +24,6 @@ SET(MYSQLSERVICES_SOURCES + mysql_string_service.c) + + ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) ++IF(FALSE) + INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) ++ENDIF() Property changes on: head/databases/mysqlwsrep56-server/files/patch-libservices_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-man_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-man_CMakeLists.txt (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-man_CMakeLists.txt (revision 434624) @@ -0,0 +1,13 @@ +--- man/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ man/CMakeLists.txt +@@ -14,9 +14,7 @@ + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + # Copy man pages +-FILE(GLOB MAN1_FILES *.1) +-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1) +-FILE(GLOB MAN1_NDB ndb*.1) ++FILE(GLOB MAN1_FILES my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1) + FILE(GLOB MAN8_FILES *.8) + FILE(GLOB MAN8_NDB ndb*.8) + IF(MAN1_FILES) Property changes on: head/databases/mysqlwsrep56-server/files/patch-man_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc (revision 434624) @@ -0,0 +1,61 @@ +--- mysys_ssl/my_default.cc.orig 2016-11-28 13:36:22 UTC ++++ mysys_ssl/my_default.cc +@@ -110,7 +110,7 @@ static my_bool defaults_already_read= FA + + /* Which directories are searched for options (and in which order) */ + +-#define MAX_DEFAULT_DIRS 6 ++#define MAX_DEFAULT_DIRS 7 + #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ + static const char **default_directories = NULL; + +@@ -903,6 +903,14 @@ static int search_default_file_with_ext( + return 1; /* Ignore wrong files */ + } + ++ if (strstr(name, "/etc") == name) ++ { ++ fprintf(stderr, ++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", ++ name,name); ++ goto err; ++ } ++ + while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) + { + line++; +@@ -1241,7 +1249,8 @@ void my_print_default_files(const char * + end[(strlen(end)-1)] = ' '; + else + strxmov(end, conf_file, *ext , " ", NullS); +- fputs(name, stdout); ++ if (strstr(name, "/etc") != name) ++ fputs(name, stdout); + } + } + } +@@ -1400,13 +1409,8 @@ static const char **init_default_directo + + #else + +- errors += add_directory(alloc, "/etc/", dirs); +- errors += add_directory(alloc, "/etc/mysql/", dirs); +- +-#if defined(DEFAULT_SYSCONFDIR) +- if (DEFAULT_SYSCONFDIR[0]) +- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); +-#endif /* DEFAULT_SYSCONFDIR */ ++ errors += add_directory(alloc, "/usr/local/etc/", dirs); ++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); + + #endif + +@@ -1477,7 +1481,7 @@ int check_file_permissions(const char *f + MY_STAT stat_info; + + if (!my_stat(file_name,&stat_info,MYF(0))) +- return 1; ++ return 0; + /* + Ignore .mylogin.cnf file if not exclusively readable/writable + by current user. Property changes on: head/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc (revision 434624) @@ -0,0 +1,11 @@ +--- plugin/password_validation/validate_password.cc.orig 2013-09-10 07:38:25.000000000 +0000 ++++ plugin/password_validation/validate_password.cc 2013-10-05 15:40:20.790380179 +0000 +@@ -16,6 +16,8 @@ + #include + #include + #include ++/* solve clash between libc++ bitset::test() and test macro from my_global.h */ ++#undef test + #include + #include + #include Property changes on: head/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt (revision 434624) @@ -0,0 +1,36 @@ +--- scripts/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ scripts/CMakeLists.txt +@@ -298,6 +298,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) + GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) + STRING(REGEX REPLACE "^lib" "" lib "${lib}") + SET(${var} "${${var}}-l${lib} " ) ++ ELSEIF(lib STREQUAL "-pthread") ++ SET(${var} "${${var}}-pthread " ) + ELSE() + SET(${var} "${${var}}-l${lib} " ) + ENDIF() +@@ -360,15 +362,10 @@ ELSE() + # On Unix, most of the files end up in the bin directory + SET(mysql_config_COMPONENT COMPONENT Development) + SET(BIN_SCRIPTS +- msql2mysql +- mysql_config + mysql_fix_extensions + mysql_setpermission + mysql_zap +- mysqlaccess +- mysqlaccess.conf + mysql_convert_table_format +- mysql_find_rows + mysqlhotcopy + mysqldumpslow + mysqld_multi +@@ -378,7 +375,7 @@ ELSE() + FOREACH(file ${BIN_SCRIPTS}) + IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh +- ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY) ++ ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY) + ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file} + ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY) Property changes on: head/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-scripts_mysqld__safe.sh =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-scripts_mysqld__safe.sh (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-scripts_mysqld__safe.sh (revision 434624) @@ -0,0 +1,24 @@ +--- scripts/mysqld_safe.sh.orig 2007-10-08 10:39:23.000000000 +0200 ++++ scripts/mysqld_safe.sh 2007-10-08 10:40:52.000000000 +0200 +@@ -242,10 +242,10 @@ + + if test -z "$MYSQL_HOME" + then +- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf" ++ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf" + then + log_error "WARNING: Found two instances of my.cnf - +-$MY_BASEDIR_VERSION/my.cnf and ++$MY_BASEDIR_VERSION/etc/my.cnf and + $DATADIR/my.cnf + IGNORING $DATADIR/my.cnf" + +@@ -254,7 +254,7 @@ + then + log_error "WARNING: Found $DATADIR/my.cnf + The data directory is a deprecated location for my.cnf, please move it to +-$MY_BASEDIR_VERSION/my.cnf" ++$MY_BASEDIR_VERSION/etc/my.cnf" + MYSQL_HOME=$DATADIR + else + MYSQL_HOME=$MY_BASEDIR_VERSION Property changes on: head/databases/mysqlwsrep56-server/files/patch-scripts_mysqld__safe.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt (revision 434624) @@ -0,0 +1,18 @@ +--- sql/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ sql/CMakeLists.txt +@@ -472,6 +472,7 @@ ADD_CUSTOM_TARGET(distclean + + IF(INSTALL_LAYOUT STREQUAL "STANDALONE") + ++IF(FALSE) + # Copy db.opt into data/test/ + SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) + INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles) +@@ -516,6 +517,7 @@ ELSE() + INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) + ENDIF() + ENDIF() ++ENDIF() + + ADD_CUSTOM_TARGET(show-dist-name + COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}" Property changes on: head/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-sql_sql__trigger.cc =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-sql_sql__trigger.cc (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-sql_sql__trigger.cc (revision 434624) @@ -0,0 +1,50 @@ +--- sql/sql_trigger.cc.orig 2012-08-02 00:01:13.000000000 +0200 ++++ sql/sql_trigger.cc 2012-09-11 17:01:13.000000000 +0200 +@@ -192,32 +192,32 @@ static File_option triggers_file_parameters[]= + { + { + { C_STRING_WITH_LEN("triggers") }, +- my_offsetof(class Table_triggers_list, definitions_list), ++ static_cast(my_offsetof(class Table_triggers_list, definitions_list)), + FILE_OPTIONS_STRLIST + }, + { + { C_STRING_WITH_LEN("sql_modes") }, +- my_offsetof(class Table_triggers_list, definition_modes_list), ++ static_cast(my_offsetof(class Table_triggers_list, definition_modes_list)), + FILE_OPTIONS_ULLLIST + }, + { + { C_STRING_WITH_LEN("definers") }, +- my_offsetof(class Table_triggers_list, definers_list), ++ static_cast(my_offsetof(class Table_triggers_list, definers_list)), + FILE_OPTIONS_STRLIST + }, + { + { C_STRING_WITH_LEN("client_cs_names") }, +- my_offsetof(class Table_triggers_list, client_cs_names), ++ static_cast(my_offsetof(class Table_triggers_list, client_cs_names)), + FILE_OPTIONS_STRLIST + }, + { + { C_STRING_WITH_LEN("connection_cl_names") }, +- my_offsetof(class Table_triggers_list, connection_cl_names), ++ static_cast(my_offsetof(class Table_triggers_list, connection_cl_names)), + FILE_OPTIONS_STRLIST + }, + { + { C_STRING_WITH_LEN("db_cl_names") }, +- my_offsetof(class Table_triggers_list, db_cl_names), ++ static_cast(my_offsetof(class Table_triggers_list, db_cl_names)), + FILE_OPTIONS_STRLIST + }, + { { 0, 0 }, 0, FILE_OPTIONS_STRING } +@@ -226,7 +226,7 @@ static File_option triggers_file_parameters[]= + File_option sql_modes_parameters= + { + { C_STRING_WITH_LEN("sql_modes") }, +- my_offsetof(class Table_triggers_list, definition_modes_list), ++ static_cast(my_offsetof(class Table_triggers_list, definition_modes_list)), + FILE_OPTIONS_ULLLIST + }; + Property changes on: head/databases/mysqlwsrep56-server/files/patch-sql_sql__trigger.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-sql_sql__view.cc =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-sql_sql__view.cc (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-sql_sql__view.cc (revision 434624) @@ -0,0 +1,63 @@ +--- sql/sql_view.cc.orig 2012-08-02 00:01:13.000000000 +0200 ++++ sql/sql_view.cc 2012-09-11 17:01:13.000000000 +0200 +@@ -730,46 +730,46 @@ static const int required_view_parameters= 14; + */ + static File_option view_parameters[]= + {{{ C_STRING_WITH_LEN("query")}, +- my_offsetof(TABLE_LIST, select_stmt), ++ static_cast(my_offsetof(TABLE_LIST, select_stmt)), + FILE_OPTIONS_ESTRING}, + {{ C_STRING_WITH_LEN("md5")}, +- my_offsetof(TABLE_LIST, md5), ++ static_cast(my_offsetof(TABLE_LIST, md5)), + FILE_OPTIONS_STRING}, + {{ C_STRING_WITH_LEN("updatable")}, +- my_offsetof(TABLE_LIST, updatable_view), ++ static_cast(my_offsetof(TABLE_LIST, updatable_view)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("algorithm")}, +- my_offsetof(TABLE_LIST, algorithm), ++ static_cast(my_offsetof(TABLE_LIST, algorithm)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("definer_user")}, +- my_offsetof(TABLE_LIST, definer.user), ++ static_cast(my_offsetof(TABLE_LIST, definer.user)), + FILE_OPTIONS_STRING}, + {{ C_STRING_WITH_LEN("definer_host")}, +- my_offsetof(TABLE_LIST, definer.host), ++ static_cast(my_offsetof(TABLE_LIST, definer.host)), + FILE_OPTIONS_STRING}, + {{ C_STRING_WITH_LEN("suid")}, +- my_offsetof(TABLE_LIST, view_suid), ++ static_cast(my_offsetof(TABLE_LIST, view_suid)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("with_check_option")}, +- my_offsetof(TABLE_LIST, with_check), ++ static_cast(my_offsetof(TABLE_LIST, with_check)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("timestamp")}, +- my_offsetof(TABLE_LIST, timestamp), ++ static_cast(my_offsetof(TABLE_LIST, timestamp)), + FILE_OPTIONS_TIMESTAMP}, + {{ C_STRING_WITH_LEN("create-version")}, +- my_offsetof(TABLE_LIST, file_version), ++ static_cast(my_offsetof(TABLE_LIST, file_version)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("source")}, +- my_offsetof(TABLE_LIST, source), ++ static_cast(my_offsetof(TABLE_LIST, source)), + FILE_OPTIONS_ESTRING}, + {{(char*) STRING_WITH_LEN("client_cs_name")}, +- my_offsetof(TABLE_LIST, view_client_cs_name), ++ static_cast(my_offsetof(TABLE_LIST, view_client_cs_name)), + FILE_OPTIONS_STRING}, + {{(char*) STRING_WITH_LEN("connection_cl_name")}, +- my_offsetof(TABLE_LIST, view_connection_cl_name), ++ static_cast(my_offsetof(TABLE_LIST, view_connection_cl_name)), + FILE_OPTIONS_STRING}, + {{(char*) STRING_WITH_LEN("view_body_utf8")}, +- my_offsetof(TABLE_LIST, view_body_utf8), ++ static_cast(my_offsetof(TABLE_LIST, view_body_utf8)), + FILE_OPTIONS_ESTRING}, + {{NullS, 0}, 0, + FILE_OPTIONS_STRING} Property changes on: head/databases/mysqlwsrep56-server/files/patch-sql_sql__view.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc (revision 434624) @@ -0,0 +1,38 @@ +--- sql/sys_vars.cc.orig 2012-06-15 17:03:32.000000000 +0200 ++++ sql/sys_vars.cc 2012-06-15 17:16:23.000000000 +0200 +@@ -900,7 +900,7 @@ + "connection before closing it", + SESSION_VAR(net_interactive_timeout), + CMD_LINE(REQUIRED_ARG), +- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); ++ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); + + static Sys_var_ulong Sys_join_buffer_size( + "join_buffer_size", +@@ -1401,7 +1401,7 @@ + "Number of seconds to wait for more data from a connection before " + "aborting the read", + SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), +- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), ++ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), + NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), + ON_UPDATE(fix_net_read_timeout)); + +@@ -1416,7 +1416,7 @@ + "Number of seconds to wait for a block to be written to a connection " + "before aborting the write", + SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), +- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), ++ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), + NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), + ON_UPDATE(fix_net_write_timeout)); + +@@ -2257,7 +2257,7 @@ + "The number of seconds the server waits for activity on a " + "connection before closing it", + SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), +- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), ++ VALID_RANGE(1, INT_MAX32/1000), + DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); + + /** propagates changes to the relevant flag of @@optimizer_switch */ Property changes on: head/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt (nonexistent) +++ head/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt (revision 434624) @@ -0,0 +1,12 @@ +--- support-files/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC ++++ support-files/CMakeLists.txt +@@ -69,7 +69,9 @@ IF(UNIX) + INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) + ENDIF() + ++IF(FALSE) + INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) ++ENDIF() + CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) + CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) + Property changes on: head/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/my.cnf.sample.in =================================================================== --- head/databases/mysqlwsrep56-server/files/my.cnf.sample.in (nonexistent) +++ head/databases/mysqlwsrep56-server/files/my.cnf.sample.in (revision 434624) @@ -0,0 +1,63 @@ +# $FreeBSD$ + +[client] +port = 3306 +socket = /tmp/mysql.sock + +[mysql] +prompt = \u@\h [\d]>\_ +no_auto_rehash + +[mysqld] +user = mysql +port = 3306 +socket = /tmp/mysql.sock +bind-address = 127.0.0.1 +basedir = %%PREFIX%% +datadir = %%MY_DBDIR%% +tmpdir = %%MY_TMPDIR%% +slave-load-tmpdir = %%MY_TMPDIR%% +secure-file-priv = %%MY_SECDIR%% +log-bin = mysql-bin +log-output = TABLE +master-info-repository = TABLE +relay-log-info-repository = TABLE +relay-log-recovery = 1 +slow-query-log = 1 +server-id = 1 +sync_binlog = 1 +sync_relay_log = 1 +binlog_cache_size = 16M +expire_logs_days = 30 +log-slave-updates = 1 +enforce-gtid-consistency = 1 +gtid-mode = ON +safe-user-create = 1 +lower_case_table_names = 1 +explicit-defaults-for-timestamp = 1 +myisam-recover-options = BACKUP,FORCE +open_files_limit = 32768 +table_open_cache = 16384 +table_definition_cache = 8192 +net_retry_count = 16384 +key_buffer_size = 256M +max_allowed_packet = 64M +query_cache_type = 0 +query_cache_size = 0 +long_query_time = 0.5 +innodb_buffer_pool_size = 1G +innodb_data_home_dir = %%MY_DBDIR%% +innodb_log_group_home_dir = %%MY_DBDIR%% +innodb_data_file_path = ibdata1:128M:autoextend +innodb_flush_method = O_DIRECT +innodb_log_file_size = 256M +innodb_log_buffer_size = 16M +innodb_write_io_threads = 8 +innodb_read_io_threads = 8 +innodb_autoinc_lock_mode = 2 +skip-symbolic-links + +[mysqldump] +max_allowed_packet = 256M +quote_names +quick Property changes on: head/databases/mysqlwsrep56-server/files/my.cnf.sample.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/files/extra-patch-config.h.cmake =================================================================== --- head/databases/mysqlwsrep56-server/files/extra-patch-config.h.cmake (nonexistent) +++ head/databases/mysqlwsrep56-server/files/extra-patch-config.h.cmake (revision 434624) @@ -0,0 +1,12 @@ +--- config.h.cmake.orig 2014-12-05 16:24:02 UTC ++++ config.h.cmake +@@ -151,7 +151,8 @@ + #cmakedefine HAVE_FESETROUND 1 + #cmakedefine HAVE_FINITE 1 + #cmakedefine HAVE_FP_EXCEPT 1 +-#cmakedefine HAVE_FPSETMASK 1 ++#cmakedefine HAVE_FPSETMASK 0 ++#cmakedefine HAVE_FEDISABLEEXCEPT 1 + #cmakedefine HAVE_FSEEKO 1 + #cmakedefine HAVE_FSYNC 1 + #cmakedefine HAVE_FTIME 1 Property changes on: head/databases/mysqlwsrep56-server/files/extra-patch-config.h.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/pkg-descr =================================================================== --- head/databases/mysqlwsrep56-server/pkg-descr (nonexistent) +++ head/databases/mysqlwsrep56-server/pkg-descr (revision 434624) @@ -0,0 +1,3 @@ +MySQL built with WSREP patch to support replication using the Galera library. + +WWW: http://www.galeracluster.com/ Property changes on: head/databases/mysqlwsrep56-server/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/pkg-message =================================================================== --- head/databases/mysqlwsrep56-server/pkg-message (nonexistent) +++ head/databases/mysqlwsrep56-server/pkg-message (revision 434624) @@ -0,0 +1,6 @@ +************************************************************************ + +Remember to run mysql_upgrade the first time you start the MySQL server +after an upgrade from an earlier version. + +************************************************************************ Property changes on: head/databases/mysqlwsrep56-server/pkg-message ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep56-server/pkg-plist =================================================================== --- head/databases/mysqlwsrep56-server/pkg-plist (nonexistent) +++ head/databases/mysqlwsrep56-server/pkg-plist (revision 434624) @@ -0,0 +1,140 @@ +bin/innochecksum +bin/my_print_defaults +bin/myisam_ftdump +bin/myisamchk +bin/myisamlog +bin/myisampack +bin/mysql_convert_table_format +bin/mysql_fix_extensions +bin/mysql_install_db +bin/mysql_plugin +bin/mysql_secure_installation +bin/mysql_setpermission +bin/mysql_tzinfo_to_sql +bin/mysql_upgrade +bin/mysql_zap +bin/mysqlbug +bin/mysqld_multi +bin/mysqld_safe +bin/mysqldumpslow +bin/mysqlhotcopy +bin/mysqltest +bin/perror +bin/replace +bin/resolve_stack_dump +bin/resolveip +bin/wsrep_sst_common +bin/wsrep_sst_mysqldump +bin/wsrep_sst_rsync +bin/wsrep_sst_xtrabackup +bin/wsrep_sst_xtrabackup-v2 +lib/mysql/plugin/adt_null.so +lib/mysql/plugin/auth.so +lib/mysql/plugin/auth_test_plugin.so +lib/mysql/plugin/connection_control.so +lib/mysql/plugin/daemon_example.ini +lib/mysql/plugin/libdaemon_example.so +lib/mysql/plugin/mypluglib.so +lib/mysql/plugin/mysql_no_login.so +lib/mysql/plugin/qa_auth_client.so +lib/mysql/plugin/qa_auth_interface.so +lib/mysql/plugin/qa_auth_server.so +lib/mysql/plugin/semisync_master.so +lib/mysql/plugin/semisync_slave.so +lib/mysql/plugin/test_udf_services.so +lib/mysql/plugin/validate_password.so +lib/mysql/plugin/innodb_engine.so +lib/mysql/plugin/libmemcached.so +libexec/mysqld +man/man1/my_print_defaults.1.gz +man/man1/myisam_ftdump.1.gz +man/man1/myisamchk.1.gz +man/man1/myisamlog.1.gz +man/man1/myisampack.1.gz +man/man1/mysql.server.1.gz +man/man1/mysql_convert_table_format.1.gz +man/man1/mysql_fix_extensions.1.gz +man/man1/mysql_install_db.1.gz +man/man1/mysql_plugin.1.gz +man/man1/mysql_secure_installation.1.gz +man/man1/mysql_setpermission.1.gz +man/man1/mysql_tzinfo_to_sql.1.gz +man/man1/mysql_upgrade.1.gz +man/man1/mysql_zap.1.gz +man/man1/mysqlbug.1.gz +man/man1/mysqld_multi.1.gz +man/man1/mysqld_safe.1.gz +man/man1/mysqldumpslow.1.gz +man/man1/mysqlhotcopy.1.gz +man/man1/mysqlman.1.gz +man/man1/mysqltest.1.gz +man/man1/perror.1.gz +man/man1/replace.1.gz +man/man1/resolve_stack_dump.1.gz +man/man1/resolveip.1.gz +man/man8/mysqld.8.gz +%%DATADIR%%/binary-configure +%%DATADIR%%/bulgarian/errmsg.sys +%%DATADIR%%/charsets/Index.xml +%%DATADIR%%/charsets/README +%%DATADIR%%/charsets/armscii8.xml +%%DATADIR%%/charsets/ascii.xml +%%DATADIR%%/charsets/cp1250.xml +%%DATADIR%%/charsets/cp1251.xml +%%DATADIR%%/charsets/cp1256.xml +%%DATADIR%%/charsets/cp1257.xml +%%DATADIR%%/charsets/cp850.xml +%%DATADIR%%/charsets/cp852.xml +%%DATADIR%%/charsets/cp866.xml +%%DATADIR%%/charsets/dec8.xml +%%DATADIR%%/charsets/geostd8.xml +%%DATADIR%%/charsets/greek.xml +%%DATADIR%%/charsets/hebrew.xml +%%DATADIR%%/charsets/hp8.xml +%%DATADIR%%/charsets/keybcs2.xml +%%DATADIR%%/charsets/koi8r.xml +%%DATADIR%%/charsets/koi8u.xml +%%DATADIR%%/charsets/latin1.xml +%%DATADIR%%/charsets/latin2.xml +%%DATADIR%%/charsets/latin5.xml +%%DATADIR%%/charsets/latin7.xml +%%DATADIR%%/charsets/macce.xml +%%DATADIR%%/charsets/macroman.xml +%%DATADIR%%/charsets/swe7.xml +%%DATADIR%%/czech/errmsg.sys +%%DATADIR%%/danish/errmsg.sys +%%DATADIR%%/dictionary.txt +%%DATADIR%%/dutch/errmsg.sys +%%DATADIR%%/english/errmsg.sys +%%DATADIR%%/errmsg-utf8.txt +%%DATADIR%%/estonian/errmsg.sys +%%DATADIR%%/fill_help_tables.sql +%%DATADIR%%/french/errmsg.sys +%%DATADIR%%/german/errmsg.sys +%%DATADIR%%/greek/errmsg.sys +%%DATADIR%%/hungarian/errmsg.sys +%%DATADIR%%/innodb_memcached_config.sql +%%DATADIR%%/italian/errmsg.sys +%%DATADIR%%/japanese/errmsg.sys +%%DATADIR%%/korean/errmsg.sys +%%DATADIR%%/magic +%%DATADIR%%/my-default.cnf +%%DATADIR%%/mysql-log-rotate +%%DATADIR%%/mysql.server +%%DATADIR%%/mysql_security_commands.sql +%%DATADIR%%/mysql_system_tables.sql +%%DATADIR%%/mysql_system_tables_data.sql +%%DATADIR%%/mysql_test_data_timezone.sql +%%DATADIR%%/mysqld_multi.server +%%DATADIR%%/norwegian-ny/errmsg.sys +%%DATADIR%%/norwegian/errmsg.sys +%%DATADIR%%/polish/errmsg.sys +%%DATADIR%%/portuguese/errmsg.sys +%%DATADIR%%/romanian/errmsg.sys +%%DATADIR%%/russian/errmsg.sys +%%DATADIR%%/serbian/errmsg.sys +%%DATADIR%%/slovak/errmsg.sys +%%DATADIR%%/spanish/errmsg.sys +%%DATADIR%%/swedish/errmsg.sys +%%DATADIR%%/ukrainian/errmsg.sys +%%DATADIR%%/wsrep_notify Property changes on: head/databases/mysqlwsrep56-server/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property