Index: head/Mk/bsd.database.mk =================================================================== --- head/Mk/bsd.database.mk (revision 408821) +++ head/Mk/bsd.database.mk (revision 408822) @@ -1,423 +1,424 @@ # $FreeBSD$ # .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) Database_Post_Include= bsd.database.mk Database_Include_MAINTAINER= ports@FreeBSD.org # This file contains some routines to interact with different databases, such # as MySQL and Berkley DB. To include this file, define macro # USE_[DATABASE], for example USE_MYSQL. Defining macro like # USE_[DATABASE]_VER or WANT_[DATABASE]_VER will include this file as well. # ## # USE_MYSQL - Add MySQL (client/server/embedded) dependency (default: # client). # If no version is given (by the maintainer via the port or # by the user via defined variable), try to find the # currently installed version. Fall back to default if # necessary (MySQL-5.6 = 56). # DEFAULT_MYSQL_VER # - MySQL default version. Can be overridden within a port. # Default: 56. # WANT_MYSQL_VER # - Maintainer can set an arbitrary version of MySQL to always # build this port with (overrides WITH_MYSQL_VER). # 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. ## # USE_BDB - Add Berkeley DB library dependency. # If no version is given (by the maintainer via the port or # by the user via defined variable), try to find the # currently installed version. Fall back to default if # necessary (db5 if compatible). # This adds a "debug-bdb" make target which will dump the # related data. # INVALID_BDB_VER # - This variable can be defined when the port does not # support one or more versions of Berkeley DB. # WANT_BDB_VER # - Maintainer can set a version of Berkeley DB to always # build this port with (overrides WITH_BDB_VER). # WITH_BDB_VER # - User defined global variable to set Berkeley DB version. # _WITH_BDB_VER # - User defined port specific variable to set Berkeley DB # version. # WITH_BDB_HIGHEST # - Use the highest installed version of Berkeley DB. # WITH_BDB6_PERMITTED # - If defined, BerkeleyDB 6 is added to the # default version set, making it eligible even # if not already installed. This is due to its # stricter Affero GNU Public License. # # These variables will then be filled in by this .mk file: # # BDB_LIB_NAME # - This variable is automatically set to the name of the # Berkeley DB library (default: db41). # BDB_LIB_CXX_NAME # - This variable is automatically set to the name of the # Berkeley DB C++ library (default: db41_cxx). # BDB_INCLUDE_DIR # - This variable is automatically set to the location of # the Berkeley DB include directory (default: # ${LOCALBASE}/include/db41). # BDB_LIB_DIR # - This variable is automatically set to the location of # the Berkeley DB library directory. # BDB_VER # - Detected Berkeley DB version. ## # USE_SQLITE - Add dependency on SQLite library. Valid values are: # 3 and 2. If version is not specified directly then # SQLite-3 is used (if USE_SQLITE= yes). # SQLITE_VER # - Detected SQLite version. ## # USE_FIREBIRD - Add dependency on Firebird library. Valid values are: # 2 and 1. If no version is given by the maintainer (if # USE_FIREBIRD= yes) and the user did not define # WITH_FIREBIRD_VER variable, fall back to default "2". # WITH_FIREBIRD_VER # - User defined variable to set Firebird version. # FIREBIRD_VER # - Detected Firebird version. .include "${PORTSDIR}/Mk/bsd.default-versions.mk" .if defined(DEFAULT_MYSQL_VER) WARNING+= "DEFAULT_MYSQL_VER is defined, consider using DEFAULT_VERSIONS=mysql=${DEFAULT_MYSQL_VER} instead" .endif .if defined(USE_MYSQL) DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//} # MySQL client version currently supported. MYSQL51_LIBVER= 16 MYSQL55_LIBVER= 18 MYSQL55m_LIBVER= 18 MYSQL55p_LIBVER= 18 MYSQL56_LIBVER= 18 MYSQL56p_LIBVER= 18 MYSQL57_LIBVER= 20 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 .elif (${MYSQL_VER:C/[0-9]*//} == "p") _MYSQL_FLAVOUR= percona .else _MYSQL_FLAVOUR= mysql .endif _MYSQL_CLIENT= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-client _MYSQL_SERVER= databases/${_MYSQL_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 (${USE_MYSQL} == "server" || ${USE_MYSQL} == "embedded") RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/${_MYSQL_SERVER} .if (${USE_MYSQL} == "embedded") BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqld.a:${PORTSDIR}/${_MYSQL_SERVER} .endif .else LIB_DEPENDS+= libmysqlclient.so.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/${_MYSQL_CLIENT} .endif .else IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER} .endif # Check for correct libs .endif # USE_MYSQL .if defined(USE_BDB) # TODO: avoid malformed conditional with invalid USE_BDB/WITH_BDB_VER # check if + works properly from test builds 01h12m23s BDB_UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} _USE_BDB_save:=${USE_BDB} _WITH_BDB_VER_save:=${WITH_BDB_VER} _DB_PORTS= 48 5 6 _DB_DEFAULTS= 48 5 # does not include 6 due to different licensing # but user can re-add it through WITH_BDB6_PERMITTED . if defined(WITH_BDB6_PERMITTED) _DB_DEFAULTS+= 6 . endif # Dependency lines for different db versions db48_DEPENDS= libdb-4.8.so:${PORTSDIR}/databases/db48 db5_DEPENDS= libdb-5.3.so:${PORTSDIR}/databases/db5 db6_DEPENDS= libdb-6.1.so:${PORTSDIR}/databases/db6 # Detect db versions by finding some files db48_FIND= ${LOCALBASE}/include/db48/db.h db5_FIND= ${LOCALBASE}/include/db5/db.h db6_FIND= ${LOCALBASE}/include/db6/db.h # Override the global WITH_BDB_VER with the # port specific _WITH_BDB_VER .if defined(${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER) WITH_BDB_VER= ${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER} .endif # Override USE_BDB with global WITH_BDB_VER .if defined(WITH_BDB_VER) . if ${WITH_BDB_VER} != 1 USE_BDB= ${WITH_BDB_VER} . endif .endif # Override USE_BDB with maintainer's WANT_BDB_VER .if defined(WANT_BDB_VER) USE_BDB= ${WANT_BDB_VER} .endif # Compatiblity hack: # upgrade older plussed versions to 48+ _BDB_OLDPLUSVERS=4+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ .for i in ${USE_BDB} . if ${_BDB_OLDPLUSVERS:M${i}} USE_BDB:= 48+ . endif .endfor .if ${USE_BDB} == yes USE_BDB:= 48+ .endif # 1. detect installed versions _INST_BDB_VER= .for bdb in ${_DB_PORTS} . if exists(${db${bdb}_FIND}) _INST_BDB_VER+=${bdb} . endif .endfor # 2. parse supported versions: # 2a. build list from USE_BDB _SUPP_BDB_VER= _USE_BDB:=${USE_BDB:C,\+$,,:C/(.)(.)$/\1.\2/} .if !empty(USE_BDB:M*+) . for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/} . if ${_USE_BDB} <= ${bdb} _SUPP_BDB_VER+=${bdb:C/\.//} . endif . endfor .else _SUPP_BDB_VER=${USE_BDB} .endif # 2b. expand INVALID_BDB_VER if given with "+": .if !empty(INVALID_BDB_VER:M*+) _INV_BDB:=${INVALID_BDB_VER:C,\+$,,:C/(.)(.)$/\1.\2/} _INV_BDB_VER:= . for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/} . if ${_INV_BDB} <= ${bdb} _INV_BDB_VER+=${bdb:C/\.//} . endif . endfor .else _INV_BDB_VER:=${INVALID_BDB_VER} .endif # 2c. strip versions from INVALID_BDB_VER out of _SUPP_BDB_VER .for unsupp in ${_INV_BDB_VER} _SUPP_BDB_VER:=${_SUPP_BDB_VER:N${unsupp}} .endfor # 3a. calculate intersection in _INST_BDB_VER to see if there # is a usable installed version .for i in ${_INST_BDB_VER} . if empty(_SUPP_BDB_VER:M${i}) _INST_BDB_VER:= ${_INST_BDB_VER:N${i}} . endif .endfor _ELIGIBLE_BDB_VER:=${_INST_BDB_VER} # 3b. if there is no usable version installed, check defaults .if empty(_INST_BDB_VER) _DFLT_BDB_VER:=${_DB_DEFAULTS} # make sure we use a reasonable version for package builds _WITH_BDB_HIGHEST=yes . for i in ${_DFLT_BDB_VER} . if empty(_SUPP_BDB_VER:M${i}) _DFLT_BDB_VER:= ${_DFLT_BDB_VER:N${i}} . endif . endfor _ELIGIBLE_BDB_VER:=${_DFLT_BDB_VER} .endif # 4. elect a version _BDB_VER= .for i in ${_ELIGIBLE_BDB_VER} . if !empty(WITH_BDB_HIGHEST) || !empty(_WITH_BDB_HIGHEST) || empty(${_BDB_VER}) _BDB_VER:=${i} . endif .endfor # 5. catch errors or set variables .if empty(_BDB_VER) IGNORE= cannot install: no eligible BerkeleyDB version. Requested: ${USE_BDB}, incompatible: ${_INV_BDB_VER}. Try: make debug-bdb .else . if defined(BDB_BUILD_DEPENDS) BUILD_DEPENDS+= ${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://} . else LIB_DEPENDS+= ${db${_BDB_VER}_DEPENDS} . endif . if ${_BDB_VER} == 48 BDB_LIB_NAME= db-4.8 BDB_LIB_CXX_NAME= db_cxx-4.8 BDB_LIB_DIR= ${LOCALBASE}/lib/db48 . elif ${_BDB_VER} == 5 BDB_LIB_NAME= db-5.3 BDB_LIB_CXX_NAME= db_cxx-5.3 BDB_LIB_DIR= ${LOCALBASE}/lib/db5 . elif ${_BDB_VER} == 6 BDB_LIB_NAME= db-6.1 BDB_LIB_CXX_NAME= db_cxx-6.1 BDB_LIB_DIR= ${LOCALBASE}/lib/db6 . endif BDB_LIB_NAME?= db${_BDB_VER} BDB_LIB_CXX_NAME?= db${_BDB_VER}_cxx BDB_INCLUDE_DIR?= ${LOCALBASE}/include/db${_BDB_VER} BDB_LIB_DIR?= ${LOCALBASE}/lib .endif BDB_VER= ${_BDB_VER} debug-bdb: @${ECHO_CMD} "--INPUTS----------------------------------------------------" @${ECHO_CMD} "${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER: ${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}" @${ECHO_CMD} "WITH_BDB_VER: ${_WITH_BDB_VER_save}" @${ECHO_CMD} "WANT_BDB_VER: ${WANT_BDB_VER}" @${ECHO_CMD} "BDB_BUILD_DEPENDS: ${BDB_BUILD_DEPENDS}" @${ECHO_CMD} "USE_BDB (original): ${_USE_BDB_save}" @${ECHO_CMD} "WITH_BDB_HIGHEST (original): ${WITH_BDB_HIGHEST}" @${ECHO_CMD} "--PROCESSING------------------------------------------------" @${ECHO_CMD} "supported versions: ${_SUPP_BDB_VER}" @${ECHO_CMD} "invalid versions: ${_INV_BDB_VER}" @${ECHO_CMD} "installed versions: ${_INST_BDB_VER}" @${ECHO_CMD} "eligible versions: ${_ELIGIBLE_BDB_VER}" @${ECHO_CMD} "USE_BDB (effective): ${USE_BDB}" @${ECHO_CMD} "WITH_BDB_HIGHEST (override): ${_WITH_BDB_HIGHEST}" @${ECHO_CMD} "--OUTPUTS---------------------------------------------------" @${ECHO_CMD} "IGNORE=${IGNORE}" @${ECHO_CMD} "BDB_VER=${BDB_VER}" @${ECHO_CMD} "BDB_INCLUDE_DIR=${BDB_INCLUDE_DIR}" @${ECHO_CMD} "BDB_LIB_NAME=${BDB_LIB_NAME}" @${ECHO_CMD} "BDB_LIB_CXX_NAME=${BDB_LIB_CXX_NAME}" @${ECHO_CMD} "BDB_LIB_DIR=${BDB_LIB_DIR}" @${ECHO_CMD} "BUILD_DEPENDS=${BUILD_DEPENDS:M*/databases/db*}" @${ECHO_CMD} "LIB_DEPENDS=${LIB_DEPENDS:M*/databases/db*}" @${ECHO_CMD} "------------------------------------------------------------" # Obsolete variables - ports can define these to want users about # variables that may be in /etc/make.conf but that are no longer # effective: .if defined(OBSOLETE_BDB_VAR) . for var in ${OBSOLETE_BDB_VAR} . if defined(${var}) BAD_VAR+= ${var}, . endif . endfor . if defined(BAD_VAR) _IGNORE_MSG= Obsolete variable(s) ${BAD_VAR} use WITH_BDB_VER or ${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER to select Berkeley DB version . if defined(IGNORE) IGNORE+= ${_IGNORE_MSG} . else IGNORE= ${_IGNORE_MSG} . endif . endif .endif .endif # USE_BDB # Handling SQLite dependency .if defined(USE_SQLITE) .if ${USE_SQLITE:tl} == "yes" _SQLITE_VER= 3 .else _SQLITE_VER= ${USE_SQLITE} .endif # USE_SQLITE is specified incorrectly, so mark this as IGNORE .if ${_SQLITE_VER} == "3" LIB_DEPENDS+= libsqlite3.so:${PORTSDIR}/databases/sqlite${_SQLITE_VER} SQLITE_VER= ${_SQLITE_VER} .elif ${_SQLITE_VER} == "2" LIB_DEPENDS+= libsqlite.so:${PORTSDIR}/databases/sqlite${_SQLITE_VER} SQLITE_VER= ${_SQLITE_VER} .else IGNORE= cannot install: unknown SQLite version: ${_SQLITE_VER} .endif .endif # defined(USE_SQLITE) .if defined(USE_FIREBIRD) .if defined(WITH_FIREBIRD_VER) USE_FIREBIRD= ${WITH_FIREBIRD_VER} .endif .if ${USE_FIREBIRD:tl} == "yes" FIREBIRD_VER= ${FIREBIRD_DEFAULT:S/.//} .else FIREBIRD_VER= ${USE_FIREBIRD} .endif .if ${FIREBIRD_VER} == "25" LIB_DEPENDS+= libfbclient.so:${PORTSDIR}/databases/firebird25-client .else IGNORE= cannot install: unknown Firebird version: ${FIREBIRD_VER} .endif .endif # defined(USE_FIREBIRD) .endif # defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) Index: head/databases/Makefile =================================================================== --- head/databases/Makefile (revision 408821) +++ head/databases/Makefile (revision 408822) @@ -1,975 +1,977 @@ # $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 += 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 += autobackupmysql SUBDIR += bbdb SUBDIR += beansdb SUBDIR += buzhug SUBDIR += c3p0 SUBDIR += cassandra 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-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 += 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 += libzdb SUBDIR += linux-c6-sqlite3 SUBDIR += linux-f10-sqlite3 SUBDIR += linux-oracle-instantclient-basic SUBDIR += linux-oracle-instantclient-sdk SUBDIR += linux-oracle-instantclient-sqlplus SUBDIR += liquibase SUBDIR += lmdb SUBDIR += luadbi SUBDIR += luasql-mysql SUBDIR += luasql-postgres SUBDIR += luasql-sqlite3 SUBDIR += mantis 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 += mysql-udf-sys SUBDIR += mysql-workbench52 SUBDIR += mysql-xql SUBDIR += mysql2odbc SUBDIR += mysql2pgsql SUBDIR += mysql55-client SUBDIR += mysql55-server SUBDIR += mysql56-client SUBDIR += mysql56-server SUBDIR += mysql57-client SUBDIR += mysql57-server SUBDIR += mysqlbackup SUBDIR += mysqlbigram 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 += ntdb SUBDIR += ocaml-dbm SUBDIR += ocaml-mysql SUBDIR += ocaml-sqlite3 SUBDIR += openark-kit SUBDIR += opendbx SUBDIR += opentsdb SUBDIR += oracle7-client SUBDIR += oracle8-client SUBDIR += oracle_odbc_driver 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-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-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-Data-Page SUBDIR += p5-Data-Pageset SUBDIR += p5-Exception-Class-DBI 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-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-qdbm 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-mdbtools SUBDIR += pecl-memcache SUBDIR += pecl-memcached SUBDIR += pecl-mongo SUBDIR += pecl-mysqlnd_ms SUBDIR += pecl-mysqlnd_qc SUBDIR += pecl-pdo_user SUBDIR += pecl-rrd SUBDIR += pecl-tokyo_tyrant SUBDIR += percona-toolkit SUBDIR += percona55-client SUBDIR += percona55-server SUBDIR += percona56-client SUBDIR += percona56-server SUBDIR += pg_activity SUBDIR += pg_reorg SUBDIR += pg_rman 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 += pgpool SUBDIR += pgpool-II SUBDIR += pgpool-II-22 SUBDIR += pgpool-II-23 SUBDIR += pgpool-II-30 SUBDIR += pgpool-II-33 SUBDIR += pgpoolAdmin SUBDIR += pgrouting SUBDIR += pgsphere SUBDIR += pgtcl SUBDIR += pgtop SUBDIR += pgtune SUBDIR += pgworksheet SUBDIR += php-adodb-ext SUBDIR += php-mdcached SUBDIR += php5-dba SUBDIR += php5-interbase SUBDIR += php5-mssql SUBDIR += php5-mysql SUBDIR += php5-mysqli SUBDIR += php5-odbc SUBDIR += php5-pdo SUBDIR += php5-pdo_cassandra SUBDIR += php5-pdo_dblib SUBDIR += php5-pdo_firebird SUBDIR += php5-pdo_mysql SUBDIR += php5-pdo_odbc SUBDIR += php5-pdo_pgsql SUBDIR += php5-pdo_sqlite SUBDIR += php5-pgsql SUBDIR += php5-sqlite3 SUBDIR += php5-sybase_ct SUBDIR += php5-tarantool SUBDIR += php55-dba SUBDIR += php55-interbase SUBDIR += php55-mssql SUBDIR += php55-mysql SUBDIR += php55-mysqli SUBDIR += php55-odbc SUBDIR += php55-pdo SUBDIR += php55-pdo_dblib SUBDIR += php55-pdo_firebird SUBDIR += php55-pdo_mysql SUBDIR += php55-pdo_odbc SUBDIR += php55-pdo_pgsql SUBDIR += php55-pdo_sqlite SUBDIR += php55-pgsql SUBDIR += php55-redis SUBDIR += php55-sqlite3 SUBDIR += php55-sybase_ct 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-redis SUBDIR += php56-sqlite3 SUBDIR += php56-sybase_ct SUBDIR += phpminiadmin SUBDIR += phpmyadmin SUBDIR += phppgadmin SUBDIR += postgis-jdbc SUBDIR += postgis20 SUBDIR += postgis21 SUBDIR += postgresql-jdbc SUBDIR += postgresql-libpgeasy SUBDIR += postgresql-libpqxx SUBDIR += postgresql-libpqxx3 SUBDIR += postgresql-odbc SUBDIR += postgresql-pllua SUBDIR += postgresql-plproxy SUBDIR += postgresql-plruby SUBDIR += postgresql-plv8js SUBDIR += postgresql-relay SUBDIR += postgresql-repmgr SUBDIR += postgresql90-client SUBDIR += postgresql90-contrib SUBDIR += postgresql90-docs SUBDIR += postgresql90-pgtcl SUBDIR += postgresql90-plperl SUBDIR += postgresql90-plpython SUBDIR += postgresql90-pltcl SUBDIR += postgresql90-server SUBDIR += postgresql91-client SUBDIR += postgresql91-contrib SUBDIR += postgresql91-docs SUBDIR += postgresql91-pgtcl SUBDIR += postgresql91-plperl SUBDIR += postgresql91-plpython SUBDIR += postgresql91-pltcl SUBDIR += postgresql91-server 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 += postgresql_autodoc 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 += 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-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-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-mycli SUBDIR += py-mysql-connector-python SUBDIR += py-mysql-connector-python2 SUBDIR += py-mysql2pgsql 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-psycopg SUBDIR += py-psycopg2 SUBDIR += py-pyPgSQL SUBDIR += py-pyhs SUBDIR += py-pylibmc SUBDIR += py-pymssql SUBDIR += py-pymysql SUBDIR += py-pypuppetdb SUBDIR += py-pytc SUBDIR += py-python-memcached SUBDIR += py-python-rrdtool SUBDIR += py-python-sql SUBDIR += py-qt4-sql SUBDIR += py-qt5-sql SUBDIR += py-queries SUBDIR += py-redis SUBDIR += py-riak SUBDIR += py-rrdtool_lgpl SUBDIR += py-south SUBDIR += py-sqlalchemy SUBDIR += py-sqlalchemy-devel SUBDIR += py-sqlalchemy-migrate SUBDIR += py-sqlalchemy06 SUBDIR += py-sqlite3 SUBDIR += py-sqlite3dbm SUBDIR += py-sqlobject SUBDIR += py-sqlparse SUBDIR += py-sqlrelay SUBDIR += py-swift SUBDIR += py-swiftclient SUBDIR += py-sybase SUBDIR += py-tarantool SUBDIR += py-umemcache SUBDIR += py-whisper SUBDIR += py33-gdbm SUBDIR += py33-sqlite3 SUBDIR += py34-gdbm SUBDIR += py34-sqlite3 SUBDIR += py35-gdbm SUBDIR += py35-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 += 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 += rrdtool10 SUBDIR += rrdtool12 SUBDIR += ruby-bdb SUBDIR += ruby-cdb SUBDIR += ruby-gdbm SUBDIR += ruby-mysql SUBDIR += ruby-o_dbm SUBDIR += ruby-odbc SUBDIR += ruby-qdbm SUBDIR += ruby-rdbc1 SUBDIR += ruby-sybct SUBDIR += ruby-tokyocabinet SUBDIR += rubygem-activemodel SUBDIR += rubygem-activemodel4 SUBDIR += rubygem-activemodel41 SUBDIR += rubygem-activerecord SUBDIR += rubygem-activerecord-jdbc-adapter SUBDIR += rubygem-activerecord-jdbcmysql-adapter SUBDIR += rubygem-activerecord-mysql-adapter SUBDIR += rubygem-activerecord-session_store SUBDIR += rubygem-activerecord4 SUBDIR += rubygem-activerecord41 SUBDIR += rubygem-after_commit_queue SUBDIR += rubygem-after_commit_queue-rails41 SUBDIR += rubygem-amalgalite SUBDIR += rubygem-arel SUBDIR += rubygem-arel-helpers SUBDIR += rubygem-arel3 SUBDIR += rubygem-arel5 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-active_model SUBDIR += rubygem-dm-aggregates SUBDIR += rubygem-dm-chunked_query SUBDIR += rubygem-dm-constraints SUBDIR += rubygem-dm-core SUBDIR += rubygem-dm-devise 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-rails 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-paranoia-rails41 SUBDIR += rubygem-pg SUBDIR += rubygem-rbase SUBDIR += rubygem-redis SUBDIR += rubygem-redis-actionpack SUBDIR += rubygem-redis-namespace SUBDIR += rubygem-rubyrep 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 += sqlite2 SUBDIR += sqlite3 SUBDIR += sqlitebrowser SUBDIR += sqliteman SUBDIR += sqlitemanager SUBDIR += sqliteodbc SUBDIR += sqlitestudio SUBDIR += sqlrelay SUBDIR += sqsh SUBDIR += squirrel-sql SUBDIR += tablelog SUBDIR += tarantool SUBDIR += tarantool-c SUBDIR += tcl-Mysql SUBDIR += tcl-sqlite3 SUBDIR += tdb SUBDIR += tdbc SUBDIR += tinycdb SUBDIR += tokyocabinet SUBDIR += tokyotyrant SUBDIR += tora 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/mariadb101-client/Makefile =================================================================== --- head/databases/mariadb101-client/Makefile (nonexistent) +++ head/databases/mariadb101-client/Makefile (revision 408822) @@ -0,0 +1,32 @@ +# $FreeBSD$ + +PORTNAME= mariadb +PKGNAMESUFFIX= 101-client + +COMMENT= Multithreaded SQL database (client) + +MASTERDIR= ${.CURDIR}/../mariadb101-server + +FILESDIR= ${.CURDIR}/files +PATCHDIR= ${.CURDIR}/files +PLIST= ${.CURDIR}/pkg-plist + +CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DWITH_WSREP=0 +INSTALL_TARGET= install + +USE_LDCONFIG= ${PREFIX}/lib/mysql + +CLIENT_ONLY= yes + +post-install: + ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 + ${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig +. for b in mysql mysqladmin mysqlbinlog mysqlcheck mysqldump \ + mysqlimport mysqlshow mysqlslap + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${b} +. endfor + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so.18 + # Fix https://mariadb.atlassian.net/browse/MDEV-9388 + @${REINPLACE_CMD} 's/-l-pthread/-lpthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config + +.include "${MASTERDIR}/Makefile" Property changes on: head/databases/mariadb101-client/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/mariadb101-client/files/patch-CMakeLists.txt =================================================================== --- head/databases/mariadb101-client/files/patch-CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-client/files/patch-CMakeLists.txt (revision 408822) @@ -0,0 +1,26 @@ +--- CMakeLists.txt.orig 2015-12-23 15:33:29 UTC ++++ CMakeLists.txt +@@ -382,7 +382,6 @@ ADD_SUBDIRECTORY(libmysql) + ADD_SUBDIRECTORY(client) + ADD_SUBDIRECTORY(extra) + ADD_SUBDIRECTORY(libservices) +-ADD_SUBDIRECTORY(sql/share) + + IF(NOT WITHOUT_SERVER) + ADD_SUBDIRECTORY(tests) +@@ -461,6 +460,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + ) + ++IF(FALSE) + INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty + EXCEPTIONS-CLIENT COMPONENT Readme) + # MDEV-6526 these files are not installed anymore +@@ -471,6 +471,7 @@ IF(UNIX) + INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) + INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) + ENDIF() ++ENDIF() + + INCLUDE(CPack) + Property changes on: head/databases/mariadb101-client/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/mariadb101-client/files/patch-client_CMakeLists.txt =================================================================== --- head/databases/mariadb101-client/files/patch-client_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-client/files/patch-client_CMakeLists.txt (revision 408822) @@ -0,0 +1,57 @@ +--- client/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC ++++ client/CMakeLists.txt +@@ -38,11 +38,12 @@ IF(UNIX) + SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) + ENDIF(UNIX) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) + SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") + TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcre pcreposix) + SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) +- ++ENDIF() + + MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) + TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) +@@ -54,21 +55,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim + SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") + TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) + TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) + ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) ++ENDIF() + + MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) + TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) + TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) ++ENDIF() + + MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) + TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) + + MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc) +-TARGET_LINK_LIBRARIES(mysqladmin mysqlclient) ++tARGET_LINK_LIBRARIES(mysqladmin mysqlclient) + + MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) + SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") +@@ -80,10 +85,12 @@ IF(WIN32) + ENDIF(WIN32) + + # async_example is just a code example, do not install it. ++IF(FALSE) + ADD_EXECUTABLE(async_example async_example.c) + TARGET_LINK_LIBRARIES(async_example mysqlclient) ++ENDIF() + +-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example ++SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap + PROPERTIES HAS_CXX TRUE) + + ADD_DEFINITIONS(-DHAVE_DLOPEN) Property changes on: head/databases/mariadb101-client/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/mariadb101-client/files/patch-cmake_jemalloc.cmake =================================================================== --- head/databases/mariadb101-client/files/patch-cmake_jemalloc.cmake (nonexistent) +++ head/databases/mariadb101-client/files/patch-cmake_jemalloc.cmake (revision 408822) @@ -0,0 +1,18 @@ +# Upstreamed https://github.com/MariaDB/server/pull/140 + +--- cmake/jemalloc.cmake.orig 2015-12-23 15:33:29 UTC ++++ cmake/jemalloc.cmake +@@ -12,7 +12,12 @@ MACRO(JEMALLOC_TRY_STATIC) + ENDMACRO() + + MACRO(JEMALLOC_TRY_DYNAMIC) +- SET(libname jemalloc) ++ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND ++ CMAKE_SYSTEM_VERSION STRGREATER "10.0") ++ SET(libname c) ++ ELSE() ++ SET(libname jemalloc) ++ ENDIF() + SET(what system) + CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_DYNAMIC_JEMALLOC) + ENDMACRO() Property changes on: head/databases/mariadb101-client/files/patch-cmake_jemalloc.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/mariadb101-client/files/patch-extra_CMakeLists.txt =================================================================== --- head/databases/mariadb101-client/files/patch-extra_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-client/files/patch-extra_CMakeLists.txt (revision 408822) @@ -0,0 +1,34 @@ +--- extra/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC ++++ extra/CMakeLists.txt +@@ -46,6 +46,7 @@ ADD_CUSTOM_TARGET(GenError + DEPENDS + ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) + TARGET_LINK_LIBRARIES(my_print_defaults mysys) + +@@ -88,18 +89,23 @@ IF(WITH_INNOBASE_STORAGE_ENGINE OR WITH_ + ) + ENDIF() + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) + TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) + ADD_DEPENDENCIES(innochecksum GenError) + ENDIF() ++ENDIF() + + MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) + TARGET_LINK_LIBRARIES(replace mysys) ++ENDIF() + + IF(UNIX) ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) + TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) + + MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) + TARGET_LINK_LIBRARIES(mysql_waitpid mysys) + ENDIF() ++ENDIF() Property changes on: head/databases/mariadb101-client/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/mariadb101-client/files/patch-include_CMakeLists.txt =================================================================== --- head/databases/mariadb101-client/files/patch-include_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-client/files/patch-include_CMakeLists.txt (revision 408822) @@ -0,0 +1,22 @@ +--- include/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC ++++ include/CMakeLists.txt +@@ -66,13 +66,18 @@ INSTALL(FILES ${HEADERS} DESTINATION ${I + FOREACH(f ${HEADERS_GEN_CONFIGURE}) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) + ENDFOREACH(f) +-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h") ++INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development ++ FILES_MATCHING PATTERN "*.h" ++ PATTERN "psi_abi*" EXCLUDE ++) + + STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") + STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") + ++IF(FALSE) + INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development + FILES_MATCHING PATTERN "*.h" + PATTERN CMakeFiles EXCLUDE + PATTERN mysql EXCLUDE + REGEX "\\./(${EXCL_RE}$)" EXCLUDE) ++ENDIF() Property changes on: head/databases/mariadb101-client/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/mariadb101-client/files/patch-include_my_compare.h =================================================================== --- head/databases/mariadb101-client/files/patch-include_my_compare.h (nonexistent) +++ head/databases/mariadb101-client/files/patch-include_my_compare.h (revision 408822) @@ -0,0 +1,11 @@ +--- include/my_compare.h.orig 2015-12-23 15:33:29 UTC ++++ include/my_compare.h +@@ -40,7 +40,7 @@ extern "C" { + 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 32 /* Max segments for key */ + + #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) Property changes on: head/databases/mariadb101-client/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/mariadb101-client/files/patch-libmysql_CMakeLists.txt =================================================================== --- head/databases/mariadb101-client/files/patch-libmysql_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-client/files/patch-libmysql_CMakeLists.txt (revision 408822) @@ -0,0 +1,11 @@ +--- libmysql/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC ++++ libmysql/CMakeLists.txt +@@ -441,6 +441,8 @@ IF(NOT DISABLE_SHARED) + # libtool compatability + IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) + SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") ++ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "DragonFly") ++ SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") + ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX") + SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0") + ELSE() Property changes on: head/databases/mariadb101-client/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/mariadb101-client/files/patch-libservices_CMakeLists.txt =================================================================== --- head/databases/mariadb101-client/files/patch-libservices_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-client/files/patch-libservices_CMakeLists.txt (revision 408822) @@ -0,0 +1,9 @@ +--- libservices/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC ++++ libservices/CMakeLists.txt +@@ -34,4 +34,6 @@ SET(MYSQLSERVICES_SOURCES + logger_service.c) + + ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) ++IF(FALSE) + INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) ++ENDIF() Property changes on: head/databases/mariadb101-client/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/mariadb101-client/files/patch-man_CMakeLists.txt =================================================================== --- head/databases/mariadb101-client/files/patch-man_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-client/files/patch-man_CMakeLists.txt (revision 408822) @@ -0,0 +1,16 @@ +--- man/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC ++++ man/CMakeLists.txt +@@ -32,9 +32,13 @@ SET(MAN1_DEVEL mysql_config.1) + SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1 + mysqltest_embedded.1 mysql_client_test_embedded.1) + ++IF(FALSE) + INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) + INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) ++ENDIF() + INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient) + INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment) ++IF(FALSE) + INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest) ++ENDIF() + Property changes on: head/databases/mariadb101-client/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/mariadb101-client/files/patch-mysys_my_default.c =================================================================== --- head/databases/mariadb101-client/files/patch-mysys_my_default.c (nonexistent) +++ head/databases/mariadb101-client/files/patch-mysys_my_default.c (revision 408822) @@ -0,0 +1,61 @@ +--- mysys/my_default.c.orig 2015-12-23 15:33:31 UTC ++++ mysys/my_default.c +@@ -90,7 +90,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; + +@@ -784,7 +784,7 @@ static int search_default_file_with_ext( + { + MY_STAT stat_info; + if (!my_stat(name,&stat_info,MYF(0))) +- return 1; ++ return 0; + /* + Ignore world-writable regular files. + This is mainly done to protect us to not read a file created by +@@ -802,6 +802,14 @@ static int search_default_file_with_ext( + if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) + 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_fgets(buff, sizeof(buff) - 1, fp)) + { + line++; +@@ -1066,7 +1074,8 @@ void my_print_default_files(const char * + if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ + *end++= '.'; + strxmov(end, conf_file, *ext, " ", NullS); +- fputs(name, stdout); ++ if (strstr(name, "/etc") != name) ++ fputs(name, stdout); + } + } + } +@@ -1222,13 +1231,10 @@ static const char **init_default_directo + + #else + +-#if defined(DEFAULT_SYSCONFDIR) +- if (DEFAULT_SYSCONFDIR[0]) +- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); +-#else + errors += add_directory(alloc, "/etc/", dirs); + errors += add_directory(alloc, "/etc/mysql/", dirs); +-#endif /* DEFAULT_SYSCONFDIR */ ++ errors += add_directory(alloc, "/usr/local/etc/", dirs); ++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); + + #endif + Property changes on: head/databases/mariadb101-client/files/patch-mysys_my_default.c ___________________________________________________________________ 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/mariadb101-client/files/patch-pcre_CMakeLists.txt =================================================================== --- head/databases/mariadb101-client/files/patch-pcre_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-client/files/patch-pcre_CMakeLists.txt (revision 408822) @@ -0,0 +1,11 @@ +--- pcre/CMakeLists.txt.orig 2015-12-23 15:33:31 UTC ++++ pcre/CMakeLists.txt +@@ -508,6 +508,8 @@ IF(PCRE_SHOW_REPORT) + MESSAGE(STATUS "") + ENDIF(PCRE_SHOW_REPORT) + ++IF(FALSE) + INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development) ++ENDIF() + + # end CMakeLists.txt Property changes on: head/databases/mariadb101-client/files/patch-pcre_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/mariadb101-client/files/patch-scripts_CMakeLists.txt =================================================================== --- head/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt (revision 408822) @@ -0,0 +1,69 @@ +--- scripts/CMakeLists.txt.orig 2015-12-23 15:33:31 UTC ++++ scripts/CMakeLists.txt +@@ -73,6 +73,7 @@ IF(UNIX) + ) + ENDIF() + ++IF(FALSE) + INSTALL(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql + ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql +@@ -84,6 +85,7 @@ INSTALL(FILES + ${FIX_PRIVILEGES_SQL} + DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server + ) ++ENDIF() + + # TCMalloc hacks + IF(MALLOC_LIB) +@@ -136,6 +138,7 @@ ENDIF() + SET(HOSTNAME "hostname") + SET(MYSQLD_USER "mysql") + ++IF(FALSE) + # Required for mysqlbug until autotools are deprecated, once done remove these + # and expand default cmake variables + SET(CC ${CMAKE_C_COMPILER}) +@@ -170,6 +173,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI + DESTINATION ${INSTALL_BINDIR} + COMPONENT Server + ) ++ENDIF() + + ENDIF(UNIX) + +@@ -195,6 +199,7 @@ ELSE() + SET(localstatedir ${MYSQL_DATADIR}) + ENDIF() + ++IF() + IF(UNIX) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh + ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) +@@ -208,6 +213,7 @@ INSTALL_SCRIPT( + COMPONENT Server + ) + ENDIF() ++ENDIF() + + SET(prefix "${CMAKE_INSTALL_PREFIX}") + IF(INSTALL_SYSCONFDIR) +@@ -286,18 +292,8 @@ ELSE() + SET(BIN_SCRIPTS + msql2mysql + mysql_config +- mysql_fix_extensions +- mysql_setpermission +- mysql_secure_installation +- mysql_zap + mysqlaccess +- mysql_convert_table_format + mysql_find_rows +- mytop +- mysqlhotcopy +- mysqldumpslow +- mysqld_multi +- mysqld_safe + ${WSREP_BINARIES} + ${SYSTEMD_SCRIPTS} + ) Property changes on: head/databases/mariadb101-client/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/mariadb101-client/files/patch-scripts_mysql_config.sh =================================================================== --- head/databases/mariadb101-client/files/patch-scripts_mysql_config.sh (nonexistent) +++ head/databases/mariadb101-client/files/patch-scripts_mysql_config.sh (revision 408822) @@ -0,0 +1,12 @@ +--- scripts/mysql_config.sh.orig 2016-01-14 20:12:38 UTC ++++ scripts/mysql_config.sh +@@ -106,7 +106,9 @@ fi + + # Create options + libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@" ++libs="$libs -L%%LOCALBASE%%/lib " + embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" ++embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " + + include="-I$pkgincludedir" + if [ "$basedir" != "/usr" ]; then Property changes on: head/databases/mariadb101-client/files/patch-scripts_mysql_config.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/mariadb101-client/files/patch-sql_CMakeLists.txt =================================================================== --- head/databases/mariadb101-client/files/patch-sql_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-client/files/patch-sql_CMakeLists.txt (revision 408822) @@ -0,0 +1,14 @@ +--- sql/CMakeLists.txt.orig 2015-12-23 15:33:31 UTC ++++ sql/CMakeLists.txt +@@ -275,9 +275,9 @@ RUN_BISON( + ) + + # Gen_lex_hash +-IF(NOT CMAKE_CROSSCOMPILING) ++ + ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) +-ENDIF() ++ + + ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h Property changes on: head/databases/mariadb101-client/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/mariadb101-client/files/patch-support-files_CMakeLists.txt =================================================================== --- head/databases/mariadb101-client/files/patch-support-files_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-client/files/patch-support-files_CMakeLists.txt (revision 408822) @@ -0,0 +1,45 @@ +--- support-files/CMakeLists.txt.orig 2015-12-23 15:33:33 UTC ++++ support-files/CMakeLists.txt +@@ -41,15 +41,18 @@ ELSE() + SET(inst_location ${INSTALL_SUPPORTFILESDIR}) + ENDIF() + ++IF(FALSE) + FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small wsrep) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh + ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} + DESTINATION ${inst_location} COMPONENT IniFiles) + ENDFOREACH() ++ENDIF() + + IF(UNIX) + SET(prefix ${CMAKE_INSTALL_PREFIX}) ++ IF(FALSE) + FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure wsrep_notify) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh + ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) +@@ -60,12 +63,14 @@ IF(UNIX) + INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) + INSTALL(DIRECTORY policy DESTINATION ${inst_location} COMPONENT SupportFiles) + ENDIF() ++ ENDIF() + + CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development) + + INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) +- ++ ++IF(FALSE) + SET(bindir ${INSTALL_BINDIRABS}) + SET(sbindir ${INSTALL_SBINDIRABS}) + SET(scriptdir ${INSTALL_SCRIPTDIRABS}) +@@ -115,6 +120,7 @@ IF(UNIX) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mysql.server + DESTINATION ${INSTALL_SYSCONFDIR}/init.d + RENAME mysql COMPONENT SupportFiles) ++ ENDIF() + + INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR} + COMPONENT Common) Property changes on: head/databases/mariadb101-client/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/mariadb101-client/files/patch-extra_yassl_taocrypt_src_integer.cpp =================================================================== --- head/databases/mariadb101-client/files/patch-extra_yassl_taocrypt_src_integer.cpp (nonexistent) +++ head/databases/mariadb101-client/files/patch-extra_yassl_taocrypt_src_integer.cpp (revision 408822) @@ -0,0 +1,11 @@ +--- extra/yassl/taocrypt/src/integer.cpp.orig 2014-04-15 14:02:39.000000000 +0300 ++++ extra/yassl/taocrypt/src/integer.cpp 2014-05-16 17:00:15.000000000 +0300 +@@ -75,7 +75,7 @@ + CPP_TYPENAME AlignedAllocator::pointer AlignedAllocator::allocate( + size_type n, const void *) + { +- if (n > this->max_size()) ++ if (n > AlignedAllocator::max_size()) + return 0; + if (n == 0) + return 0; Property changes on: head/databases/mariadb101-client/files/patch-extra_yassl_taocrypt_src_integer.cpp ___________________________________________________________________ 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/mariadb101-client/files/pkg-message.in =================================================================== --- head/databases/mariadb101-client/files/pkg-message.in (nonexistent) +++ head/databases/mariadb101-client/files/pkg-message.in (revision 408822) @@ -0,0 +1,7 @@ +************************************************************************ + +MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for +my.cnf. Please move existing my.cnf files from those paths to +%%PREFIX%%/etc and %%PREFIX%%/etc/mysql. + +************************************************************************ Property changes on: head/databases/mariadb101-client/files/pkg-message.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/mariadb101-client/pkg-plist =================================================================== --- head/databases/mariadb101-client/pkg-plist (nonexistent) +++ head/databases/mariadb101-client/pkg-plist (revision 408822) @@ -0,0 +1,109 @@ +bin/msql2mysql +bin/mysql +bin/mysql_find_rows +bin/mysqlaccess +bin/mysqladmin +bin/mysqlbinlog +bin/mysqlcheck +bin/mysqldump +bin/mysqlimport +bin/mysqlshow +bin/mysqlslap +bin/mysql_config +include/mysql/auth_dialog_client.h +include/mysql/big_endian.h +include/mysql/byte_order_generic.h +include/mysql/byte_order_generic_x86.h +include/mysql/byte_order_generic_x86_64.h +include/mysql/client_plugin.h +include/mysql/decimal.h +include/mysql/errmsg.h +include/mysql/handler_ername.h +include/mysql/handler_state.h +include/mysql/keycache.h +include/mysql/little_endian.h +include/mysql/m_ctype.h +include/mysql/m_string.h +include/mysql/ma_dyncol.h +include/mysql/my_alloc.h +include/mysql/my_attribute.h +include/mysql/my_byteorder.h +include/mysql/my_compiler.h +include/mysql/my_config.h +include/mysql/my_dbug.h +include/mysql/my_decimal_limits.h +include/mysql/my_dir.h +include/mysql/my_getopt.h +include/mysql/my_global.h +include/mysql/my_list.h +include/mysql/my_net.h +include/mysql/my_pthread.h +include/mysql/my_sys.h +include/mysql/my_valgrind.h +include/mysql/my_xml.h +include/mysql/mysql.h +include/mysql/mysql_com.h +include/mysql/mysql_com_server.h +include/mysql/mysql_embed.h +include/mysql/mysql_time.h +include/mysql/mysql_version.h +include/mysql/mysqld_ername.h +include/mysql/mysqld_error.h +include/mysql/plugin.h +include/mysql/plugin_audit.h +include/mysql/plugin_auth.h +include/mysql/plugin_auth_common.h +include/mysql/plugin_encryption.h +include/mysql/plugin_ftparser.h +include/mysql/plugin_password_validation.h +include/mysql/psi/mysql_file.h +include/mysql/psi/mysql_idle.h +include/mysql/psi/mysql_socket.h +include/mysql/psi/mysql_stage.h +include/mysql/psi/mysql_statement.h +include/mysql/psi/mysql_table.h +include/mysql/psi/mysql_thread.h +include/mysql/psi/psi.h +include/mysql/service_debug_sync.h +include/mysql/service_encryption.h +include/mysql/service_encryption_scheme.h +include/mysql/service_kill_statement.h +include/mysql/service_logger.h +include/mysql/service_md5.h +include/mysql/service_my_snprintf.h +include/mysql/service_progress_report.h +include/mysql/service_sha1.h +include/mysql/service_thd_alloc.h +include/mysql/service_thd_autoinc.h +include/mysql/service_thd_error_context.h +include/mysql/service_thd_specifics.h +include/mysql/service_thd_timezone.h +include/mysql/service_thd_wait.h +include/mysql/service_wsrep.h +include/mysql/services.h +include/mysql/sql_common.h +include/mysql/sql_state.h +include/mysql/sslopt-case.h +include/mysql/sslopt-longopts.h +include/mysql/sslopt-vars.h +include/mysql/typelib.h +lib/mysql/libmysqlclient.a +lib/mysql/libmysqlclient.so +lib/mysql/libmysqlclient.so.18 +lib/mysql/libmysqlclient_r.a +lib/mysql/libmysqlclient_r.so +lib/mysql/libmysqlclient_r.so.18 +man/man1/msql2mysql.1.gz +man/man1/mysql.1.gz +man/man1/mysql_config.1.gz +man/man1/mysql_find_rows.1.gz +man/man1/mysql_plugin.1.gz +man/man1/mysql_waitpid.1.gz +man/man1/mysqlaccess.1.gz +man/man1/mysqladmin.1.gz +man/man1/mysqlbinlog.1.gz +man/man1/mysqlcheck.1.gz +man/man1/mysqldump.1.gz +man/man1/mysqlimport.1.gz +man/man1/mysqlshow.1.gz +man/man1/mysqlslap.1.gz Property changes on: head/databases/mariadb101-client/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 Index: head/databases/mariadb101-server/Makefile =================================================================== --- head/databases/mariadb101-server/Makefile (nonexistent) +++ head/databases/mariadb101-server/Makefile (revision 408822) @@ -0,0 +1,163 @@ +# $FreeBSD$ + +PORTNAME?= mariadb +PORTVERSION= 10.1.11 +CATEGORIES= databases ipv6 +MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ + http://mirrors.supportex.net/${SITESDIR}/ \ + http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ + http://gd.tuwien.ac.at/db/${SITESDIR}/ \ + http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ + http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ + http://mirror.layerjet.com/${SITESDIR}/ \ + http://mirror.switch.ch/mirror/${SITESDIR}/ +PKGNAMESUFFIX?= 101-server + +MAINTAINER= brnrd@FreeBSD.org +COMMENT?= Multithreaded SQL database (server) + +LICENSE= GPLv2 + +SUB_FILES= pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message + +SLAVEDIRS= databases/mariadb101-client +USES= bison:build cmake cpe execinfo shebangfix +USE_LDCONFIG= ${PREFIX}/lib/mysql +SHEBANG_FILES= scripts/*.sh +SITESDIR= mariadb/mariadb-${PORTVERSION}/source + +OPTIONS_DEFINE= FASTMTX +OPTIONS_SINGLE= GSSAPI +OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT +OPTIONS_DEFAULT= GSSAPI_BASE + +FASTMTX_DESC= Replace mutexes with spinlocks + +.if !defined(CLIENT_ONLY) +# MySQL-Server options +OPTIONS_DEFINE+= MAXKEY +OPTIONS_DEFAULT+= MAXKEY SPHINX SPIDER +OPTIONS_GROUP= ENGINES +OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH SPHINX SPIDER TOKUDB + +ENGINES_DESC= Optional MariaDB storage engines +INNOBASE_DESC= Build InnoDB engine next to XtraDB +MAXKEY_DESC= Change max key length from 1000 to 4000 +MROONGA_DESC= Mroonga Full Text Search engine +OQGRAPH_DESC= Open Query Graph Computation engine (Requires GCC) +SPHINX_DESC= SphinxSE engine +SPIDER_DESC= Partitioning and XA-transactions engine +TOKUDB_DESC= Fractal tree index tree data structure engine +.endif + +GSSAPI_BASE_USES= gssapi +GSSAPI_HEIMDAL_USES= gssapi:heimdal +GSSAPI_MIT_USES= gssapi:mit + +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="/var/db/mysql" \ + -DINSTALL_MYSQLSHAREDIR="share/mysql" \ + -DINSTALL_MYSQLTESTDIR= \ + -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ + -DINSTALL_SBINDIR="libexec" \ + -DINSTALL_SCRIPTDIR="bin" \ + -DINSTALL_SHAREDIR="share" \ + -DINSTALL_SQLBENCHDIR= \ + -DINSTALL_SUPPORTFILESDIR="share/mysql" \ + -DWITH_UNIT_TESTS=0 \ + -DWITH_LIBWRAP=1 \ + -DWITH_SSL=${OPENSSLBASE} \ + -DKRB5_CONFIG=${KRB5CONFIG} \ + -DEXECINFO_ROOT=${LOCALBASE} \ + -DCOMPILATION_COMMENT="FreeBSD Ports" + +DATADIR= ${PREFIX}/share/mysql + +.ifdef USE_MYSQL +.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again. +.endif + +CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ + mariadb10[02-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ + mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ + percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* + +USE_OPENSSL= yes +FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 + +.if defined(CLIENT_ONLY) +# MySQL-Client part +USES+= readline +.else +# MySQL-Server part +USE_MYSQL= yes +WANT_MYSQL_VER= 101m +OPTIONS_SUB= yes +USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin +USE_RC_SUBR= mysql-server +USERS= mysql +GROUPS= mysql +CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ + -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ + -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 + +.for ENGINE in ${OPTIONS_GROUP_ENGINES} +${ENGINE}_CMAKE_OFF= -DWITHOUT_${ENGINE}=1 +.endfor + +MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h +OQGRAPH_LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ + libJudy.so:${PORTSDIR}/devel/judy +# Currently OQGraph does not build using clang. +# See See https://mariadb.atlassian.net/browse/MDEV-8051. +OQGRAPH_USE= gcc=yes +TOKUDB_LIB_DEPENDS= libsnappy.so:${PORTSDIR}/archivers/snappy + +post-install: +# Remove programs to avoid conflict with mariadb101-client +# These are "client" components, so there should be a switch that +# prevents them from being installed but it's unknown right now + ${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \ + ${STAGEDIR}${PREFIX}/bin/mysql_config \ + ${STAGEDIR}${PREFIX}/bin/mysql_find_rows \ + ${STAGEDIR}${PREFIX}/bin/mysqlaccess + ${RM} -r ${STAGEDIR}/${PREFIX}/share/mysql/policy \ + ${STAGEDIR}/${PREFIX}/share/pkgconfig +# See https://mariadb.atlassian.net/browse/MDEV-9529 + ${RM} ${STAGEDIR}/${PREFIX}/bin/maria_add_gis_sp.sql +.endif # defined(CLIENT_ONLY) + +.include + +.if defined(WITH_OPENSSL_PORT) && ${PORT_OPTIONS:MGSSAPI_BASE} +IGNORE= GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system +.endif + +.include + +.if ${OPSYS} == DragonFly +CMAKE_ARGS+= -DWITHOUT_TOKUDB +.endif + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012 +CMAKE_ARGS+= -DWITH_JEMALLOC="system" +.else +CMAKE_ARGS+= -DWITH_JEMALLOC="no" +.endif + +post-patch: + @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt + @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c + @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh +.if ${OPSYS} == DragonFly + ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ + ${WRKSRC}/cmake/os/DragonFly.cmake +.endif + +.include Property changes on: head/databases/mariadb101-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/mariadb101-server/distinfo =================================================================== --- head/databases/mariadb101-server/distinfo (nonexistent) +++ head/databases/mariadb101-server/distinfo (revision 408822) @@ -0,0 +1,2 @@ +SHA256 (mariadb-10.1.11.tar.gz) = cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce +SIZE (mariadb-10.1.11.tar.gz) = 55184229 Property changes on: head/databases/mariadb101-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/mariadb101-server/files/patch-CMakeLists.txt =================================================================== --- head/databases/mariadb101-server/files/patch-CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-server/files/patch-CMakeLists.txt (revision 408822) @@ -0,0 +1,20 @@ +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- CMakeLists.txt.orig 2015-10-15 15:43:35 UTC ++++ CMakeLists.txt +@@ -452,6 +452,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + ) + ++IF(FALSE) + INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty + EXCEPTIONS-CLIENT COMPONENT Readme) + # MDEV-6526 these files are not installed anymore +@@ -462,6 +463,7 @@ IF(UNIX) + INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) + INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) + ENDIF() ++ENDIF() + + INCLUDE(CPack) + Property changes on: head/databases/mariadb101-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/mariadb101-server/files/patch-client_CMakeLists.txt =================================================================== --- head/databases/mariadb101-server/files/patch-client_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-server/files/patch-client_CMakeLists.txt (revision 408822) @@ -0,0 +1,72 @@ +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- client/CMakeLists.txt.orig 2015-10-15 15:43:35 UTC ++++ client/CMakeLists.txt +@@ -30,6 +30,7 @@ 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 + ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) + TARGET_LINK_LIBRARIES(mysql mysqlclient) +@@ -37,6 +38,7 @@ IF(UNIX) + TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) + SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) + ENDIF(UNIX) ++ENDIF() + + MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) + SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") +@@ -44,6 +46,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli + SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) + + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) + TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) + +@@ -53,17 +56,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 COMPONENT Server) + 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) + +@@ -73,17 +80,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlcl + MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) + SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") + TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) ++ENDIF() + + # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". + IF(WIN32) + MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk) + ENDIF(WIN32) + ++IF(FALSE) + # async_example is just a code example, do not install it. + ADD_EXECUTABLE(async_example async_example.c) + TARGET_LINK_LIBRARIES(async_example mysqlclient) ++ENDIF() + +-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example ++SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin + PROPERTIES HAS_CXX TRUE) + + ADD_DEFINITIONS(-DHAVE_DLOPEN) Property changes on: head/databases/mariadb101-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/mariadb101-server/files/patch-cmake_jemalloc.cmake =================================================================== --- head/databases/mariadb101-server/files/patch-cmake_jemalloc.cmake (nonexistent) +++ head/databases/mariadb101-server/files/patch-cmake_jemalloc.cmake (revision 408822) @@ -0,0 +1,24 @@ +Fix jemalloc detection on FreeBSD 10.x +Upstream https://github.com/MariaDB/server/pull/140 + +--- cmake/jemalloc.cmake.orig 2015-12-23 15:33:29 UTC ++++ cmake/jemalloc.cmake +@@ -12,9 +12,16 @@ MACRO(JEMALLOC_TRY_STATIC) + ENDMACRO() + + MACRO(JEMALLOC_TRY_DYNAMIC) +- SET(libname jemalloc) + SET(what system) +- CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_DYNAMIC_JEMALLOC) ++ IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND ++ CMAKE_SYSTEM_VERSION STRGREATER "10.0") ++ # Since FreeBSD 10.0 jemalloc is in base libc ++ SET(libname c) ++ SET(HAVE_DYNAMIC_JEMALLOC ON) ++ ELSE() ++ SET(libname jemalloc) ++ CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_DYNAMIC_JEMALLOC) ++ ENDIF() + ENDMACRO() + + MACRO (CHECK_JEMALLOC) Property changes on: head/databases/mariadb101-server/files/patch-cmake_jemalloc.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/mariadb101-server/files/patch-extra_CMakeLists.txt =================================================================== --- head/databases/mariadb101-server/files/patch-extra_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-server/files/patch-extra_CMakeLists.txt (revision 408822) @@ -0,0 +1,13 @@ +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- extra/CMakeLists.txt.orig 2015-10-15 15:43:36 UTC ++++ extra/CMakeLists.txt +@@ -91,6 +91,8 @@ IF(UNIX) + MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) + TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) + TARGET_LINK_LIBRARIES(mysql_waitpid mysys) + ENDIF() ++ENDIF() Property changes on: head/databases/mariadb101-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/mariadb101-server/files/patch-extra_yassl_taocrypt_src_integer.cpp =================================================================== --- head/databases/mariadb101-server/files/patch-extra_yassl_taocrypt_src_integer.cpp (nonexistent) +++ head/databases/mariadb101-server/files/patch-extra_yassl_taocrypt_src_integer.cpp (revision 408822) @@ -0,0 +1 @@ +# Intentionally empty Property changes on: head/databases/mariadb101-server/files/patch-extra_yassl_taocrypt_src_integer.cpp ___________________________________________________________________ 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/mariadb101-server/files/patch-include_CMakeLists.txt =================================================================== --- head/databases/mariadb101-server/files/patch-include_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-server/files/patch-include_CMakeLists.txt (revision 408822) @@ -0,0 +1,26 @@ +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- include/CMakeLists.txt.orig 2015-10-15 15:43:36 UTC ++++ include/CMakeLists.txt +@@ -62,17 +62,21 @@ SET(HEADERS + handler_ername.h + ) + ++IF(FALSE) + INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) + FOREACH(f ${HEADERS_GEN_CONFIGURE}) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) + ENDFOREACH(f) + INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h") ++ENDIF() + + STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") + STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") + ++IF(FALSE) + INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development + FILES_MATCHING PATTERN "*.h" + PATTERN CMakeFiles EXCLUDE + PATTERN mysql EXCLUDE + REGEX "\\./(${EXCL_RE}$)" EXCLUDE) ++ENDIF() Property changes on: head/databases/mariadb101-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/mariadb101-server/files/patch-libmysql_CMakeLists.txt =================================================================== --- head/databases/mariadb101-server/files/patch-libmysql_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-server/files/patch-libmysql_CMakeLists.txt (revision 408822) @@ -0,0 +1,41 @@ +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- libmysql/CMakeLists.txt.orig 2015-10-15 15:43:37 UTC ++++ libmysql/CMakeLists.txt +@@ -410,7 +410,7 @@ SET(LIBS clientlib dbug strings vio mysy + + # Merge several convenience libraries into one big mysqlclient + # and link them together into shared library. +-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) +@@ -418,6 +418,7 @@ IF(MSVC) + INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) + ENDIF() + ++IF(FALSE) + IF(UNIX) + MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) + SET(DOT_VERSION ".${VERSION}") +@@ -432,11 +433,13 @@ IF(UNIX) + ENDMACRO() + INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) + ENDIF() ++ENDIF() + + IF(NOT DISABLE_SHARED) + MERGE_LIBRARIES(libmysql SHARED ${LIBS} + EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA} +- COMPONENT SharedLibraries) ++ COMPONENT SharedLibraries NOINSTALL) ++IF(FALSE) + IF(UNIX) + # libtool compatability + IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) +@@ -484,3 +487,4 @@ IF(NOT DISABLE_SHARED) + ENDFOREACH() + ENDIF() + ENDIF() ++ENDIF() Property changes on: head/databases/mariadb101-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/mariadb101-server/files/patch-libservices_CMakeLists.txt =================================================================== --- head/databases/mariadb101-server/files/patch-libservices_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-server/files/patch-libservices_CMakeLists.txt (revision 408822) @@ -0,0 +1,11 @@ +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- libservices/CMakeLists.txt.orig 2015-10-15 15:43:37 UTC ++++ libservices/CMakeLists.txt +@@ -34,4 +34,6 @@ SET(MYSQLSERVICES_SOURCES + logger_service.c) + + ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) ++IF(FALSE) + INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) ++ENDIF() Property changes on: head/databases/mariadb101-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/mariadb101-server/files/patch-man_CMakeLists.txt =================================================================== --- head/databases/mariadb101-server/files/patch-man_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-server/files/patch-man_CMakeLists.txt (revision 408822) @@ -0,0 +1,14 @@ +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- man/CMakeLists.txt.orig 2015-10-15 15:43:37 UTC ++++ man/CMakeLists.txt +@@ -34,7 +34,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys + + INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) + INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) ++IF(FALSE) + INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient) + INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment) + INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest) +- ++ENDIF() Property changes on: head/databases/mariadb101-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/mariadb101-server/files/patch-mysys_my__default.c =================================================================== --- head/databases/mariadb101-server/files/patch-mysys_my__default.c (nonexistent) +++ head/databases/mariadb101-server/files/patch-mysys_my__default.c (revision 408822) @@ -0,0 +1,63 @@ +Obey hier(7) + +--- mysys/my_default.c.orig 2015-10-15 15:43:45 UTC ++++ mysys/my_default.c +@@ -90,7 +90,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; + +@@ -784,7 +784,7 @@ static int search_default_file_with_ext( + { + MY_STAT stat_info; + if (!my_stat(name,&stat_info,MYF(0))) +- return 1; ++ return 0; + /* + Ignore world-writable regular files. + This is mainly done to protect us to not read a file created by +@@ -802,6 +802,14 @@ static int search_default_file_with_ext( + if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) + 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_fgets(buff, sizeof(buff) - 1, fp)) + { + line++; +@@ -1066,7 +1074,8 @@ void my_print_default_files(const char * + if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ + *end++= '.'; + strxmov(end, conf_file, *ext, " ", NullS); +- fputs(name, stdout); ++ if (strstr(name, "/etc") != name) ++ fputs(name, stdout); + } + } + } +@@ -1222,13 +1231,10 @@ static const char **init_default_directo + + #else + +-#if defined(DEFAULT_SYSCONFDIR) +- if (DEFAULT_SYSCONFDIR[0]) +- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); +-#else + errors += add_directory(alloc, "/etc/", dirs); + errors += add_directory(alloc, "/etc/mysql/", dirs); +-#endif /* DEFAULT_SYSCONFDIR */ ++ errors += add_directory(alloc, "/usr/local/etc/", dirs); ++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); + + #endif + Property changes on: head/databases/mariadb101-server/files/patch-mysys_my__default.c ___________________________________________________________________ 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/mariadb101-server/files/patch-pcre_CMakeLists.txt =================================================================== --- head/databases/mariadb101-server/files/patch-pcre_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-server/files/patch-pcre_CMakeLists.txt (revision 408822) @@ -0,0 +1,13 @@ +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- pcre/CMakeLists.txt.orig 2015-10-15 15:43:45 UTC ++++ pcre/CMakeLists.txt +@@ -513,6 +513,8 @@ IF(PCRE_SHOW_REPORT) + MESSAGE(STATUS "") + ENDIF(PCRE_SHOW_REPORT) + ++IF(FALSE) + INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development) ++ENDIF() + + # end CMakeLists.txt Property changes on: head/databases/mariadb101-server/files/patch-pcre_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/mariadb101-server/files/patch-scripts_CMakeLists.txt =================================================================== --- head/databases/mariadb101-server/files/patch-scripts_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-server/files/patch-scripts_CMakeLists.txt (revision 408822) @@ -0,0 +1 @@ +# Intentionally empty Property changes on: head/databases/mariadb101-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/mariadb101-server/files/patch-scripts_mysql__config.sh =================================================================== --- head/databases/mariadb101-server/files/patch-scripts_mysql__config.sh (nonexistent) +++ head/databases/mariadb101-server/files/patch-scripts_mysql__config.sh (revision 408822) @@ -0,0 +1,12 @@ +--- scripts/mysql_config.sh.orig 2016-01-14 20:12:38 UTC ++++ scripts/mysql_config.sh +@@ -106,7 +106,9 @@ fi + + # Create options + libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@" ++libs="$libs -L%%LOCALBASE%%/lib " + embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" ++embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " + + include="-I$pkgincludedir" + if [ "$basedir" != "/usr" ]; then Property changes on: head/databases/mariadb101-server/files/patch-scripts_mysql__config.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/mariadb101-server/files/patch-scripts_mysqld__safe.sh =================================================================== --- head/databases/mariadb101-server/files/patch-scripts_mysqld__safe.sh (nonexistent) +++ head/databases/mariadb101-server/files/patch-scripts_mysqld__safe.sh (revision 408822) @@ -0,0 +1,26 @@ +Obey hier(7) + +--- scripts/mysqld_safe.sh.orig 2015-10-15 15:43:45 UTC ++++ scripts/mysqld_safe.sh +@@ -558,10 +558,10 @@ fi + + 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" + +@@ -570,7 +570,7 @@ IGNORING $DATADIR/my.cnf" + 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/mariadb101-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/mariadb101-server/files/patch-sql_CMakeLists.txt =================================================================== --- head/databases/mariadb101-server/files/patch-sql_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-server/files/patch-sql_CMakeLists.txt (revision 408822) @@ -0,0 +1,30 @@ +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- sql/CMakeLists.txt.orig 2015-10-15 15:43:45 UTC ++++ sql/CMakeLists.txt +@@ -340,6 +340,7 @@ ADD_CUSTOM_TARGET(distclean + VERBATIM + ) + ++IF(FALSE) + IF(INSTALL_LAYOUT STREQUAL "STANDALONE") + + # Copy db.opt into data/test/ +@@ -383,6 +384,7 @@ ELSE() + INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) + ENDIF(WIN32 AND MYSQLD_EXECUTABLE) + ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE") ++ENDIF() + + IF(WIN32) + SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql) +@@ -425,7 +427,9 @@ IF(WIN32) + TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice) + ENDIF(WIN32) + ++IF(FALSE) + INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development + FILES_MATCHING PATTERN "*.h" + PATTERN share EXCLUDE + PATTERN CMakeFiles EXCLUDE) ++ENDIF() Property changes on: head/databases/mariadb101-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/mariadb101-server/files/patch-sql_sql__trigger.cc =================================================================== --- head/databases/mariadb101-server/files/patch-sql_sql__trigger.cc (nonexistent) +++ head/databases/mariadb101-server/files/patch-sql_sql__trigger.cc (revision 408822) @@ -0,0 +1,52 @@ +Fix clang build error + +--- sql/sql_trigger.cc.orig 2015-10-15 15:43:47 UTC ++++ sql/sql_trigger.cc +@@ -192,32 +192,32 @@ static File_option triggers_file_paramet + { + { + { 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_paramet + 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/mariadb101-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/mariadb101-server/files/patch-sql_sql__view.cc =================================================================== --- head/databases/mariadb101-server/files/patch-sql_sql__view.cc (nonexistent) +++ head/databases/mariadb101-server/files/patch-sql_sql__view.cc (revision 408822) @@ -0,0 +1,65 @@ +Fix clang build error + +--- sql/sql_view.cc.orig 2015-10-15 15:43:47 UTC ++++ sql/sql_view.cc +@@ -720,46 +720,46 @@ static const int required_view_parameter + */ + 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_VIEW_ALGO}, + {{ 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}, + {{ C_STRING_WITH_LEN("mariadb-version")}, + my_offsetof(TABLE_LIST, mariadb_version), Property changes on: head/databases/mariadb101-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/mariadb101-server/files/patch-sql_sys__vars.cc =================================================================== --- head/databases/mariadb101-server/files/patch-sql_sys__vars.cc (nonexistent) +++ head/databases/mariadb101-server/files/patch-sql_sys__vars.cc (revision 408822) @@ -0,0 +1,40 @@ +Fix clang build error + +--- sql/sys_vars.cc.orig 2015-10-15 15:43:47 UTC ++++ sql/sys_vars.cc +@@ -1040,7 +1040,7 @@ static Sys_var_ulong Sys_interactive_tim + "connection before closing it", + NO_SET_STMT 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_ulonglong Sys_join_buffer_size( + "join_buffer_size", +@@ -2214,7 +2214,7 @@ static Sys_var_ulong Sys_net_read_timeou + "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)); + +@@ -2229,7 +2229,7 @@ static Sys_var_ulong Sys_net_write_timeo + "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)); + +@@ -3424,7 +3424,7 @@ static Sys_var_ulong Sys_net_wait_timeou + "The number of seconds the server waits for activity on a " + "connection before closing it", + NO_SET_STMT 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)); + + static Sys_var_plugin Sys_default_storage_engine( Property changes on: head/databases/mariadb101-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/mariadb101-server/files/patch-storage_connect_json.cpp =================================================================== --- head/databases/mariadb101-server/files/patch-storage_connect_json.cpp (nonexistent) +++ head/databases/mariadb101-server/files/patch-storage_connect_json.cpp (revision 408822) @@ -0,0 +1 @@ +# Intentionally empty Property changes on: head/databases/mariadb101-server/files/patch-storage_connect_json.cpp ___________________________________________________________________ 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/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake =================================================================== --- head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake (nonexistent) +++ head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake (revision 408822) @@ -0,0 +1,19 @@ +Fix failing backtrace detection + +--- storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake.orig 2015-10-15 15:43:51 UTC ++++ storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake +@@ -87,13 +87,7 @@ if (NOT HAVE_DLSYM_WITHOUT_DL) + endif () + check_function_exists(backtrace HAVE_BACKTRACE_WITHOUT_EXECINFO) + if (NOT HAVE_BACKTRACE_WITHOUT_EXECINFO) +- set(CMAKE_REQUIRED_LIBRARIES execinfo) +- check_function_exists(backtrace HAVE_BACKTRACE_WITH_EXECINFO) +- if (HAVE_BACKTRACE_WITH_EXECINFO) +- list(APPEND EXTRA_SYSTEM_LIBS execinfo) +- else () +- message(FATAL_ERROR "Cannot find backtrace(), even with -lexecinfo.") +- endif () ++ list(APPEND EXTRA_SYSTEM_LIBS execinfo) + endif () + + if(HAVE_CLOCK_REALTIME) Property changes on: head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.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/mariadb101-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc =================================================================== --- head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc (nonexistent) +++ head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc (revision 408822) @@ -0,0 +1,16 @@ +Fix build error + +--- storage/tokudb/PerconaFT/portability/memory.cc.orig 2015-10-15 15:43:52 UTC ++++ storage/tokudb/PerconaFT/portability/memory.cc +@@ -94,11 +94,6 @@ PATENT RIGHTS GRANT: + #include + #include + #include +-#if defined(HAVE_MALLOC_H) +-# include +-#elif defined(HAVE_SYS_MALLOC_H) +-# include +-#endif + #include + #include + #include "memory.h" Property changes on: head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_portability_memory.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/mariadb101-server/files/patch-support-files_CMakeLists.txt =================================================================== --- head/databases/mariadb101-server/files/patch-support-files_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-server/files/patch-support-files_CMakeLists.txt (revision 408822) @@ -0,0 +1,14 @@ +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- support-files/CMakeLists.txt.orig 2015-10-15 15:44:15 UTC ++++ support-files/CMakeLists.txt +@@ -64,7 +64,9 @@ IF(UNIX) + CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development) + ++IF(FALSE) + INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) ++ENDIF() + + SET(bindir ${prefix}/${INSTALL_BINDIR}) + SET(sbindir ${prefix}/${INSTALL_SBINDIR}) Property changes on: head/databases/mariadb101-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/mariadb101-server/files/extra-patch-include_my__compare.h =================================================================== --- head/databases/mariadb101-server/files/extra-patch-include_my__compare.h (nonexistent) +++ head/databases/mariadb101-server/files/extra-patch-include_my__compare.h (revision 408822) @@ -0,0 +1,11 @@ +--- include/my_compare.h.orig 2012-11-28 17:49:43.000000000 +0200 ++++ include/my_compare.h 2012-12-23 02:45:51.000000000 +0200 +@@ -40,7 +40,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 32 /* Max segments for key */ + + #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) Property changes on: head/databases/mariadb101-server/files/extra-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/mariadb101-server/files/pkg-message.in =================================================================== --- head/databases/mariadb101-server/files/pkg-message.in (nonexistent) +++ head/databases/mariadb101-server/files/pkg-message.in (revision 408822) @@ -0,0 +1,15 @@ +************************************************************************ + +Remember to run mysql_upgrade (with the optional --datadir= flag) +the first time you start the MySQL server after an upgrade from an +earlier version. + +MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for +my.cnf. Please move existing my.cnf files from those paths to +%%PREFIX%%/etc and %%PREFIX%%/etc/mysql. + +This port does NOT include the mytop perl script, this is included in +the MariaDB tarball but the most recent version can be found in the +databases/mytop port + +************************************************************************ Property changes on: head/databases/mariadb101-server/files/pkg-message.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/mariadb101-server/files/mysql-server.in =================================================================== --- head/databases/mariadb101-server/files/mysql-server.in (nonexistent) +++ head/databases/mariadb101-server/files/mysql-server.in (revision 408822) @@ -0,0 +1,139 @@ +#!/bin/sh + +# $FreeBSD: head/databases/mariadb55-server/files/mysql-server.in 361647 2014-07-12 22:42:33Z rakuco $ +# +# PROVIDE: mysql +# REQUIRE: LOGIN +# KEYWORD: shutdown +# +# Add the following line to /etc/rc.conf to enable mysql: +# mysql_(instance_)?enable (bool): Set to "NO" by default. +# Set it to "YES" to enable MySQL. +# mysql_(instance_)?limits (bool): Set to "NO" by default. +# Set it to yes to run `limits -e -U mysql` +# just before mysql starts. +# mysql_(instance_)?dbdir (str): Default to "/var/db/mysql" +# Base database directory. +# mysql_(instance_)?args (str): Custom additional arguments to be passed +# to mysqld_safe (default empty). +# mysql_(instance_)?pidfile (str): Custum PID file path and name. +# Default to "${mysql_dbdir}/${hostname}.pid". +# mysql_(instance_)?user (str): User to run mysqld as +# Default to "mysql" created by the port +# mysql_(instance_)?optfile (str): Server-specific option file. +# Default to "${mysql_dbdir}/my.cnf". +# mysql_instances (str): Set to "" by default. +# If defined, list of instances to enable + +. /etc/rc.subr + +name="mysql" +rcvar=mysql_enable + +load_rc_config $name + +: ${mysql_enable="NO"} +: ${mysql_limits="NO"} +: ${mysql_user="mysql"} +: ${mysql_limits_args="-e -U $mysql_user"} +: ${mysql_dbdir="/var/db/mysql"} +: ${mysql_optfile="${mysql_dbdir}/my.cnf"} + +command="/usr/sbin/daemon" +procname="%%PREFIX%%/libexec/mysqld" +start_precmd="${name}_prestart" +start_postcmd="${name}_poststart" + +if [ -n "$2" ]; then + instance="$2" + load_rc_config ${name}_${instance} + case "$mysql_instances" in + "$2 "*|*" $2 "*|*" $2"|"$2") + eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" + eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}" + eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" + eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}" + eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}" + eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}" + eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}" + ;; + *) + err 1 "$2 not found in mysql_instances" ;; + esac +else + if [ -n "${mysql_instances}" -a -n "$1" ]; then + for instance in ${mysql_instances}; do + eval _enable="\${mysql_${instance}_enable}" + case "${_enable:-${mysql_enable}}" in + [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) + continue + ;; + [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) + ;; + *) + if [ -z "$_enable" ]; then + _var=mysql_enable + else + _var=mysql_${instance}_enable + fi + warn "Bad value" \ + "'${_enable:-${mysql_enable}}'" \ + "for ${_var}. " \ + "Instance ${instance} skipped." + continue + ;; + esac + echo "===> mysql instance: ${instance}" + if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then + success="${instance} ${success}" + else + failed="${instance} (${retcode}) ${failed}" + fi + done + exit 0 + else + mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"} + fi +fi + +pidfile=$mysql_pidfile +mysql_install_db="%%PREFIX%%/bin/mysql_install_db" +mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force" +command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" + +mysql_create_auth_tables() +{ + eval $mysql_install_db $mysql_install_db_args + [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir} +} + +mysql_prestart() +{ + local dir + for dir in /etc /etc/mysql; do + if [ -f "${dir}/my.cnf" ]; then + echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}" + return 1 + fi + done + 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:-"-e -U $mysql_user"}` 2>/dev/null + else + return 0 + fi +} + +mysql_poststart() +{ + local timeout=15 + while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do + timeout=$(( timeout - 1 )) + sleep 1 + done + return 0 +} + +run_rc_command "$1" Property changes on: head/databases/mariadb101-server/files/mysql-server.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/mariadb101-server/pkg-plist =================================================================== --- head/databases/mariadb101-server/pkg-plist (nonexistent) +++ head/databases/mariadb101-server/pkg-plist (revision 408822) @@ -0,0 +1,190 @@ +bin/aria_chk +bin/aria_dump_log +bin/aria_ftdump +bin/aria_pack +bin/aria_read_log +bin/innochecksum +bin/my_print_defaults +bin/myisam_ftdump +bin/myisamchk +bin/myisamlog +bin/myisampack +bin/mysql_client_test +bin/mysql_client_test_embedded +bin/mysql_convert_table_format +bin/mysql_embedded +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/mysqltest_embedded +@comment bin/mytop +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 +include/mysql/private/embedded_priv.h +lib/mysql/libmysqld.a +lib/mysql/libmysqld.so +lib/mysql/libmysqld.so.18 +lib/mysql/plugin/adt_null.so +lib/mysql/plugin/auth_0x0100.so +lib/mysql/plugin/auth_gssapi.so +lib/mysql/plugin/auth_gssapi_client.so +lib/mysql/plugin/auth_pam.so +lib/mysql/plugin/auth_socket.so +lib/mysql/plugin/auth_test_plugin.so +lib/mysql/plugin/daemon_example.ini +lib/mysql/plugin/debug_key_management.so +lib/mysql/plugin/dialog.so +lib/mysql/plugin/dialog_examples.so +lib/mysql/plugin/example_key_management.so +lib/mysql/plugin/file_key_management.so +lib/mysql/plugin/ha_archive.so +lib/mysql/plugin/ha_blackhole.so +lib/mysql/plugin/ha_connect.so +lib/mysql/plugin/ha_federated.so +lib/mysql/plugin/ha_federatedx.so +%%INNOBASE%%lib/mysql/plugin/ha_innodb.so +%%MROONGA%%lib/mysql/plugin/ha_mroonga.so +%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so +%%SPHINX%%lib/mysql/plugin/ha_sphinx.so +%%SPIDER%%lib/mysql/plugin/ha_spider.so +%%TOKUDB%%lib/mysql/plugin/ha_tokudb.so +lib/mysql/plugin/ha_test_sql_discovery.so +lib/mysql/plugin/handlersocket.so +lib/mysql/plugin/libdaemon_example.so +lib/mysql/plugin/locales.so +lib/mysql/plugin/metadata_lock_info.so +lib/mysql/plugin/mypluglib.so +lib/mysql/plugin/mysql_clear_password.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/query_cache_info.so +lib/mysql/plugin/query_response_time.so +lib/mysql/plugin/semisync_master.so +lib/mysql/plugin/semisync_slave.so +lib/mysql/plugin/server_audit.so +lib/mysql/plugin/simple_password_check.so +lib/mysql/plugin/sql_errlog.so +lib/mysql/plugin/wsrep_info.so +libexec/mysqld +man/man1/aria_chk.1.gz +man/man1/aria_dump_log.1.gz +man/man1/aria_ftdump.1.gz +man/man1/aria_pack.1.gz +man/man1/aria_read_log.1.gz +man/man1/innochecksum.1.gz +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_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/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%%/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%%/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%%/install_spider.sql +%%DATADIR%%/italian/errmsg.sys +%%DATADIR%%/japanese/errmsg.sys +%%DATADIR%%/korean/errmsg.sys +%%DATADIR%%/magic +%%DATADIR%%/maria_add_gis_sp.sql +%%DATADIR%%/maria_add_gis_sp_bootstrap.sql +%%MROONGA%%%%DATADIR%%/mroonga/install.sql +%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql +%%DATADIR%%/my-huge.cnf +%%DATADIR%%/my-innodb-heavy-4G.cnf +%%DATADIR%%/my-large.cnf +%%DATADIR%%/my-medium.cnf +%%DATADIR%%/my-small.cnf +%%DATADIR%%/mysql-log-rotate +%%DATADIR%%/mysql.server +%%DATADIR%%/mysql_performance_tables.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.cnf +%%DATADIR%%/wsrep_notify Property changes on: head/databases/mariadb101-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 Index: head/databases/mariadb101-server/pkg-descr =================================================================== --- head/databases/mariadb101-server/pkg-descr (nonexistent) +++ head/databases/mariadb101-server/pkg-descr (revision 408822) @@ -0,0 +1,14 @@ +MariaDB is a database server that offers drop-in replacement functionality +for MySQL. MariaDB is built by some of the original authors of MySQL, with +assistance from the broader community of Free and open source software +developers. In addition to the core functionality of MySQL, MariaDB offers +a rich set of feature enhancements including alternate storage engines, +server optimizations, and patches. + +MariaDB is primarily driven by developers at Monty Program, a company +founded by Michael "Monty" Widenius, the original author of MySQL, but +this is not the whole story about MariaDB. On the "About MariaDB" page you +will find more information about all participants in the MariaDB community, +including storage engines XtraDB and PBXT. + +WWW: http://mariadb.org/ Property changes on: head/databases/mariadb101-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