From nobody Wed Jun 08 17:46:35 2022 X-Original-To: dev-commits-ports-main@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 BE69F837918; Wed, 8 Jun 2022 17:46:35 +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 4LJF5l4pvrz4sJ7; Wed, 8 Jun 2022 17:46:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654710395; 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=jCfdgo8WCWwdtGz7JdnvyS4xnZ+4vBr2OR4oHPqgIAY=; b=RS/wj94RAff0P3vEBDSHB+SarQmmnl2fryVgBHePf3ApYnVIAplyroHjMm9uNxCPmYPPEX xtVG6i1uFm3Sd4xmDJscbC5c1ZHN9JuB6GVNgKap9vkHERGJIKNQlnHnhp9FeabQsuH7Gw uefaJpHNef8jJeJlRLT5HyxOZJW46+KTrV749FgyDOFXepDWIbpCyVHQhDQZ5yJuiHXcLL jfyhqJWoBtw60dfG28hPHSycnaA/ohaNsrS/uiqRRLFZ+KwMK6CbsYcj+/3mwExKsrCoBq bbRPIe6OoXso60Ru2jL9aS8o1nTIlKu9BbNVwia9LiVQGD9RUGacgmcZuYFPtQ== 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 84CEB140F8; Wed, 8 Jun 2022 17:46:35 +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 258HkZZi043356; Wed, 8 Jun 2022 17:46:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 258HkZmH043355; Wed, 8 Jun 2022 17:46:35 GMT (envelope-from git) Date: Wed, 8 Jun 2022 17:46:35 GMT Message-Id: <202206081746.258HkZmH043355@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: 32932bd8815a - main - databases/soci: Fix packaging errors on no ODBC List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 32932bd8815a130693a2d2e0a7bfcd11eca711a7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654710395; 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=jCfdgo8WCWwdtGz7JdnvyS4xnZ+4vBr2OR4oHPqgIAY=; b=HxVBJSs3h909nXs5rdRwsrkPF8lF0WSnCBRxnPH/YlG1Dh6XWh/aW83Xgd9NrNTSHy4L93 zp5jAi3LgJ6XbjRtl2j4U4Fg0y4UD4+CXViht4AzsE0Yh03StRDQx4ZgP7ZNpywqDHxu7X vSV4ds3DJz0fdxu3M3JO4M8Z5vIkNlvNLs4BXyDle6xA6/6rTl3O6FfuSsHKJa1DJ2TBCc d4Cdf1AoX81LlAHlJsUSb+sIxcJIzmSorxwRiI2MncJE92QPbFQ3z3x9HEKGNWValAmfop hIngzCd+OK3dqBg69++ucIrhpDwCzvBO393lB38vy1q18jKx4zr9b1Kn/WH/Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654710395; a=rsa-sha256; cv=none; b=G9DeGPcseWY9qSqO4pB4jAYCd2FyFcyM3ensl0t1VOpqKCEHKKdHHyanBaEH+JvXJxwYRU NwqSqVFnxGGheHkAoKpC32lkljCKE6i0jo09gTKTj0bDDvnzSUaqHsl1a27nk8M1yQskSv iTGmepvL3HGFi4wTDW1Dvxp1NzAOB2bLfjz1ZZOyNu2hddkhIGp9HlelF7t3FK1YYB/YJC v+7ZLwGbuYFvQLi+5ycXSuqpFkOb5eEQ81HK6xN1YrirRjugzGHEVZVxDWTV4INpHTRbb5 k3gk1OP3ERktPhvVd6EMDIb8Q7RhMtEWrm7qlnfPnT0I4o6OFvLgUWxQg+pBPg== 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=32932bd8815a130693a2d2e0a7bfcd11eca711a7 commit 32932bd8815a130693a2d2e0a7bfcd11eca711a7 Author: Neel Chauhan AuthorDate: 2022-06-08 17:46:07 +0000 Commit: Neel Chauhan CommitDate: 2022-06-08 17:46:07 +0000 databases/soci: Fix packaging errors on no ODBC PR: 264537 Reported by: Stéphane D'Alu --- databases/soci/pkg-plist | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/databases/soci/pkg-plist b/databases/soci/pkg-plist index 05d7ad447dad..f5b012e6f878 100644 --- a/databases/soci/pkg-plist +++ b/databases/soci/pkg-plist @@ -19,7 +19,7 @@ include/soci/into.h include/soci/logger.h include/soci/mysql/soci-mysql.h include/soci/noreturn.h -include/soci/odbc/soci-odbc.h +%%ODBC%%include/soci/odbc/soci-odbc.h include/soci/once-temp-type.h include/soci/postgresql/soci-postgresql.h include/soci/prepare-temp-type.h @@ -72,10 +72,10 @@ 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 +%%ODBC%%lib/libsoci_odbc.a +%%ODBC%%lib/libsoci_odbc.so +%%ODBC%%lib/libsoci_odbc.so.4.0 +%%ODBC%%lib/libsoci_odbc.so.4.0.3 lib/libsoci_postgresql.a lib/libsoci_postgresql.so lib/libsoci_postgresql.so.4.0