databases/soci: Update to 4.0.3

4 files changed, 61 insertions, 68 deletions

diff --git a/databases/soci/Makefile b/databases/soci/Makefile
index 4f29549e643f..a215823e991f 100644
--- a/databases/soci/Makefile
+++ b/databases/soci/Makefile
@@ -1,8 +1,8 @@
 # Created by: Julien Laffaye <kimelto@gmail.com>
 
 PORTNAME=	soci
-DISTVERSION=	4.0.1
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	4.0.3
 CATEGORIES=	databases
 
 MAINTAINER=	ports@FreeBSD.org
@@ -12,48 +12,50 @@ LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE_1_0.txt
 
 USES=		cmake compiler:c++11-lang
-USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	SOCI
 
+USE_LDCONFIG=	yes
+
 CMAKE_OFF=	WITH_ORACLE
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	MYSQL PGSQL SQLITE ODBC BOOST FIREBIRD
-BOOST_DESC=	Enable support for additional types using Boost
-OPTIONS_DEFAULT=MYSQL PGSQL SQLITE ODBC BOOST FIREBIRD
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		BOOST FIREBIRD MYSQL ODBC PGSQL SQLITE
+OPTIONS_DEFAULT=	BOOST FIREBIRD MYSQL ODBC PGSQL SQLITE
 
 # firebird is currently only available on x86.
 OPTIONS_EXCLUDE_aarch64=	FIREBIRD
-OPTIONS_EXCLUDE_armv6=		FIREBIRD
-OPTIONS_EXCLUDE_armv7=		FIREBIRD
-OPTIONS_EXCLUDE_mips=		FIREBIRD
-OPTIONS_EXCLUDE_mips64=		FIREBIRD
+OPTIONS_EXCLUDE_armv6=	FIREBIRD
+OPTIONS_EXCLUDE_armv7=	FIREBIRD
+OPTIONS_EXCLUDE_mips=	FIREBIRD
+OPTIONS_EXCLUDE_mips64=	FIREBIRD
 OPTIONS_EXCLUDE_powerpc=	FIREBIRD
 OPTIONS_EXCLUDE_powerpc64=	FIREBIRD
 OPTIONS_EXCLUDE_powerpc64le=	FIREBIRD
 OPTIONS_EXCLUDE_sparc64=	FIREBIRD
 
-MYSQL_USES=	mysql
-MYSQL_CMAKE_BOOL=	WITH_MYSQL
+OPTIONS_SUB=	yes
 
-PGSQL_USES=	pgsql
-PGSQL_CMAKE_BOOL=	WITH_POSTGRESQL
+BOOST_DESC=		Enable support for additional types using Boost
+BOOST_LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
+BOOST_CMAKE_BOOL=	WITH_BOOST
 
-SQLITE_USES=	sqlite
-SQLITE_CMAKE_BOOL=	WITH_SQLITE3
+FIREBIRD_USES=		firebird
+FIREBIRD_CMAKE_BOOL=	WITH_FIREBIRD
+
+MYSQL_USES=		mysql
+MYSQL_CMAKE_BOOL=	WITH_MYSQL
 
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_CMAKE_BOOL=	WITH_ODBC
 ODBC_CMAKE_ON=		-DODBC_LIBRARY:FILE_PATH=${LOCALBASE}/lib/libodbc.so
 
-BOOST_LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
-BOOST_CMAKE_BOOL=	WITH_BOOST
+PGSQL_USES=		pgsql
+PGSQL_CMAKE_BOOL=	WITH_POSTGRESQL
 
-FIREBIRD_USES=	firebird
-FIREBIRD_CMAKE_BOOL=	WITH_FIREBIRD
+SQLITE_USES=		sqlite
+SQLITE_CMAKE_BOOL=	WITH_SQLITE3
 
 .include <bsd.port.mk>
diff --git a/databases/soci/distinfo b/databases/soci/distinfo
index c5634c764065..89acc0debdaf 100644
--- a/databases/soci/distinfo
+++ b/databases/soci/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610905825
-SHA256 (SOCI-soci-4.0.1_GH0.tar.gz) = fa69347b1a1ef74450c0382b665a67bd6777cc7005bbe09726479625bcf1e29c
-SIZE (SOCI-soci-4.0.1_GH0.tar.gz) = 489841
+TIMESTAMP = 1644601909
+SHA256 (SOCI-soci-v4.0.3_GH0.tar.gz) = 4b1ff9c8545c5d802fbe06ee6cd2886630e5c03bf740e269bb625b45cf934928
+SIZE (SOCI-soci-v4.0.3_GH0.tar.gz) = 508750
diff --git a/databases/soci/files/patch-CMakeLists.txt b/databases/soci/files/patch-CMakeLists.txt
deleted file mode 100644
index 24d063d1153e..000000000000
--- a/databases/soci/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2020-10-19 14:59:47 UTC
-+++ CMakeLists.txt
-@@ -134,7 +134,7 @@ set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- ###############################################################################
- 
- if(NOT DEFINED SOCI_LIBDIR)
--  if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4)
-+  if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-     set(SOCI_LIBDIR "lib")
-   else()
-     set(SOCI_LIBDIR "lib64")
diff --git a/databases/soci/pkg-plist b/databases/soci/pkg-plist
index eb1d3f4fb68d..47fca9aa4b5d 100644
--- a/databases/soci/pkg-plist
+++ b/databases/soci/pkg-plist
@@ -1,13 +1,11 @@
-cmake/SOCI-%%CMAKE_BUILD_TYPE%%.cmake
-cmake/SOCI.cmake
 include/soci/backend-loader.h
 include/soci/bind-values.h
 include/soci/blob-exchange.h
 include/soci/blob.h
