Index: Mk/Uses/mysql.mk =================================================================== --- Mk/Uses/mysql.mk (revision 430546) +++ Mk/Uses/mysql.mk (working copy) @@ -1,141 +1,142 @@ # $FreeBSD$ # # Provide support for MySQL # Feature: mysql # Usage: USES=mysql or USES=mysql:args # Valid ARGS: , client, server, embedded # # version If no version is given (by the maintainer via the port), try to # find the currently installed version. Fall back to default if # necessary (MySQL-5.6 = 56). # client Depends on the libmysqlclient library (default) # server/embedded # Depend on the server at run/build time. If none of these is # set, depends on the client. # # IGNORE_WITH_MYSQL # This variable can be defined if the ports does not support one # or more versions of MySQL. # WITH_MYSQL_VER # User defined variable to set MySQL version. # MYSQL_VER # Detected MySQL version. # # MAINTAINER: ports@FreeBSD.org .if !defined(_INCLUDE_USES_MYSQL_MK) _INCLUDE_USES_MYSQL_MK= yes .if !empty(mysql_ARGS) .undef _WANT_MYSQL_VER .undef _WANT_MYSQL_SERVER .undef _WANT_MYSQL_EMBEDDED _MYSQL_ARGS= ${mysql_ARGS:S/,/ /g} .if ${_MYSQL_ARGS:Mserver} _WANT_MYSQL_SERVER= yes _MYSQL_ARGS:= ${_MYSQL_ARGS:Nserver} .endif .if ${_MYSQL_ARGS:Membedded} _WANT_MYSQL_EMBEDDED= yes _MYSQL_ARGS:= ${_MYSQL_ARGS:Nembedded} .endif .if ${_MYSQL_ARGS:Mclient} _WANT_MYSQL_CLIENT= yes _MYSQL_ARGS:= ${_MYSQL_ARGS:Nclient} .endif # Port requested a version .if !empty(_MYSQL_ARGS) _WANT_MYSQL_VER= ${_MYSQL_ARGS} .endif .endif # !empty(mysql_ARGS) .if defined(DEFAULT_MYSQL_VER) WARNING+= "DEFAULT_MYSQL_VER is defined, consider using DEFAULT_VERSIONS=mysql=${DEFAULT_MYSQL_VER} instead" .endif DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//} # MySQL client version currently supported. # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. MYSQL51_LIBVER= 16 MYSQL55_LIBVER= 18 MYSQL55m_LIBVER= 18 MYSQL55p_LIBVER= 18 MYSQL56_LIBVER= 18 MYSQL56p_LIBVER= 18 MYSQL57_LIBVER= 20 +MYSQL80_LIBVER= 21 MYSQL100m_LIBVER= 18 MYSQL101m_LIBVER= 18 # Setting/finding MySQL version we want. .if exists(${LOCALBASE}/bin/mysql) _MYSQL!= ${LOCALBASE}/bin/mysql --version | ${SED} -e 's/.*Distrib \([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/' _PERCONA!= ${LOCALBASE}/bin/mysql --version | ${GREP} Percona | wc -l _MARIADB!= ${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB | wc -l .if ${_PERCONA} == 1 _MYSQL_VER= ${_MYSQL}p .elif ${_MARIADB} == 1 _MYSQL_VER= ${_MYSQL}m .else _MYSQL_VER= ${_MYSQL} .endif .endif .if defined(_WANT_MYSQL_VER) .if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${_WANT_MYSQL_VER} IGNORE= cannot install: the port wants mysql${_WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client .endif MYSQL_VER= ${_WANT_MYSQL_VER} .elif defined(WITH_MYSQL_VER) MYSQL_VER= ${WITH_MYSQL_VER} .else .if defined(_MYSQL_VER) MYSQL_VER= ${_MYSQL_VER} .else MYSQL_VER= ${DEFAULT_MYSQL_VER} .endif .endif # _WANT_MYSQL_VER .if defined(_MYSQL_VER) .if ${_MYSQL_VER} != ${MYSQL_VER} IGNORE= cannot install: MySQL versions mismatch: mysql${_MYSQL_VER}-client is installed and wanted version is mysql${MYSQL_VER}-client .endif .endif .if (${MYSQL_VER:C/[0-9]*//} == "m") _MYSQL_FLAVOUR= mariadb .elif (${MYSQL_VER:C/[0-9]*//} == "p") _MYSQL_FLAVOUR= percona .else _MYSQL_FLAVOUR= mysql .endif _MYSQL_CLIENT= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-client _MYSQL_SERVER= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-server # And now we are checking if we can use it .if defined(MYSQL${MYSQL_VER}_LIBVER) .if defined(IGNORE_WITH_MYSQL) . for VER in ${IGNORE_WITH_MYSQL} . if (${MYSQL_VER} == "${VER}") IGNORE= cannot install: does not work with MySQL version ${MYSQL_VER} (MySQL ${IGNORE_WITH_MYSQL} not supported) . endif . endfor .endif # IGNORE_WITH_MYSQL .if defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED) RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER} .if defined(_WANT_MYSQL_EMBEDDED) BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqld.a:${_MYSQL_SERVER} .endif .endif .if defined(_WANT_MYSQL_CLIENT) || \ !(defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED)) LIB_DEPENDS+= libmysqlclient.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT} .endif .else IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER} .endif # Check for correct libs .endif Index: databases/Makefile =================================================================== --- databases/Makefile (revision 430546) +++ databases/Makefile (working copy) @@ -1,990 +1,992 @@ # $FreeBSD$ # COMMENT = Databases and related software SUBDIR += R-cran-DBI SUBDIR += R-cran-RMySQL SUBDIR += R-cran-RSQLite SUBDIR += R-cran-RSQLite.extfuns SUBDIR += R-cran-sqldf SUBDIR += WWWdb SUBDIR += adabase SUBDIR += adminer SUBDIR += adodb SUBDIR += adodb5 SUBDIR += akonadi SUBDIR += akonadi-googledata SUBDIR += animenfo-client SUBDIR += animenfo-client-gtk SUBDIR += apq SUBDIR += apq-mysql SUBDIR += apq-odbc SUBDIR += apq-pgsql SUBDIR += ateam_mysql_ldap_auth SUBDIR += autobackupmysql SUBDIR += bbdb SUBDIR += beansdb SUBDIR += buzhug SUBDIR += c3p0 SUBDIR += cassandra-cpp-driver SUBDIR += cassandra2 SUBDIR += casstcl SUBDIR += cdb SUBDIR += cego SUBDIR += cegobridge SUBDIR += couchdb SUBDIR += courier-authlib-mysql SUBDIR += courier-authlib-pgsql SUBDIR += courier-authlib-userdb SUBDIR += courier-authlib-usergdbm SUBDIR += cppdb SUBDIR += credis SUBDIR += dalmp SUBDIR += datamodeler SUBDIR += db SUBDIR += db48 SUBDIR += db5 SUBDIR += db6 SUBDIR += dbconnect SUBDIR += dbf SUBDIR += dbf2mysql SUBDIR += dbh SUBDIR += dbow SUBDIR += dbtool SUBDIR += dbview SUBDIR += elixir-calecto SUBDIR += elixir-db_connection SUBDIR += elixir-ecto SUBDIR += elixir-ecto_migrate SUBDIR += elixir-exredis SUBDIR += elixir-geo SUBDIR += elixir-mariaex SUBDIR += elixir-mongo SUBDIR += elixir-postgrex SUBDIR += elixir-timex_ecto SUBDIR += emma SUBDIR += erlang-couchbeam SUBDIR += erlang-epgsql SUBDIR += erlang-eredis SUBDIR += evolution-data-server SUBDIR += fastdb SUBDIR += firebird25-client SUBDIR += firebird25-server SUBDIR += flamerobin SUBDIR += fortytwo-bdb SUBDIR += fpc-dblib SUBDIR += fpc-fpindexer SUBDIR += fpc-gdbm SUBDIR += fpc-ibase SUBDIR += fpc-mysql SUBDIR += fpc-odbc SUBDIR += fpc-oracle SUBDIR += fpc-postgres SUBDIR += fpc-pxlib SUBDIR += fpc-sqlite SUBDIR += freetds SUBDIR += freetds-devel SUBDIR += frontbase-jdbc SUBDIR += gadfly SUBDIR += galera SUBDIR += gdbm SUBDIR += geoserver-mysql-plugin SUBDIR += gigabase SUBDIR += glom SUBDIR += gnats4 SUBDIR += gnatsweb4 SUBDIR += godis SUBDIR += gomdb SUBDIR += gosqlite3 SUBDIR += gqlplus SUBDIR += grass SUBDIR += gtksql SUBDIR += hamsterdb SUBDIR += hashtypes SUBDIR += hbase SUBDIR += hiredis SUBDIR += hs-esqueleto SUBDIR += hs-hedis SUBDIR += hs-mysql SUBDIR += hs-persistent SUBDIR += hs-persistent-sqlite SUBDIR += hs-persistent-template SUBDIR += hsqldb SUBDIR += influxdb SUBDIR += innotop SUBDIR += ip4r SUBDIR += ipa_sdb SUBDIR += iplike SUBDIR += isql-viewer SUBDIR += jakarta-commons-dbutils SUBDIR += jasperreports SUBDIR += jdb SUBDIR += jdbc-oracle10g SUBDIR += jdbc-oracle11g SUBDIR += jdbc-oracle8i SUBDIR += jdbc-oracle9i SUBDIR += jdbm2 SUBDIR += jlog SUBDIR += jrobin SUBDIR += jrrd SUBDIR += kbibtex SUBDIR += kyotocabinet SUBDIR += kyototycoon SUBDIR += ldb SUBDIR += leo_center SUBDIR += leofs SUBDIR += leveldb SUBDIR += levigo SUBDIR += libcouchbase SUBDIR += libdbi SUBDIR += libdbi-drivers SUBDIR += libdrizzle SUBDIR += libdrizzle-redux SUBDIR += libgda4 SUBDIR += libgda4-bdb SUBDIR += libgda4-jdbc SUBDIR += libgda4-ldap SUBDIR += libgda4-mdb SUBDIR += libgda4-mysql SUBDIR += libgda4-postgresql SUBDIR += libgda4-reference SUBDIR += libgda5 SUBDIR += libgda5-bdb SUBDIR += libgda5-jdbc SUBDIR += libgda5-ldap SUBDIR += libgda5-mdb SUBDIR += libgda5-mysql SUBDIR += libgda5-postgresql SUBDIR += libgda5-ui SUBDIR += libgdamm SUBDIR += libgdamm5 SUBDIR += libhsclient SUBDIR += libiodbc SUBDIR += libmemcache SUBDIR += libmemcached SUBDIR += libmongo-client SUBDIR += libnvpair SUBDIR += libodbc++ SUBDIR += libpbl SUBDIR += libpqtypes SUBDIR += libsdb SUBDIR += libzbxpgsql SUBDIR += libzdb SUBDIR += linux-c6-sqlite3 SUBDIR += linux-c7-sqlite3 SUBDIR += linux-oracle-instantclient-basic SUBDIR += linux-oracle-instantclient-sdk SUBDIR += linux-oracle-instantclient-sqlplus SUBDIR += liquibase SUBDIR += lmdb SUBDIR += luadbi SUBDIR += luasql-firebird SUBDIR += luasql-mysql SUBDIR += luasql-odbc SUBDIR += luasql-postgres SUBDIR += luasql-sqlite3 SUBDIR += mantis SUBDIR += mariadb100-client SUBDIR += mariadb100-server SUBDIR += mariadb101-client SUBDIR += mariadb101-server SUBDIR += mariadb55-client SUBDIR += mariadb55-server SUBDIR += mdbtools SUBDIR += mdcached SUBDIR += memcached SUBDIR += memcacheq SUBDIR += metakit SUBDIR += monetdb SUBDIR += mongodb SUBDIR += mongodb32 SUBDIR += mongodb32-tools SUBDIR += mrtg-mysql-load SUBDIR += mtools-mongodb SUBDIR += mtop SUBDIR += mydbf2mysql SUBDIR += mydumper SUBDIR += mysac SUBDIR += mysql++1 SUBDIR += mysql++3 SUBDIR += mysql-connector-c SUBDIR += mysql-connector-c++ SUBDIR += mysql-connector-java SUBDIR += mysql-connector-odbc SUBDIR += mysql-proxy SUBDIR += mysql-q4m SUBDIR += mysql-udf SUBDIR += mysql2odbc SUBDIR += mysql2pgsql SUBDIR += mysql55-client SUBDIR += mysql55-server SUBDIR += mysql56-client SUBDIR += mysql56-server SUBDIR += mysql57-client SUBDIR += mysql57-server + SUBDIR += mysql80-client + SUBDIR += mysql80-server SUBDIR += mysqlbackup SUBDIR += mysqlbigram SUBDIR += mysqldump-secure SUBDIR += mysqldumper SUBDIR += mysqlidxchk SUBDIR += mysqlreport SUBDIR += mysqlsla SUBDIR += mysqlsniffer SUBDIR += mysqltcl SUBDIR += mysqltuner SUBDIR += mytop SUBDIR += nagios-check_mongodb SUBDIR += nagios-check_postgres_replication SUBDIR += nagios-check_redis SUBDIR += namazu2 SUBDIR += neo4j SUBDIR += ntdb SUBDIR += ocaml-dbm SUBDIR += ocaml-mysql SUBDIR += ocaml-sqlite3 SUBDIR += openark-kit SUBDIR += opendbx SUBDIR += opentsdb SUBDIR += oracle7-client SUBDIR += oracle8-client SUBDIR += p5-Amazon-SimpleDB SUBDIR += p5-Amon2-DBI SUBDIR += p5-AnyEvent-BDB SUBDIR += p5-AnyEvent-CouchDB SUBDIR += p5-AnyEvent-DBD-Pg SUBDIR += p5-AnyEvent-Memcached SUBDIR += p5-AnyEvent-Redis SUBDIR += p5-App-Sqitch SUBDIR += p5-AsciiDB-TagFile SUBDIR += p5-BDB SUBDIR += p5-BSON SUBDIR += p5-BerkeleyDB SUBDIR += p5-Bucardo SUBDIR += p5-CDB_File SUBDIR += p5-CDB_File-Generator SUBDIR += p5-CGI-Session-Driver-memcached SUBDIR += p5-Cache-BDB SUBDIR += p5-Cache-Memcached SUBDIR += p5-Cache-Memcached-Fast SUBDIR += p5-Cache-Memcached-Managed SUBDIR += p5-Cache-Memcached-XS SUBDIR += p5-Cache-Memcached-libmemcached SUBDIR += p5-Class-DBI SUBDIR += p5-Class-DBI-AbstractSearch SUBDIR += p5-Class-DBI-AsForm SUBDIR += p5-Class-DBI-AutoLoader SUBDIR += p5-Class-DBI-BaseDSN SUBDIR += p5-Class-DBI-DATA-Schema SUBDIR += p5-Class-DBI-DDL SUBDIR += p5-Class-DBI-FromCGI SUBDIR += p5-Class-DBI-LazyInflate SUBDIR += p5-Class-DBI-Loader SUBDIR += p5-Class-DBI-Loader-Relationship SUBDIR += p5-Class-DBI-Oracle SUBDIR += p5-Class-DBI-Pager SUBDIR += p5-Class-DBI-Pg SUBDIR += p5-Class-DBI-Plugin SUBDIR += p5-Class-DBI-Plugin-AbstractCount SUBDIR += p5-Class-DBI-Plugin-DeepAbstractSearch SUBDIR += p5-Class-DBI-Plugin-Iterator SUBDIR += p5-Class-DBI-Plugin-Pager SUBDIR += p5-Class-DBI-Plugin-RetrieveAll SUBDIR += p5-Class-DBI-Plugin-Senna SUBDIR += p5-Class-DBI-Plugin-Type SUBDIR += p5-Class-DBI-Replication SUBDIR += p5-Class-DBI-SAK SUBDIR += p5-Class-DBI-SQLite SUBDIR += p5-Class-DBI-Sweet SUBDIR += p5-Class-DBI-ToSax SUBDIR += p5-Class-DBI-Untaint SUBDIR += p5-Class-DBI-mysql SUBDIR += p5-Class-Inflate SUBDIR += p5-CouchDB-View SUBDIR += p5-DBD-AnyData SUBDIR += p5-DBD-CSV SUBDIR += p5-DBD-Excel SUBDIR += p5-DBD-Google SUBDIR += p5-DBD-InterBase SUBDIR += p5-DBD-LDAP SUBDIR += p5-DBD-Mock SUBDIR += p5-DBD-Multi SUBDIR += p5-DBD-ODBC SUBDIR += p5-DBD-Oracle SUBDIR += p5-DBD-Pg SUBDIR += p5-DBD-PgLite SUBDIR += p5-DBD-PgPP SUBDIR += p5-DBD-SQLite SUBDIR += p5-DBD-SQLite2 SUBDIR += p5-DBD-Sybase SUBDIR += p5-DBD-XBase SUBDIR += p5-DBD-cego SUBDIR += p5-DBD-mysql SUBDIR += p5-DBI SUBDIR += p5-DBI-Shell SUBDIR += p5-DBICx-Deploy SUBDIR += p5-DBICx-MapMaker SUBDIR += p5-DBICx-Sugar SUBDIR += p5-DBICx-TestDatabase SUBDIR += p5-DBICx-TxnInsert SUBDIR += p5-DBIWrapper SUBDIR += p5-DBIx-Abstract SUBDIR += p5-DBIx-Admin-CreateTable SUBDIR += p5-DBIx-Admin-DSNManager SUBDIR += p5-DBIx-Admin-TableInfo SUBDIR += p5-DBIx-AnyDBD SUBDIR += p5-DBIx-Browse SUBDIR += p5-DBIx-Class SUBDIR += p5-DBIx-Class-AsFdat SUBDIR += p5-DBIx-Class-BitField SUBDIR += p5-DBIx-Class-Candy SUBDIR += p5-DBIx-Class-Cursor-Cached SUBDIR += p5-DBIx-Class-CustomPrefetch SUBDIR += p5-DBIx-Class-DateTime-Epoch SUBDIR += p5-DBIx-Class-DeploymentHandler SUBDIR += p5-DBIx-Class-DigestColumns SUBDIR += p5-DBIx-Class-DynamicDefault SUBDIR += p5-DBIx-Class-DynamicSubclass SUBDIR += p5-DBIx-Class-EncodeColumns SUBDIR += p5-DBIx-Class-EncodedColumn SUBDIR += p5-DBIx-Class-Fixtures SUBDIR += p5-DBIx-Class-FrozenColumns SUBDIR += p5-DBIx-Class-Helpers SUBDIR += p5-DBIx-Class-InflateColumn-Authen-Passphrase SUBDIR += p5-DBIx-Class-InflateColumn-FS SUBDIR += p5-DBIx-Class-InflateColumn-IP SUBDIR += p5-DBIx-Class-IntrospectableM2M SUBDIR += p5-DBIx-Class-Loader SUBDIR += p5-DBIx-Class-Migration SUBDIR += p5-DBIx-Class-MooseColumns SUBDIR += p5-DBIx-Class-PassphraseColumn SUBDIR += p5-DBIx-Class-QueryLog SUBDIR += p5-DBIx-Class-QueryProfiler SUBDIR += p5-DBIx-Class-ResultSet-HashRef SUBDIR += p5-DBIx-Class-ResultSet-RecursiveUpdate SUBDIR += p5-DBIx-Class-Schema-Config SUBDIR += p5-DBIx-Class-Schema-Loader SUBDIR += p5-DBIx-Class-Schema-PopulateMore SUBDIR += p5-DBIx-Class-TimeStamp SUBDIR += p5-DBIx-Class-Tree SUBDIR += p5-DBIx-Class-Tree-NestedSet SUBDIR += p5-DBIx-Class-UUIDColumns SUBDIR += p5-DBIx-Class-VirtualColumns SUBDIR += p5-DBIx-Class-WebForm SUBDIR += p5-DBIx-Connector SUBDIR += p5-DBIx-ContextualFetch SUBDIR += p5-DBIx-Custom SUBDIR += p5-DBIx-DBHResolver SUBDIR += p5-DBIx-DBSchema SUBDIR += p5-DBIx-DataSource SUBDIR += p5-DBIx-Dump SUBDIR += p5-DBIx-Ease SUBDIR += p5-DBIx-HA SUBDIR += p5-DBIx-Inspector SUBDIR += p5-DBIx-Introspector SUBDIR += p5-DBIx-Log4perl SUBDIR += p5-DBIx-MySQLSequence SUBDIR += p5-DBIx-NoSQL SUBDIR += p5-DBIx-Password SUBDIR += p5-DBIx-Perlish SUBDIR += p5-DBIx-QueryLog SUBDIR += p5-DBIx-Recordset SUBDIR += p5-DBIx-RetryOverDisconnects SUBDIR += p5-DBIx-SQLEngine SUBDIR += p5-DBIx-SQLite-Simple SUBDIR += p5-DBIx-Safe SUBDIR += p5-DBIx-SearchBuilder SUBDIR += p5-DBIx-Sequence SUBDIR += p5-DBIx-Simple SUBDIR += p5-DBIx-Skinny SUBDIR += p5-DBIx-Skinny-InflateColumn-DateTime SUBDIR += p5-DBIx-Skinny-Mixin-DBHResolver SUBDIR += p5-DBIx-Skinny-Pager SUBDIR += p5-DBIx-Skinny-Schema-Loader SUBDIR += p5-DBIx-Sunny SUBDIR += p5-DBIx-TableHash SUBDIR += p5-DBIx-TransactionManager SUBDIR += p5-DBIx-Tree SUBDIR += p5-DBIx-VersionedDDL SUBDIR += p5-DBIx-Wrapper SUBDIR += p5-DBIx-XHTML_Table SUBDIR += p5-DBIx-XML_RDB SUBDIR += p5-DBM-Deep SUBDIR += p5-DMOZ-ParseRDF SUBDIR += p5-DR-Tarantool SUBDIR += p5-DWH_File SUBDIR += p5-Dancer-Plugin-DBIC SUBDIR += p5-Dancer-Plugin-Database SUBDIR += p5-Dancer-Plugin-Database-Core SUBDIR += p5-Dancer-Plugin-Redis SUBDIR += p5-Dancer-Session-Memcached SUBDIR += p5-Dancer2-Plugin-DBIC SUBDIR += p5-Dancer2-Plugin-Database SUBDIR += p5-Dancer2-Session-DBIC SUBDIR += p5-Data-Page SUBDIR += p5-Data-Pageset SUBDIR += p5-Exception-Class-DBI SUBDIR += p5-GDBM SUBDIR += p5-Genezzo SUBDIR += p5-GitDDL SUBDIR += p5-GitDDL-Migrator SUBDIR += p5-GraphViz-DBI SUBDIR += p5-HTML-FormHandler-Model-DBIC SUBDIR += p5-Ima-DBI SUBDIR += p5-Interchange6-Schema SUBDIR += p5-Iterator-DBI SUBDIR += p5-Jifty-DBI SUBDIR += p5-KyotoCabinet SUBDIR += p5-LMDB_File SUBDIR += p5-MLDBM SUBDIR += p5-MLDBM-Sync SUBDIR += p5-MR-Tarantool SUBDIR += p5-Mango SUBDIR += p5-Memcached-libmemcached SUBDIR += p5-Metadata SUBDIR += p5-Mojo-Pg SUBDIR += p5-MongoDB SUBDIR += p5-MySQL-Diff SUBDIR += p5-Net-Async-CassandraCQL SUBDIR += p5-ORLite SUBDIR += p5-ORLite-Migrate SUBDIR += p5-Oryx SUBDIR += p5-POE-Component-DBIAgent SUBDIR += p5-POE-Component-EasyDBI SUBDIR += p5-POE-Component-LaDBI SUBDIR += p5-POE-Component-RRDTool SUBDIR += p5-Pg SUBDIR += p5-PostgreSQL-PLPerl-Call SUBDIR += p5-PostgreSQL-PLPerl-Trace SUBDIR += p5-Prophet SUBDIR += p5-Protocol-CassandraCQL SUBDIR += p5-RRD-Simple SUBDIR += p5-Redis SUBDIR += p5-Redis-hiredis SUBDIR += p5-RedisDB SUBDIR += p5-RedisDB-Parser SUBDIR += p5-Relations SUBDIR += p5-Relations-Query SUBDIR += p5-ResourcePool-Resource-DBI SUBDIR += p5-Rose-DB SUBDIR += p5-Rose-DB-Object SUBDIR += p5-Rose-DBx-Object-MoreHelpers SUBDIR += p5-Rose-DBx-Object-Renderer SUBDIR += p5-SQL-Abstract SUBDIR += p5-SQL-Abstract-Limit SUBDIR += p5-SQL-Abstract-More SUBDIR += p5-SQL-Abstract-Plugin-InsertMulti SUBDIR += p5-SQL-Interp SUBDIR += p5-SQL-Maker SUBDIR += p5-SQL-ReservedWords SUBDIR += p5-SQL-Statement SUBDIR += p5-SQL-Translator SUBDIR += p5-SQLite-Work SUBDIR += p5-Search-InvertedIndex SUBDIR += p5-Search-Namazu SUBDIR += p5-Search-Xapian SUBDIR += p5-Search-Xapian10 SUBDIR += p5-T2 SUBDIR += p5-Tangram SUBDIR += p5-Template-DBI SUBDIR += p5-Teng SUBDIR += p5-Test-Cukes SUBDIR += p5-Test-Database SUBDIR += p5-Test-DatabaseRow SUBDIR += p5-Test-Fixture-DBI SUBDIR += p5-Test-mysqld SUBDIR += p5-Test-postgresql SUBDIR += p5-Text-Query-SQL SUBDIR += p5-Text-xSV SUBDIR += p5-Tie-DBI SUBDIR += p5-Tie-LevelDB SUBDIR += p5-Time-Piece-MySQL SUBDIR += p5-TokyoCabinet SUBDIR += p5-mysql-genocide SUBDIR += p5-tokyotyrant SUBDIR += pear-DB SUBDIR += pear-DBA SUBDIR += pear-DBA_Relational SUBDIR += pear-DB_DataObject SUBDIR += pear-DB_DataObject_FormBuilder SUBDIR += pear-DB_Pager SUBDIR += pear-DB_QueryTool SUBDIR += pear-DB_Sqlite_Tools SUBDIR += pear-DB_Table SUBDIR += pear-DB_ldap SUBDIR += pear-DB_ldap2 SUBDIR += pear-DoctrineCommon SUBDIR += pear-DoctrineDBAL SUBDIR += pear-DoctrineORM SUBDIR += pear-Horde_Db SUBDIR += pear-Horde_HashTable SUBDIR += pear-Horde_Imsp SUBDIR += pear-Horde_Memcache SUBDIR += pear-Horde_Mongo SUBDIR += pear-MDB SUBDIR += pear-MDB2 SUBDIR += pear-MDB2_Driver_mysql SUBDIR += pear-MDB2_Driver_mysqli SUBDIR += pear-MDB2_Driver_pgsql SUBDIR += pear-MDB2_Schema SUBDIR += pear-MDB_QueryTool SUBDIR += pear-Structures_DataGrid_DataSource_Array SUBDIR += pear-Structures_DataGrid_DataSource_CSV SUBDIR += pear-Structures_DataGrid_DataSource_DB SUBDIR += pear-Structures_DataGrid_DataSource_DBQuery SUBDIR += pear-Structures_DataGrid_DataSource_DBTable SUBDIR += pear-Structures_DataGrid_DataSource_DataObject SUBDIR += pear-Structures_DataGrid_DataSource_MDB2 SUBDIR += pear-Structures_DataGrid_DataSource_PDO SUBDIR += pear-XML_Query2XML SUBDIR += pecl-chdb SUBDIR += pecl-dbase SUBDIR += pecl-drizzle SUBDIR += pecl-leveldb SUBDIR += pecl-memcache SUBDIR += pecl-memcached SUBDIR += pecl-mongo SUBDIR += pecl-mongodb SUBDIR += pecl-pdo_user SUBDIR += pecl-rrd SUBDIR += pecl-tokyo_tyrant SUBDIR += percona-pam-for-mysql SUBDIR += percona-toolkit SUBDIR += percona55-client SUBDIR += percona55-server SUBDIR += percona56-client SUBDIR += percona56-server SUBDIR += pg_activity SUBDIR += pg_citus SUBDIR += pg_qualstats SUBDIR += pg_reorg SUBDIR += pg_rman SUBDIR += pg_stat_kcache SUBDIR += pg_statsinfo SUBDIR += pgaccess SUBDIR += pgadmin3 SUBDIR += pgagent SUBDIR += pgbadger SUBDIR += pgbarman SUBDIR += pgbouncer SUBDIR += pgdbf SUBDIR += pgespresso SUBDIR += pgfouine SUBDIR += pglesslog SUBDIR += pgloader SUBDIR += pglogical SUBDIR += pgmodeler SUBDIR += pgpool SUBDIR += pgpool-II SUBDIR += pgpool-II-22 SUBDIR += pgpool-II-23 SUBDIR += pgpool-II-30 SUBDIR += pgpool-II-33 SUBDIR += pgpoolAdmin SUBDIR += pgreplay SUBDIR += pgrouting SUBDIR += pgsphere SUBDIR += pgtcl SUBDIR += pgtop SUBDIR += pgtune SUBDIR += pguri SUBDIR += pgworksheet SUBDIR += php-mdcached SUBDIR += php5-pdo_cassandra SUBDIR += php5-tarantool SUBDIR += php56-dba SUBDIR += php56-interbase SUBDIR += php56-mssql SUBDIR += php56-mysql SUBDIR += php56-mysqli SUBDIR += php56-odbc SUBDIR += php56-pdo SUBDIR += php56-pdo_dblib SUBDIR += php56-pdo_firebird SUBDIR += php56-pdo_mysql SUBDIR += php56-pdo_odbc SUBDIR += php56-pdo_pgsql SUBDIR += php56-pdo_sqlite SUBDIR += php56-pgsql SUBDIR += php56-redis SUBDIR += php56-sqlite3 SUBDIR += php56-sybase_ct SUBDIR += php70-dba SUBDIR += php70-interbase SUBDIR += php70-memcache SUBDIR += php70-memcached SUBDIR += php70-mysqli SUBDIR += php70-odbc SUBDIR += php70-pdo SUBDIR += php70-pdo_dblib SUBDIR += php70-pdo_firebird SUBDIR += php70-pdo_mysql SUBDIR += php70-pdo_odbc SUBDIR += php70-pdo_pgsql SUBDIR += php70-pdo_sqlite SUBDIR += php70-pgsql SUBDIR += php70-redis SUBDIR += php70-sqlite3 SUBDIR += phpminiadmin SUBDIR += phpmyadmin SUBDIR += phppgadmin SUBDIR += postgis-jdbc SUBDIR += postgis20 SUBDIR += postgis21 SUBDIR += postgis22 SUBDIR += postgis23 SUBDIR += postgresql-jdbc SUBDIR += postgresql-libpgeasy SUBDIR += postgresql-libpqxx SUBDIR += postgresql-libpqxx3 SUBDIR += postgresql-odbc SUBDIR += postgresql-plproxy SUBDIR += postgresql-plruby SUBDIR += postgresql-plv8js SUBDIR += postgresql-relay SUBDIR += postgresql-repmgr SUBDIR += postgresql-repmgr2 SUBDIR += postgresql92-client SUBDIR += postgresql92-contrib SUBDIR += postgresql92-docs SUBDIR += postgresql92-pgtcl SUBDIR += postgresql92-plperl SUBDIR += postgresql92-plpython SUBDIR += postgresql92-pltcl SUBDIR += postgresql92-server SUBDIR += postgresql93-client SUBDIR += postgresql93-contrib SUBDIR += postgresql93-docs SUBDIR += postgresql93-pgtcl SUBDIR += postgresql93-plperl SUBDIR += postgresql93-plpython SUBDIR += postgresql93-pltcl SUBDIR += postgresql93-server SUBDIR += postgresql94-client SUBDIR += postgresql94-contrib SUBDIR += postgresql94-docs SUBDIR += postgresql94-pgtcl SUBDIR += postgresql94-plperl SUBDIR += postgresql94-plpython SUBDIR += postgresql94-pltcl SUBDIR += postgresql94-server SUBDIR += postgresql95-client SUBDIR += postgresql95-contrib SUBDIR += postgresql95-docs SUBDIR += postgresql95-pgtcl SUBDIR += postgresql95-plperl SUBDIR += postgresql95-plpython SUBDIR += postgresql95-pltcl SUBDIR += postgresql95-server SUBDIR += postgresql96-client SUBDIR += postgresql96-contrib SUBDIR += postgresql96-docs SUBDIR += postgresql96-pgtcl SUBDIR += postgresql96-plperl SUBDIR += postgresql96-plpython SUBDIR += postgresql96-pltcl SUBDIR += postgresql96-server SUBDIR += powa-archivist SUBDIR += powa-web SUBDIR += powerarchitect SUBDIR += proftpd-mod_sql_mysql SUBDIR += proftpd-mod_sql_odbc SUBDIR += proftpd-mod_sql_postgres SUBDIR += proftpd-mod_sql_sqlite SUBDIR += proftpd-mod_sql_tds SUBDIR += puppetdb SUBDIR += puppetdb-terminus SUBDIR += puppetdb-terminus3 SUBDIR += puppetdb-terminus4 SUBDIR += puppetdb3 SUBDIR += puppetdb4 SUBDIR += pure-sql3 SUBDIR += puredb SUBDIR += pxlib SUBDIR += pxtools SUBDIR += py-Elixir SUBDIR += py-MySQLdb SUBDIR += py-MySQLdb55 SUBDIR += py-MySQLdb56 SUBDIR += py-PyGreSQL SUBDIR += py-Pyrseas SUBDIR += py-agate-sql SUBDIR += py-alembic SUBDIR += py-apsw SUBDIR += py-bsddb SUBDIR += py-bsddb3 SUBDIR += py-carbon SUBDIR += py-cdb SUBDIR += py-couchdb SUBDIR += py-cql SUBDIR += py-dbf SUBDIR += py-dbutils SUBDIR += py-django-transaction-hooks SUBDIR += py-fdb SUBDIR += py-firebirdsql SUBDIR += py-flask-sqlalchemy SUBDIR += py-forgetsql SUBDIR += py-gdbm SUBDIR += py-geoalchemy SUBDIR += py-geoalchemy2 SUBDIR += py-hiredis SUBDIR += py-htsql SUBDIR += py-htsql-mysql SUBDIR += py-htsql-pgsql SUBDIR += py-kyotocabinet SUBDIR += py-leveldb SUBDIR += py-motor SUBDIR += py-mycli SUBDIR += py-mysql-connector-python SUBDIR += py-mysql-connector-python2 SUBDIR += py-mysql2pgsql SUBDIR += py-mysqlclient SUBDIR += py-odbc SUBDIR += py-oops SUBDIR += py-oursql SUBDIR += py-peewee SUBDIR += py-pg8000 SUBDIR += py-pg_pqueue SUBDIR += py-pgcli SUBDIR += py-pgspecial SUBDIR += py-pgxnclient SUBDIR += py-pickledb SUBDIR += py-pickleshare SUBDIR += py-postgresql SUBDIR += py-psycogreen SUBDIR += py-psycopg2 SUBDIR += py-psycopg2cffi SUBDIR += py-pyPgSQL SUBDIR += py-pyhs SUBDIR += py-pylibmc SUBDIR += py-pymssql SUBDIR += py-pymysql SUBDIR += py-pypuppetdb SUBDIR += py-pypuppetdb03 SUBDIR += py-pytc SUBDIR += py-python-memcached SUBDIR += py-python-rrdtool SUBDIR += py-python-sql SUBDIR += py-python-swiftclient SUBDIR += py-qt4-sql SUBDIR += py-qt5-sql SUBDIR += py-queries SUBDIR += py-rb SUBDIR += py-redis SUBDIR += py-riak SUBDIR += py-rrdtool_lgpl SUBDIR += py-south SUBDIR += py-sqlalchemy-migrate SUBDIR += py-sqlalchemy08 SUBDIR += py-sqlalchemy09 SUBDIR += py-sqlalchemy10 SUBDIR += py-sqlalchemy11 SUBDIR += py-sqlite3 SUBDIR += py-sqlite3dbm SUBDIR += py-sqlobject SUBDIR += py-sqlparse SUBDIR += py-sqlparse01 SUBDIR += py-sqlrelay SUBDIR += py-swift SUBDIR += py-sybase SUBDIR += py-tarantool SUBDIR += py-umemcache SUBDIR += py-unqlite SUBDIR += py-whisper SUBDIR += py3-bsddb3 SUBDIR += py3-mysqlclient SUBDIR += py3-psycopg2 SUBDIR += py33-gdbm SUBDIR += py33-sqlite3 SUBDIR += py34-gdbm SUBDIR += py34-sqlite3 SUBDIR += py35-gdbm SUBDIR += py35-sqlite3 SUBDIR += py36-gdbm SUBDIR += py36-sqlite3 SUBDIR += pydbx SUBDIR += pymongo SUBDIR += pypy-gdbm SUBDIR += pypy-sqlite3 SUBDIR += pyspatialite SUBDIR += qdbm SUBDIR += qdbm-plus SUBDIR += qof SUBDIR += qt4-ibase-plugin SUBDIR += qt4-mysql-plugin SUBDIR += qt4-odbc-plugin SUBDIR += qt4-pgsql-plugin SUBDIR += qt4-sql SUBDIR += qt4-sqlite-plugin SUBDIR += qt4-sqlite3-plugin SUBDIR += qt5-sql SUBDIR += qt5-sqldrivers-ibase SUBDIR += qt5-sqldrivers-mysql SUBDIR += qt5-sqldrivers-odbc SUBDIR += qt5-sqldrivers-pgsql SUBDIR += qt5-sqldrivers-sqlite2 SUBDIR += qt5-sqldrivers-sqlite3 SUBDIR += qt5-sqldrivers-tds SUBDIR += radix.v2 SUBDIR += rdb SUBDIR += rdfdb SUBDIR += recutils SUBDIR += redigo SUBDIR += redis SUBDIR += redis-devel SUBDIR += riak SUBDIR += riak2 SUBDIR += rocksdb SUBDIR += rrdman SUBDIR += rrdmerge SUBDIR += rrdtool SUBDIR += rrdtool12 SUBDIR += ruby-bdb SUBDIR += ruby-cdb SUBDIR += ruby-gdbm SUBDIR += ruby-mysql SUBDIR += ruby-o_dbm SUBDIR += ruby-odbc SUBDIR += ruby-qdbm SUBDIR += ruby-rdbc1 SUBDIR += ruby-sybct SUBDIR += ruby-tokyocabinet SUBDIR += rubygem-activemodel SUBDIR += rubygem-activemodel4 SUBDIR += rubygem-activerecord SUBDIR += rubygem-activerecord-import SUBDIR += rubygem-activerecord-jdbc-adapter SUBDIR += rubygem-activerecord-jdbcmysql-adapter SUBDIR += rubygem-activerecord-mysql-adapter SUBDIR += rubygem-activerecord-session_store SUBDIR += rubygem-activerecord4 SUBDIR += rubygem-after_commit_queue SUBDIR += rubygem-amalgalite SUBDIR += rubygem-arel SUBDIR += rubygem-arel-helpers SUBDIR += rubygem-arel3 SUBDIR += rubygem-arel5 SUBDIR += rubygem-arel6 SUBDIR += rubygem-awesome_nested_set SUBDIR += rubygem-bdb1 SUBDIR += rubygem-bigrecord SUBDIR += rubygem-couchrest SUBDIR += rubygem-data_objects SUBDIR += rubygem-datamapper SUBDIR += rubygem-dbd-mysql SUBDIR += rubygem-dbd-odbc SUBDIR += rubygem-dbd-pg SUBDIR += rubygem-dbd-sqlite3 SUBDIR += rubygem-dbi SUBDIR += rubygem-dm-active_model SUBDIR += rubygem-dm-aggregates SUBDIR += rubygem-dm-chunked_query SUBDIR += rubygem-dm-constraints SUBDIR += rubygem-dm-core SUBDIR += rubygem-dm-do-adapter SUBDIR += rubygem-dm-migrations SUBDIR += rubygem-dm-mysql-adapter SUBDIR += rubygem-dm-observer SUBDIR += rubygem-dm-pager SUBDIR += rubygem-dm-paperclip SUBDIR += rubygem-dm-postgres-adapter SUBDIR += rubygem-dm-rails SUBDIR += rubygem-dm-serializer SUBDIR += rubygem-dm-timestamps SUBDIR += rubygem-dm-transactions SUBDIR += rubygem-dm-types SUBDIR += rubygem-dm-validations SUBDIR += rubygem-do_mysql SUBDIR += rubygem-do_postgres SUBDIR += rubygem-do_sqlite3 SUBDIR += rubygem-em-redis-unified SUBDIR += rubygem-familia SUBDIR += rubygem-globalid SUBDIR += rubygem-her SUBDIR += rubygem-hiredis SUBDIR += rubygem-jdbc-mysql SUBDIR += rubygem-leo_manager_client SUBDIR += rubygem-memcache SUBDIR += rubygem-memcache-client SUBDIR += rubygem-mysql SUBDIR += rubygem-mysql2 SUBDIR += rubygem-openid-redis-store SUBDIR += rubygem-paranoia SUBDIR += rubygem-pg SUBDIR += rubygem-pg_array_parser SUBDIR += rubygem-postgres_ext SUBDIR += rubygem-rbase SUBDIR += rubygem-redis SUBDIR += rubygem-redis-actionpack SUBDIR += rubygem-redis-actionpack4 SUBDIR += rubygem-redis-namespace SUBDIR += rubygem-rubyrep SUBDIR += rubygem-seed-fu SUBDIR += rubygem-sqlite3 SUBDIR += rubygem-sqlite3-ruby SUBDIR += rubygem-state_machines-activemodel SUBDIR += rubygem-state_machines-activerecord SUBDIR += rubygem-tarantool SUBDIR += sfcgal SUBDIR += sharedance SUBDIR += skytools SUBDIR += slony1v2 SUBDIR += soci SUBDIR += spatialite SUBDIR += spatialite-tools SUBDIR += spatialite_gui SUBDIR += speedtables SUBDIR += sql-workbench SUBDIR += sqlbuddy SUBDIR += sqlcached SUBDIR += sqlcipher SUBDIR += sqlclient SUBDIR += sqldeveloper SUBDIR += sqlite-ext-miscfuncs SUBDIR += sqlite-ext-pcre SUBDIR += sqlite-ext-regexp SUBDIR += sqlite-ext-spellfix SUBDIR += sqlite2 SUBDIR += sqlite3 SUBDIR += sqlitebrowser SUBDIR += sqlitebrowser-qt5 SUBDIR += sqliteman SUBDIR += sqlitemanager SUBDIR += sqliteodbc SUBDIR += sqliteodbc-sqlite2 SUBDIR += sqlitestudio SUBDIR += sqlrelay SUBDIR += sqsh SUBDIR += squirrel-sql SUBDIR += tablelog SUBDIR += tarantool SUBDIR += tarantool-c SUBDIR += tcl-Mysql SUBDIR += tcl-lmdb SUBDIR += tcl-sqlite3 SUBDIR += tdb SUBDIR += tdbc SUBDIR += tile38 SUBDIR += tinycdb SUBDIR += tokyocabinet SUBDIR += tokyotyrant SUBDIR += tora SUBDIR += tsearch_extras SUBDIR += tuning-primer SUBDIR += twemproxy SUBDIR += unixODBC SUBDIR += useracc SUBDIR += vfront SUBDIR += virtualpg SUBDIR += virtuoso SUBDIR += vsqlite SUBDIR += wfb2sql SUBDIR += wmjsql SUBDIR += xapian-bindings SUBDIR += xapian-core SUBDIR += xapian-core10 SUBDIR += xtrabackup SUBDIR += yasql SUBDIR += zodb3 .include Index: databases/mysql80-client/Makefile =================================================================== --- databases/mysql80-client/Makefile (.../mysql57-client) (revision 430546) +++ databases/mysql80-client/Makefile (.../mysql80-client) (working copy) @@ -1,42 +1,42 @@ # Created by: "Mahdi Mokhtari " # $FreeBSD$ PORTNAME= mysql PORTREVISION?= 0 -PKGNAMESUFFIX= 57-client +PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) LICENSE+= LGPL21 BROKEN_powerpc64= Does not build BROKEN_sparc64= Does not build: reports unsupported compiler -MASTERDIR= ${.CURDIR}/../mysql57-server +MASTERDIR= ${.CURDIR}/../mysql80-server PKGMESSAGE= ${.CURDIR}/pkg-message PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -CONFLICTS_INSTALL= mysql5[0-68-9]-client-* \ - mysql[0-46-9][0-9]-client-* \ +CONFLICTS_INSTALL= mysql8[1-9]-client-* \ + mysql[0-79][0-9]-client-* \ mariadb[0-9][0-9]-client-* \ percona[0-9][0-9]-client-* CMAKE_ARGS+= -DWITHOUT_SERVER=1 USE_LDCONFIG+= ${PREFIX}/lib/mysql MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \ mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \ mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 CLIENT_ONLY= yes # issue 166367: adding symlinks for back-compatibility with ${lib}_r post-install: @${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a @${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so - @${LN} -s libmysqlclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.20 + @${LN} -s libmysqlclient.so.21 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.21 .include "${MASTERDIR}/Makefile" Index: databases/mysql80-client/files/patch-cmake_build__configurations_compiler__options.cmake =================================================================== --- databases/mysql80-client/files/patch-cmake_build__configurations_compiler__options.cmake (.../mysql57-client) (revision 430546) +++ databases/mysql80-client/files/patch-cmake_build__configurations_compiler__options.cmake (.../mysql80-client) (nonexistent) @@ -1,20 +0,0 @@ ---- cmake/build_configurations/compiler_options.cmake.orig 2016-08-25 11:52:06 UTC -+++ cmake/build_configurations/compiler_options.cmake -@@ -29,7 +29,7 @@ IF(UNIX) - - # Default GCC flags - IF(CMAKE_COMPILER_IS_GNUCC) -- SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") -+ SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") - # Disable inline optimizations for valgrind testing to avoid false positives - IF(WITH_VALGRIND) - SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") -@@ -42,7 +42,7 @@ IF(UNIX) - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") - ENDIF() - IF(CMAKE_COMPILER_IS_GNUCXX) -- SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") -+ SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") - # GCC 6 has C++14 as default, set it explicitly to the old default. - EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion - OUTPUT_VARIABLE GXX_VERSION) Property changes on: databases/mysql80-client/files/patch-cmake_build__configurations_compiler__options.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: databases/mysql80-client/files/patch-mysys__ssl_my__default.cc =================================================================== Index: databases/mysql80-client/files/patch-cmake_ssl.cmake =================================================================== Index: databases/mysql80-client/files/patch-CMakeLists.txt =================================================================== Index: databases/mysql80-client/files/patch-client_CMakeLists.txt =================================================================== --- databases/mysql80-client/files/patch-client_CMakeLists.txt (.../mysql57-client) (revision 430546) +++ databases/mysql80-client/files/patch-client_CMakeLists.txt (.../mysql80-client) (working copy) @@ -1,54 +1,36 @@ ---- client/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- client/CMakeLists.txt.orig 2016-08-25 12:32:09 UTC +++ client/CMakeLists.txt @@ -47,6 +47,7 @@ IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) ENDIF(UNIX) +IF(FALSE) IF(NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc -@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS( +@@ -57,11 +58,14 @@ ADD_COMPILE_FLAGS( TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core) ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema) ENDIF() +ENDIF() +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) + ADD_DEPENDENCIES(mysqltest GenError GenClientError) +ENDIF() ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) -@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - ADD_COMPILE_FLAGS( -@@ -98,8 +104,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli +@@ -113,8 +117,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) +ENDIF() - IF(UNIX AND NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysql_install_db -@@ -122,7 +130,6 @@ IF(WIN32) - ENDIF(WIN32) - - SET_TARGET_PROPERTIES ( -- mysql_plugin - mysqlcheck - mysqldump - mysqlimport + MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc) + TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl) Index: databases/mysql80-client/files/patch-cmake_os_DragonFly.cmake =================================================================== Index: databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h =================================================================== Index: databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c =================================================================== Index: databases/mysql80-client/files/patch-extra_CMakeLists.txt =================================================================== Index: databases/mysql80-client/files/patch-include_CMakeLists.txt =================================================================== Index: databases/mysql80-client/files/patch-include_my__compare.h =================================================================== Index: databases/mysql80-client/files/patch-include_myisam.h =================================================================== Index: databases/mysql80-client/files/patch-libmysql_CMakeLists.txt =================================================================== Index: databases/mysql80-client/files/patch-scripts_CMakeLists.txt =================================================================== Index: databases/mysql80-client/files/patch-storage_myisam_mi__dynrec.c =================================================================== Index: databases/mysql80-client/files/patch-support-files_CMakeLists.txt =================================================================== Index: databases/mysql80-client/files/patch-man_CMakeLists.txt =================================================================== Index: databases/mysql80-client/pkg-plist =================================================================== --- databases/mysql80-client/pkg-plist (.../mysql57-client) (revision 430546) +++ databases/mysql80-client/pkg-plist (.../mysql80-client) (working copy) @@ -1,140 +1,163 @@ bin/mysql bin/mysql_config bin/mysql_config_editor bin/mysql_ssl_rsa_setup bin/mysqladmin bin/mysqlbinlog bin/mysqlcheck bin/mysqldump bin/mysqlimport bin/mysqlpump bin/mysqlshow bin/mysqlslap include/mysql/binary_log_types.h include/mysql/big_endian.h include/mysql/byte_order_generic.h include/mysql/byte_order_generic_x86.h include/mysql/decimal.h include/mysql/errmsg.h include/mysql/hash.h include/mysql/keycache.h include/mysql/little_endian.h include/mysql/m_ctype.h include/mysql/m_string.h include/mysql/my_alloc.h include/mysql/my_byteorder.h include/mysql/my_command.h include/mysql/my_compiler.h include/mysql/my_config.h include/mysql/my_dbug.h include/mysql/my_dir.h include/mysql/my_getopt.h include/mysql/my_global.h include/mysql/my_list.h include/mysql/my_sys.h include/mysql/my_thread.h include/mysql/my_thread_local.h include/mysql/my_xml.h include/mysql/mysql.h include/mysql/mysql/client_authentication.h include/mysql/mysql/client_plugin.h include/mysql/mysql/client_plugin.h.pp include/mysql/mysql/com_data.h include/mysql/mysql/get_password.h include/mysql/mysql/group_replication_priv.h include/mysql/mysql/innodb_priv.h include/mysql/mysql/mysql_lex_string.h include/mysql/mysql/plugin.h include/mysql/mysql/plugin_audit.h include/mysql/mysql/plugin_audit.h.pp include/mysql/mysql/plugin_auth.h include/mysql/mysql/plugin_auth.h.pp include/mysql/mysql/plugin_auth_common.h include/mysql/mysql/plugin_ftparser.h include/mysql/mysql/plugin_ftparser.h.pp include/mysql/mysql/plugin_group_replication.h include/mysql/mysql/plugin_keyring.h include/mysql/mysql/plugin_keyring.h.pp +include/mysql/mysql/plugin_query_rewrite.h include/mysql/mysql/plugin_trace.h include/mysql/mysql/plugin_validate_password.h +include/mysql/mysql/components/component_implementation.h +include/mysql/mysql/components/my_service.h +include/mysql/mysql/components/service.h +include/mysql/mysql/components/service_implementation.h +include/mysql/mysql/components/services/dynamic_loader.h +include/mysql/mysql/components/services/dynamic_loader_scheme_file.h +include/mysql/mysql/components/services/persistent_dynamic_loader.h +include/mysql/mysql/components/services/registry.h +include/mysql/mysql/psi/mysql_cond.h +include/mysql/mysql/psi/mysql_error.h +include/mysql/mysql/psi/mysql_mutex.h +include/mysql/mysql/psi/mysql_rwlock.h +include/mysql/mysql/psi/psi_cond.h +include/mysql/mysql/psi/psi_error.h +include/mysql/mysql/psi/psi_file.h +include/mysql/mysql/psi/psi_idle.h +include/mysql/mysql/psi/psi_mdl.h +include/mysql/mysql/psi/psi_mutex.h +include/mysql/mysql/psi/psi_rwlock.h +include/mysql/mysql/psi/psi_socket.h +include/mysql/mysql/psi/psi_stage.h +include/mysql/mysql/psi/psi_statement.h +include/mysql/mysql/psi/psi_table.h +include/mysql/mysql/psi/psi_thread.h +include/mysql/mysql/psi/psi_transaction.h include/mysql/mysql/psi/mysql_file.h include/mysql/mysql/psi/mysql_idle.h include/mysql/mysql/psi/mysql_mdl.h include/mysql/mysql/psi/mysql_memory.h include/mysql/mysql/psi/mysql_ps.h include/mysql/mysql/psi/mysql_socket.h include/mysql/mysql/psi/mysql_sp.h include/mysql/mysql/psi/mysql_stage.h include/mysql/mysql/psi/mysql_statement.h include/mysql/mysql/psi/mysql_table.h include/mysql/mysql/psi/mysql_thread.h include/mysql/mysql/psi/mysql_transaction.h -include/mysql/mysql/psi/psi.h include/mysql/mysql/psi/psi_base.h include/mysql/mysql/psi/psi_memory.h include/mysql/mysql/service_command.h include/mysql/mysql/service_locking.h include/mysql/mysql/service_my_plugin_log.h include/mysql/mysql/service_my_snprintf.h include/mysql/mysql/service_mysql_alloc.h include/mysql/mysql/service_mysql_keyring.h include/mysql/mysql/service_mysql_password_policy.h include/mysql/mysql/service_mysql_string.h include/mysql/mysql/service_parser.h include/mysql/mysql/service_rpl_transaction_ctx.h include/mysql/mysql/service_rpl_transaction_write_set.h include/mysql/mysql/service_rules_table.h include/mysql/mysql/service_security_context.h include/mysql/mysql/service_srv_session.h include/mysql/mysql/service_srv_session_info.h include/mysql/mysql/service_ssl_wrapper.h include/mysql/mysql/service_thd_alloc.h include/mysql/mysql/service_thd_engine_lock.h include/mysql/mysql/service_thd_wait.h include/mysql/mysql/service_thread_scheduler.h include/mysql/mysql/services.h include/mysql/mysql/services.h.pp include/mysql/mysql/thread_pool_priv.h include/mysql/mysql/thread_type.h include/mysql/mysql_com.h include/mysql/mysql_com_server.h -include/mysql/mysql_embed.h include/mysql/mysql_time.h include/mysql/mysql_version.h include/mysql/mysqld_ername.h include/mysql/mysqld_error.h include/mysql/plugin.h include/mysql/plugin_audit.h include/mysql/plugin_ftparser.h include/mysql/plugin_group_replication.h include/mysql/plugin_keyring.h include/mysql/plugin_validate_password.h include/mysql/sql_common.h -include/mysql/sql_state.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-vars.h include/mysql/thr_cond.h include/mysql/thr_mutex.h include/mysql/thr_rwlock.h include/mysql/typelib.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.20 +lib/mysql/libmysqlclient.so.21 lib/mysql/libmysqlservices.a lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.20 +lib/mysql/libmysqlclient_r.so.21 libdata/pkgconfig/mysqlclient.pc man/man1/comp_err.1.gz man/man1/mysql.1.gz man/man1/mysql_config.1.gz man/man1/mysql_config_editor.1.gz man/man1/mysqladmin.1.gz man/man1/mysqlbinlog.1.gz man/man1/mysqlcheck.1.gz man/man1/mysqldump.1.gz man/man1/mysqlimport.1.gz man/man1/mysqlshow.1.gz man/man1/mysqlslap.1.gz share/aclocal/mysql.m4 Index: databases/mysql80-client/pkg-message =================================================================== --- databases/mysql80-client/pkg-message (.../mysql57-client) (revision 430546) +++ databases/mysql80-client/pkg-message (.../mysql80-client) (working copy) @@ -1,6 +1,12 @@ * * * * * * * * * * * * * * * * * * * * * * * * This is the mysql CLIENT without the server. -for complete server and client, please install databases/mysql57-server +for complete server and client, please install databases/mysql80-server + +* * * * * * * * * * * * * * * * * * * * * * * * + +* * * * * * * * * * * * * * * * * * * * * * * * + +WARNING: THIS IS STILL-IN-DEV PROJECT! USE WITH CAUTION ON PRODUCTION ENVS! * * * * * * * * * * * * * * * * * * * * * * * * Index: databases/mysql80-server/Makefile =================================================================== --- databases/mysql80-server/Makefile (.../mysql57-server) (revision 430546) +++ databases/mysql80-server/Makefile (.../mysql80-server) (working copy) @@ -1,165 +1,167 @@ # Created by: Mahdi Mokhtari # $FreeBSD$ -PORTNAME?= mysql -PORTVERSION= 5.7.17 -PORTREVISION?= 0 -CATEGORIES= databases ipv6 -MASTER_SITES= MYSQL/MySQL-5.7 -PKGNAMESUFFIX?= 57-server -DISTNAME= ${PORTNAME}-boost-${PORTVERSION} +PORTNAME?= mysql +PORTVERSION= 8.0.0 +DISTVERSIONSUFFIX?= -dmr +PORTREVISION?= 0 +CATEGORIES= databases ipv6 +MASTER_SITES= MYSQL/MySQL-8.0 +PKGNAMESUFFIX?= 80-server +DISTNAME= ${PORTNAME}-boost-${PORTVERSION}${DISTVERSIONSUFFIX} -MAINTAINER= mokhi64@gmail.com -COMMENT?= Multithreaded SQL database (server) +MAINTAINER= mokhi64@gmail.com +COMMENT?= Multithreaded SQL database (server) -LICENSE= GPLv2 +LICENSE= GPLv2 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX} -SLAVEDIRS= databases/mysql57-client +SLAVEDIRS= databases/mysql80-client USES= bison:build cmake:outsource compiler:c11 compiler:c++11-lib \ cpe libedit localbase perl5 shebangfix ssl USE_PERL5= run MY_DBDIR= /var/db/mysql MY_SECDIR= /var/db/mysql_secure MY_TMPDIR= /var/db/mysql_tmpdir LIB_DEPENDS+= libevent.so:devel/libevent2 \ liblz4.so:archivers/liblz4 CMAKE_BUILD_TYPE= Release CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \ -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \ -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \ -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \ -DWITH_BOOST="${WRKSRC}/boost" \ -DWITH_EDITLINE=system \ -DWITH_LIBEVENT=system \ -DWITH_LZ4=system \ -DWITH_ZLIB=system \ -DINSTALL_MYSQLTESTDIR=0 SHEBANG_FILES= scripts/*.pl* scripts/*.sh .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif SUB_LIST= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ - MY_TMPDIR=${MY_TMPDIR} + MY_TMPDIR=${MY_TMPDIR} \ + MYSQL80_LIBVER=${MYSQL80_LIBVER} # MySQL-Server part .if !defined(CLIENT_ONLY) -USES+= mysql:57 +USES+= mysql:80 -CONFLICTS_INSTALL= mysql5[0-68-9]-server-* \ - mysql[0-46-9][0-9]-server-* \ +CONFLICTS_INSTALL= mysql8[1-9]-server-* \ + mysql[0-79][0-9]-server-* \ mariadb[0-9][0-9]-server-* \ percona[0-9][0-9]-server-* USE_RC_SUBR= mysql-server SUB_FILES= my.cnf.sample USERS= mysql GROUPS= mysql USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin MMAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \ mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \ mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \ mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" OPTIONS_GROUP= STORAGE OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA OPTIONS_SUB= YES STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server) ARCHIVE_DESC= Compile "Archive Storage" statically in server BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server EXAMPLE_DESC= Compile "Example Storage" statically in server FEDERATED_DESC= Compile "Federated Storage" statically in server INNOBASE_DESC= Compile "InnoDB Storage" statically in server PARTITION_DESC= Compile "Partitioning support Storage" statically in server PERFSCHEMA_DESC= Compile "Performance Schema Storage" statically in server ARCHIVE_CMAKE_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1 BLACKHOLE_CMAKE_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1 EXAMPLE_CMAKE_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1 FEDERATED_CMAKE_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1 INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1 PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1 PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 OPTIONS_GROUP+= FEATURES OPTIONS_GROUP_FEATURES= PERFSCHM FEATURES_DESC= Default features knobs PERFSCHM_DESC= Enable "Performance Schema" by default (High RAM usage) OPTIONS_DEFAULT+= PERFSCHM PERFSCHM_SUB_LIST+= PERFSCHEMRC="" PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" .endif .include ### Just for the sake of FreeBSD 9.X ### .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 . if !defined(CLIENT_ONLY) EXTRA_PATCHES+= ${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc . endif .endif .include .if ${SSL_DEFAULT} == base +BROKEN_FreeBSD_9= FreeBSD 9.x requires SSL from ports CMAKE_ARGS+= -DWITH_SSL=system .else CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} .endif post-extract: @${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h post-patch: @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt .if !defined(CLIENT_ONLY) post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample - ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring ${MKDIR} ${STAGEDIR}${MY_SECDIR} ${MKDIR} ${STAGEDIR}${MY_TMPDIR} .endif .include Index: databases/mysql80-server/distinfo =================================================================== --- databases/mysql80-server/distinfo (.../mysql57-server) (revision 430546) +++ databases/mysql80-server/distinfo (.../mysql80-server) (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483356681 -SHA256 (mysql-boost-5.7.17.tar.gz) = b75bba87199ef6a6ccc5dfbcaf70949009dc12089eafad8c5254afc9002aa903 -SIZE (mysql-boost-5.7.17.tar.gz) = 61480982 +TIMESTAMP = 1483372244 +SHA256 (mysql-boost-8.0.0-dmr.tar.gz) = e5b7b77e532c906dc30f12b821950426b8205a64b5a77c26681e2109a3b6a5fc +SIZE (mysql-boost-8.0.0-dmr.tar.gz) = 65567795 Index: databases/mysql80-server/files/patch-mysys__ssl_my__default.cc =================================================================== Index: databases/mysql80-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake =================================================================== Index: databases/mysql80-server/files/patch-sql_CMakeLists.txt =================================================================== Index: databases/mysql80-server/files/patch-cmake_ssl.cmake =================================================================== Index: databases/mysql80-server/files/mysql-server.in =================================================================== Index: databases/mysql80-server/files/my.cnf.sample.in =================================================================== Index: databases/mysql80-server/files/patch-CMakeLists.txt =================================================================== Index: databases/mysql80-server/files/patch-client_CMakeLists.txt =================================================================== --- databases/mysql80-server/files/patch-client_CMakeLists.txt (.../mysql57-server) (revision 430546) +++ databases/mysql80-server/files/patch-client_CMakeLists.txt (.../mysql80-server) (working copy) @@ -1,78 +1,60 @@ ---- client/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- client/CMakeLists.txt.orig 2016-08-25 12:32:09 UTC +++ client/CMakeLists.txt @@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil ## Subdirectory with common client code. ADD_SUBDIRECTORY(base) -## Subdirectory for mysqlpump code. -ADD_SUBDIRECTORY(dump) ## We will need libeay32.dll and ssleay32.dll when running client executables. COPY_OPENSSL_DLLS(copy_openssl_client) @@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client) INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) ADD_DEFINITIONS(${SSL_DEFINES}) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc) TARGET_LINK_LIBRARIES(mysql mysqlclient) IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) ENDIF(UNIX) +ENDIF() IF(NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_upgrade -@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli +@@ -66,6 +66,7 @@ ADD_DEPENDENCIES(mysqltest GenError GenC ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc) TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core) -@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc +@@ -78,7 +79,9 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) + MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.cc) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) +ENDIF() - MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) - +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - ADD_COMPILE_FLAGS( - mysqlbinlog.cc -@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli + SET(MYSQLBINLOG_LIB_SOURCES + ${CMAKE_SOURCE_DIR}/strings/decimal.cc +@@ -112,13 +115,16 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) -@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER) - ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema) - ENDIF() +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc) TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl) SET_TARGET_PROPERTIES(mysql_ssl_rsa_setup PROPERTIES LINKER_LANGUAGE CXX) +ENDIF() # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) -@@ -123,11 +129,6 @@ ENDIF(WIN32) - - SET_TARGET_PROPERTIES ( - mysql_plugin -- mysqlcheck -- mysqldump -- mysqlimport -- mysqlshow -- mysqlslap - PROPERTIES HAS_CXX TRUE) - - ADD_DEFINITIONS(-DHAVE_DLOPEN) Index: databases/mysql80-server/files/patch-cmake_plugin.cmake =================================================================== Index: databases/mysql80-server/files/patch-cmd-line-utils_libedit_chartype.h =================================================================== Index: databases/mysql80-server/files/patch-cmd-line-utils_libedit_vi.c =================================================================== Index: databases/mysql80-server/files/patch-include_CMakeLists.txt =================================================================== Index: databases/mysql80-server/files/patch-include_my__compare.h =================================================================== Index: databases/mysql80-server/files/patch-include_my__thread__os__id.h =================================================================== Index: databases/mysql80-server/files/patch-include_myisam.h =================================================================== Index: databases/mysql80-server/files/patch-libmysql_CMakeLists.txt =================================================================== Index: databases/mysql80-server/files/patch-libservices_CMakeLists.txt =================================================================== Index: databases/mysql80-server/files/patch-plugin_password__validation_validate__password.cc =================================================================== Index: databases/mysql80-server/files/patch-rapid_plugin_x_CMakeLists.txt =================================================================== Index: databases/mysql80-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt =================================================================== Index: databases/mysql80-server/files/patch-scripts_CMakeLists.txt =================================================================== Index: databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc =================================================================== Index: databases/mysql80-server/files/patch-sql_sql__view.cc =================================================================== --- databases/mysql80-server/files/patch-sql_sql__view.cc (.../mysql57-server) (revision 430546) +++ databases/mysql80-server/files/patch-sql_sql__view.cc (.../mysql80-server) (nonexistent) @@ -1,63 +0,0 @@ ---- sql/sql_view.cc.orig 2016-03-28 18:06:12 UTC -+++ sql/sql_view.cc -@@ -773,46 +773,46 @@ static const int required_view_parameter - */ - static File_option view_parameters[]= - {{{ C_STRING_WITH_LEN("query")}, -- my_offsetof(TABLE_LIST, select_stmt), -+ static_cast(my_offsetof(TABLE_LIST, select_stmt)), - FILE_OPTIONS_ESTRING}, - {{ C_STRING_WITH_LEN("md5")}, -- my_offsetof(TABLE_LIST, md5), -+ static_cast(my_offsetof(TABLE_LIST, md5)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("updatable")}, -- my_offsetof(TABLE_LIST, updatable_view), -+ static_cast(my_offsetof(TABLE_LIST, updatable_view)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("algorithm")}, -- my_offsetof(TABLE_LIST, algorithm), -+ static_cast(my_offsetof(TABLE_LIST, algorithm)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("definer_user")}, -- my_offsetof(TABLE_LIST, definer.user), -+ static_cast(my_offsetof(TABLE_LIST, definer.user)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("definer_host")}, -- my_offsetof(TABLE_LIST, definer.host), -+ static_cast(my_offsetof(TABLE_LIST, definer.host)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("suid")}, -- my_offsetof(TABLE_LIST, view_suid), -+ static_cast(my_offsetof(TABLE_LIST, view_suid)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("with_check_option")}, -- my_offsetof(TABLE_LIST, with_check), -+ static_cast(my_offsetof(TABLE_LIST, with_check)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("timestamp")}, -- my_offsetof(TABLE_LIST, timestamp), -+ static_cast(my_offsetof(TABLE_LIST, timestamp)), - FILE_OPTIONS_TIMESTAMP}, - {{ C_STRING_WITH_LEN("create-version")}, -- my_offsetof(TABLE_LIST, file_version), -+ static_cast(my_offsetof(TABLE_LIST, file_version)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("source")}, -- my_offsetof(TABLE_LIST, source), -+ static_cast(my_offsetof(TABLE_LIST, source)), - FILE_OPTIONS_ESTRING}, - {{(char*) STRING_WITH_LEN("client_cs_name")}, -- my_offsetof(TABLE_LIST, view_client_cs_name), -+ static_cast(my_offsetof(TABLE_LIST, view_client_cs_name)), - FILE_OPTIONS_STRING}, - {{(char*) STRING_WITH_LEN("connection_cl_name")}, -- my_offsetof(TABLE_LIST, view_connection_cl_name), -+ static_cast(my_offsetof(TABLE_LIST, view_connection_cl_name)), - FILE_OPTIONS_STRING}, - {{(char*) STRING_WITH_LEN("view_body_utf8")}, -- my_offsetof(TABLE_LIST, view_body_utf8), -+ static_cast(my_offsetof(TABLE_LIST, view_body_utf8)), - FILE_OPTIONS_ESTRING}, - {{NullS, 0}, 0, - FILE_OPTIONS_STRING} Property changes on: databases/mysql80-server/files/patch-sql_sql__view.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: databases/mysql80-server/files/patch-sql_sys__vars.cc =================================================================== Index: databases/mysql80-server/files/patch-storage_innobase_include_srv0mon.h =================================================================== Index: databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.c =================================================================== Index: databases/mysql80-server/files/patch-support-files_CMakeLists.txt =================================================================== Index: databases/mysql80-server/files/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc =================================================================== Index: databases/mysql80-server/files/patch-man_CMakeLists.txt =================================================================== Index: databases/mysql80-server/files/extra-patch-config.h.cmake =================================================================== Index: databases/mysql80-server/pkg-plist =================================================================== --- databases/mysql80-server/pkg-plist (.../mysql57-server) (revision 430546) +++ databases/mysql80-server/pkg-plist (.../mysql80-server) (working copy) @@ -1,163 +1,160 @@ +bin/ibd2sdi bin/innochecksum -bin/lz4_decompress bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack -bin/mysql_install_db -bin/mysql_plugin bin/mysql_secure_installation bin/mysql_tzinfo_to_sql bin/mysql_upgrade bin/mysqld_multi bin/mysqld_safe bin/mysqldumpslow bin/mysqltest bin/mysqlxtest bin/perror bin/replace bin/resolve_stack_dump bin/resolveip -bin/zlib_decompress lib/mysql/libmysqld.a lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth.so lib/mysql/plugin/auth_test_plugin.so -lib/mysql/plugin/connection_control.so +lib/mysql/plugin/component_example_component1.so +lib/mysql/plugin/component_example_component2.so +lib/mysql/plugin/component_example_component3.so lib/mysql/plugin/daemon_example.ini -lib/mysql/plugin/group_replication.so %%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so lib/mysql/plugin/keyring_file.so lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/libtest_framework.so lib/mysql/plugin/libtest_services.so lib/mysql/plugin/libtest_services_threaded.so lib/mysql/plugin/libtest_session_detach.so lib/mysql/plugin/libtest_session_in_thd.so lib/mysql/plugin/libtest_session_info.so lib/mysql/plugin/libtest_sql_2_sessions.so lib/mysql/plugin/libtest_sql_all_col_types.so lib/mysql/plugin/libtest_sql_cmds_1.so lib/mysql/plugin/libtest_sql_commit.so lib/mysql/plugin/libtest_sql_complex.so lib/mysql/plugin/libtest_sql_errors.so lib/mysql/plugin/libtest_sql_lock.so lib/mysql/plugin/libtest_sql_processlist.so lib/mysql/plugin/libtest_sql_replication.so lib/mysql/plugin/libtest_sql_shutdown.so lib/mysql/plugin/libtest_sql_sqlmode.so lib/mysql/plugin/libtest_sql_stored_procedures_functions.so lib/mysql/plugin/libtest_sql_views_triggers.so lib/mysql/plugin/libtest_x_sessions_deinit.so lib/mysql/plugin/libtest_x_sessions_init.so lib/mysql/plugin/locking_service.so lib/mysql/plugin/mypluglib.so lib/mysql/plugin/mysql_no_login.so lib/mysql/plugin/mysqlx.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/replication_observers_example_plugin.so lib/mysql/plugin/rewrite_example.so lib/mysql/plugin/rewriter.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/test_security_context.so lib/mysql/plugin/keyring_udf.so lib/mysql/plugin/test_udf_services.so lib/mysql/plugin/validate_password.so lib/mysql/plugin/version_token.so libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc libexec/mysqld man/man1/my_print_defaults.1.gz man/man1/myisam_ftdump.1.gz man/man1/myisamchk.1.gz man/man1/myisamlog.1.gz man/man1/myisampack.1.gz man/man1/mysql.server.1.gz -man/man1/mysql_install_db.1.gz -man/man1/mysql_plugin.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/mysqldumpslow.1.gz man/man1/mysqlman.1.gz man/man1/mysqltest.1.gz man/man1/perror.1.gz man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz man/man8/mysqld.8.gz %%DATADIR%%/bulgarian/errmsg.sys %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml %%DATADIR%%/charsets/ascii.xml %%DATADIR%%/charsets/cp1250.xml %%DATADIR%%/charsets/cp1251.xml %%DATADIR%%/charsets/cp1256.xml %%DATADIR%%/charsets/cp1257.xml %%DATADIR%%/charsets/cp850.xml %%DATADIR%%/charsets/cp852.xml %%DATADIR%%/charsets/cp866.xml %%DATADIR%%/charsets/dec8.xml %%DATADIR%%/charsets/geostd8.xml %%DATADIR%%/charsets/greek.xml %%DATADIR%%/charsets/hebrew.xml %%DATADIR%%/charsets/hp8.xml %%DATADIR%%/charsets/keybcs2.xml %%DATADIR%%/charsets/koi8r.xml %%DATADIR%%/charsets/koi8u.xml %%DATADIR%%/charsets/latin1.xml %%DATADIR%%/charsets/latin2.xml %%DATADIR%%/charsets/latin5.xml %%DATADIR%%/charsets/latin7.xml %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dictionary.txt %%DATADIR%%/dutch/errmsg.sys %%DATADIR%%/english/errmsg.sys %%DATADIR%%/errmsg-utf8.txt %%DATADIR%%/estonian/errmsg.sys %%DATADIR%%/fill_help_tables.sql %%DATADIR%%/french/errmsg.sys %%DATADIR%%/german/errmsg.sys %%DATADIR%%/greek/errmsg.sys %%DATADIR%%/hungarian/errmsg.sys %%DATADIR%%/innodb_memcached_config.sql %%DATADIR%%/install_rewriter.sql %%DATADIR%%/italian/errmsg.sys %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/magic %%DATADIR%%/my-default.cnf %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/mysql_security_commands.sql %%DATADIR%%/mysql_sys_schema.sql %%DATADIR%%/mysql_system_tables.sql %%DATADIR%%/mysql_system_tables_data.sql %%DATADIR%%/mysql_test_data_timezone.sql %%DATADIR%%/mysqld_multi.server %%DATADIR%%/norwegian-ny/errmsg.sys %%DATADIR%%/norwegian/errmsg.sys %%DATADIR%%/polish/errmsg.sys %%DATADIR%%/portuguese/errmsg.sys %%DATADIR%%/romanian/errmsg.sys %%DATADIR%%/russian/errmsg.sys %%DATADIR%%/serbian/errmsg.sys %%DATADIR%%/slovak/errmsg.sys %%DATADIR%%/spanish/errmsg.sys %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/ukrainian/errmsg.sys %%DATADIR%%/uninstall_rewriter.sql +@dir lib/mysql/plugin/debug @sample(root,wheel,0644) %%ETCDIR%%/my.cnf.sample @dir(mysql,mysql,0750) %%ETCDIR%%/keyring @dir(mysql,mysql,0750) %%MY_SECDIR%% @dir(mysql,mysql,0750) %%MY_TMPDIR%% Index: databases/mysql80-server/pkg-message =================================================================== --- databases/mysql80-server/pkg-message (.../mysql57-server) (revision 430546) +++ databases/mysql80-server/pkg-message (.../mysql80-server) (working copy) @@ -1,20 +1,16 @@ ***************************************************************************** Remember to run mysql_upgrade the first time you start the MySQL server after an upgrade from an earlier version. Initial password for first time use of MySQL is saved in $HOME/.mysql_secret ie. when you want to use "mysql -u root -p" first you should see password in /root/.mysql_secret ***************************************************************************** ***************************************************************************** -The default location for my.cnf has changed from "/var/db/mysql/my.cnf" to -"/usr/local/etc/mysql/my.cnf". Existing my.cnf files must be merged manually -with the new default and moved to the new location. To continue using the -my.cnf file at the old location, set "mysql_optfile" in /etc/rc.conf to -point to the location of the existing my.cnf file. +WARNING: THIS IS STILL-IN-DEV PROJECT! USE WITH CAUTION ON PRODUCTION ENVS! ***************************************************************************** Index: databases/mysql80-server/pkg-descr =================================================================== --- databases/mysql80-server/pkg-descr (.../mysql57-server) (revision 430546) +++ databases/mysql80-server/pkg-descr (.../mysql80-server) (working copy) @@ -1,4 +1,15 @@ MySQL is a very fast, multi-threaded, multi-user and robust SQL (Structured Query Language) database server. +The new features in MySQL 8.0. In addition to Data Dictionnary and CTEs are: + Move to utf8(mb4) as MySQL's default character set + Language specific case insensitive collation for 21 languages (utf8) + Invisible index + Descending indexes + Improve usability of UUID and IPV6 manipulations + SQL roles - SET PERSIST for global variable values + Performance Schema, instrumenting data locks + Performance Schema, instrumenting error messages + Improved cost model with histograms + WWW: http://www.mysql.com/