Date: Mon, 26 Nov 2018 18:01:54 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485950 - in branches/2018Q4/databases/mariadb102-server: . files Message-ID: <201811261801.wAQI1scJ031798@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Mon Nov 26 18:01:54 2018 New Revision: 485950 URL: https://svnweb.freebsd.org/changeset/ports/485950 Log: MFH: r481016 databases/mariadb102-server: Update to 10.2.18 Merge missing parts from r481016 to fix build failure Approved by: ports-secteam Deleted: branches/2018Q4/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc Modified: branches/2018Q4/databases/mariadb102-server/Makefile branches/2018Q4/databases/mariadb102-server/pkg-plist Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/databases/mariadb102-server/Makefile ============================================================================== --- branches/2018Q4/databases/mariadb102-server/Makefile Mon Nov 26 17:38:02 2018 (r485949) +++ branches/2018Q4/databases/mariadb102-server/Makefile Mon Nov 26 18:01:54 2018 (r485950) @@ -184,11 +184,11 @@ post-install: ${RM} ${STAGEDIR}${PREFIX}/include/mysql/*.h .endif # defined(CLIENT_ONLY) -.if defined(WITH_OPENSSL_PORT) -GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system -.endif - .include <bsd.port.options.mk> + +.if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE} +IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system +.endif .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" Modified: branches/2018Q4/databases/mariadb102-server/pkg-plist ============================================================================== --- branches/2018Q4/databases/mariadb102-server/pkg-plist Mon Nov 26 17:38:02 2018 (r485949) +++ branches/2018Q4/databases/mariadb102-server/pkg-plist Mon Nov 26 18:01:54 2018 (r485950) @@ -103,7 +103,9 @@ man/man1/aria_read_log.1.gz man/man1/galera_new_cluster.1.gz man/man1/galera_recovery.1.gz man/man1/innochecksum.1.gz +man/man1/mariabackup.1.gz man/man1/mariadb-service-convert.1.gz +man/man1/mbstream.1.gz man/man1/my_print_defaults.1.gz man/man1/myisam_ftdump.1.gz man/man1/myisamchk.1.gz @@ -113,6 +115,7 @@ man/man1/mysql.server.1.gz man/man1/mysql_convert_table_format.1.gz man/man1/mysql_fix_extensions.1.gz man/man1/mysql_install_db.1.gz +man/man1/mysql_ldb.1.gz man/man1/mysql_secure_installation.1.gz man/man1/mysql_setpermission.1.gz man/man1/mysql_tzinfo_to_sql.1.gz @@ -127,11 +130,13 @@ man/man1/perror.1.gz man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz -man/man1/tokuft_logdump.1.gz -man/man1/tokuftdump.1.gz +%%TOKUDB%%man/man1/tokuft_logprint.1.gz +%%TOKUDB%%man/man1/tokuftdump.1.gz man/man1/wsrep_sst_common.1.gz +man/man1/wsrep_sst_mariabackup.1.gz man/man1/wsrep_sst_mysqldump.1.gz man/man1/wsrep_sst_rsync.1.gz +man/man1/wsrep_sst_rsync_wan.1.gz man/man1/wsrep_sst_xtrabackup-v2.1.gz man/man1/wsrep_sst_xtrabackup.1.gz man/man8/mysqld.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811261801.wAQI1scJ031798>