Index: head/Mk/Uses/mysql.mk =================================================================== --- head/Mk/Uses/mysql.mk (revision 505442) +++ head/Mk/Uses/mysql.mk (revision 505443) @@ -1,175 +1,176 @@ # $FreeBSD$ # # Provide support for MySQL # Feature: mysql # Usage: USES=mysql or USES=mysql:args # Valid ARGS: , client, server, embedded # # version If no version is given (by the maintainer via the port), try to # find the currently installed version. Fall back to default if # necessary (MySQL-5.6 = 56). # client Depends on the libmysqlclient library (default) # server/embedded # Depend on the server at run/build time. If none of these is # set, depends on the client. # # IGNORE_WITH_MYSQL # This variable can be defined if the ports does not support one # or more versions of MySQL. # WITH_MYSQL_VER # User defined variable to set MySQL version. # MYSQL_VER # Detected MySQL version. # # MAINTAINER: ports@FreeBSD.org .if !defined(_INCLUDE_USES_MYSQL_MK) _INCLUDE_USES_MYSQL_MK= yes .if !empty(mysql_ARGS) .undef _WANT_MYSQL_VER .undef _WANT_MYSQL_SERVER .undef _WANT_MYSQL_EMBEDDED _MYSQL_ARGS= ${mysql_ARGS:S/,/ /g} .if ${_MYSQL_ARGS:Mserver} _WANT_MYSQL_SERVER= yes _MYSQL_ARGS:= ${_MYSQL_ARGS:Nserver} .endif .if ${_MYSQL_ARGS:Membedded} _WANT_MYSQL_EMBEDDED= yes _MYSQL_ARGS:= ${_MYSQL_ARGS:Nembedded} .endif .if ${_MYSQL_ARGS:Mclient} _WANT_MYSQL_CLIENT= yes _MYSQL_ARGS:= ${_MYSQL_ARGS:Nclient} .endif # Port requested a version .if !empty(_MYSQL_ARGS) _WANT_MYSQL_VER= ${_MYSQL_ARGS} .if (${_WANT_MYSQL_VER:C/[0-9]*//} == "m") _WANT_MYSQL_FLAVOUR= mariadb .elif (${_WANT_MYSQL_VER:C/[0-9]*//} == "p") _WANT_MYSQL_FLAVOUR= percona .else _WANT_MYSQL_FLAVOUR= mysql .endif .endif .endif # !empty(mysql_ARGS) .if defined(DEFAULT_MYSQL_VER) WARNING+= "DEFAULT_MYSQL_VER is defined, consider using DEFAULT_VERSIONS=mysql=${DEFAULT_MYSQL_VER} instead" .endif DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//} # MySQL client version currently supported. # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. .for v in 55 55m 55p 56 56p 56w 100m 101m MYSQL${v}_LIBVER= 18 .endfor MYSQL57_LIBVER= 20 MYSQL57p_LIBVER= 20 MYSQL80_LIBVER= 21 MYSQL102m_LIBVER= 3 MYSQL103m_LIBVER= 3 +MYSQL104m_LIBVER= 3 # Setting/finding MySQL version we want. .if exists(${LOCALBASE}/bin/mysql) _MYSQL!= ${LOCALBASE}/bin/mysql_config --version | ${SED} -e 's/\([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 _MYSQL_FLAVOUR= percona .elif ${_MARIADB} == 1 _MYSQL_VER= ${_MYSQL}m _MYSQL_FLAVOUR= mariadb .else _MYSQL_VER= ${_MYSQL} _MYSQL_FLAVOUR= mysql .endif .endif .if defined(_WANT_MYSQL_VER) .if defined(WITH_MYSQL_VER) && (${WITH_MYSQL_VER:C/[0-9]*//} == "m") WITH_MYSQL_FLAVOUR= mariadb .elif defined(WITH_MYSQL_VER) && (${WITH_MYSQL_VER:C/[0-9]*//} == "p") WITH_MYSQL_FLAVOUR= percona .else WITH_MYSQL_FLAVOUR= mysql .endif .if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${_WANT_MYSQL_VER} IGNORE= cannot install: the port wants ${_WANT_MYSQL_FLAVOUR}${_WANT_MYSQL_VER:C/[mpw]//}-client and you try to install ${WITH_MYSQL_FLAVOUR}${WITH_MYSQL_VER:C/[mpw]//}-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 ${MYSQL_VER:C/[0-9]*//} == "m" MYSQL_FLAVOUR= mariadb .elif ${MYSQL_VER:C/[0-9]*//} == "p" MYSQL_FLAVOUR= percona .else MYSQL_FLAVOUR= mysql .endif .if defined(_MYSQL_VER) .if ${_MYSQL_VER} != ${MYSQL_VER} IGNORE= cannot install: MySQL versions mismatch: ${_MYSQL_FLAVOUR}${_MYSQL_VER:C/[mpw]//}-client is installed and wanted version is ${MYSQL_FLAVOUR}${MYSQL_VER:C/[mpw]//}-client .endif .endif _MYSQL_SHLIB= libmysqlclient .if (${MYSQL_VER:C/[0-9]*//} == "m") _MYSQL_SERVER_FLAVOUR= mariadb _MYSQL_CLIENT_FLAVOUR= mariadb . if ${MYSQL_VER:C/m//} >= 102 _MYSQL_SHLIB= libmariadb . endif .elif (${MYSQL_VER:C/[0-9]*//} == "p") _MYSQL_SERVER_FLAVOUR= percona _MYSQL_CLIENT_FLAVOUR= percona .elif (${MYSQL_VER:C/[0-9]*//} == "w") _MYSQL_SERVER_FLAVOUR= mysqlwsrep _MYSQL_CLIENT_FLAVOUR= mysql .else _MYSQL_SERVER_FLAVOUR= mysql _MYSQL_CLIENT_FLAVOUR= mysql .endif _MYSQL_CLIENT= databases/${_MYSQL_CLIENT_FLAVOUR}${MYSQL_VER:C/[mp]//}-client _MYSQL_SERVER= databases/${_MYSQL_SERVER_FLAVOUR}${MYSQL_VER:C/[mp]//}-server # And now we are checking if we can use it .if defined(MYSQL${MYSQL_VER}_LIBVER) .if defined(IGNORE_WITH_MYSQL) . for VER in ${IGNORE_WITH_MYSQL} . if (${MYSQL_VER} == "${VER}") IGNORE= cannot install: does not work with MySQL version ${MYSQL_VER} (MySQL ${IGNORE_WITH_MYSQL} not supported) . endif . endfor .endif # IGNORE_WITH_MYSQL .if defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED) RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER} .if defined(_WANT_MYSQL_EMBEDDED) BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqld.a:${_MYSQL_SERVER} .endif .endif .if defined(_WANT_MYSQL_CLIENT) || \ !(defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED)) LIB_DEPENDS+= ${_MYSQL_SHLIB}.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT} .endif .else IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER} .endif # Check for correct libs .endif Index: head/databases/Makefile =================================================================== --- head/databases/Makefile (revision 505442) +++ head/databases/Makefile (revision 505443) @@ -1,1048 +1,1050 @@ # $FreeBSD$ # COMMENT = Databases and related software SUBDIR += R-cran-DBI SUBDIR += R-cran-RMySQL SUBDIR += R-cran-RPostgreSQL SUBDIR += R-cran-RSQLite SUBDIR += R-cran-RSQLite.extfuns SUBDIR += R-cran-sqldf SUBDIR += WWWdb SUBDIR += adabase SUBDIR += adminer SUBDIR += adodb SUBDIR += adodb5 SUBDIR += akonadi SUBDIR += apq SUBDIR += apq-mysql SUBDIR += apq-odbc SUBDIR += apq-pgsql SUBDIR += arangodb32 SUBDIR += arangodb33 SUBDIR += ateam_mysql_ldap_auth SUBDIR += autobackupmysql SUBDIR += automysqlbackup SUBDIR += bbdb SUBDIR += beansdb SUBDIR += buzhug SUBDIR += c3p0 SUBDIR += cassandra-cpp-driver SUBDIR += cassandra3 SUBDIR += casstcl SUBDIR += cayley SUBDIR += cdb SUBDIR += cego SUBDIR += cegobridge SUBDIR += clickhouse SUBDIR += cockroach SUBDIR += couchdb SUBDIR += couchdb2 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 += dbf SUBDIR += dbh SUBDIR += dbixx SUBDIR += dbow SUBDIR += dbtool SUBDIR += dbview SUBDIR += elixir-calecto SUBDIR += elixir-db_connection SUBDIR += elixir-ecto SUBDIR += elixir-exredis SUBDIR += elixir-geo SUBDIR += elixir-mariaex SUBDIR += elixir-mongo SUBDIR += elixir-postgrex SUBDIR += elixir-timex_ecto SUBDIR += emma SUBDIR += erlang-couchbeam SUBDIR += erlang-epgsql SUBDIR += erlang-eredis SUBDIR += evolution-data-server SUBDIR += fastdb SUBDIR += firebird25-client SUBDIR += firebird25-server SUBDIR += fortytwo-bdb SUBDIR += foundationdb 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 += gnats4 SUBDIR += gnatsweb4 SUBDIR += go-carbon SUBDIR += gom SUBDIR += gqlplus SUBDIR += grass7 SUBDIR += gtksql SUBDIR += hamsterdb SUBDIR += hashtypes SUBDIR += hbase SUBDIR += hiredis SUBDIR += hsqldb SUBDIR += influxdb SUBDIR += innotop SUBDIR += iowow SUBDIR += ip4r SUBDIR += ipa_sdb SUBDIR += iplike SUBDIR += isql-viewer SUBDIR += jakarta-commons-dbutils SUBDIR += jasperreports SUBDIR += jdb SUBDIR += jdbc-oracle11g SUBDIR += jlog SUBDIR += jrobin SUBDIR += jrrd SUBDIR += kbibtex SUBDIR += kdb SUBDIR += kexi SUBDIR += kyotocabinet SUBDIR += kyototycoon SUBDIR += ldb SUBDIR += ldb12 SUBDIR += ldb13 SUBDIR += ldb14 SUBDIR += leo_center SUBDIR += leofs SUBDIR += leveldb SUBDIR += libcouchbase SUBDIR += libdbi SUBDIR += libdbi-drivers SUBDIR += libdrizzle SUBDIR += libdrizzle-redux SUBDIR += libgda5 SUBDIR += libgda5-bdb SUBDIR += libgda5-jdbc SUBDIR += libgda5-ldap SUBDIR += libgda5-mdb SUBDIR += libgda5-mysql SUBDIR += libgda5-postgresql SUBDIR += libgda5-ui 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-c7-sqlite3 SUBDIR += linux-oracle-instantclient-basic SUBDIR += linux-oracle-instantclient-sdk SUBDIR += linux-oracle-instantclient-sqlplus SUBDIR += liquibase SUBDIR += lmdb SUBDIR += lua-lsqlite3 SUBDIR += lua-resty-redis SUBDIR += lua-xapian SUBDIR += luadbi SUBDIR += luasql-firebird SUBDIR += luasql-mysql SUBDIR += luasql-odbc SUBDIR += luasql-postgres SUBDIR += luasql-sqlite3 SUBDIR += mantis SUBDIR += mariadb-connector-c SUBDIR += mariadb-connector-odbc SUBDIR += mariadb101-client SUBDIR += mariadb101-server SUBDIR += mariadb102-client SUBDIR += mariadb102-server SUBDIR += mariadb103-client SUBDIR += mariadb103-server + SUBDIR += mariadb104-client + SUBDIR += mariadb104-server SUBDIR += mariadb55-client SUBDIR += mariadb55-server SUBDIR += mdbtools SUBDIR += mdcached SUBDIR += memcached SUBDIR += memcacheq SUBDIR += metakit SUBDIR += monetdb SUBDIR += mongodb34 SUBDIR += mongodb34-tools SUBDIR += mongodb36 SUBDIR += mongodb36-tools SUBDIR += mongodb40 SUBDIR += mongodb40-tools SUBDIR += mroonga 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-java51 SUBDIR += mysql-connector-odbc SUBDIR += mysql-q4m SUBDIR += mysql-udf SUBDIR += mysql2odbc SUBDIR += mysql2pgsql SUBDIR += mysql55-client SUBDIR += mysql55-server SUBDIR += mysql56-client SUBDIR += mysql56-server SUBDIR += mysql57-client SUBDIR += mysql57-server SUBDIR += mysql80-client SUBDIR += mysql80-server SUBDIR += mysqlbackup SUBDIR += mysqlbigram SUBDIR += mysqldump-secure SUBDIR += mysqlidxchk SUBDIR += mysqlreport SUBDIR += mysqlsla SUBDIR += mysqlsniffer SUBDIR += mysqltcl SUBDIR += mysqltuner SUBDIR += mysqlwsrep56-server SUBDIR += mysqlwsrep57-server SUBDIR += mytop SUBDIR += nagios-check_mongodb SUBDIR += nagios-check_postgres_replication SUBDIR += nagios-check_redis SUBDIR += namazu2 SUBDIR += neo4j SUBDIR += ntdb SUBDIR += ocaml-dbm SUBDIR += ocaml-mysql SUBDIR += ocaml-sqlite3 SUBDIR += openark-kit SUBDIR += opendbviewer SUBDIR += opendbx SUBDIR += opentsdb SUBDIR += ora2pg SUBDIR += oracle8-client SUBDIR += p5-Amazon-SimpleDB SUBDIR += p5-Amon2-DBI SUBDIR += p5-AnyEvent-BDB SUBDIR += p5-AnyEvent-CouchDB SUBDIR += p5-AnyEvent-DBD-Pg SUBDIR += p5-AnyEvent-Memcached SUBDIR += p5-AnyEvent-Redis SUBDIR += p5-App-Sqitch SUBDIR += p5-AsciiDB-TagFile SUBDIR += p5-BDB SUBDIR += p5-BSON SUBDIR += p5-BSON-XS SUBDIR += p5-BerkeleyDB SUBDIR += p5-Bucardo SUBDIR += p5-CDB_File SUBDIR += p5-CDB_File-Generator SUBDIR += p5-CGI-Session-Driver-memcached SUBDIR += p5-CHI-Driver-Memcached SUBDIR += p5-CHI-Driver-Redis SUBDIR += p5-CHI-Driver-TokyoTyrant 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-AuditLog 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-InflateColumn-Serializer 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-Storage-TxnEndHook SUBDIR += p5-DBIx-Class-TimeStamp SUBDIR += p5-DBIx-Class-Tree SUBDIR += p5-DBIx-Class-Tree-NestedSet SUBDIR += p5-DBIx-Class-UUIDColumns SUBDIR += p5-DBIx-Class-VirtualColumns SUBDIR += p5-DBIx-Class-WebForm SUBDIR += p5-DBIx-Connector SUBDIR += p5-DBIx-ContextualFetch SUBDIR += p5-DBIx-Custom SUBDIR += p5-DBIx-DBHResolver SUBDIR += p5-DBIx-DBSchema SUBDIR += p5-DBIx-DataSource SUBDIR += p5-DBIx-Dump SUBDIR += p5-DBIx-Ease SUBDIR += p5-DBIx-HA SUBDIR += p5-DBIx-Handler SUBDIR += p5-DBIx-Inspector SUBDIR += p5-DBIx-Introspector SUBDIR += p5-DBIx-Lite SUBDIR += p5-DBIx-Log4perl SUBDIR += p5-DBIx-MySQLSequence SUBDIR += p5-DBIx-NoSQL SUBDIR += p5-DBIx-Password SUBDIR += p5-DBIx-Perlish SUBDIR += p5-DBIx-QueryLog SUBDIR += p5-DBIx-Recordset SUBDIR += p5-DBIx-RetryOverDisconnects SUBDIR += p5-DBIx-SQLEngine SUBDIR += p5-DBIx-SQLite-Simple SUBDIR += p5-DBIx-Safe SUBDIR += p5-DBIx-SearchBuilder SUBDIR += p5-DBIx-Sequence SUBDIR += p5-DBIx-Simple SUBDIR += p5-DBIx-Skinny SUBDIR += p5-DBIx-Skinny-InflateColumn-DateTime SUBDIR += p5-DBIx-Skinny-Mixin-DBHResolver SUBDIR += p5-DBIx-Skinny-Pager SUBDIR += p5-DBIx-Skinny-Schema-Loader SUBDIR += p5-DBIx-Sunny SUBDIR += p5-DBIx-TableHash SUBDIR += p5-DBIx-TransactionManager SUBDIR += p5-DBIx-Tree SUBDIR += p5-DBIx-VersionedDDL SUBDIR += p5-DBIx-Wrapper SUBDIR += p5-DBIx-XHTML_Table SUBDIR += p5-DBIx-XML_RDB SUBDIR += p5-DBM-Deep SUBDIR += p5-DMOZ-ParseRDF SUBDIR += p5-DR-Tarantool SUBDIR += p5-DWH_File SUBDIR += p5-Dancer-Plugin-DBIC SUBDIR += p5-Dancer-Plugin-Database SUBDIR += p5-Dancer-Plugin-Database-Core SUBDIR += p5-Dancer-Plugin-Redis SUBDIR += p5-Dancer-Session-Memcached SUBDIR += p5-Dancer2-Plugin-DBIC SUBDIR += p5-Dancer2-Plugin-Database SUBDIR += p5-Dancer2-Session-DBIC SUBDIR += p5-Data-Page SUBDIR += p5-Data-Pageset SUBDIR += p5-Exception-Class-DBI SUBDIR += p5-File-Locate SUBDIR += p5-GDBM SUBDIR += p5-Genezzo SUBDIR += p5-GitDDL SUBDIR += p5-GitDDL-Migrator SUBDIR += p5-GraphViz-DBI SUBDIR += p5-HTML-FormHandler-Model-DBIC SUBDIR += p5-Ima-DBI SUBDIR += p5-Interchange6-Schema SUBDIR += p5-Iterator-DBI SUBDIR += p5-Jifty-DBI SUBDIR += p5-KyotoCabinet SUBDIR += p5-LMDB_File SUBDIR += p5-MLDBM SUBDIR += p5-MLDBM-Sync SUBDIR += p5-MR-Tarantool SUBDIR += p5-Mango SUBDIR += p5-Memcached-libmemcached SUBDIR += p5-Metadata SUBDIR += p5-Mojo-Pg SUBDIR += p5-MongoDB SUBDIR += p5-Mongoose 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-Fast 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-Scope-Container-DBI SUBDIR += p5-Search-InvertedIndex SUBDIR += p5-Search-Namazu SUBDIR += p5-Search-Xapian SUBDIR += p5-Search-Xapian10 SUBDIR += p5-Search-Xapian12 SUBDIR += p5-Store-CouchDB 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-Xapian SUBDIR += p5-mysql-genocide SUBDIR += p5-tokyotyrant SUBDIR += pear-DB SUBDIR += pear-DBA SUBDIR += pear-DBA_Relational SUBDIR += pear-DB_DataObject SUBDIR += pear-DB_DataObject_FormBuilder SUBDIR += pear-DB_Pager SUBDIR += pear-DB_QueryTool SUBDIR += pear-DB_Sqlite_Tools SUBDIR += pear-DB_Table SUBDIR += pear-DB_ldap SUBDIR += pear-DB_ldap2 SUBDIR += pear-DoctrineCommon SUBDIR += pear-DoctrineDBAL SUBDIR += pear-DoctrineORM SUBDIR += pear-Horde_Db SUBDIR += pear-Horde_HashTable SUBDIR += pear-Horde_Imsp SUBDIR += pear-Horde_Memcache SUBDIR += pear-Horde_Mongo SUBDIR += pear-MDB SUBDIR += pear-MDB2 SUBDIR += pear-MDB2_Driver_mysql SUBDIR += pear-MDB2_Driver_mysqli SUBDIR += pear-MDB2_Driver_pgsql SUBDIR += pear-MDB2_Schema SUBDIR += pear-MDB_QueryTool SUBDIR += pear-Structures_DataGrid_DataSource_Array SUBDIR += pear-Structures_DataGrid_DataSource_CSV SUBDIR += pear-Structures_DataGrid_DataSource_DB SUBDIR += pear-Structures_DataGrid_DataSource_DBQuery SUBDIR += pear-Structures_DataGrid_DataSource_DBTable SUBDIR += pear-Structures_DataGrid_DataSource_DataObject SUBDIR += pear-Structures_DataGrid_DataSource_MDB2 SUBDIR += pear-Structures_DataGrid_DataSource_PDO SUBDIR += pear-XML_Query2XML SUBDIR += pecl-cassandra SUBDIR += pecl-couchbase SUBDIR += pecl-leveldb SUBDIR += pecl-memcached SUBDIR += pecl-mongodb SUBDIR += pecl-redis SUBDIR += pecl-redis3 SUBDIR += pecl-rrd SUBDIR += percona-pam-for-mysql SUBDIR += percona-toolkit SUBDIR += percona55-client SUBDIR += percona55-server SUBDIR += percona56-client SUBDIR += percona56-server SUBDIR += percona57-client SUBDIR += percona57-pam-for-mysql SUBDIR += percona57-server SUBDIR += pgFormatter SUBDIR += pg_activity SUBDIR += pg_citus SUBDIR += pg_dirtyread SUBDIR += pg_partman SUBDIR += pg_qualstats SUBDIR += pg_reorg SUBDIR += pg_repack SUBDIR += pg_similarity SUBDIR += pg_stat_kcache SUBDIR += pgaccess SUBDIR += pgadmin3 SUBDIR += pgagent SUBDIR += pgbadger SUBDIR += pgbarman SUBDIR += pgbouncer SUBDIR += pgdbf SUBDIR += pgespresso SUBDIR += pgfouine SUBDIR += pgloader SUBDIR += pgloader3 SUBDIR += pglogical SUBDIR += pgmetrics SUBDIR += pgmodeler SUBDIR += pgpool SUBDIR += pgpool-II-35 SUBDIR += pgpool-II-36 SUBDIR += pgpool-II-37 SUBDIR += pgpool-II-40 SUBDIR += pgreplay SUBDIR += pgroonga SUBDIR += pgrouting SUBDIR += pgsanity SUBDIR += pgsphere SUBDIR += pgtcl SUBDIR += pgtop SUBDIR += pgtune SUBDIR += pguri SUBDIR += pgworksheet SUBDIR += php-memcache SUBDIR += php-tarantool SUBDIR += php-xapian SUBDIR += php71-dba SUBDIR += php71-interbase SUBDIR += php71-mysqli SUBDIR += php71-odbc SUBDIR += php71-pdo SUBDIR += php71-pdo_dblib SUBDIR += php71-pdo_firebird SUBDIR += php71-pdo_mysql SUBDIR += php71-pdo_odbc SUBDIR += php71-pdo_pgsql SUBDIR += php71-pdo_sqlite SUBDIR += php71-pgsql SUBDIR += php71-sqlite3 SUBDIR += php72-dba SUBDIR += php72-interbase SUBDIR += php72-mysqli SUBDIR += php72-odbc SUBDIR += php72-pdo SUBDIR += php72-pdo_dblib SUBDIR += php72-pdo_firebird SUBDIR += php72-pdo_mysql SUBDIR += php72-pdo_odbc SUBDIR += php72-pdo_pgsql SUBDIR += php72-pdo_sqlite SUBDIR += php72-pgsql SUBDIR += php72-sqlite3 SUBDIR += php73-dba SUBDIR += php73-interbase SUBDIR += php73-mysqli SUBDIR += php73-odbc SUBDIR += php73-pdo SUBDIR += php73-pdo_dblib SUBDIR += php73-pdo_firebird SUBDIR += php73-pdo_mysql SUBDIR += php73-pdo_odbc SUBDIR += php73-pdo_pgsql SUBDIR += php73-pdo_sqlite SUBDIR += php73-pgsql SUBDIR += php73-sqlite3 SUBDIR += phpliteadmin SUBDIR += phpminiadmin SUBDIR += phpmyadmin SUBDIR += phppgadmin SUBDIR += pldebugger SUBDIR += plpgsql_check SUBDIR += pointcloud SUBDIR += postgis-jdbc SUBDIR += postgis23 SUBDIR += postgis24 SUBDIR += postgis25 SUBDIR += postgres-xl SUBDIR += postgresql-cstore_fdw SUBDIR += postgresql-jdbc SUBDIR += postgresql-libpgeasy SUBDIR += postgresql-libpqxx SUBDIR += postgresql-libpqxx3 SUBDIR += postgresql-libpqxx4 SUBDIR += postgresql-mysql_fdw SUBDIR += postgresql-odbc SUBDIR += postgresql-orafce SUBDIR += postgresql-plproxy SUBDIR += postgresql-plruby SUBDIR += postgresql-plv8js SUBDIR += postgresql-prefix SUBDIR += postgresql-relay SUBDIR += postgresql-repmgr SUBDIR += postgresql-rum SUBDIR += postgresql-tds_fdw SUBDIR += postgresql-zhparser SUBDIR += postgresql10-client SUBDIR += postgresql10-contrib SUBDIR += postgresql10-docs SUBDIR += postgresql10-pgtcl SUBDIR += postgresql10-plperl SUBDIR += postgresql10-plpython SUBDIR += postgresql10-pltcl SUBDIR += postgresql10-server SUBDIR += postgresql11-client SUBDIR += postgresql11-contrib SUBDIR += postgresql11-docs SUBDIR += postgresql11-pgtcl SUBDIR += postgresql11-plperl SUBDIR += postgresql11-plpython SUBDIR += postgresql11-pltcl SUBDIR += postgresql11-server SUBDIR += postgresql94-client SUBDIR += postgresql94-contrib SUBDIR += postgresql94-docs SUBDIR += postgresql94-pgtcl SUBDIR += postgresql94-plperl SUBDIR += postgresql94-plpython SUBDIR += postgresql94-pltcl SUBDIR += postgresql94-server SUBDIR += postgresql95-client SUBDIR += postgresql95-contrib SUBDIR += postgresql95-docs SUBDIR += postgresql95-pgtcl SUBDIR += postgresql95-plperl SUBDIR += postgresql95-plpython SUBDIR += postgresql95-pltcl SUBDIR += postgresql95-server SUBDIR += postgresql96-client SUBDIR += postgresql96-contrib SUBDIR += postgresql96-docs SUBDIR += postgresql96-pgtcl SUBDIR += postgresql96-plperl SUBDIR += postgresql96-plpython SUBDIR += postgresql96-pltcl SUBDIR += postgresql96-server SUBDIR += powa-archivist SUBDIR += powa-web SUBDIR += powerarchitect SUBDIR += proftpd-mod_sql_mysql SUBDIR += proftpd-mod_sql_odbc SUBDIR += proftpd-mod_sql_postgres SUBDIR += proftpd-mod_sql_sqlite SUBDIR += proftpd-mod_sql_tds SUBDIR += pspg SUBDIR += puppetdb-terminus5 SUBDIR += puppetdb-terminus6 SUBDIR += puppetdb5 SUBDIR += puppetdb6 SUBDIR += pure-sql3 SUBDIR += puredb SUBDIR += pxlib SUBDIR += pxtools SUBDIR += py-Elixir SUBDIR += py-MySQLdb SUBDIR += py-MySQLdb55 SUBDIR += py-MySQLdb56 SUBDIR += py-PyGreSQL SUBDIR += py-Pyrseas SUBDIR += py-agate-sql SUBDIR += py-aiopg SUBDIR += py-aioredis SUBDIR += py-alembic SUBDIR += py-apsw SUBDIR += py-asyncpg SUBDIR += py-bsddb SUBDIR += py-bsddb3 SUBDIR += py-carbon SUBDIR += py-cassandra-driver SUBDIR += py-cdb SUBDIR += py-couchdb SUBDIR += py-cql SUBDIR += py-dbf SUBDIR += py-dbutils SUBDIR += py-django-transaction-hooks SUBDIR += py-fakeredis SUBDIR += py-fdb SUBDIR += py-firebirdsql SUBDIR += py-flask-sqlalchemy SUBDIR += py-forgetsql SUBDIR += py-gdbm SUBDIR += py-geoalchemy SUBDIR += py-geoalchemy2 SUBDIR += py-hiredis SUBDIR += py-htsql SUBDIR += py-htsql-mysql SUBDIR += py-htsql-pgsql SUBDIR += py-influxdb SUBDIR += py-kyotocabinet SUBDIR += py-leveldb SUBDIR += py-lmdb SUBDIR += py-marshmallow-sqlalchemy SUBDIR += py-minidb SUBDIR += py-mongoengine SUBDIR += py-motor SUBDIR += py-mycli SUBDIR += py-mysql-connector-python SUBDIR += py-mysql2pgsql SUBDIR += py-mysqlclient SUBDIR += py-oops SUBDIR += py-oursql SUBDIR += py-peewee SUBDIR += py-pg8000 SUBDIR += py-pg8000-112 SUBDIR += py-pgcli SUBDIR += py-pgdbconn SUBDIR += py-pglast SUBDIR += py-pglite SUBDIR += py-pgspecial SUBDIR += py-pgxnclient SUBDIR += py-pickledb SUBDIR += py-pickleshare SUBDIR += py-postgresql SUBDIR += py-psycogreen SUBDIR += py-psycopg2 SUBDIR += py-psycopg2cffi SUBDIR += py-pum SUBDIR += py-pyPgSQL SUBDIR += py-pyhs SUBDIR += py-pylibmc SUBDIR += py-pymssql SUBDIR += py-pymysql SUBDIR += py-pyodbc SUBDIR += py-pypuppetdb SUBDIR += py-pypuppetdb03 SUBDIR += py-pytc SUBDIR += py-python-arango SUBDIR += py-python-memcached SUBDIR += py-python-rrdtool SUBDIR += py-python-sql SUBDIR += py-python-swiftclient SUBDIR += py-qt5-sql SUBDIR += py-queries SUBDIR += py-rb SUBDIR += py-redis SUBDIR += py-riak SUBDIR += py-rrdtool_lgpl SUBDIR += py-sispy SUBDIR += py-south SUBDIR += py-sqlalchemy-migrate SUBDIR += py-sqlalchemy10 SUBDIR += py-sqlalchemy11 SUBDIR += py-sqlalchemy12 SUBDIR += py-sqlalchemy13 SUBDIR += py-sqlite3 SUBDIR += py-sqlite3dbm SUBDIR += py-sqlobject SUBDIR += py-sqlparse SUBDIR += py-sqlparse020 SUBDIR += py-sqlrelay SUBDIR += py-swift SUBDIR += py-sybase SUBDIR += py-tableschema SUBDIR += py-tarantool SUBDIR += py-tiledb SUBDIR += py-umemcache SUBDIR += py-unqlite SUBDIR += py-varstack SUBDIR += py-whisper SUBDIR += py-xapian SUBDIR += py-zodbpickle SUBDIR += pydbx SUBDIR += pymongo SUBDIR += pypy-gdbm SUBDIR += pypy-sqlite3 SUBDIR += pyspatialite SUBDIR += qdbm SUBDIR += qdbm-plus SUBDIR += qof SUBDIR += qt5-sql SUBDIR += qt5-sqldrivers-ibase SUBDIR += qt5-sqldrivers-mysql SUBDIR += qt5-sqldrivers-odbc SUBDIR += qt5-sqldrivers-pgsql SUBDIR += qt5-sqldrivers-sqlite2 SUBDIR += qt5-sqldrivers-sqlite3 SUBDIR += qt5-sqldrivers-tds SUBDIR += recutils SUBDIR += redis SUBDIR += redis-devel SUBDIR += redis_exporter SUBDIR += redisdesktopmanager SUBDIR += retcl SUBDIR += riak SUBDIR += rocksdb SUBDIR += rocksdb-lite SUBDIR += rrdman SUBDIR += rrdmerge SUBDIR += rrdtool SUBDIR += rrdtool12 SUBDIR += ruby-bdb SUBDIR += ruby-qdbm SUBDIR += ruby-tokyocabinet SUBDIR += ruby-xapian SUBDIR += rubygem-active_model_serializers SUBDIR += rubygem-active_record_query_trace SUBDIR += rubygem-activemodel-serializers-xml SUBDIR += rubygem-activemodel4 SUBDIR += rubygem-activemodel5 SUBDIR += rubygem-activemodel50 SUBDIR += rubygem-activerecord-import SUBDIR += rubygem-activerecord-jdbc-adapter SUBDIR += rubygem-activerecord-jdbcmysql-adapter SUBDIR += rubygem-activerecord-session_store SUBDIR += rubygem-activerecord4 SUBDIR += rubygem-activerecord5 SUBDIR += rubygem-activerecord50 SUBDIR += rubygem-after_commit_queue SUBDIR += rubygem-amalgalite SUBDIR += rubygem-arel SUBDIR += rubygem-arel-helpers SUBDIR += rubygem-arel6 SUBDIR += rubygem-arel7 SUBDIR += rubygem-arel8 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-pg SUBDIR += rubygem-dbd-sqlite3 SUBDIR += rubygem-dbf SUBDIR += rubygem-dbi SUBDIR += rubygem-dbm SUBDIR += rubygem-dm-aggregates SUBDIR += rubygem-dm-chunked_query SUBDIR += rubygem-dm-constraints SUBDIR += rubygem-dm-core SUBDIR += rubygem-dm-do-adapter SUBDIR += rubygem-dm-migrations SUBDIR += rubygem-dm-mysql-adapter SUBDIR += rubygem-dm-observer SUBDIR += rubygem-dm-pager SUBDIR += rubygem-dm-paperclip SUBDIR += rubygem-dm-postgres-adapter SUBDIR += rubygem-dm-serializer SUBDIR += rubygem-dm-timestamps SUBDIR += rubygem-dm-transactions SUBDIR += rubygem-dm-types SUBDIR += rubygem-dm-validations SUBDIR += rubygem-do_mysql SUBDIR += rubygem-do_postgres SUBDIR += rubygem-do_sqlite3 SUBDIR += rubygem-em-redis-unified SUBDIR += rubygem-familia SUBDIR += rubygem-flipper-active_record SUBDIR += rubygem-flipper-active_record013 SUBDIR += rubygem-gdbm SUBDIR += rubygem-globalid SUBDIR += rubygem-globalid-rails5 SUBDIR += rubygem-globalid-rails50 SUBDIR += rubygem-her SUBDIR += rubygem-hiredis SUBDIR += rubygem-influxdb SUBDIR += rubygem-jdbc-mysql SUBDIR += rubygem-leo_manager_client SUBDIR += rubygem-mario-redis-lock SUBDIR += rubygem-memcache SUBDIR += rubygem-memcache-client SUBDIR += rubygem-mysql SUBDIR += rubygem-mysql2 SUBDIR += rubygem-openid-redis-store SUBDIR += rubygem-paranoia SUBDIR += rubygem-peek-mysql2-rails5 SUBDIR += rubygem-peek-pg-rails5 SUBDIR += rubygem-pg SUBDIR += rubygem-pg0 SUBDIR += rubygem-pg018 SUBDIR += rubygem-pg_array_parser SUBDIR += rubygem-pghero SUBDIR += rubygem-pghero-rails5 SUBDIR += rubygem-pghero-rails50 SUBDIR += rubygem-pl-puppetdb-ruby SUBDIR += rubygem-postgres_ext SUBDIR += rubygem-puppetdb_cli SUBDIR += rubygem-rbase SUBDIR += rubygem-redis SUBDIR += rubygem-redis-actionpack SUBDIR += rubygem-redis-actionpack-rails5 SUBDIR += rubygem-redis-actionpack-rails50 SUBDIR += rubygem-redis-namespace SUBDIR += rubygem-redis3 SUBDIR += rubygem-seed-fu SUBDIR += rubygem-sqlite3 SUBDIR += rubygem-sqlite3-ruby SUBDIR += rubygem-state_machines-activemodel SUBDIR += rubygem-state_machines-activerecord SUBDIR += rubygem-state_machines-activerecord05 SUBDIR += rubygem-tarantool SUBDIR += sequeler SUBDIR += sfcgal SUBDIR += sharedance SUBDIR += skytools SUBDIR += slony1v2 SUBDIR += soci SUBDIR += spatialite SUBDIR += spatialite-tools SUBDIR += spatialite_gui SUBDIR += speedtables SUBDIR += sql-workbench SUBDIR += sqlcached SUBDIR += sqlcipher SUBDIR += sqlclient SUBDIR += sqldeveloper SUBDIR += sqlite-ext-miscfuncs SUBDIR += sqlite-ext-pcre SUBDIR += sqlite-ext-regexp SUBDIR += sqlite-ext-spellfix SUBDIR += sqlite2 SUBDIR += sqlite3 SUBDIR += sqlitebrowser SUBDIR += sqliteconvert SUBDIR += sqlitemanager SUBDIR += sqliteodbc SUBDIR += sqliteodbc-sqlite2 SUBDIR += sqlitestudio SUBDIR += sqlrelay SUBDIR += sqsh SUBDIR += squirrel-sql SUBDIR += tablelog SUBDIR += tarantool SUBDIR += tarantool-c SUBDIR += tcl-Mysql SUBDIR += tcl-lmdb SUBDIR += tcl-sqlite3 SUBDIR += tdb SUBDIR += tdb1 SUBDIR += tdbc SUBDIR += tile38 SUBDIR += tiledb SUBDIR += timescaledb SUBDIR += tinycdb SUBDIR += tokyocabinet SUBDIR += tokyotyrant SUBDIR += tsearch_extras SUBDIR += tuning-primer SUBDIR += twemproxy SUBDIR += unixODBC SUBDIR += useracc SUBDIR += usql SUBDIR += vfront SUBDIR += virtualpg SUBDIR += virtuoso SUBDIR += vsqlite SUBDIR += wfb2sql SUBDIR += wmjsql SUBDIR += xapian-bindings SUBDIR += xapian-bindings12 SUBDIR += xapian-core SUBDIR += xapian-core10 SUBDIR += xapian-core12 SUBDIR += xrootd SUBDIR += xtrabackup SUBDIR += zabbix22-libzbxpgsql SUBDIR += zabbix3-libzbxpgsql SUBDIR += zodb3 .include Index: head/databases/mariadb104-client/Makefile =================================================================== --- head/databases/mariadb104-client/Makefile (nonexistent) +++ head/databases/mariadb104-client/Makefile (revision 505443) @@ -0,0 +1,17 @@ +# Created by: Bernard Spil +# $FreeBSD$ + +PORTNAME= mariadb +PKGNAMESUFFIX= 104-client + +COMMENT= Multithreaded SQL database (client) + +MASTERDIR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/} + +FILESDIR= ${.CURDIR}/files +PATCHDIR= ${.CURDIR}/files +PLIST= ${.CURDIR}/pkg-plist + +CONFLICTS_INSTALL= databases/mytop + +.include "${MASTERDIR}/Makefile" Property changes on: head/databases/mariadb104-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/mariadb104-client/files/patch-MDEV-11790 =================================================================== --- head/databases/mariadb104-client/files/patch-MDEV-11790 (nonexistent) +++ head/databases/mariadb104-client/files/patch-MDEV-11790 (revision 505443) @@ -0,0 +1,46 @@ +WITHOUT_SERVER installs server-only files + +https://jira.mariadb.org/browse/MDEV-11790 +--- extra/CMakeLists.txt.orig 2018-10-02 09:45:40 UTC ++++ extra/CMakeLists.txt +@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) + ADD_DEPENDENCIES(innochecksum GenError) + ENDIF() + +-MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) ++MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client) + TARGET_LINK_LIBRARIES(replace mysys) + + IF(UNIX) +--- scripts/CMakeLists.txt.orig 2018-10-02 09:45:42 UTC ++++ scripts/CMakeLists.txt +@@ -241,7 +241,10 @@ ENDIF() + SET(mysql_config_COMPONENT COMPONENT Development) + SET(msql2mysql_COMPONENT COMPONENT Client) + SET(mysqlaccess_COMPONENT COMPONENT Client) ++SET(mysqlhotcopy_COMPONENT COMPONENT Client) ++SET(mysql_convert_table_format_COMPONENT COMPONENT Client) + SET(mysql_find_rows_COMPONENT COMPONENT Client) ++SET(mysql_setpermission_COMPONENT COMPONENT Client) + SET(mytop_COMPONENT Mytop) + + IF(WIN32) +@@ -298,14 +301,14 @@ ELSE() + # On Unix, most of the files end up in the bin directory + SET(BIN_SCRIPTS + msql2mysql +- mysql_config +- mysql_setpermission +- mysql_secure_installation + mysqlaccess ++ mysqlhotcopy ++ mysql_config + mysql_convert_table_format + mysql_find_rows ++ mysql_secure_installation ++ mysql_setpermission + mytop +- mysqlhotcopy + ${SERVER_SCRIPTS} + ${WSREP_SCRIPTS} + ${SYSTEMD_SCRIPTS} Property changes on: head/databases/mariadb104-client/files/patch-MDEV-11790 ___________________________________________________________________ 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/mariadb104-client/files/patch-MDEV-15961 =================================================================== --- head/databases/mariadb104-client/files/patch-MDEV-15961 (nonexistent) +++ head/databases/mariadb104-client/files/patch-MDEV-15961 (revision 505443) @@ -0,0 +1,50 @@ +MDEV-15961: Fix stacktraces under FreeBSD + +https://jira.mariadb.org/browse/MDEV-15961 +--- mysys/stacktrace.c.orig 2018-07-02 07:34:11 UTC ++++ mysys/stacktrace.c +@@ -34,19 +34,19 @@ + #include + #endif + ++#ifdef __linux__ + #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end) +- + static char *heap_start; +- +-#if(defined HAVE_BSS_START) && !(defined __linux__) + extern char *__bss_start; +-#endif ++#else ++#define PTR_SANE(p) (p) ++#endif /* __linux */ + + void my_init_stacktrace() + { +-#if(defined HAVE_BSS_START) && !(defined __linux__) ++#ifdef __linux__ + heap_start = (char*) &__bss_start; +-#endif ++#endif /* __linux__ */ + } + + #ifdef __linux__ +@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad + + int my_safe_print_str(const char* val, size_t max_len) + { ++#ifdef __linux__ ++/* Only needed by the linux version of PTR_SANE */ + char *heap_end; + +-#ifdef __linux__ + // Try and make use of /proc filesystem to safely print memory contents. + if (!safe_print_str(val, max_len)) + return 0; +-#endif + + heap_end= (char*) sbrk(0); ++#endif + + if (!PTR_SANE(val)) + { Property changes on: head/databases/mariadb104-client/files/patch-MDEV-15961 ___________________________________________________________________ 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/mariadb104-client/files/pkg-message.in =================================================================== --- head/databases/mariadb104-client/files/pkg-message.in (nonexistent) +++ head/databases/mariadb104-client/files/pkg-message.in (revision 505443) @@ -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/mariadb104-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/mariadb104-client/pkg-plist =================================================================== --- head/databases/mariadb104-client/pkg-plist (nonexistent) +++ head/databases/mariadb104-client/pkg-plist (revision 505443) @@ -0,0 +1,175 @@ +bin/mariadb +bin/mariadb-access +bin/mariadb-admin +bin/mariadb-binlog +bin/mariadb-check +bin/mariadb-convert-table-format +bin/mariadb-dump +bin/mariadb-find-rows +bin/mariadb-hotcopy +bin/mariadb-import +bin/mariadb-plugin +bin/mariadb-setpermission +bin/mariadb-show +bin/mariadb-slap +@comment bin/mariadb-test +@comment bin/mariadb-waitpid +bin/mariadb_config +bin/msql2mysql +bin/mysql +bin/mysql_config +bin/mysql_convert_table_format +bin/mysql_find_rows +bin/mysql_setpermission +@comment bin/mysql_plugin +@comment bin/mysql_waitpid +bin/mysqlaccess +bin/mysqladmin +bin/mysqlbinlog +bin/mysqlcheck +bin/mysqldump +bin/mysqlhotcopy +bin/mysqlimport +bin/mysqlshow +bin/mysqlslap +@comment bin/mysqltest +bin/mytop +bin/replace +@comment bin/wsrep_sst_rsync_wan +include/mysql/errmsg.h +include/mysql/ma_list.h +include/mysql/ma_pvio.h +include/mysql/ma_tls.h +include/mysql/mariadb/ma_io.h +include/mysql/mariadb_com.h +include/mysql/mariadb_ctype.h +include/mysql/mariadb_dyncol.h +include/mysql/mariadb_rpl.h +include/mysql/mariadb_stmt.h +include/mysql/mariadb_version.h +include/mysql/my_config.h +include/mysql/my_global.h +include/mysql/my_sys.h +include/mysql/mysql.h +include/mysql/mysql_com.h +include/mysql/mysql_version.h +include/mysql/mysql/client_plugin.h +include/mysql/mysql/plugin_auth.h +include/mysql/mysql/plugin_auth_common.h +include/mysql/mysqld_error.h +%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so +lib/mysql/libmariadb.so +lib/mysql/libmariadb.so.3 +lib/mysql/libmariadbclient.a +lib/mysql/libmysqlclient.a +lib/mysql/libmysqlclient.so +lib/mysql/libmysqlclient_r.a +lib/mysql/libmysqlclient_r.so +lib/mysql/libmysqlservices.a +@comment lib/mysql/plugin/caching_sha2_password.so +lib/mysql/plugin/client_ed25519.so +lib/mysql/plugin/daemon_example.ini +lib/mysql/plugin/dialog.so +lib/mysql/plugin/mysql_clear_password.so +lib/mysql/plugin/sha256_password.so +libdata/pkgconfig/libmariadb.pc +@comment man/man1/aria_chk.1.gz +@comment man/man1/aria_dump_log.1.gz +@comment man/man1/aria_ftdump.1.gz +@comment man/man1/aria_pack.1.gz +@comment man/man1/aria_read_log.1.gz +@comment man/man1/galera_new_cluster.1.gz +@comment man/man1/galera_recovery.1.gz +@comment man/man1/innochecksum.1.gz +@comment man/man1/mariabackup.1.gz +man/man1/mariadb.1.gz +man/man1/mariadb-access.1.gz +man/man1/mariadb-admin.1.gz +@comment man/man1/mariadb-backup.1.gz +man/man1/mariadb-binlog.1.gz +man/man1/mariadb-check.1.gz +@comment man/man1/mariadb-client-test-embedded.1.gz +@comment man/man1/mariadb-client-test.1.gz +man/man1/mariadb-convert-table-format.1.gz +man/man1/mariadb-dump.1.gz +@comment man/man1/mariadb-dumpslow.1.gz +@comment man/man1/mariadb-embedded.1.gz +man/man1/mariadb-find-rows.1.gz +@comment man/man1/mariadb-fix-extensions.1.gz +man/man1/mariadb-hotcopy.1.gz +man/man1/mariadb-import.1.gz +@comment man/man1/mariadb-install-db.1.gz +@comment man/man1/mariadb-ldb.1.gz +man/man1/mariadb-plugin.1.gz +@comment man/man1/mariadb-secure-installation.1.gz +@comment man/man1/mariadb-service-convert.1.gz +man/man1/mariadb-setpermission.1.gz +man/man1/mariadb-show.1.gz +man/man1/mariadb-slap.1.gz +@comment man/man1/mariadb-test-embedded.1.gz +@comment man/man1/mariadb-test.1.gz +@comment man/man1/mariadb-tzinfo-to-sql.1.gz +@comment man/man1/mariadb-upgrade.1.gz +@comment man/man1/mariadb-waitpid.1.gz +@comment man/man1/mariadbd-multi.1.gz +@comment man/man1/mariadbd-safe-helper.1.gz +@comment man/man1/mariadbd-safe.1.gz +@comment man/man8/mariadbd.8.gz +man/man1/msql2mysql.1.gz +@comment man/man1/mbstream.1.gz +@comment man/man1/my_print_defaults.1.gz +man/man1/my_safe_process.1.gz +@comment man/man1/myisam_ftdump.1.gz +@comment man/man1/myisamchk.1.gz +@comment man/man1/myisamlog.1.gz +@comment man/man1/myisampack.1.gz +man/man1/mysql-stress-test.pl.1.gz +man/man1/mysql-test-run.pl.1.gz +man/man1/mysql.1.gz +@comment man/man1/mysql.server.1.gz +@comment man/man1/mysql_client_test.1.gz +@comment man/man1/mysql_client_test_embedded.1.gz +man/man1/mysql_config.1.gz +man/man1/mysql_convert_table_format.1.gz +@comment man/man1/mysql_embedded.1.gz +man/man1/mysql_find_rows.1.gz +@comment man/man1/mysql_fix_extensions.1.gz +@comment man/man1/mysql_install_db.1.gz +@comment man/man1/mysql_ldb.1.gz +man/man1/mysql_plugin.1.gz +@comment man/man1/mysql_secure_installation.1.gz +man/man1/mysql_setpermission.1.gz +@comment man/man1/mysql_tzinfo_to_sql.1.gz +@comment man/man1/mysql_upgrade.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 +@comment man/man1/mysqld_multi.1.gz +@comment man/man1/mysqld_safe.1.gz +@comment man/man1/mysqld_safe_helper.1.gz +man/man1/mysqldump.1.gz +@comment man/man1/mysqldumpslow.1.gz +man/man1/mysqlhotcopy.1.gz +man/man1/mysqlimport.1.gz +man/man1/mysqlshow.1.gz +man/man1/mysqlslap.1.gz +@comment man/man1/mysqltest.1.gz +@comment man/man1/mysqltest_embedded.1.gz +@comment man/man1/perror.1.gz +man/man1/replace.1.gz +@comment man/man1/resolve_stack_dump.1.gz +@comment man/man1/resolveip.1.gz +@comment man/man1/tokuft_logprint.1.gz +@comment man/man1/tokuftdump.1.gz +@comment man/man1/wsrep_sst_common.1.gz +@comment man/man1/wsrep_sst_mariabackup.1.gz +@comment man/man1/wsrep_sst_mysqldump.1.gz +@comment man/man1/wsrep_sst_rsync.1.gz +@comment man/man1/wsrep_sst_rsync_wan.1.gz +@comment man/man1/wsrep_sst_xtrabackup-v2.1.gz +@comment man/man1/wsrep_sst_xtrabackup.1.gz +@comment man/man8/mysqld.8.gz +@comment share/aclocal/mysql.m4 +share/pkgconfig/mariadb.pc Property changes on: head/databases/mariadb104-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/mariadb104-server/Makefile =================================================================== --- head/databases/mariadb104-server/Makefile (nonexistent) +++ head/databases/mariadb104-server/Makefile (revision 505443) @@ -0,0 +1,225 @@ +# Created by: Bernard Spil +# $FreeBSD$ + +PORTNAME?= mariadb +PORTVERSION= 10.4.6 +PORTREVISION?= 0 +CATEGORIES= databases ipv6 +MASTER_SITES= 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}/ \ + http://ftp.osuosl.org/pub/${SITESDIR}/ +PKGNAMESUFFIX?= 104-server + +MAINTAINER= brnrd@FreeBSD.org +COMMENT?= Multithreaded SQL database (server) + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_NAME_PerconaFT= PerconaFT patents license +LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS +LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + +SUB_FILES= pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message + +SLAVEDIRS= databases/mariadb102-client +USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl +USE_LDCONFIG= ${PREFIX}/lib/mysql +SHEBANG_FILES= scripts/*.sh +SITESDIR= mariadb/mariadb-${PORTVERSION}/source +DOCSDIR= ${PREFIX}/share/doc/mysql + +OPTIONS_SINGLE= GSSAPI +OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE +OPTIONS_DEFAULT= GSSAPI_BASE + +.if ${PKGNAMESUFFIX:M*-server} +# MySQL-Server options +OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP +OPTIONS_GROUP= COMPRESSION ENGINES GROONGA +OPTIONS_DEFINE= AWS_KMS CONNECT_EXTRA DOCS +OPTIONS_DEFINE_amd64= WSREP +OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD +OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB +OPTIONS_GROUP_GROONGA= ZMQ MSGPACK +OPTIONS_EXCLUDE_i386= TOKUDB + +CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine +COMPRESSION_DESC= Optional page compression +ENGINES_DESC= Optional MariaDB storage engines +GROONGA_DESC= Optional Mroonga features +INNOBASE_DESC= InnoDB default engine +MROONGA_DESC= Mroonga Full Text Search engine +MSGPACK_DESC= MsgPack support +OQGRAPH_DESC= Open Query Graph Computation engine +ROCKSDB_DESC= RocksDB LSM engine (Alpha) +SPHINX_DESC= SphinxSE engine +SPIDER_DESC= Partitioning and XA-transactions engine +TOKUDB_DESC= Fractal tree index tree data structure engine +WSREP_DESC= Build wsrep clustering +ZMQ_DESC= ZeroMQ support +ZSTD_DESC+= Zstandard compression support (RocksDB only) +.endif + +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" \ + -DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \ + -DWITH_SSL="${OPENSSLBASE}" \ + -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \ + -DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \ + -DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \ + -DKRB5_CONFIG="${KRB5CONFIG}" \ + -DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \ + -DCOMPILATION_COMMENT="FreeBSD Ports" \ + -DCMAKE_PREFIX_PATH=${PREFIX} \ + -DPLUGIN_AUTH_TEST_PLUGIN=NO +CMAKE_OFF+= CONC_WITH_UNIT_TESTS CONNECT_WITH_MONGO WITH_UNIT_TESTS +CMAKE_ON+= WITH_LIBWRAP WITHOUT_DOCS +DISABLED_PLUGINS+= DAEMON_EXAMPLE DIALOG_EXAMPLES EXAMPLE \ + EXAMPLE_KEY_MANAGEMENT FTEXAMPLE + +DATADIR= ${PREFIX}/share/mysql + +CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ + mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ + mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ + mysqlwsrep* \ + percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* + +FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES +GSSAPI_BASE_USES= gssapi +GSSAPI_HEIMDAL_USES= gssapi:heimdal +GSSAPI_MIT_USES= gssapi:mit +GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF +OPTIONS_SUB= yes + +.if ${PKGNAMESUFFIX:M*-client} +# MySQL-Client part +CMAKE_ON+= CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER +CMAKE_OFF+= WITH_WSREP +USES+= readline +USE_LDCONFIG= ${PREFIX}/lib/mysql +.else # ! ${PKGNAMESUFFIX:M*-client} +# MySQL-Server part +USES+= mysql:104m +USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin +USE_RC_SUBR= mysql-server +USERS= mysql +GROUPS= mysql +CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER +CMAKE_OFF+= WITH_CLIENT + +.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE} +${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO +${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC +.endfor +INNOBASE_VARS_OFF= disabled_plugins+=INNOBASE + +CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC +CONNECT_EXTRA_USE= gnome=libxml2 +CONNECT_EXTRA_USES= gnome +CONNECT_EXTRA_CMAKE_BOOL= CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC +GSSAPI_NONE_VARS= disabled_plugins+=AUTH_GSSAPI +LZ4_CMAKE_BOOL= GRN_WITH_LZ4 WITH_INNODB_LZ4 WITH_ROCKSDB_LZ4 +LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 +LZO_CMAKE_BOOL= WITH_INNODB_LZO +LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 +MROONGA_IMPLIES= LZ4 +MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack +OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ + libJudy.so:devel/judy +ROCKSDB_USES= python +SNAPPY_CMAKE_BOOL= WITH_INNODB_SNAPPY WITH_ROCKSDB_snappy +SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy +TOKUDB_IMPLIES= SNAPPY +TOKUDB_PORTDOCS= README.md +TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi +WSREP_CMAKE_BOOL= WITH_WSREP +ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 +ZSTD_CMAKE_BOOL= WITH_ROCKSDB_ZSTD +ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd + +.include + +.for PLUGIN in ${DISABLED_PLUGINS} +CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO +.endfor + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 +SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" +.else +SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " +.endif + +.endif # ${PKGNAMESUFFIX:M*-client} + +.if defined(WITH_OPENSSL_PORT) +GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system +.endif + +.include + +.if ${ARCH} != amd64 +PLIST_SUB+= WSREP="@comment " +.endif + +.if ${OPSYS} == DragonFly +CMAKE_OFF+= WITH_TOKUDB +.endif + +post-patch: + ${REINPLACE_CMD} 's|/usr/bin/env python|${PYTHON_CMD}|' ${WRKSRC}/CMakeLists.txt + ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c + ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh \ + ${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake +.if ${OPSYS} == DragonFly + ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ + ${WRKSRC}/cmake/os/DragonFly.cmake +.endif + +post-configure: + ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ + -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \ + ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c + +# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072 +post-configure-INNOBASE-on: + ${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \ + -e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \ + -e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \ + -e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \ + ${WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt + +.if ${PKGNAMESUFFIX:M*-client} +post-install: + ${RM} -r ${STAGEDIR}${DATADIR} + ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server + +post-install-GSSAPI_NONE: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so + +.else # ! ${PKGNAMESUFFIX:M*-client} +post-install: + ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy + ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private +.endif # ${PKGNAMESUFFIX:M*-client} + +.include Property changes on: head/databases/mariadb104-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/mariadb104-server/distinfo =================================================================== --- head/databases/mariadb104-server/distinfo (nonexistent) +++ head/databases/mariadb104-server/distinfo (revision 505443) @@ -0,0 +1,3 @@ +TIMESTAMP = 1561918517 +SHA256 (mariadb-10.4.6.tar.gz) = a270fe6169a1aaf6f2cbbc945de2c954d818c48e1a0fc02fbed92ecb94678e70 +SIZE (mariadb-10.4.6.tar.gz) = 76710358 Property changes on: head/databases/mariadb104-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/mariadb104-server/files/patch-MDEV-11790 =================================================================== --- head/databases/mariadb104-server/files/patch-MDEV-11790 (nonexistent) +++ head/databases/mariadb104-server/files/patch-MDEV-11790 (revision 505443) @@ -0,0 +1,46 @@ +WITHOUT_SERVER installs server-only files + +https://jira.mariadb.org/browse/MDEV-11790 +--- extra/CMakeLists.txt.orig 2018-10-02 09:45:40 UTC ++++ extra/CMakeLists.txt +@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) + ADD_DEPENDENCIES(innochecksum GenError) + ENDIF() + +-MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) ++MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client) + TARGET_LINK_LIBRARIES(replace mysys) + + IF(UNIX) +--- scripts/CMakeLists.txt.orig 2018-10-02 09:45:42 UTC ++++ scripts/CMakeLists.txt +@@ -241,7 +241,10 @@ ENDIF() + SET(mysql_config_COMPONENT COMPONENT Development) + SET(msql2mysql_COMPONENT COMPONENT Client) + SET(mysqlaccess_COMPONENT COMPONENT Client) ++SET(mysqlhotcopy_COMPONENT COMPONENT Client) ++SET(mysql_convert_table_format_COMPONENT COMPONENT Client) + SET(mysql_find_rows_COMPONENT COMPONENT Client) ++SET(mysql_setpermission_COMPONENT COMPONENT Client) + SET(mytop_COMPONENT Mytop) + + IF(WIN32) +@@ -298,14 +301,14 @@ ELSE() + # On Unix, most of the files end up in the bin directory + SET(BIN_SCRIPTS + msql2mysql +- mysql_config +- mysql_setpermission +- mysql_secure_installation + mysqlaccess ++ mysqlhotcopy ++ mysql_config + mysql_convert_table_format + mysql_find_rows ++ mysql_secure_installation ++ mysql_setpermission + mytop +- mysqlhotcopy + ${SERVER_SCRIPTS} + ${WSREP_SCRIPTS} + ${SYSTEMD_SCRIPTS} Property changes on: head/databases/mariadb104-server/files/patch-MDEV-11790 ___________________________________________________________________ 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/mariadb104-server/files/mysql-server.in =================================================================== --- head/databases/mariadb104-server/files/mysql-server.in (nonexistent) +++ head/databases/mariadb104-server/files/mysql-server.in (revision 505443) @@ -0,0 +1,140 @@ +#!/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. +%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool): Set to "NO" by default. +%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql` +%%LEGACY_LIMITS%%# 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"} +%%LEGACY_LIMITS%%: ${mysql_limits="NO"} +: ${mysql_user="mysql"} +%%LEGACY_LIMITS%%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}\"}" + %%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" + eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}" + %%LEGACY_LIMITS%%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 +%%LEGACY_LIMITS%% if checkyesno mysql_limits; then +%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null +%%LEGACY_LIMITS%% else +%%LEGACY_LIMITS%% return 0 +%%LEGACY_LIMITS%% fi +%%MODERN_LIMITS%% return 0 +} + +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/mariadb104-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/mariadb104-server/files/patch-MDEV-15961 =================================================================== --- head/databases/mariadb104-server/files/patch-MDEV-15961 (nonexistent) +++ head/databases/mariadb104-server/files/patch-MDEV-15961 (revision 505443) @@ -0,0 +1,50 @@ +MDEV-15961: Fix stacktraces under FreeBSD + +https://jira.mariadb.org/browse/MDEV-15961 +--- mysys/stacktrace.c.orig 2018-07-02 07:34:11 UTC ++++ mysys/stacktrace.c +@@ -34,19 +34,19 @@ + #include + #endif + ++#ifdef __linux__ + #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end) +- + static char *heap_start; +- +-#if(defined HAVE_BSS_START) && !(defined __linux__) + extern char *__bss_start; +-#endif ++#else ++#define PTR_SANE(p) (p) ++#endif /* __linux */ + + void my_init_stacktrace() + { +-#if(defined HAVE_BSS_START) && !(defined __linux__) ++#ifdef __linux__ + heap_start = (char*) &__bss_start; +-#endif ++#endif /* __linux__ */ + } + + #ifdef __linux__ +@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad + + int my_safe_print_str(const char* val, size_t max_len) + { ++#ifdef __linux__ ++/* Only needed by the linux version of PTR_SANE */ + char *heap_end; + +-#ifdef __linux__ + // Try and make use of /proc filesystem to safely print memory contents. + if (!safe_print_str(val, max_len)) + return 0; +-#endif + + heap_end= (char*) sbrk(0); ++#endif + + if (!PTR_SANE(val)) + { Property changes on: head/databases/mariadb104-server/files/patch-MDEV-15961 ___________________________________________________________________ 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/mariadb104-server/files/patch-storage_rocksdb_build__rocksdb.cmake =================================================================== --- head/databases/mariadb104-server/files/patch-storage_rocksdb_build__rocksdb.cmake (nonexistent) +++ head/databases/mariadb104-server/files/patch-storage_rocksdb_build__rocksdb.cmake (revision 505443) @@ -0,0 +1,13 @@ +--- storage/rocksdb/build_rocksdb.cmake.orig 2018-10-02 09:45:43 UTC ++++ storage/rocksdb/build_rocksdb.cmake +@@ -69,10 +69,6 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD + SET(CMAKE_REQUIRED_LIBRARIES zstd) + CHECK_FUNCTION_EXISTS(ZDICT_trainFromBuffer ZSTD_VALID) + UNSET(CMAKE_REQUIRED_LIBRARIES) +- if (WITH_ROCKSDB_ZSTD STREQUAL "ON" AND NOT ZSTD_VALID) +- MESSAGE(FATAL_ERROR +- "WITH_ROCKSDB_ZSTD is ON and ZSTD library was found, but the version needs to be >= 1.1.3") +- endif() + if (ZSTD_VALID) + add_definitions(-DZSTD) + include_directories(${ZSTD_INCLUDE_DIR}) Property changes on: head/databases/mariadb104-server/files/patch-storage_rocksdb_build__rocksdb.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/mariadb104-server/files/patch-mysys_my__default.c =================================================================== --- head/databases/mariadb104-server/files/patch-mysys_my__default.c (nonexistent) +++ head/databases/mariadb104-server/files/patch-mysys_my__default.c (revision 505443) @@ -0,0 +1,52 @@ +--- mysys/my_default.c.orig 2017-05-14 23:13:17 UTC ++++ mysys/my_default.c +@@ -785,7 +785,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 +@@ -803,6 +803,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 %%PREFIX%%%s\n", ++ name,name); ++ goto err; ++ } ++ + while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) + { + line++; +@@ -1067,7 +1075,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); + } + } + } +@@ -1192,13 +1201,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, "%%PREFIX%%/etc/", dirs); ++ errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs); + + #endif + Property changes on: head/databases/mariadb104-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/mariadb104-server/files/patch-scripts_mysql__config.sh =================================================================== --- head/databases/mariadb104-server/files/patch-scripts_mysql__config.sh (nonexistent) +++ head/databases/mariadb104-server/files/patch-scripts_mysql__config.sh (revision 505443) @@ -0,0 +1,12 @@ +--- scripts/mysql_config.sh.orig 2017-05-24 09:15:23 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/mariadb104-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/mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake =================================================================== --- head/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake (nonexistent) +++ head/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake (revision 505443) @@ -0,0 +1,39 @@ +Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports + +--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2017-05-14 23:13:20 UTC ++++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake +@@ -34,6 +34,13 @@ if (CMAKE_PROJECT_NAME STREQUAL TokuDB) + endif () + endif () + ++IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ include_directories("/usr/include") ++ ++ add_library(lzma SHARED IMPORTED) ++ set_target_properties(lzma PROPERTIES IMPORTED_LOCATION ++ "/usr/lib/liblzma.so") ++ELSE() + ## add lzma with an external project + set(xz_configure_opts --with-pic --enable-static) + if (APPLE) +@@ -105,8 +112,15 @@ add_library(lzma STATIC IMPORTED) + set_target_properties(lzma PROPERTIES IMPORTED_LOCATION + "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a") + add_dependencies(lzma build_lzma) ++ENDIF() + ++IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ include_directories("%%LOCALBASE%%/include") + ++ add_library(snappy SHARED IMPORTED) ++ set_target_properties(snappy PROPERTIES IMPORTED_LOCATION ++ "%%LOCALBASE%%/lib/libsnappy.so") ++ELSE() + ## add snappy with an external project + set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.") + if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt") +@@ -140,3 +154,4 @@ add_library(snappy STATIC IMPORTED) + set_target_properties(snappy PROPERTIES IMPORTED_LOCATION + "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a") + add_dependencies(snappy build_snappy) ++ENDIF() Property changes on: head/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.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/mariadb104-server/files/patch-sql_mysqld.cc =================================================================== --- head/databases/mariadb104-server/files/patch-sql_mysqld.cc (nonexistent) +++ head/databases/mariadb104-server/files/patch-sql_mysqld.cc (revision 505443) @@ -0,0 +1,13 @@ +--- sql/mysqld.cc.orig 2017-05-14 23:13:18 UTC ++++ sql/mysqld.cc +@@ -4838,8 +4840,9 @@ static void init_ssl() + while ((err= ERR_get_error())) + sql_print_warning("SSL error: %s", ERR_error_string(err, NULL)); + } +- else ++ else { + ERR_remove_state(0); ++ } + } + else + { Property changes on: head/databases/mariadb104-server/files/patch-sql_mysqld.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/mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt =================================================================== --- head/databases/mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt (nonexistent) +++ head/databases/mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt (revision 505443) @@ -0,0 +1,31 @@ +--- libmariadb/plugins/auth/CMakeLists.txt.orig 2018-05-23 20:38:41 UTC ++++ libmariadb/plugins/auth/CMakeLists.txt +@@ -38,6 +38,7 @@ IF(GSSAPI_SOURCES) + LIBRARIES ${GSSAPI_LIBS}) + ENDIF() + ++IF(NOT WITHOUT_CLIENT) + IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${WITH_SSL} STREQUAL "SCHANNEL") + IF(WIN32) + SET(SHA256_LIBS crypt32) +@@ -51,6 +52,7 @@ IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${W + SOURCES ${AUTH_DIR}/sha256_pw.c + LIBRARIES ${SHA256_LIBS}) + ENDIF() ++ENDIF() + + # old_password plugin + REGISTER_PLUGIN(TARGET mysql_old_password +@@ -60,10 +62,11 @@ REGISTER_PLUGIN(TARGET mysql_old_passwor + SOURCES ${AUTH_DIR}/old_password.c) + + ++IF(NOT WITHOUT_CLIENT) + # Cleartext + REGISTER_PLUGIN(TARGET mysql_clear_password + TYPE MARIADB_CLIENT_PLUGIN_AUTH + CONFIGURATIONS DYNAMIC STATIC OFF + DEFAULT DYNAMIC + SOURCES ${AUTH_DIR}/mariadb_cleartext.c) +- ++ENDIF() Property changes on: head/databases/mariadb104-server/files/patch-libmariadb_plugins_auth_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/mariadb104-server/files/pkg-message.in =================================================================== --- head/databases/mariadb104-server/files/pkg-message.in (nonexistent) +++ head/databases/mariadb104-server/files/pkg-message.in (revision 505443) @@ -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/mariadb104-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/mariadb104-server/files/patch-oqgraph-MDEV-15291 =================================================================== --- head/databases/mariadb104-server/files/patch-oqgraph-MDEV-15291 (nonexistent) +++ head/databases/mariadb104-server/files/patch-oqgraph-MDEV-15291 (revision 505443) @@ -0,0 +1,40 @@ +--- storage/oqgraph/oqgraph_judy.cc.orig 2018-02-12 15:01:28 UTC ++++ storage/oqgraph/oqgraph_judy.cc +@@ -27,7 +27,7 @@ + /* + Currently the only active code that can return error is: + judy_bitset::reset()/J1U() +- judy_bitset::setbit()/J1S() ++ judy_bitset::jsetbit()/J1S() + + In most cases errors are either about wrong parameters passed to Judy + functions or internal structures corruption. These definitely deserve +@@ -60,7 +60,7 @@ bool open_query::judy_bitset::test(size_ + return rc == 1; + } + +-open_query::judy_bitset& open_query::judy_bitset::setbit(size_type n) ++open_query::judy_bitset& open_query::judy_bitset::jsetbit(size_type n) + { + int rc; + J1S(rc, array, n); +--- storage/oqgraph/oqgraph_judy.h.orig 2018-02-12 15:01:28 UTC ++++ storage/oqgraph/oqgraph_judy.h +@@ -63,7 +63,7 @@ namespace open_query + if (!val) + return reset(n); + else +- return setbit(n); ++ return jsetbit(n); + } + + judy_bitset& set(const judy_bitset& src); +@@ -115,7 +115,7 @@ namespace open_query + private: + mutable void* array; + +- judy_bitset& setbit(size_type n); ++ judy_bitset& jsetbit(size_type n); + }; + } + Property changes on: head/databases/mariadb104-server/files/patch-oqgraph-MDEV-15291 ___________________________________________________________________ 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/mariadb104-server/files/patch-pcre_CMakeLists.txt =================================================================== --- head/databases/mariadb104-server/files/patch-pcre_CMakeLists.txt (nonexistent) +++ head/databases/mariadb104-server/files/patch-pcre_CMakeLists.txt (revision 505443) @@ -0,0 +1,11 @@ +--- pcre/CMakeLists.txt.orig 2017-08-17 10:05:39 UTC ++++ pcre/CMakeLists.txt +@@ -510,6 +510,8 @@ IF(PCRE_SHOW_REPORT) + MESSAGE(STATUS "") + ENDIF(PCRE_SHOW_REPORT) + ++IF(FALSE) + INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development) ++ENDIF() + + # end CMakeLists.txt Property changes on: head/databases/mariadb104-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/mariadb104-server/files/patch-storage_tokudb_CMakeLists.txt =================================================================== --- head/databases/mariadb104-server/files/patch-storage_tokudb_CMakeLists.txt (nonexistent) +++ head/databases/mariadb104-server/files/patch-storage_tokudb_CMakeLists.txt (revision 505443) @@ -0,0 +1,9 @@ +--- storage/tokudb/CMakeLists.txt.orig 2017-09-25 08:33:26.000000000 +0200 ++++ storage/tokudb/CMakeLists.txt 2017-09-28 21:46:55.119327000 +0200 +@@ -108,6 +108,3 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA + + TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static + ${ZLIB_LIBRARY} ${LIBJEMALLOC} stdc++) +- +-SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin") +-SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin") Property changes on: head/databases/mariadb104-server/files/patch-storage_tokudb_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/mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt =================================================================== --- head/databases/mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt (nonexistent) +++ head/databases/mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt (revision 505443) @@ -0,0 +1,15 @@ +--- libmariadb/include/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC ++++ libmariadb/include/CMakeLists.txt +@@ -21,6 +21,7 @@ IF(WIN32) + SET(WIX_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES} ${MYSQL_ADDITIONAL_INCLUDES} PARENT_SCOPE) + ENDIF() + ++IF(NOT WITHOUT_CLIENT) + INSTALL(FILES + ${MARIADB_CLIENT_INCLUDES} + DESTINATION ${INSTALL_INCLUDEDIR} +@@ -33,3 +34,4 @@ INSTALL(FILES + ${MARIADB_ADDITIONAL_INCLUDES} + DESTINATION ${INSTALL_INCLUDEDIR}/mariadb + COMPONENT Development) ++ENDIF() Property changes on: head/databases/mariadb104-server/files/patch-libmariadb_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/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt =================================================================== --- head/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt (nonexistent) +++ head/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt (revision 505443) @@ -0,0 +1,14 @@ +--- libmariadb/libmariadb/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC ++++ libmariadb/libmariadb/CMakeLists.txt +@@ -401,9 +401,11 @@ SET_TARGET_PROPERTIES(libmariadb PROPERT + INSTALL(TARGETS mariadbclient + COMPONENT Development + DESTINATION ${INSTALL_LIBDIR}) ++IF(NOT WITHOUT_CLIENT) + INSTALL(TARGETS libmariadb + COMPONENT SharedLibraries + DESTINATION ${INSTALL_LIBDIR}) ++ENDIF() + + IF(WIN32) + # On Windows, install PDB Property changes on: head/databases/mariadb104-server/files/patch-libmariadb_libmariadb_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/mariadb104-server/files/patch-libservices_CMakeLists.txt =================================================================== --- head/databases/mariadb104-server/files/patch-libservices_CMakeLists.txt (nonexistent) +++ head/databases/mariadb104-server/files/patch-libservices_CMakeLists.txt (revision 505443) @@ -0,0 +1,11 @@ +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- libservices/CMakeLists.txt.orig 2017-05-14 23:13:16 UTC ++++ libservices/CMakeLists.txt +@@ -40,4 +40,6 @@ SET(MYSQLSERVICES_SOURCES + ) + + ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) ++IF(FALSE) + INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) ++ENDIF() Property changes on: head/databases/mariadb104-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/mariadb104-server/files/patch-man_CMakeLists.txt =================================================================== --- head/databases/mariadb104-server/files/patch-man_CMakeLists.txt (nonexistent) +++ head/databases/mariadb104-server/files/patch-man_CMakeLists.txt (revision 505443) @@ -0,0 +1,14 @@ +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- man/CMakeLists.txt.orig 2017-05-14 23:13:16 UTC ++++ man/CMakeLists.txt +@@ -38,7 +38,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/mariadb104-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/mariadb104-server/files/patch-scripts_mysqld__safe.sh =================================================================== --- head/databases/mariadb104-server/files/patch-scripts_mysqld__safe.sh (nonexistent) +++ head/databases/mariadb104-server/files/patch-scripts_mysqld__safe.sh (revision 505443) @@ -0,0 +1,16 @@ +--- scripts/mysqld_safe.sh.orig 2017-05-24 09:15:23 UTC ++++ scripts/mysqld_safe.sh +@@ -568,11 +568,11 @@ fi + + if test -z "$MYSQL_HOME" + then +- if test -r "$DATADIR/my.cnf" ++ if test -r "$DATADIR/etc/my.cnf" + then + log_error "WARNING: Found $DATADIR/my.cnf + The data directory is not a valid location for my.cnf, please move it to +-$MY_BASEDIR_VERSION/my.cnf" ++$MY_BASEDIR_VERSION/etc/my.cnf" + fi + MYSQL_HOME=$MY_BASEDIR_VERSION + fi Property changes on: head/databases/mariadb104-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/mariadb104-server/files/patch-storage_innobase_lz4.cmake =================================================================== --- head/databases/mariadb104-server/files/patch-storage_innobase_lz4.cmake (nonexistent) +++ head/databases/mariadb104-server/files/patch-storage_innobase_lz4.cmake (revision 505443) @@ -0,0 +1,36 @@ +--- storage/innobase/lz4.cmake.orig 2017-05-14 23:13:18 UTC ++++ storage/innobase/lz4.cmake +@@ -17,21 +17,29 @@ SET(WITH_INNODB_LZ4 AUTO CACHE STRING + + MACRO (MYSQL_CHECK_LZ4) + IF (WITH_INNODB_LZ4 STREQUAL "ON" OR WITH_INNODB_LZ4 STREQUAL "AUTO") +- CHECK_INCLUDE_FILES(lz4.h HAVE_LZ4_H) +- CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput "" HAVE_LZ4_SHARED_LIB) +- CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default "" HAVE_LZ4_COMPRESS_DEFAULT) ++ find_path(LZ4_INCLUDE_DIR NAMES lz4.h) ++ find_library(LZ4_LIBRARY NAMES lz4) ++ IF (LZ4_LIBRARY) ++ get_filename_component(LZ4_LIBDIR ${LZ4_LIBRARY} DIRECTORY) ++#MESSAGE(STATUS "LZ4_INCLUDE_DIR=${LZ4_INCLUDE_DIR} LZ4_LIBRARY=${LZ4_LIBRARY} LZ4_LIBDIR=${LZ4_LIBDIR}") ++ IF (LZ4_INCLUDE_DIR) ++ SET(HAVE_LZ4_H YES) ++ ENDIF() ++ CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput ${LZ4_LIBDIR} HAVE_LZ4_SHARED_LIB) ++ CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default ${LZ4_LIBDIR} HAVE_LZ4_COMPRESS_DEFAULT) + + IF (HAVE_LZ4_SHARED_LIB AND HAVE_LZ4_H) + ADD_DEFINITIONS(-DHAVE_LZ4=1) + IF (HAVE_LZ4_COMPRESS_DEFAULT) + ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1) + ENDIF() +- LINK_LIBRARIES(lz4) ++ LINK_LIBRARIES(innobase ${LZ4_LIBRARY}) + ELSE() + IF (WITH_INNODB_LZ4 STREQUAL "ON") + MESSAGE(FATAL_ERROR "Required lz4 library is not found") + ENDIF() + ENDIF() ++ ENDIF() + ENDIF() + ENDMACRO() + Property changes on: head/databases/mariadb104-server/files/patch-storage_innobase_lz4.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/mariadb104-server/files/patch-storage_innobase_lzo.cmake =================================================================== --- head/databases/mariadb104-server/files/patch-storage_innobase_lzo.cmake (nonexistent) +++ head/databases/mariadb104-server/files/patch-storage_innobase_lzo.cmake (revision 505443) @@ -0,0 +1,38 @@ +--- storage/innobase/lzo.cmake.orig 2017-05-14 23:13:18 UTC ++++ storage/innobase/lzo.cmake +@@ -17,12 +17,10 @@ SET(WITH_INNODB_LZO AUTO CACHE STRING + + MACRO (MYSQL_CHECK_LZO_STATIC) + IF (WITH_INNODB_LZO STREQUAL "ON" OR WITH_INNODB_LZO STREQUAL "AUTO") +- CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H) +- CHECK_LIBRARY_EXISTS(liblzo2.a lzo1x_1_compress "" HAVE_LZO_LIB) +- ++ CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress "${LZO_LIBDIR}" HAVE_LZO_LIB) + IF(HAVE_LZO_LIB AND HAVE_LZO_H) + ADD_DEFINITIONS(-DHAVE_LZO=1) +- LINK_LIBRARIES(liblzo2.a) ++ LINK_LIBRARIES(lzo2) + ELSE() + IF (WITH_INNODB_LZO STREQUAL "ON") + MESSAGE(FATAL_ERROR "Required lzo library is not found") +@@ -33,12 +31,16 @@ ENDMACRO() + + MACRO (MYSQL_CHECK_LZO) + IF (WITH_INNODB_LZO STREQUAL "ON" OR WITH_INNODB_LZO STREQUAL "AUTO") +- CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H) +- CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress "" HAVE_LZO_SHARED_LIB) +- ++ find_path(LZO_INCLUDE NAMES lzo/lzo1x.h) ++ find_library(LZO_LIBRARY NAMES lzo2) ++ get_filename_component(LZO_LIBDIR ${LZO_LIBRARY} DIRECTORY) ++ IF (LZO_INCLUDE) ++ SET(HAVE_LZO_H 1) ++ ENDIF() ++ CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress ${LZO_LIBDIR} HAVE_LZO_SHARED_LIB) + IF(HAVE_LZO_SHARED_LIB AND HAVE_LZO_H) + ADD_DEFINITIONS(-DHAVE_LZO=1) +- LINK_LIBRARIES(lzo2) ++ LINK_LIBRARIES(${LZO_LIBRARY}) + ELSE() + IF (WITH_INNODB_LZO STREQUAL "ON") + MESSAGE(FATAL_ERROR "Required lzo library is not found") Property changes on: head/databases/mariadb104-server/files/patch-storage_innobase_lzo.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/mariadb104-server/files/patch-storage_innobase_snappy.cmake =================================================================== --- head/databases/mariadb104-server/files/patch-storage_innobase_snappy.cmake (nonexistent) +++ head/databases/mariadb104-server/files/patch-storage_innobase_snappy.cmake (revision 505443) @@ -0,0 +1,24 @@ +--- storage/innobase/snappy.cmake.orig 2017-05-14 23:13:18 UTC ++++ storage/innobase/snappy.cmake +@@ -17,12 +17,17 @@ SET(WITH_INNODB_SNAPPY AUTO CACHE STRING + + MACRO (MYSQL_CHECK_SNAPPY) + IF (WITH_INNODB_SNAPPY STREQUAL "ON" OR WITH_INNODB_SNAPPY STREQUAL "AUTO") +- CHECK_INCLUDE_FILES(snappy-c.h HAVE_SNAPPY_H) +- CHECK_LIBRARY_EXISTS(snappy snappy_uncompress "" HAVE_SNAPPY_SHARED_LIB) +- ++ find_path(SNAPPY_INCLUDE_DIR NAMES snappy-c.h) ++ find_library(SNAPPY_LIBRARY NAMES snappy) ++ get_filename_component(SNAPPY_LIBDIR ${SNAPPY_LIBRARY} DIRECTORY) ++ IF (SNAPPY_INCLUDE_DIR) ++ SET(HAVE_SNAPPY_H 1) ++ ENDIF() ++ CHECK_LIBRARY_EXISTS(snappy snappy_uncompress ${SNAPPY_LIBDIR} HAVE_SNAPPY_SHARED_LIB) ++MESSAGE(STATUS "HAVE_SNAPPY_H=${HAVE_SNAPPY_H} HAVE_SNAPPY_SHARED_LIB=${HAVE_SNAPPY_SHARED_LIB} SNAPPY_LIBDIR=${SNAPPY_LIBDIR} ") + IF(HAVE_SNAPPY_SHARED_LIB AND HAVE_SNAPPY_H) + ADD_DEFINITIONS(-DHAVE_SNAPPY=1) +- LINK_LIBRARIES(snappy) ++ LINK_LIBRARIES(${SNAPPY_LIBRARY}) + ELSE() + IF (WITH_INNODB_SNAPPY STREQUAL "ON") + MESSAGE(FATAL_ERROR "Required snappy library is not found") Property changes on: head/databases/mariadb104-server/files/patch-storage_innobase_snappy.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/mariadb104-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt =================================================================== --- head/databases/mariadb104-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt (nonexistent) +++ head/databases/mariadb104-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt (revision 505443) @@ -0,0 +1,15 @@ +From https://github.com/openquery/mariadb-server/commit/43bf72e45b9ead6aa0dc4abd6e5719c6381974b5 + +--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig 2017-05-14 23:13:18 UTC ++++ storage/mroonga/vendor/groonga/CMakeLists.txt +@@ -167,6 +167,10 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COM + MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-clobbered") + endif() + ++if(CMAKE_COMPILER_IS_CLANGCXX) ++ MY_CHECK_AND_SET_COMPILER_FLAG("-fexceptions") ++endif() ++ + if(NOT DEFINED CMAKE_C_COMPILE_OPTIONS_PIC) + # For old CMake + if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGCXX) Property changes on: head/databases/mariadb104-server/files/patch-storage_mroonga_vendor_groonga_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/mariadb104-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt =================================================================== --- head/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt (nonexistent) +++ head/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt (revision 505443) @@ -0,0 +1,11 @@ +--- storage/tokudb/PerconaFT/CMakeLists.txt.orig 2017-05-14 23:13:20 UTC ++++ storage/tokudb/PerconaFT/CMakeLists.txt +@@ -80,7 +80,7 @@ add_subdirectory(src) + add_subdirectory(ftcxx) + add_subdirectory(tools) + +-INSTALL_DOCUMENTATION(README.md COPYING.AGPLv3 COPYING.GPLv2 PATENTS ++INSTALL_DOCUMENTATION(README.md + COMPONENT Server) + + ## build tags Property changes on: head/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_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/mariadb104-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc =================================================================== --- head/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc (nonexistent) +++ head/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc (revision 505443) @@ -0,0 +1,16 @@ +Fix build error + +--- storage/tokudb/PerconaFT/portability/memory.cc.orig 2017-05-14 23:13:21 UTC ++++ storage/tokudb/PerconaFT/portability/memory.cc +@@ -42,11 +42,6 @@ Copyright (c) 2006, 2015, Percona and/or + #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/mariadb104-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/mariadb104-server/files/patch-support-files_CMakeLists.txt =================================================================== --- head/databases/mariadb104-server/files/patch-support-files_CMakeLists.txt (nonexistent) +++ head/databases/mariadb104-server/files/patch-support-files_CMakeLists.txt (revision 505443) @@ -0,0 +1,14 @@ +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- support-files/CMakeLists.txt.orig 2017-05-14 23:13:28 UTC ++++ support-files/CMakeLists.txt +@@ -83,7 +83,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 ${INSTALL_BINDIRABS}) + SET(sbindir ${INSTALL_SBINDIRABS}) Property changes on: head/databases/mariadb104-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/mariadb104-server/pkg-plist =================================================================== --- head/databases/mariadb104-server/pkg-plist (nonexistent) +++ head/databases/mariadb104-server/pkg-plist (revision 505443) @@ -0,0 +1,420 @@ +bin/aria_chk +bin/aria_dump_log +bin/aria_ftdump +bin/aria_pack +bin/aria_read_log +%%INNOBASE%%bin/innochecksum +%%INNOBASE%%bin/mariabackup +bin/mariadb-backup +bin/mariadb-dumpslow +bin/mariadb-embedded +bin/mariadb-fix-extensions +bin/mariadb-install-db +%%ROCKSDB%%bin/mariadb-ldb +bin/mariadb-secure-installation +bin/mariadb-tzinfo-to-sql +bin/mariadb-upgrade +bin/mariadbd-multi +bin/mariadbd-safe +bin/mariadbd-safe-helper +bin/mariadb-waitpid +%%INNOBASE%%bin/mbstream +bin/my_print_defaults +bin/myisam_ftdump +bin/myisamchk +bin/myisamlog +bin/myisampack +%%ROCKSDB%%bin/myrocks_hotbackup +bin/mysql_client_test +bin/mysql_client_test_embedded +bin/mysql_embedded +bin/mysql_fix_extensions +bin/mysql_install_db +%%ROCKSDB%%bin/mysql_ldb +bin/mysql_plugin +bin/mysql_secure_installation +bin/mysql_tzinfo_to_sql +bin/mysql_upgrade +bin/mysql_waitpid +bin/mysqld_multi +bin/mysqld_safe +bin/mysqld_safe_helper +bin/mysqldumpslow +@comment bin/mysqltest_embedded +bin/perror +bin/resolve_stack_dump +bin/resolveip +%%ROCKSDB%%bin/sst_dump +@comment bin/test-connect-t +%%TOKUDB%%bin/tokuft_logprint +%%TOKUDB%%bin/tokuftdump +%%WSREP%%bin/wsrep_sst_common +%%WSREP%%bin/wsrep_sst_mariabackup +%%WSREP%%bin/wsrep_sst_mysqldump +%%WSREP%%bin/wsrep_sst_rsync +%%WSREP%%bin/wsrep_sst_rsync_wan +@comment data/test/db.opt +include/mysql/server/big_endian.h +include/mysql/server/byte_order_generic.h +include/mysql/server/byte_order_generic_x86.h +include/mysql/server/byte_order_generic_x86_64.h +include/mysql/server/decimal.h +include/mysql/server/errmsg.h +include/mysql/server/handler_ername.h +include/mysql/server/handler_state.h +include/mysql/server/json_lib.h +include/mysql/server/keycache.h +include/mysql/server/little_endian.h +include/mysql/server/m_ctype.h +include/mysql/server/m_string.h +include/mysql/server/ma_dyncol.h +include/mysql/server/my_alloc.h +include/mysql/server/my_attribute.h +include/mysql/server/my_byteorder.h +include/mysql/server/my_compiler.h +include/mysql/server/my_config.h +include/mysql/server/my_dbug.h +include/mysql/server/my_decimal_limits.h +include/mysql/server/my_dir.h +include/mysql/server/my_getopt.h +include/mysql/server/my_global.h +include/mysql/server/my_list.h +include/mysql/server/my_net.h +include/mysql/server/my_pthread.h +include/mysql/server/my_sys.h +include/mysql/server/my_valgrind.h +include/mysql/server/my_xml.h +include/mysql/server/mysql.h +include/mysql/server/mysql/auth_dialog_client.h +include/mysql/server/mysql/client_plugin.h +include/mysql/server/mysql/plugin.h +include/mysql/server/mysql/plugin_audit.h +include/mysql/server/mysql/plugin_auth.h +include/mysql/server/mysql/plugin_auth_common.h +include/mysql/server/mysql/plugin_encryption.h +include/mysql/server/mysql/plugin_ftparser.h +include/mysql/server/mysql/plugin_password_validation.h +include/mysql/server/mysql/psi/mysql_file.h +include/mysql/server/mysql/psi/mysql_idle.h +include/mysql/server/mysql/psi/mysql_socket.h +include/mysql/server/mysql/psi/mysql_stage.h +include/mysql/server/mysql/psi/mysql_statement.h +include/mysql/server/mysql/psi/mysql_table.h +include/mysql/server/mysql/psi/mysql_thread.h +include/mysql/server/mysql/psi/psi.h +include/mysql/server/mysql/psi/psi_abi_v0.h +include/mysql/server/mysql/psi/psi_abi_v1.h +include/mysql/server/mysql/psi/psi_abi_v2.h +include/mysql/server/mysql/psi/psi_base.h +include/mysql/server/mysql/psi/psi_memory.h +include/mysql/server/mysql/service_base64.h +include/mysql/server/mysql/service_debug_sync.h +include/mysql/server/mysql/service_encryption.h +include/mysql/server/mysql/service_encryption_scheme.h +include/mysql/server/mysql/service_json.h +include/mysql/server/mysql/service_kill_statement.h +include/mysql/server/mysql/service_logger.h +include/mysql/server/mysql/service_md5.h +include/mysql/server/mysql/service_my_crypt.h +include/mysql/server/mysql/service_my_print_error.h +include/mysql/server/mysql/service_my_snprintf.h +include/mysql/server/mysql/service_progress_report.h +include/mysql/server/mysql/service_sha1.h +include/mysql/server/mysql/service_sha2.h +include/mysql/server/mysql/service_thd_alloc.h +include/mysql/server/mysql/service_thd_autoinc.h +include/mysql/server/mysql/service_thd_error_context.h +include/mysql/server/mysql/service_thd_rnd.h +include/mysql/server/mysql/service_thd_specifics.h +include/mysql/server/mysql/service_thd_timezone.h +include/mysql/server/mysql/service_thd_wait.h +include/mysql/server/mysql/service_wsrep.h +include/mysql/server/mysql/services.h +include/mysql/server/mysql_com.h +include/mysql/server/mysql_com_server.h +include/mysql/server/mysql_embed.h +include/mysql/server/mysql_time.h +include/mysql/server/mysql_version.h +include/mysql/server/mysqld_ername.h +include/mysql/server/mysqld_error.h +include/mysql/server/pack.h +include/mysql/server/sql_common.h +include/mysql/server/sql_state.h +include/mysql/server/sslopt-case.h +include/mysql/server/sslopt-longopts.h +include/mysql/server/sslopt-vars.h +include/mysql/server/typelib.h +@comment lib/mysql/libmariadbclient.a +lib/mysql/libmariadbd.a +lib/mysql/libmariadbd.so +lib/mysql/libmariadbd.so.19 +lib/mysql/libmysqld.a +lib/mysql/libmysqld.so +lib/mysql/plugin/adt_null.so +lib/mysql/plugin/auth_0x0100.so +lib/mysql/plugin/auth_ed25519.so +%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so +lib/mysql/plugin/auth_pam.so +lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool +lib/mysql/plugin/auth_pam_v1.so +lib/mysql/plugin/caching_sha2_password.so +lib/mysql/plugin/debug_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 +%%MROONGA%%lib/mysql/plugin/ha_mroonga.so +%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so +%%ROCKSDB%%lib/mysql/plugin/ha_rocksdb.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/locales.so +lib/mysql/plugin/metadata_lock_info.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/server_audit.so +lib/mysql/plugin/simple_password_check.so +lib/mysql/plugin/sql_errlog.so +lib/mysql/plugin/test_versioning.so +%%WSREP%%lib/mysql/plugin/wsrep_info.so +libexec/mariadbd +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/galera_new_cluster.1.gz +man/man1/galera_recovery.1.gz +man/man1/innochecksum.1.gz +man/man1/mariabackup.1.gz +man/man1/mariadb-backup.1.gz +man/man1/mariadb-dumpslow.1.gz +man/man1/mariadb-embedded.1.gz +man/man1/mariadb-fix-extensions.1.gz +man/man1/mariadb-install-db.1.gz +%%ROCKSDB%%man/man1/mariadb-ldb.1.gz +man/man1/mariadb-secure-installation.1.gz +@comment man/man1/mariadb-service-convert.1.gz +man/man1/mariadb-tzinfo-to-sql.1.gz +man/man1/mariadb-upgrade.1.gz +man/man1/mariadbd-multi.1.gz +man/man1/mariadbd-safe-helper.1.gz +man/man1/mariadbd-safe.1.gz +man/man1/mbstream.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_fix_extensions.1.gz +%%ROCKSDB%%man/man1/mysql_ldb.1.gz +man/man1/mysql_install_db.1.gz +man/man1/mysql_secure_installation.1.gz +man/man1/mysql_tzinfo_to_sql.1.gz +man/man1/mysql_upgrade.1.gz +man/man1/mysqld_multi.1.gz +man/man1/mysqld_safe.1.gz +man/man1/mysqld_safe_helper.1.gz +man/man1/mysqldumpslow.1.gz +man/man1/perror.1.gz +man/man1/resolve_stack_dump.1.gz +man/man1/resolveip.1.gz +%%TOKUDB%%man/man1/tokuft_logprint.1.gz +%%TOKUDB%%man/man1/tokuftdump.1.gz +%%WSREP%%man/man1/wsrep_sst_common.1.gz +%%WSREP%%man/man1/wsrep_sst_mariabackup.1.gz +%%WSREP%%man/man1/wsrep_sst_mysqldump.1.gz +%%WSREP%%man/man1/wsrep_sst_rsync.1.gz +%%WSREP%%man/man1/wsrep_sst_rsync_wan.1.gz +man/man8/mariadbd.8.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%%/hindi/errmsg.sys +%%DATADIR%%/hungarian/errmsg.sys +%%SPIDER%%%%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/AUTHORS +%%MROONGA%%%%DATADIR%%/mroonga/install.sql +%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql +%%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%%/mysql_test_db.sql +%%DATADIR%%/mysql_to_mariadb.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 +%%WSREP%%%%DATADIR%%/wsrep.cnf +%%WSREP%%%%DATADIR%%/wsrep_notify +%%DOCSDIR%%/CREDITS +@comment %%DOCSDIR%%/COPYING +%%DOCSDIR%%/EXCEPTIONS-CLIENT +%%DOCSDIR%%/INSTALL-BINARY +%%WSREP%%%%DOCSDIR%%/README-wsrep +%%DOCSDIR%%/README.md +@comment %%DOCSDIR%%/THIRDPARTY +@comment share/groonga-normalizer-mysql/lgpl-2.0.txt +@comment share/groonga/COPYING +@comment share/mysql/mroonga/COPYING +%%MROONGA%%share/groonga-normalizer-mysql/README.md +%%MROONGA%%share/groonga/README.md +@comment bin/mariadb +@comment bin/mariadb-access +@comment bin/mariadb-admin +@comment bin/mariadb-binlog +@comment bin/mariadb-check +@comment bin/mariadb-client-test +@comment bin/mariadb-client-test-embedded +@comment bin/mariadb-convert-table-format +@comment bin/mariadb-dump +@comment bin/mariadb-find-rows +@comment bin/mariadb-hotcopy +@comment bin/mariadb-import +@comment bin/mariadb-plugin +@comment bin/mariadb-setpermission +@comment bin/mariadb-show +@comment bin/mariadb-slap +@comment bin/mariadb-test +@comment bin/mariadb-test-embedded +@comment bin/mariadb_config +@comment bin/msql2mysql +@comment bin/mysql +@comment bin/mysql_config +@comment bin/mysql_convert_table_format +@comment bin/mysql_find_rows +@comment bin/mysql_setpermission +@comment bin/mysqlaccess +@comment bin/mysqladmin +@comment bin/mysqlbinlog +@comment bin/mysqlcheck +@comment bin/mysqldump +@comment bin/mysqlhotcopy +@comment bin/mysqlimport +@comment bin/mysqlshow +@comment bin/mysqlslap +@comment bin/mysqltest +@comment bin/mytop +@comment bin/replace +@comment include/mysql/errmsg.h +@comment include/mysql/ma_list.h +@comment include/mysql/ma_pvio.h +@comment include/mysql/ma_tls.h +@comment include/mysql/mariadb/ma_io.h +@comment include/mysql/mariadb_com.h +@comment include/mysql/mariadb_ctype.h +@comment include/mysql/mariadb_dyncol.h +@comment include/mysql/mariadb_rpl.h +@comment include/mysql/mariadb_stmt.h +@comment include/mysql/mariadb_version.h +@comment include/mysql/my_config.h +@comment include/mysql/my_global.h +@comment include/mysql/my_sys.h +@comment include/mysql/mysql.h +@comment include/mysql/mysql/client_plugin.h +@comment include/mysql/mysql/plugin_auth.h +@comment include/mysql/mysql/plugin_auth_common.h +@comment include/mysql/mysql_com.h +@comment include/mysql/mysql_version.h +@comment include/mysql/mysqld_error.h +@comment lib/mysql/libmariadb.so +@comment lib/mysql/libmariadb.so.3 +@comment lib/mysql/libmariadbclient.a +@comment lib/mysql/libmysqlclient.a +@comment lib/mysql/libmysqlclient.so +@comment lib/mysql/libmysqlclient_r.a +@comment lib/mysql/libmysqlclient_r.so +@comment lib/mysql/plugin/auth_gssapi_client.so +@comment lib/mysql/plugin/client_ed25519.so +@comment lib/mysql/plugin/daemon_example.ini +@comment lib/mysql/plugin/dialog.so +@comment lib/mysql/plugin/mysql_clear_password.so +@comment lib/mysql/plugin/sha256_password.so +@comment libdata/pkgconfig/libmariadb.pc +@comment man/man1/mysql_convert_table_format.1.gz +@comment man/man1/mariadb.1.gz +@comment man/man1/mariadb-access.1.gz +@comment man/man1/mariadb-admin.1.gz +@comment man/man1/mariadb-binlog.1.gz +@comment man/man1/mariadb-check.1.gz +@comment man/man1/mariadb-client-test-embedded.1.gz +@comment man/man1/mariadb-client-test.1.gz +@comment man/man1/mariadb-convert-table-format.1.gz +@comment man/man1/mariadb-dump.1.gz +@comment man/man1/mariadb-find-rows.1.gz +@comment man/man1/mariadb-hotcopy.1.gz +@comment man/man1/mariadb-import.1.gz +@comment man/man1/mariadb-plugin.1.gz +@comment man/man1/mariadb-setpermission.1.gz +@comment man/man1/mariadb-show.1.gz +@comment man/man1/mariadb-slap.1.gz +@comment man/man1/mariadb-test-embedded.1.gz +@comment man/man1/mariadb-test.1.gz +man/man1/mariadb-waitpid.1.gz +@comment man/man1/mysql_setpermission.1.gz +@comment man/man1/mysqlhotcopy.1.gz +@comment man/man1/mysqltest.1.gz +@comment man/man1/replace.1.gz +@comment share/pkgconfig/mariadb.pc Property changes on: head/databases/mariadb104-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/mariadb104-server/pkg-descr =================================================================== --- head/databases/mariadb104-server/pkg-descr (nonexistent) +++ head/databases/mariadb104-server/pkg-descr (revision 505443) @@ -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: https://mariadb.org/ Property changes on: head/databases/mariadb104-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