From 9f69094b522c8ce32863eaf52a827e4dceeb9fee Mon Sep 17 00:00:00 2001 From: Muhammad Moinur Rahman Date: Thu, 2 Feb 2023 11:10:20 -0600 Subject: databases/mysql-connector-c++: Update version 1.1.13=>8.0.32 - Update LICENSE_FILE - Unbreak for mysql 8.0 - OPTIONIZE DOCS - Remove tests as those are no longer provided in distfile Changes: https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-32.html --- databases/mysql-connector-c++/Makefile | 72 +++++++++------------- databases/mysql-connector-c++/distinfo | 6 +- .../mysql-connector-c++/files/patch-CMakeLists.txt | 10 --- databases/mysql-connector-c++/pkg-plist | 56 ++++++++++------- 4 files changed, 66 insertions(+), 78 deletions(-) delete mode 100644 databases/mysql-connector-c++/files/patch-CMakeLists.txt diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile index 370203ad1bb1..acc0ce1d0bae 100644 --- a/databases/mysql-connector-c++/Makefile +++ b/databases/mysql-connector-c++/Makefile @@ -1,64 +1,52 @@ PORTNAME= mysql-connector-c++ -PORTVERSION= 1.1.13 -PORTREVISION= 3 +PORTVERSION= 8.0.32 CATEGORIES= databases MASTER_SITES= MYSQL/Connector-C++ +DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= bofh@FreeBSD.org COMMENT= MySQL database connector for C++ WWW= https://dev.mysql.com/doc/relnotes/connector-cpp/en/index.html LICENSE= GPLv2 # only -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_FILE= ${WRKSRC}/LICENSE.txt -LIB_DEPENDS= libboost_regex.so:devel/boost-libs +LIB_DEPENDS= libboost_regex.so:devel/boost-libs \ + liblz4.so:archivers/liblz4 \ + libprotobuf.so:devel/protobuf \ + libzstd.so:archivers/zstd -USES= cmake compiler:c++11-lang mysql ssl -IGNORE_WITH_MYSQL= 80 +USES= cmake:noninja compiler:c++17-lang cpe gmake mysql ssl +CPE_VENDOR= oracle +USE_CXXSTD= c++17 USE_LDCONFIG= yes -CMAKE_ARGS= -DDOC_DESTINATION="${DOCSDIR}" -DCMAKE_ENABLE_C++11=ON +CMAKE_ARGS= -DCMAKE_ENABLE_C++17=ON \ + -DWITH_LZ4=system \ + -DWITH_PROTOBUF=system \ + -DWITH_SYSTEM_LIBS=1 \ + -DWITH_ZLIB=system \ + -DWITH_ZSTD=system PLIST_SUB= PORTVERSION=${PORTVERSION} - PORTDOCS= * + OPTIONS_DEFINE= DOCS +OPTIONS_SUB= yes -post-install: - @${RM} ${STAGEDIR}${DOCSDIR}/INSTALL \ - ${STAGEDIR}${DOCSDIR}/COPYING +DOCS_BUILD_DEPENDS= doxygen:devel/doxygen +DOCS_CMAKE_ON= -DDOC_DESTINATION="${DOCSDIR}" \ + -DWITH_DOC=ON -.if defined(MAINTAINER_MODE) -CMAKE_ARGS+= -DMYSQLCPPCONN_TEST_NOT_IMPLEMENTED:BOOL=1 \ - -DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=1 +post-install: + @${RM} ${STAGEDIR}${PREFIX}/INFO_BIN + @${RM} ${STAGEDIR}${PREFIX}/INFO_SRC -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 +post-install-DOCS-on: + @${RM} ${STAGEDIR}${DOCSDIR}/INSTALL \ + ${STAGEDIR}${DOCSDIR}/LICENSE.txt + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${BUILD_WRKSRC}/doc && \ + ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR} .include diff --git a/databases/mysql-connector-c++/distinfo b/databases/mysql-connector-c++/distinfo index cdb132d4f773..26518fa364e5 100644 --- a/databases/mysql-connector-c++/distinfo +++ b/databases/mysql-connector-c++/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1572299977 -SHA256 (mysql-connector-c++-1.1.13.tar.gz) = 332c87330ab167c17606b95d27af110c3f8f228658e8ba0d1f6e5f0a0acf3b41 -SIZE (mysql-connector-c++-1.1.13.tar.gz) = 519743 +TIMESTAMP = 1675349313 +SHA256 (mysql-connector-c++-8.0.32-src.tar.gz) = fbdb7f214427632f423e84ba7594be1f9205eac8128c6b1857203b2f5455cef3 +SIZE (mysql-connector-c++-8.0.32-src.tar.gz) = 4202413 diff --git a/databases/mysql-connector-c++/files/patch-CMakeLists.txt b/databases/mysql-connector-c++/files/patch-CMakeLists.txt deleted file mode 100644 index 5dfa0b0b7bcd..000000000000 --- a/databases/mysql-connector-c++/files/patch-CMakeLists.txt +++ /dev/null @@ -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() diff --git a/databases/mysql-connector-c++/pkg-plist b/databases/mysql-connector-c++/pkg-plist index a730f110cff2..cbef9cbe77ca 100644 --- a/databases/mysql-connector-c++/pkg-plist +++ b/databases/mysql-connector-c++/pkg-plist @@ -1,23 +1,33 @@ -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%% +include/mysqlx/common.h +include/mysqlx/common/api.h +include/mysqlx/common/error.h +include/mysqlx/common/op_if.h +include/mysqlx/common/settings.h +include/mysqlx/common/util.h +include/mysqlx/common/value.h +include/mysqlx/common_constants.h +include/mysqlx/devapi/collations.h +include/mysqlx/devapi/collection_crud.h +include/mysqlx/devapi/common.h +include/mysqlx/devapi/crud.h +include/mysqlx/devapi/detail/crud.h +include/mysqlx/devapi/detail/error.h +include/mysqlx/devapi/detail/result.h +include/mysqlx/devapi/detail/row.h +include/mysqlx/devapi/detail/session.h +include/mysqlx/devapi/detail/settings.h +include/mysqlx/devapi/document.h +include/mysqlx/devapi/error.h +include/mysqlx/devapi/executable.h +include/mysqlx/devapi/mysql_charsets.h +include/mysqlx/devapi/mysql_collations.h +include/mysqlx/devapi/result.h +include/mysqlx/devapi/row.h +include/mysqlx/devapi/settings.h +include/mysqlx/devapi/table_crud.h +include/mysqlx/version_info.h +include/mysqlx/xapi.h +include/mysqlx/xdevapi.h +lib/libmysqlcppconn8.so +lib/libmysqlcppconn8.so.2 +lib/libmysqlcppconn8.so.2.%%PORTVERSION%% -- cgit v1.2.3