--- mysql-connector-c++/Makefile 2019-01-02 14:00:24.030465000 +0100 +++ mysql-connector-c++/Makefile 2019-01-02 17:38:52.338123000 +0100 @@ -2,63 +2,46 @@ # $FreeBSD: head/databases/mysql-connector-c++/Makefile 488341 2018-12-25 20:25:39Z tcberner $ PORTNAME= mysql-connector-c++ -PORTVERSION= 1.1.9 -PORTREVISION= 7 +PORTVERSION= 8.0.13 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= MYSQL/Connector-C++ +DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= bofh@FreeBSD.org COMMENT= MySQL database connector for C++ LICENSE= GPLv2 # only -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE= ${WRKSRC}/LICENSE.txt +CMAKE_ARGS= -DINSTALL_LIB_DIR=lib -DINSTALL_DOC_DIR="${DOCSDIR}" all +DOCS_CMAKE_ARGS= build_docs + LIB_DEPENDS= libboost_regex.so:devel/boost-libs -USES= cmake compiler:c++11-lang mysql ssl +USES= cmake:noninja compiler:c++11-lang mysql ssl +IGNORE_WITH_MYSQL= 55 55m 55p 56 56p 56w 57 57p 100m 101m 102m USE_LDCONFIG= yes -CMAKE_ARGS= -DDOC_DESTINATION="${DOCSDIR}" -DCMAKE_ENABLE_C++11=ON PLIST_SUB= PORTVERSION=${PORTVERSION} PORTDOCS= * -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS JDBC +OPTIONS_SUB= yes -post-install: - @${RM} ${STAGEDIR}${DOCSDIR}/INSTALL \ - ${STAGEDIR}${DOCSDIR}/COPYING +DOCS_DESC= Build doxygen based documentation +JDBC_DESC= The legacy API based on JDBC4 -.if defined(MAINTAINER_MODE) -CMAKE_ARGS+= -DMYSQLCPPCONN_TEST_NOT_IMPLEMENTED:BOOL=1 \ - -DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=1 +DOCS_CMAKE_ON= -DWITH_DOC=ON +JDBC_CMAKE_ON= -DWITH_JDBC=ON -do-test: -# 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 +DOCS_BUILD_DEPENDS= doxygen:devel/doxygen + +post-install: + @${RM} ${STAGEDIR}${DOCSDIR}/INSTALL \ + ${STAGEDIR}${DOCSDIR}/LICENSE.txt + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${BUILD_WRKSRC}/doc && \ + ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR} .include --- mysql-connector-c++/distinfo 2019-01-02 14:00:24.032951000 +0100 +++ mysql-connector-c++/distinfo 2019-01-02 14:18:53.527594000 +0100 @@ -1,3 +1,3 @@ -TIMESTAMP = 1495260128 -SHA256 (mysql-connector-c++-1.1.9.tar.gz) = 3e31847a69a4e5c113b7c483731317ec4533858e3195d3a85026a0e2f509d2e4 -SIZE (mysql-connector-c++-1.1.9.tar.gz) = 508255 +TIMESTAMP = 1546435133 +SHA256 (mysql-connector-c++-8.0.13-src.tar.gz) = 64be955ad2b87376ade555651b0b86c3ecc6000faf71485d1dff360dff83c90f +SIZE (mysql-connector-c++-8.0.13-src.tar.gz) = 2174609 --- mysql-connector-c++/files/patch-CMakeLists.txt 2019-01-02 14:00:24.034871000 +0100 +++ mysql-connector-c++/files/patch-CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ---- CMakeLists.txt.orig 2016-01-12 18:42:38 UTC -+++ CMakeLists.txt -@@ -316,7 +316,6 @@ ELSE(WIN32) - SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}") - ENDIF(WIN32) - --SET(DOC_DESTINATION ".") - IF(RPM_LAYOUT) - SET(DOC_DESTINATION "share/doc/${CPACK_PACKAGE_NAME}-${MYSQLCPPCONN_VERSION}") - ENDIF() --- mysql-connector-c++/files/patch-docbuild.txt 1970-01-01 01:00:00.000000000 +0100 +++ mysql-connector-c++/files/patch-docbuild.txt 2019-01-02 16:59:34.852467000 +0100 @@ -0,0 +1,13 @@ +diff --git doc/CMakeLists.txt doc/CMakeLists.txt +index 6e34652c..7f119ed1 100644 +--- doc/CMakeLists.txt ++++ doc/CMakeLists.txt +@@ -90,7 +90,7 @@ FILE(GLOB sources *.txt) + LIST(APPEND sources doxygen.cfg.in) + + +-ADD_CUSTOM_TARGET(build_docs ++ADD_CUSTOM_TARGET(build_docs ALL + COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + COMMENT "Building project documentation" --- mysql-connector-c++/pkg-plist 2019-01-02 14:00:24.048666000 +0100 +++ mysql-connector-c++/pkg-plist 2019-01-02 16:04:32.941323000 +0100 @@ -1,23 +1,54 @@ -include/cppconn/build_config.h -include/cppconn/config.h -include/cppconn/connection.h -include/cppconn/datatype.h -include/cppconn/driver.h -include/cppconn/exception.h -include/cppconn/metadata.h -include/cppconn/parameter_metadata.h -include/cppconn/prepared_statement.h -include/cppconn/resultset.h -include/cppconn/resultset_metadata.h -include/cppconn/statement.h -include/cppconn/sqlstring.h -include/cppconn/variant.h -include/cppconn/version_info.h -include/cppconn/warning.h -include/mysql_connection.h -include/mysql_driver.h -include/mysql_error.h -lib/libmysqlcppconn-static.a -lib/libmysqlcppconn.so -lib/libmysqlcppconn.so.7 -lib/libmysqlcppconn.so.7.%%PORTVERSION%% +%%JDBC%%include/jdbc/cppconn/build_config.h +%%JDBC%%include/jdbc/cppconn/config.h +%%JDBC%%include/jdbc/cppconn/connection.h +%%JDBC%%include/jdbc/cppconn/datatype.h +%%JDBC%%include/jdbc/cppconn/driver.h +%%JDBC%%include/jdbc/cppconn/exception.h +%%JDBC%%include/jdbc/cppconn/metadata.h +%%JDBC%%include/jdbc/cppconn/parameter_metadata.h +%%JDBC%%include/jdbc/cppconn/prepared_statement.h +%%JDBC%%include/jdbc/cppconn/resultset.h +%%JDBC%%include/jdbc/cppconn/resultset_metadata.h +%%JDBC%%include/jdbc/cppconn/statement.h +%%JDBC%%include/jdbc/cppconn/sqlstring.h +%%JDBC%%include/jdbc/cppconn/variant.h +%%JDBC%%include/jdbc/cppconn/version_info.h +%%JDBC%%include/jdbc/cppconn/warning.h +%%JDBC%%include/jdbc/mysql_connection.h +%%JDBC%%include/jdbc/mysql_driver.h +%%JDBC%%include/jdbc/mysql_error.h +include/mysqlx/common/api.h +include/mysqlx/common/error.h +include/mysqlx/common/value.h +include/mysqlx/common/op_if.h +include/mysqlx/common/settings.h +include/mysqlx/common/util.h +include/mysqlx/devapi/row.h +include/mysqlx/devapi/common.h +include/mysqlx/devapi/result.h +include/mysqlx/devapi/collations.h +include/mysqlx/devapi/crud.h +include/mysqlx/devapi/detail/row.h +include/mysqlx/devapi/detail/session.h +include/mysqlx/devapi/detail/crud.h +include/mysqlx/devapi/detail/settings.h +include/mysqlx/devapi/detail/result.h +include/mysqlx/devapi/detail/error.h +include/mysqlx/devapi/mysql_collations.h +include/mysqlx/devapi/executable.h +include/mysqlx/devapi/document.h +include/mysqlx/devapi/settings.h +include/mysqlx/devapi/collection_crud.h +include/mysqlx/devapi/error.h +include/mysqlx/devapi/mysql_charsets.h +include/mysqlx/devapi/table_crud.h +include/mysqlx/xdevapi.h +include/mysqlx/xapi.h +include/mysqlx/common.h +include/mysqlx/common_constants.h +%%JDBC%%lib/libmysqlcppconn.so +%%JDBC%%lib/libmysqlcppconn.so.7 +%%JDBC%%lib/libmysqlcppconn.so.7.%%PORTVERSION%% +lib/libmysqlcppconn8.so +lib/libmysqlcppconn8.so.1 +lib/libmysqlcppconn8.so.1.%%PORTVERSION%%