From owner-svn-ports-head@FreeBSD.ORG  Sun Oct  6 13:41:30 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 246C86C;
 Sun,  6 Oct 2013 13:41:30 +0000 (UTC) (envelope-from flo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E68C72A8D;
 Sun,  6 Oct 2013 13:41:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r96DfTW9067093;
 Sun, 6 Oct 2013 13:41:29 GMT (envelope-from flo@svn.freebsd.org)
Received: (from flo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r96DfTEt067091;
 Sun, 6 Oct 2013 13:41:29 GMT (envelope-from flo@svn.freebsd.org)
Message-Id: <201310061341.r96DfTEt067091@svn.freebsd.org>
From: Florian Smeets <flo@FreeBSD.org>
Date: Sun, 6 Oct 2013 13:41:29 +0000 (UTC)
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
X-SVN-Group: ports-head
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Oct 2013 13:41:30 -0000

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>