From owner-svn-ports-head@freebsd.org Wed Jul 5 16:32:38 2017 Return-Path: Delivered-To: svn-ports-head@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 80754D8A06A; Wed, 5 Jul 2017 16:32:38 +0000 (UTC) (envelope-from vd@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 566A22B2D; Wed, 5 Jul 2017 16:32:38 +0000 (UTC) (envelope-from vd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v65GWbgu093216; Wed, 5 Jul 2017 16:32:37 GMT (envelope-from vd@FreeBSD.org) Received: (from vd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v65GWbcR093214; Wed, 5 Jul 2017 16:32:37 GMT (envelope-from vd@FreeBSD.org) Message-Id: <201707051632.v65GWbcR093214@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vd set sender to vd@FreeBSD.org using -f From: Vasil Dimov Date: Wed, 5 Jul 2017 16:32:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445085 - in head/databases/mysqlwsrep56-server: . files X-SVN-Group: ports-head X-SVN-Commit-Author: vd X-SVN-Commit-Paths: in head/databases/mysqlwsrep56-server: . files X-SVN-Commit-Revision: 445085 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jul 2017 16:32:38 -0000 Author: vd Date: Wed Jul 5 16:32:37 2017 New Revision: 445085 URL: https://svnweb.freebsd.org/changeset/ports/445085 Log: databases/mysqlwsrep56-server: Upgrade from 5.6.35_1 to 5.6.36 * Change maintainer from info@galeracluster.com to devel@galeracluster.com for consistency with databases/galera * Fetch the source code from GitHub * Remove patches that have been included upstream (files/patch-client_mysql.cc, files/patch-cmake_readline.cmake) Deleted: head/databases/mysqlwsrep56-server/files/patch-client_mysql.cc head/databases/mysqlwsrep56-server/files/patch-cmake_readline.cmake Modified: head/databases/mysqlwsrep56-server/Makefile head/databases/mysqlwsrep56-server/distinfo Modified: head/databases/mysqlwsrep56-server/Makefile ============================================================================== --- head/databases/mysqlwsrep56-server/Makefile Wed Jul 5 15:50:43 2017 (r445084) +++ head/databases/mysqlwsrep56-server/Makefile Wed Jul 5 16:32:37 2017 (r445085) @@ -2,31 +2,41 @@ # $FreeBSD$ PORTNAME= mysqlwsrep -PORTVERSION= 5.6.35 -PORTREVISION= 1 +PORTVERSION?= 5.6.36 +DISTVERSIONSUFFIX?= -25.20 CATEGORIES= databases ipv6 -MASTER_SITES= http://releases.galeracluster.com/source/ PKGNAMESUFFIX= 56-server -DISTNAME= mysql-wsrep-5.6.35-25.19 -MAINTAINER= info@galeracluster.com +MAINTAINER= devel@galeracluster.com COMMENT= MySQL database enhanced with Galera replication (server package) LICENSE= GPLv2 -BUILD_DEPENDS= bison:devel/bison RUN_DEPENDS= socat:net/socat lsof:sysutils/lsof netcat:net/netcat rsync:net/rsync +BROKEN_powerpc64= Does not build + DATADIR= ${PREFIX}/share/mysql -NOT_FOR_ARCHS= aarch64 armv6 powerpc64 +NOT_FOR_ARCHS= aarch64 armv6 powerpc64 NOT_FOR_ARCHS_REASON= error: Unsupported platform -USES= cmake:outsource,noninja libedit shebangfix perl5 +USES= bison \ + cmake:outsource,noninja \ + compiler:c++11-lib \ + compiler:c11 \ + libedit \ + perl5 \ + shebangfix \ + ssl + USE_PERL5= run USE_LDCONFIG= yes -MY_DBDIR= /var/db/mysql +USE_GITHUB= yes +GH_ACCOUNT= codership +GH_PROJECT?= mysql-wsrep +GH_TAGNAME?= wsrep_${DISTVERSION}${DISTVERSIONSUFFIX} CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ @@ -34,7 +44,7 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ - -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \ + -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ @@ -50,11 +60,12 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ SHEBANG_FILES= scripts/*.pl* scripts/*.sh scripts/wsrep_sst_* .ifdef USE_MYSQL -.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. +.error You have USE_MYSQL variable defined either in environment or in make(1) arguments. Please undefine it and try again. .endif -CONFLICTS_INSTALL= mysql5[0-9]-server-* \ - mariadb*-server-* \ +CONFLICTS_INSTALL= mariadb*-server-* \ + mysql5[0-57-9]-server-* \ + mysql8*-server-* \ percona*-server-* USE_RC_SUBR= mysql-server @@ -62,20 +73,40 @@ USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql -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 +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 post-patch: - @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt + ${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt .include .if ${ARCH} == "armv6" -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake .endif .include Modified: head/databases/mysqlwsrep56-server/distinfo ============================================================================== --- head/databases/mysqlwsrep56-server/distinfo Wed Jul 5 15:50:43 2017 (r445084) +++ head/databases/mysqlwsrep56-server/distinfo Wed Jul 5 16:32:37 2017 (r445085) @@ -1,3 +1,3 @@ -TIMESTAMP = 1486024045 -SHA256 (mysql-wsrep-5.6.35-25.19.tar.gz) = f7bf200c5d5379cf616d901fcf701c8bad11658e06b1d8e25cb50d7164ee229c -SIZE (mysql-wsrep-5.6.35-25.19.tar.gz) = 33180905 +TIMESTAMP = 1499257665 +SHA256 (codership-mysql-wsrep-5.6.36-25.20-wsrep_5.6.36-25.20_GH0.tar.gz) = b40e01d95d8ccc5c23b9f1bf6c43c93776a7f542d57c14da661191b5a656754b +SIZE (codership-mysql-wsrep-5.6.36-25.20-wsrep_5.6.36-25.20_GH0.tar.gz) = 32374284