From owner-svn-ports-all@freebsd.org Sun Jun 26 11:12:17 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB1C8AC561C; Sun, 26 Jun 2016 11:12:17 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 974C22E3B; Sun, 26 Jun 2016 11:12:17 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5QBCGXG032992; Sun, 26 Jun 2016 11:12:16 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5QBCGW4032987; Sun, 26 Jun 2016 11:12:16 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201606261112.u5QBCGW4032987@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 26 Jun 2016 11:12:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417518 - in head/databases: mariadb100-client mariadb100-server X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jun 2016 11:12:17 -0000 Author: brnrd Date: Sun Jun 26 11:12:16 2016 New Revision: 417518 URL: https://svnweb.freebsd.org/changeset/ports/417518 Log: databases/mariadb100-server: Update to 10.0.26 - Update -server and -client to 10.0.26 - Add private headers to -server package - Remove private headers from -client (conflict) - Add License file for PerconaFT - Add archivers/snappy dependency for TokuDB Modified: head/databases/mariadb100-client/Makefile head/databases/mariadb100-server/Makefile head/databases/mariadb100-server/distinfo head/databases/mariadb100-server/pkg-plist Modified: head/databases/mariadb100-client/Makefile ============================================================================== --- head/databases/mariadb100-client/Makefile Sun Jun 26 11:06:35 2016 (r417517) +++ head/databases/mariadb100-client/Makefile Sun Jun 26 11:12:16 2016 (r417518) @@ -19,7 +19,8 @@ USE_LDCONFIG= ${PREFIX}/lib/mysql CLIENT_ONLY= yes -post-install: +post-stage: ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 + ${RM} -rf ${STAGEDIR}${PREFIX}/include/mysql/private .include "${MASTERDIR}/Makefile" Modified: head/databases/mariadb100-server/Makefile ============================================================================== --- head/databases/mariadb100-server/Makefile Sun Jun 26 11:06:35 2016 (r417517) +++ head/databases/mariadb100-server/Makefile Sun Jun 26 11:12:16 2016 (r417518) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.0.25 +PORTVERSION= 10.0.26 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -17,6 +17,9 @@ MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 +LICENSE_NAME_PerconaFT= PerconaFT patents license +LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS +LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_powerpc64= Does not build @@ -86,8 +89,6 @@ TOKUDB_DESC= Fractal tree index tree dat OPTIONS_SUB= yes -TOKUDB_PORTDOCS= PATENTS README.md - .endif FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 @@ -120,17 +121,18 @@ OQGRAPH_LIB_DEPENDS= libboost_system.so: # See See https://mariadb.atlassian.net/browse/MDEV-8051. OQGRAPH_USE= gcc OQGRAPH_BROKEN= OQGraph does not build +TOKUDB_LIB_DEPENDS= libsnappy.so:archivers/snappy +TOKUDB_PORTDOCS= PATENTS README.md +TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi post-install: # Remove programs to avoid conflict with mariadb100-client # These are "client" components, so there should be a switch that # prevents them from being installed but it's unknown right now - ${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \ - ${STAGEDIR}${PREFIX}/bin/mysql_config \ - ${STAGEDIR}${PREFIX}/bin/mysql_find_rows \ - ${STAGEDIR}${PREFIX}/bin/mysqlaccess \ - ${STAGEDIR}${DOCSDIR}/COPYING.AGPLv3 \ - ${STAGEDIR}${DOCSDIR}/COPYING.GPLv2 +. for f in bin/msql2mysql bin/mysql_config bin/mysql_find_rows \ + bin/mysqlaccess COPYING.AGPLv3 COPYING.GPLv2 + ${RM} ${STAGEDIR}${PREFIX}/${f} +. endfor .endif .include Modified: head/databases/mariadb100-server/distinfo ============================================================================== --- head/databases/mariadb100-server/distinfo Sun Jun 26 11:06:35 2016 (r417517) +++ head/databases/mariadb100-server/distinfo Sun Jun 26 11:12:16 2016 (r417518) @@ -1,2 +1,3 @@ -SHA256 (mariadb-10.0.25.tar.gz) = 4540832c18112a332f61f4eeb57140890c4e2188ae12b312f4e2e8a0363553e4 -SIZE (mariadb-10.0.25.tar.gz) = 57459461 +TIMESTAMP = 1466794478 +SHA256 (mariadb-10.0.26.tar.gz) = 578538d9b51f455cbd0cb021f523284a45480b4bba853b4a79f3497c49ec40c0 +SIZE (mariadb-10.0.26.tar.gz) = 57621647 Modified: head/databases/mariadb100-server/pkg-plist ============================================================================== --- head/databases/mariadb100-server/pkg-plist Sun Jun 26 11:06:35 2016 (r417517) +++ head/databases/mariadb100-server/pkg-plist Sun Jun 26 11:12:16 2016 (r417518) @@ -35,7 +35,65 @@ bin/resolve_stack_dump bin/resolveip %%TOKUDB%%bin/tokuft_logprint %%TOKUDB%%bin/tokuftdump +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/solaris.h +include/mysql/private/atomic/x86-gcc.h +include/mysql/private/base64.h +include/mysql/private/config.h include/mysql/private/embedded_priv.h +include/mysql/private/ft_global.h +include/mysql/private/hash.h +include/mysql/private/heap.h +include/mysql/private/lf.h +include/mysql/private/maria.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_check_opt.h +include/mysql/private/my_compare.h +include/mysql/private/my_context.h +include/mysql/private/my_cpu.h +include/mysql/private/my_default.h +include/mysql/private/my_handler_errors.h +include/mysql/private/my_libwrap.h +include/mysql/private/my_md5.h +include/mysql/private/my_nosys.h +include/mysql/private/my_rdtsc.h +include/mysql/private/my_rnd.h +include/mysql/private/my_stacktrace.h +include/mysql/private/my_time.h +include/mysql/private/my_tree.h +include/mysql/private/my_uctype.h +include/mysql/private/my_user.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_async.h +include/mysql/private/mysqld_default_groups.h +include/mysql/private/mysys_err.h +include/mysql/private/password.h +include/mysql/private/probes_mysql.h +include/mysql/private/probes_mysql_nodtrace.h +include/mysql/private/queues.h +include/mysql/private/rijndael.h +include/mysql/private/service_versions.h +include/mysql/private/sha1.h +include/mysql/private/sha2.h +include/mysql/private/t_ctype.h +include/mysql/private/thr_alarm.h +include/mysql/private/thr_lock.h +include/mysql/private/thread_pool_priv.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/libmysqld.a lib/mysql/libmysqld.so lib/mysql/libmysqld.so.18