From owner-svn-ports-head@freebsd.org Sun Oct 16 13:30:58 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C4EDC12680; Sun, 16 Oct 2016 13:30:58 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 420311701; Sun, 16 Oct 2016 13:30:58 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9GDUvuS094626; Sun, 16 Oct 2016 13:30:57 GMT (envelope-from bofh@FreeBSD.org) Received: (from bofh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9GDUv72094235; Sun, 16 Oct 2016 13:30:57 GMT (envelope-from bofh@FreeBSD.org) Message-Id: <201610161330.u9GDUv72094235@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bofh set sender to bofh@FreeBSD.org using -f From: Muhammad Moinur Rahman Date: Sun, 16 Oct 2016 13:30:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424061 - in head/databases/mysql-connector-c++: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Oct 2016 13:30:58 -0000 Author: bofh Date: Sun Oct 16 13:30:56 2016 New Revision: 424061 URL: https://svnweb.freebsd.org/changeset/ports/424061 Log: databases/mysql-conector-c++: Fix build in 11.0 and later [1] - Make patches makepatch compatible PR: 213346 [1] Submitted by: supportme@ukr.net [1] Added: head/databases/mysql-connector-c++/files/patch-driver_mysql__resultbind.cpp (contents, props changed) head/databases/mysql-connector-c++/files/patch-driver_mysql__util.cpp (contents, props changed) Deleted: head/databases/mysql-connector-c++/files/patch-optional-json Modified: head/databases/mysql-connector-c++/Makefile Modified: head/databases/mysql-connector-c++/Makefile ============================================================================== --- head/databases/mysql-connector-c++/Makefile Sun Oct 16 12:46:00 2016 (r424060) +++ head/databases/mysql-connector-c++/Makefile Sun Oct 16 13:30:56 2016 (r424061) @@ -3,7 +3,7 @@ PORTNAME= mysql-connector-c++ PORTVERSION= 1.1.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= MYSQL/Connector-C++ @@ -17,13 +17,19 @@ LIB_DEPENDS= libboost_regex.so:devel/boo USES= cmake:outsource mysql USE_LDCONFIG= yes -CMAKE_ARGS= -DDOC_DESTINATION="${DOCSDIR}" +CMAKE_ARGS= -DDOC_DESTINATION="${DOCSDIR}" -DCMAKE_ENABLE_C++11=ON PLIST_SUB= PORTVERSION=${PORTVERSION} PORTDOCS= * OPTIONS_DEFINE= DOCS +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000 +CMAKE_ARGS+=-DCMAKE_ENABLE_C++11=ON +.endif + post-install: @${RM} -f ${STAGEDIR}${DOCSDIR}/INSTALL \ ${STAGEDIR}${DOCSDIR}/COPYING @@ -60,4 +66,4 @@ regression-test: build test/unit/classes/statement ) .endif -.include +.include Added: head/databases/mysql-connector-c++/files/patch-driver_mysql__resultbind.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql-connector-c++/files/patch-driver_mysql__resultbind.cpp Sun Oct 16 13:30:56 2016 (r424061) @@ -0,0 +1,12 @@ +--- driver/mysql_resultbind.cpp.orig 2016-01-12 18:42:38 UTC ++++ driver/mysql_resultbind.cpp +@@ -86,7 +86,9 @@ static struct st_buffer_size_type + case MYSQL_TYPE_BLOB: + case MYSQL_TYPE_STRING: + case MYSQL_TYPE_VAR_STRING: ++#ifdef MYSQL_TYPE_JSON + case MYSQL_TYPE_JSON: ++#endif + return st_buffer_size_type(new char[field->max_length + 1], field->max_length + 1, field->type); + + case MYSQL_TYPE_DECIMAL: Added: head/databases/mysql-connector-c++/files/patch-driver_mysql__util.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql-connector-c++/files/patch-driver_mysql__util.cpp Sun Oct 16 13:30:56 2016 (r424061) @@ -0,0 +1,24 @@ +--- driver/mysql_util.cpp.orig 2016-01-12 18:42:38 UTC ++++ driver/mysql_util.cpp +@@ -431,8 +431,10 @@ mysql_type_to_datatype(const MYSQL_FIELD + return sql::DataType::SET; + case MYSQL_TYPE_GEOMETRY: + return sql::DataType::GEOMETRY; ++#ifdef MYSQL_TYPE_JSON + case MYSQL_TYPE_JSON: + return sql::DataType::JSON; ++#endif + default: + return sql::DataType::UNKNOWN; + } +@@ -645,8 +647,10 @@ mysql_type_to_string(const MYSQL_FIELD * + return "SET"; + case MYSQL_TYPE_GEOMETRY: + return "GEOMETRY"; ++#ifdef MYSQL_TYPE_JSON + case MYSQL_TYPE_JSON: + return "JSON"; ++#endif + default: + return "UNKNOWN"; + }