svn commit: r424061 - in head/databases/mysql-connector-c++: . files

[Muhammad Moinur Rahman]

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 at 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 <bsd.port.pre.mk>
+
+.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 <bsd.port.mk>
+.include <bsd.port.post.mk>

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";
+   }