From owner-svn-ports-all@FreeBSD.ORG Tue Mar 3 14:55:30 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 06A27857; Tue, 3 Mar 2015 14:55:30 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CBF75792; Tue, 3 Mar 2015 14:55:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t23EtTxh022452; Tue, 3 Mar 2015 14:55:29 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t23EtTp4022450; Tue, 3 Mar 2015 14:55:29 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201503031455.t23EtTp4022450@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Tue, 3 Mar 2015 14:55:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380375 - in head/databases: apq apq-mysql X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Mar 2015 14:55:30 -0000 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