From 021dd8596f408b3ac1c097555d531ccb216144ef Mon Sep 17 00:00:00 2001
From: knu <knu@FreeBSD.org>
Date: Fri, 23 Jun 2017 09:28:16 +0000
Subject: Unbreak and update to 0.9.14

---
 databases/mysql-q4m/Makefile | 14 ++++++--------
 databases/mysql-q4m/distinfo |  5 +++--
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'databases')

diff --git a/databases/mysql-q4m/Makefile b/databases/mysql-q4m/Makefile
index fee976110c7c..000608ef9c77 100644
--- a/databases/mysql-q4m/Makefile
+++ b/databases/mysql-q4m/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	q4m
-PORTVERSION=	0.9.13
-PORTREVISION=	3
+PORTVERSION=	0.9.14
 CATEGORIES=	databases
 MASTER_SITES=	http://q4m.kazuhooku.com/dist/
 PKGNAMEPREFIX=	${_MYSQL_SERVER:T:C/-server$/-/}
@@ -11,9 +10,8 @@ PKGNAMEPREFIX=	${_MYSQL_SERVER:T:C/-server$/-/}
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Message queue that works as a pluggable storage engine of MySQL
 
-FETCH_DEPENDS+=	${NONEXISTENT}:${_MYSQL_SERVER}:build
-
-BROKEN=		does not build (ha_queue.cc:35:27: fatal error: mysql_version.h: No such file or directory)
+FETCH_DEPENDS+=	${NONEXISTENT}:${_MYSQL_SERVER}:fetch
+BUILD_DEPENDS+=	${NONEXISTENT}:${_MYSQL_SERVER}:build
 
 USES=		gmake perl5 libtool
 USE_MYSQL=	server
@@ -21,11 +19,11 @@ USE_GCC=	any
 USE_PERL5=	run
 
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include -DDBUG_OFF
-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib/mysql
 CONFIGURE_ARGS=	--prefix="${PREFIX}" \
 		--libdir="${PREFIX}/lib/mysql/plugin" \
-		--with-mysql="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V WRKSRC)"
+		--with-mysql="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V WRKSRC)" \
+		CPPFLAGS="-I$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V BUILD_WRKSRC)/include -DDEBUG_OFF"
 INSTALL_TARGET=	bindir=${STAGEDIR}${PREFIX}/bin install
 
 post-extract:
diff --git a/databases/mysql-q4m/distinfo b/databases/mysql-q4m/distinfo
index 7ad396d5bcda..1c5c0a949858 100644
--- a/databases/mysql-q4m/distinfo
+++ b/databases/mysql-q4m/distinfo
@@ -1,2 +1,3 @@
-SHA256 (q4m-0.9.13.tar.gz) = fec473030e65895a6a4ac88e10f53fcfc6ec005607a0313be6b074e1079bf1a7
-SIZE (q4m-0.9.13.tar.gz) = 1664407
+TIMESTAMP = 1481686487
+SHA256 (q4m-0.9.14.tar.gz) = 26f6242fb56580a3bd16fd025012fac3b264be6269255532d1398273b1d7792a
+SIZE (q4m-0.9.14.tar.gz) = 1665552
-- 
cgit