From f81c34e7ba4cecf147bbd65ea8785ef07da242e6 Mon Sep 17 00:00:00 2001
From: Akinori MUSHA <knu@FreeBSD.org>
Date: Wed, 22 Jan 2014 11:03:44 +0000
Subject: [PATCH] Update to 0.9.10, adding support for MySQL 5.5+.

---
 databases/mysql-q4m/Makefile                       | 10 +++++-----
 databases/mysql-q4m/distinfo                       |  4 ++--
 databases/mysql-q4m/files/patch-src::ha_queue.cc   | 12 ++++++++++++
 databases/mysql-q4m/files/patch-src::queue_cond.cc | 10 ++++++++++
 4 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 databases/mysql-q4m/files/patch-src::ha_queue.cc
 create mode 100644 databases/mysql-q4m/files/patch-src::queue_cond.cc

diff --git a/databases/mysql-q4m/Makefile b/databases/mysql-q4m/Makefile
index f64100af1fd5..b15dc5f4738b 100644
--- a/databases/mysql-q4m/Makefile
+++ b/databases/mysql-q4m/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	q4m
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.10
 CATEGORIES=	databases
 MASTER_SITES=	http://q4m.kazuhooku.com/dist/
 PKGNAMEPREFIX=	mysql${MYSQL_VER}-
@@ -13,13 +13,13 @@ COMMENT=	A message queue that works as a pluggable storage engine of MySQL
 FETCH_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/databases/mysql${MYSQL_VER}-server:build
 RUN_DEPENDS=	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
 
+USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_MYSQL=	yes
-WANT_MYSQL_VER?=	51
 
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include -DDBUG_OFF
 LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql
 CONFIGURE_ARGS=	--prefix="${PREFIX}" \
 		--libdir="${PREFIX}/lib/mysql/plugin" \
@@ -42,7 +42,7 @@ PORTDOCS=	AUTHORS ChangeLog README doc
 PORTEXAMPLES=	crawler install.sql
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|/include/mysql|/include/mysql/mysql|g' ${WRKSRC}/configure
 
 post-install:
 	${MKDIR} ${DOCSDIR}
@@ -59,6 +59,6 @@ install-functions:
 	mysql -u root -f mysql < ${EXAMPLESDIR}/install.sql
 
 test:
-	cd ${WRKSRC}; ${PERL} run_tests.pl
+	cd ${WRKSRC}; ./run_tests.pl
 
 .include <bsd.port.mk>
diff --git a/databases/mysql-q4m/distinfo b/databases/mysql-q4m/distinfo
index 42fb68ead9ac..03aef041f770 100644
--- a/databases/mysql-q4m/distinfo
+++ b/databases/mysql-q4m/distinfo
@@ -1,2 +1,2 @@
-SHA256 (q4m-0.9.5.tar.gz) = 97bdf74a69dd663a9d908df9fdfab35001cbdfa396e478d7aa982bcbab9f1260
-SIZE (q4m-0.9.5.tar.gz) = 1631858
+SHA256 (q4m-0.9.10.tar.gz) = ddca34f5cf58be70039adaa3197c6a10303218b631c3c0bd3313c892e08199bb
+SIZE (q4m-0.9.10.tar.gz) = 1663838
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..b8cdc4045dc1
--- /dev/null
+++ b/databases/mysql-q4m/files/patch-src::ha_queue.cc
@@ -0,0 +1,12 @@
+--- src/ha_queue.cc.orig	2013-05-21 18:33:11.000000000 +0900
++++ src/ha_queue.cc	2014-01-22 18:50:08.633290803 +0900
+@@ -64,9 +64,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"
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;