Index: head/databases/mysql-connector-c++/Makefile =================================================================== --- head/databases/mysql-connector-c++/Makefile (revision 424060) +++ head/databases/mysql-connector-c++/Makefile (revision 424061) @@ -1,63 +1,69 @@ # Created by: gahr # $FreeBSD$ PORTNAME= mysql-connector-c++ PORTVERSION= 1.1.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= MYSQL/Connector-C++ MAINTAINER= ports@FreeBSD.org COMMENT= MySQL database connector for C++ LICENSE= GPLv2 # only LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_regex.so:devel/boost-libs 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 .if defined(MAINTAINER_MODE) CMAKE_ARGS+= -DMYSQLCPPCONN_TEST_NOT_IMPLEMENTED:BOOL=1 \ -DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=1 regression-test: build # These tests assume that a database is running on localhost, # with user:root and pass:root (cd ${WRKDIR}/.build ; \ test/CJUnitTestsPort/CJUnitTestsPort --verbose ; \ test/driver_test --verbose ; \ test/static_test --verbose ; \ examples/connect --verbose ; \ examples/connection_meta_schemaobj --verbose ; \ examples/debug --verbose ; \ examples/dynamic_load --verbose ; \ examples/exceptions --verbose ; \ examples/prepared_statement --verbose ; \ examples/resultset --verbose ; \ examples/resultset_binary --verbose ; \ examples/resultset_meta --verbose ; \ examples/resultset_types --verbose ; \ examples/statement --verbose ; \ test/unit/classes/art_resultset --verbose ; \ test/unit/classes/connection --verbose ; \ test/unit/classes/databasemetadata --verbose ; \ test/unit/classes/parametermetadata --verbose ; \ test/unit/classes/preparedstatement --verbose ; \ test/unit/classes/resultset --verbose ; \ test/unit/classes/resultsetmetadata --verbose ; \ test/unit/classes/savepoint --verbose ; \ test/unit/classes/statement ) .endif -.include +.include Index: head/databases/mysql-connector-c++/files/patch-optional-json =================================================================== --- head/databases/mysql-connector-c++/files/patch-optional-json (revision 424060) +++ head/databases/mysql-connector-c++/files/patch-optional-json (nonexistent) @@ -1,36 +0,0 @@ -The newly-added JSON-support may not be available in the older -version of MySQL client-library against which this connector may -be building. Fortunately, that's easy to detect at compile time... - - -mi - ---- driver/mysql_resultbind.cpp 2016-01-12 13:42:38.000000000 -0500 -+++ driver/mysql_resultbind.cpp 2016-01-24 03:58:18.451886000 -0500 -@@ -87,5 +87,7 @@ - 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); - ---- driver/mysql_util.cpp 2016-01-12 13:42:38.000000000 -0500 -+++ driver/mysql_util.cpp 2016-01-24 04:01:04.499990000 -0500 -@@ -432,6 +432,8 @@ - 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; -@@ -646,6 +648,8 @@ - case MYSQL_TYPE_GEOMETRY: - return "GEOMETRY"; -+#ifdef MYSQL_TYPE_JSON - case MYSQL_TYPE_JSON: - return "JSON"; -+#endif - default: - return "UNKNOWN"; Property changes on: head/databases/mysql-connector-c++/files/patch-optional-json ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mysql-connector-c++/files/patch-driver_mysql__resultbind.cpp =================================================================== --- head/databases/mysql-connector-c++/files/patch-driver_mysql__resultbind.cpp (nonexistent) +++ head/databases/mysql-connector-c++/files/patch-driver_mysql__resultbind.cpp (revision 424061) @@ -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: Property changes on: head/databases/mysql-connector-c++/files/patch-driver_mysql__resultbind.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysql-connector-c++/files/patch-driver_mysql__util.cpp =================================================================== --- head/databases/mysql-connector-c++/files/patch-driver_mysql__util.cpp (nonexistent) +++ head/databases/mysql-connector-c++/files/patch-driver_mysql__util.cpp (revision 424061) @@ -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"; + } Property changes on: head/databases/mysql-connector-c++/files/patch-driver_mysql__util.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property