Date: Sun, 6 Oct 2013 13:41:29 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329563 - in head/databases/percona56-server: . files Message-ID: <201310061341.r96DfTEt067091@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Sun Oct 6 13:41:29 2013 New Revision: 329563 URL: http://svnweb.freebsd.org/changeset/ports/329563 Log: - merge r329470 by decke from mysql56 (head build fix) - merge r329549 by marino from mysql56 (use shebangfix) Added: head/databases/percona56-server/files/patch-plugin_password_validation_validate_password.cc (contents, props changed) Modified: head/databases/percona56-server/Makefile Modified: head/databases/percona56-server/Makefile ============================================================================== --- head/databases/percona56-server/Makefile Sun Oct 6 13:37:53 2013 (r329562) +++ head/databases/percona56-server/Makefile Sun Oct 6 13:41:29 2013 (r329563) @@ -13,7 +13,7 @@ MAINTAINER= flo@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/percona56-client -USES= bison cmake +USES= bison cmake shebangfix OPTIONS_DEFINE= OPENSSL FASTMTX OPTIONS_DEFAULT= OPENSSL @@ -40,6 +40,8 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc -DWITH_LIBWRAP=1 \ -DHAVE_PAM=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 Added: head/databases/percona56-server/files/patch-plugin_password_validation_validate_password.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona56-server/files/patch-plugin_password_validation_validate_password.cc Sun Oct 6 13:41:29 2013 (r329563) @@ -0,0 +1,11 @@ +--- plugin/password_validation/validate_password.cc.orig 2013-09-10 07:38:25.000000000 +0000 ++++ plugin/password_validation/validate_password.cc 2013-10-05 15:40:20.790380179 +0000 +@@ -16,6 +16,8 @@ + #include <my_sys.h> + #include <string> + #include <mysql/plugin_validate_password.h> ++/* solve clash between libc++ bitset::test() and test macro from my_global.h */ ++#undef test + #include <set> + #include <iostream> + #include <fstream>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310061341.r96DfTEt067091>