diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2015-11-18 10:51:14 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2015-11-18 10:51:14 +0000 |
| commit | e30954c60548a0f825d2b93f09f2fadd66092b79 (patch) | |
| tree | 261d184f3fd0d5d98cd25fa7275b2bc100655862 | |
| parent | b25dc6aa1f1ce6f3644662e32d09fced1d134f62 (diff) | |
| download | ports-e30954c60548a0f825d2b93f09f2fadd66092b79.tar.gz ports-e30954c60548a0f825d2b93f09f2fadd66092b79.zip | |
Notes
21 files changed, 11 insertions, 1262 deletions
@@ -7938,3 +7938,6 @@ deskutils/steadyflow||2015-11-13|Has expired: No new releases for years, conside net/py-smb|net/py-pysmb|2015-11-14|Renamed to match upstream naming devel/py-asn1-modules|devel/py-pyasn1-modules|2015-11-14|Renamed to match upstream naming devel/py-experimental.cssselect||2015-11-15|The only consumer of this port switched to www/py-cssselect +databases/mariadb-client||2015-11-18|Vulnerable, no updates expected, use mariadb55 or mariadb100 instead +databases/mariadb-server||2015-11-18|Vulnerable, no updates expected, use mariadb55 or mariadb100 instead +databases/mariadb-scripts||2015-11-18|Vulnerable, no updates expected, use mariadb55 or mariadb100 instead diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk index 26ab48d50222..d16e4df8bc7a 100644 --- a/Mk/bsd.database.mk +++ b/Mk/bsd.database.mk @@ -101,7 +101,6 @@ WARNING+= "DEFAULT_MYSQL_VER is defined, consider using DEFAULT_VERSIONS=mysql=$ DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//} # MySQL client version currently supported. MYSQL51_LIBVER= 16 -MYSQL53m_LIBVER= 16 MYSQL55_LIBVER= 18 MYSQL55m_LIBVER= 18 MYSQL55p_LIBVER= 18 @@ -145,26 +144,17 @@ IGNORE= cannot install: MySQL versions mismatch: mysql${_MYSQL_VER}-client is i .endif .endif -.if (${MYSQL_VER} == "53m") -_MYSQL_CLIENT= databases/mariadb-client -_MYSQL_SERVER= databases/mariadb-server -.elif (${MYSQL_VER} == "55m") -_MYSQL_CLIENT= databases/mariadb55-client -_MYSQL_SERVER= databases/mariadb55-server -.elif (${MYSQL_VER} == "100m") -_MYSQL_CLIENT= databases/mariadb100-client -_MYSQL_SERVER= databases/mariadb100-server -.elif (${MYSQL_VER} == "55p") -_MYSQL_CLIENT= databases/percona55-client -_MYSQL_SERVER= databases/percona55-server -.elif (${MYSQL_VER} == "56p") -_MYSQL_CLIENT= databases/percona56-client -_MYSQL_SERVER= databases/percona56-server +.if (${MYSQL_VER:C/[0-9]*//} == "m") +_MYSQL_FLAVOUR= mariadb +.elif (${MYSQL_VER:C/[0-9]*//} == "p") +_MYSQL_FLAVOUR= percona .else -_MYSQL_CLIENT= databases/mysql${MYSQL_VER}-client -_MYSQL_SERVER= databases/mysql${MYSQL_VER}-server +_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) diff --git a/databases/Makefile b/databases/Makefile index 1b0461491603..f49b52eb2987 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -180,9 +180,6 @@ SUBDIR += luasql-postgres SUBDIR += luasql-sqlite3 SUBDIR += mantis - SUBDIR += mariadb-client - SUBDIR += mariadb-scripts - SUBDIR += mariadb-server SUBDIR += mariadb100-client SUBDIR += mariadb100-server SUBDIR += mariadb55-client diff --git a/databases/mariadb-client/Makefile b/databases/mariadb-client/Makefile deleted file mode 100644 index 07f18a5b8664..000000000000 --- a/databases/mariadb-client/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# $FreeBSD$ - -PORTNAME= mariadb -PORTREVISION= 7 -PKGNAMESUFFIX= 53-client - -COMMENT= Database client - drop-in replacement for MySQL - -MASTERDIR= ${.CURDIR}/../mariadb-server -MARIADB_CLIENT_SLAVE= yes - -USES+= readline -CONFIGURE_ARGS= --without-server --with-libevent=no - -OPTIONS_DEFINE= THREADSAFE -OPTIONS_DEFAULT= THREADSAFE -THREADSAFE_DESC= Build thread-safe client - -CONFLICTS= mariadb5[4-9]-client-* \ - mariadb1[0-9][0-9]-client-* \ - mysql*-client-* \ - percona*-client-* - -PATCHDIR= ${.CURDIR}/files -PLIST= ${.CURDIR}/pkg-plist -PKGMESSAGE= ${.CURDIR}/pkg-message - -MANS= mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \ - mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \ - mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 mysqltest.1 - -EXTRA_PATCHES= ${MASTERDIR}/files/patch-* -MDB_CLIENT_SUBDIRS= include sql-common cmd-line-utils scripts strings regex mysys dbug extra libmysql libmysql_r client @man_dirs@ - -post-patch: - @${REINPLACE_CMD} -e "s|%%SUBDIRS%%|${MDB_CLIENT_SUBDIRS}|" ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/Makefile.in ${WRKSRC}/mysys/Makefile.in ${WRKSRC}/dbug/Makefile.in - @${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in - @${REINPLACE_CMD} -e "s|%%MANS%%|${MANS}|" ${WRKSRC}/man/Makefile.in - @${REINPLACE_CMD} -e "s|^\(install-man: install-man1\).*|\1|" ${WRKSRC}/man/Makefile.in - @${REINPLACE_CMD} -e "s|-fno-implicit-templates||g" ${WRKSRC}/configure - -post-install: - ${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${STAGEDIR}${PREFIX}/share/aclocal/ - -post-stage: - @${RM} -rf ${STAGEDIR}/${PREFIX}/include/mysql/private - -.include "${MASTERDIR}/Makefile" diff --git a/databases/mariadb-client/files/patch-scripts__Makefile.in b/databases/mariadb-client/files/patch-scripts__Makefile.in deleted file mode 100644 index befd7d01082d..000000000000 --- a/databases/mariadb-client/files/patch-scripts__Makefile.in +++ /dev/null @@ -1,39 +0,0 @@ ---- scripts/Makefile.in.orig 2012-04-20 18:35:25.000000000 +0200 -+++ scripts/Makefile.in 2012-04-20 18:38:15.000000000 +0200 -@@ -495,22 +495,7 @@ - BUILT_SOURCES = mysql_fix_privilege_tables.sql \ - mysql_fix_privilege_tables_sql.c - --bin_SCRIPTS = @server_scripts@ \ -- msql2mysql \ -- mysql_config \ -- mysql_fix_privilege_tables \ -- mysql_fix_extensions \ -- mysql_setpermission \ -- mysql_secure_installation \ -- mysql_zap \ -- mysqlaccess \ -- mysqlbug \ -- mysql_convert_table_format \ -- mysql_find_rows \ -- mysqlhotcopy \ -- mytop \ -- mysqldumpslow \ -- mysqld_multi -+bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug - - noinst_SCRIPTS = make_binary_distribution \ - make_sharedlib_distribution \ -@@ -548,11 +533,7 @@ - mysql_system_tables_fix.sql \ - CMakeLists.txt - --dist_pkgdata_DATA = fill_help_tables.sql \ -- mysql_fix_privilege_tables.sql \ -- mysql_system_tables.sql \ -- mysql_system_tables_data.sql \ -- mysql_test_data_timezone.sql -+dist_pkgdata_DATA = mysql_fix_privilege_tables.sql - - CLEANFILES = @server_scripts@ \ - make_binary_distribution \ diff --git a/databases/mariadb-client/pkg-message b/databases/mariadb-client/pkg-message deleted file mode 100644 index 2cf54a1cf930..000000000000 --- a/databases/mariadb-client/pkg-message +++ /dev/null @@ -1,15 +0,0 @@ -* * * * * * * * * * * * * * * * * * * * * * * * - -Please be aware the database client is vulnerable -to CVE-2015-3152 - SSL Downgrade aka "BACKRONYM". -You may find more information at the following URL: - -http://www.vuxml.org/freebsd/36bd352d-299b-11e5-86ff-14dae9d210b8.html - -Although this database client is not listed as -"affected", it is vulnerable and will not be -receiving a patch. Please take note of this when -deploying this software. - -* * * * * * * * * * * * * * * * * * * * * * * * - diff --git a/databases/mariadb-client/pkg-plist b/databases/mariadb-client/pkg-plist deleted file mode 100644 index c91c176323f0..000000000000 --- a/databases/mariadb-client/pkg-plist +++ /dev/null @@ -1,79 +0,0 @@ -bin/mysql -bin/mysql_config -bin/mysql_fix_privilege_tables -bin/mysql_upgrade -bin/mysqladmin -bin/mysqlbinlog -bin/mysqlbug -bin/mysqlcheck -bin/mysqldump -bin/mysqlimport -bin/mysqlshow -bin/mysqlslap -bin/mysqltest -include/mysql/client_plugin.h -include/mysql/decimal.h -include/mysql/errmsg.h -include/mysql/keycache.h -include/mysql/m_ctype.h -include/mysql/m_string.h -include/mysql/ma_dyncol.h -include/mysql/my_alloc.h -include/mysql/my_attribute.h -include/mysql/my_compiler.h -include/mysql/my_config.h -include/mysql/my_dbug.h -include/mysql/my_decimal_limits.h -include/mysql/my_dir.h -include/mysql/my_getopt.h -include/mysql/my_global.h -include/mysql/my_list.h -include/mysql/my_net.h -include/mysql/my_no_pthread.h -include/mysql/my_pthread.h -include/mysql/my_sys.h -include/mysql/my_valgrind.h -include/mysql/my_xml.h -include/mysql/mysql.h -include/mysql/mysql_com.h -include/mysql/mysql_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_auth.h -include/mysql/plugin_auth_common.h -include/mysql/readline.h -include/mysql/service_my_snprintf.h -include/mysql/service_progress_report.h -include/mysql/service_thd_alloc.h -include/mysql/services.h -include/mysql/sql_common.h -include/mysql/sql_state.h -include/mysql/sslopt-case.h -include/mysql/sslopt-longopts.h -include/mysql/sslopt-vars.h -include/mysql/typelib.h -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.16 -lib/mysql/libmysqlclient.so.16.0.0 -lib/mysql/libmysqlclient_r.a -lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.16 -lib/mysql/libmysqlclient_r.so.16.0.0 -man/man1/mysql.1.gz -man/man1/mysql_config.1.gz -man/man1/mysql_upgrade.1.gz -man/man1/mysqladmin.1.gz -man/man1/mysqlbinlog.1.gz -man/man1/mysqlbug.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 -man/man1/mysqltest.1.gz -share/aclocal/mysql.m4 -%%DATADIR%%/mysql_fix_privilege_tables.sql diff --git a/databases/mariadb-scripts/Makefile b/databases/mariadb-scripts/Makefile deleted file mode 100644 index effc8eec3a6b..000000000000 --- a/databases/mariadb-scripts/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# $FreeBSD$ - -PORTNAME= mariadb -PKGNAMESUFFIX= 53-scripts - -COMMENT= Scripts for mariadb - drop-in replacement for MySQL - -LICENSE= GPLv2 - -USES= perl5 - -MASTERDIR= ${.CURDIR}/../mariadb-server -MARIADB_SCRIPTS_SLAVE= yes - -CONFLICTS= mysql[0-9][0-9]-scripts-* \ - mytop-[0-9]* - -PATCHDIR= ${.CURDIR}/files -PLIST= ${.CURDIR}/pkg-plist - -MANS= msql2mysql.1 mysql_convert_table_format.1 mysql_find_rows.1 \ - mysql_fix_extensions.1 mysql_secure_installation.1 \ - mysql_setpermission.1 mysql_zap.1 mysqlaccess.1 \ - mysqldumpslow.1 mysqlhotcopy.1 mysqld_multi.1 - -EXTRA_PATCHES= ${MASTERDIR}/files/patch-Makefile.in ${MASTERDIR}/files/patch-man__Makefile.in -MDB_SCRIPTS_SUBDIRS= scripts @man_dirs@ - -post-patch: - @${REINPLACE_CMD} -e "s|%%SUBDIRS%%|${MDB_SCRIPTS_SUBDIRS}|" ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e "s|%%MANS%%|${MANS}|" ${WRKSRC}/man/Makefile.in - @${REINPLACE_CMD} -e "s|^\(install-man: install-man1\).*|\1|" ${WRKSRC}/man/Makefile.in - -.include "${MASTERDIR}/Makefile" diff --git a/databases/mariadb-scripts/files/patch-scripts__Makefile.in b/databases/mariadb-scripts/files/patch-scripts__Makefile.in deleted file mode 100644 index bca4397a521f..000000000000 --- a/databases/mariadb-scripts/files/patch-scripts__Makefile.in +++ /dev/null @@ -1,29 +0,0 @@ ---- scripts/Makefile.in.orig 2012-04-28 16:50:52.000000000 +0200 -+++ scripts/Makefile.in 2012-04-28 16:50:04.000000000 +0200 -@@ -495,16 +495,12 @@ - BUILT_SOURCES = mysql_fix_privilege_tables.sql \ - mysql_fix_privilege_tables_sql.c - --bin_SCRIPTS = @server_scripts@ \ -- msql2mysql \ -- mysql_config \ -- mysql_fix_privilege_tables \ -+bin_SCRIPTS = msql2mysql \ - mysql_fix_extensions \ - mysql_setpermission \ - mysql_secure_installation \ - mysql_zap \ - mysqlaccess \ -- mysqlbug \ - mysql_convert_table_format \ - mysql_find_rows \ - mysqlhotcopy \ -@@ -811,7 +807,7 @@ - uninstall: uninstall-am - - install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am - - installcheck: installcheck-am - install-strip: diff --git a/databases/mariadb-scripts/pkg-plist b/databases/mariadb-scripts/pkg-plist deleted file mode 100644 index 686d2c2ae1b5..000000000000 --- a/databases/mariadb-scripts/pkg-plist +++ /dev/null @@ -1,23 +0,0 @@ -bin/msql2mysql -bin/mytop -bin/mysql_convert_table_format -bin/mysql_find_rows -bin/mysql_fix_extensions -bin/mysql_secure_installation -bin/mysql_setpermission -bin/mysql_zap -bin/mysqlaccess -bin/mysqld_multi -bin/mysqldumpslow -bin/mysqlhotcopy -man/man1/msql2mysql.1.gz -man/man1/mysql_convert_table_format.1.gz -man/man1/mysql_find_rows.1.gz -man/man1/mysql_fix_extensions.1.gz -man/man1/mysql_secure_installation.1.gz -man/man1/mysql_setpermission.1.gz -man/man1/mysql_zap.1.gz -man/man1/mysqlaccess.1.gz -man/man1/mysqld_multi.1.gz -man/man1/mysqldumpslow.1.gz -man/man1/mysqlhotcopy.1.gz diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile deleted file mode 100644 index 63d23cb03d3d..000000000000 --- a/databases/mariadb-server/Makefile +++ /dev/null @@ -1,337 +0,0 @@ -# $FreeBSD$ - -PORTNAME= mariadb -PORTVERSION= 5.3.12 -PORTREVISION?= 6 -CATEGORIES= databases ipv6 -MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://mirror.aarnet.edu.au/pub/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://mirror2.hs-esslingen.de/pub/Mirrors/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://gd.tuwien.ac.at/db/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ - http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ -PKGNAMESUFFIX?= 53-server - -MAINTAINER= spil.oss@gmail.com -COMMENT= Database server - drop-in replacement for MySQL - -LICENSE= GPLv2 - -CONFLICTS?= mariadb5[4-9]-server-* \ - mariadb1[0-9][0-9]-server-* \ - mysql*-server-* \ - percona*-server-* - -GNU_CONFIGURE= yes -USES+= libtool shebangfix -SHEBANG_FILES= scripts/* - -.if !defined(MARIADB_CLIENT_SLAVE) -USE_MYSQL= yes -WANT_MYSQL_VER= 53m -.endif - -.if !defined(MARIADB_SCRIPTS_SLAVE) -CPPFLAGS+= -I${LOCALBASE}/include - -DATADIR= ${PREFIX}/share/mysql -USE_LDCONFIG= ${PREFIX}/lib/mysql - -USERS= mysql -GROUPS= mysql - -OPTIONS_DEFINE+= STATIC SSL OPENSSL -OPTIONS_DEFAULT+= SSL -STATIC_DESC= Statically link executables (not on 9.x) -SSL_DESC= Activate SSL support -OPENSSL_DESC= Use OpenSSL instead of bundled yassl - -.if !defined(MARIADB_CLIENT_SLAVE) -LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 - -MANS= innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \ - myisamlog.1 myisampack.1 mysql.server.1 mysql_client_test_embedded.1 \ - mysql_install_db.1 mysql_tzinfo_to_sql.1 mysql_waitpid.1 mysqld_safe.1 \ - mysqltest_embedded.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 - -INFO= mysql - -CONFIGURE_ARGS+= --with-embedded-server --enable-local-infile -USE_RC_SUBR= mysql-server - -OPTIONS_DEFINE+= ARIADB ARCHIVE BLACKHOLE SPHINX FEDX FEDERATED XTRADB INNODB \ - OQGRAPH PBXT PARTITION HANDLERSOCKET EXAMPLES MAXKEY - -ARIADB_DESC= Aria storage engine -ARCHIVE_DESC= Archive storage plugin -BLACKHOLE_DESC= Blackhole storage engine -SPHINX_DESC= SE client for Sphinx search daemon -FEDX_DESC= FederatedX (new) storage engine -FEDERATED_DESC= Federated (old) storage engine -XTRADB_DESC= XtraDB (InnoDB replacement) engine -INNODB_DESC= InnoDB (old) engine -OQGRAPH_DESC= Open Query Graph Computation engine -PBXT_DESC= MVCC-based transactional engine -PARTITION_DESC= Partitioning support -HANDLERSOCKET_DESC= HandlerSocket support -NDB_DESC= Enable NDB support (implies PARTITION) -EXAMPLES_DESC= Example engine,daemon and ftsearch plugins -MAXKEY_DESC= Change max key length from 1000 to 4000 - -OPTIONS_DEFAULT+= ARIADB ARCHIVE BLACKHOLE SPHINX FEDX XTRADB HANDLERSOCKET -.endif # .if !defined(MARIADB_CLIENT_SLAVE) - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MSTATIC} -BROKEN= WITH_STATIC is not functional on 9-current -.endif - -.if ${ARCH} == "i386" || ${ARCH} == "amd64" -CONFIGURE_ARGS+= --enable-assembler -.endif -.if ${ARCH} == "i386" -CONFIGURE_ARGS+= --with-big-tables -.endif -.if ${PORT_OPTIONS:MSSL} -.if ${PORT_OPTIONS:MOPENSSL} -USE_OPENSSL= yes -CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} -.else -CONFIGURE_ARGS+= --with-ssl=bundled -MDB_EXTRA_SUBDIRS= extra -.endif -.else -CONFIGURE_ARGS+= --without-ssl -.endif -.if ${PORT_OPTIONS:MSTATIC} -CONFIGURE_ARGS+= --with-client-ldflags="-static -all-static" -.endif -.if ${PORT_OPTIONS:MTHREADSAFE} -CONFIGURE_ARGS+= --enable-thread-safe-client -.endif - -.if !defined(MARIADB_CLIENT_SLAVE) -.if ${PORT_OPTIONS:MARIADB} -PLIST_SUB+= ARIADB="" -CONFIGURE_ARGS+= --with-plugin-aria --with-aria-tmp-tables -PLUGINS+= aria -.else -CONFIGURE_ARGS+= --without-plugin-aria -PLIST_SUB+= ARIADB="@comment " -.endif -.if ${PORT_OPTIONS:MSPHINX} -PLIST_SUB+= SPHINX="" -PLUGINS+= sphinx -.else -CONFIGURE_ARGS+= --without-plugin-sphinx -PLIST_SUB+= SPHINX="@comment " -.endif -.if ${PORT_OPTIONS:MARCHIVE} -PLIST_SUB+= ARCHIVE="" -PLUGINS+= archive -.else -CONFIGURE_ARGS+= --without-plugin-archive -PLIST_SUB+= ARCHIVE="@comment " -.endif -.if ${PORT_OPTIONS:MBLACKHOLE} -PLIST_SUB+= BLACKHOLE="" -PLUGINS+= blackhole -.else -CONFIGURE_ARGS+= --without-plugin-blackhole -PLIST_SUB+= BLACKHOLE="@comment " -.endif -.if ${PORT_OPTIONS:MFEDERATED} -PLIST_SUB+= FEDERATED="" -PLUGINS+= federated -.else -CONFIGURE_ARGS+= --without-plugin-federated -PLIST_SUB+= FEDERATED="@comment " -.endif -.if ${PORT_OPTIONS:MFEDX} -PLIST_SUB+= FEDERATEDX="" -PLUGINS+= federatedx -.else -CONFIGURE_ARGS+= --without-plugin-federatedx -PLIST_SUB+= FEDERATEDX="@comment " -.endif -.if ${PORT_OPTIONS:MINNODB} -PLIST_SUB+= INNODB="" -PLUGINS+= innodb_plugin -.else -CONFIGURE_ARGS+= --without-plugin-innodb_plugin -PLIST_SUB+= INNODB="@comment " -.endif -.if ${PORT_OPTIONS:MXTRADB} -PLIST_SUB+= XTRADB="" -PLUGINS+= xtradb -.else -CONFIGURE_ARGS+= --without-plugin-xtradb -PLIST_SUB+= XTRADB="@comment " -.endif -.if ${PORT_OPTIONS:MHANDLERSOCKET} -PLIST_SUB+= HANDLERSOCKET="" -PLUGINS+= handlersocket -.else -CONFIGURE_ARGS+= --without-plugin-handlersocket -PLIST_SUB+= HANDLERSOCKET="@comment " -.endif -.if ${PORT_OPTIONS:MOQGRAPH} -CONFIGURE_ARGS+= --with-plugin-oqgraph -PLIST_SUB+= OQGRAPH="" -LIB_DEPENDS+= libboost_system.so:${PORTSDIR}/devel/boost-libs -PLUGINS+= oqgraph -.else -CONFIGURE_ARGS+= --without-plugin-oqgraph -PLIST_SUB+= OQGRAPH="@comment " -.endif -.if ${PORT_OPTIONS:MPBXT} -CONFIGURE_ARGS+= --with-plugin-pbxt -PLIST_SUB+= PBXT="" -PLUGINS+= pbxt -.else -CONFIGURE_ARGS+= --without-plugin-pbxt -PLIST_SUB+= PBXT="@comment " -.endif -.if ${PORT_OPTIONS:MEXAMPLES} -PLIST_SUB+= EXAMPLES="" -.else -CONFIGURE_ARGS+= --without-plugin-example --without-plugin-daemon_example --without-plugin-ftexample -PLIST_SUB+= EXAMPLES="@comment " -.endif -.if ${PORT_OPTIONS:MNDB} -CONFIGURE_ARGS+= --with-plugin-ndbcluster -WITH_PARTITION=yes -PLIST_SUB+= NDB="" -PLUGINS+= ndbcluster -.else -CONFIGURE_ARGS+= --without-plugin-ndbcluster -PLIST_SUB+= NDB="@comment " -.endif -.if ${PORT_OPTIONS:MPARTITION} -CONFIGURE_ARGS+= --with-plugin-partition -PLUGINS+= partition -.else -CONFIGURE_ARGS+= --without-plugin-partition -.endif -.if ${PORT_OPTIONS:MSTATIC} -CONFIGURE_ARGS+= --with-mysqld-ldflags="-static -all-static" --with-plugins="${PLUGINS}" -PLIST_SUB+= STATIC="@comment " -.else -PLIST_SUB+= STATIC="" -.endif -.if ${PORT_OPTIONS:MMAXKEY} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include__my_handler.h -.endif -.endif # .if !defined(MARIADB_CLIENT_SLAVE) - -.if defined(WITH_CHARSET) && ${WITH_CHARSET} != "" -CONFIGURE_ARGS+= --with-charset=${WITH_CHARSET} -.endif -.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != "" -CONFIGURE_ARGS+= --with-extra-charsets=${WITH_XCHARSET} -.else -CONFIGURE_ARGS+= --with-extra-charsets=complex -.endif -.if defined(WITH_COLLATION) && ${WITH_COLLATION} != "" -CONFIGURE_ARGS+= --with-collation=${WITH_COLLATION} -.endif - -.if ${PORT_OPTIONS:MSTATIC} && ( ${PORT_OPTIONS:MOPENSSL} || ${PORT_OPTIONS:MNDB} ) -pre-extract: - @${ECHO} '' - @${ECHO} "STATIC is not compatible with OPENSSL or NDB" - @${ECHO} '' - @${FALSE} -.endif - -.if !defined(MARIADB_CLIENT_SLAVE) -.if empty(PORT_OPTIONS:MSTATIC) -SUB_FILES= pkg-message -.endif - -pre-fetch: - @${ECHO} '' - @${ECHO} ' The following configuration options can be set in /etc/make.conf' - @${ECHO} '' - @${ECHO} " WITH_COLLATION=collate" - @${ECHO} " Default collation (default: latin1_swedish_ci, selected: ${WITH_COLLATION})." - @${ECHO} " WITH_CHARSET=charset" - @${ECHO} " Primary built-in charset (default: latin1, selected: ${WITH_CHARSET})." - @${ECHO} " WITH_XCHARSET=list" - @${ECHO} " Other built-in charsets (default: complex, selected: ${WITH_XCHARSET})." - @${ECHO} '' - -EXTRA_PATCHES+= ${FILESDIR}/scripts__Makefile.in -MDB_SERVER_SUBDIRS= include @docs_dirs@ sql-common libservices mysys strings dbug ${MDB_EXTRA_SUBDIRS} unittest cmd-line-utils libmysql scripts @sql_server_dirs@ @sql_server@ @man_dirs@ @libmysqld_dirs@ support-files - -post-patch: - @${REINPLACE_CMD} -e "s|%%SUBDIRS%%|${MDB_SERVER_SUBDIRS}|" ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e "s|%%MANS%%|${MANS}|" ${WRKSRC}/man/Makefile.in - @${REINPLACE_CMD} -e "s|^\(install:\).*|\1|" ${WRKSRC}/mysql-test/Makefile.in ${WRKSRC}/sql-bench/Makefile.in - @${REINPLACE_CMD} -e "s|^\(aclocal_DATA =\).*|\1|" ${WRKSRC}/support-files/Makefile.in - @${REINPLACE_CMD} -e "s|^\(pkginclude_HEADERS =\).*|\1|" ${WRKSRC}/cmd-line-utils/libedit/Makefile.in - @${REINPLACE_CMD} -e "s|^\(install-data-am:\) install-pkgincludeHEADERS|\1|g" ${WRKSRC}/extra/Makefile.in ${WRKSRC}/include/Makefile.in - @${REINPLACE_CMD} -e "s|^\(install-exec-am:\) install-pkglibLTLIBRARIES|\1|g" ${WRKSRC}/libmysql/Makefile.in - @${REINPLACE_CMD} -e "s|-fno-implicit-templates||g" ${WRKSRC}/configure - -post-stage: - # Delete files that should only be installed by client - @${RM} ${STAGEDIR}/${PREFIX}/bin/mysql_convert_table_format - @${RM} ${STAGEDIR}/${PREFIX}/bin/mysql_find_rows - @${RM} ${STAGEDIR}/${PREFIX}/bin/mysql_fix_extensions - @${RM} ${STAGEDIR}/${PREFIX}/bin/mysql_secure_installation - @${RM} ${STAGEDIR}/${PREFIX}/bin/mysql_setpermission - @${RM} ${STAGEDIR}/${PREFIX}/bin/mysql_zap - @${RM} ${STAGEDIR}/${PREFIX}/bin/mysqlaccess - @${RM} ${STAGEDIR}/${PREFIX}/bin/mysqld_multi - @${RM} ${STAGEDIR}/${PREFIX}/bin/mysqldumpslow - @${RM} ${STAGEDIR}/${PREFIX}/bin/mysqlhotcopy - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/client_plugin.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/decimal.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/errmsg.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/keycache.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/m_ctype.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/m_string.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/ma_dyncol.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_alloc.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_attribute.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_compiler.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_config.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_dbug.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_decimal_limits.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_dir.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_getopt.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_global.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_list.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_net.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_no_pthread.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_pthread.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_sys.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_valgrind.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_xml.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/mysql.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/mysql_com.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/mysql_embed.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/mysql_time.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/mysql_version.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/plugin.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/plugin_auth.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/plugin_auth_common.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/service_my_snprintf.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/service_progress_report.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/service_thd_alloc.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/services.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/sql_common.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/sslopt-case.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/sslopt-longopts.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/sslopt-vars.h - @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/typelib.h - -.endif # .if !defined(MARIADB_CLIENT_SLAVE) -.endif # .if !defined(MARIADB_SCRIPTS_SLAVE) - -.include <bsd.port.mk> diff --git a/databases/mariadb-server/distinfo b/databases/mariadb-server/distinfo deleted file mode 100644 index 1c4ef357cc4b..000000000000 --- a/databases/mariadb-server/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mariadb-5.3.12.tar.gz) = 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c -SIZE (mariadb-5.3.12.tar.gz) = 26880808 diff --git a/databases/mariadb-server/files/extra-patch-include__my_handler.h b/databases/mariadb-server/files/extra-patch-include__my_handler.h deleted file mode 100644 index 8a492b24b670..000000000000 --- a/databases/mariadb-server/files/extra-patch-include__my_handler.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_handler.h.orig 2012-08-30 21:44:42.000000000 +0200 -+++ include/my_handler.h 2012-08-30 21:45:23.000000000 +0200 -@@ -34,7 +34,7 @@ - But beware the dependency of HA_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. - */ - --#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ -+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ - #define HA_MAX_KEY_SEG 32 /* Max segments for key */ - - #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) diff --git a/databases/mariadb-server/files/mysql-server.in b/databases/mariadb-server/files/mysql-server.in deleted file mode 100644 index b0b6bff94c84..000000000000 --- a/databases/mariadb-server/files/mysql-server.in +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ -# -# PROVIDE: mysql -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Add the following line to /etc/rc.conf to enable mysql: -# mysql_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable MySQL. -# mysql_limits (bool): Set to "NO" by default. -# Set it to yes to run `limits -e -U mysql` -# just before mysql starts. -# mysql_dbdir (str): Default to "/var/db/mysql" -# Base database directory. -# mysql_args (str): Custom additional arguments to be passed -# to mysqld_safe (default empty). -# mysql_instances (str): Set to "" by default. -# If defined, list of instances to enable - -. /etc/rc.subr - -name="mysql" -rcvar=mysql_enable - -load_rc_config $name - -: ${mysql_enable="NO"} -: ${mysql_limits="NO"} -: ${mysql_user="mysql"} -: ${mysql_limits_args="-e -U $mysql_user"} -: ${mysql_dbdir="/var/db/mysql"} - -command="/usr/sbin/daemon" -procname="%%PREFIX%%/libexec/mysqld" -start_precmd="${name}_prestart" -start_postcmd="${name}_poststart" - -if [ -n "$2" ]; then - instance="$2" - load_rc_config ${name}_${instance} - case "$mysql_instances" in - "$2 "*|*" $2 "*|*" $2"|"$2") - eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" - eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}" - eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" - eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}" - eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"${mysql_limits_args}\"}" - 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 - pidfile="${mysql_dbdir}/`/bin/hostname`.pid" - fi -fi - -mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="--ldata=${mysql_dbdir}" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --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() -{ - if [ ! -d "${mysql_dbdir}/mysql/." ]; then - mysql_create_auth_tables || return 1 - fi - if checkyesno mysql_limits; then - eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null - else - return 0 - fi -} - -mysql_poststart() -{ - local timeout=15 - while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do - timeout=$(( timeout - 1 )) - sleep 1 - done - return 0 -} - -run_rc_command "$1" diff --git a/databases/mariadb-server/files/patch-Makefile.in b/databases/mariadb-server/files/patch-Makefile.in deleted file mode 100644 index d8ae17962963..000000000000 --- a/databases/mariadb-server/files/patch-Makefile.in +++ /dev/null @@ -1,30 +0,0 @@ ---- Makefile.in.orig 2011-03-01 22:25:33.000000000 -0800 -+++ Makefile.in 2011-06-03 15:19:13.000000000 -0700 -@@ -476,24 +476,9 @@ - CMakeLists.txt \ - config/ac-macros/libevent_configure.m4 - --SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ -- @readline_topdir@ sql-common scripts \ -- libservices \ -- @sql_union_dirs@ storage \ -- @sql_server@ @man_dirs@ tests \ -- netware @libmysqld_dirs@ \ -- mysql-test support-files sql-bench @tools_dirs@ \ -- win -- --DIST_SUBDIRS = . include Docs zlib \ -- cmd-line-utils sql-common scripts \ -- libservices \ -- strings mysys dbug extra regex libmysql libmysql_r client unittest storage plugin \ -- vio sql man tests \ -- netware libmysqld \ -- mysql-test support-files sql-bench server-tools \ -- win \ -- BUILD -+SUBDIRS = %%SUBDIRS%% -+ -+DIST_SUBDIRS = %%SUBDIRS%% - - DISTCLEANFILES = ac_available_languages_fragment - diff --git a/databases/mariadb-server/files/patch-man__Makefile.in b/databases/mariadb-server/files/patch-man__Makefile.in deleted file mode 100644 index 9326a9645bbb..000000000000 --- a/databases/mariadb-server/files/patch-man__Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- man/Makefile.in.orig 2011-03-01 22:25:06.000000000 -0800 -+++ man/Makefile.in 2011-06-01 22:55:49.000000000 -0700 -@@ -450,7 +450,7 @@ - yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ - yassl_thread_cxxflags = @yassl_thread_cxxflags@ - zlib_dir = @zlib_dir@ --man1_MANS = @man1_files@ -+man1_MANS = %%MANS%% - man8_MANS = @man8_files@ - EXTRA_DIST = $(man1_MANS) $(man8_MANS) - all: all-am diff --git a/databases/mariadb-server/files/pkg-message.in b/databases/mariadb-server/files/pkg-message.in deleted file mode 100644 index 831367e52575..000000000000 --- a/databases/mariadb-server/files/pkg-message.in +++ /dev/null @@ -1,7 +0,0 @@ - -Some optional plugins (those in %%LOCALBASE%%/lib/mysql/plugin/*.so) -must be loaded in <datadir>/my.cnf. For example: - -[mysqld] -plugin-load=ha_oqgraph.so:ha_federatedx.so - diff --git a/databases/mariadb-server/files/scripts__Makefile.in b/databases/mariadb-server/files/scripts__Makefile.in deleted file mode 100644 index edfde43a66d6..000000000000 --- a/databases/mariadb-server/files/scripts__Makefile.in +++ /dev/null @@ -1,32 +0,0 @@ ---- scripts/Makefile.in.orig 2012-04-08 02:31:01.000000000 +0200 -+++ scripts/Makefile.in 2012-04-28 14:08:29.000000000 +0200 -@@ -496,19 +496,14 @@ - mysql_fix_privilege_tables_sql.c - - bin_SCRIPTS = @server_scripts@ \ -- msql2mysql \ -- mysql_config \ -- mysql_fix_privilege_tables \ - mysql_fix_extensions \ - mysql_setpermission \ - mysql_secure_installation \ - mysql_zap \ - mysqlaccess \ -- mysqlbug \ - mysql_convert_table_format \ - mysql_find_rows \ - mysqlhotcopy \ -- mytop \ - mysqldumpslow \ - mysqld_multi - -@@ -548,8 +543,7 @@ - mysql_system_tables_fix.sql \ - CMakeLists.txt - --dist_pkgdata_DATA = fill_help_tables.sql \ -- mysql_fix_privilege_tables.sql \ -+dist_pkgdata_DATA = fill_help_tables.sql mysql_system_tables.sql mysql_system_tables_data.sql fill_help_tables.sql \ - mysql_system_tables.sql \ - mysql_system_tables_data.sql \ - mysql_test_data_timezone.sql diff --git a/databases/mariadb-server/pkg-descr b/databases/mariadb-server/pkg-descr deleted file mode 100644 index 30b14a9f0075..000000000000 --- a/databases/mariadb-server/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -MariaDB is a database server that offers drop-in replacement functionality for -MySQL1. MariaDB is built by some of the original authors of MySQL, with -assistance from the broader community of Free and open source software -developers. In addition to the core functionality of MySQL, MariaDB offers a -rich set of feature enhancements including alternate storage engines, server -optimizations, and patches. - -MariaDB is primarily driven by developers at Monty Program, a company founded by -Michael "Monty" Widenius, the original author of MySQL, but this is not the -whole story about MariaDB. On the "About MariaDB" page you will find more -information about all participants in the MariaDB community, including storage -engines XtraDB and PBXT. - -WWW: http://mariadb.org/ diff --git a/databases/mariadb-server/pkg-plist b/databases/mariadb-server/pkg-plist deleted file mode 100644 index 4ddb79d4754b..000000000000 --- a/databases/mariadb-server/pkg-plist +++ /dev/null @@ -1,405 +0,0 @@ -%%ARIADB%%bin/aria_chk -%%ARIADB%%bin/aria_dump_log -%%ARIADB%%bin/aria_ftdump -%%ARIADB%%bin/aria_pack -%%ARIADB%%bin/aria_read_log -%%ARIADB%%lib/mysql/libaria.a -%%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%%/config.huge.ini -%%DATADIR%%/config.medium.ini -%%DATADIR%%/config.small.ini -%%DATADIR%%/czech/errmsg.sys -%%DATADIR%%/danish/errmsg.sys -%%DATADIR%%/dutch/errmsg.sys -%%DATADIR%%/english/errmsg.sys -%%DATADIR%%/errmsg.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%%/italian/errmsg.sys -%%DATADIR%%/japanese/errmsg.sys -%%DATADIR%%/korean/errmsg.sys -%%DATADIR%%/my-huge.cnf -%%DATADIR%%/my-innodb-heavy-4G.cnf -%%DATADIR%%/my-large.cnf -%%DATADIR%%/my-medium.cnf -%%DATADIR%%/my-small.cnf -%%DATADIR%%/mysql-log-rotate -%%DATADIR%%/mysql.server -%%DATADIR%%/mysql_system_tables.sql -%%DATADIR%%/mysql_system_tables_data.sql -%%DATADIR%%/mysql_test_data_timezone.sql -%%DATADIR%%/mysqld_multi.server -%%DATADIR%%/ndb-config-2-node.ini -%%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 -%%HANDLERSOCKET%%bin/hsclient -%%HANDLERSOCKET%%include/handlersocket/allocator.hpp -%%HANDLERSOCKET%%include/handlersocket/auto_addrinfo.hpp -%%HANDLERSOCKET%%include/handlersocket/auto_file.hpp -%%HANDLERSOCKET%%include/handlersocket/auto_ptrcontainer.hpp -%%HANDLERSOCKET%%include/handlersocket/config.hpp -%%HANDLERSOCKET%%include/handlersocket/escape.hpp -%%HANDLERSOCKET%%include/handlersocket/fatal.hpp -%%HANDLERSOCKET%%include/handlersocket/hstcpcli.hpp -%%HANDLERSOCKET%%include/handlersocket/mutex.hpp -%%HANDLERSOCKET%%include/handlersocket/socket.hpp -%%HANDLERSOCKET%%include/handlersocket/string_buffer.hpp -%%HANDLERSOCKET%%include/handlersocket/string_ref.hpp -%%HANDLERSOCKET%%include/handlersocket/string_util.hpp -%%HANDLERSOCKET%%include/handlersocket/thread.hpp -%%HANDLERSOCKET%%include/handlersocket/util.hpp -%%HANDLERSOCKET%%lib/libhsclient.a -%%HANDLERSOCKET%%lib/libhsclient.so -%%HANDLERSOCKET%%lib/libhsclient.so.0 -%%HANDLERSOCKET%%lib/libhsclient.so.0.0.0 -%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.a -%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.so -%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.so.0 -%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.so.0.0.0 -%%NDB%%bin/ndb_config -%%NDB%%bin/ndb_delete_all -%%NDB%%bin/ndb_desc -%%NDB%%bin/ndb_drop_index -%%NDB%%bin/ndb_drop_table -%%NDB%%bin/ndb_error_reporter -%%NDB%%bin/ndb_mgm -%%NDB%%bin/ndb_print_backup_file -%%NDB%%bin/ndb_print_schema_file -%%NDB%%bin/ndb_print_sys_file -%%NDB%%bin/ndb_restore -%%NDB%%bin/ndb_select_all -%%NDB%%bin/ndb_select_count -%%NDB%%bin/ndb_show_tables -%%NDB%%bin/ndb_size.pl -%%NDB%%bin/ndb_test_platform -%%NDB%%bin/ndb_waiter -%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi.h -%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters.h -%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters_debug.h -%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_debug.h -%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_error.h -%%NDB%%include/mysql/storage/ndb/mgmapi/ndb_logevent.h -%%NDB%%include/mysql/storage/ndb/mgmapi/ndbd_exit_codes.h -%%NDB%%include/mysql/storage/ndb/ndb_constants.h -%%NDB%%include/mysql/storage/ndb/ndb_init.h -%%NDB%%include/mysql/storage/ndb/ndb_types.h -%%NDB%%include/mysql/storage/ndb/ndb_version.h -%%NDB%%include/mysql/storage/ndb/ndbapi/Ndb.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbApi.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbBlob.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbDictionary.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbError.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbEventOperation.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexOperation.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexScanOperation.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexStat.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbOperation.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbPool.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbRecAttr.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbReceiver.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbScanFilter.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbScanOperation.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbTransaction.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/ndb_cluster_connection.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.h -%%NDB%%include/mysql/storage/ndb/ndbapi/ndbapi_limits.h -%%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h -%%NDB%%lib/mysql/libndbclient.a -%%NDB%%lib/mysql/libndbclient.so -%%NDB%%lib/mysql/libndbclient.so.3 -%%NDB%%lib/mysql/libndbclient.so.3.0.0 -%%NDB%%libexec/ndb_cpcd -%%NDB%%libexec/ndb_mgmd -%%NDB%%libexec/ndbd -%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so -%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so.0 -%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so.0.0.0 -%%PBXT%%bin/xtstat -%%SPHINX%%lib/mysql/plugin/sphinx.a -%%SPHINX%%lib/mysql/plugin/sphinx.so -%%SPHINX%%lib/mysql/plugin/sphinx.so.0 -%%SPHINX%%lib/mysql/plugin/sphinx.so.0.0.0 -%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so -%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so.0 -%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so.0.0.0 -%%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so -%%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so.0 -%%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so.0.0.0 -%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/ha_example.so -%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/ha_example.so.0 -%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/ha_example.so.0.0.0 -%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so -%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so.0 -%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so.0.0.0 -%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/mypluglib.so -%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/mypluglib.so.0 -%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/mypluglib.so.0.0.0 -%%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.a -%%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.so -%%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.so.0 -%%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.so.0.0.0 -%%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so -%%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so.0 -%%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so.0.0.0 -%%STATIC%%%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.a -%%STATIC%%%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so -%%STATIC%%%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so.0 -%%STATIC%%%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so.0.0.0 -%%STATIC%%%%SPHINX%%lib/mysql/plugin/ha_sphinx.a -%%STATIC%%%%SPHINX%%lib/mysql/plugin/ha_sphinx.so -%%STATIC%%%%SPHINX%%lib/mysql/plugin/ha_sphinx.so.0 -%%STATIC%%%%SPHINX%%lib/mysql/plugin/ha_sphinx.so.0.0.0 -%%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.so -%%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.so.0 -%%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.so.0.0.0 -%%STATIC%%lib/mysql/plugin/auth_pam.so -%%STATIC%%lib/mysql/plugin/auth_pam.so.0 -%%STATIC%%lib/mysql/plugin/auth_pam.so.0.0.0 -%%STATIC%%lib/mysql/plugin/dialog.a -%%STATIC%%lib/mysql/plugin/dialog.so -%%STATIC%%lib/mysql/plugin/dialog.so.0 -%%STATIC%%lib/mysql/plugin/dialog.so.0.0.0 -%%STATIC%%lib/mysql/plugin/feedback.so -%%STATIC%%lib/mysql/plugin/feedback.so.0 -%%STATIC%%lib/mysql/plugin/feedback.so.0.0.0 -%%XTRADB%%bin/innochecksum -bin/my_print_defaults -bin/myisam_ftdump -bin/myisamchk -bin/myisamlog -bin/myisampack -bin/mysql_client_test_embedded -bin/mysql_install_db -bin/mysql_tzinfo_to_sql -bin/mysql_waitpid -bin/mysqld_safe -bin/mysqltest_embedded -bin/perror -bin/replace -bin/resolve_stack_dump -bin/resolveip -include/mysql/private/atomic/gcc_builtins.h -include/mysql/private/atomic/generic-msvc.h -include/mysql/private/atomic/nolock.h -include/mysql/private/atomic/rwlock.h -include/mysql/private/atomic/x86-gcc.h -include/mysql/private/authors.h -include/mysql/private/base64.h -include/mysql/private/client_settings.h -include/mysql/private/config-netware.h -include/mysql/private/config-win.h -include/mysql/private/contributors.h -include/mysql/private/create_options.h -include/mysql/private/debug_sync.h -include/mysql/private/event_data_objects.h -include/mysql/private/event_db_repository.h -include/mysql/private/event_parse_data.h -include/mysql/private/event_queue.h -include/mysql/private/event_scheduler.h -include/mysql/private/events.h -include/mysql/private/field.h -include/mysql/private/ft_global.h -include/mysql/private/gcalc_slicescan.h -include/mysql/private/gcalc_tools.h -include/mysql/private/gstream.h -include/mysql/private/ha_ndbcluster.h -include/mysql/private/ha_ndbcluster_binlog.h -include/mysql/private/ha_ndbcluster_cond.h -include/mysql/private/ha_ndbcluster_tables.h -include/mysql/private/ha_partition.h -include/mysql/private/handler.h -include/mysql/private/hash.h -include/mysql/private/hash_filo.h -include/mysql/private/heap.h -include/mysql/private/help_end.h -include/mysql/private/help_start.h -include/mysql/private/item.h -include/mysql/private/item_cmpfunc.h -include/mysql/private/item_create.h -include/mysql/private/item_func.h -include/mysql/private/item_geofunc.h -include/mysql/private/item_row.h -include/mysql/private/item_strfunc.h -include/mysql/private/item_subselect.h -include/mysql/private/item_sum.h -include/mysql/private/item_timefunc.h -include/mysql/private/item_xmlfunc.h -include/mysql/private/lex.h -include/mysql/private/lex_symbol.h -include/mysql/private/lf.h -include/mysql/private/log.h -include/mysql/private/log_event.h -include/mysql/private/log_event_old.h -include/mysql/private/log_slow.h -include/mysql/private/maria.h -include/mysql/private/mem_root_array.h -include/mysql/private/multi_range_read.h -include/mysql/private/my_aes.h -include/mysql/private/my_alarm.h -include/mysql/private/my_atomic.h -include/mysql/private/my_base.h -include/mysql/private/my_bit.h -include/mysql/private/my_bitmap.h -include/mysql/private/my_compare.h -include/mysql/private/my_decimal.h -include/mysql/private/my_handler.h -include/mysql/private/my_libwrap.h -include/mysql/private/my_md5.h -include/mysql/private/my_nosys.h -include/mysql/private/my_regex.h -include/mysql/private/my_stacktrace.h -include/mysql/private/my_time.h -include/mysql/private/my_tree.h -include/mysql/private/my_trie.h -include/mysql/private/my_uctype.h -include/mysql/private/my_user.h -include/mysql/private/my_vle.h -include/mysql/private/myisam.h -include/mysql/private/myisamchk.h -include/mysql/private/myisammrg.h -include/mysql/private/myisampack.h -include/mysql/private/mysql_priv.h -include/mysql/private/mysqld_suffix.h -include/mysql/private/mysys_err.h -include/mysql/private/opt_range.h -include/mysql/private/opt_subselect.h -include/mysql/private/parse_file.h -include/mysql/private/partition_element.h -include/mysql/private/partition_info.h -include/mysql/private/plistsort.c -include/mysql/private/procedure.h -include/mysql/private/protocol.h -include/mysql/private/queues.h -include/mysql/private/rijndael.h -include/mysql/private/rpl_constants.h -include/mysql/private/rpl_filter.h -include/mysql/private/rpl_injector.h -include/mysql/private/rpl_mi.h -include/mysql/private/rpl_record.h -include/mysql/private/rpl_record_old.h -include/mysql/private/rpl_reporting.h -include/mysql/private/rpl_rli.h -include/mysql/private/rpl_tblmap.h -include/mysql/private/rpl_utility.h -include/mysql/private/scheduler.h -include/mysql/private/service_versions.h -include/mysql/private/set_var.h -include/mysql/private/sha1.h -include/mysql/private/slave.h -include/mysql/private/sp.h -include/mysql/private/sp_cache.h -include/mysql/private/sp_head.h -include/mysql/private/sp_pcontext.h -include/mysql/private/sp_rcontext.h -include/mysql/private/spatial.h -include/mysql/private/sql_acl.h -include/mysql/private/sql_array.h -include/mysql/private/sql_bitmap.h -include/mysql/private/sql_cache.h -include/mysql/private/sql_class.h -include/mysql/private/sql_crypt.h -include/mysql/private/sql_cursor.h -include/mysql/private/sql_error.h -include/mysql/private/sql_expression_cache.h -include/mysql/private/sql_handler.h -include/mysql/private/sql_join_cache.h -include/mysql/private/sql_lex.h -include/mysql/private/sql_lifo_buffer.h -include/mysql/private/sql_list.h -include/mysql/private/sql_map.h -include/mysql/private/sql_partition.h -include/mysql/private/sql_plugin.h -include/mysql/private/sql_plugin_services.h -include/mysql/private/sql_profile.h -include/mysql/private/sql_repl.h -include/mysql/private/sql_select.h -include/mysql/private/sql_servers.h -include/mysql/private/sql_show.h -include/mysql/private/sql_sort.h -include/mysql/private/sql_string.h -include/mysql/private/sql_trigger.h -include/mysql/private/sql_udf.h -include/mysql/private/sql_view.h -include/mysql/private/structs.h -include/mysql/private/t_ctype.h -include/mysql/private/table.h -include/mysql/private/thr_alarm.h -include/mysql/private/thr_lock.h -include/mysql/private/tzfile.h -include/mysql/private/tztime.h -include/mysql/private/unireg.h -include/mysql/private/violite.h -include/mysql/private/waiting_threads.h -include/mysql/private/welcome_copyright_notice.h -include/mysql/private/wqueue.h -lib/mysql/libdbug.a -lib/mysql/libheap.a -lib/mysql/libmyisam.a -lib/mysql/libmyisammrg.a -lib/mysql/libmysqld.a -lib/mysql/libmysqld.so -lib/mysql/libmysqld.so.0 -lib/mysql/libmysqld.so.0.0.0 -lib/mysql/libmysqlservices.a -lib/mysql/libmystrings.a -lib/mysql/libmysys.a -lib/mysql/libvio.a -libexec/mysqld -man/man1/innochecksum.1.gz -man/man1/my_print_defaults.1.gz -man/man1/myisam_ftdump.1.gz -man/man1/myisamchk.1.gz -man/man1/myisamlog.1.gz -man/man1/myisampack.1.gz -man/man1/mysql.server.1.gz -man/man1/mysql_client_test_embedded.1.gz -man/man1/mysql_install_db.1.gz -man/man1/mysql_tzinfo_to_sql.1.gz -man/man1/mysql_waitpid.1.gz -man/man1/mysqld_safe.1.gz -man/man1/mysqltest_embedded.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 -man/man8/mysqlmanager.8.gz diff --git a/databases/mytop/Makefile b/databases/mytop/Makefile index 39fc1b9bae26..a6f2b6ad9529 100644 --- a/databases/mytop/Makefile +++ b/databases/mytop/Makefile @@ -19,7 +19,6 @@ GH_ACCOUNT= jzawodn GH_TAGNAME= 437f2ef NO_ARCH= yes -CONFLICTS= mariadb-scripts-[0-9]* USES+= perl5 USE_PERL5= configure |