-%%BOOST%%include/soci/boost-fusion.h
-%%BOOST%%include/soci/boost-gregorian-date.h
-%%BOOST%%include/soci/boost-optional.h
-%%BOOST%%include/soci/boost-tuple.h
+include/soci/boost-fusion.h
+include/soci/boost-gregorian-date.h
+include/soci/boost-optional.h
+include/soci/boost-tuple.h
 include/soci/callbacks.h
 include/soci/column-info.h
 include/soci/connection-parameters.h
@@ -15,15 +13,15 @@ include/soci/connection-pool.h
 include/soci/empty/soci-empty.h
 include/soci/error.h
 include/soci/exchange-traits.h
-%%FIREBIRD%%include/soci/firebird/soci-firebird.h
+include/soci/firebird/soci-firebird.h
 include/soci/into-type.h
 include/soci/into.h
 include/soci/logger.h
-%%MYSQL%%include/soci/mysql/soci-mysql.h
+include/soci/mysql/soci-mysql.h
 include/soci/noreturn.h
-%%ODBC%%include/soci/odbc/soci-odbc.h
+include/soci/odbc/soci-odbc.h
 include/soci/once-temp-type.h
-%%PGSQL%%include/soci/postgresql/soci-postgresql.h
+include/soci/postgresql/soci-postgresql.h
 include/soci/prepare-temp-type.h
 include/soci/procedure.h
 include/soci/query_transformation.h
@@ -40,7 +38,7 @@ include/soci/soci-config.h
 include/soci/soci-platform.h
 include/soci/soci-simple.h
 include/soci/soci.h
-%%SQLITE%%include/soci/sqlite3/soci-sqlite3.h
+include/soci/sqlite3/soci-sqlite3.h
 include/soci/statement.h
 include/soci/transaction.h
 include/soci/type-conversion-traits.h
@@ -54,31 +52,35 @@ include/soci/use.h
 include/soci/values-exchange.h
 include/soci/values.h
 include/soci/version.h
+lib/cmake/SOCI/SOCIConfig.cmake
+lib/cmake/SOCI/SOCIConfigVersion.cmake
+lib/cmake/SOCI/SOCITargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/SOCI/SOCITargets.cmake
 lib/libsoci_core.a
 lib/libsoci_core.so
 lib/libsoci_core.so.4.0
-lib/libsoci_core.so.4.0.1
+lib/libsoci_core.so.4.0.3
 lib/libsoci_empty.a
 lib/libsoci_empty.so
 lib/libsoci_empty.so.4.0
-lib/libsoci_empty.so.4.0.1
-%%FIREBIRD%%lib/libsoci_firebird.a
-%%FIREBIRD%%lib/libsoci_firebird.so
-%%FIREBIRD%%lib/libsoci_firebird.so.4.0
-%%FIREBIRD%%lib/libsoci_firebird.so.4.0.1
-%%MYSQL%%lib/libsoci_mysql.a
-%%MYSQL%%lib/libsoci_mysql.so
-%%MYSQL%%lib/libsoci_mysql.so.4.0
-%%MYSQL%%lib/libsoci_mysql.so.4.0.1
-%%ODBC%%lib/libsoci_odbc.a
-%%ODBC%%lib/libsoci_odbc.so
-%%ODBC%%lib/libsoci_odbc.so.4.0
-%%ODBC%%lib/libsoci_odbc.so.4.0.1
-%%PGSQL%%lib/libsoci_postgresql.a
-%%PGSQL%%lib/libsoci_postgresql.so
-%%PGSQL%%lib/libsoci_postgresql.so.4.0
-%%PGSQL%%lib/libsoci_postgresql.so.4.0.1
-%%SQLITE%%lib/libsoci_sqlite3.a
-%%SQLITE%%lib/libsoci_sqlite3.so
-%%SQLITE%%lib/libsoci_sqlite3.so.4.0
-%%SQLITE%%lib/libsoci_sqlite3.so.4.0.1
+lib/libsoci_empty.so.4.0.3
+lib/libsoci_firebird.a
+lib/libsoci_firebird.so
+lib/libsoci_firebird.so.4.0
+lib/libsoci_firebird.so.4.0.3
+lib/libsoci_mysql.a
+lib/libsoci_mysql.so
+lib/libsoci_mysql.so.4.0
+lib/libsoci_mysql.so.4.0.3
+lib/libsoci_odbc.a
+lib/libsoci_odbc.so
+lib/libsoci_odbc.so.4.0
+lib/libsoci_odbc.so.4.0.3
+lib/libsoci_postgresql.a
+lib/libsoci_postgresql.so
+lib/libsoci_postgresql.so.4.0
+lib/libsoci_postgresql.so.4.0.3
+lib/libsoci_sqlite3.a
+lib/libsoci_sqlite3.so
+lib/libsoci_sqlite3.so.4.0
+lib/libsoci_sqlite3.so.4.0.3