From 08a006d08a4c35d2c3ecc9a3d10cf7fd14661a84 Mon Sep 17 00:00:00 2001
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Tue, 29 Jul 2014 17:12:47 +0000
Subject: Rename all patches that contain '::' as a path separator, and use
 '__' instead.

---
 databases/mysql-q4m/files/patch-src::ha_queue.cc   | 21 ---------------------
 databases/mysql-q4m/files/patch-src::queue_cond.cc | 10 ----------
 databases/mysql-q4m/files/patch-src__ha_queue.cc   | 21 +++++++++++++++++++++
 databases/mysql-q4m/files/patch-src__queue_cond.cc | 10 ++++++++++
 4 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 databases/mysql-q4m/files/patch-src::ha_queue.cc
 delete mode 100644 databases/mysql-q4m/files/patch-src::queue_cond.cc
 create mode 100644 databases/mysql-q4m/files/patch-src__ha_queue.cc
 create mode 100644 databases/mysql-q4m/files/patch-src__queue_cond.cc

(limited to 'databases/mysql-q4m/files')

diff --git a/databases/mysql-q4m/files/patch-src::ha_queue.cc b/databases/mysql-q4m/files/patch-src::ha_queue.cc
deleted file mode 100644
index 92ceb4f921e8..000000000000
--- a/databases/mysql-q4m/files/patch-src::ha_queue.cc
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/ha_queue.cc.orig	2014-02-06 14:51:01.000000000 +0900
-+++ src/ha_queue.cc	2014-02-12 13:48:57.069544726 +0900
-@@ -68,9 +68,7 @@
- #define Q4M_DELETE_MT_PWRITE 2
- #define Q4M_DELETE_SERIAL_PWRITE 3
- 
--#if MYSQL_VERSION_ID < 50500
- #include "queue_config.h"
--#endif
- 
- #if SIZEOF_OFF_T != 8
- #  error "support for 64-bit file offsets is mandatory"
-@@ -763,7 +761,7 @@
-     if (share->mmap_table(max(min((info->_header.end() + EXPAND_BY - 1)
- 				  / EXPAND_BY * EXPAND_BY,
- 				  mmap_max),
--			      EXPAND_BY))
-+			      static_cast<ulonglong>EXPAND_BY))
- 	!= 0) {
-       log("mmap failed\n");
-       goto ERR_AFTER_FILEOPEN;
diff --git a/databases/mysql-q4m/files/patch-src::queue_cond.cc b/databases/mysql-q4m/files/patch-src::queue_cond.cc
deleted file mode 100644
index 343a58be8b6e..000000000000
--- a/databases/mysql-q4m/files/patch-src::queue_cond.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/queue_cond.cc.orig	2013-03-22 15:35:15.000000000 +0900
-+++ src/queue_cond.cc	2014-01-22 18:55:04.861289350 +0900
-@@ -10,6 +10,7 @@
- #include <string>
- #include <iostream>
- #endif
-+#include "queue_config.h"
- #include "queue_cond.h"
- 
- using namespace std;
diff --git a/databases/mysql-q4m/files/patch-src__ha_queue.cc b/databases/mysql-q4m/files/patch-src__ha_queue.cc
new file mode 100644
index 000000000000..92ceb4f921e8
--- /dev/null
+++ b/databases/mysql-q4m/files/patch-src__ha_queue.cc
@@ -0,0 +1,21 @@
+--- src/ha_queue.cc.orig	2014-02-06 14:51:01.000000000 +0900
++++ src/ha_queue.cc	2014-02-12 13:48:57.069544726 +0900
+@@ -68,9 +68,7 @@
+ #define Q4M_DELETE_MT_PWRITE 2
+ #define Q4M_DELETE_SERIAL_PWRITE 3
+ 
+-#if MYSQL_VERSION_ID < 50500
+ #include "queue_config.h"
+-#endif
+ 
+ #if SIZEOF_OFF_T != 8
+ #  error "support for 64-bit file offsets is mandatory"
+@@ -763,7 +761,7 @@
+     if (share->mmap_table(max(min((info->_header.end() + EXPAND_BY - 1)
+ 				  / EXPAND_BY * EXPAND_BY,
+ 				  mmap_max),
+-			      EXPAND_BY))
++			      static_cast<ulonglong>EXPAND_BY))
+ 	!= 0) {
+       log("mmap failed\n");
+       goto ERR_AFTER_FILEOPEN;
diff --git a/databases/mysql-q4m/files/patch-src__queue_cond.cc b/databases/mysql-q4m/files/patch-src__queue_cond.cc
new file mode 100644
index 000000000000..343a58be8b6e
--- /dev/null
+++ b/databases/mysql-q4m/files/patch-src__queue_cond.cc
@@ -0,0 +1,10 @@
+--- src/queue_cond.cc.orig	2013-03-22 15:35:15.000000000 +0900
++++ src/queue_cond.cc	2014-01-22 18:55:04.861289350 +0900
+@@ -10,6 +10,7 @@
+ #include <string>
+ #include <iostream>
+ #endif
++#include "queue_config.h"
+ #include "queue_cond.h"
+ 
+ using namespace std;
-- 
cgit v1.2.3