diff --git a/databases/odbc-cpp-wrapper/Makefile b/databases/odbc-cpp-wrapper/Makefile index 93dfca02f7b8..fa97a565c252 100644 --- a/databases/odbc-cpp-wrapper/Makefile +++ b/databases/odbc-cpp-wrapper/Makefile @@ -1,20 +1,23 @@ PORTNAME= odbc-cpp-wrapper -PORTVERSION= 1.1 +PORTVERSION= 1.5 DISTVERSIONPREFIX= v CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org COMMENT= Object-oriented C++-wrapper of the ODBC API WWW= https://github.com/SAP/odbc-cpp-wrapper LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libodbc.so:databases/unixODBC +TEST_DEPENDS= googletest>=0:devel/googletest -USES= cmake compiler:c++11-lang localbase +USES= cmake:testing compiler:c++11-lang localbase + +CMAKE_ON= BUILD_SHARED_LIBS USE_GITHUB= yes GH_ACCOUNT= SAP .include diff --git a/databases/odbc-cpp-wrapper/distinfo b/databases/odbc-cpp-wrapper/distinfo index 35781d125c79..8df8fb0bff8c 100644 --- a/databases/odbc-cpp-wrapper/distinfo +++ b/databases/odbc-cpp-wrapper/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663672720 -SHA256 (SAP-odbc-cpp-wrapper-v1.1_GH0.tar.gz) = 27b45ff65e2f2963bb642c91864892570a6a3867932a53db3b59d4179a650904 -SIZE (SAP-odbc-cpp-wrapper-v1.1_GH0.tar.gz) = 60600 +TIMESTAMP = 1773966698 +SHA256 (SAP-odbc-cpp-wrapper-v1.5_GH0.tar.gz) = b77bf175f20be039a219246c863cf5c7763080846a6644cdcf0714af310b3503 +SIZE (SAP-odbc-cpp-wrapper-v1.5_GH0.tar.gz) = 63971 diff --git a/databases/odbc-cpp-wrapper/files/patch-CMakeLists.txt b/databases/odbc-cpp-wrapper/files/patch-CMakeLists.txt index 699579b03eb3..2942acfa9f2b 100644 --- a/databases/odbc-cpp-wrapper/files/patch-CMakeLists.txt +++ b/databases/odbc-cpp-wrapper/files/patch-CMakeLists.txt @@ -1,20 +1,23 @@ ---- CMakeLists.txt.orig 2022-09-13 10:33:43 UTC +--- CMakeLists.txt.orig 2026-02-27 11:01:34 UTC +++ CMakeLists.txt -@@ -5,17 +5,9 @@ SET(CMAKE_CXX_STANDARD 11) +@@ -5,17 +5,14 @@ FIND_PACKAGE(ODBC REQUIRED) PROJECT(odbccpp) FIND_PACKAGE(ODBC REQUIRED) -FIND_PACKAGE(Doxygen) -FIND_PACKAGE(GTest) FILE(STRINGS cfg/VERSION version) ENABLE_TESTING() ADD_SUBDIRECTORY(src) -IF (GTEST_FOUND) -- ADD_SUBDIRECTORY(test) ++ ++IF (BUILD_TESTING) ++ FIND_PACKAGE(GTest) + ADD_SUBDIRECTORY(test) -ENDIF() -IF (DOXYGEN_FOUND) - ADD_SUBDIRECTORY(doc) --ENDIF() + ENDIF() diff --git a/databases/odbc-cpp-wrapper/files/patch-src-odbc-CMakeLists.txt b/databases/odbc-cpp-wrapper/files/patch-src-odbc-CMakeLists.txt deleted file mode 100644 index a9fa081c1b2d..000000000000 --- a/databases/odbc-cpp-wrapper/files/patch-src-odbc-CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- src/odbc/CMakeLists.txt.orig 2022-08-05 08:39:29 UTC -+++ src/odbc/CMakeLists.txt -@@ -57,6 +57,7 @@ TARGET_COMPILE_DEFINITIONS(odbccpp_static - ODBC_STATIC - ) - SET_PROPERTY(TARGET odbccpp_static PROPERTY POSITION_INDEPENDENT_CODE ON) -+SET_TARGET_PROPERTIES(odbccpp_static PROPERTIES OUTPUT_NAME "odbccpp") - - # Shared library - ADD_LIBRARY(odbccpp diff --git a/databases/odbc-cpp-wrapper/pkg-plist b/databases/odbc-cpp-wrapper/pkg-plist index 188f59f948f9..c20c0eba84f4 100644 --- a/databases/odbc-cpp-wrapper/pkg-plist +++ b/databases/odbc-cpp-wrapper/pkg-plist @@ -1,22 +1,21 @@ include/odbc/Config.h include/odbc/Connection.h include/odbc/DatabaseMetaData.h include/odbc/DatabaseMetaDataBase.h include/odbc/DatabaseMetaDataUnicode.h include/odbc/Environment.h include/odbc/Exception.h include/odbc/Forwards.h include/odbc/ParameterMetaData.h include/odbc/PreparedStatement.h include/odbc/RefCounted.h include/odbc/ResultSet.h include/odbc/ResultSetMetaData.h include/odbc/ResultSetMetaDataBase.h include/odbc/ResultSetMetaDataUnicode.h include/odbc/Statement.h include/odbc/StatementBase.h include/odbc/StringConverter.h include/odbc/Types.h include/odbc/Util.h -lib/libodbccpp.a lib/libodbccpp.so