From nobody Fri Feb 11 17:58:41 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B3A0F19B95D4; Fri, 11 Feb 2022 17:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JwLvk16JSz3F75; Fri, 11 Feb 2022 17:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644602322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/DBe3mlM7nRnlPc7lZcHBribnpVnSQajKy3e1eIJohk=; b=k/8Eth3KgONvFMbMUPCB+zNDZqDsLRvK/nRNLUzfwt2HP1z5YVvOH/gHAUnMM1SNCZI6BL aLblz5lks5332vbbjzAQpH7EAsFhtk3X8HhuYTU6IBxV65HyZTR4bgYSkJ14XP7ZLZLKbV utlshxqhcqOH8IgZ1WqBAJJxZIH1hJtDuxsGmaekaakn7r3R/fHbxfqfswVM3usQ7O4Dcx JiBP98P+tQtuzGZxtc1ZTz2eX4wwH5SmwnYQmcD5+va41QEsw+7DJRiimiRtwHQI7UD9Ei 8MU6PiMtEagHc5WgjDM8mz9l0d0z2IdYhW8812kEJR5WP7OvUs8bmT4Nd/UKbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 076B618D38; Fri, 11 Feb 2022 17:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21BHwfog015150; Fri, 11 Feb 2022 17:58:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21BHwfxf015149; Fri, 11 Feb 2022 17:58:41 GMT (envelope-from git) Date: Fri, 11 Feb 2022 17:58:41 GMT Message-Id: <202202111758.21BHwfxf015149@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: f6da53de6e32 - main - databases/soci: Update to 4.0.3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f6da53de6e322701f9ade2acdcbec631dd49bc6a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644602322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/DBe3mlM7nRnlPc7lZcHBribnpVnSQajKy3e1eIJohk=; b=xqS0ifv3/swWWrYY5aV+z47TmFYw+ZaJ2wGWtYX0E9L3tjZc1e43buq6yUc8a91QZDa17W lioZzy6ofRrWATSBI9qdBTDrDnRHQwFTCOHIbHPNmokm1aKhUxZ1kDabYxrj7O4qkg27HL mEe2Oi/z4JEfE+ax/cWytKiz2HpiVhhQj0xVKKxnxSHoxZovkc4gH1VK194KWKmRMhbuI8 0mvqAay0FRN5vzRVVhgpQz2IgVTtABYueNg8IHFYwLG8kDmDAsGFqokc2xyEGgWPJ9TJ0P zz+fN53ivj1w5lMp0lLK/eUHQ3gKKVv6ErxydGz0BPCyrlr2Jvnw1hmtKC3CJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644602322; a=rsa-sha256; cv=none; b=He/7NI9jTtMBEc2ayvaiCIz9Lj69U9O+gY45kOvtH3w2I6KLgAZ/GJMySsf8v/MYTW0t+c C1tFUDjKC97/OLg8vBsggNgXSrvvXvumSOdXMRC9rzIHSM15wBrRojiYKKfevMkN8M9pLL AhrkmyW0b8Qg16ay6hoQFM3p55Zpc+aqf3Jf/GBcZMJL8MT8f1iwTqRz7QVUERS1EQ6vrC QiaHAHJMRK/ud7zFHcJH4y92RiIPCnNh4XTbaJ68vDUmAcPzI+FNfyUYFA2+yBh7Gu9OUK mXcuaMb1DxVf5Y04CcrAhGwszrmegWfWAXYKH0I64kebIwu45rYv65uEVZ8HLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=f6da53de6e322701f9ade2acdcbec631dd49bc6a commit f6da53de6e322701f9ade2acdcbec631dd49bc6a Author: Neel Chauhan AuthorDate: 2022-02-11 17:58:39 +0000 Commit: Neel Chauhan CommitDate: 2022-02-11 17:58:39 +0000 databases/soci: Update to 4.0.3 --- databases/soci/Makefile | 44 ++++++++++---------- databases/soci/distinfo | 6 +-- databases/soci/files/patch-CMakeLists.txt | 11 ----- databases/soci/pkg-plist | 68 ++++++++++++++++--------------- 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 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 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