svn commit: r380375 - in head/databases: apq apq-mysql

[John Marino]

Author: marino
Date: Tue Mar  3 14:55:28 2015
New Revision: 380375
URL: https://svnweb.freebsd.org/changeset/ports/380375
QAT: https://qat.redports.org/buildarchive/r380375/

Log:
  databases/apq-mysql: Support default MySQL (5.6)
  
  This port generates some headers based on MySQL headers, and a couple
  of the variables must have been deprecated because the resulting
  variable name ended in "__UNUSED".  Double underscores are not allowed
  in Ada, so the build broke.
  
  Since the Ada header is generated during the configure phase, I'm adding
  a post-configure target to replace "__" with "_" to restore the build.
  
  Since the dependencies change from MySQL 5.5 to MySQL 5.6, revbump.

Modified:
  head/databases/apq-mysql/Makefile
  head/databases/apq/Makefile.version

Modified: head/databases/apq-mysql/Makefile
==============================================================================
--- head/databases/apq-mysql/Makefile	Tue Mar  3 13:57:33 2015	(r380374)
+++ head/databases/apq-mysql/Makefile	Tue Mar  3 14:55:28 2015	(r380375)
@@ -20,8 +20,6 @@ RUN_DEPENDS=	${LOCALBASE}/lib/gnat/apq.g
 
 USES=		ada tar:bzip2
 USE_MYSQL=	yes
-MYSQL_DEFAULT=	55
-IGNORE_MYSQL_VER=	56
 HAS_CONFIGURE=	yes
 WRKPATH=	${WRKDIR}/build
 CONFIGURE_ARGS= --prefix=${PREFIX} \
@@ -39,6 +37,12 @@ post-patch:
 	${REINPLACE_CMD} -e 's|-ws|-ws --autoconf=dummy.cgpr|' \
 		${WRKSRC}/scripts/buildutil.sh
 
+post-configure:
+	# The header generated with MySQL 5.6 comes with two instances of
+	# double underscore variables, which is illegal in Ada
+	${REINPLACE_CMD} -e 's|__|_|' \
+		${WRKDIR}/build/include/apq-mysql/apq-mysql.ads
+
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/apq-mysql/static \

Modified: head/databases/apq/Makefile.version
==============================================================================
--- head/databases/apq/Makefile.version	Tue Mar  3 13:57:33 2015	(r380374)
+++ head/databases/apq/Makefile.version	Tue Mar  3 14:55:28 2015	(r380375)
@@ -3,5 +3,5 @@
 APQ_VERSION=	3.2.0
 BASE_PORTREV=	0
 DRV_ODBC_PR=	0
-DRV_MYSQL_PR=	0
+DRV_MYSQL_PR=	1
 DRV_PGSQL_PR=	0